Merge branch 'RHH/upcoming' into RHH/pr/upcoming/gen9-species-nomigration

# Conflicts:
#	include/constants/species.h
#	sound/cry_tables.inc
#	src/data/pokemon_graphics/enemy_mon_elevation.h
#	src/data/pokemon_graphics/front_pic_anims.h
This commit is contained in:
Eduardo Quezada 2023-10-23 09:23:32 -03:00
commit f570d14f2d
317 changed files with 14482 additions and 5147 deletions

View File

@ -345,6 +345,7 @@ $(C_BUILDDIR)/librfu_intr.o: CC1 := tools/agbcc/bin/agbcc_arm$(EXE)
$(C_BUILDDIR)/librfu_intr.o: CFLAGS := -O2 -mthumb-interwork -quiet
else
$(C_BUILDDIR)/librfu_intr.o: CFLAGS := -mthumb-interwork -O2 -mabi=apcs-gnu -mtune=arm7tdmi -march=armv4t -fno-toplevel-reorder -Wno-pointer-to-int-cast
$(C_BUILDDIR)/pokedex_plus_hgss.o: CFLAGS := -mthumb -mthumb-interwork -O2 -mabi=apcs-gnu -mtune=arm7tdmi -march=armv4t -Wno-pointer-to-int-cast -std=gnu17 -Werror -Wall -Wno-strict-aliasing -Wno-attribute-alias
endif
ifeq ($(DINFO),1)

View File

@ -108,11 +108,17 @@ The pokeemerald Expansion is a feature branch meant to be integrated into existi
- Feature branches incorporated:
- [RHH intro credits](https://github.com/Xhyzi/pokeemerald/tree/rhh-intro-credits) by Xhyzi.
- A small signature from all of us to show the collective effort in the project :)
- [Overworld debug]() by TheXaman
- [Overworld debug](https://github.com/TheXaman/pokeemerald/tree/tx_debug_system) by TheXaman
- May be disabled.
- Accesible by pressing `R + Start` in the overworld by default.
- **Additional features**:
- *Clear Boxes*: cleans every Pokémon from the Boxes.
- *Hatch an Egg*: lets you choose an Egg in your party and immediatly hatch it.
- [HGSS Pokédex](https://github.com/TheXaman/pokeemerald/tree/tx_pokedexPlus_hgss) by TheXaman
- May be disabled.
- **Additional features**:
- *Support for new evolution methods*.
- *Dark Mode*.
- Other features
- Pressing B while holding a Pokémon drops them like in modern games (configurable).
- Running indoors (configurable).

View File

@ -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
@ -2340,3 +2383,8 @@
getbattlerfainted \battler
jumpifbyte CMP_EQUAL, gBattleCommunication, \value, \ptr
.endm
.macro flushtextbox
printstring STRINGID_EMPTYSTRING3
waitmessage 1
.endm

View File

@ -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
@ -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
@ -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::
@ -15105,16 +15161,21 @@ Move_SILK_TRAP::
clearmonbg ANIM_ATK_PARTNER
end
@ Also used by Snow weather. Currently identical with Move_HAIL
@ Also used by Snow weather. Credits to Dat.H A
Move_SNOWSCAPE::
loadspritegfx ANIM_TAG_HAIL
loadspritegfx ANIM_TAG_ICE_CRYSTALS
createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 3, 0, 6, RGB_BLACK
loadspritegfx ANIM_TAG_SNOWFLAKES
playsewithpan SE_M_GUST, SOUND_PAN_ATTACKER
createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_BATTLERS), 2, 0, 4, RGB(11, 18, 22)
waitforvisualfinish
createvisualtask AnimTask_Hail, 5
loopsewithpan SE_M_HAIL, 0, 8, 10
createvisualtask AnimTask_CreateSnowflakes, 2, 0, 3, 120
createvisualtask AnimTask_CreateSnowflakes, 2, 0, 3, 120
createvisualtask AnimTask_CreateSnowflakes, 2, 0, 3, 120
delay 120
playsewithpan SE_M_GUST2, SOUND_PAN_ATTACKER
delay 30
waitforvisualfinish
createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_BATTLERS), 2, 4, 0, RGB(11, 18, 22)
waitforvisualfinish
createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 3, 6, 0, RGB_BLACK
end
@Credits to Skeli
@ -32868,3 +32929,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

View File

