Commit Graph

216 Commits

Author SHA1 Message Date
DizzyEggg
d0f91a996d Tweak up mega evo 2019-05-02 23:10:01 +02:00
Papa Cancer
3cde800bd0 Magnetic Flux + Gear Up
Both have the same effect so they're in one commit. Uses custom script to check both user and partner for stats and abilities.
Magnetic Flux uses Charge animation.
2019-04-20 20:17:56 +01:00
Papa Cancer
b50007e861 Instruct
Re-PR'd due to excess "merges"
2019-04-20 20:11:49 +01:00
Papa Cancer
7e99272482 Laser Focus
Re-PR'd due to excess "merges"
2019-04-20 20:02:52 +01:00
Papa Cancer
c4acc3dbf8
Merge branch 'battle_engine_v2' into beta 2019-04-20 16:49:57 +01:00
DizzyEggg
5b43a9289d
Merge pull request #134 from thechurchofcage/epsilon
Baneful Bunker + King's Shield
2019-04-20 08:42:35 +02:00
Papa Cancer
e310d0f10e Core Enforcer
New code - uses Gastro Acid script instead through own move effect
2019-04-18 12:10:18 +01:00
Papa Cancer
754befe393 Baneful Bunker + King's Shield
Both apply a move effect from atk49. King's Shield swaps attacker and defender for the sake of Defiant etc. and then swaps them back!
2019-04-17 14:54:21 +01:00
Papa Cancer
e5e45bbcf5 Throat Chop
Added strings that show when Throat Chop prevents move usage. Added extra string (not present in games) to show when it ends as there is no indication otherwise. Fixed Embargo's string as well.
2019-04-17 13:52:25 +01:00
DizzyEggg
549a9cdcc2
Merge pull request #118 from thechurchofcage/beta
Stomping Tantrum
2019-04-13 14:09:15 +02:00
Papa Cancer
fd6dc98045 Hold Hands fix
Better check for valid ally. If there isn't one, the target defaults to the attacker, causing the move to fail.
2019-04-06 22:23:34 +01:00
Papa Cancer
33d484a7ed
Merge branch 'battle_engine_v2' into beta 2019-04-06 00:38:56 +01:00
Papa Cancer
43525d2a9c
Merge branch 'battle_engine_v2' into delta 2019-04-05 23:13:41 +01:00
DizzyEggg
794c9aa255
Merge pull request #121 from thechurchofcage/epsilon
Three pointless moves
2019-04-05 23:47:54 +02:00
Papa Cancer
4c8bc9d526 Three pointless moves
Celebrate, Hold Hands and Happy Hour. Yay(!)
Update: turns out Pay Day works differently to how I thought, so I added a new move effect for Happy Hour doubling prize money.
Made all three effects subset of EFFECT_SPLASH, now called EFFECT_DUMB, as per Egg's instructions ( ͡° ͜ʖ ͡°)
2019-04-05 18:10:02 +01:00
DizzyEggg
183b714ff1 Merge with master and fix web moves 2019-04-05 12:43:44 +02:00
Fontbane
90e32f4ec5 Document landmark setting and item balls 2019-04-04 19:34:35 -05:00
Papa Cancer
c9ad96d228 Stomping Tantrum
Uses timer in gBattleStruct to count time since last failed move. This is augmented by a MOVE_FAILED result in atk_49 and decreased with an ENDTURN case. EFFECT_STOMPING_TANTRUM doubles  base power if the timer is set.
2019-04-01 20:06:45 +01:00
DizzyEggg
62192b86f7 Aroma Veil 2019-04-01 11:42:37 +02:00
DizzyEggg
e878de782e
Merge pull request #114 from thechurchofcage/gamma
Misc. move updates
2019-03-31 22:08:14 +02:00
DizzyEggg
6f9096c613 Add Sweet Veil 2019-03-31 22:02:39 +02:00
DizzyEggg
b12334c88b Remove cases from ABE, add functionality of Flower Veil 2019-03-31 21:38:58 +02:00
Papa Cancer
1d5cf3acb5 Misc. move updates
Bind: 75% Acc -> 85% Acc
Disable: 55% Acc. -> 100% Acc.
Freeze-Dry: 10% chance to freeze
Hammer Arm and Ice Hammer: lower user's speed
High Jump Kick: 130BP, 10 PP
Jump Kick: 100BP, 10 PP
Tail Glow: raises Sp. Atk by 3 stages
Waterfall: 20% chance to flinch
2019-03-31 18:25:37 +01:00
Papa Cancer
ebe2dc6bbb Mat Block
Nothing more needs to be said
2019-03-31 17:17:13 +01:00
DizzyEggg
17e74756cb Merge with master, add defines to atk49 and statbuffchange commands 2019-03-31 15:19:25 +02:00
DizzyEggg
35cffea987 Helpful macros for atk49 2019-03-30 08:29:56 -05:00
DizzyEggg
876be1d9cd
Merge pull request #104 from thechurchofcage/beta
Spiky Shield
2019-03-30 11:21:27 +01:00
DizzyEggg
5dd653a89e Use constants in atk89_statbuffchange 2019-03-27 07:47:01 -05:00
Papa Cancer
a3b4767dd2 Spiky Shield
Created generic string "Atk was hurt by Def's BUFF" for use for both Spiky Shield and Rough Skin - can also be used for Aftermath and Rocky Helmet, when programmed
2019-03-26 17:45:34 +00:00
Papa Cancer
61a7bd2788 Taunt fix etc.
Taunt now works for the correct number of turns and has its own ending string - made by reusing the "Heal Block ends" string as a multi-purpose "X wore off" one. Fixed a bug in PREPARE_STRING_BUFFER and touched up the ENDTURN timers for various STATUS3's.
Heal Block now displays the correct string when preventing usage of a move.
2019-03-24 12:54:01 +00:00
DizzyEggg
b8a634770f Touch up Weak Armor 2019-03-23 16:56:56 +01:00
DizzyEggg
b9052fb37d Touch Up Justified and Rattled 2019-03-23 16:37:56 +01:00
DizzyEggg
e135ea47e5 Touch up Anger Point 2019-03-23 16:33:08 +01:00
DizzyEggg
c329252ce3 Add Safety Googles effect 2019-03-08 10:16:54 +01:00
DizzyEggg
f9ee31903d VCreate and fix stat stage changes functions 2019-03-07 12:20:57 +01:00
DizzyEggg
666e2ac584 Fix allowing the player to run from wild double battles 2019-03-06 12:13:37 +01:00
DizzyEggg
7a8f524bc5 Proper Roar handling in double battles 2019-03-06 12:09:34 +01:00
DizzyEggg
fddb5159b4 Merge with master 2019-03-05 21:46:45 +01:00
Papa Cancer
2050ac3963 Grassy Terrain v2
All corrected, simplest version
Also includes proper ending strings for all terrains
2019-03-05 19:13:25 +00:00
DizzyEggg
b150091436 Rename an erroneously named battlescript 2019-03-05 17:06:29 +01:00
Phlosioneer
4ea5e85bed Fix typos
This is an updated version of #554, since it hasn't been updated in two
weeks.
2019-03-03 09:31:47 -06:00
Papa Cancer
cfd50eb65a Grassy Terrain + minor fixes
Includes strings for all
Fixes:
・Psychic Terrain blocks priority if the TARGET is grounded, not the user
・Psychic Terrain no longer targets an opponent
・Terrains no longer boost (or nerf, for Misty) the power of certain moves if the affect mon is semi-invulnerable
・Small fix: Meteor Mash corrected to being a physical attack
2019-03-02 22:52:43 +00:00
DizzyEggg
bf70861798 Powder moves on grass types 2019-03-02 13:08:50 +01:00
DizzyEggg
eea162d3d8 Effect Spore ability pop-up 2019-03-01 13:59:08 +01:00
DizzyEggg
fa81559793 Fix Sturdy's pop-up 2019-03-01 13:53:06 +01:00
Papa Cancer
d704b9cd5b Gravity fix
Brings down Pokémon in the middle of a two-turn flying move (only Bounce and Fly at the moment); says the appropriate message for all mons brought to the ground via Gravity
2019-02-24 13:28:24 +00:00
DizzyEggg
c1f9032989 Defiant and Competitive 2019-02-16 12:54:11 +01:00
DizzyEggg
94cd547e9a Change move effect to u16 2019-02-14 13:17:27 +01:00
DizzyEggg
dc39f76a95 Spectral Thief effect 2019-02-14 12:15:53 +01:00
DizzyEggg
4c535a1b03
Merge pull request #71 from thechurchofcage/partingshot
Parting Shot
2019-02-10 18:18:49 +01:00