Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dynamax #2417

Merged
merged 104 commits into from
Oct 19, 2023
Merged

Dynamax #2417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
104 commits
Select commit Hold shift + click to select a range
7981887
merge kyogre, groudon, rayquaza battle types
AgustinGDLV May 25, 2022
056048d
added data for max moves
AgustinGDLV Oct 27, 2022
caaec99
added data and graphics for gigantamax mons
AgustinGDLV Oct 27, 2022
2139e13
removed duplicate sprites and changed folder format for gmax
AgustinGDLV Oct 28, 2022
0663510
merged regi battle type into BATTLE_TYPE_LEGENDARY
AgustinGDLV Oct 28, 2022
ae7cbc2
merged physical and special max moves
AgustinGDLV Oct 28, 2022
87a9150
added base functionality for max moves
AgustinGDLV Feb 22, 2023
d69de9f
added longer 'used move' messages for max moves
AgustinGDLV Feb 22, 2023
07fd952
implemented max move functionality for dynamic type moves
AgustinGDLV Feb 22, 2023
38f4625
pulled rhh master, i hate merge conflicts
AgustinGDLV Feb 23, 2023
b4ec273
Merge branch 'upcoming' into dynamax
AgustinGDLV Feb 25, 2023
503aad9
fixed tests
AgustinGDLV Feb 25, 2023
4d19659
implemented G-Max Stonesurge, G-Max Steelsurge
AgustinGDLV Feb 27, 2023
a36c35a
implemented G-Max Vine Lash, G-Max Wildfire, G-Max Cannonade, G-Max V…
AgustinGDLV Feb 27, 2023
e32936d
implemented G-Max Foam Burst, G-Max Tartness
AgustinGDLV Feb 27, 2023
c6c92da
implemented G-Max Wind Rage
AgustinGDLV Feb 27, 2023
92c8503
reorganized max move functionality to remove redundant move effects
AgustinGDLV Feb 27, 2023
05fe62c
implemented G-Max Drum Solo, G-Max Hydrosnipe, G-Max Fireball
AgustinGDLV Feb 27, 2023
93d8efd
implemented G-Max Resonance
AgustinGDLV Feb 27, 2023
9ef7717
max move effects don't apply if the move didn't land
AgustinGDLV Feb 27, 2023
ad54b0d
changed max move power calc from table to formula
AgustinGDLV Feb 27, 2023
6890690
bringing back gMaxMovePowers to temp. fix exceptions
AgustinGDLV Feb 27, 2023
0908129
implemented G-Max Gravitas, G-Max Snooze, G-Max Depletion; Spite work…
AgustinGDLV Feb 28, 2023
da24b71
implemented all status1 and status2 G-Max Moves: Befuddle, Volt Crash…
AgustinGDLV Feb 28, 2023
3cdcf2a
implemented G-Max Chi Strike, finished G-Max Gold Rush
AgustinGDLV Feb 28, 2023
7c853ef
implemented G-Max Sweetness, Overgrowth, One Blow, Rapid Flow, and Fi…
AgustinGDLV Mar 1, 2023
e937482
fixed potential G-Max Chi Strike, Court Change bugs
AgustinGDLV Mar 7, 2023
7de7599
reworked scripts to remove jumpifnotally / jumpiftargetabsent
AgustinGDLV Mar 7, 2023
ac649a4
added Gigantamax check + move display and tint when dynamaxed
AgustinGDLV Mar 8, 2023
6083a22
fixed doubles target bug
AgustinGDLV Mar 8, 2023
76073fa
added basic Dynamax-in-battle
AgustinGDLV Mar 10, 2023
06bf934
Dynamaxed pokemon now have increased HP
AgustinGDLV Mar 11, 2023
ec4b330
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-…
AgustinGDLV Mar 11, 2023
06151cf
Max Guard actually protects / Max Moves bypass protect
AgustinGDLV Mar 11, 2023
317b52f
added Dynamax trigger sprite
AgustinGDLV Mar 11, 2023
4293dc8
not entirely confident implementation of Dynamax indicator
AgustinGDLV Mar 11, 2023
28ffffa
fixed typo with HP multiplier
AgustinGDLV Mar 11, 2023
b708da3
Merge branch 'RHH/pr/feature/formBattleChange' of https://github.com/…
AgustinGDLV Mar 11, 2023
89e7782
dynamax indicator shares palette with alpha/omega
AgustinGDLV Mar 11, 2023
c823e19
implemented Gigantamax form change
AgustinGDLV Mar 11, 2023
f679c41
fixed redundancy in g-max form change
AgustinGDLV Mar 11, 2023
d0dc564
actually fixed it
AgustinGDLV Mar 11, 2023
ca75fcb
added some 'test' tests
AgustinGDLV Mar 12, 2023
4c28b63
added first set of Dynamax tests
AgustinGDLV Mar 14, 2023
7d70222
added most Dynamax immunities/interactions + tests + fixed some move …
AgustinGDLV Mar 20, 2023
5a9e1de
Merge branch 'RHH/pr/feature/formBattleChange' of https://github.com/…
AgustinGDLV Mar 21, 2023
4ceb61b
updated Gigantamax form changing + tests
AgustinGDLV Mar 21, 2023
69fd63a
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-…
AgustinGDLV Mar 21, 2023
7886423
added HP-based damage/healing interactions with Dynamax Pokemon
AgustinGDLV Mar 21, 2023
6233627
more tests + fixed hp reversion issues
AgustinGDLV Mar 23, 2023
a3c8b97
added tests for status1/status2 effects + bug fixes for them
AgustinGDLV Mar 23, 2023
019b39c
Disable, Heal Block, Torment, and Imprison don't prevent move selection
AgustinGDLV Mar 23, 2023
0386495
finished G-Max Move tests
AgustinGDLV Mar 23, 2023
40102fe
added check for AI to use Dynamax on last pokemon
AgustinGDLV Mar 24, 2023
6dc3c7a
level reappears in healthbox and form reversion occurs correctly when…
AgustinGDLV Mar 24, 2023
2b86044
goodbye gMaxMovePowers table
AgustinGDLV Mar 24, 2023
7988c53
compile fix + placeholder animations (Wyrmwind broken?)
AgustinGDLV Mar 24, 2023
bbff30d
Tabs to spaces
AsparagusEduardo Mar 25, 2023
4e2e3b5
Refactored Max Move power to be based on effect
AsparagusEduardo Mar 25, 2023
2bcfaf8
CanDynamax rewrite, level-up + misc. bug fixes
AgustinGDLV Mar 25, 2023
cf6f9de
Merge remote-tracking branch 'AgustinGDLV/dynamax' into RHH/pr/test/d…
AsparagusEduardo Mar 25, 2023
5d508f7
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-…
AgustinGDLV Mar 25, 2023
886bee2
fixed double HP multiplier application + slapped KNOWN_FAILING on RNG…
AgustinGDLV Mar 25, 2023
9f306c6
fixed Dynamax bypassing selection prevention
AgustinGDLV Mar 25, 2023
1acddfa
Max Moves cannot target allies
AgustinGDLV Mar 25, 2023
60720c0
Dynamaxed Pokemon do not get an -ate boost, TODO: write tests
AgustinGDLV Mar 25, 2023
e3f29fa
Merge branch 'dynamax' into RHH/pr/test/dynoTweaks
AgustinGDLV Mar 25, 2023
0e79697
Merge pull request #1 from AsparagusEduardo/RHH/pr/test/dynoTweaks
AgustinGDLV Mar 25, 2023
7d4a666
current HP increases on level up
AgustinGDLV Mar 25, 2023
f633d16
gave Max Wyrmwind a placeholder anim
AgustinGDLV Mar 25, 2023
a383fab
added cries for Gigantamax forms
AgustinGDLV Mar 25, 2023
fff0f78
fixed Gigantamax and level bugs + lots of clean-up and debug removal
AgustinGDLV Mar 25, 2023
e1c819a
opponents properly revert Gigantamax + understand Max Guard
AgustinGDLV Mar 26, 2023
aac4ef4
fixed terrain effects
AgustinGDLV Mar 26, 2023
aa80e3f
fixed G-Max Wildfire, Max Guard interactions, and reworked changedSpe…
AgustinGDLV Mar 27, 2023
8a963ca
changed Dynamax animation
AgustinGDLV Mar 27, 2023
504ec36
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-…
AgustinGDLV Mar 27, 2023
131e455
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-…
AgustinGDLV Apr 4, 2023
bd4d164
removed .yml file
AgustinGDLV Apr 4, 2023
aec51b5
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-…
AgustinGDLV May 12, 2023
3b6389e
updated tests
AgustinGDLV May 12, 2023
dceefac
moved tryfaintmon back, no bugs?
AgustinGDLV May 12, 2023
e47eca1
mid converting script commands to callnative
AgustinGDLV May 14, 2023
d133564
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-…
AgustinGDLV May 17, 2023
34abc44
fixed RandomElement
AgustinGDLV May 17, 2023
3d4789c
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-…
AgustinGDLV May 28, 2023
f91cbe9
updated anim macros
AgustinGDLV May 29, 2023
9230139
Merge branch 'RHH/upcoming' into RHH/pr/upcoming/dynamax
AsparagusEduardo Oct 9, 2023
0a84072
Fixed 2 protection tests
AsparagusEduardo Oct 9, 2023
ed2d28b
Fixed erroneous species and item checks for Dynamax
AsparagusEduardo Oct 10, 2023
8f4c1e9
Frostbite NonDynamaxMaxHP to mimic Burn
AsparagusEduardo Oct 10, 2023
070ce21
Fixed Max Overgrowth test
AsparagusEduardo Oct 10, 2023
644fba2
Gigantamax Flag
AsparagusEduardo Oct 10, 2023
92a0b04
Applied trigger fix from upstream
AsparagusEduardo Oct 10, 2023
f830b07
GMAX -> GIGANTAMAX
AsparagusEduardo Oct 10, 2023
4d4d566
Undid flag
AsparagusEduardo Oct 10, 2023
1acc0ba
Style fixes
AsparagusEduardo Oct 10, 2023
c61d187
Removed hard-coded order for sGMaxMoveTable + failsafe for sMaxMoveTable
AsparagusEduardo Oct 10, 2023
3cb29f8
gBattleCommunication ids
AsparagusEduardo Oct 10, 2023
c0540a3
Merge branch 'RHH/upcoming' into RHH/pr/upcoming/dynamax
AsparagusEduardo Oct 15, 2023
6e1d4b4
Fixed compile on modern + tests
AsparagusEduardo Oct 15, 2023
ca101e9
Updated AI to use non-dynamax HP (Leech Seed, Nightmare, Trap Damage,…
AsparagusEduardo Oct 15, 2023
8b83528
Merge pull request #3 from AsparagusEduardo/RHH/pr/upcoming/dynamax
AgustinGDLV Oct 18, 2023
d153947
Merge branch 'upcoming' into dynamax
AsparagusEduardo Oct 18, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 43 additions & 0 deletions asm/macros/battle_script.inc
Original file line number Diff line number Diff line change
Expand Up @@ -1456,6 +1456,49 @@
.4byte \jumpInstr
.endm

@ Used to active a different Max Move effects.
.macro setmaxmoveeffect
callnative BS_SetMaxMoveEffect
.endm

.macro setsteelsurge, failInstr:req
callnative BS_SetSteelsurge
.4byte \failInstr
.endm

.macro damagenontypes
callnative BS_DamageNonTypes
.endm

.macro trysetstatus1, ptr:req
callnative BS_TrySetStatus1
.4byte \ptr
.endm

.macro trysetstatus2, ptr:req
callnative BS_TrySetStatus2
.4byte \ptr
.endm

.macro tryhealsixthhealth, ptr:req
callnative BS_HealOneSixth
.4byte \ptr
.endm

.macro tryrecycleberry, ptr:req
callnative BS_TryRecycleBerry
.4byte \ptr
.endm

.macro updatedynamax
callnative BS_UpdateDynamax
.endm

.macro jumpiftargetdynamaxed, ptr:req
callnative BS_JumpIfDynamaxed
.4byte \ptr
.endm

@ various command changed to more readable macros
.macro cancelmultiturnmoves battler:req
various \battler, VARIOUS_CANCEL_MULTI_TURN_MOVES
Expand Down
237 changes: 236 additions & 1 deletion data/battle_anim_scripts.s
Original file line number Diff line number Diff line change
Expand Up @@ -780,7 +780,7 @@ gBattleAnims_Moves::
.4byte Move_GLACIAL_LANCE
.4byte Move_ASTRAL_BARRAGE
.4byte Move_EERIE_SPELL
@@@@LA MOVES
@@@@ LA MOVES
.4byte Move_DIRE_CLAW
.4byte Move_PSYSHIELD_BASH
.4byte Move_POWER_SHIFT
Expand Down Expand Up @@ -896,6 +896,60 @@ gBattleAnims_Moves::
.4byte Move_MENACING_MOONRAZE_MAELSTROM
.4byte Move_LIGHT_THAT_BURNS_THE_SKY
.4byte Move_SOUL_STEALING_7_STAR_STRIKE
@@@@ MAX MOVES
.4byte Move_MAX_GUARD
.4byte Move_MAX_STRIKE
.4byte Move_MAX_KNUCKLE
.4byte Move_MAX_AIRSTREAM
.4byte Move_MAX_OOZE
.4byte Move_MAX_QUAKE
.4byte Move_MAX_ROCKFALL
.4byte Move_MAX_FLUTTERBY
.4byte Move_MAX_PHANTASM
.4byte Move_MAX_STEELSPIKE
.4byte Move_MAX_FLARE
.4byte Move_MAX_GEYSER
.4byte Move_MAX_OVERGROWTH
.4byte Move_MAX_LIGHTNING
.4byte Move_MAX_MINDSTORM
.4byte Move_MAX_HAILSTORM
.4byte Move_MAX_WYRMWIND
.4byte Move_MAX_DARKNESS
.4byte Move_MAX_STARFALL
@@@@ G-MAX MOVES
.4byte Move_G_MAX_VINE_LASH
.4byte Move_G_MAX_WILDFIRE
.4byte Move_G_MAX_CANNONADE
.4byte Move_G_MAX_BEFUDDLE
.4byte Move_G_MAX_VOLT_CRASH
.4byte Move_G_MAX_GOLD_RUSH
.4byte Move_G_MAX_CHI_STRIKE
.4byte Move_G_MAX_TERROR
.4byte Move_G_MAX_FOAM_BURST
.4byte Move_G_MAX_RESONANCE
.4byte Move_G_MAX_CUDDLE
.4byte Move_G_MAX_REPLENISH
.4byte Move_G_MAX_MALODOR
.4byte Move_G_MAX_MELTDOWN
.4byte Move_G_MAX_DRUM_SOLO
.4byte Move_G_MAX_FIREBALL
.4byte Move_G_MAX_HYDROSNIPE
.4byte Move_G_MAX_WIND_RAGE
.4byte Move_G_MAX_GRAVITAS
.4byte Move_G_MAX_STONESURGE
.4byte Move_G_MAX_VOLCALITH
.4byte Move_G_MAX_TARTNESS
.4byte Move_G_MAX_SWEETNESS
.4byte Move_G_MAX_SANDBLAST
.4byte Move_G_MAX_STUN_SHOCK
.4byte Move_G_MAX_CENTIFERNO
.4byte Move_G_MAX_SMITE
.4byte Move_G_MAX_SNOOZE
.4byte Move_G_MAX_FINALE
.4byte Move_G_MAX_STEELSURGE
.4byte Move_G_MAX_DEPLETION
.4byte Move_G_MAX_ONE_BLOW
.4byte Move_G_MAX_RAPID_FLOW
@@@ Last Move - cannot be reached
.4byte Move_COUNT

Expand Down Expand Up @@ -953,6 +1007,8 @@ gBattleAnims_General::
.4byte General_Snow @ B_ANIM_SNOW_CONTINUES
.4byte General_UltraBurst @ B_ANIM_ULTRA_BURST
.4byte General_SaltCureDamage @ B_ANIM_SALT_CURE_DAMAGE
.4byte General_DynamaxGrowth @ B_ANIM_DYNAMAX_GROWTH
.4byte General_SetWeather @ B_ANIM_MAX_SET_WEATHER

.align 2
gBattleAnims_Special::
Expand Down Expand Up @@ -32868,3 +32924,182 @@ SoulStealingSevenStarStrikeExplosion:
createsprite gSoulStealExplosionSpriteTemplate, ANIM_TARGET, 3, 0x10, 0x10, ANIM_TARGET, 0x1
delay 0x6
return

@@@@@@@@@@ MAX MOVES @@@@@@@@@@
General_SetWeather::
createvisualtask AnimTask_GetWeatherToSet, 2
jumpreteq 1, General_Sun
jumpreteq 2, General_Rain
jumpreteq 3, General_Sandstorm
jumpreteq 4, General_Hail
end

Move_MAX_GUARD:
createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x1
waitforvisualfinish
goto Move_PROTECT
end

Move_MAX_STRIKE:
Move_G_MAX_REPLENISH:
createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x1
waitforvisualfinish
goto Move_GIGA_IMPACT
end

Move_MAX_AIRSTREAM:
Move_G_MAX_WIND_RAGE:
createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x1
waitforvisualfinish
goto Move_AEROBLAST
end

Move_MAX_OOZE:
Move_G_MAX_MALODOR:
createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x1
waitforvisualfinish
goto Move_GUNK_SHOT
end

Move_G_MAX_WILDFIRE:
Move_G_MAX_FIREBALL:
Move_G_MAX_CENTIFERNO:
Move_MAX_FLARE:
createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x1
waitforvisualfinish
goto Move_BLAST_BURN
end

Move_G_MAX_CANNONADE:
Move_G_MAX_HYDROSNIPE:
Move_G_MAX_FOAM_BURST:
Move_MAX_GEYSER:
createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x1
waitforvisualfinish
goto Move_HYDRO_CANNON
end

Move_G_MAX_VINE_LASH:
Move_G_MAX_DRUM_SOLO:
Move_G_MAX_TARTNESS:
Move_G_MAX_SWEETNESS:
Move_MAX_OVERGROWTH:
createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x1
waitforvisualfinish
goto Move_FRENZY_PLANT
end

Move_MAX_LIGHTNING:
Move_G_MAX_STUN_SHOCK:
createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x1
waitforvisualfinish
goto Move_ZAP_CANNON
end

Move_G_MAX_CHI_STRIKE:
Move_G_MAX_ONE_BLOW:
Move_G_MAX_RAPID_FLOW:
Move_MAX_KNUCKLE:
createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x1
waitforvisualfinish
goto Move_CLOSE_COMBAT
end

Move_G_MAX_RESONANCE:
Move_MAX_HAILSTORM:
createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x1
waitforvisualfinish
goto Move_SHEER_COLD
end

Move_G_MAX_SANDBLAST:
Move_MAX_QUAKE:
createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x1
waitforvisualfinish
goto Move_FISSURE
end

Move_G_MAX_BEFUDDLE:
Move_MAX_FLUTTERBY:
createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x1
waitforvisualfinish
goto Move_BUG_BUZZ
end

Move_G_MAX_STEELSURGE:
Move_G_MAX_MELTDOWN:
Move_MAX_STEELSPIKE:
createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x1
waitforvisualfinish
goto Move_HEAVY_SLAM
end

Move_G_MAX_TERROR:
Move_MAX_PHANTASM:
createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x1
waitforvisualfinish
goto Move_PHANTOM_FORCE
end

Move_G_MAX_GRAVITAS:
Move_MAX_MINDSTORM:
createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x1
waitforvisualfinish
goto Move_PSYCHO_BOOST
end

Move_G_MAX_SMITE:
Move_G_MAX_FINALE:
Move_MAX_STARFALL:
createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x1
waitforvisualfinish
goto Move_MOONBLAST
end

Move_G_MAX_STONESURGE:
Move_G_MAX_VOLCALITH:
Move_MAX_ROCKFALL:
createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x1
waitforvisualfinish
goto Move_ROCK_WRECKER
end

Move_G_MAX_DEPLETION:
Move_MAX_WYRMWIND:
createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x1
waitforvisualfinish
goto Move_SPACIAL_REND
end

Move_G_MAX_SNOOZE:
Move_MAX_DARKNESS:
createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x1
waitforvisualfinish
goto Move_DARK_PULSE
end

Move_G_MAX_CUDDLE:
createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x1
waitforvisualfinish
goto Move_COVET
end

Move_G_MAX_VOLT_CRASH:
createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x1
waitforvisualfinish
goto Move_VOLT_TACKLE
end

Move_G_MAX_GOLD_RUSH:
createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x1
waitforvisualfinish
goto Move_PAY_DAY
end

@@@ DYNAMAX AND MAX RAIDS
General_DynamaxGrowth:: @ PORTED FROM CFRU
createvisualtask SoundTask_PlayCryWithEcho, 2, ANIM_ATTACKER, 2
delay 8
createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x0
waitforvisualfinish
end
Loading
Loading