@ -435,12 +435,11 @@ gBattleScriptsForMoveEffects::
.4byte BattleScript_EffectCorrosiveGas @ EFFECT_CORROSIVE_GAS
.4byte BattleScript_EffectHit @ EFFECT_POPULATION_BOMB
.4byte BattleScript_EffectMortalSpin @ EFFECT_MORTAL_SPIN
.4byte BattleScript_EffectHit @ EFFECT_GIGATON_HAMMER
.4byte BattleScript_EffectSaltCure @ EFFECT_SALT_CURE
.4byte BattleScript_EffectMatchaGotcha @ EFFECT_MATCHA_GOTCHA
.4byte BattleScript_EffectSyrupBomb @ EFFECT_SYRUP_BOMB
.4byte BattleScript_EffectHit @ EFFECT_IVY_CUDGEL
.4byte BattleScript_EffectMaxMove @ EFFECT_MAX_MOVE
BattleScript_EffectSyrupBomb::
setmoveeffect MOVE_EFFECT_SYRUP_BOMB
@ -538,6 +537,8 @@ BattleScript_CorrosiveGasFail:
goto BattleScript_MoveEnd
BattleScript_EffectMakeItRain:
jumpifbattletype BATTLE_TYPE_DOUBLE, BattleScript_MakeItRainDoubles
BattleScript_MakeItRainContinuous:
setmoveeffect MOVE_EFFECT_PAYDAY
call BattleScript_EffectHit_Ret
seteffectwithchance
@ -545,6 +546,9 @@ BattleScript_EffectMakeItRain:
setmoveeffect MOVE_EFFECT_SP_ATK_MINUS_1 | MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN
seteffectprimary
goto BattleScript_MoveEnd
BattleScript_MakeItRainDoubles:
jumpifword CMP_NO_COMMON_BITS, gHitMarker, HITMARKER_NO_ATTACKSTRING | HITMARKER_NO_PPDEDUCT, BattleScript_NoMoveEffect
goto BattleScript_MakeItRainContinuous
BattleScript_EffectSpinOut::
setmoveeffect MOVE_EFFECT_SPD_MINUS_2 | MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN
@ -758,8 +762,7 @@ BattleScript_AffectionBasedStatusHeal_Continue:
end2
BattleScript_ShellTrapSetUp::
printstring STRINGID_EMPTYSTRING3
waitmessage 0x1
flushtextbox
playanimation BS_ATTACKER, B_ANIM_SHELL_TRAP_SETUP, NULL
printstring STRINGID_PREPARESHELLTRAP
waitmessage B_WAIT_TIME_LONG
@ -832,8 +835,7 @@ BattleScript_EffectCourtChange::
BattleScript_BeakBlastSetUp::
setbeakblast BS_ATTACKER
printstring STRINGID_EMPTYSTRING3
waitmessage 1
flushtextbox
playanimation BS_ATTACKER, B_ANIM_BEAK_BLAST_SETUP, NULL
printstring STRINGID_HEATUPBEAK
waitmessage B_WAIT_TIME_LONG
@ -857,7 +859,7 @@ BattleScript_EffectMeteorBeam::
BattleScript_FirstChargingTurnMeteorBeam::
attackcanceler
printstring STRINGID_EMPTYSTRING3
flushtextbox
ppreduce
attackanimation
waitanimation
@ -1048,7 +1050,7 @@ BattleScript_EffectPhotonGeyser:
goto BattleScript_MoveEnd
BattleScript_EffectAuraWheel: @ Aura Wheel can only be used by Morpeko
jumpifspecies BS_ATTACKER, SPECIES_MORPEKO, BattleScript_EffectSpeedUpHit
jumpifspecies BS_ATTACKER, SPECIES_MORPEKO_FULL_BELLY, BattleScript_EffectSpeedUpHit
jumpifspecies BS_ATTACKER, SPECIES_MORPEKO_HANGRY, BattleScript_EffectSpeedUpHit
goto BattleScript_PokemonCantUseTheMove
@ -1161,7 +1163,7 @@ BattleScript_BothCanNoLongerEscape::
BattleScript_EffectHyperspaceFury:
jumpifspecies BS_ATTACKER, SPECIES_HOOPA_UNBOUND, BattleScript_EffectHyperspaceFuryUnbound
jumpifspecies BS_ATTACKER, SPECIES_HOOPA, BattleScript_ButHoopaCantUseIt
jumpifspecies BS_ATTACKER, SPECIES_HOOPA_CONFINED, BattleScript_ButHoopaCantUseIt
goto BattleScript_PokemonCantUseTheMove
BattleScript_EffectHyperspaceFuryUnbound::
@ -1537,8 +1539,7 @@ BattleScript_MoveEffectCoreEnforcer::
waitmessage B_WAIT_TIME_LONG
trytoclearprimalweather
tryrevertweatherform
printstring STRINGID_EMPTYSTRING3
waitmessage 1
flushtextbox
BattleScript_CoreEnforcerRet:
return
@ -1632,8 +1633,7 @@ BattleScript_EffectPartingShotSwitch:
switchindataupdate BS_ATTACKER
hpthresholds BS_ATTACKER
trytoclearprimalweather
printstring STRINGID_EMPTYSTRING3
waitmessage 1
flushtextbox
printstring STRINGID_SWITCHINMON
switchinanim BS_ATTACKER, TRUE
waitstate
@ -1988,8 +1988,7 @@ BattleScript_SynchronoiseLoop:
waitmessage B_WAIT_TIME_LONG
resultmessage
waitmessage B_WAIT_TIME_LONG
printstring STRINGID_EMPTYSTRING3
waitmessage 1
flushtextbox
tryfaintmon BS_TARGET
BattleScript_SynchronoiseMoveTargetEnd:
moveendto MOVEEND_NEXT_TARGET
@ -2138,10 +2137,14 @@ BattleScript_EffectHitSwitchTarget:
moveendall
jumpifability BS_TARGET, ABILITY_SUCTION_CUPS, BattleScript_AbilityPreventsPhasingOut
jumpifstatus3 BS_TARGET, STATUS3_ROOTED, BattleScript_PrintMonIsRooted
jumpiftargetdynamaxed BattleScript_HitSwitchTargetDynamaxed
tryhitswitchtarget BattleScript_MoveEnd
forcerandomswitch BattleScript_HitSwitchTargetForceRandomSwitchFailed
goto BattleScript_MoveEnd
BattleScript_HitSwitchTargetDynamaxed:
printstring STRINGID_MOVEBLOCKEDBYDYNAMAX
waitmessage B_WAIT_TIME_LONG
BattleScript_HitSwitchTargetForceRandomSwitchFailed:
hitswitchtargetfailed
setbyte sSWITCH_CASE, B_SWITCH_NORMAL
@ -2669,8 +2672,7 @@ BattleScript_EffectSimpleBeam:
waitmessage B_WAIT_TIME_LONG
trytoclearprimalweather
tryrevertweatherform
printstring STRINGID_EMPTYSTRING3
waitmessage 1
flushtextbox
tryendneutralizinggas BS_TARGET
goto BattleScript_MoveEnd
@ -2723,8 +2725,7 @@ BattleScript_EffectHealingWish:
switchindataupdate BS_ATTACKER
hpthresholds BS_ATTACKER
trytoclearprimalweather
printstring STRINGID_EMPTYSTRING3
waitmessage 1
flushtextbox
printstring STRINGID_SWITCHINMON
switchinanim BS_ATTACKER, TRUE
waitstate
@ -2769,8 +2770,7 @@ BattleScript_EffectWorrySeed:
waitmessage B_WAIT_TIME_LONG
trytoclearprimalweather
tryrevertweatherform
printstring STRINGID_EMPTYSTRING3
waitmessage 1
flushtextbox
goto BattleScript_MoveEnd
BattleScript_EffectPowerSplit:
@ -2901,8 +2901,7 @@ BattleScript_EffectGastroAcid:
waitmessage B_WAIT_TIME_LONG
trytoclearprimalweather
tryrevertweatherform
printstring STRINGID_EMPTYSTRING3
waitmessage 1
flushtextbox
tryendneutralizinggas BS_TARGET
goto BattleScript_MoveEnd
@ -3037,6 +3036,7 @@ BattleScript_EffectGravity:
setgravity BattleScript_ButItFailed
attackanimation
waitanimation
BattleScript_EffectGravitySuccess::
printstring STRINGID_GRAVITYINTENSIFIED
waitmessage B_WAIT_TIME_LONG
selectfirstvalidtarget
@ -3111,8 +3111,7 @@ BattleScript_EffectHitEscape:
switchindataupdate BS_ATTACKER
hpthresholds BS_ATTACKER
trytoclearprimalweather
printstring STRINGID_EMPTYSTRING3
waitmessage 1
flushtextbox
printstring STRINGID_SWITCHINMON
switchinanim BS_ATTACKER, TRUE
waitstate
@ -3727,11 +3726,17 @@ BattleScript_EffectRoar::
jumpifability BS_TARGET, ABILITY_GUARD_DOG, BattleScript_ButItFailed
jumpifability BS_TARGET, ABILITY_SUCTION_CUPS, BattleScript_AbilityPreventsPhasingOut
jumpifstatus3 BS_TARGET, STATUS3_ROOTED, BattleScript_PrintMonIsRooted
jumpiftargetdynamaxed BattleScript_RoarBlockedByDynamax
accuracycheck BattleScript_ButItFailed, NO_ACC_CALC_CHECK_LOCK_ON
accuracycheck BattleScript_MoveMissedPause, ACC_CURR_MOVE
jumpifbattletype BATTLE_TYPE_ARENA, BattleScript_ButItFailed
forcerandomswitch BattleScript_ButItFailed
BattleScript_RoarBlockedByDynamax:
printstring STRINGID_MOVEBLOCKEDBYDYNAMAX
waitmessage B_WAIT_TIME_LONG
goto BattleScript_MoveEnd
BattleScript_EffectMultiHit::
attackcanceler
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
@ -3762,8 +3767,7 @@ BattleScript_DoMultiHit::
critmessage
waitmessage B_WAIT_TIME_LONG
multihitresultmessage
printstring STRINGID_EMPTYSTRING3
waitmessage 1
flushtextbox
addbyte sMULTIHIT_STRING + 4, 1
moveendto MOVEEND_NEXT_TARGET
jumpifbyte CMP_COMMON_BITS, gMoveResultFlags, MOVE_RESULT_FOE_ENDURED, BattleScript_MultiHitPrintStrings
@ -3954,7 +3958,7 @@ BattleScript_TwoTurnMovesSecondTurn::
BattleScriptFirstChargingTurn::
attackcanceler
printstring STRINGID_EMPTYSTRING3
flushtextbox
ppreduce
attackstring
BattleScriptFirstChargingTurnAfterAttackString:
@ -4129,8 +4133,7 @@ BattleScript_EffectTransform::
attackstring
ppreduce
trytoclearprimalweather
printstring STRINGID_EMPTYSTRING3
waitmessage 1
flushtextbox
transformdataexecution
attackanimation
waitanimation
@ -4174,6 +4177,7 @@ BattleScript_EffectReflect::
BattleScript_PrintReflectLightScreenSafeguardString::
attackanimation
waitanimation
BattleScript_EffectAuroraVeilSuccess::
printfromtable gReflectLightScreenSafeguardStringIds
waitmessage B_WAIT_TIME_LONG
goto BattleScript_MoveEnd
@ -5030,8 +5034,7 @@ BattleScript_EffectBatonPass::
switchindataupdate BS_ATTACKER
hpthresholds BS_ATTACKER
trytoclearprimalweather
printstring STRINGID_EMPTYSTRING3
waitmessage 1
flushtextbox
printstring STRINGID_SWITCHINMON
switchinanim BS_ATTACKER, TRUE
waitstate
@ -5926,6 +5929,7 @@ BattleScript_EffectYawn::
setyawn BattleScript_ButItFailed
attackanimation
waitanimation
BattleScript_EffectYawnSuccess::
printstring STRINGID_PKMNWASMADEDROWSY
waitmessage B_WAIT_TIME_LONG
goto BattleScript_MoveEnd
@ -6357,8 +6361,7 @@ BattleScript_FaintedMonTryChoose:
switchindataupdate BS_ATTACKER
hpthresholds BS_ATTACKER
trytoclearprimalweather
printstring STRINGID_EMPTYSTRING3
waitmessage 1
flushtextbox
printstring STRINGID_SWITCHINMON
hidepartystatussummary BS_ATTACKER
switchinanim BS_ATTACKER, 0
@ -6370,8 +6373,7 @@ BattleScript_FaintedMonSendOutNew:
switchindataupdate BS_FAINTED
hpthresholds BS_FAINTED
trytoclearprimalweather
printstring STRINGID_EMPTYSTRING3
waitmessage 1
flushtextbox
printstring STRINGID_SWITCHINMON
hidepartystatussummary BS_FAINTED
switchinanim BS_FAINTED, FALSE
@ -6405,8 +6407,7 @@ BattleScript_LinkHandleFaintedMonLoop::
switchindataupdate BS_FAINTED
hpthresholds BS_FAINTED
trytoclearprimalweather
printstring STRINGID_EMPTYSTRING3
waitmessage 1
flushtextbox
printstring STRINGID_SWITCHINMON
hidepartystatussummary BS_FAINTED
switchinanim BS_FAINTED, FALSE
@ -6620,6 +6621,7 @@ BattleScript_PursuitSwitchDmgLoop::
BattleScript_DoSwitchOut::
decrementmultihit BattleScript_PursuitSwitchDmgLoop
switchoutabilities BS_ATTACKER
updatedynamax
waitstate
returnatktoball
waitstate
@ -6629,8 +6631,7 @@ BattleScript_DoSwitchOut::
switchindataupdate BS_ATTACKER
hpthresholds BS_ATTACKER
trytoclearprimalweather
printstring STRINGID_EMPTYSTRING3
waitmessage 1
flushtextbox
printstring STRINGID_SWITCHINMON
hidepartystatussummary BS_ATTACKER
switchinanim BS_ATTACKER, FALSE
@ -6925,8 +6926,7 @@ BattleScript_RoarSuccessSwitch::
getswitchedmondata BS_TARGET
switchindataupdate BS_TARGET
trytoclearprimalweather
printstring STRINGID_EMPTYSTRING3
waitmessage 1
flushtextbox
switchinanim BS_TARGET, FALSE
waitstate
printstring STRINGID_PKMNWASDRAGGEDOUT
@ -7367,6 +7367,11 @@ BattleScript_StealthRockFree::
printstring STRINGID_PKMNBLEWAWAYSTEALTHROCK
waitmessage B_WAIT_TIME_LONG
return
BattleScript_SteelsurgeFree::
printstring STRINGID_PKMNBLEWAWAYSHARPSTEEL
waitmessage B_WAIT_TIME_LONG
return
BattleScript_SpikesDefog::
printstring STRINGID_SPIKESDISAPPEAREDFROMTEAM
@ -7388,6 +7393,11 @@ BattleScript_StealthRockDefog::
waitmessage B_WAIT_TIME_LONG
return
BattleScript_SteelsurgeDefog::
printstring STRINGID_SHARPSTEELDISAPPEAREDFROMTEAM
waitmessage B_WAIT_TIME_LONG
return
BattleScript_MonTookFutureAttack::
printstring STRINGID_PKMNTOOKATTACK
waitmessage B_WAIT_TIME_LONG
@ -7742,15 +7752,14 @@ BattleScript_MoveEffectClearSmog::
return
BattleScript_FocusPunchSetUp::
printstring STRINGID_EMPTYSTRING3
waitmessage 1
flushtextbox
playanimation BS_ATTACKER, B_ANIM_FOCUS_PUNCH_SETUP
printstring STRINGID_PKMNTIGHTENINGFOCUS
waitmessage B_WAIT_TIME_LONG
end3
BattleScript_MegaEvolution::
printstring STRINGID_EMPTYSTRING3
flushtextbox
trytrainerslidemegaevolutionmsg BS_ATTACKER
printstring STRINGID_MEGAEVOREACTING
BattleScript_MegaEvolutionAfterString:
@ -7766,7 +7775,7 @@ BattleScript_MegaEvolutionAfterString:
end3
BattleScript_WishMegaEvolution::
printstring STRINGID_EMPTYSTRING3
flushtextbox
trytrainerslidemegaevolutionmsg BS_ATTACKER
printstring STRINGID_FERVENTWISHREACHED
goto BattleScript_MegaEvolutionAfterString
@ -7781,8 +7790,7 @@ BattleScript_PrimalReversionRestoreAttacker::
end2
BattleScript_PrimalReversionRet::
printstring STRINGID_EMPTYSTRING3
waitmessage 1
flushtextbox
setbyte gIsCriticalHit, 0
handleprimalreversion BS_ATTACKER, 0
handleprimalreversion BS_ATTACKER, 1
@ -7795,7 +7803,7 @@ BattleScript_PrimalReversionRet::
return
BattleScript_UltraBurst::
printstring STRINGID_EMPTYSTRING3
flushtextbox
trytrainerslidezmovemsg BS_ATTACKER
printstring STRINGID_ULTRABURSTREACTING
waitmessage B_WAIT_TIME_LONG
@ -7813,8 +7821,7 @@ BattleScript_AttackerFormChange::
pause 5
copybyte gBattlerAbility, gBattlerAttacker
call BattleScript_AbilityPopUp
printstring STRINGID_EMPTYSTRING3
waitmessage 1
flushtextbox
BattleScript_AttackerFormChangeNoPopup::
handleformchange BS_ATTACKER, 0
handleformchange BS_ATTACKER, 1
@ -7861,8 +7868,7 @@ BattleScript_CudChewActivates::
end3
BattleScript_TargetFormChangeNoPopup:
printstring STRINGID_EMPTYSTRING3
waitmessage 1
flushtextbox
handleformchange BS_TARGET, 0
handleformchange BS_TARGET, 1
playanimation BS_TARGET, B_ANIM_FORM_CHANGE
@ -7893,8 +7899,7 @@ BattleScript_TargetFormChangeWithStringNoPopup::
BattleScript_BattlerFormChangeWithStringEnd3::
pause 5
call BattleScript_AbilityPopUp
printstring STRINGID_EMPTYSTRING3
waitmessage 1
flushtextbox
handleformchange BS_SCRIPTING, 0
handleformchange BS_SCRIPTING, 1
playanimation BS_SCRIPTING, B_ANIM_FORM_CHANGE, NULL
@ -9771,7 +9776,7 @@ BattleScript_ActionSelectionItemsCantBeUsed::
endselectionscript
BattleScript_FlushMessageBox::
printstring STRINGID_EMPTYSTRING3
flushtextbox
return
BattleScript_PalacePrintFlavorText::
@ -9958,8 +9963,7 @@ BattleScript_AnnounceAirLockCloudNine::
end3
BattleScript_QuickClawActivation::
printstring STRINGID_EMPTYSTRING3
waitmessage 1
flushtextbox
playanimation BS_ATTACKER, B_ANIM_HELD_ITEM_EFFECT
waitanimation
printstring STRINGID_CANACTFASTERTHANKSTO
@ -9967,16 +9971,14 @@ BattleScript_QuickClawActivation::
end2
BattleScript_QuickDrawActivation::
printstring STRINGID_EMPTYSTRING3
waitmessage 1
flushtextbox
call BattleScript_AbilityPopUp
printstring STRINGID_CANACTFASTERTHANKSTO
waitmessage B_WAIT_TIME_LONG
end2
BattleScript_CustapBerryActivation::
printstring STRINGID_EMPTYSTRING3
waitmessage 1
flushtextbox
playanimation BS_ATTACKER, B_ANIM_HELD_ITEM_EFFECT
waitanimation
printstring STRINGID_CANACTFASTERTHANKSTO
@ -10024,7 +10026,7 @@ BattleScript_JabocaRowapBerryActivate_Dmg:
@ z moves / effects
BattleScript_ZMoveActivateDamaging::
printstring STRINGID_EMPTYSTRING3
flushtextbox
trytrainerslidezmovemsg BS_ATTACKER
printstring STRINGID_ZPOWERSURROUNDS
playanimation BS_ATTACKER, B_ANIM_ZMOVE_ACTIVATE, NULL
@ -10033,7 +10035,7 @@ BattleScript_ZMoveActivateDamaging::
return
BattleScript_ZMoveActivateStatus::
printstring STRINGID_EMPTYSTRING3
flushtextbox
trytrainerslidezmovemsg BS_ATTACKER
savetarget
printstring STRINGID_ZPOWERSURROUNDS
@ -10202,6 +10204,7 @@ BattleScript_RedCardActivates::
swapattackerwithtarget
jumpifstatus3 BS_EFFECT_BATTLER, STATUS3_ROOTED, BattleScript_RedCardIngrain
jumpifability BS_EFFECT_BATTLER, ABILITY_SUCTION_CUPS, BattleScript_RedCardSuctionCups
jumpiftargetdynamaxed BattleScript_RedCardDynamaxed
removeitem BS_SCRIPTING
setbyte sSWITCH_CASE, B_SWITCH_RED_CARD
forcerandomswitch BattleScript_RedCardEnd
@ -10220,6 +10223,12 @@ BattleScript_RedCardSuctionCups:
removeitem BS_SCRIPTING
swapattackerwithtarget
return
BattleScript_RedCardDynamaxed:
printstring STRINGID_MOVEBLOCKEDBYDYNAMAX
waitmessage B_WAIT_TIME_LONG
removeitem BS_SCRIPTING
swapattackerwithtarget
return
BattleScript_EjectButtonActivates::
makevisible BS_ATTACKER
@ -10237,8 +10246,7 @@ BattleScript_EjectButtonActivates::
switchindataupdate BS_SCRIPTING
hpthresholds BS_SCRIPTING
trytoclearprimalweather
printstring STRINGID_EMPTYSTRING3
waitmessage 1
flushtextbox
printstring 0x3
switchinanim BS_SCRIPTING 0x1
waitstate
@ -10358,6 +10366,294 @@ BattleScript_TargetAbilityStatRaiseRet_End:
copybyte gBattlerAttacker, sSAVED_BATTLER
return
@@@ MAX MOVES @@@
BattleScript_EffectMaxMove::
attackcanceler
accuracycheck BattleScript_ButItFailed, NO_ACC_CALC_CHECK_LOCK_ON
attackstring
ppreduce
critcalc
damagecalc
adjustdamage
attackanimation
waitanimation
effectivenesssound
hitanimation BS_TARGET
waitstate
healthbarupdate BS_TARGET
datahpupdate BS_TARGET
critmessage
waitmessage B_WAIT_TIME_LONG
resultmessage
waitmessage B_WAIT_TIME_LONG
tryfaintmon BS_TARGET
setmaxmoveeffect
moveendall
end
BattleScript_EffectRaiseStatAllies::
savetarget
copybyte gBattlerTarget, gBattlerAttacker
BattleScript_RaiseSideStatsLoop:
jumpifabsent BS_TARGET, BattleScript_RaiseSideStatsIncrement
statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_RaiseSideStatsIncrement
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_RaiseSideStatsIncrement
setgraphicalstatchangevalues
playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_RaiseSideStatsIncrement:
setbyte sSTAT_ANIM_PLAYED, FALSE
jumpifbytenotequal gBattlerTarget, gBattlerAttacker, BattleScript_RaiseSideStatsEnd
setallytonexttarget BattleScript_RaiseSideStatsLoop
BattleScript_RaiseSideStatsEnd:
restoretarget
goto BattleScript_MoveEnd
BattleScript_EffectLowerStatFoes::
savetarget
copybyte sBATTLER, gBattlerTarget
BattleScript_LowerSideStatsLoop:
jumpifabsent BS_TARGET, BattleScript_LowerSideStatsIncrement
statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_LowerSideStatsIncrement
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_LowerSideStatsIncrement
setgraphicalstatchangevalues
playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
printfromtable gStatDownStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_LowerSideStatsIncrement:
setbyte sSTAT_ANIM_PLAYED, FALSE
jumpifbytenotequal gBattlerTarget, sBATTLER, BattleScript_LowerSideStatsEnd
setallytonexttarget BattleScript_LowerSideStatsLoop
BattleScript_LowerSideStatsEnd:
restoretarget
goto BattleScript_MoveEnd
BattleScript_EffectSetWeather::
playanimation 0, B_ANIM_MAX_SET_WEATHER
printfromtable gMoveWeatherChangeStringIds
waitmessage B_WAIT_TIME_LONG
call BattleScript_ActivateWeatherAbilities
goto BattleScript_MoveEnd
BattleScript_EffectSetTerrain::
printfromtable gTerrainStringIds
waitmessage B_WAIT_TIME_LONG
playanimation BS_ATTACKER, B_ANIM_RESTORE_BG
call BattleScript_ActivateTerrainEffects
goto BattleScript_MoveEnd
BattleScript_DamageNonTypesStarts::
printfromtable gDamageNonTypesStartStringIds
waitmessage B_WAIT_TIME_LONG
goto BattleScript_MoveEnd
BattleScript_DamageNonTypesContinues::
setbyte gBattleCommunication, 0
BattleScript_DamageNonTypesLoop::
copyarraywithindex gBattlerAttacker, gBattlerByTurnOrder, gBattleCommunication, 1
damagenontypes
jumpifword CMP_EQUAL, gBattleMoveDamage, 0, BattleScript_DamageNonTypesLoopIncrement
printfromtable gDamageNonTypesDmgStringIds
waitmessage B_WAIT_TIME_LONG
effectivenesssound
hitanimation BS_ATTACKER
orword gHitMarker, HITMARKER_SKIP_DMG_TRACK | HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_PASSIVE_DAMAGE | HITMARKER_GRUDGE
healthbarupdate BS_ATTACKER
datahpupdate BS_ATTACKER
tryfaintmon BS_ATTACKER
checkteamslost BattleScript_DamageNonTypesLoopIncrement
BattleScript_DamageNonTypesLoopIncrement::
jumpifbyte CMP_NOT_EQUAL, gBattleOutcome, 0, BattleScript_DamageNonTypesContinuesEnd
addbyte gBattleCommunication, 1
jumpifbytenotequal gBattleCommunication, gBattlersCount, BattleScript_DamageNonTypesLoop
BattleScript_DamageNonTypesContinuesEnd::
bicword gHitMarker, HITMARKER_SKIP_DMG_TRACK | HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_PASSIVE_DAMAGE | HITMARKER_GRUDGE
end2
BattleScript_EffectTryReducePP::
tryspiteppreduce BattleScript_MoveEnd
printstring STRINGID_PKMNREDUCEDPP
waitmessage B_WAIT_TIME_LONG
goto BattleScript_MoveEnd
BattleScript_EffectStatus1Foes::
savetarget
copybyte sBATTLER, gBattlerTarget
BattleScript_Status1FoesLoop:
jumpifabsent BS_TARGET, BattleScript_Status1FoesIncrement
trysetstatus1 BattleScript_Status1FoesIncrement
statusanimation BS_TARGET
updatestatusicon BS_TARGET
printfromtable gStatusConditionsStringIds
waitmessage B_WAIT_TIME_LONG
updatestatusicon BS_EFFECT_BATTLER
waitstate
BattleScript_Status1FoesIncrement:
jumpifbytenotequal gBattlerTarget, sBATTLER, BattleScript_Status1FoesEnd
setallytonexttarget BattleScript_Status1FoesLoop
BattleScript_Status1FoesEnd:
restoretarget
goto BattleScript_MoveEnd
BattleScript_EffectStatus2Foes::
savetarget
copybyte sBATTLER, gBattlerTarget
BattleScript_Status2FoesLoop:
jumpifabsent BS_TARGET, BattleScript_Status2FoesIncrement
trysetstatus2 BattleScript_Status2FoesIncrement
jumpifbyte CMP_EQUAL, gBattleCommunication, 1, BattleScript_DoConfuseAnim
jumpifbyte CMP_EQUAL, gBattleCommunication, 2, BattleScript_DoInfatuationAnim
BattleScript_Status2FoesPrintMessage:
printfromtable gStatus2StringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_Status2FoesIncrement:
jumpifbytenotequal gBattlerTarget, sBATTLER, BattleScript_Status2FoesEnd
setallytonexttarget BattleScript_Status2FoesLoop
BattleScript_Status2FoesEnd:
restoretarget
jumpifbyte CMP_EQUAL, gBattleCommunication + 1, 1, BattleScript_PrintCoinsScattered @ Gold Rush
goto BattleScript_MoveEnd
BattleScript_DoConfuseAnim:
status2animation BS_EFFECT_BATTLER, STATUS2_CONFUSION
goto BattleScript_Status2FoesPrintMessage
BattleScript_DoInfatuationAnim:
status2animation BS_EFFECT_BATTLER, STATUS2_INFATUATION
goto BattleScript_Status2FoesPrintMessage
BattleScript_PrintCoinsScattered:
printstring STRINGID_COINSSCATTERED
goto BattleScript_MoveEnd
BattleScript_TormentEnds::
printstring STRINGID_TORMENTEDNOMORE
waitmessage B_WAIT_TIME_LONG
end2
BattleScript_EffectRaiseCritAlliesAnim::
savetarget
copybyte gBattlerTarget, gBattlerAttacker
BattleScript_RaiseCritAlliesLoop:
jumpifabsent BS_TARGET, BattleScript_RaiseCritAlliesIncrement
setstatchanger STAT_ATK, 0, FALSE @ for animation
setgraphicalstatchangevalues
playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
swapattackerwithtarget
printstring STRINGID_PKMNGETTINGPUMPED
waitmessage B_WAIT_TIME_LONG
swapattackerwithtarget
BattleScript_RaiseCritAlliesIncrement:
setbyte sSTAT_ANIM_PLAYED, FALSE
jumpifbytenotequal gBattlerTarget, gBattlerAttacker, BattleScript_RaiseCritAlliesEnd
setallytonexttarget BattleScript_RaiseCritAlliesLoop
BattleScript_RaiseCritAlliesEnd:
restoretarget
goto BattleScript_MoveEnd
BattleScript_EffectHealOneSixthAllies::
jumpifteamhealthy BS_ATTACKER, BattleScript_MoveEnd
savetarget
copybyte gBattlerTarget, gBattlerAttacker
BattleScript_HealOneSixthAlliesLoop:
jumpifabsent BS_TARGET, BattleScript_HealOneSixthAlliesIncrement
tryhealsixthhealth BattleScript_HealOneSixthAlliesIncrement
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE
healthbarupdate BS_TARGET
datahpupdate BS_TARGET
printstring STRINGID_PKMNREGAINEDHEALTH
waitmessage B_WAIT_TIME_LONG
BattleScript_HealOneSixthAlliesIncrement:
jumpifbytenotequal gBattlerTarget, gBattlerAttacker, BattleScript_HealOneSixthAlliesEnd
setallytonexttarget BattleScript_HealOneSixthAlliesLoop
BattleScript_HealOneSixthAlliesEnd:
restoretarget
goto BattleScript_MoveEnd
BattleScript_EffectCureStatusAllies::
jumpifteamhealthy BS_ATTACKER, BattleScript_MoveEnd
savetarget
copybyte gBattlerTarget, gBattlerAttacker
BattleScript_CureStatusAlliesLoop:
jumpifabsent BS_TARGET, BattleScript_CureStatusAlliesIncrement
jumpifstatus BS_TARGET, STATUS1_ANY, BattleScript_CureStatusActivate
BattleScript_CureStatusAlliesIncrement:
jumpifbytenotequal gBattlerTarget, gBattlerAttacker, BattleScript_CureStatusAlliesEnd
setallytonexttarget BattleScript_CureStatusAlliesLoop
BattleScript_CureStatusAlliesEnd:
restoretarget
goto BattleScript_MoveEnd
BattleScript_CureStatusActivate:
curestatus BS_TARGET
updatestatusicon BS_TARGET
swapattackerwithtarget
printstring STRINGID_PKMNSTATUSNORMAL
waitmessage B_WAIT_TIME_LONG
swapattackerwithtarget
goto BattleScript_CureStatusAlliesIncrement
BattleScript_EffectRecycleBerriesAllies::
savetarget
copybyte gBattlerTarget, gBattlerAttacker
BattleScript_RecycleBerriesAlliesLoop:
jumpifabsent BS_TARGET, BattleScript_RecycleBerriesAlliesIncrement
tryrecycleberry BattleScript_RecycleBerriesAlliesIncrement
swapattackerwithtarget
printstring STRINGID_XFOUNDONEY
waitmessage B_WAIT_TIME_LONG
swapattackerwithtarget
BattleScript_RecycleBerriesAlliesIncrement:
jumpifbytenotequal gBattlerTarget, gBattlerAttacker, BattleScript_RecycleBerriesAlliesEnd
setallytonexttarget BattleScript_RecycleBerriesAlliesLoop
BattleScript_RecycleBerriesAlliesEnd:
restoretarget
goto BattleScript_MoveEnd
BattleScript_EffectStonesurge::
setstealthrock BattleScript_MoveEnd
printfromtable gDmgHazardsStringIds
waitmessage B_WAIT_TIME_LONG
goto BattleScript_MoveEnd
BattleScript_EffectSteelsurge::
setsteelsurge BattleScript_MoveEnd
printfromtable gDmgHazardsStringIds
waitmessage B_WAIT_TIME_LONG
goto BattleScript_MoveEnd
@@@ END MAX MOVES @@@
BattleScript_DynamaxBegins::
flushtextbox
returnatktoball
pause B_WAIT_TIME_SHORT
returntoball BS_SCRIPTING
switchinanim BS_SCRIPTING, TRUE
updatedynamax
playanimation BS_SCRIPTING, B_ANIM_DYNAMAX_GROWTH
waitanimation
end3
BattleScript_DynamaxEnds::
flushtextbox
updatedynamax
playanimation BS_SCRIPTING, B_ANIM_FORM_CHANGE
waitanimation
end2
BattleScript_MoveBlockedByDynamax::
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
pause B_WAIT_TIME_SHORT
ppreduce
jumpifword CMP_COMMON_BITS, gHitMarker, HITMARKER_STRING_PRINTED, BattleScript_MoveEnd
printstring STRINGID_MOVEBLOCKEDBYDYNAMAX
waitmessage B_WAIT_TIME_LONG
orword gHitMarker, HITMARKER_STRING_PRINTED
goto BattleScript_MoveEnd
BattleScript_PokemonCantUseTheMove::
attackstring
ppreduce

View File

@ -81,11 +81,11 @@ BirthIsland_Exterior_EventScript_Deoxys::
applymovement LOCALID_DEOXYS, BirthIsland_Exterior_Movement_DeoxysApproach
waitmovement 0
waitse
playmoncry SPECIES_DEOXYS, CRY_MODE_ENCOUNTER
playmoncry SPECIES_DEOXYS_NORMAL, CRY_MODE_ENCOUNTER
delay 40
waitmoncry
setvar VAR_LAST_TALKED, LOCALID_DEOXYS
seteventmon SPECIES_DEOXYS, 30
seteventmon SPECIES_DEOXYS_NORMAL, 30
setflag FLAG_SYS_CTRL_OBJ_DELETE
special BattleSetup_StartLegendaryBattle
waitstate
@ -100,12 +100,12 @@ BirthIsland_Exterior_EventScript_Deoxys::
BirthIsland_Exterior_EventScript_DefeatedDeoxys::
setflag FLAG_DEFEATED_DEOXYS
setvar VAR_0x8004, SPECIES_DEOXYS
setvar VAR_0x8004, SPECIES_DEOXYS_NORMAL
goto Common_EventScript_LegendaryFlewAway
end
BirthIsland_Exterior_EventScript_RanFromDeoxys::
setvar VAR_0x8004, SPECIES_DEOXYS
setvar VAR_0x8004, SPECIES_DEOXYS_NORMAL
goto Common_EventScript_LegendaryFlewAway
end

View File

@ -88,8 +88,8 @@ Route119_WeatherInstitute_2F_EventScript_ShellyDefeated::
Route119_WeatherInstitute_2F_EventScript_ReceiveCastform::
msgbox Route119_WeatherInstitute_2F_Text_ThanksPleaseTakePokemon, MSGBOX_DEFAULT
setvar VAR_TEMP_TRANSFERRED_SPECIES, SPECIES_CASTFORM
givemon SPECIES_CASTFORM, 25, ITEM_MYSTIC_WATER
setvar VAR_TEMP_TRANSFERRED_SPECIES, SPECIES_CASTFORM_NORMAL
givemon SPECIES_CASTFORM_NORMAL, 25, ITEM_MYSTIC_WATER
goto_if_eq VAR_RESULT, MON_GIVEN_TO_PARTY, Route119_WeatherInstitute_2F_EventScript_ReceiveCastformParty
goto_if_eq VAR_RESULT, MON_GIVEN_TO_PC, Route119_WeatherInstitute_2F_EventScript_ReceiveCastformPC
goto Common_EventScript_NoMoreRoomForPokemon
@ -122,7 +122,7 @@ Route119_WeatherInstitute_2F_EventScript_ReceivedCastformFanfare::
message Route119_WeatherInstitute_2F_Text_PlayerReceivedCastform
waitmessage
waitfanfare
bufferspeciesname STR_VAR_1, SPECIES_CASTFORM
bufferspeciesname STR_VAR_1, SPECIES_CASTFORM_NORMAL
return
Route119_WeatherInstitute_2F_EventScript_ExplainCastform::

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 268 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.7 KiB

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
255 0 0
224 74 106
236 234 108
154 45 48
244 162 132
32 127 216
16 75 156
184 224 240
136 184 224
213 207 207
246 246 246
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0

View File

@ -1,21 +1,21 @@
JASC-PAL
0100
48
193 33 177
249 249 249
225 225 225
201 201 201
169 169 169
129 129 129
249 153 161
233 49 49
193 33 41
145 17 33
249 153 161
193 33 41
141 251 184
52 66 162
194 181 66
123 131 0
255 255 255
222 222 222
189 189 189
164 164 164
98 98 115
41 57 65
41 57 106
0 0 41
255 255 255
238 246 57
255 0 189
49 213 74
24 131 32
189 156 90
0 0 0
123 131 0
255 255 255

View File

@ -1,21 +1,21 @@
JASC-PAL
0100
48
193 33 177
249 249 249
225 225 225
201 201 201
169 169 169
129 129 129
249 153 161
233 49 49
193 33 41
145 17 33
249 153 161
193 33 41
141 251 184
52 66 162
194 181 66
123 131 0
255 255 255
255 238 0
255 189 0
255 115 0
98 98 115
41 57 65
41 57 106
0 0 41
255 255 255
238 246 57
255 0 189
49 213 74
24 131 32
189 156 90
0 0 0
123 131 0
255 255 255

Binary file not shown.

After

Width:  |  Height:  |  Size: 514 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 815 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 484 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
153 211 165
147 116 87
16 16 16
214 191 164
253 241 208
217 194 40
254 255 112
185 119 190
164 153 183
240 189 195
254 109 38
232 254 23
86 225 210
247 86 144
28 151 140
226 122 129

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
153 211 165
108 127 125
16 16 16
184 203 202
240 253 255
35 36 35
66 69 66
185 119 190
91 69 73
139 113 119
254 109 38
232 254 23
187 157 165
247 86 144
28 151 140
75 79 75

Binary file not shown.

After

Width:  |  Height:  |  Size: 581 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 713 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 418 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
153 211 165
16 16 16
166 49 57
119 38 40
198 138 72
141 66 41
233 197 88
66 118 56
210 57 77
179 172 98
249 249 249
44 72 40
218 208 139
57 164 61
213 68 86
15 15 15

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
153 211 165
16 16 16
55 143 41
35 91 27
198 138 72
141 66 41
233 197 88
66 118 56
75 183 48
179 172 98
249 249 249
44 72 40
218 208 139
57 164 61
213 68 86
15 15 15

Binary file not shown.

After

Width:  |  Height:  |  Size: 871 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 510 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
153 211 165
8 58 99
16 16 16
90 140 206
33 99 173
205 205 213
74 74 74
53 46 39
199 84 53
148 148 148
253 253 253
108 232 214
73 65 54
95 86 71
148 173 230
206 206 214

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
153 211 165
115 82 148
16 16 16
213 180 246
164 123 189
205 205 213
74 74 74
66 53 42
199 84 53
148 148 148
253 253 253
108 232 214
92 75 62
140 126 83
238 222 255
206 206 214

Binary file not shown.

After

Width:  |  Height:  |  Size: 947 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 670 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
255 194 14
134 122 150
100 87 122
70 52 92
106 189 205
82 123 197
179 242 219
238 238 255
189 189 230
140 206 188
146 233 150
39 167 119
255 156 180
230 98 131
222 49 49
16 16 16

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
255 194 14
131 131 189
115 98 172
90 74 115
246 139 131
222 82 98
179 242 219
238 238 255
189 189 230
140 206 188
146 233 150
39 167 119
156 255 156
115 238 115
32 213 24
16 16 16

Binary file not shown.

After

Width:  |  Height:  |  Size: 802 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 996 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 644 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
153 211 165
215 44 0
255 155 27
64 30 33
255 247 0
16 16 16
85 19 7
115 66 57
82 40 41
205 45 26
255 90 66
255 213 0
156 27 15
251 251 251
148 21 40
15 15 15

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
153 211 165
215 44 0
255 155 27
6 31 51
255 247 0
16 16 16
85 19 7
43 94 109
20 54 73
205 45 26
255 90 66
255 213 0
156 27 15
251 251 251
148 21 40
15 15 15

Binary file not shown.

After

Width:  |  Height:  |  Size: 970 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 626 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
153 211 165
255 66 0
255 214 16
247 165 16
255 232 119
16 16 16
132 49 25
239 132 41
206 82 66
252 252 252
214 41 44
239 181 90
213 207 174
162 54 43
14 14 14
15 15 15

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
153 211 165
255 66 0
255 214 16
247 165 16
255 232 119
16 16 16
49 57 65
131 123 148
90 90 106
252 252 252
214 41 44
169 163 183
213 207 174
66 66 82
14 14 14
15 15 15

View File

Before

Width:  |  Height:  |  Size: 852 B

After

Width:  |  Height:  |  Size: 852 B

View File

Before

Width:  |  Height:  |  Size: 600 B

After

Width:  |  Height:  |  Size: 600 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 690 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 600 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
153 211 165
125 118 121
16 16 16
190 182 183
115 26 13
175 39 20
254 226 90
235 93 36
254 238 160
237 151 35
244 201 28
104 85 25
7 33 69
0 65 148
248 248 248
252 252 252

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
153 211 165
80 77 73
16 16 16
136 133 128
118 50 8
180 75 12
254 226 90
228 119 19
254 238 160
237 151 35
244 201 28
104 85 25
132 120 120
252 252 252
179 186 175
254 254 254

Binary file not shown.

After

Width:  |  Height:  |  Size: 715 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 489 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
153 211 165
31 20 24
47 36 39
16 16 16
55 51 55
37 35 37
88 71 74
69 50 51
66 64 60
84 81 76
103 99 92
120 55 59
89 40 43
243 120 67
236 225 13
234 70 73

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
153 211 165
31 20 24
47 36 39
16 16 16
50 58 63
34 36 38
88 71 74
69 50 51
71 82 88
88 112 124
103 132 140
120 55 59
89 40 43
243 120 67
236 225 13
234 70 73

Binary file not shown.

After

Width:  |  Height:  |  Size: 663 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 580 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
153 211 165
135 67 44
16 16 16
192 106 49
34 66 54
23 47 38
95 101 89
238 230 233
159 147 149
57 110 99
34 83 72
242 143 58
24 88 79
53 193 167
242 91 0
26 140 120

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
153 211 165
141 100 46
16 16 16
198 155 50
37 63 44
25 45 30
95 101 89
238 230 233
159 147 149
62 105 80
39 78 55
243 202 62
52 90 85
100 166 154
242 91 0
65 127 116

Binary file not shown.

After

Width:  |  Height:  |  Size: 823 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 478 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
153 211 165
37 29 78
16 16 16
67 68 117
122 24 95
215 0 67
48 51 96
24 23 61
62 61 109
77 84 136
44 43 88
100 108 168
78 65 80
46 38 47
255 118 160
152 27 117

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
153 211 165
53 53 53
16 16 16
131 131 131
139 121 31
238 214 0
77 77 77
21 21 23
65 64 68
144 144 144
41 41 44
188 188 188
35 34 34
8 8 8
255 247 153
179 166 107

Binary file not shown.

After

Width:  |  Height:  |  Size: 570 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 457 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
153 211 165
16 16 16
62 115 115
100 38 32
168 83 26
252 252 252
101 208 188
77 164 155
152 67 52
246 190 19
183 236 230
214 132 20
186 90 58
250 230 184
230 196 125
202 152 96

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
153 211 165
16 16 16
31 60 40
43 34 34
162 51 32
252 252 252
70 113 84
49 87 61
77 63 60
236 132 29
122 160 135
206 85 28
99 83 77
255 178 119
242 200 113
185 132 73

Binary file not shown.

After

Width:  |  Height:  |  Size: 719 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 864 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 428 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
153 211 165
16 16 16
40 39 45
168 147 168
131 112 128
112 112 134
57 58 65
228 229 241
78 79 95
56 173 186
196 186 197
254 254 254
46 105 118
56 139 156
79 203 217
255 222 89

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
153 211 165
16 16 16
37 42 57
143 165 151
109 128 119
94 116 158
54 65 77
232 237 220
66 85 116
219 89 40
181 193 184
254 254 254
139 55 24
183 73 31
226 122 84
255 164 48

Binary file not shown.

After

Width:  |  Height:  |  Size: 673 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 579 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 500 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
153 211 165
82 49 32
16 16 16
115 74 74
189 156 123
164 98 74
230 197 148
255 230 172
213 156 74
253 253 253
230 189 123
11 11 11
12 12 12
13 13 13
14 14 14
15 15 15

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
153 211 165
90 82 74
16 16 16
131 115 115
189 197 255
172 164 156
213 222 255
222 230 255
213 213 197
253 253 253
246 246 238
11 11 11
12 12 12
13 13 13
14 14 14
15 15 15

Binary file not shown.

After

Width:  |  Height:  |  Size: 581 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 713 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 418 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
153 211 165
16 16 16
166 49 57
119 38 40
198 138 72
141 66 41
233 197 88
66 118 56
210 57 77
179 172 98
249 249 249
44 72 40
218 208 139
57 164 61
213 68 86
15 15 15

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
153 211 165
16 16 16
55 143 41
35 91 27
198 138 72
141 66 41
233 197 88
66 118 56
75 183 48
179 172 98
249 249 249
44 72 40
218 208 139
57 164 61
213 68 86
15 15 15

Binary file not shown.

After

Width:  |  Height:  |  Size: 946 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 624 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
153 211 165
16 16 16
123 106 90
189 189 189
90 74 65
164 139 115
24 57 41
0 172 213
107 220 39
41 106 74
253 253 253
254 188 164
235 73 78
230 218 0
184 41 45
239 143 255

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
153 211 165
16 16 16
106 106 98
189 189 189
82 74 74
148 139 131
16 65 74
82 238 106
255 189 90
41 164 164
253 253 253
255 134 134
255 133 35
178 86 230
184 41 45
75 86 255

Binary file not shown.

After

Width:  |  Height:  |  Size: 596 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 789 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 554 B

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
153 211 165
74 41 74
16 16 16
90 74 156
148 115 180
123 98 164
150 62 128
116 58 91
204 30 91
146 6 52
180 139 189
186 50 90
255 246 255
255 131 55
255 255 0
189 172 189

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
153 211 165
99 75 99
16 16 16
168 157 196
252 244 252
209 188 214
221 144 195
183 142 184
204 30 91
146 6 52
254 254 254
84 84 84
255 246 255
95 95 95
140 140 140
189 172 189

Binary file not shown.

After

Width:  |  Height:  |  Size: 627 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 994 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 493 B

Some files were not shown because too many files have changed in this diff Show More