diff options
Diffstat (limited to 'data')
112 files changed, 773 insertions, 1290 deletions
diff --git a/data/battle/ai/constant_damage_effects.asm b/data/battle/ai/constant_damage_effects.asm index 0ce67c191..cd812d415 100644 --- a/data/battle/ai/constant_damage_effects.asm +++ b/data/battle/ai/constant_damage_effects.asm @@ -2,10 +2,9 @@ ; to calculate damage for these instead of ; BattleCommand_DamageCalc and BattleCommand_Stab. -ConstantDamageEffects: ; 39413 +ConstantDamageEffects: db EFFECT_SUPER_FANG db EFFECT_STATIC_DAMAGE db EFFECT_LEVEL_DAMAGE db EFFECT_PSYWAVE db -1 ; end -; 39418 diff --git a/data/battle/ai/encore_moves.asm b/data/battle/ai/encore_moves.asm index b18f2419d..03e028bd1 100644 --- a/data/battle/ai/encore_moves.asm +++ b/data/battle/ai/encore_moves.asm @@ -1,6 +1,6 @@ ; AI_SMART encourages these moves with Encore. -EncoreMoves: ; 38c85 +EncoreMoves: db SWORDS_DANCE db WHIRLWIND db LEER @@ -32,4 +32,3 @@ EncoreMoves: ; 38c85 db COTTON_SPORE db POWDER_SNOW db -1 ; end -; 38ca4 diff --git a/data/battle/ai/rain_dance_moves.asm b/data/battle/ai/rain_dance_moves.asm index 05cf68670..c00e0b60a 100644 --- a/data/battle/ai/rain_dance_moves.asm +++ b/data/battle/ai/rain_dance_moves.asm @@ -1,6 +1,6 @@ ; AI_SMART prefers these moves during rain. -RainDanceMoves: ; 390e7 +RainDanceMoves: db WATER_GUN db HYDRO_PUMP db SURF @@ -13,4 +13,3 @@ RainDanceMoves: ; 390e7 db OCTAZOOKA db WHIRLPOOL db -1 ; end -; 390f3 diff --git a/data/battle/ai/reckless_moves.asm b/data/battle/ai/reckless_moves.asm index 40bc070d8..67252979b 100644 --- a/data/battle/ai/reckless_moves.asm +++ b/data/battle/ai/reckless_moves.asm @@ -1,10 +1,9 @@ ; AI_AGGRESSIVE does not discourage these moves ; even if a stronger one is available. -RecklessMoves: ; 393e2 +RecklessMoves: db EFFECT_SELFDESTRUCT db EFFECT_RAMPAGE db EFFECT_MULTI_HIT db EFFECT_DOUBLE_HIT db -1 ; end -; 393e7 diff --git a/data/battle/ai/residual_moves.asm b/data/battle/ai/residual_moves.asm index 99407e238..c99ac0f5e 100644 --- a/data/battle/ai/residual_moves.asm +++ b/data/battle/ai/residual_moves.asm @@ -14,4 +14,3 @@ ResidualMoves: db SUBSTITUTE db SPIKES db -1 ; end -; 39453 diff --git a/data/battle/ai/risky_effects.asm b/data/battle/ai/risky_effects.asm index 2ca0bc655..529436c48 100644 --- a/data/battle/ai/risky_effects.asm +++ b/data/battle/ai/risky_effects.asm @@ -1,8 +1,7 @@ ; AI_RISKY will not use these effects at max HP ; even if they would KO the player. -RiskyEffects: ; 394ff +RiskyEffects: db EFFECT_SELFDESTRUCT db EFFECT_OHKO db -1 ; end -; 39502 diff --git a/data/battle/ai/stall_moves.asm b/data/battle/ai/stall_moves.asm index 5a017dadf..65838e0f0 100644 --- a/data/battle/ai/stall_moves.asm +++ b/data/battle/ai/stall_moves.asm @@ -1,7 +1,7 @@ ; AI_OPPORTUNIST discourages these moves ; when the player's HP is low. -StallMoves: ; 39348 +StallMoves: db SWORDS_DANCE db TAIL_WHIP db LEER @@ -35,4 +35,3 @@ StallMoves: ; 39348 db SUBSTITUTE db FLAME_WHEEL db -1 ; end -; 39369 diff --git a/data/battle/ai/status_only_effects.asm b/data/battle/ai/status_only_effects.asm index daeadb46c..8748d93b3 100644 --- a/data/battle/ai/status_only_effects.asm +++ b/data/battle/ai/status_only_effects.asm @@ -1,10 +1,9 @@ ; AI_BASIC discourages these effects if the player ; already has a status condition. -StatusOnlyEffects: ; 385db +StatusOnlyEffects: db EFFECT_SLEEP db EFFECT_TOXIC db EFFECT_POISON db EFFECT_PARALYZE db -1 ; end -; 385e0 diff --git a/data/battle/ai/sunny_day_moves.asm b/data/battle/ai/sunny_day_moves.asm index 0ec59bc9e..38d6a8ee7 100644 --- a/data/battle/ai/sunny_day_moves.asm +++ b/data/battle/ai/sunny_day_moves.asm @@ -1,6 +1,6 @@ ; AI_SMART prefers these moves during harsh sunlight. -SunnyDayMoves: ; 39134 +SunnyDayMoves: db FIRE_PUNCH db EMBER db FLAMETHROWER @@ -10,4 +10,3 @@ SunnyDayMoves: ; 39134 db MORNING_SUN db SYNTHESIS db -1 ; end -; 3913d diff --git a/data/battle/ai/useful_moves.asm b/data/battle/ai/useful_moves.asm index 3bab9e598..456bda2da 100644 --- a/data/battle/ai/useful_moves.asm +++ b/data/battle/ai/useful_moves.asm @@ -1,6 +1,6 @@ ; AI_SMART knows these moves are usable all-around. -UsefulMoves: ; 39301 +UsefulMoves: db DOUBLE_EDGE db SING db FLAMETHROWER @@ -21,4 +21,3 @@ UsefulMoves: ; 39301 db SOFTBOILED db SUPER_FANG db -1 ; end -; 39315 diff --git a/data/battle/effect_command_pointers.asm b/data/battle/effect_command_pointers.asm index f18e3c230..1b06eefe7 100644 --- a/data/battle/effect_command_pointers.asm +++ b/data/battle/effect_command_pointers.asm @@ -2,181 +2,180 @@ dw 0 ; padding -BattleCommandPointers: ; 3fd28 +BattleCommandPointers: ; entries correspond to macros/scripts/battle_commands.asm - dw BattleCommand_CheckTurn ; 34084 - dw BattleCommand_CheckObedience ; 343db - dw BattleCommand_UsedMoveText ; 34541 - dw BattleCommand_DoTurn ; 34555 - dw BattleCommand_Critical ; 34631 - dw BattleCommand_DamageStats ; 352dc - dw BattleCommand_Stab ; 346d2 - 07 - dw BattleCommand_DamageVariation ; 34cfd - dw BattleCommand_CheckHit ; 34d32 - dw BattleCommand_LowerSub ; 34eee - dw BattleCommand_MoveAnimNoSub ; 34f60 - dw BattleCommand_RaiseSub ; 35004 - dw BattleCommand_FailureText ; 35023 - dw BattleCommand_ApplyDamage ; 3505e - dw BattleCommand_CriticalText ; 35175 - dw BattleCommand_SuperEffectiveText ; 351ad - dw BattleCommand_CheckDestinyBond ; 351c0 - dw BattleCommand_BuildOpponentRage ; 35250 - dw BattleCommand_PoisonTarget ; 35eee - dw BattleCommand_SleepTarget ; 35e5c - dw BattleCommand_DrainTarget ; 35fff - dw BattleCommand_EatDream ; 36008 - dw BattleCommand_BurnTarget ; 3608c - dw BattleCommand_FreezeTarget ; 36102 - dw BattleCommand_ParalyzeTarget ; 36165 - dw BattleCommand_Selfdestruct ; 37380 - dw BattleCommand_MirrorMove ; 373c9 - dw BattleCommand_StatUp ; 361e4 - dw BattleCommand_StatDown ; 362e3 - dw BattleCommand_PayDay ; 3705c - dw BattleCommand_Conversion ; 3707f - dw BattleCommand_ResetStats ; 3710e - dw BattleCommand_StoreEnergy ; 36671 - dw BattleCommand_UnleashEnergy ; 366e5 - dw BattleCommand_ForceSwitch ; 3680f - dw BattleCommand_EndLoop ; 369b6 - dw BattleCommand_FlinchTarget ; 36aa0 - dw BattleCommand_OHKO ; 36af3 - dw BattleCommand_Recoil ; 36cb2 - dw BattleCommand_Mist ; 36c7e - dw BattleCommand_FocusEnergy ; 36c98 - dw BattleCommand_Confuse ; 36d3b - dw BattleCommand_ConfuseTarget ; 36d1d - dw BattleCommand_Heal ; 3713e - dw BattleCommand_Transform ; 371cd - dw BattleCommand_Screen ; 372fc - dw BattleCommand_Poison ; 35f2c - dw BattleCommand_Paralyze ; 36dc7 - dw BattleCommand_Substitute ; 36e7c - dw BattleCommand_RechargeNextTurn ; 36f0b - dw BattleCommand_Mimic ; 36f46 - dw BattleCommand_Metronome ; 37418 - dw BattleCommand_LeechSeed ; 36f9d - dw BattleCommand_Splash ; 36fe1 - dw BattleCommand_Disable ; 36fed - dw BattleCommand_ClearText ; 37e85 - dw BattleCommand_Charge ; 36b4d - dw BattleCommand_CheckCharge ; 36b3a - dw BattleCommand_TrapTarget ; 36c2d - dw BattleCommand3c ; 36c2c - dw BattleCommand_Rampage ; 36751 - dw BattleCommand_CheckRampage ; 3671a - dw BattleCommand_ConstantDamage ; 35726 - dw BattleCommand_Counter ; 35813 - dw BattleCommand_Encore ; 35864 - dw BattleCommand_PainSplit ; 35926 - dw BattleCommand_Snore ; 359d0 - dw BattleCommand_Conversion2 ; 359e6 - dw BattleCommand_LockOn ; 35a53 - dw BattleCommand_Sketch ; 35a74 - dw BattleCommand_DefrostOpponent ; 35b16 - dw BattleCommand_SleepTalk ; 35b33 - dw BattleCommand_DestinyBond ; 35bff - dw BattleCommand_Spite ; 35c0f - dw BattleCommand_FalseSwipe ; 35c94 - dw BattleCommand_HealBell ; 35cc9 - dw BattleCommand_HeldFlinch ; 36ac9 - dw BattleCommand_TripleKick ; 346b2 - dw BattleCommand_KickCounter ; 346cd - dw BattleCommand_Thief ; 37492 - dw BattleCommand_ArenaTrap ; 37517 - dw BattleCommand_Nightmare ; 37536 - dw BattleCommand_Defrost ; 37563 - dw BattleCommand_Curse ; 37588 - dw BattleCommand_Protect ; 37618 - dw BattleCommand_Spikes ; 37683 - dw BattleCommand_Foresight ; 376a0 - dw BattleCommand_PerishSong ; 376c2 - dw BattleCommand_StartSandstorm ; 376f8 - dw BattleCommand_Endure ; 3766f - dw BattleCommand_CheckCurl ; 37718 - dw BattleCommand_RolloutPower ; 37734 - dw BattleCommand5d ; 37791 - dw BattleCommand_FuryCutter ; 37792 - dw BattleCommand_Attract ; 377ce - dw BattleCommand_HappinessPower ; 3784b - dw BattleCommand_Present ; 37874 - dw BattleCommand_DamageCalc ; 35612 - 62 - dw BattleCommand_FrustrationPower ; 3790e - dw BattleCommand_Safeguard ; 37939 - dw BattleCommand_CheckSafeguard ; 37972 - dw BattleCommand_GetMagnitude ; 37991 - dw BattleCommand_BatonPass ; 379c9 - dw BattleCommand_Pursuit ; 37b1d - dw BattleCommand_ClearHazards ; 37b39 - dw BattleCommand_HealMorn ; 37b74 - dw BattleCommand_HealDay ; 37b78 - dw BattleCommand_HealNite ; 37b7c - dw BattleCommand_HiddenPower ; 37be8 - dw BattleCommand_StartRain ; 37bf4 - dw BattleCommand_StartSun ; 37c07 - dw BattleCommand_AttackUp ; 361ac - dw BattleCommand_DefenseUp ; 361b0 - dw BattleCommand_SpeedUp ; 361b4 - dw BattleCommand_SpecialAttackUp ; 361b8 - dw BattleCommand_SpecialDefenseUp ; 361bc - dw BattleCommand_AccuracyUp ; 361c0 - dw BattleCommand_EvasionUp ; 361c4 - dw BattleCommand_AttackUp2 ; 361c8 - dw BattleCommand_DefenseUp2 ; 361cc - dw BattleCommand_SpeedUp2 ; 361d0 - dw BattleCommand_SpecialAttackUp2 ; 361d4 - dw BattleCommand_SpecialDefenseUp2 ; 361d8 - dw BattleCommand_AccuracyUp2 ; 361dc - dw BattleCommand_EvasionUp2 ; 361e0 - dw BattleCommand_AttackDown ; 362ad - dw BattleCommand_DefenseDown ; 362b1 - dw BattleCommand_SpeedDown ; 362b5 - dw BattleCommand_SpecialAttackDown ; 362b9 - dw BattleCommand_SpecialDefenseDown ; 362bd - dw BattleCommand_AccuracyDown ; 362c1 - dw BattleCommand_EvasionDown ; 362c5 - dw BattleCommand_AttackDown2 ; 362c9 - dw BattleCommand_DefenseDown2 ; 362cd - dw BattleCommand_SpeedDown2 ; 362d1 - dw BattleCommand_SpecialAttackDown2 ; 362d5 - dw BattleCommand_SpecialDefenseDown2 ; 362d9 - dw BattleCommand_AccuracyDown2 ; 362dd - dw BattleCommand_EvasionDown2 ; 362e1 - dw BattleCommand_StatUpMessage ; 363b8 - dw BattleCommand_StatDownMessage ; 363e9 - dw BattleCommand_StatUpFailText ; 3644c - dw BattleCommand_StatDownFailText ; 3646a - dw BattleCommand_EffectChance ; 34ecc - dw BattleCommand_StatDownAnim ; 34fdb - dw BattleCommand_StatUpAnim ; 34fd1 - dw BattleCommand_SwitchTurn ; 34ffd - 93 - dw BattleCommand_FakeOut ; 36a82 - dw BattleCommand_BellyDrum ; 37c1a - dw BattleCommand_PsychUp ; 37c55 - dw BattleCommand_Rage ; 36f1d - dw BattleCommand_DoubleFlyingDamage ; 36f25 - dw BattleCommand_DoubleUndergroundDamage ; 36f2f - dw BattleCommand_MirrorCoat ; 37c95 - dw BattleCommand_CheckFutureSight ; 37d0d - dw BattleCommand_FutureSight ; 37d34 - dw BattleCommand_DoubleMinimizeDamage ; 37ce6 - dw BattleCommand_SkipSunCharge ; 37d02 - dw BattleCommand_ThunderAccuracy ; 37d94 - dw BattleCommand_Teleport ; 36778 - dw BattleCommand_BeatUp ; 35461 - dw BattleCommand_RageDamage ; 3527b - dw BattleCommand_ResetTypeMatchup ; 34833 - dw BattleCommand_AllStatsUp ; 36500 - dw BattleCommand_BideFailText ; 35165 - dw BattleCommand_RaiseSubNoAnim ; 365af - dw BattleCommand_LowerSubNoAnim ; 365c3 - dw BattleCommand_BeatUpFailText ; 355b5 - dw BattleCommand_ClearMissDamage ; 355d5 - a9 - dw BattleCommand_MoveDelay ; 37e80 - dw BattleCommand_MoveAnim ; 34f57 - dw BattleCommand_TriStatusChance ; 3658f - dw BattleCommand_SuperEffectiveLoopText ; 351a5 - dw BattleCommand_StartLoop ; 35197 - dw BattleCommand_Curl ; 365a7 -; 3fe86 + dw BattleCommand_CheckTurn + dw BattleCommand_CheckObedience + dw BattleCommand_UsedMoveText + dw BattleCommand_DoTurn + dw BattleCommand_Critical + dw BattleCommand_DamageStats + dw BattleCommand_Stab + dw BattleCommand_DamageVariation + dw BattleCommand_CheckHit + dw BattleCommand_LowerSub + dw BattleCommand_MoveAnimNoSub + dw BattleCommand_RaiseSub + dw BattleCommand_FailureText + dw BattleCommand_ApplyDamage + dw BattleCommand_CriticalText + dw BattleCommand_SuperEffectiveText + dw BattleCommand_CheckDestinyBond + dw BattleCommand_BuildOpponentRage + dw BattleCommand_PoisonTarget + dw BattleCommand_SleepTarget + dw BattleCommand_DrainTarget + dw BattleCommand_EatDream + dw BattleCommand_BurnTarget + dw BattleCommand_FreezeTarget + dw BattleCommand_ParalyzeTarget + dw BattleCommand_Selfdestruct + dw BattleCommand_MirrorMove + dw BattleCommand_StatUp + dw BattleCommand_StatDown + dw BattleCommand_PayDay + dw BattleCommand_Conversion + dw BattleCommand_ResetStats + dw BattleCommand_StoreEnergy + dw BattleCommand_UnleashEnergy + dw BattleCommand_ForceSwitch + dw BattleCommand_EndLoop + dw BattleCommand_FlinchTarget + dw BattleCommand_OHKO + dw BattleCommand_Recoil + dw BattleCommand_Mist + dw BattleCommand_FocusEnergy + dw BattleCommand_Confuse + dw BattleCommand_ConfuseTarget + dw BattleCommand_Heal + dw BattleCommand_Transform + dw BattleCommand_Screen + dw BattleCommand_Poison + dw BattleCommand_Paralyze + dw BattleCommand_Substitute + dw BattleCommand_RechargeNextTurn + dw BattleCommand_Mimic + dw BattleCommand_Metronome + dw BattleCommand_LeechSeed + dw BattleCommand_Splash + dw BattleCommand_Disable + dw BattleCommand_ClearText + dw BattleCommand_Charge + dw BattleCommand_CheckCharge + dw BattleCommand_TrapTarget + dw BattleCommand3c + dw BattleCommand_Rampage + dw BattleCommand_CheckRampage + dw BattleCommand_ConstantDamage + dw BattleCommand_Counter + dw BattleCommand_Encore + dw BattleCommand_PainSplit + dw BattleCommand_Snore + dw BattleCommand_Conversion2 + dw BattleCommand_LockOn + dw BattleCommand_Sketch + dw BattleCommand_DefrostOpponent + dw BattleCommand_SleepTalk + dw BattleCommand_DestinyBond + dw BattleCommand_Spite + dw BattleCommand_FalseSwipe + dw BattleCommand_HealBell + dw BattleCommand_HeldFlinch + dw BattleCommand_TripleKick + dw BattleCommand_KickCounter + dw BattleCommand_Thief + dw BattleCommand_ArenaTrap + dw BattleCommand_Nightmare + dw BattleCommand_Defrost + dw BattleCommand_Curse + dw BattleCommand_Protect + dw BattleCommand_Spikes + dw BattleCommand_Foresight + dw BattleCommand_PerishSong + dw BattleCommand_StartSandstorm + dw BattleCommand_Endure + dw BattleCommand_CheckCurl + dw BattleCommand_RolloutPower + dw BattleCommand5d + dw BattleCommand_FuryCutter + dw BattleCommand_Attract + dw BattleCommand_HappinessPower + dw BattleCommand_Present + dw BattleCommand_DamageCalc + dw BattleCommand_FrustrationPower + dw BattleCommand_Safeguard + dw BattleCommand_CheckSafeguard + dw BattleCommand_GetMagnitude + dw BattleCommand_BatonPass + dw BattleCommand_Pursuit + dw BattleCommand_ClearHazards + dw BattleCommand_HealMorn + dw BattleCommand_HealDay + dw BattleCommand_HealNite + dw BattleCommand_HiddenPower + dw BattleCommand_StartRain + dw BattleCommand_StartSun + dw BattleCommand_AttackUp + dw BattleCommand_DefenseUp + dw BattleCommand_SpeedUp + dw BattleCommand_SpecialAttackUp + dw BattleCommand_SpecialDefenseUp + dw BattleCommand_AccuracyUp + dw BattleCommand_EvasionUp + dw BattleCommand_AttackUp2 + dw BattleCommand_DefenseUp2 + dw BattleCommand_SpeedUp2 + dw BattleCommand_SpecialAttackUp2 + dw BattleCommand_SpecialDefenseUp2 + dw BattleCommand_AccuracyUp2 + dw BattleCommand_EvasionUp2 + dw BattleCommand_AttackDown + dw BattleCommand_DefenseDown + dw BattleCommand_SpeedDown + dw BattleCommand_SpecialAttackDown + dw BattleCommand_SpecialDefenseDown + dw BattleCommand_AccuracyDown + dw BattleCommand_EvasionDown + dw BattleCommand_AttackDown2 + dw BattleCommand_DefenseDown2 + dw BattleCommand_SpeedDown2 + dw BattleCommand_SpecialAttackDown2 + dw BattleCommand_SpecialDefenseDown2 + dw BattleCommand_AccuracyDown2 + dw BattleCommand_EvasionDown2 + dw BattleCommand_StatUpMessage + dw BattleCommand_StatDownMessage + dw BattleCommand_StatUpFailText + dw BattleCommand_StatDownFailText + dw BattleCommand_EffectChance + dw BattleCommand_StatDownAnim + dw BattleCommand_StatUpAnim + dw BattleCommand_SwitchTurn + dw BattleCommand_FakeOut + dw BattleCommand_BellyDrum + dw BattleCommand_PsychUp + dw BattleCommand_Rage + dw BattleCommand_DoubleFlyingDamage + dw BattleCommand_DoubleUndergroundDamage + dw BattleCommand_MirrorCoat + dw BattleCommand_CheckFutureSight + dw BattleCommand_FutureSight + dw BattleCommand_DoubleMinimizeDamage + dw BattleCommand_SkipSunCharge + dw BattleCommand_ThunderAccuracy + dw BattleCommand_Teleport + dw BattleCommand_BeatUp + dw BattleCommand_RageDamage + dw BattleCommand_ResetTypeMatchup + dw BattleCommand_AllStatsUp + dw BattleCommand_BideFailText + dw BattleCommand_RaiseSubNoAnim + dw BattleCommand_LowerSubNoAnim + dw BattleCommand_BeatUpFailText + dw BattleCommand_ClearMissDamage + dw BattleCommand_MoveDelay + dw BattleCommand_MoveAnim + dw BattleCommand_TriStatusChance + dw BattleCommand_SuperEffectiveLoopText + dw BattleCommand_StartLoop + dw BattleCommand_Curl diff --git a/data/battle/held_consumables.asm b/data/battle/held_consumables.asm index c1b28822c..bd47c1d83 100644 --- a/data/battle/held_consumables.asm +++ b/data/battle/held_consumables.asm @@ -1,6 +1,6 @@ ; Held item effects that are consumed on use -ConsumableEffects: ; 271de +ConsumableEffects: db HELD_BERRY db HELD_2 db HELD_5 @@ -23,4 +23,3 @@ ConsumableEffects: ; 271de db HELD_ESCAPE db HELD_CRITICAL_UP db -1 -; 271f4 diff --git a/data/battle/held_heal_status.asm b/data/battle/held_heal_status.asm index b56335189..ac11b645b 100644 --- a/data/battle/held_heal_status.asm +++ b/data/battle/held_heal_status.asm @@ -1,6 +1,6 @@ ; See also data/items/heal_status.asm -HeldStatusHealingEffects: ; 3de44 +HeldStatusHealingEffects: db HELD_HEAL_POISON, 1 << PSN db HELD_HEAL_FREEZE, 1 << FRZ db HELD_HEAL_BURN, 1 << BRN @@ -8,4 +8,3 @@ HeldStatusHealingEffects: ; 3de44 db HELD_HEAL_PARALYZE, 1 << PAR db HELD_HEAL_STATUS, ALL_STATUS db -1 ; end -; 3de51 diff --git a/data/battle/held_stat_up.asm b/data/battle/held_stat_up.asm index a08aa1844..4f28c0d08 100644 --- a/data/battle/held_stat_up.asm +++ b/data/battle/held_stat_up.asm @@ -7,4 +7,3 @@ HeldStatUpItems: dbw HELD_ACCURACY_UP, BattleCommand_AccuracyUp dbw HELD_EVASION_UP, BattleCommand_EvasionUp db -1 ; end -; 3df12 diff --git a/data/battle/metronome_exception_moves.asm b/data/battle/metronome_exception_moves.asm index e9cd7f860..a5aa44132 100644 --- a/data/battle/metronome_exception_moves.asm +++ b/data/battle/metronome_exception_moves.asm @@ -1,6 +1,6 @@ ; Metronome cannot turn into these moves. -MetronomeExcepts: ; 37454 +MetronomeExcepts: db NO_MOVE db METRONOME db STRUGGLE @@ -15,4 +15,3 @@ MetronomeExcepts: ; 37454 db SLEEP_TALK db THIEF db -1 -; 37462 diff --git a/data/battle_anims/ball_colors.asm b/data/battle_anims/ball_colors.asm index c3ba9d2b4..0453c14b7 100644 --- a/data/battle_anims/ball_colors.asm +++ b/data/battle_anims/ball_colors.asm @@ -1,6 +1,6 @@ ; colors of balls thrown in battle -BallColors: ; cd26c (33:526c) +BallColors: db MASTER_BALL, PAL_BATTLE_OB_GREEN db ULTRA_BALL, PAL_BATTLE_OB_YELLOW db GREAT_BALL, PAL_BATTLE_OB_BLUE @@ -13,4 +13,3 @@ BallColors: ; cd26c (33:526c) db MOON_BALL, PAL_BATTLE_OB_GRAY db LOVE_BALL, PAL_BATTLE_OB_RED db -1, PAL_BATTLE_OB_GRAY -; cd284 diff --git a/data/battle_anims/framesets.asm b/data/battle_anims/framesets.asm index 905597cfa..35cb3e5a8 100644 --- a/data/battle_anims/framesets.asm +++ b/data/battle_anims/framesets.asm @@ -1,4 +1,4 @@ -BattleAnimFrameData: ; ce85e +BattleAnimFrameData: ; entries correspond to BATTLEANIMFRAMESET_* constants dw .Frameset_00 ; BATTLEANIMFRAMESET_00 dw .Frameset_01 ; BATTLEANIMFRAMESET_01 @@ -1267,4 +1267,3 @@ BattleAnimFrameData: ; ce85e frame BATTLEANIMOAMSET_D7, 8 endanim -; ceeae diff --git a/data/battle_anims/oam.asm b/data/battle_anims/oam.asm index d4b0b6978..1beca2937 100644 --- a/data/battle_anims/oam.asm +++ b/data/battle_anims/oam.asm @@ -1,4 +1,4 @@ -BattleAnimOAMData: ; ceeae +BattleAnimOAMData: ; entries correspond to BATTLEANIMOAMSET_* constants ; vtile offset, length, pointer dbbw $00, 16, .OAMData_00 ; BATTLEANIMOAMSET_00 @@ -1083,4 +1083,3 @@ BattleAnimOAMData: ; ceeae dsprite -2, 0, 6, 4, $00, $0 dsprite -4, 0, 8, 4, $00, $0 dsprite -2, 0, 10, 4, $00, $0 -; cfcf6 diff --git a/data/battle_anims/object_gfx.asm b/data/battle_anims/object_gfx.asm index 441692b03..432e513dd 100644 --- a/data/battle_anims/object_gfx.asm +++ b/data/battle_anims/object_gfx.asm @@ -4,7 +4,7 @@ anim_obj_gfx: MACRO dba \2 ENDM -AnimObjGFX: ; cfcf6 +AnimObjGFX: ; entries correspond to ANIM_GFX_* constants anim_obj_gfx 0, AnimObj00GFX anim_obj_gfx 21, AnimObjHitGFX @@ -48,4 +48,3 @@ AnimObjGFX: ; cfcf6 anim_obj_gfx 24, AnimObjAeroblastGFX anim_obj_gfx 1, NULL anim_obj_gfx 1, NULL -; cfd9e diff --git a/data/battle_anims/objects.asm b/data/battle_anims/objects.asm index 3d46ae2d7..0cd19ae0d 100644 --- a/data/battle_anims/objects.asm +++ b/data/battle_anims/objects.asm @@ -16,7 +16,7 @@ battleanimobj: MACRO db \6 ; tile offset ENDM -BattleAnimObjects: ; ccb56 +BattleAnimObjects: ; entries correspond to ANIM_OBJ_* constants battleanimobj RELATIVE_X, $ff, BATTLEANIMFRAMESET_00, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $01 ; ANIM_OBJ_00 battleanimobj RELATIVE_X, $ff, BATTLEANIMFRAMESET_01, BATTLEANIMFUNC_00, PAL_BATTLE_OB_GRAY, $01 ; ANIM_OBJ_01 @@ -206,4 +206,3 @@ BattleAnimObjects: ; ccb56 battleanimobj ABSOLUTE_X, $00, BATTLEANIMFRAMESET_B6, BATTLEANIMFUNC_00, PAL_BATTLE_OB_PLAYER, $29 ; ANIM_OBJ_ENEMYFEETFOLLOW battleanimobj ABSOLUTE_X, $00, BATTLEANIMFRAMESET_B7, BATTLEANIMFUNC_00, PAL_BATTLE_OB_ENEMY, $28 ; ANIM_OBJ_PLAYERHEADFOLLOW battleanimobj ABSOLUTE_X, $00, BATTLEANIMFRAMESET_B8, BATTLEANIMFUNC_00, PAL_BATTLE_OB_PLAYER, $29 ; ANIM_OBJ_ENEMYHEADFOLLOW -; ccfbe diff --git a/data/battle_tower/classes.asm b/data/battle_tower/classes.asm index 5a148e6ec..c53197548 100644 --- a/data/battle_tower/classes.asm +++ b/data/battle_tower/classes.asm @@ -1,4 +1,4 @@ -BattleTowerTrainers: ; 1f814e +BattleTowerTrainers: ; The trainer class is not used in Crystal 1.0 due to a bug. ; Instead, the sixth character in the trainer's name is used. ; See BattleTowerText in engine/events/battle_tower/trainer_text.asm. @@ -73,4 +73,3 @@ BattleTowerTrainers: ; 1f814e db "DYKSTRA@@@", SWIMMERF db "EATON@@@@@", BIKER db "WONG@@@@@@", FIREBREATHER -; 1f8450 diff --git a/data/battle_tower/parties.asm b/data/battle_tower/parties.asm index c7008a247..e4e8f151a 100644 --- a/data/battle_tower/parties.asm +++ b/data/battle_tower/parties.asm @@ -1,4 +1,4 @@ -BattleTowerMons: ; 1f8450 +BattleTowerMons: ; 10 groups of 21 mons. diff --git a/data/credits_script.asm b/data/credits_script.asm index 810e61c83..7f349aaad 100644 --- a/data/credits_script.asm +++ b/data/credits_script.asm @@ -1,4 +1,4 @@ -CreditsScript: ; 10acb4 +CreditsScript: ; Clear the banner. db CREDITS_CLEAR @@ -284,4 +284,3 @@ CreditsScript: ; 10acb4 db CREDITS_WAIT, 20 db CREDITS_END -; 10ae13 diff --git a/data/decorations/attributes.asm b/data/decorations/attributes.asm index a60f441a6..1be457395 100644 --- a/data/decorations/attributes.asm +++ b/data/decorations/attributes.asm @@ -5,7 +5,7 @@ decoration: MACRO db \5 ENDM -DecorationAttributes: ; 26a4f +DecorationAttributes: ; entries correspond to deco constants decoration DECO_PLANT, $00, $0, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1, $00 decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_BED, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1, $00 @@ -60,4 +60,3 @@ DecorationAttributes: ; 26a4f decoration DECO_DOLL, TENTACOOL, SET_UP_DOLL, EVENT_DECO_TENTACOOL_DOLL, SPRITE_TENTACOOL decoration DECO_PLANT, GOLD_TROPHY, SET_UP_DOLL, EVENT_DECO_GOLD_TROPHY, SPRITE_GOLD_TROPHY decoration DECO_PLANT, SILVER_TROPHY, SET_UP_DOLL, EVENT_DECO_SILVER_TROPHY, SPRITE_SILVER_TROPHY -; 26b8d diff --git a/data/decorations/decorations.asm b/data/decorations/decorations.asm index 7b76b8f6a..947bca1b9 100644 --- a/data/decorations/decorations.asm +++ b/data/decorations/decorations.asm @@ -1,4 +1,4 @@ -DecorationIDs: ; 26f2b +DecorationIDs: ; see constants/deco_constants.asm db DECO_FEATHERY_BED ; 2 db DECO_PINK_BED ; 3 @@ -52,4 +52,3 @@ TrophyIDs: db DECO_GOLD_TROPHY_DOLL ; 33 db DECO_SILVER_TROPHY_DOLL ; 34 db -1 -; 26f59 diff --git a/data/decorations/mystery_gift_decos.asm b/data/decorations/mystery_gift_decos.asm index 94a5935de..3b75c0a58 100644 --- a/data/decorations/mystery_gift_decos.asm +++ b/data/decorations/mystery_gift_decos.asm @@ -1,4 +1,4 @@ -MysteryGiftDecos: ; 2c74a +MysteryGiftDecos: db DECOFLAG_PIKACHU_DOLL db DECOFLAG_BULBASAUR_DOLL db DECOFLAG_CHARMANDER_DOLL @@ -37,4 +37,3 @@ MysteryGiftDecos: ; 2c74a db DECOFLAG_GRIMER_DOLL db DECOFLAG_UNOWN_DOLL .End -; 2c76f diff --git a/data/decorations/names.asm b/data/decorations/names.asm index 21f7eb2a0..1e3a00140 100644 --- a/data/decorations/names.asm +++ b/data/decorations/names.asm @@ -1,4 +1,4 @@ -DecorationNames: ; 26b8d +DecorationNames: ; entries correspond to constants/deco_constants.asm db "CANCEL@" db "PUT IT AWAY@" @@ -26,4 +26,3 @@ DecorationNames: ; 26b8d db "BLUE@" db "YELLOW@" db "GREEN@" -; 26c72 diff --git a/data/default_options.asm b/data/default_options.asm index 7a4f77128..991827316 100644 --- a/data/default_options.asm +++ b/data/default_options.asm @@ -1,4 +1,4 @@ -DefaultOptions: ; 14f7c +DefaultOptions: ; wOptions: med text speed db TEXT_DELAY_MED ; wSaveFileExists: no @@ -14,4 +14,3 @@ DefaultOptions: ; 14f7c db $00 db $00 -; 14f84 diff --git a/data/engine_flags.asm b/data/engine_flags.asm index 7a74276cd..9099953ca 100644 --- a/data/engine_flags.asm +++ b/data/engine_flags.asm @@ -4,7 +4,7 @@ engine_flag: MACRO dwb \1 + (\2 / 8), 1 << (\2 % 8) ENDM -EngineFlags: ; 80462 +EngineFlags: ; entries correspond to ENGINE_* constants ; pokegear @@ -198,4 +198,3 @@ EngineFlags: ; 80462 engine_flag wSwarmFlags, SWARMFLAGS_DUNSPARCE_SWARM_F ; $a0 engine_flag wSwarmFlags, SWARMFLAGS_YANMA_SWARM_F -; 80648 diff --git a/data/events/bug_contest_flags.asm b/data/events/bug_contest_flags.asm index 04d748270..734bf11f8 100644 --- a/data/events/bug_contest_flags.asm +++ b/data/events/bug_contest_flags.asm @@ -1,4 +1,4 @@ -BugCatchingContestantEventFlagTable: ; 139fe +BugCatchingContestantEventFlagTable: ; there are NUM_BUG_CONTESTANTS entries dw EVENT_BUG_CATCHING_CONTESTANT_1A dw EVENT_BUG_CATCHING_CONTESTANT_2A @@ -10,4 +10,3 @@ BugCatchingContestantEventFlagTable: ; 139fe dw EVENT_BUG_CATCHING_CONTESTANT_8A dw EVENT_BUG_CATCHING_CONTESTANT_9A dw EVENT_BUG_CATCHING_CONTESTANT_10A -; 13a12 diff --git a/data/events/bug_contest_winners.asm b/data/events/bug_contest_winners.asm index 7a465edf5..e29ce0436 100644 --- a/data/events/bug_contest_winners.asm +++ b/data/events/bug_contest_winners.asm @@ -1,4 +1,4 @@ -BugContestantPointers: ; 13783 +BugContestantPointers: ; there are NUM_BUG_CONTESTANTS + 1 entries dw BugContestant_BugCatcherDon ; this reverts back to the player dw BugContestant_BugCatcherDon @@ -11,7 +11,6 @@ BugContestantPointers: ; 13783 dw BugContestant_BugCatcherJosh dw BugContestant_YoungsterSamuel dw BugContestant_SchoolboyKipp -; 13799 ; contestant format: ; db class, id @@ -78,4 +77,3 @@ BugContestant_SchoolboyKipp: dbw VENONAT, 267 dbw PARAS, 254 dbw KAKUNA, 259 -; 13807 diff --git a/data/events/field_move_blocks.asm b/data/events/field_move_blocks.asm index d97fdc995..b7cae3dd7 100644 --- a/data/events/field_move_blocks.asm +++ b/data/events/field_move_blocks.asm @@ -1,4 +1,4 @@ -CutTreeBlockPointers: ; c862 +CutTreeBlockPointers: ; tileset, block list pointer dbw TILESET_JOHTO, .johto dbw TILESET_JOHTO_MODERN, .johto_modern @@ -43,7 +43,7 @@ CutTreeBlockPointers: ; c862 db -1 ; end -WhirlpoolBlockPointers: ; c8a4 +WhirlpoolBlockPointers: dbw TILESET_JOHTO, .johto db -1 ; end diff --git a/data/events/happiness_probabilities.asm b/data/events/happiness_probabilities.asm index 22a7395d9..0dc08ac7e 100644 --- a/data/events/happiness_probabilities.asm +++ b/data/events/happiness_probabilities.asm @@ -1,12 +1,12 @@ -HappinessData_YoungerHaircutBrother: ; 7459 +HappinessData_YoungerHaircutBrother: db $4c, 2, HAPPINESS_YOUNGCUT1 ; 30% chance db $80, 3, HAPPINESS_YOUNGCUT2 ; 20% chance db $ff, 4, HAPPINESS_YOUNGCUT3 ; 50% chance -HappinessData_OlderHaircutBrother: ; 7462 +HappinessData_OlderHaircutBrother: db $9a, 2, HAPPINESS_OLDERCUT1 ; 60% chance db $4c, 3, HAPPINESS_OLDERCUT2 ; 10% chance db $ff, 4, HAPPINESS_OLDERCUT3 ; 30% chance -HappinessData_DaisysGrooming: ; 746b +HappinessData_DaisysGrooming: db $ff, 2, HAPPINESS_GROOMING ; 99.6% chance diff --git a/data/events/magikarp_lengths.asm b/data/events/magikarp_lengths.asm index a631ef719..1a1040d6c 100644 --- a/data/events/magikarp_lengths.asm +++ b/data/events/magikarp_lengths.asm @@ -1,4 +1,4 @@ -MagikarpLengths: ; fbca8 +MagikarpLengths: ; [wMagikarpLength] = z * 100 + (bc - x) / y ; First argument is the bc threshold as well as x. ; Second argument is y. @@ -18,4 +18,3 @@ MagikarpLengths: ; fbca8 dwb 65210, 5 dwb 65410, 2 dwb 65510, 1 ; not used -; fbcd2 diff --git a/data/events/npc_trades.asm b/data/events/npc_trades.asm index b019baf7a..03d409571 100644 --- a/data/events/npc_trades.asm +++ b/data/events/npc_trades.asm @@ -6,7 +6,7 @@ npctrade: MACRO db \8, \9, 0 ENDM -NPCTrades: ; fce58 +NPCTrades: ; entries correspond to NPCTRADE_* constants npctrade TRADE_DIALOGSET_COLLECTOR, ABRA, MACHOP, "MUSCLE@@@@@", $37, $66, GOLD_BERRY, 37460, "MIKE@@@@@@@", TRADE_GENDER_EITHER npctrade TRADE_DIALOGSET_COLLECTOR, BELLSPROUT, ONIX, "ROCKY@@@@@@", $96, $66, BITTER_BERRY, 48926, "KYLE@@@@@@@", TRADE_GENDER_EITHER @@ -15,4 +15,3 @@ NPCTrades: ; fce58 npctrade TRADE_DIALOGSET_NEWBIE, HAUNTER, XATU, "PAUL@@@@@@@", $96, $86, MYSTERYBERRY, 15616, "CHRIS@@@@@@", TRADE_GENDER_EITHER npctrade TRADE_DIALOGSET_GIRL, CHANSEY, AERODACTYL, "AEROY@@@@@@", $96, $66, GOLD_BERRY, 26491, "KIM@@@@@@@@", TRADE_GENDER_EITHER npctrade TRADE_DIALOGSET_COLLECTOR, DUGTRIO, MAGNETON, "MAGGIE@@@@@", $96, $66, METAL_COAT, 50082, "FOREST@@@@@", TRADE_GENDER_EITHER -; fcf38 diff --git a/data/events/odd_eggs.asm b/data/events/odd_eggs.asm index aa7e8176b..f006833a7 100644 --- a/data/events/odd_eggs.asm +++ b/data/events/odd_eggs.asm @@ -26,10 +26,9 @@ prob_total = 0 ; Tyrogue prob 10 prob 1 -; 1fb56e -OddEggs: ; 1fb56e +OddEggs: OddEgg1: db PICHU diff --git a/data/events/unown_walls.asm b/data/events/unown_walls.asm index d7fa26cbc..d0909d139 100644 --- a/data/events/unown_walls.asm +++ b/data/events/unown_walls.asm @@ -17,7 +17,7 @@ endr db -1 ; end ENDM -UnownWalls: ; 8aebc +UnownWalls: ; UNOWNWORDS_ESCAPE ; db $08, $44, $04, $00, $2e, $08, -1 unownwall "E", "S", "C", "A", "P", "E" @@ -30,7 +30,6 @@ UnownWalls: ; 8aebc ; UNOWNWORDS_HO_OH ; db $0e, $2c, $64, $2c, $0e, -1 unownwall "H", "O", "-", "O", "H" -; 8aed5 MenuHeaders_UnownWalls: ; 0x8aed5 ; UNOWNWORDS_ESCAPE @@ -45,4 +44,3 @@ MenuHeaders_UnownWalls: ; 0x8aed5 ; UNOWNWORDS_HO_OH db MENU_BACKUP_TILES ; flags menu_coords 4, 4, 15, 9 -; 8aee9 diff --git a/data/growth_rates.asm b/data/growth_rates.asm index 84e600139..aee2a16e7 100644 --- a/data/growth_rates.asm +++ b/data/growth_rates.asm @@ -9,7 +9,7 @@ growth_rate: MACRO db \4, \5 ENDM -GrowthRates: ; 50efa +GrowthRates: ; entries correspond to GROWTH_* (see constants/pokemon_data_constants.asm) growth_rate 1, 1, 0, 0, 0 ; Medium Fast growth_rate 3, 4, 10, 0, 30 ; Slightly Fast @@ -17,4 +17,3 @@ GrowthRates: ; 50efa growth_rate 6, 5, -15, 100, 140 ; Medium Slow growth_rate 4, 5, 0, 0, 0 ; Fast growth_rate 5, 4, 0, 0, 0 ; Slow -; 50f12 diff --git a/data/items/apricorn_balls.asm b/data/items/apricorn_balls.asm index 57e7d04bb..814aeab2f 100644 --- a/data/items/apricorn_balls.asm +++ b/data/items/apricorn_balls.asm @@ -1,4 +1,4 @@ -ApricornBalls: ; 24ca0 +ApricornBalls: ; apricorn, ball db RED_APRICORN, LEVEL_BALL db BLU_APRICORN, LURE_BALL @@ -8,4 +8,3 @@ ApricornBalls: ; 24ca0 db BLK_APRICORN, HEAVY_BALL db PNK_APRICORN, LOVE_BALL db -1 -; 24caf diff --git a/data/items/attributes.asm b/data/items/attributes.asm index e0198e3ad..806a2ef28 100644 --- a/data/items/attributes.asm +++ b/data/items/attributes.asm @@ -5,7 +5,7 @@ item_attribute: MACRO dn \6, \7 ENDM -ItemAttributes: ; 67c1 +ItemAttributes: ; entries correspond to item ids ; MASTER_BALL item_attribute 0, HELD_NONE, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE diff --git a/data/items/bargain_shop.asm b/data/items/bargain_shop.asm index e4da96210..a17db6550 100644 --- a/data/items/bargain_shop.asm +++ b/data/items/bargain_shop.asm @@ -1,4 +1,4 @@ -BargainShopData: ; 15c51 +BargainShopData: db 5 dbw NUGGET, 4500 dbw PEARL, 650 @@ -6,4 +6,3 @@ BargainShopData: ; 15c51 dbw STARDUST, 900 dbw STAR_PIECE, 4600 db -1 -; 15c62 diff --git a/data/items/buena_prizes.asm b/data/items/buena_prizes.asm index baac8a56d..b0737aee2 100644 --- a/data/items/buena_prizes.asm +++ b/data/items/buena_prizes.asm @@ -1,4 +1,4 @@ -BuenaPrizeItems: ; 8b15e +BuenaPrizeItems: ; there are NUM_BUENA_PRIZES items (see engine/events/buena.asm) db ULTRA_BALL, 2 db FULL_RESTORE, 2 @@ -10,4 +10,3 @@ BuenaPrizeItems: ; 8b15e db CALCIUM, 5 db HP_UP, 5 .End -; 8b170 diff --git a/data/items/catch_rate_items.asm b/data/items/catch_rate_items.asm index d7ef4cf2b..9c39afac3 100644 --- a/data/items/catch_rate_items.asm +++ b/data/items/catch_rate_items.asm @@ -2,7 +2,7 @@ ; catch rate as an item. However, if the catch rate appears in this table, the ; item associated with the table entry is used instead. -TimeCapsule_CatchRateItems: ; 28785 +TimeCapsule_CatchRateItems: db ITEM_19, LEFTOVERS db ITEM_2D, BITTER_BERRY db ITEM_32, GOLD_BERRY @@ -16,4 +16,3 @@ TimeCapsule_CatchRateItems: ; 28785 db ITEM_FA, BERRY db -1, BERRY db 0 ; end -; 2879e diff --git a/data/items/fruit_trees.asm b/data/items/fruit_trees.asm index 67b8f51ad..9c4e4793d 100644 --- a/data/items/fruit_trees.asm +++ b/data/items/fruit_trees.asm @@ -1,4 +1,4 @@ -FruitTreeItems: ; 44097 +FruitTreeItems: ; entries correspond to FRUITTREE_* constants db BERRY ; ROUTE_29 db BERRY ; ROUTE_30_1 @@ -30,4 +30,3 @@ FruitTreeItems: ; 44097 db ICE_BERRY ; PEWTER_CITY_1 db MINT_BERRY ; PEWTER_CITY_2 db BURNT_BERRY ; FUCHSIA_CITY -; 440b5 diff --git a/data/items/heal_hp.asm b/data/items/heal_hp.asm index a84670450..cc3da2367 100644 --- a/data/items/heal_hp.asm +++ b/data/items/heal_hp.asm @@ -1,4 +1,4 @@ -HealingHPAmounts: ; f3af +HealingHPAmounts: dbw FRESH_WATER, 50 dbw SODA_POP, 60 dbw LEMONADE, 80 @@ -15,4 +15,3 @@ HealingHPAmounts: ; f3af dbw RAGECANDYBAR, 20 dbw BERRY_JUICE, 20 dbw -1, 0 ; end -; f3df diff --git a/data/items/heal_status.asm b/data/items/heal_status.asm index 29bb872e1..b39f2f80d 100644 --- a/data/items/heal_status.asm +++ b/data/items/heal_status.asm @@ -1,6 +1,6 @@ ; See also data/battle/held_heal_status.asm -StatusHealingActions: ; f071 +StatusHealingActions: ; item, party menu action text, status db ANTIDOTE, PARTYMENUTEXT_HEAL_PSN, 1 << PSN db BURN_HEAL, PARTYMENUTEXT_HEAL_BRN, 1 << BRN @@ -17,4 +17,3 @@ StatusHealingActions: ; f071 db MINT_BERRY, PARTYMENUTEXT_HEAL_SLP, SLP db MIRACLEBERRY, PARTYMENUTEXT_HEAL_ALL, %11111111 db -1, 0, 0 ; end -; f09e diff --git a/data/items/mail_items.asm b/data/items/mail_items.asm index 64b4216ca..388613d98 100644 --- a/data/items/mail_items.asm +++ b/data/items/mail_items.asm @@ -1,4 +1,4 @@ -MailItems: ; b9e80 +MailItems: db FLOWER_MAIL db SURF_MAIL db LITEBLUEMAIL @@ -10,4 +10,3 @@ MailItems: ; b9e80 db MUSIC_MAIL db MIRAGE_MAIL db -1 -; b9e8b diff --git a/data/items/marts.asm b/data/items/marts.asm index a9fad3e69..e761e624a 100644 --- a/data/items/marts.asm +++ b/data/items/marts.asm @@ -1,4 +1,4 @@ -Marts: ; 160a9 +Marts: ; entries correspond to MART_* constants dw MartCherrygrove dw MartCherrygroveDex @@ -35,19 +35,17 @@ Marts: ; 160a9 dw MartIndigoPlateau dw MartUnderground .End -; 160ed -MartCherrygrove: ; 160ed +MartCherrygrove: db 4 ; # items db POTION db ANTIDOTE db PARLYZ_HEAL db AWAKENING db -1 ; end -; 160f3 -MartCherrygroveDex: ; 160f3 +MartCherrygroveDex: db 5 ; # items db POKE_BALL db POTION @@ -55,9 +53,8 @@ MartCherrygroveDex: ; 160f3 db PARLYZ_HEAL db AWAKENING db -1 ; end -; 160fa -MartViolet: ; 160fa +MartViolet: db 10 ; # items db POKE_BALL db POTION @@ -70,9 +67,8 @@ MartViolet: ; 160fa db X_SPEED db FLOWER_MAIL db -1 ; end -; 16106 -MartAzalea: ; 16106 +MartAzalea: db 9 ; # items db CHARCOAL db POKE_BALL @@ -84,9 +80,8 @@ MartAzalea: ; 16106 db PARLYZ_HEAL db FLOWER_MAIL db -1 ; end -; 16111 -MartCianwood: ; 16111 +MartCianwood: db 5 ; # items db POTION db SUPER_POTION @@ -94,9 +89,8 @@ MartCianwood: ; 16111 db FULL_HEAL db REVIVE db -1 ; end -; 16118 -MartGoldenrod2F1: ; 16118 +MartGoldenrod2F1: db 7 ; # items db POTION db SUPER_POTION @@ -106,9 +100,8 @@ MartGoldenrod2F1: ; 16118 db BURN_HEAL db ICE_HEAL db -1 ; end -; 16121 -MartGoldenrod2F2: ; 16121 +MartGoldenrod2F2: db 8 ; # items db POKE_BALL db GREAT_BALL @@ -119,9 +112,8 @@ MartGoldenrod2F2: ; 16121 db POKE_DOLL db FLOWER_MAIL db -1 ; end -; 1612b -MartGoldenrod3F: ; 1612b +MartGoldenrod3F: db 7 ; # items db X_SPEED db X_SPECIAL @@ -131,9 +123,8 @@ MartGoldenrod3F: ; 1612b db GUARD_SPEC db X_ACCURACY db -1 ; end -; 16134 -MartGoldenrod4F: ; 16134 +MartGoldenrod4F: db 5 ; # items db PROTEIN db IRON @@ -141,35 +132,31 @@ MartGoldenrod4F: ; 16134 db CALCIUM db HP_UP db -1 ; end -; 1613b -MartGoldenrod5F1: ; 1613b +MartGoldenrod5F1: db 3 ; # items db TM_THUNDERPUNCH db TM_FIRE_PUNCH db TM_ICE_PUNCH db -1 ; end -; 16140 -MartGoldenrod5F2: ; 16140 +MartGoldenrod5F2: db 4 ; # items db TM_THUNDERPUNCH db TM_FIRE_PUNCH db TM_ICE_PUNCH db TM_HEADBUTT db -1 ; end -; 16146 -MartGoldenrod5F3: ; 16146 +MartGoldenrod5F3: db 4 ; # items db TM_THUNDERPUNCH db TM_FIRE_PUNCH db TM_ICE_PUNCH db TM_ROCK_SMASH db -1 ; end -; 1614c -MartGoldenrod5F4: ; 1614c +MartGoldenrod5F4: db 5 ; # items db TM_THUNDERPUNCH db TM_FIRE_PUNCH @@ -177,9 +164,8 @@ MartGoldenrod5F4: ; 1614c db TM_HEADBUTT db TM_ROCK_SMASH db -1 ; end -; 16153 -MartOlivine: ; 16153 +MartOlivine: db 9 ; # items db GREAT_BALL db SUPER_POTION @@ -191,9 +177,8 @@ MartOlivine: ; 16153 db SUPER_REPEL db SURF_MAIL db -1 ; end -; 1615e -MartEcruteak: ; 1615e +MartEcruteak: db 10 ; # items db POKE_BALL db GREAT_BALL @@ -206,18 +191,16 @@ MartEcruteak: ; 1615e db ICE_HEAL db REVIVE db -1 ; end -; 1616a -MartMahogany1: ; 1616a +MartMahogany1: db 4 ; # items db TINYMUSHROOM db SLOWPOKETAIL db POKE_BALL db POTION db -1 ; end -; 16170 -MartMahogany2: ; 16170 +MartMahogany2: db 9 ; # items db RAGECANDYBAR db GREAT_BALL @@ -229,9 +212,8 @@ MartMahogany2: ; 16170 db REVIVE db FLOWER_MAIL db -1 ; end -; 1617b -MartBlackthorn: ; 1617b +MartBlackthorn: db 9 ; # items db GREAT_BALL db ULTRA_BALL @@ -243,9 +225,8 @@ MartBlackthorn: ; 1617b db X_DEFEND db X_ATTACK db -1 ; end -; 16186 -MartViridian: ; 16186 +MartViridian: db 9 ; # items db ULTRA_BALL db HYPER_POTION @@ -257,9 +238,8 @@ MartViridian: ; 16186 db BURN_HEAL db FLOWER_MAIL db -1 ; end -; 16191 -MartPewter: ; 16191 +MartPewter: db 7 ; # items db GREAT_BALL db SUPER_POTION @@ -269,9 +249,8 @@ MartPewter: ; 16191 db AWAKENING db BURN_HEAL db -1 ; end -; 1619a -MartCerulean: ; 1619a +MartCerulean: db 9 ; # items db GREAT_BALL db ULTRA_BALL @@ -283,9 +262,8 @@ MartCerulean: ; 1619a db DIRE_HIT db SURF_MAIL db -1 ; end -; 161a5 -MartLavender: ; 161a5 +MartLavender: db 8 ; # items db GREAT_BALL db POTION @@ -296,9 +274,8 @@ MartLavender: ; 161a5 db AWAKENING db BURN_HEAL db -1 ; end -; 161af -MartVermilion: ; 161af +MartVermilion: db 8 ; # items db ULTRA_BALL db SUPER_POTION @@ -309,9 +286,8 @@ MartVermilion: ; 161af db BURN_HEAL db LITEBLUEMAIL db -1 ; end -; 161b9 -MartCeladon2F1: ; 161b9 +MartCeladon2F1: db 7 ; # items db POTION db SUPER_POTION @@ -321,9 +297,8 @@ MartCeladon2F1: ; 161b9 db SUPER_REPEL db MAX_REPEL db -1 ; end -; 161c2 -MartCeladon2F2: ; 161c2 +MartCeladon2F2: db 10 ; # items db POKE_BALL db GREAT_BALL @@ -336,9 +311,8 @@ MartCeladon2F2: ; 161c2 db AWAKENING db PARLYZ_HEAL db -1 ; end -; 161ce -MartCeladon3F: ; 161ce +MartCeladon3F: db 5 ; # items db TM_HIDDEN_POWER db TM_SUNNY_DAY @@ -346,17 +320,15 @@ MartCeladon3F: ; 161ce db TM_RAIN_DANCE db TM_SANDSTORM db -1 ; end -; 161d5 -MartCeladon4F: ; 161d5 +MartCeladon4F: db 3 ; # items db POKE_DOLL db LOVELY_MAIL db SURF_MAIL db -1 ; end -; 161da -MartCeladon5F1: ; 161da +MartCeladon5F1: db 5 ; # items db HP_UP db PROTEIN @@ -364,9 +336,8 @@ MartCeladon5F1: ; 161da db CARBOS db CALCIUM db -1 ; end -; 161e1 -MartCeladon5F2: ; 161e1 +MartCeladon5F2: db 7 ; # items db X_ACCURACY db GUARD_SPEC @@ -376,9 +347,8 @@ MartCeladon5F2: ; 161e1 db X_SPEED db X_SPECIAL db -1 ; end -; 161ea -MartFuchsia: ; 161ea +MartFuchsia: db 7 ; # items db GREAT_BALL db ULTRA_BALL @@ -388,9 +358,8 @@ MartFuchsia: ; 161ea db MAX_REPEL db FLOWER_MAIL db -1 ; end -; 161f3 -MartSaffron: ; 161f3 +MartSaffron: db 8 ; # items db GREAT_BALL db ULTRA_BALL @@ -401,9 +370,8 @@ MartSaffron: ; 161f3 db X_DEFEND db FLOWER_MAIL db -1 ; end -; 161fd -MartMtMoon: ; 161fd +MartMtMoon: db 6 ; # items db POKE_DOLL db FRESH_WATER @@ -412,9 +380,8 @@ MartMtMoon: ; 161fd db REPEL db PORTRAITMAIL db -1 ; end -; 16205 -MartIndigoPlateau: ; 16205 +MartIndigoPlateau: db 7 ; # items db ULTRA_BALL db MAX_REPEL @@ -424,20 +391,17 @@ MartIndigoPlateau: ; 16205 db REVIVE db FULL_HEAL db -1 ; end -; 1620e -MartUnderground: ; 1620e +MartUnderground: db 4 ; # items db ENERGYPOWDER db ENERGY_ROOT db HEAL_POWDER db REVIVAL_HERB db -1 ; end -; 16214 -DefaultMart: ; 16214 +DefaultMart: db 2 ; # items db POKE_BALL db POTION db -1 ; end -; 16218 diff --git a/data/items/mom_phone.asm b/data/items/mom_phone.asm index 5a5087c0e..407a9a016 100644 --- a/data/items/mom_phone.asm +++ b/data/items/mom_phone.asm @@ -5,15 +5,15 @@ momitem: MACRO db \3, \4 ENDM -MomItems_1: ; fd136 +MomItems_1: momitem 0, 600, MOM_ITEM, SUPER_POTION momitem 0, 90, MOM_ITEM, ANTIDOTE momitem 0, 180, MOM_ITEM, POKE_BALL momitem 0, 450, MOM_ITEM, ESCAPE_ROPE momitem 0, 500, MOM_ITEM, GREAT_BALL -.End ; fd15e +.End -MomItems_2: ; fd15e +MomItems_2: momitem 900, 600, MOM_ITEM, SUPER_POTION momitem 4000, 270, MOM_ITEM, REPEL momitem 7000, 600, MOM_ITEM, SUPER_POTION @@ -24,4 +24,4 @@ MomItems_2: ; fd15e momitem 40000, 900, MOM_ITEM, HYPER_POTION momitem 50000, 8000, MOM_DOLL, DECO_PIKACHU_DOLL momitem 100000, 22800, MOM_DOLL, DECO_BIG_SNORLAX_DOLL -.End ; fd1ae +.End diff --git a/data/items/mystery_gift_items.asm b/data/items/mystery_gift_items.asm index 7f7125ef7..242035eac 100644 --- a/data/items/mystery_gift_items.asm +++ b/data/items/mystery_gift_items.asm @@ -1,4 +1,4 @@ -MysteryGiftItems: ; 2c725 +MysteryGiftItems: db BERRY db PRZCUREBERRY db MINT_BERRY @@ -37,4 +37,3 @@ MysteryGiftItems: ; 2c725 db BLUESKY_MAIL db MIRAGE_MAIL .End -; 2c74a diff --git a/data/items/rooftop_sale.asm b/data/items/rooftop_sale.asm index 87165fa5a..9606ef21e 100644 --- a/data/items/rooftop_sale.asm +++ b/data/items/rooftop_sale.asm @@ -1,4 +1,4 @@ -RooftopSaleMart1: ; 15aee +RooftopSaleMart1: db 5 dbw POKE_BALL, 150 dbw GREAT_BALL, 500 @@ -7,7 +7,7 @@ RooftopSaleMart1: ; 15aee dbw REVIVE, 1200 db -1 -RooftopSaleMart2: ; 15aff +RooftopSaleMart2: db 5 dbw HYPER_POTION, 1000 dbw FULL_RESTORE, 2000 @@ -15,4 +15,3 @@ RooftopSaleMart2: ; 15aff dbw ULTRA_BALL, 1000 dbw PROTEIN, 7800 db -1 -; 15b10 diff --git a/data/items/x_stats.asm b/data/items/x_stats.asm index ac2d0ad27..255542098 100644 --- a/data/items/x_stats.asm +++ b/data/items/x_stats.asm @@ -1,7 +1,6 @@ -XItemStats: ; f504 +XItemStats: ; item, stat db X_ATTACK, ATTACK db X_DEFEND, DEFENSE db X_SPEED, SPEED db X_SPECIAL, SP_ATTACK -; f50c diff --git a/data/maps/flypoints.asm b/data/maps/flypoints.asm index c24cd8d89..007b59073 100644 --- a/data/maps/flypoints.asm +++ b/data/maps/flypoints.asm @@ -3,7 +3,7 @@ flypoint: MACRO db \2, SPAWN_\1 ENDM -Flypoints: ; 91c5e +Flypoints: ; landmark, spawn point const_def ; Johto @@ -35,4 +35,3 @@ KANTO_FLYPOINT EQU const_value flypoint CINNABAR, CINNABAR_ISLAND flypoint INDIGO, INDIGO_PLATEAU db -1 -; 91c8f diff --git a/data/maps/outdoor_sprites.asm b/data/maps/outdoor_sprites.asm index c7e30114a..64c0cf238 100644 --- a/data/maps/outdoor_sprites.asm +++ b/data/maps/outdoor_sprites.asm @@ -1,7 +1,7 @@ ; Valid sprite IDs for each map group. ; Maps with environment ROUTE or TOWN can only use these sprites. -OutdoorSprites: ; 144b8 +OutdoorSprites: ; entries correspond to map groups dw OlivineGroupSprites dw MahoganyGroupSprites @@ -29,10 +29,9 @@ OutdoorSprites: ; 144b8 dw NewBarkGroupSprites dw SaffronGroupSprites dw CherrygroveGroupSprites -; 144ec -PalletGroupSprites: ; 144ec +PalletGroupSprites: db SPRITE_SUICUNE db SPRITE_SILVER_TROPHY db SPRITE_FAMICOM @@ -56,9 +55,8 @@ PalletGroupSprites: ; 144ec db SPRITE_SWIMMER_GUY db SPRITE_POKE_BALL db SPRITE_FRUIT_TREE -; 14503 -ViridianGroupSprites: ; 14503 +ViridianGroupSprites: db SPRITE_SUICUNE db SPRITE_SILVER_TROPHY db SPRITE_FAMICOM @@ -82,9 +80,8 @@ ViridianGroupSprites: ; 14503 db SPRITE_SWIMMER_GUY db SPRITE_POKE_BALL db SPRITE_FRUIT_TREE -; 1451a -PewterGroupSprites: ; 1451a +PewterGroupSprites: db SPRITE_SUICUNE db SPRITE_SILVER_TROPHY db SPRITE_FAMICOM @@ -108,9 +105,8 @@ PewterGroupSprites: ; 1451a db SPRITE_SWIMMER_GUY db SPRITE_POKE_BALL db SPRITE_FRUIT_TREE -; 14531 -CinnabarGroupSprites: ; 14531 +CinnabarGroupSprites: db SPRITE_SUICUNE db SPRITE_SILVER_TROPHY db SPRITE_FAMICOM @@ -134,9 +130,8 @@ CinnabarGroupSprites: ; 14531 db SPRITE_SWIMMER_GUY db SPRITE_POKE_BALL db SPRITE_FRUIT_TREE -; 14548 -CeruleanGroupSprites: ; 14548 +CeruleanGroupSprites: db SPRITE_SUICUNE db SPRITE_SILVER_TROPHY db SPRITE_FAMICOM @@ -160,9 +155,8 @@ CeruleanGroupSprites: ; 14548 db SPRITE_MISTY db SPRITE_POKE_BALL db SPRITE_SLOWPOKE -; 1455f -SaffronGroupSprites: ; 1455f +SaffronGroupSprites: db SPRITE_SUICUNE db SPRITE_SILVER_TROPHY db SPRITE_FAMICOM @@ -186,9 +180,8 @@ SaffronGroupSprites: ; 1455f db SPRITE_MISTY db SPRITE_POKE_BALL db SPRITE_SLOWPOKE -; 14576 -CeladonGroupSprites: ; 14576 +CeladonGroupSprites: db SPRITE_SUICUNE db SPRITE_SILVER_TROPHY db SPRITE_FAMICOM @@ -212,9 +205,8 @@ CeladonGroupSprites: ; 14576 db SPRITE_BLUE db SPRITE_POKE_BALL db SPRITE_FRUIT_TREE -; 1458d -LavenderGroupSprites: ; 1458d +LavenderGroupSprites: db SPRITE_SUICUNE db SPRITE_SILVER_TROPHY db SPRITE_FAMICOM @@ -238,9 +230,8 @@ LavenderGroupSprites: ; 1458d db SPRITE_BIKER db SPRITE_POKE_BALL db SPRITE_FRUIT_TREE -; 145a4 -VermilionGroupSprites: ; 145a4 +VermilionGroupSprites: db SPRITE_SUICUNE db SPRITE_SILVER_TROPHY db SPRITE_FAMICOM @@ -264,9 +255,8 @@ VermilionGroupSprites: ; 145a4 db SPRITE_BIKER db SPRITE_POKE_BALL db SPRITE_FRUIT_TREE -; 145bb -FuchsiaGroupSprites: ; 145bb +FuchsiaGroupSprites: db SPRITE_SUICUNE db SPRITE_SILVER_TROPHY db SPRITE_FAMICOM @@ -290,9 +280,8 @@ FuchsiaGroupSprites: ; 145bb db SPRITE_BIKER db SPRITE_POKE_BALL db SPRITE_FRUIT_TREE -; 145d2 -IndigoGroupSprites: ; 145d2 +IndigoGroupSprites: db SPRITE_SUICUNE db SPRITE_SILVER_TROPHY db SPRITE_FAMICOM @@ -316,9 +305,8 @@ IndigoGroupSprites: ; 145d2 db SPRITE_BIKER db SPRITE_POKE_BALL db SPRITE_BOULDER -; 145e9 -NewBarkGroupSprites: ; 145e9 +NewBarkGroupSprites: db SPRITE_SUICUNE db SPRITE_SILVER_TROPHY db SPRITE_FAMICOM @@ -342,9 +330,8 @@ NewBarkGroupSprites: ; 145e9 db SPRITE_COOLTRAINER_F db SPRITE_POKE_BALL db SPRITE_FRUIT_TREE -; 14600 -CherrygroveGroupSprites: ; 14600 +CherrygroveGroupSprites: db SPRITE_SUICUNE db SPRITE_SILVER_TROPHY db SPRITE_FAMICOM @@ -368,9 +355,8 @@ CherrygroveGroupSprites: ; 14600 db SPRITE_COOLTRAINER_F db SPRITE_POKE_BALL db SPRITE_FRUIT_TREE -; 14617 -SilverGroupSprites: ; 14617 +SilverGroupSprites: db SPRITE_SUICUNE db SPRITE_SILVER_TROPHY db SPRITE_FAMICOM @@ -394,9 +380,8 @@ SilverGroupSprites: ; 14617 db SPRITE_COOLTRAINER_F db SPRITE_POKE_BALL db SPRITE_FRUIT_TREE -; 1462e -VioletGroupSprites: ; 1462e +VioletGroupSprites: db SPRITE_SUICUNE db SPRITE_SILVER_TROPHY db SPRITE_FAMICOM @@ -420,9 +405,8 @@ VioletGroupSprites: ; 1462e db SPRITE_WEIRD_TREE db SPRITE_POKE_BALL db SPRITE_FRUIT_TREE -; 14645 -EcruteakGroupSprites: ; 14645 +EcruteakGroupSprites: db SPRITE_SUICUNE db SPRITE_SILVER_TROPHY db SPRITE_FAMICOM @@ -446,9 +430,8 @@ EcruteakGroupSprites: ; 14645 db SPRITE_WEIRD_TREE db SPRITE_POKE_BALL db SPRITE_FRUIT_TREE -; 1465c -AzaleaGroupSprites: ; 1465c +AzaleaGroupSprites: db SPRITE_SUICUNE db SPRITE_SILVER_TROPHY db SPRITE_FAMICOM @@ -472,9 +455,8 @@ AzaleaGroupSprites: ; 1465c db SPRITE_SILVER db SPRITE_FRUIT_TREE db SPRITE_SLOWPOKE -; 14673 -GoldenrodGroupSprites: ; 14673 +GoldenrodGroupSprites: db SPRITE_SUICUNE db SPRITE_SILVER_TROPHY db SPRITE_POKE_BALL @@ -498,9 +480,8 @@ GoldenrodGroupSprites: ; 14673 db SPRITE_DAY_CARE_MON_2 db SPRITE_FRUIT_TREE db SPRITE_SLOWPOKE -; 1468a -CianwoodGroupSprites: ; 1468a +CianwoodGroupSprites: db SPRITE_SUICUNE db SPRITE_SILVER_TROPHY db SPRITE_FAMICOM @@ -524,9 +505,8 @@ CianwoodGroupSprites: ; 1468a db SPRITE_TAUROS db SPRITE_FRUIT_TREE db SPRITE_ROCK -; 146a1 -OlivineGroupSprites: ; 146a1 +OlivineGroupSprites: db SPRITE_SUICUNE db SPRITE_SILVER_TROPHY db SPRITE_FAMICOM @@ -550,9 +530,8 @@ OlivineGroupSprites: ; 146a1 db SPRITE_TAUROS db SPRITE_FRUIT_TREE db SPRITE_ROCK -; 146b8 -LakeOfRageGroupSprites: ; 146b8 +LakeOfRageGroupSprites: db SPRITE_SUICUNE db SPRITE_SILVER_TROPHY db SPRITE_FAMICOM @@ -576,9 +555,8 @@ LakeOfRageGroupSprites: ; 146b8 db SPRITE_GYARADOS db SPRITE_FRUIT_TREE db SPRITE_POKE_BALL -; 146cf -MahoganyGroupSprites: ; 146cf +MahoganyGroupSprites: db SPRITE_SUICUNE db SPRITE_SILVER_TROPHY db SPRITE_FAMICOM @@ -602,9 +580,8 @@ MahoganyGroupSprites: ; 146cf db SPRITE_FISHER db SPRITE_FRUIT_TREE db SPRITE_POKE_BALL -; 146e6 -BlackthornGroupSprites: ; 146e6 +BlackthornGroupSprites: db SPRITE_SUICUNE db SPRITE_SILVER_TROPHY db SPRITE_FAMICOM @@ -628,9 +605,8 @@ BlackthornGroupSprites: ; 146e6 db SPRITE_FISHER db SPRITE_FRUIT_TREE db SPRITE_POKE_BALL -; 146fd -DungeonsGroupSprites: ; 146fd +DungeonsGroupSprites: db SPRITE_SUICUNE db SPRITE_SILVER_TROPHY db SPRITE_FAMICOM @@ -654,9 +630,8 @@ DungeonsGroupSprites: ; 146fd db SPRITE_SCIENTIST db SPRITE_POKE_BALL db SPRITE_BOULDER -; 14714 -FastShipGroupSprites: ; 14714 +FastShipGroupSprites: db SPRITE_SUICUNE db SPRITE_SILVER_TROPHY db SPRITE_FAMICOM @@ -680,9 +655,8 @@ FastShipGroupSprites: ; 14714 db SPRITE_FAIRY db SPRITE_POKE_BALL db SPRITE_ROCK -; 1472b -CableClubGroupSprites: ; 1472b +CableClubGroupSprites: db SPRITE_OAK db SPRITE_FISHER db SPRITE_TEACHER @@ -694,4 +668,3 @@ CableClubGroupSprites: ; 1472b db SPRITE_FISHING_GURU db SPRITE_POKE_BALL db SPRITE_POKEDEX -; 14736 diff --git a/data/maps/roofs.asm b/data/maps/roofs.asm index 8765cfa6a..0a27e97ca 100644 --- a/data/maps/roofs.asm +++ b/data/maps/roofs.asm @@ -6,7 +6,7 @@ const ROOF_OLIVINE ; 3 const ROOF_GOLDENROD ; 4 -MapGroupRoofs: ; 1c021i +MapGroupRoofs: ; entries correspond to map groups ; values are indexes for Roofs (see below) db -1 ; 0 @@ -36,13 +36,11 @@ MapGroupRoofs: ; 1c021i db ROOF_NEW_BARK ; 24 (New Bark) db -1 ; 25 db ROOF_NEW_BARK ; 26 (Cherrygrove) -; 1c03c -Roofs: ; 1c03c +Roofs: ; entries correspond to ROOF_* constants INCBIN "gfx/tilesets/roofs/0.2bpp" INCBIN "gfx/tilesets/roofs/1.2bpp" INCBIN "gfx/tilesets/roofs/2.2bpp" INCBIN "gfx/tilesets/roofs/3.2bpp" INCBIN "gfx/tilesets/roofs/4.2bpp" -; 1c30c diff --git a/data/maps/scenes.asm b/data/maps/scenes.asm index 9e11f3590..9c820f9a6 100644 --- a/data/maps/scenes.asm +++ b/data/maps/scenes.asm @@ -4,7 +4,7 @@ scene_var: MACRO dw \2 ENDM -MapScenes:: ; 4d01e +MapScenes:: scene_var POKECENTER_2F, wPokecenter2FSceneID scene_var TRADE_CENTER, wTradeCenterSceneID scene_var COLOSSEUM, wColosseumSceneID @@ -85,4 +85,3 @@ MapScenes:: ; 4d01e scene_var MOBILE_TRADE_ROOM, wMobileTradeRoomSceneID scene_var MOBILE_BATTLE_ROOM, wMobileBattleRoomSceneID db -1 -; 4d15b diff --git a/data/maps/setup_scripts.asm b/data/maps/setup_scripts.asm index 00b059865..218c81e06 100644 --- a/data/maps/setup_scripts.asm +++ b/data/maps/setup_scripts.asm @@ -1,4 +1,4 @@ -MapSetupScripts: ; 15377 +MapSetupScripts: ; entries correspond to MAPSETUP_* constants (see constants/map_setup_constants.asm) dw MapSetupScript_Warp dw MapSetupScript_Continue @@ -12,14 +12,13 @@ MapSetupScripts: ; 15377 dw MapSetupScript_Submenu dw MapSetupScript_BadWarp dw MapSetupScript_Fly -; 1538f -MapSetupScript_Teleport: ; 1538f +MapSetupScript_Teleport: db map_prolong_sprites -MapSetupScript_Fly: ; 15390 +MapSetupScript_Fly: db map_fade_out_palettes db map_keep_roam -MapSetupScript_Warp: ; 15392 +MapSetupScript_Warp: db map_lcd_off db map_sound_off db map_load_spawn @@ -44,7 +43,7 @@ MapSetupScript_Warp: ; 15392 db map_wildmons db map_end -MapSetupScript_BadWarp: ; 153a9 +MapSetupScript_BadWarp: db map_load_spawn db map_load_attributes db map_change_callback @@ -68,7 +67,7 @@ MapSetupScript_BadWarp: ; 153a9 db map_wildmons db map_end -MapSetupScript_Connection: ; 153bf +MapSetupScript_Connection: db map_animations_off db map_load_connection db map_load_attributes @@ -87,11 +86,11 @@ MapSetupScript_Connection: ; 153bf db map_animations_on db map_end -MapSetupScript_Fall: ; 153d0 +MapSetupScript_Fall: db map_prolong_sprites -MapSetupScript_Door: ; 153d1 +MapSetupScript_Door: db map_fade_out_palettes -MapSetupScript_Train: ; 153d2 +MapSetupScript_Train: db map_load_warp db map_load_attributes db map_warp_face @@ -114,7 +113,7 @@ MapSetupScript_Train: ; 153d2 db map_update_roam db map_end -MapSetupScript_ReloadMap: ; 153e7 +MapSetupScript_ReloadMap: db map_fade db map_clear_bg_palettes db map_lcd_off @@ -132,7 +131,7 @@ MapSetupScript_ReloadMap: ; 153e7 db map_wildmons db map_end -MapSetupScript_LinkReturn: ; 153f7 +MapSetupScript_LinkReturn: db map_fade db map_lcd_off db map_sound_off @@ -151,7 +150,7 @@ MapSetupScript_LinkReturn: ; 153f7 db map_text_scroll_off db map_end -MapSetupScript_Continue: ; 15408 +MapSetupScript_Continue: db map_lcd_off db map_sound_off db map_load_attributes_2 @@ -171,7 +170,7 @@ MapSetupScript_Continue: ; 15408 db map_wildmons db map_end -MapSetupScript_Submenu: ; 1541a +MapSetupScript_Submenu: db map_load_blocks db map_connection_blocks db map_end diff --git a/data/maps/sgb_roof_pal_inds.asm b/data/maps/sgb_roof_pal_inds.asm index c56ddaf7d..4b117fe67 100644 --- a/data/maps/sgb_roof_pal_inds.asm +++ b/data/maps/sgb_roof_pal_inds.asm @@ -1,6 +1,6 @@ ; Crystal does not support SGB, so this is unused. -MapGroupRoofSGBPalInds: ; 8a45 +MapGroupRoofSGBPalInds: ; entries correspond to map groups db PREDEFPAL_00 db PREDEFPAL_OLIVINE @@ -29,4 +29,3 @@ MapGroupRoofSGBPalInds: ; 8a45 db PREDEFPAL_NEW_BARK db PREDEFPAL_SAFFRON db PREDEFPAL_CHERRYGROVE -; 8a60 diff --git a/data/maps/spawn_points.asm b/data/maps/spawn_points.asm index b00a2ac1e..52baa111c 100644 --- a/data/maps/spawn_points.asm +++ b/data/maps/spawn_points.asm @@ -38,4 +38,3 @@ SpawnPoints: ; 0x152ab spawn SILVER_CAVE_OUTSIDE, 23, 20 spawn FAST_SHIP_CABINS_SW_SSW_NW, 6, 2 spawn N_A, -1, -1 -; 1531f diff --git a/data/mon_menu.asm b/data/mon_menu.asm index ec9a59a94..b6130a199 100644 --- a/data/mon_menu.asm +++ b/data/mon_menu.asm @@ -8,7 +8,7 @@ const MONMENUVALUE_MAIL ; 6 const MONMENUVALUE_ERROR ; 7 -MonMenuOptionStrings: ; 24caf +MonMenuOptionStrings: ; entries correspond to MONMENUVALUE_* constants db "STATS@" db "SWITCH@" @@ -17,9 +17,8 @@ MonMenuOptionStrings: ; 24caf db "MOVE@" db "MAIL@" db "ERROR!@" -; 24cd9 -MonMenuOptions: ; 24cd9 +MonMenuOptions: ; category, item, value; actions are in PokemonActionSubmenu (see engine/start_menu.asm) ; moves db MONMENU_FIELD_MOVE, MONMENUITEM_CUT, CUT @@ -45,4 +44,3 @@ MonMenuOptions: ; 24cd9 db MONMENU_MENUOPTION, MONMENUITEM_MAIL, MONMENUVALUE_MAIL db MONMENU_MENUOPTION, MONMENUITEM_ERROR, MONMENUVALUE_ERROR db -1 -; 24d19 diff --git a/data/moves/animations.asm b/data/moves/animations.asm index 037e5f1d2..cef14f5ab 100644 --- a/data/moves/animations.asm +++ b/data/moves/animations.asm @@ -1,4 +1,4 @@ -BattleAnimations:: ; c906f +BattleAnimations:: ; entries correspond to constants/move_constants.asm dw BattleAnim_0 dw BattleAnim_Pound @@ -279,17 +279,15 @@ BattleAnimations:: ; c906f dw BattleAnim_Wobble dw BattleAnim_Shake dw BattleAnim_HitConfusion -; c929b -BattleAnim_0: ; c929b -BattleAnim_252: ; c929b -BattleAnim_253: ; c929b -BattleAnim_254: ; c929b -BattleAnim_MirrorMove: ; c929b +BattleAnim_0: +BattleAnim_252: +BattleAnim_253: +BattleAnim_254: +BattleAnim_MirrorMove: anim_ret -; c929c -BattleAnim_SweetScent2: ; c929c +BattleAnim_SweetScent2: anim_2gfx ANIM_GFX_FLOWER, ANIM_GFX_MISC anim_obj ANIM_OBJ_FLOWER, 64, 96, $2 anim_wait 2 @@ -301,7 +299,6 @@ BattleAnim_SweetScent2: ; c929c anim_bgeffect ANIM_BG_06, $0, $2, $0 anim_wait 128 anim_ret -; c92c1 BattleAnim_ThrowPokeBall: anim_if_param_equal NO_ITEM, .TheTrainerBlockedTheBall @@ -320,7 +317,6 @@ BattleAnim_ThrowPokeBall: anim_obj ANIM_OBJ_BALL_POOF, 136, 64, $10 anim_wait 16 anim_jump .Shake -; c92f2 .TheTrainerBlockedTheBall: anim_2gfx ANIM_GFX_POKE_BALL, ANIM_GFX_HIT @@ -330,7 +326,6 @@ BattleAnim_ThrowPokeBall: anim_obj ANIM_OBJ_01, 112, 40, $0 anim_wait 32 anim_ret -; c9305 .UltraBall: anim_2gfx ANIM_GFX_POKE_BALL, ANIM_GFX_SMOKE @@ -344,7 +339,6 @@ BattleAnim_ThrowPokeBall: anim_obj ANIM_OBJ_BALL_POOF, 136, 64, $10 anim_wait 16 anim_jump .Shake -; c9326 .GreatBall: anim_2gfx ANIM_GFX_POKE_BALL, ANIM_GFX_SMOKE @@ -358,7 +352,6 @@ BattleAnim_ThrowPokeBall: anim_obj ANIM_OBJ_BALL_POOF, 136, 64, $10 anim_wait 16 anim_jump .Shake -; c9347 .MasterBall: anim_3gfx ANIM_GFX_POKE_BALL, ANIM_GFX_SMOKE, ANIM_GFX_SPEED @@ -403,12 +396,10 @@ BattleAnim_ThrowPokeBall: anim_incobj 1 anim_sound 0, 1, SFX_BALL_WOBBLE anim_jump .Loop -; c93bc .Click: anim_clearsprites anim_ret -; c93be .BreakFree: anim_setobj $1, $b @@ -418,9 +409,8 @@ BattleAnim_ThrowPokeBall: anim_bgeffect ANIM_BG_ENTER_MON, $0, $0, $0 anim_wait 32 anim_ret -; c93d1 -BattleAnim_SendOutMon: ; c93d1 +BattleAnim_SendOutMon: anim_if_param_equal $0, .Normal anim_if_param_equal $1, .Shiny anim_if_param_equal $2, .Unknown @@ -488,17 +478,15 @@ BattleAnim_SendOutMon: ; c93d1 anim_bgeffect ANIM_BG_ENTER_MON, $0, $1, $0 anim_wait 32 anim_ret -; c9483 -BattleAnim_ReturnMon: ; c9483 +BattleAnim_ReturnMon: anim_sound 0, 0, SFX_BALL_POOF -BattleAnim_BatonPass_branch_c9486: ; c9486 +BattleAnim_BatonPass_branch_c9486: anim_bgeffect ANIM_BG_RETURN_MON, $0, $1, $0 anim_wait 32 anim_ret -; c948d -BattleAnim_Confused: ; c948d +BattleAnim_Confused: anim_1gfx ANIM_GFX_STATUS anim_sound 0, 0, SFX_KINESIS anim_obj ANIM_OBJ_CHICK, 44, 56, $15 @@ -506,9 +494,8 @@ BattleAnim_Confused: ; c948d anim_obj ANIM_OBJ_CHICK, 44, 56, $bf anim_wait 96 anim_ret -; c94a3 -BattleAnim_Slp: ; c94a3 +BattleAnim_Slp: anim_1gfx ANIM_GFX_STATUS anim_sound 0, 0, SFX_TAIL_WHIP .loop @@ -517,9 +504,8 @@ BattleAnim_Slp: ; c94a3 anim_loop 3, .loop anim_wait 32 anim_ret -; c94b4 -BattleAnim_Brn: ; c94b4 +BattleAnim_Brn: anim_1gfx ANIM_GFX_FIRE .loop anim_sound 0, 0, SFX_BURN @@ -528,9 +514,8 @@ BattleAnim_Brn: ; c94b4 anim_loop 3, .loop anim_wait 6 anim_ret -; c94c5 -BattleAnim_Psn: ; c94c5 +BattleAnim_Psn: anim_1gfx ANIM_GFX_POISON anim_sound 0, 0, SFX_POISON anim_obj ANIM_OBJ_SKULL, 64, 56, $0 @@ -539,9 +524,8 @@ BattleAnim_Psn: ; c94c5 anim_obj ANIM_OBJ_SKULL, 48, 56, $0 anim_wait 8 anim_ret -; c94da -BattleAnim_Sap: ; c94da +BattleAnim_Sap: anim_1gfx ANIM_GFX_CHARGE anim_sound 6, 3, SFX_WATER_GUN anim_obj ANIM_OBJ_ABSORB, 128, 48, $2 @@ -553,9 +537,8 @@ BattleAnim_Sap: ; c94da anim_obj ANIM_OBJ_ABSORB, 136, 32, $4 anim_wait 16 anim_ret -; c94f8 -BattleAnim_Frz: ; c94f8 +BattleAnim_Frz: anim_1gfx ANIM_GFX_ICE anim_obj ANIM_OBJ_FROZEN, 44, 110, $0 anim_sound 0, 0, SFX_SHINE @@ -563,9 +546,8 @@ BattleAnim_Frz: ; c94f8 anim_sound 0, 0, SFX_SHINE anim_wait 16 anim_ret -; c9508 -BattleAnim_Par: ; c9508 +BattleAnim_Par: anim_1gfx ANIM_GFX_STATUS anim_bgeffect ANIM_BG_06, $0, $2, $0 anim_sound 0, 0, SFX_THUNDERSHOCK @@ -573,9 +555,8 @@ BattleAnim_Par: ; c9508 anim_obj ANIM_OBJ_PARALYZED, 76, 88, $c2 anim_wait 128 anim_ret -; c951e -BattleAnim_InLove: ; c951e +BattleAnim_InLove: anim_1gfx ANIM_GFX_OBJECTS anim_sound 0, 0, SFX_LICK anim_obj ANIM_OBJ_HEART, 64, 76, $0 @@ -584,9 +565,8 @@ BattleAnim_InLove: ; c951e anim_obj ANIM_OBJ_HEART, 36, 72, $0 anim_wait 32 anim_ret -; c9533 -BattleAnim_InSandstorm: ; c9533 +BattleAnim_InSandstorm: anim_1gfx ANIM_GFX_POWDER anim_obj ANIM_OBJ_SANDSTORM, 88, 0, $0 anim_wait 8 @@ -599,17 +579,15 @@ BattleAnim_InSandstorm: ; c9533 anim_loop 6, .loop anim_wait 8 anim_ret -; c9550 -BattleAnim_InNightmare: ; c9550 +BattleAnim_InNightmare: anim_1gfx ANIM_GFX_ANGELS anim_sound 0, 0, SFX_BUBBLEBEAM anim_obj ANIM_OBJ_IN_NIGHTMARE, 68, 80, $0 anim_wait 40 anim_ret -; c955c -BattleAnim_InWhirlpool: ; c955c +BattleAnim_InWhirlpool: anim_1gfx ANIM_GFX_WIND anim_bgeffect ANIM_BG_WHIRLPOOL, $0, $0, $0 anim_sound 0, 1, SFX_SURF @@ -620,21 +598,18 @@ BattleAnim_InWhirlpool: ; c955c anim_incbgeffect ANIM_BG_WHIRLPOOL anim_wait 1 anim_ret -; c9574 -BattleAnim_HitConfusion: ; c9574 +BattleAnim_HitConfusion: anim_1gfx ANIM_GFX_HIT anim_sound 0, 0, SFX_POUND anim_obj ANIM_OBJ_04, 44, 96, $0 anim_wait 16 anim_ret -; c9580 -BattleAnim_Miss: ; c9580 +BattleAnim_Miss: anim_ret -; c9581 -BattleAnim_EnemyDamage: ; c9581 +BattleAnim_EnemyDamage: .loop anim_bgeffect ANIM_BG_HIDE_MON, $0, $0, $0 anim_wait 5 @@ -642,45 +617,39 @@ BattleAnim_EnemyDamage: ; c9581 anim_wait 5 anim_loop 3, .loop anim_ret -; c9592 -BattleAnim_EnemyStatDown: ; c9592 +BattleAnim_EnemyStatDown: anim_call BattleAnim_FollowEnemyFeet_1 anim_bgeffect ANIM_BG_VIBRATE_MON, $0, $0, $0 anim_wait 40 anim_call BattleAnim_ShowMon_1 anim_wait 1 anim_ret -; c95a0 -BattleAnim_PlayerStatDown: ; c95a0 +BattleAnim_PlayerStatDown: anim_call BattleAnim_FollowEnemyFeet_1 anim_bgeffect ANIM_BG_WOBBLE_MON, $0, $0, $0 anim_wait 40 anim_call BattleAnim_ShowMon_1 anim_wait 1 anim_ret -; c95ae -BattleAnim_PlayerDamage: ; c95ae +BattleAnim_PlayerDamage: anim_bgeffect ANIM_BG_20, $20, $2, $20 anim_wait 40 anim_ret -; c95b5 -BattleAnim_Wobble: ; c95b5 +BattleAnim_Wobble: anim_bgeffect ANIM_BG_35, $0, $0, $0 anim_wait 40 anim_ret -; c95bc -BattleAnim_Shake: ; c95bc +BattleAnim_Shake: anim_bgeffect ANIM_BG_1F, $20, $2, $40 anim_wait 40 anim_ret -; c95c3 -BattleAnim_Pound: ; c95c3 +BattleAnim_Pound: anim_1gfx ANIM_GFX_HIT anim_sound 0, 1, SFX_POUND anim_obj ANIM_OBJ_08, 136, 56, $0 @@ -688,9 +657,8 @@ BattleAnim_Pound: ; c95c3 anim_obj ANIM_OBJ_01, 136, 56, $0 anim_wait 16 anim_ret -; c95d5 -BattleAnim_KarateChop: ; c95d5 +BattleAnim_KarateChop: anim_1gfx ANIM_GFX_HIT anim_sound 0, 1, SFX_KARATE_CHOP anim_obj ANIM_OBJ_08, 136, 40, $0 @@ -708,9 +676,8 @@ BattleAnim_KarateChop: ; c95d5 anim_obj ANIM_OBJ_01, 136, 48, $0 anim_wait 16 anim_ret -; c9605 -BattleAnim_Doubleslap: ; c9605 +BattleAnim_Doubleslap: anim_1gfx ANIM_GFX_HIT anim_if_param_equal $1, BattleAnim_Doubleslap_branch_c961b anim_sound 0, 1, SFX_DOUBLESLAP @@ -719,18 +686,16 @@ BattleAnim_Doubleslap: ; c9605 anim_obj ANIM_OBJ_01, 144, 48, $0 anim_wait 8 anim_ret -; c961b -BattleAnim_Doubleslap_branch_c961b: ; c961b +BattleAnim_Doubleslap_branch_c961b: anim_sound 0, 1, SFX_DOUBLESLAP anim_obj ANIM_OBJ_08, 120, 48, $0 anim_wait 6 anim_obj ANIM_OBJ_01, 120, 48, $0 anim_wait 8 anim_ret -; c962b -BattleAnim_CometPunch: ; c962b +BattleAnim_CometPunch: anim_1gfx ANIM_GFX_HIT anim_if_param_equal $1, BattleAnim_CometPunch_branch_c9641 anim_sound 0, 1, SFX_COMET_PUNCH @@ -739,19 +704,17 @@ BattleAnim_CometPunch: ; c962b anim_obj ANIM_OBJ_01, 144, 48, $0 anim_wait 8 anim_ret -; c9641 -BattleAnim_CometPunch_branch_c9641: ; c9641 +BattleAnim_CometPunch_branch_c9641: anim_sound 0, 1, SFX_COMET_PUNCH anim_obj ANIM_OBJ_06, 120, 64, $0 anim_wait 6 anim_obj ANIM_OBJ_01, 120, 64, $0 anim_wait 8 anim_ret -; c9651 -BattleAnim_Bide_branch_c9651: ; c9651 -BattleAnim_MegaPunch: ; c9651 +BattleAnim_Bide_branch_c9651: +BattleAnim_MegaPunch: anim_1gfx ANIM_GFX_HIT anim_bgeffect ANIM_BG_1F, $40, $2, $0 anim_wait 48 @@ -765,9 +728,8 @@ BattleAnim_MegaPunch: ; c9651 anim_wait 6 anim_loop 3, .loop anim_ret -; c9677 -BattleAnim_Stomp: ; c9677 +BattleAnim_Stomp: anim_1gfx ANIM_GFX_HIT anim_sound 0, 1, SFX_STOMP anim_obj ANIM_OBJ_07, 136, 40, $0 @@ -785,9 +747,8 @@ BattleAnim_Stomp: ; c9677 anim_obj ANIM_OBJ_01, 136, 48, $0 anim_wait 16 anim_ret -; c96a7 -BattleAnim_DoubleKick: ; c96a7 +BattleAnim_DoubleKick: anim_1gfx ANIM_GFX_HIT anim_if_param_equal $1, BattleAnim_DoubleKick_branch_c96bd anim_sound 0, 1, SFX_DOUBLE_KICK @@ -796,18 +757,16 @@ BattleAnim_DoubleKick: ; c96a7 anim_obj ANIM_OBJ_01, 144, 48, $0 anim_wait 8 anim_ret -; c96bd -BattleAnim_DoubleKick_branch_c96bd: ; c96bd +BattleAnim_DoubleKick_branch_c96bd: anim_sound 0, 1, SFX_DOUBLE_KICK anim_obj ANIM_OBJ_07, 120, 64, $0 anim_wait 6 anim_obj ANIM_OBJ_01, 120, 64, $0 anim_wait 8 anim_ret -; c96cd -BattleAnim_JumpKick: ; c96cd +BattleAnim_JumpKick: anim_1gfx ANIM_GFX_HIT anim_if_param_equal $1, BattleAnim_JumpKick_branch_c96f1 anim_sound 0, 1, SFX_JUMP_KICK @@ -820,17 +779,15 @@ BattleAnim_JumpKick: ; c96cd anim_obj ANIM_OBJ_04, 136, 48, $0 anim_wait 16 anim_ret -; c96f1 -BattleAnim_JumpKick_branch_c96f1: ; c96f1 +BattleAnim_JumpKick_branch_c96f1: anim_wait 8 anim_sound 0, 0, SFX_DOUBLE_KICK anim_obj ANIM_OBJ_04, 44, 88, $0 anim_wait 16 anim_ret -; c96fc -BattleAnim_HiJumpKick: ; c96fc +BattleAnim_HiJumpKick: anim_1gfx ANIM_GFX_HIT anim_bgeffect ANIM_BG_1F, $40, $2, $0 anim_if_param_equal $1, BattleAnim_HiJumpKick_branch_c971e @@ -843,17 +800,15 @@ BattleAnim_HiJumpKick: ; c96fc anim_obj ANIM_OBJ_04, 136, 48, $0 anim_wait 16 anim_ret -; c971e -BattleAnim_HiJumpKick_branch_c971e: ; c971e +BattleAnim_HiJumpKick_branch_c971e: anim_wait 16 anim_sound 0, 0, SFX_DOUBLE_KICK anim_obj ANIM_OBJ_04, 44, 88, $0 anim_wait 16 anim_ret -; c9729 -BattleAnim_RollingKick: ; c9729 +BattleAnim_RollingKick: anim_1gfx ANIM_GFX_HIT anim_sound 0, 1, SFX_DOUBLE_KICK anim_obj ANIM_OBJ_07, 112, 56, $0 @@ -862,9 +817,8 @@ BattleAnim_RollingKick: ; c9729 anim_obj ANIM_OBJ_01, 136, 48, $0 anim_wait 16 anim_ret -; c973e -BattleAnim_MegaKick: ; c973e +BattleAnim_MegaKick: anim_1gfx ANIM_GFX_HIT anim_bgeffect ANIM_BG_1F, $40, $2, $0 anim_wait 67 @@ -878,9 +832,8 @@ BattleAnim_MegaKick: ; c973e anim_wait 6 anim_loop 3, .loop anim_ret -; c9764 -BattleAnim_HyperFang: ; c9764 +BattleAnim_HyperFang: anim_1gfx ANIM_GFX_HIT anim_bgeffect ANIM_BG_1F, $20, $1, $0 anim_sound 0, 1, SFX_BITE @@ -889,9 +842,8 @@ BattleAnim_HyperFang: ; c9764 anim_obj ANIM_OBJ_01, 136, 56, $0 anim_wait 16 anim_ret -; c977b -BattleAnim_SuperFang: ; c977b +BattleAnim_SuperFang: anim_1gfx ANIM_GFX_HIT anim_bgeffect ANIM_BG_1F, $40, $2, $0 anim_wait 48 @@ -905,9 +857,8 @@ BattleAnim_SuperFang: ; c977b anim_wait 6 anim_loop 3, .loop anim_ret -; c97a1 -BattleAnim_Ember: ; c97a1 +BattleAnim_Ember: anim_1gfx ANIM_GFX_FIRE anim_sound 6, 2, SFX_EMBER anim_obj ANIM_OBJ_EMBER, 64, 96, $12 @@ -927,17 +878,15 @@ BattleAnim_Ember: ; c97a1 anim_obj ANIM_OBJ_EMBER, 144, 68, $30 anim_wait 32 anim_ret -; c97d8 -BattleAnim_FirePunch: ; c97d8 +BattleAnim_FirePunch: anim_2gfx ANIM_GFX_HIT, ANIM_GFX_FIRE anim_obj ANIM_OBJ_0A, 136, 56, $43 anim_call BattleAnim_FirePunch_branch_cbbcc anim_wait 16 anim_ret -; c97e5 -BattleAnim_FireSpin: ; c97e5 +BattleAnim_FireSpin: anim_1gfx ANIM_GFX_FIRE .loop anim_sound 6, 2, SFX_EMBER @@ -955,9 +904,8 @@ BattleAnim_FireSpin: ; c97e5 anim_loop 2, .loop anim_wait 96 anim_ret -; c9811 -BattleAnim_DragonRage: ; c9811 +BattleAnim_DragonRage: anim_1gfx ANIM_GFX_FIRE .loop anim_sound 6, 2, SFX_EMBER @@ -966,9 +914,8 @@ BattleAnim_DragonRage: ; c9811 anim_loop 16, .loop anim_wait 64 anim_ret -; c9822 -BattleAnim_Flamethrower: ; c9822 +BattleAnim_Flamethrower: anim_1gfx ANIM_GFX_FIRE anim_sound 6, 2, SFX_EMBER anim_obj ANIM_OBJ_FLAMETHROWER, 64, 92, $3 @@ -993,9 +940,8 @@ BattleAnim_Flamethrower: ; c9822 anim_loop 6, .loop anim_wait 16 anim_ret -; c9861 -BattleAnim_FireBlast: ; c9861 +BattleAnim_FireBlast: anim_1gfx ANIM_GFX_FIRE .loop1 anim_sound 6, 2, SFX_EMBER @@ -1028,17 +974,15 @@ BattleAnim_FireBlast: ; c9861 anim_loop 2, .loop3 anim_wait 32 anim_ret -; c98b0 -BattleAnim_IcePunch: ; c98b0 +BattleAnim_IcePunch: anim_2gfx ANIM_GFX_HIT, ANIM_GFX_ICE anim_obj ANIM_OBJ_0A, 136, 56, $43 anim_call BattleAnim_IcePunch_branch_cbbdf anim_wait 32 anim_ret -; c98bd -BattleAnim_IceBeam: ; c98bd +BattleAnim_IceBeam: anim_1gfx ANIM_GFX_ICE .loop anim_sound 6, 2, SFX_SHINE @@ -1057,9 +1001,8 @@ BattleAnim_IceBeam: ; c98bd anim_sound 0, 1, SFX_SHINE anim_wait 8 anim_ret -; c98e8 -BattleAnim_Blizzard: ; c98e8 +BattleAnim_Blizzard: anim_1gfx ANIM_GFX_ICE .loop anim_sound 6, 2, SFX_SHINE @@ -1081,9 +1024,8 @@ BattleAnim_Blizzard: ; c98e8 anim_sound 0, 1, SFX_SHINE anim_wait 24 anim_ret -; c991e -BattleAnim_Bubble: ; c991e +BattleAnim_Bubble: anim_1gfx ANIM_GFX_BUBBLE anim_sound 32, 2, SFX_WATER_GUN anim_obj ANIM_OBJ_BUBBLE, 64, 92, $c1 @@ -1096,9 +1038,8 @@ BattleAnim_Bubble: ; c991e anim_wait 128 anim_wait 32 anim_ret -; c993d -BattleAnim_Bubblebeam: ; c993d +BattleAnim_Bubblebeam: anim_1gfx ANIM_GFX_BUBBLE .loop anim_sound 16, 2, SFX_BUBBLEBEAM @@ -1122,9 +1063,8 @@ BattleAnim_Bubblebeam: ; c993d anim_bgeffect ANIM_BG_32, $0, $0, $0 anim_wait 8 anim_ret -; c9979 -BattleAnim_WaterGun: ; c9979 +BattleAnim_WaterGun: anim_bgeffect ANIM_BG_30, $0, $0, $0 anim_1gfx ANIM_GFX_WATER anim_call BattleAnim_FollowPlayerHead_1 @@ -1145,9 +1085,8 @@ BattleAnim_WaterGun: ; c9979 anim_bgeffect ANIM_BG_32, $0, $0, $0 anim_wait 16 anim_ret -; c99b4 -BattleAnim_HydroPump: ; c99b4 +BattleAnim_HydroPump: anim_bgeffect ANIM_BG_30, $0, $0, $0 anim_1gfx ANIM_GFX_WATER anim_call BattleAnim_FollowPlayerHead_1 @@ -1183,9 +1122,8 @@ BattleAnim_HydroPump: ; c99b4 anim_bgeffect ANIM_BG_32, $0, $0, $0 anim_wait 16 anim_ret -; c9a2a -BattleAnim_Surf: ; c9a2a +BattleAnim_Surf: anim_1gfx ANIM_GFX_BUBBLE anim_bgeffect ANIM_BG_SURF, $0, $0, $0 anim_obj ANIM_OBJ_SURF, 88, 104, $8 @@ -1196,9 +1134,8 @@ BattleAnim_Surf: ; c9a2a anim_incobj 1 anim_wait 56 anim_ret -; c9a42 -BattleAnim_VineWhip: ; c9a42 +BattleAnim_VineWhip: anim_1gfx ANIM_GFX_WHIP anim_sound 0, 1, SFX_VINE_WHIP anim_obj ANIM_OBJ_40, 116, 52, $80 @@ -1209,9 +1146,8 @@ BattleAnim_VineWhip: ; c9a42 anim_incobj 1 anim_wait 4 anim_ret -; c9a5a -BattleAnim_LeechSeed: ; c9a5a +BattleAnim_LeechSeed: anim_1gfx ANIM_GFX_PLANT anim_sound 16, 2, SFX_VINE_WHIP anim_obj ANIM_OBJ_LEECH_SEED, 48, 80, $20 @@ -1225,9 +1161,8 @@ BattleAnim_LeechSeed: ; c9a5a anim_sound 0, 1, SFX_CHARGE anim_wait 128 anim_ret -; c9a7c -BattleAnim_RazorLeaf: ; c9a7c +BattleAnim_RazorLeaf: anim_1gfx ANIM_GFX_PLANT anim_sound 0, 0, SFX_VINE_WHIP anim_obj ANIM_OBJ_RAZOR_LEAF, 48, 80, $28 @@ -1273,9 +1208,8 @@ BattleAnim_RazorLeaf: ; c9a7c anim_incobj 10 anim_wait 64 anim_ret -; c9af2 -BattleAnim_Solarbeam: ; c9af2 +BattleAnim_Solarbeam: anim_if_param_equal $0, .FireSolarBeam ; charge turn anim_1gfx ANIM_GFX_CHARGE @@ -1293,7 +1227,6 @@ BattleAnim_Solarbeam: ; c9af2 anim_bgeffect ANIM_BG_FLASH_WHITE, $0, $4, $2 anim_wait 64 anim_ret -; c9b30 .FireSolarBeam anim_1gfx ANIM_GFX_BEAM @@ -1301,9 +1234,8 @@ BattleAnim_Solarbeam: ; c9af2 anim_call BattleAnim_Solarbeam_branch_cbb39 anim_wait 48 anim_ret -; c9b3c -BattleAnim_Thunderpunch: ; c9b3c +BattleAnim_Thunderpunch: anim_2gfx ANIM_GFX_HIT, ANIM_GFX_LIGHTNING anim_obj ANIM_OBJ_0A, 136, 56, $43 anim_bgeffect ANIM_BG_FLASH_INVERTED, $0, $8, $2 @@ -1311,9 +1243,8 @@ BattleAnim_Thunderpunch: ; c9b3c anim_obj ANIM_OBJ_2F, 152, 68, $0 anim_wait 64 anim_ret -; c9b53 -BattleAnim_Thundershock: ; c9b53 +BattleAnim_Thundershock: anim_2gfx ANIM_GFX_LIGHTNING, ANIM_GFX_EXPLOSION anim_obj ANIM_OBJ_34, 136, 56, $2 anim_wait 16 @@ -1321,9 +1252,8 @@ BattleAnim_Thundershock: ; c9b53 anim_obj ANIM_OBJ_33, 136, 56, $0 anim_wait 96 anim_ret -; c9b66 -BattleAnim_Thunderbolt: ; c9b66 +BattleAnim_Thunderbolt: anim_2gfx ANIM_GFX_LIGHTNING, ANIM_GFX_EXPLOSION anim_obj ANIM_OBJ_LIGHTNING_BOLT, 136, 56, $2 anim_wait 16 @@ -1334,9 +1264,8 @@ BattleAnim_Thunderbolt: ; c9b66 anim_bgeffect ANIM_BG_FLASH_INVERTED, $0, $4, $2 anim_wait 64 anim_ret -; c9b84 -BattleAnim_ThunderWave: ; c9b84 +BattleAnim_ThunderWave: anim_1gfx ANIM_GFX_LIGHTNING anim_bgeffect ANIM_BG_FLASH_INVERTED, $0, $4, $3 anim_sound 0, 1, SFX_THUNDERSHOCK @@ -1346,9 +1275,8 @@ BattleAnim_ThunderWave: ; c9b84 anim_incobj 1 anim_wait 96 anim_ret -; c9b9a -BattleAnim_Thunder: ; c9b9a +BattleAnim_Thunder: anim_1gfx ANIM_GFX_LIGHTNING anim_bgeffect ANIM_BG_FLASH_INVERTED, $0, $6, $20 anim_sound 0, 1, SFX_THUNDER @@ -1361,9 +1289,8 @@ BattleAnim_Thunder: ; c9b9a anim_obj ANIM_OBJ_2D, 136, 68, $0 anim_wait 48 anim_ret -; c9bbd -BattleAnim_RazorWind: ; c9bbd +BattleAnim_RazorWind: anim_if_param_equal $1, BattleAnim_RazorWind_branch_c9fb5 anim_1gfx ANIM_GFX_WHIP anim_bgeffect ANIM_BG_06, $0, $1, $0 @@ -1387,9 +1314,8 @@ BattleAnim_RazorWind: ; c9bbd anim_loop 3, .loop anim_wait 24 anim_ret -; c9c00 -BattleAnim_Sonicboom_JP: ; c9c00 +BattleAnim_Sonicboom_JP: anim_2gfx ANIM_GFX_WHIP, ANIM_GFX_HIT .loop anim_sound 3, 0, SFX_RAZOR_WIND @@ -1412,10 +1338,9 @@ BattleAnim_Sonicboom_JP: ; c9c00 anim_obj ANIM_OBJ_01, 136, 56, $0 anim_wait 16 anim_ret -; c9c36 -BattleAnim_Gust: ; c9c36 -BattleAnim_Sonicboom: ; c9c36 +BattleAnim_Gust: +BattleAnim_Sonicboom: anim_2gfx ANIM_GFX_WIND, ANIM_GFX_HIT .loop anim_sound 0, 1, SFX_RAZOR_WIND @@ -1427,16 +1352,14 @@ BattleAnim_Sonicboom: ; c9c36 anim_obj ANIM_OBJ_01, 128, 32, $18 anim_wait 16 anim_ret -; c9c53 -BattleAnim_Selfdestruct: ; c9c53 +BattleAnim_Selfdestruct: anim_1gfx ANIM_GFX_EXPLOSION anim_bgeffect ANIM_BG_FLASH_INVERTED, $0, $8, $24 anim_if_param_equal $1, .loop anim_call BattleAnim_Selfdestruct_branch_cbb8f anim_wait 16 anim_ret -; c9c63 .loop anim_call BattleAnim_Selfdestruct_branch_cbb62 @@ -1445,9 +1368,8 @@ BattleAnim_Selfdestruct: ; c9c53 anim_loop 2, .loop anim_wait 16 anim_ret -; c9c72 -BattleAnim_Explosion: ; c9c72 +BattleAnim_Explosion: anim_1gfx ANIM_GFX_EXPLOSION anim_bgeffect ANIM_BG_1F, $60, $4, $10 anim_bgeffect ANIM_BG_FLASH_INVERTED, $0, $8, $24 @@ -1455,7 +1377,6 @@ BattleAnim_Explosion: ; c9c72 anim_call BattleAnim_Explosion_branch_cbb8f anim_wait 16 anim_ret -; c9c87 .loop anim_call BattleAnim_Explosion_branch_cbb62 @@ -1464,16 +1385,14 @@ BattleAnim_Explosion: ; c9c72 anim_loop 2, .loop anim_wait 16 anim_ret -; c9c96 -BattleAnim_Acid: ; c9c96 +BattleAnim_Acid: anim_1gfx ANIM_GFX_POISON anim_call BattleAnim_Acid_branch_cbc35 anim_wait 64 anim_ret -; c9c9d -BattleAnim_RockThrow: ; c9c9d +BattleAnim_RockThrow: anim_1gfx ANIM_GFX_ROCKS anim_bgeffect ANIM_BG_1F, $60, $1, $0 anim_sound 0, 1, SFX_STRENGTH @@ -1492,9 +1411,8 @@ BattleAnim_RockThrow: ; c9c9d anim_obj ANIM_OBJ_SMALL_ROCK, 136, 68, $30 anim_wait 96 anim_ret -; c9cd2 -BattleAnim_RockSlide: ; c9cd2 +BattleAnim_RockSlide: anim_1gfx ANIM_GFX_ROCKS anim_bgeffect ANIM_BG_1F, $c0, $1, $0 .loop @@ -1516,9 +1434,8 @@ BattleAnim_RockSlide: ; c9cd2 anim_loop 4, .loop anim_wait 96 anim_ret -; c9d0c -BattleAnim_Sing: ; c9d0c +BattleAnim_Sing: anim_1gfx ANIM_GFX_NOISE anim_sound 16, 2, SFX_SING .loop @@ -1535,12 +1452,11 @@ BattleAnim_Sing: ; c9d0c anim_loop 4, .loop anim_wait 64 anim_ret -; c9d35 -BattleAnim_Poisonpowder: ; c9d35 -BattleAnim_SleepPowder: ; c9d35 -BattleAnim_Spore: ; c9d35 -BattleAnim_StunSpore: ; c9d35 +BattleAnim_Poisonpowder: +BattleAnim_SleepPowder: +BattleAnim_Spore: +BattleAnim_StunSpore: anim_1gfx ANIM_GFX_POWDER .loop anim_sound 0, 1, SFX_POWDER @@ -1561,9 +1477,8 @@ BattleAnim_StunSpore: ; c9d35 anim_loop 2, .loop anim_wait 96 anim_ret -; c9d6a -BattleAnim_HyperBeam: ; c9d6a +BattleAnim_HyperBeam: anim_1gfx ANIM_GFX_BEAM anim_bgeffect ANIM_BG_1F, $30, $4, $10 anim_bgeffect ANIM_BG_FLASH_INVERTED, $0, $8, $40 @@ -1571,9 +1486,8 @@ BattleAnim_HyperBeam: ; c9d6a anim_call BattleAnim_HyperBeam_branch_cbb39 anim_wait 48 anim_ret -; c9d80 -BattleAnim_AuroraBeam: ; c9d80 +BattleAnim_AuroraBeam: anim_1gfx ANIM_GFX_BEAM anim_bgeffect ANIM_BG_06, $0, $2, $0 anim_bgeffect ANIM_BG_ALTERNATE_HUES, $0, $2, $0 @@ -1583,18 +1497,16 @@ BattleAnim_AuroraBeam: ; c9d80 anim_incobj 5 anim_wait 64 anim_ret -; c9d95 -BattleAnim_Vicegrip: ; c9d95 +BattleAnim_Vicegrip: anim_1gfx ANIM_GFX_CUT anim_sound 0, 1, SFX_VICEGRIP anim_obj ANIM_OBJ_37, 152, 40, $0 anim_obj ANIM_OBJ_39, 120, 72, $0 anim_wait 32 anim_ret -; c9da6 -BattleAnim_Scratch: ; c9da6 +BattleAnim_Scratch: anim_1gfx ANIM_GFX_CUT anim_sound 0, 1, SFX_SCRATCH anim_obj ANIM_OBJ_37, 144, 48, $0 @@ -1602,9 +1514,8 @@ BattleAnim_Scratch: ; c9da6 anim_obj ANIM_OBJ_37, 136, 40, $0 anim_wait 32 anim_ret -; c9dbc -BattleAnim_FurySwipes: ; c9dbc +BattleAnim_FurySwipes: anim_1gfx ANIM_GFX_CUT anim_if_param_equal $1, BattleAnim_FurySwipes_branch_c9dd9 anim_sound 0, 1, SFX_SCRATCH @@ -1614,9 +1525,8 @@ BattleAnim_FurySwipes: ; c9dbc anim_sound 0, 1, SFX_SCRATCH anim_wait 32 anim_ret -; c9dd9 -BattleAnim_FurySwipes_branch_c9dd9: ; c9dd9 +BattleAnim_FurySwipes_branch_c9dd9: anim_sound 0, 1, SFX_SCRATCH anim_obj ANIM_OBJ_38, 120, 48, $0 anim_obj ANIM_OBJ_38, 124, 44, $0 @@ -1624,26 +1534,23 @@ BattleAnim_FurySwipes_branch_c9dd9: ; c9dd9 anim_sound 0, 1, SFX_SCRATCH anim_wait 32 anim_ret -; c9df0 -BattleAnim_Cut: ; c9df0 +BattleAnim_Cut: anim_1gfx ANIM_GFX_CUT anim_sound 0, 1, SFX_CUT anim_obj ANIM_OBJ_3A, 152, 40, $0 anim_wait 32 anim_ret -; c9dfc -BattleAnim_Slash: ; c9dfc +BattleAnim_Slash: anim_1gfx ANIM_GFX_CUT anim_sound 0, 1, SFX_CUT anim_obj ANIM_OBJ_3A, 152, 40, $0 anim_obj ANIM_OBJ_3A, 148, 36, $0 anim_wait 32 anim_ret -; c9e0d -BattleAnim_Clamp: ; c9e0d +BattleAnim_Clamp: anim_2gfx ANIM_GFX_CUT, ANIM_GFX_HIT anim_obj ANIM_OBJ_CLAMP, 136, 56, $a0 anim_obj ANIM_OBJ_CLAMP, 136, 56, $20 @@ -1655,9 +1562,8 @@ BattleAnim_Clamp: ; c9e0d anim_obj ANIM_OBJ_01, 128, 64, $18 anim_wait 16 anim_ret -; c9e2e -BattleAnim_Bite: ; c9e2e +BattleAnim_Bite: anim_2gfx ANIM_GFX_CUT, ANIM_GFX_HIT anim_obj ANIM_OBJ_BITE, 136, 56, $98 anim_obj ANIM_OBJ_BITE, 136, 56, $18 @@ -1669,9 +1575,8 @@ BattleAnim_Bite: ; c9e2e anim_obj ANIM_OBJ_01, 128, 64, $18 anim_wait 8 anim_ret -; c9e4f -BattleAnim_Teleport: ; c9e4f +BattleAnim_Teleport: anim_1gfx ANIM_GFX_SPEED anim_call BattleAnim_FollowEnemyFeet_0 anim_bgeffect ANIM_BG_TELEPORT, $0, $1, $0 @@ -1684,31 +1589,28 @@ BattleAnim_Teleport: ; c9e4f anim_call BattleAnim_Teleport_branch_cbb12 anim_wait 64 anim_ret -; c9e6f -BattleAnim_Fly: ; c9e6f +BattleAnim_Fly: anim_if_param_equal $1, BattleAnim_Fly_branch_c9e89 anim_if_param_equal $2, BattleAnim_Fly_branch_c9e82 anim_1gfx ANIM_GFX_HIT anim_sound 0, 1, SFX_WING_ATTACK anim_obj ANIM_OBJ_01, 136, 56, $0 anim_wait 32 -BattleAnim_Fly_branch_c9e82: ; c9e82 +BattleAnim_Fly_branch_c9e82: anim_bgeffect ANIM_BG_SHOW_MON, $0, $1, $0 anim_wait 32 anim_ret -; c9e89 -BattleAnim_Fly_branch_c9e89: ; c9e89 +BattleAnim_Fly_branch_c9e89: anim_1gfx ANIM_GFX_SPEED anim_bgeffect ANIM_BG_06, $0, $1, $0 anim_bgeffect ANIM_BG_HIDE_MON, $0, $1, $0 anim_call BattleAnim_Fly_branch_cbb12 anim_wait 64 anim_ret -; c9e9a -BattleAnim_DoubleTeam: ; c9e9a +BattleAnim_DoubleTeam: anim_call BattleAnim_FollowPlayerHead_0 anim_sound 0, 0, SFX_PSYBEAM anim_bgeffect ANIM_BG_DOUBLE_TEAM, $0, $1, $0 @@ -1718,9 +1620,8 @@ BattleAnim_DoubleTeam: ; c9e9a anim_incbgeffect ANIM_BG_DOUBLE_TEAM anim_call BattleAnim_ShowMon_0 anim_ret -; c9eaf -BattleAnim_Recover: ; c9eaf +BattleAnim_Recover: anim_1gfx ANIM_GFX_BUBBLE anim_call BattleAnim_FollowEnemyFeet_0 anim_sound 0, 0, SFX_FULL_HEAL @@ -1737,9 +1638,8 @@ BattleAnim_Recover: ; c9eaf anim_incbgeffect ANIM_BG_18 anim_call BattleAnim_ShowMon_0 anim_ret -; c9eeb -BattleAnim_Absorb: ; c9eeb +BattleAnim_Absorb: anim_1gfx ANIM_GFX_CHARGE anim_obj ANIM_OBJ_3D, 44, 88, $0 .loop @@ -1755,9 +1655,8 @@ BattleAnim_Absorb: ; c9eeb anim_loop 5, .loop anim_wait 32 anim_ret -; c9f13 -BattleAnim_MegaDrain: ; c9f13 +BattleAnim_MegaDrain: anim_1gfx ANIM_GFX_CHARGE anim_call BattleAnim_FollowEnemyFeet_0 anim_bgeffect ANIM_BG_1C, $0, $0, $10 @@ -1776,21 +1675,18 @@ BattleAnim_MegaDrain: ; c9f13 anim_if_var_equal $7, .done anim_if_var_equal $2, .spawn anim_jump .loop -; c9f46 .spawn anim_obj ANIM_OBJ_3D, 44, 88, $0 anim_jump .loop -; c9f4e .done anim_wait 32 anim_incbgeffect ANIM_BG_1C anim_call BattleAnim_ShowMon_0 anim_ret -; c9f55 -BattleAnim_EggBomb: ; c9f55 +BattleAnim_EggBomb: anim_2gfx ANIM_GFX_EGG, ANIM_GFX_EXPLOSION anim_sound 0, 0, SFX_SWITCH_POKEMON anim_obj ANIM_OBJ_EGG, 44, 104, $1 @@ -1808,9 +1704,8 @@ BattleAnim_EggBomb: ; c9f55 anim_obj ANIM_OBJ_18, 136, 72, $0 anim_wait 24 anim_ret -; c9f85 -BattleAnim_Softboiled: ; c9f85 +BattleAnim_Softboiled: anim_2gfx ANIM_GFX_EGG, ANIM_GFX_BUBBLE anim_call BattleAnim_FollowEnemyFeet_0 anim_sound 0, 0, SFX_SWITCH_POKEMON @@ -1829,12 +1724,11 @@ BattleAnim_Softboiled: ; c9f85 anim_incbgeffect ANIM_BG_18 anim_call BattleAnim_ShowMon_0 anim_ret -; c9fb5 -BattleAnim_FocusEnergy: ; c9fb5 -BattleAnim_RazorWind_branch_c9fb5: ; c9fb5 -BattleAnim_SkullBash_branch_c9fb5: ; c9fb5 -BattleAnim_SkyAttack_branch_c9fb5: ; c9fb5 +BattleAnim_FocusEnergy: +BattleAnim_RazorWind_branch_c9fb5: +BattleAnim_SkullBash_branch_c9fb5: +BattleAnim_SkyAttack_branch_c9fb5: anim_1gfx ANIM_GFX_SPEED anim_call BattleAnim_FollowEnemyFeet_0 anim_bgeffect ANIM_BG_16, $0, $1, $40 @@ -1860,9 +1754,8 @@ BattleAnim_SkyAttack_branch_c9fb5: ; c9fb5 anim_incbgeffect ANIM_BG_16 anim_call BattleAnim_ShowMon_0 anim_ret -; c9ffc -BattleAnim_Bide: ; c9ffc +BattleAnim_Bide: anim_if_param_equal $0, BattleAnim_Bide_branch_c9651 anim_1gfx ANIM_GFX_HIT anim_call BattleAnim_FollowEnemyFeet_0 @@ -1872,9 +1765,8 @@ BattleAnim_Bide: ; c9ffc anim_incbgeffect ANIM_BG_1A anim_call BattleAnim_ShowMon_0 anim_ret -; ca014 -BattleAnim_Bind: ; ca014 +BattleAnim_Bind: anim_1gfx ANIM_GFX_ROPE anim_sound 0, 1, SFX_BIND anim_obj ANIM_OBJ_48, 132, 64, $0 @@ -1889,9 +1781,8 @@ BattleAnim_Bind: ; ca014 anim_incobj 3 anim_wait 96 anim_ret -; ca036 -BattleAnim_Wrap: ; ca036 +BattleAnim_Wrap: anim_1gfx ANIM_GFX_ROPE anim_sound 0, 1, SFX_BIND anim_obj ANIM_OBJ_48, 132, 64, $0 @@ -1906,9 +1797,8 @@ BattleAnim_Wrap: ; ca036 anim_incobj 3 anim_wait 96 anim_ret -; ca058 -BattleAnim_Confusion: ; ca058 +BattleAnim_Confusion: anim_1gfx ANIM_GFX_HIT anim_call BattleAnim_FollowPlayerHead_1 anim_sound 0, 1, SFX_PSYCHIC @@ -1917,9 +1807,8 @@ BattleAnim_Confusion: ; ca058 anim_incbgeffect ANIM_BG_NIGHT_SHADE anim_call BattleAnim_ShowMon_1 anim_ret -; ca06c -BattleAnim_Constrict: ; ca06c +BattleAnim_Constrict: anim_1gfx ANIM_GFX_ROPE anim_sound 0, 1, SFX_BIND anim_obj ANIM_OBJ_49, 132, 64, $0 @@ -1931,18 +1820,16 @@ BattleAnim_Constrict: ; ca06c anim_obj ANIM_OBJ_48, 132, 56, $0 anim_wait 64 anim_ret -; ca08a -BattleAnim_Earthquake: ; ca08a +BattleAnim_Earthquake: anim_bgeffect ANIM_BG_1F, $60, $4, $10 .loop anim_sound 0, 1, SFX_EMBER anim_wait 24 anim_loop 4, .loop anim_ret -; ca098 -BattleAnim_Fissure: ; ca098 +BattleAnim_Fissure: anim_bgeffect ANIM_BG_FLASH_INVERTED, $0, $8, $40 anim_bgeffect ANIM_BG_1F, $60, $4, $0 .loop @@ -1950,9 +1837,8 @@ BattleAnim_Fissure: ; ca098 anim_wait 24 anim_loop 4, .loop anim_ret -; ca0ab -BattleAnim_Growl: ; ca0ab +BattleAnim_Growl: anim_1gfx ANIM_GFX_NOISE anim_enemyfeetobj anim_bgeffect ANIM_BG_06, $0, $2, $0 @@ -1973,9 +1859,8 @@ BattleAnim_Growl: ; ca0ab anim_incobj 10 anim_wait 8 anim_ret -; ca0d7 -BattleAnim_Roar: ; ca0d7 +BattleAnim_Roar: anim_1gfx ANIM_GFX_NOISE anim_bgeffect ANIM_BG_06, $0, $2, $0 anim_cry $1 @@ -1989,9 +1874,8 @@ BattleAnim_Roar: ; ca0d7 anim_wait 64 .done anim_ret -; ca0f4 -BattleAnim_Supersonic: ; ca0f4 +BattleAnim_Supersonic: anim_1gfx ANIM_GFX_PSYCHIC .loop anim_sound 6, 2, SFX_SUPERSONIC @@ -2000,9 +1884,8 @@ BattleAnim_Supersonic: ; ca0f4 anim_loop 10, .loop anim_wait 64 anim_ret -; ca105 -BattleAnim_Screech: ; ca105 +BattleAnim_Screech: anim_1gfx ANIM_GFX_PSYCHIC anim_bgeffect ANIM_BG_1F, $8, $1, $20 anim_sound 6, 2, SFX_SCREECH @@ -2012,9 +1895,8 @@ BattleAnim_Screech: ; ca105 anim_loop 2, .loop anim_wait 64 anim_ret -; ca11b -BattleAnim_ConfuseRay: ; ca11b +BattleAnim_ConfuseRay: anim_1gfx ANIM_GFX_SPEED anim_bgeffect ANIM_BG_06, $0, $2, $0 anim_bgeffect ANIM_BG_08, $0, $4, $0 @@ -2033,17 +1915,15 @@ BattleAnim_ConfuseRay: ; ca11b anim_loop 8, .loop anim_wait 32 anim_ret -; ca15e -BattleAnim_Leer: ; ca15e +BattleAnim_Leer: anim_1gfx ANIM_GFX_BEAM anim_bgeffect ANIM_BG_06, $0, $2, $0 anim_call BattleAnim_Leer_branch_cbadc anim_wait 16 anim_ret -; ca16a -BattleAnim_Reflect: ; ca16a +BattleAnim_Reflect: anim_1gfx ANIM_GFX_REFLECT anim_bgeffect ANIM_BG_06, $0, $2, $0 anim_bgeffect ANIM_BG_FLASH_INVERTED, $0, $4, $2 @@ -2055,9 +1935,8 @@ BattleAnim_Reflect: ; ca16a anim_obj ANIM_OBJ_SCREEN, 72, 80, $0 anim_wait 64 anim_ret -; ca18e -BattleAnim_LightScreen: ; ca18e +BattleAnim_LightScreen: anim_2gfx ANIM_GFX_SPEED, ANIM_GFX_REFLECT anim_bgeffect ANIM_BG_06, $0, $2, $0 anim_sound 0, 0, SFX_FLASH @@ -2081,9 +1960,8 @@ BattleAnim_LightScreen: ; ca18e anim_obj ANIM_OBJ_SHINY, 72, 80, $38 anim_wait 64 anim_ret -; ca1d5 -BattleAnim_Amnesia: ; ca1d5 +BattleAnim_Amnesia: anim_1gfx ANIM_GFX_STATUS anim_sound 0, 0, SFX_LICK anim_obj ANIM_OBJ_AMNESIA, 64, 80, $2 @@ -2093,9 +1971,8 @@ BattleAnim_Amnesia: ; ca1d5 anim_obj ANIM_OBJ_AMNESIA, 72, 80, $0 anim_wait 64 anim_ret -; ca1ed -BattleAnim_DizzyPunch: ; ca1ed +BattleAnim_DizzyPunch: anim_2gfx ANIM_GFX_STATUS, ANIM_GFX_HIT anim_sound 0, 1, SFX_MEGA_PUNCH anim_obj ANIM_OBJ_00, 136, 40, $0 @@ -2107,9 +1984,8 @@ BattleAnim_DizzyPunch: ; ca1ed anim_obj ANIM_OBJ_CHICK, 136, 24, $bf anim_wait 96 anim_ret -; ca212 -BattleAnim_Rest: ; ca212 +BattleAnim_Rest: anim_1gfx ANIM_GFX_STATUS anim_sound 0, 0, SFX_TAIL_WHIP .loop @@ -2118,9 +1994,8 @@ BattleAnim_Rest: ; ca212 anim_loop 3, .loop anim_wait 32 anim_ret -; ca223 -BattleAnim_AcidArmor: ; ca223 +BattleAnim_AcidArmor: anim_1gfx ANIM_GFX_HIT anim_call BattleAnim_FollowPlayerHead_0 anim_bgeffect ANIM_BG_ACID_ARMOR, $0, $1, $8 @@ -2129,9 +2004,8 @@ BattleAnim_AcidArmor: ; ca223 anim_incbgeffect ANIM_BG_ACID_ARMOR anim_call BattleAnim_ShowMon_0 anim_ret -; ca237 -BattleAnim_Splash: ; ca237 +BattleAnim_Splash: anim_1gfx ANIM_GFX_HIT anim_sound 0, 0, SFX_VICEGRIP anim_call BattleAnim_FollowPlayerHead_0 @@ -2140,9 +2014,8 @@ BattleAnim_Splash: ; ca237 anim_incbgeffect ANIM_BG_BOUNCE_DOWN anim_call BattleAnim_ShowMon_0 anim_ret -; ca24b -BattleAnim_Dig: ; ca24b +BattleAnim_Dig: anim_2gfx ANIM_GFX_SAND, ANIM_GFX_HIT anim_if_param_equal $0, .hit anim_if_param_equal $2, .fail @@ -2169,15 +2042,13 @@ BattleAnim_Dig: ; ca24b anim_bgeffect ANIM_BG_ENTER_MON, $0, $1, $0 anim_wait 32 anim_ret -; ca28d -BattleAnim_SandAttack: ; ca28d +BattleAnim_SandAttack: anim_1gfx ANIM_GFX_SAND anim_call BattleAnim_SandAttack_branch_cbc5b anim_ret -; ca293 -BattleAnim_StringShot: ; ca293 +BattleAnim_StringShot: anim_1gfx ANIM_GFX_WEB anim_bgeffect ANIM_BG_07, $0, $2, $0 anim_sound 6, 2, SFX_MENU @@ -2199,9 +2070,8 @@ BattleAnim_StringShot: ; ca293 anim_obj ANIM_OBJ_STRING_SHOT, 132, 56, $2 anim_wait 64 anim_ret -; ca2d1 -BattleAnim_Headbutt: ; ca2d1 +BattleAnim_Headbutt: anim_1gfx ANIM_GFX_HIT anim_bgeffect ANIM_BG_1F, $14, $2, $0 anim_wait 32 @@ -2213,9 +2083,8 @@ BattleAnim_Headbutt: ; ca2d1 anim_wait 8 anim_call BattleAnim_ShowMon_0 anim_ret -; ca2ef -BattleAnim_Tackle: ; ca2ef +BattleAnim_Tackle: anim_1gfx ANIM_GFX_HIT anim_call BattleAnim_FollowPlayerHead_0 anim_bgeffect ANIM_BG_TACKLE, $0, $1, $0 @@ -2225,9 +2094,8 @@ BattleAnim_Tackle: ; ca2ef anim_wait 8 anim_call BattleAnim_ShowMon_0 anim_ret -; ca307 -BattleAnim_BodySlam: ; ca307 +BattleAnim_BodySlam: anim_1gfx ANIM_GFX_HIT anim_call BattleAnim_FollowPlayerHead_0 anim_bgeffect ANIM_BG_BOUNCE_DOWN, $0, $1, $0 @@ -2244,9 +2112,8 @@ BattleAnim_BodySlam: ; ca307 anim_wait 3 anim_call BattleAnim_ShowMon_0 anim_ret -; ca331 -BattleAnim_TakeDown: ; ca331 +BattleAnim_TakeDown: anim_1gfx ANIM_GFX_HIT anim_call BattleAnim_FollowEnemyFeet_0 anim_bgeffect ANIM_BG_TACKLE, $0, $1, $0 @@ -2261,9 +2128,8 @@ BattleAnim_TakeDown: ; ca331 anim_wait 3 anim_call BattleAnim_ShowMon_0 anim_ret -; ca35c -BattleAnim_DoubleEdge: ; ca35c +BattleAnim_DoubleEdge: anim_1gfx ANIM_GFX_HIT anim_call BattleAnim_FollowEnemyFeet_0 anim_bgeffect ANIM_BG_FLASH_INVERTED, $0, $4, $10 @@ -2277,9 +2143,8 @@ BattleAnim_DoubleEdge: ; ca35c anim_wait 3 anim_call BattleAnim_ShowMon_0 anim_ret -; ca382 -BattleAnim_Submission: ; ca382 +BattleAnim_Submission: anim_1gfx ANIM_GFX_HIT anim_call BattleAnim_FollowEnemyFeet_1 anim_bgeffect ANIM_BG_26, $0, $0, $0 @@ -2294,9 +2159,8 @@ BattleAnim_Submission: ; ca382 anim_incbgeffect ANIM_BG_26 anim_call BattleAnim_ShowMon_1 anim_ret -; ca3a8 -BattleAnim_Whirlwind: ; ca3a8 +BattleAnim_Whirlwind: anim_1gfx ANIM_GFX_WIND .loop anim_sound 0, 0, SFX_RAZOR_WIND @@ -2319,9 +2183,8 @@ BattleAnim_Whirlwind: ; ca3a8 anim_wait 64 .done anim_ret -; ca3d8 -BattleAnim_Hypnosis: ; ca3d8 +BattleAnim_Hypnosis: anim_1gfx ANIM_GFX_PSYCHIC .loop anim_sound 6, 2, SFX_SUPERSONIC @@ -2331,9 +2194,8 @@ BattleAnim_Hypnosis: ; ca3d8 anim_loop 3, .loop anim_wait 56 anim_ret -; ca3ee -BattleAnim_Haze: ; ca3ee +BattleAnim_Haze: anim_1gfx ANIM_GFX_HAZE anim_sound 0, 1, SFX_SURF .loop @@ -2343,9 +2205,8 @@ BattleAnim_Haze: ; ca3ee anim_loop 5, .loop anim_wait 96 anim_ret -; ca404 -BattleAnim_Mist: ; ca404 +BattleAnim_Mist: anim_obp0 $54 anim_1gfx ANIM_GFX_HAZE anim_sound 0, 0, SFX_SURF @@ -2355,9 +2216,8 @@ BattleAnim_Mist: ; ca404 anim_loop 10, .loop anim_wait 96 anim_ret -; ca417 -BattleAnim_Smog: ; ca417 +BattleAnim_Smog: anim_1gfx ANIM_GFX_HAZE anim_sound 0, 1, SFX_BUBBLEBEAM .loop @@ -2366,9 +2226,8 @@ BattleAnim_Smog: ; ca417 anim_loop 10, .loop anim_wait 96 anim_ret -; ca428 -BattleAnim_PoisonGas: ; ca428 +BattleAnim_PoisonGas: anim_1gfx ANIM_GFX_HAZE anim_sound 16, 2, SFX_BUBBLEBEAM .loop @@ -2377,9 +2236,8 @@ BattleAnim_PoisonGas: ; ca428 anim_loop 10, .loop anim_wait 128 anim_ret -; ca439 -BattleAnim_HornAttack: ; ca439 +BattleAnim_HornAttack: anim_2gfx ANIM_GFX_HORN, ANIM_GFX_HIT anim_obj ANIM_OBJ_HORN, 72, 80, $1 anim_wait 16 @@ -2387,9 +2245,8 @@ BattleAnim_HornAttack: ; ca439 anim_obj ANIM_OBJ_01, 136, 56, $0 anim_wait 16 anim_ret -; ca44c -BattleAnim_FuryAttack: ; ca44c +BattleAnim_FuryAttack: anim_2gfx ANIM_GFX_HORN, ANIM_GFX_HIT anim_obj ANIM_OBJ_HORN, 72, 72, $2 anim_wait 8 @@ -2407,9 +2264,8 @@ BattleAnim_FuryAttack: ; ca44c anim_obj ANIM_OBJ_04, 132, 48, $0 anim_wait 8 anim_ret -; ca47d -BattleAnim_HornDrill: ; ca47d +BattleAnim_HornDrill: anim_2gfx ANIM_GFX_HORN, ANIM_GFX_HIT anim_bgeffect ANIM_BG_FLASH_INVERTED, $0, $8, $40 anim_obj ANIM_OBJ_HORN, 72, 80, $3 @@ -2429,9 +2285,8 @@ BattleAnim_HornDrill: ; ca47d anim_wait 8 anim_loop 3, .loop anim_ret -; ca4b4 -BattleAnim_PoisonSting: ; ca4b4 +BattleAnim_PoisonSting: anim_2gfx ANIM_GFX_HORN, ANIM_GFX_HIT anim_obj ANIM_OBJ_60, 64, 92, $14 anim_wait 16 @@ -2439,9 +2294,8 @@ BattleAnim_PoisonSting: ; ca4b4 anim_obj ANIM_OBJ_05, 136, 56, $0 anim_wait 16 anim_ret -; ca4c7 -BattleAnim_Twineedle: ; ca4c7 +BattleAnim_Twineedle: anim_2gfx ANIM_GFX_HORN, ANIM_GFX_HIT anim_sound 0, 1, SFX_POISON_STING anim_obj ANIM_OBJ_60, 64, 92, $14 @@ -2452,9 +2306,8 @@ BattleAnim_Twineedle: ; ca4c7 anim_obj ANIM_OBJ_05, 128, 48, $0 anim_wait 16 anim_ret -; ca4e7 -BattleAnim_PinMissile: ; ca4e7 +BattleAnim_PinMissile: anim_2gfx ANIM_GFX_HORN, ANIM_GFX_HIT .loop anim_obj ANIM_OBJ_60, 64, 92, $28 @@ -2472,9 +2325,8 @@ BattleAnim_PinMissile: ; ca4e7 anim_loop 3, .loop anim_wait 16 anim_ret -; ca51a -BattleAnim_SpikeCannon: ; ca51a +BattleAnim_SpikeCannon: anim_2gfx ANIM_GFX_HORN, ANIM_GFX_HIT .loop anim_obj ANIM_OBJ_60, 64, 92, $18 @@ -2492,9 +2344,8 @@ BattleAnim_SpikeCannon: ; ca51a anim_loop 3, .loop anim_wait 16 anim_ret -; ca54d -BattleAnim_Transform: ; ca54d +BattleAnim_Transform: anim_1gfx ANIM_GFX_HIT anim_call BattleAnim_FollowPlayerHead_0 anim_transform @@ -2506,9 +2357,8 @@ BattleAnim_Transform: ; ca54d anim_wait 48 anim_call BattleAnim_ShowMon_0 anim_ret -; ca564 -BattleAnim_PetalDance: ; ca564 +BattleAnim_PetalDance: anim_sound 0, 0, SFX_MENU anim_2gfx ANIM_GFX_FLOWER, ANIM_GFX_HIT .loop @@ -2521,9 +2371,8 @@ BattleAnim_PetalDance: ; ca564 anim_obj ANIM_OBJ_00, 136, 56, $0 anim_wait 16 anim_ret -; ca580 -BattleAnim_Barrage: ; ca580 +BattleAnim_Barrage: anim_2gfx ANIM_GFX_EGG, ANIM_GFX_EXPLOSION anim_sound 6, 2, SFX_THROW_BALL anim_obj ANIM_OBJ_SLUDGE_BOMB, 64, 92, $10 @@ -2532,9 +2381,8 @@ BattleAnim_Barrage: ; ca580 anim_obj ANIM_OBJ_18, 136, 56, $0 anim_wait 16 anim_ret -; ca596 -BattleAnim_PayDay: ; ca596 +BattleAnim_PayDay: anim_2gfx ANIM_GFX_HIT, ANIM_GFX_STATUS anim_sound 0, 1, SFX_POUND anim_obj ANIM_OBJ_01, 128, 56, $0 @@ -2543,9 +2391,8 @@ BattleAnim_PayDay: ; ca596 anim_obj ANIM_OBJ_PAY_DAY, 120, 76, $1 anim_wait 64 anim_ret -; ca5ac -BattleAnim_Mimic: ; ca5ac +BattleAnim_Mimic: anim_1gfx ANIM_GFX_SPEED anim_obp0 $fc anim_sound 63, 3, SFX_LICK @@ -2560,9 +2407,8 @@ BattleAnim_Mimic: ; ca5ac anim_wait 128 anim_wait 48 anim_ret -; ca5de -BattleAnim_LovelyKiss: ; ca5de +BattleAnim_LovelyKiss: anim_2gfx ANIM_GFX_OBJECTS, ANIM_GFX_ANGELS anim_bgeffect ANIM_BG_07, $0, $2, $0 anim_obj ANIM_OBJ_LOVELY_KISS, 152, 40, $0 @@ -2571,9 +2417,8 @@ BattleAnim_LovelyKiss: ; ca5de anim_obj ANIM_OBJ_HEART, 128, 40, $0 anim_wait 40 anim_ret -; ca5f6 -BattleAnim_Bonemerang: ; ca5f6 +BattleAnim_Bonemerang: anim_2gfx ANIM_GFX_MISC, ANIM_GFX_HIT anim_sound 6, 2, SFX_HYDRO_PUMP anim_obj ANIM_OBJ_BONEMERANG, 88, 56, $1c @@ -2582,9 +2427,8 @@ BattleAnim_Bonemerang: ; ca5f6 anim_obj ANIM_OBJ_01, 136, 56, $0 anim_wait 24 anim_ret -; ca60c -BattleAnim_Swift: ; ca60c +BattleAnim_Swift: anim_1gfx ANIM_GFX_OBJECTS anim_sound 6, 2, SFX_METRONOME anim_obj ANIM_OBJ_SWIFT, 64, 88, $4 @@ -2594,9 +2438,8 @@ BattleAnim_Swift: ; ca60c anim_obj ANIM_OBJ_SWIFT, 64, 76, $4 anim_wait 64 anim_ret -; ca624 -BattleAnim_Crabhammer: ; ca624 +BattleAnim_Crabhammer: anim_1gfx ANIM_GFX_HIT anim_bgeffect ANIM_BG_1F, $40, $2, $0 anim_wait 48 @@ -2607,9 +2450,8 @@ BattleAnim_Crabhammer: ; ca624 anim_wait 12 anim_loop 3, .loop anim_ret -; ca63f -BattleAnim_SkullBash: ; ca63f +BattleAnim_SkullBash: anim_if_param_equal $1, BattleAnim_SkullBash_branch_c9fb5 anim_1gfx ANIM_GFX_HIT anim_bgeffect ANIM_BG_1F, $14, $2, $0 @@ -2625,9 +2467,8 @@ BattleAnim_SkullBash: ; ca63f anim_loop 3, .loop anim_call BattleAnim_ShowMon_0 anim_ret -; ca66a -BattleAnim_Kinesis: ; ca66a +BattleAnim_Kinesis: anim_2gfx ANIM_GFX_MISC, ANIM_GFX_NOISE anim_bgeffect ANIM_BG_06, $0, $2, $0 anim_obj ANIM_OBJ_KINESIS, 80, 76, $0 @@ -2641,9 +2482,8 @@ BattleAnim_Kinesis: ; ca66a anim_sound 0, 0, SFX_KINESIS_2 anim_wait 32 anim_ret -; ca68b -BattleAnim_Peck: ; ca68b +BattleAnim_Peck: anim_1gfx ANIM_GFX_HIT anim_sound 0, 1, SFX_PECK anim_obj ANIM_OBJ_02, 128, 48, $0 @@ -2652,9 +2492,8 @@ BattleAnim_Peck: ; ca68b anim_obj ANIM_OBJ_02, 136, 56, $0 anim_wait 16 anim_ret -; ca6a0 -BattleAnim_DrillPeck: ; ca6a0 +BattleAnim_DrillPeck: anim_1gfx ANIM_GFX_HIT .loop anim_sound 0, 1, SFX_PECK @@ -2672,9 +2511,8 @@ BattleAnim_DrillPeck: ; ca6a0 anim_loop 5, .loop anim_wait 16 anim_ret -; ca6cc -BattleAnim_Guillotine: ; ca6cc +BattleAnim_Guillotine: anim_1gfx ANIM_GFX_CUT anim_bgeffect ANIM_BG_FLASH_INVERTED, $0, $8, $10 anim_bgeffect ANIM_BG_1F, $40, $2, $0 @@ -2688,9 +2526,8 @@ BattleAnim_Guillotine: ; ca6cc anim_obj ANIM_OBJ_39, 120, 72, $0 anim_wait 32 anim_ret -; ca700 -BattleAnim_Flash: ; ca700 +BattleAnim_Flash: anim_1gfx ANIM_GFX_SPEED anim_sound 0, 1, SFX_FLASH anim_bgeffect ANIM_BG_FLASH_INVERTED, $0, $6, $20 @@ -2712,9 +2549,8 @@ BattleAnim_Flash: ; ca700 anim_obj ANIM_OBJ_FLASH, 136, 56, $38 anim_wait 32 anim_ret -; ca73c -BattleAnim_Substitute: ; ca73c +BattleAnim_Substitute: anim_sound 0, 0, SFX_SURF anim_if_param_equal $3, BattleAnim_Substitute_branch_ca77c anim_if_param_equal $2, BattleAnim_Substitute_branch_ca76e @@ -2727,36 +2563,32 @@ BattleAnim_Substitute: ; ca73c anim_bgeffect ANIM_BG_ENTER_MON, $0, $1, $0 anim_wait 32 anim_ret -; ca760 -BattleAnim_Substitute_branch_ca760: ; ca760 +BattleAnim_Substitute_branch_ca760: anim_bgeffect ANIM_BG_27, $0, $1, $0 anim_wait 48 anim_dropsub anim_bgeffect ANIM_BG_SHOW_MON, $0, $1, $0 anim_wait 32 anim_ret -; ca76e -BattleAnim_Substitute_branch_ca76e: ; ca76e +BattleAnim_Substitute_branch_ca76e: anim_bgeffect ANIM_BG_27, $0, $1, $0 anim_wait 48 anim_raisesub anim_bgeffect ANIM_BG_SHOW_MON, $0, $1, $0 anim_wait 32 anim_ret -; ca77c -BattleAnim_Substitute_branch_ca77c: ; ca77c +BattleAnim_Substitute_branch_ca77c: anim_bgeffect ANIM_BG_HIDE_MON, $0, $1, $0 anim_wait 48 anim_dropsub anim_bgeffect ANIM_BG_SHOW_MON, $0, $1, $0 anim_wait 32 anim_ret -; ca78a -BattleAnim_Minimize: ; ca78a +BattleAnim_Minimize: anim_sound 0, 0, SFX_SURF anim_1gfx ANIM_GFX_HIT anim_call BattleAnim_FollowPlayerHead_0 @@ -2768,9 +2600,8 @@ BattleAnim_Minimize: ; ca78a anim_wait 48 anim_call BattleAnim_ShowMon_0 anim_ret -; ca7a1 -BattleAnim_SkyAttack: ; ca7a1 +BattleAnim_SkyAttack: anim_if_param_equal $1, BattleAnim_SkyAttack_branch_c9fb5 anim_1gfx ANIM_GFX_SKY_ATTACK anim_bgeffect ANIM_BG_27, $0, $1, $0 @@ -2788,9 +2619,8 @@ BattleAnim_SkyAttack: ; ca7a1 anim_bgeffect ANIM_BG_SHOW_MON, $0, $1, $0 anim_wait 16 anim_ret -; ca7cc -BattleAnim_NightShade: ; ca7cc +BattleAnim_NightShade: anim_1gfx ANIM_GFX_HIT anim_bgp $1b anim_obp1 $1b @@ -2802,17 +2632,15 @@ BattleAnim_NightShade: ; ca7cc anim_incbgeffect ANIM_BG_NIGHT_SHADE anim_call BattleAnim_ShowMon_1 anim_ret -; ca7e5 -BattleAnim_Lick: ; ca7e5 +BattleAnim_Lick: anim_1gfx ANIM_GFX_WATER anim_sound 0, 1, SFX_LICK anim_obj ANIM_OBJ_LICK, 136, 56, $0 anim_wait 64 anim_ret -; ca7f1 -BattleAnim_TriAttack: ; ca7f1 +BattleAnim_TriAttack: anim_3gfx ANIM_GFX_FIRE, ANIM_GFX_ICE, ANIM_GFX_LIGHTNING anim_call BattleAnim_TriAttack_branch_cbbcc anim_wait 16 @@ -2823,9 +2651,8 @@ BattleAnim_TriAttack: ; ca7f1 anim_obj ANIM_OBJ_2F, 152, 68, $0 anim_wait 16 anim_ret -; ca80c -BattleAnim_Withdraw: ; ca80c +BattleAnim_Withdraw: anim_1gfx ANIM_GFX_REFLECT anim_call BattleAnim_FollowPlayerHead_0 anim_bgeffect ANIM_BG_WITHDRAW, $0, $1, $50 @@ -2838,9 +2665,8 @@ BattleAnim_Withdraw: ; ca80c anim_incbgeffect ANIM_BG_WITHDRAW anim_call BattleAnim_ShowMon_0 anim_ret -; ca829 -BattleAnim_Psybeam: ; ca829 +BattleAnim_Psybeam: anim_1gfx ANIM_GFX_PSYCHIC anim_bgeffect ANIM_BG_06, $0, $2, $0 anim_bgeffect ANIM_BG_08, $0, $4, $0 @@ -2851,9 +2677,8 @@ BattleAnim_Psybeam: ; ca829 anim_loop 10, .loop anim_wait 48 anim_ret -; ca844 -BattleAnim_DreamEater: ; ca844 +BattleAnim_DreamEater: anim_1gfx ANIM_GFX_BUBBLE anim_bgp $1b anim_obp0 $27 @@ -2862,27 +2687,24 @@ BattleAnim_DreamEater: ; ca844 anim_wait 128 anim_wait 48 anim_ret -; ca853 -BattleAnim_LeechLife: ; ca853 +BattleAnim_LeechLife: anim_1gfx ANIM_GFX_BUBBLE anim_sound 6, 3, SFX_WATER_GUN anim_call BattleAnim_LeechLife_branch_cbab3 anim_wait 128 anim_wait 48 anim_ret -; ca85e -BattleAnim_Harden: ; ca85e +BattleAnim_Harden: anim_1gfx ANIM_GFX_REFLECT anim_obp0 $0 anim_call BattleAnim_FollowEnemyFeet_0 anim_call BattleAnim_Harden_branch_cbc43 anim_call BattleAnim_ShowMon_0 anim_ret -; ca86c -BattleAnim_Psywave: ; ca86c +BattleAnim_Psywave: anim_1gfx ANIM_GFX_PSYCHIC anim_bgeffect ANIM_BG_PSYCHIC, $0, $0, $0 .loop @@ -2900,18 +2722,16 @@ BattleAnim_Psywave: ; ca86c anim_incbgeffect ANIM_BG_PSYCHIC anim_wait 4 anim_ret -; ca897 -BattleAnim_Glare: ; ca897 +BattleAnim_Glare: anim_1gfx ANIM_GFX_BEAM anim_bgeffect ANIM_BG_FLASH_INVERTED, $0, $8, $20 anim_bgeffect ANIM_BG_06, $0, $2, $0 anim_call BattleAnim_Glare_branch_cbadc anim_wait 16 anim_ret -; ca8a8 -BattleAnim_Thrash: ; ca8a8 +BattleAnim_Thrash: anim_1gfx ANIM_GFX_HIT anim_sound 0, 1, SFX_POUND anim_obj ANIM_OBJ_08, 120, 72, $0 @@ -2926,9 +2746,8 @@ BattleAnim_Thrash: ; ca8a8 anim_obj ANIM_OBJ_00, 152, 40, $0 anim_wait 16 anim_ret -; ca8d5 -BattleAnim_Growth: ; ca8d5 +BattleAnim_Growth: anim_bgeffect ANIM_BG_WHITE_HUES, $0, $8, $0 anim_1gfx ANIM_GFX_CHARGE anim_sound 0, 0, SFX_SWORDS_DANCE @@ -2942,9 +2761,8 @@ BattleAnim_Growth: ; ca8d5 anim_obj ANIM_OBJ_GROWTH, 48, 108, $38 anim_wait 64 anim_ret -; ca909 -BattleAnim_Conversion2: ; ca909 +BattleAnim_Conversion2: anim_1gfx ANIM_GFX_EXPLOSION anim_sound 63, 3, SFX_SHARPEN anim_obj ANIM_OBJ_CONVERSION2, 132, 44, $0 @@ -2958,9 +2776,8 @@ BattleAnim_Conversion2: ; ca909 anim_wait 128 anim_wait 48 anim_ret -; ca939 -BattleAnim_Smokescreen: ; ca939 +BattleAnim_Smokescreen: anim_3gfx ANIM_GFX_HAZE, ANIM_GFX_EGG, ANIM_GFX_SMOKE anim_sound 6, 2, SFX_THROW_BALL anim_obj ANIM_OBJ_SMOKESCREEN, 64, 92, $6c @@ -2976,9 +2793,8 @@ BattleAnim_Smokescreen: ; ca939 anim_loop 5, .loop anim_wait 128 anim_ret -; ca960 -BattleAnim_Strength: ; ca960 +BattleAnim_Strength: anim_2gfx ANIM_GFX_ROCKS, ANIM_GFX_HIT anim_bgeffect ANIM_BG_20, $10, $1, $20 anim_sound 0, 0, SFX_STRENGTH @@ -2990,9 +2806,8 @@ BattleAnim_Strength: ; ca960 anim_obj ANIM_OBJ_00, 132, 40, $0 anim_wait 16 anim_ret -; ca97e -BattleAnim_SwordsDance: ; ca97e +BattleAnim_SwordsDance: anim_1gfx ANIM_GFX_WHIP anim_sound 0, 0, SFX_SWORDS_DANCE anim_obj ANIM_OBJ_SWORDS_DANCE, 48, 108, $0 @@ -3002,9 +2817,8 @@ BattleAnim_SwordsDance: ; ca97e anim_obj ANIM_OBJ_SWORDS_DANCE, 48, 108, $34 anim_wait 56 anim_ret -; ca99e -BattleAnim_QuickAttack: ; ca99e +BattleAnim_QuickAttack: anim_2gfx ANIM_GFX_SPEED, ANIM_GFX_HIT anim_sound 0, 0, SFX_MENU anim_bgeffect ANIM_BG_HIDE_MON, $0, $1, $0 @@ -3021,9 +2835,8 @@ BattleAnim_QuickAttack: ; ca99e anim_bgeffect ANIM_BG_SHOW_MON, $0, $1, $0 anim_wait 16 anim_ret -; ca9d8 -BattleAnim_Meditate: ; ca9d8 +BattleAnim_Meditate: anim_1gfx ANIM_GFX_HIT anim_call BattleAnim_FollowEnemyFeet_0 anim_sound 0, 0, SFX_PSYBEAM @@ -3033,9 +2846,8 @@ BattleAnim_Meditate: ; ca9d8 anim_wait 48 anim_call BattleAnim_ShowMon_0 anim_ret -; ca9ed -BattleAnim_Sharpen: ; ca9ed +BattleAnim_Sharpen: anim_1gfx ANIM_GFX_SHAPES anim_obp0 $e4 anim_call BattleAnim_FollowEnemyFeet_0 @@ -3047,9 +2859,8 @@ BattleAnim_Sharpen: ; ca9ed anim_incbgeffect ANIM_BG_18 anim_call BattleAnim_ShowMon_0 anim_ret -; caa0a -BattleAnim_DefenseCurl: ; caa0a +BattleAnim_DefenseCurl: anim_1gfx ANIM_GFX_SHAPES anim_obp0 $e4 anim_call BattleAnim_FollowEnemyFeet_0 @@ -3061,9 +2872,8 @@ BattleAnim_DefenseCurl: ; caa0a anim_incbgeffect ANIM_BG_18 anim_call BattleAnim_ShowMon_0 anim_ret -; caa27 -BattleAnim_SeismicToss: ; caa27 +BattleAnim_SeismicToss: anim_2gfx ANIM_GFX_GLOBE, ANIM_GFX_HIT anim_bgeffect ANIM_BG_20, $10, $1, $20 anim_sound 0, 0, SFX_STRENGTH @@ -3075,9 +2885,8 @@ BattleAnim_SeismicToss: ; caa27 anim_obj ANIM_OBJ_00, 132, 40, $0 anim_wait 16 anim_ret -; caa45 -BattleAnim_Rage: ; caa45 +BattleAnim_Rage: anim_1gfx ANIM_GFX_HIT anim_call BattleAnim_FollowEnemyFeet_0 anim_bgeffect ANIM_BG_1A, $0, $1, $20 @@ -3095,9 +2904,8 @@ BattleAnim_Rage: ; caa45 anim_obj ANIM_OBJ_00, 152, 40, $0 anim_wait 16 anim_ret -; caa74 -BattleAnim_Agility: ; caa74 +BattleAnim_Agility: anim_1gfx ANIM_GFX_WIND anim_obp0 $fc anim_call BattleAnim_FollowEnemyFeet_0 @@ -3117,9 +2925,8 @@ BattleAnim_Agility: ; caa74 anim_incbgeffect ANIM_BG_18 anim_call BattleAnim_ShowMon_0 anim_ret -; caab2 -BattleAnim_BoneClub: ; caab2 +BattleAnim_BoneClub: anim_2gfx ANIM_GFX_HIT, ANIM_GFX_MISC anim_obj ANIM_OBJ_BONE_CLUB, 64, 88, $2 anim_wait 32 @@ -3127,9 +2934,8 @@ BattleAnim_BoneClub: ; caab2 anim_obj ANIM_OBJ_01, 136, 56, $0 anim_wait 16 anim_ret -; caac5 -BattleAnim_Barrier: ; caac5 +BattleAnim_Barrier: anim_1gfx ANIM_GFX_REFLECT anim_enemyfeetobj anim_bgeffect ANIM_BG_06, $0, $2, $0 @@ -3141,9 +2947,8 @@ BattleAnim_Barrier: ; caac5 anim_obj ANIM_OBJ_SCREEN, 72, 80, $0 anim_wait 32 anim_ret -; caae1 -BattleAnim_Waterfall: ; caae1 +BattleAnim_Waterfall: anim_1gfx ANIM_GFX_HIT anim_call BattleAnim_FollowPlayerHead_0 anim_bgeffect ANIM_BG_25, $0, $1, $0 @@ -3165,9 +2970,8 @@ BattleAnim_Waterfall: ; caae1 anim_obj ANIM_OBJ_01, 136, 24, $0 anim_wait 8 anim_ret -; cab1d -BattleAnim_PsychicM: ; cab1d +BattleAnim_PsychicM: anim_1gfx ANIM_GFX_PSYCHIC anim_bgeffect ANIM_BG_ALTERNATE_HUES, $0, $2, $0 anim_bgeffect ANIM_BG_PSYCHIC, $0, $0, $0 @@ -3180,16 +2984,14 @@ BattleAnim_PsychicM: ; cab1d anim_incbgeffect ANIM_BG_PSYCHIC anim_wait 4 anim_ret -; cab3b -BattleAnim_Sludge: ; cab3b +BattleAnim_Sludge: anim_1gfx ANIM_GFX_POISON anim_call BattleAnim_Sludge_branch_cbc15 anim_wait 56 anim_ret -; cab42 -BattleAnim_Toxic: ; cab42 +BattleAnim_Toxic: anim_1gfx ANIM_GFX_POISON anim_bgeffect ANIM_BG_BLACK_HUES, $0, $8, $0 anim_call BattleAnim_Toxic_branch_cbc35 @@ -3197,9 +2999,8 @@ BattleAnim_Toxic: ; cab42 anim_call BattleAnim_Toxic_branch_cbc15 anim_wait 64 anim_ret -; cab52 -BattleAnim_Metronome: ; cab52 +BattleAnim_Metronome: anim_2gfx ANIM_GFX_MISC, ANIM_GFX_SPEED anim_sound 0, 0, SFX_METRONOME anim_obj ANIM_OBJ_7A, 72, 88, $0 @@ -3209,9 +3010,8 @@ BattleAnim_Metronome: ; cab52 anim_loop 5, .loop anim_wait 48 anim_ret -; cab69 -BattleAnim_Counter: ; cab69 +BattleAnim_Counter: anim_1gfx ANIM_GFX_HIT .loop anim_bgeffect ANIM_BG_FLASH_INVERTED, $0, $6, $2 @@ -3232,9 +3032,8 @@ BattleAnim_Counter: ; cab69 anim_loop 3, .loop anim_wait 16 anim_ret -; cabaa -BattleAnim_LowKick: ; cabaa +BattleAnim_LowKick: anim_1gfx ANIM_GFX_HIT anim_bgeffect ANIM_BG_FLASH_INVERTED, $0, $4, $2 anim_sound 0, 1, SFX_DOUBLE_KICK @@ -3252,9 +3051,8 @@ BattleAnim_LowKick: ; cabaa anim_obj ANIM_OBJ_00, 140, 64, $0 anim_wait 16 anim_ret -; cabe6 -BattleAnim_WingAttack: ; cabe6 +BattleAnim_WingAttack: anim_1gfx ANIM_GFX_HIT anim_sound 0, 1, SFX_WING_ATTACK anim_obj ANIM_OBJ_01, 148, 56, $0 @@ -3269,18 +3067,16 @@ BattleAnim_WingAttack: ; cabe6 anim_obj ANIM_OBJ_01, 124, 56, $0 anim_wait 16 anim_ret -; cac13 -BattleAnim_Slam: ; cac13 +BattleAnim_Slam: anim_1gfx ANIM_GFX_HIT anim_sound 0, 1, SFX_WING_ATTACK anim_bgeffect ANIM_BG_FLASH_INVERTED, $0, $8, $2 anim_obj ANIM_OBJ_01, 124, 40, $0 anim_wait 16 anim_ret -; cac24 -BattleAnim_Disable: ; cac24 +BattleAnim_Disable: anim_2gfx ANIM_GFX_LIGHTNING, ANIM_GFX_STATUS anim_bgeffect ANIM_BG_06, $0, $2, $0 anim_obj ANIM_OBJ_DISABLE, 132, 56, $0 @@ -3290,9 +3086,8 @@ BattleAnim_Disable: ; cac24 anim_obj ANIM_OBJ_PARALYZED, 160, 56, $c2 anim_wait 96 anim_ret -; cac41 -BattleAnim_TailWhip: ; cac41 +BattleAnim_TailWhip: anim_1gfx ANIM_GFX_HIT anim_call BattleAnim_FollowPlayerHead_0 anim_sound 0, 0, SFX_TAIL_WHIP @@ -3301,17 +3096,15 @@ BattleAnim_TailWhip: ; cac41 anim_incbgeffect ANIM_BG_26 anim_call BattleAnim_ShowMon_0 anim_ret -; cac55 -BattleAnim_Struggle: ; cac55 +BattleAnim_Struggle: anim_1gfx ANIM_GFX_HIT anim_sound 0, 1, SFX_POUND anim_obj ANIM_OBJ_01, 136, 56, $0 anim_wait 16 anim_ret -; cac61 -BattleAnim_Sketch: ; cac61 +BattleAnim_Sketch: anim_1gfx ANIM_GFX_OBJECTS anim_call BattleAnim_FollowEnemyFeet_0 anim_bgeffect ANIM_BG_1A, $0, $1, $20 @@ -3322,9 +3115,8 @@ BattleAnim_Sketch: ; cac61 anim_call BattleAnim_ShowMon_0 anim_wait 1 anim_ret -; cac7b -BattleAnim_TripleKick: ; cac7b +BattleAnim_TripleKick: anim_1gfx ANIM_GFX_HIT anim_if_param_equal $1, BattleAnim_TripleKick_branch_cac95 anim_if_param_equal $2, BattleAnim_TripleKick_branch_caca5 @@ -3334,27 +3126,24 @@ BattleAnim_TripleKick: ; cac7b anim_obj ANIM_OBJ_01, 144, 48, $0 anim_wait 8 anim_ret -; cac95 -BattleAnim_TripleKick_branch_cac95: ; cac95 +BattleAnim_TripleKick_branch_cac95: anim_sound 0, 1, SFX_DOUBLE_KICK anim_obj ANIM_OBJ_07, 120, 64, $0 anim_wait 6 anim_obj ANIM_OBJ_01, 120, 64, $0 anim_wait 8 anim_ret -; caca5 -BattleAnim_TripleKick_branch_caca5: ; caca5 +BattleAnim_TripleKick_branch_caca5: anim_sound 0, 1, SFX_DOUBLE_KICK anim_obj ANIM_OBJ_07, 132, 32, $0 anim_wait 6 anim_obj ANIM_OBJ_01, 132, 32, $0 anim_wait 8 anim_ret -; cacb5 -BattleAnim_Thief: ; cacb5 +BattleAnim_Thief: anim_1gfx ANIM_GFX_HIT anim_call BattleAnim_FollowEnemyFeet_0 anim_bgeffect ANIM_BG_TACKLE, $0, $1, $0 @@ -3369,9 +3158,8 @@ BattleAnim_Thief: ; cacb5 anim_obj ANIM_OBJ_THIEF, 120, 76, $1 anim_wait 64 anim_ret -; cacd9 -BattleAnim_SpiderWeb: ; cacd9 +BattleAnim_SpiderWeb: anim_1gfx ANIM_GFX_WEB anim_bgeffect ANIM_BG_07, $0, $2, $0 anim_obj ANIM_OBJ_SPIDER_WEB, 132, 48, $0 @@ -3383,9 +3171,8 @@ BattleAnim_SpiderWeb: ; cacd9 anim_obj ANIM_OBJ_STRING_SHOT, 64, 84, $0 anim_wait 64 anim_ret -; cacfb -BattleAnim_MindReader: ; cacfb +BattleAnim_MindReader: anim_1gfx ANIM_GFX_MISC anim_sound 0, 1, SFX_MIND_READER .loop @@ -3397,9 +3184,8 @@ BattleAnim_MindReader: ; cacfb anim_loop 2, .loop anim_wait 32 anim_ret -; cad1b -BattleAnim_Nightmare: ; cad1b +BattleAnim_Nightmare: anim_1gfx ANIM_GFX_ANGELS anim_bgp $1b anim_obp0 $f @@ -3408,9 +3194,8 @@ BattleAnim_Nightmare: ; cad1b anim_sound 0, 1, SFX_NIGHTMARE anim_wait 96 anim_ret -; cad30 -BattleAnim_FlameWheel: ; cad30 +BattleAnim_FlameWheel: anim_1gfx ANIM_GFX_FIRE .loop anim_sound 0, 0, SFX_EMBER @@ -3432,9 +3217,8 @@ BattleAnim_FlameWheel: ; cad30 anim_incobj 9 anim_wait 8 anim_ret -; cad6b -BattleAnim_Snore: ; cad6b +BattleAnim_Snore: anim_2gfx ANIM_GFX_STATUS, ANIM_GFX_NOISE anim_obj ANIM_OBJ_ASLEEP, 64, 80, $0 anim_wait 32 @@ -3446,9 +3230,8 @@ BattleAnim_Snore: ; cad6b anim_loop 2, .loop anim_wait 8 anim_ret -; cad86 -BattleAnim_Curse: ; cad86 +BattleAnim_Curse: anim_if_param_equal $1, .NotGhost anim_2gfx ANIM_GFX_HIT, ANIM_GFX_OBJECTS anim_obj ANIM_OBJ_CURSE, 68, 72, $0 @@ -3460,9 +3243,8 @@ BattleAnim_Curse: ; cad86 anim_obj ANIM_OBJ_04, 44, 96, $0 anim_wait 16 anim_ret -; cada3 -.NotGhost: ; cada3 +.NotGhost: anim_1gfx ANIM_GFX_SPEED anim_call BattleAnim_FollowEnemyFeet_0 anim_bgeffect ANIM_BG_19, $0, $1, $40 @@ -3492,9 +3274,8 @@ BattleAnim_Curse: ; cad86 anim_incbgeffect ANIM_BG_16 anim_call BattleAnim_ShowMon_0 anim_ret -; cadf1 -BattleAnim_Flail: ; cadf1 +BattleAnim_Flail: anim_1gfx ANIM_GFX_HIT anim_call BattleAnim_FollowEnemyFeet_0 anim_sound 0, 0, SFX_SUBMISSION @@ -3509,9 +3290,8 @@ BattleAnim_Flail: ; cadf1 anim_incbgeffect ANIM_BG_2C anim_call BattleAnim_ShowMon_0 anim_ret -; cae17 -BattleAnim_Conversion: ; cae17 +BattleAnim_Conversion: anim_1gfx ANIM_GFX_EXPLOSION anim_bgeffect ANIM_BG_ALTERNATE_HUES, $0, $2, $0 anim_sound 63, 3, SFX_SHARPEN @@ -3525,9 +3305,8 @@ BattleAnim_Conversion: ; cae17 anim_obj ANIM_OBJ_CONVERSION, 48, 88, $38 anim_wait 128 anim_ret -; cae4b -BattleAnim_Aeroblast: ; cae4b +BattleAnim_Aeroblast: anim_2gfx ANIM_GFX_BEAM, ANIM_GFX_AEROBLAST anim_bgp $1b anim_bgeffect ANIM_BG_1F, $50, $4, $10 @@ -3546,21 +3325,19 @@ BattleAnim_Aeroblast: ; cae4b anim_obj ANIM_OBJ_28, 126, 62, $0 anim_wait 48 anim_ret -; cae84 -BattleAnim_CottonSpore: ; cae84 +BattleAnim_CottonSpore: anim_obp0 $54 anim_1gfx ANIM_GFX_MISC anim_sound 0, 1, SFX_POWDER -.loop ; cae8b +.loop anim_obj ANIM_OBJ_COTTON_SPORE, 132, 32, $0 anim_wait 8 anim_loop 5, .loop anim_wait 96 anim_ret -; cae97 -BattleAnim_Reversal: ; cae97 +BattleAnim_Reversal: anim_2gfx ANIM_GFX_SHINE, ANIM_GFX_HIT anim_bgeffect ANIM_BG_07, $0, $0, $0 anim_sound 0, 1, SFX_MEGA_PUNCH @@ -3582,19 +3359,17 @@ BattleAnim_Reversal: ; cae97 anim_obj ANIM_OBJ_FORESIGHT, 152, 40, $0 anim_wait 24 anim_ret -; caed6 -BattleAnim_Spite: ; caed6 +BattleAnim_Spite: anim_1gfx ANIM_GFX_ANGELS anim_obj ANIM_OBJ_SPITE, 132, 16, $0 anim_sound 0, 1, SFX_SPITE anim_wait 96 anim_ret -; caee2 -BattleAnim_PowderSnow: ; caee2 +BattleAnim_PowderSnow: anim_1gfx ANIM_GFX_ICE -.loop ; caee4 +.loop anim_sound 6, 2, SFX_SHINE anim_obj ANIM_OBJ_POWDER_SNOW, 64, 88, $23 anim_wait 2 @@ -3610,9 +3385,8 @@ BattleAnim_PowderSnow: ; caee2 anim_call BattleAnim_PowderSnow_branch_cbbdf anim_wait 32 anim_ret -; caf0e -BattleAnim_Protect: ; caf0e +BattleAnim_Protect: anim_1gfx ANIM_GFX_OBJECTS anim_bgeffect ANIM_BG_07, $0, $2, $0 anim_obj ANIM_OBJ_PROTECT, 80, 80, $0 @@ -3623,9 +3397,8 @@ BattleAnim_Protect: ; caf0e anim_sound 0, 0, SFX_PROTECT anim_wait 96 anim_ret -; caf33 -BattleAnim_MachPunch: ; caf33 +BattleAnim_MachPunch: anim_2gfx ANIM_GFX_SPEED, ANIM_GFX_HIT anim_bgeffect ANIM_BG_HIDE_MON, $0, $1, $0 anim_sound 0, 0, SFX_MENU @@ -3644,18 +3417,16 @@ BattleAnim_MachPunch: ; caf33 anim_bgeffect ANIM_BG_SHOW_MON, $0, $1, $0 anim_wait 16 anim_ret -; caf73 -BattleAnim_ScaryFace: ; caf73 +BattleAnim_ScaryFace: anim_1gfx ANIM_GFX_BEAM anim_bgeffect ANIM_BG_ALTERNATE_HUES, $0, $2, $0 anim_bgeffect ANIM_BG_06, $0, $2, $0 anim_call BattleAnim_ScaryFace_branch_cbadc anim_wait 64 anim_ret -; caf84 -BattleAnim_FaintAttack: ; caf84 +BattleAnim_FaintAttack: anim_1gfx ANIM_GFX_HIT anim_sound 0, 0, SFX_CURSE anim_call BattleAnim_FollowEnemyFeet_0 @@ -3674,9 +3445,8 @@ BattleAnim_FaintAttack: ; caf84 anim_call BattleAnim_ShowMon_0 anim_wait 4 anim_ret -; cafb4 -BattleAnim_SweetKiss: ; cafb4 +BattleAnim_SweetKiss: anim_2gfx ANIM_GFX_OBJECTS, ANIM_GFX_ANGELS anim_bgeffect ANIM_BG_07, $0, $2, $0 anim_obj ANIM_OBJ_SWEET_KISS, 96, 40, $0 @@ -3686,9 +3456,8 @@ BattleAnim_SweetKiss: ; cafb4 anim_obj ANIM_OBJ_HEART, 120, 40, $0 anim_wait 40 anim_ret -; cafcf -BattleAnim_BellyDrum: ; cafcf +BattleAnim_BellyDrum: anim_2gfx ANIM_GFX_HIT, ANIM_GFX_NOISE anim_sound 0, 0, SFX_BELLY_DRUM anim_obj ANIM_OBJ_AA, 64, 104, $0 @@ -3727,9 +3496,8 @@ BattleAnim_BellyDrum: ; cafcf anim_obj ANIM_OBJ_AB, 64, 92, $f8 anim_wait 12 anim_ret -; cb051 -BattleAnim_SludgeBomb: ; cb051 +BattleAnim_SludgeBomb: anim_2gfx ANIM_GFX_EGG, ANIM_GFX_POISON anim_bgeffect ANIM_BG_BLACK_HUES, $0, $8, $0 anim_sound 6, 2, SFX_SLUDGE_BOMB @@ -3738,16 +3506,14 @@ BattleAnim_SludgeBomb: ; cb051 anim_call BattleAnim_SludgeBomb_branch_cbc15 anim_wait 64 anim_ret -; cb067 -BattleAnim_MudSlap: ; cb067 +BattleAnim_MudSlap: anim_1gfx ANIM_GFX_SAND anim_obp0 $fc anim_call BattleAnim_MudSlap_branch_cbc5b anim_ret -; cb06f -BattleAnim_Octazooka: ; cb06f +BattleAnim_Octazooka: anim_3gfx ANIM_GFX_HAZE, ANIM_GFX_EGG, ANIM_GFX_SMOKE anim_sound 6, 2, SFX_SLUDGE_BOMB anim_obj ANIM_OBJ_OCTAZOOKA, 64, 92, $4 @@ -3762,9 +3528,8 @@ BattleAnim_Octazooka: ; cb06f anim_wait 128 .done anim_ret -; cb092 -BattleAnim_Spikes: ; cb092 +BattleAnim_Spikes: anim_1gfx ANIM_GFX_MISC anim_sound 6, 2, SFX_MENU anim_obj ANIM_OBJ_SPIKES, 48, 88, $20 @@ -3776,9 +3541,8 @@ BattleAnim_Spikes: ; cb092 anim_obj ANIM_OBJ_SPIKES, 48, 88, $28 anim_wait 64 anim_ret -; cb0b0 -BattleAnim_ZapCannon: ; cb0b0 +BattleAnim_ZapCannon: anim_2gfx ANIM_GFX_LIGHTNING, ANIM_GFX_EXPLOSION anim_bgp $1b anim_obp0 $30 @@ -3791,9 +3555,8 @@ BattleAnim_ZapCannon: ; cb0b0 anim_obj ANIM_OBJ_31, 136, 56, $0 anim_wait 128 anim_ret -; cb0d0 -BattleAnim_Foresight: ; cb0d0 +BattleAnim_Foresight: anim_1gfx ANIM_GFX_SHINE anim_call BattleAnim_FollowEnemyFeet_1 anim_bgeffect ANIM_BG_07, $0, $0, $0 @@ -3806,9 +3569,8 @@ BattleAnim_Foresight: ; cb0d0 anim_call BattleAnim_ShowMon_1 anim_wait 8 anim_ret -; cb0f0 -BattleAnim_DestinyBond: ; cb0f0 +BattleAnim_DestinyBond: anim_1gfx ANIM_GFX_ANGELS anim_bgp $1b anim_obp0 $0 @@ -3817,17 +3579,15 @@ BattleAnim_DestinyBond: ; cb0f0 anim_obj ANIM_OBJ_DESTINY_BOND, 44, 120, $2 anim_wait 128 anim_ret -; cb104 -BattleAnim_DestinyBond_branch_cb104: ; cb104 +BattleAnim_DestinyBond_branch_cb104: anim_obj ANIM_OBJ_DESTINY_BOND, 132, 76, $0 anim_sound 0, 1, SFX_KINESIS anim_bgeffect ANIM_BG_RETURN_MON, $0, $0, $0 anim_wait 32 anim_ret -; cb113 -BattleAnim_PerishSong: ; cb113 +BattleAnim_PerishSong: anim_1gfx ANIM_GFX_NOISE anim_bgeffect ANIM_BG_06, $0, $2, $0 anim_bgeffect ANIM_BG_ALTERNATE_HUES, $0, $2, $0 @@ -3842,9 +3602,8 @@ BattleAnim_PerishSong: ; cb113 anim_obj ANIM_OBJ_PERISH_SONG, 88, 0, $38 anim_wait 112 anim_ret -; cb14c -BattleAnim_IcyWind: ; cb14c +BattleAnim_IcyWind: anim_1gfx ANIM_GFX_SPEED anim_bgeffect ANIM_BG_06, $0, $2, $0 anim_bgeffect ANIM_BG_ALTERNATE_HUES, $0, $2, $0 @@ -3870,18 +3629,16 @@ BattleAnim_IcyWind: ; cb14c anim_incobj 7 anim_wait 1 anim_ret -; cb18c -BattleAnim_Detect: ; cb18c +BattleAnim_Detect: anim_1gfx ANIM_GFX_SHINE anim_bgeffect ANIM_BG_07, $0, $0, $0 anim_sound 0, 0, SFX_FORESIGHT anim_obj ANIM_OBJ_FORESIGHT, 64, 88, $0 anim_wait 24 anim_ret -; cb19d -BattleAnim_BoneRush: ; cb19d +BattleAnim_BoneRush: anim_2gfx ANIM_GFX_HIT, ANIM_GFX_MISC anim_sound 0, 1, SFX_BONE_CLUB anim_obj ANIM_OBJ_BONE_RUSH, 132, 56, $2 @@ -3893,9 +3650,8 @@ BattleAnim_BoneRush: ; cb19d anim_obj ANIM_OBJ_01, 144, 64, $0 anim_wait 16 anim_ret -; cb1bc -BattleAnim_LockOn: ; cb1bc +BattleAnim_LockOn: anim_1gfx ANIM_GFX_MISC anim_sound 0, 1, SFX_MIND_READER .loop @@ -3907,9 +3663,8 @@ BattleAnim_LockOn: ; cb1bc anim_loop 2, .loop anim_wait 32 anim_ret -; cb1dc -BattleAnim_Outrage: ; cb1dc +BattleAnim_Outrage: anim_1gfx ANIM_GFX_HIT anim_call BattleAnim_FollowEnemyFeet_0 anim_bgeffect ANIM_BG_1A, $0, $1, $20 @@ -3928,9 +3683,8 @@ BattleAnim_Outrage: ; cb1dc anim_obj ANIM_OBJ_00, 152, 40, $0 anim_wait 16 anim_ret -; cb210 -BattleAnim_Sandstorm: ; cb210 +BattleAnim_Sandstorm: anim_1gfx ANIM_GFX_POWDER anim_obj ANIM_OBJ_SANDSTORM, 88, 0, $0 anim_wait 8 @@ -3943,9 +3697,8 @@ BattleAnim_Sandstorm: ; cb210 anim_loop 16, .loop anim_wait 8 anim_ret -; cb22d -BattleAnim_GigaDrain: ; cb22d +BattleAnim_GigaDrain: anim_2gfx ANIM_GFX_BUBBLE, ANIM_GFX_CHARGE anim_call BattleAnim_FollowEnemyFeet_0 anim_bgeffect ANIM_BG_1C, $0, $0, $10 @@ -3973,9 +3726,8 @@ BattleAnim_GigaDrain: ; cb22d anim_loop 2, .loop anim_wait 32 anim_ret -; cb274 -BattleAnim_Endure: ; cb274 +BattleAnim_Endure: anim_1gfx ANIM_GFX_SPEED anim_call BattleAnim_FollowEnemyFeet_0 anim_bgeffect ANIM_BG_1A, $0, $1, $20 @@ -4001,9 +3753,8 @@ BattleAnim_Endure: ; cb274 anim_incbgeffect ANIM_BG_1A anim_call BattleAnim_ShowMon_0 anim_ret -; cb2bb -BattleAnim_Charm: ; cb2bb +BattleAnim_Charm: anim_1gfx ANIM_GFX_OBJECTS anim_call BattleAnim_FollowEnemyFeet_0 anim_bgeffect ANIM_BG_26, $0, $1, $0 @@ -4014,9 +3765,8 @@ BattleAnim_Charm: ; cb2bb anim_call BattleAnim_ShowMon_0 anim_wait 4 anim_ret -; cb2d5 -BattleAnim_Rollout: ; cb2d5 +BattleAnim_Rollout: anim_1gfx ANIM_GFX_HIT anim_sound 0, 0, SFX_SPARK anim_call BattleAnim_FollowPlayerHead_0 @@ -4028,9 +3778,8 @@ BattleAnim_Rollout: ; cb2d5 anim_wait 8 anim_call BattleAnim_ShowMon_0 anim_ret -; cb2f5 -BattleAnim_FalseSwipe: ; cb2f5 +BattleAnim_FalseSwipe: anim_2gfx ANIM_GFX_SHINE, ANIM_GFX_CUT anim_bgeffect ANIM_BG_07, $0, $0, $0 anim_sound 0, 1, SFX_CUT @@ -4039,9 +3788,8 @@ BattleAnim_FalseSwipe: ; cb2f5 anim_obj ANIM_OBJ_GLIMMER, 136, 40, $0 anim_wait 32 anim_ret -; cb30d -BattleAnim_Swagger: ; cb30d +BattleAnim_Swagger: anim_2gfx ANIM_GFX_MISC, ANIM_GFX_WIND .loop anim_sound 0, 0, SFX_MENU @@ -4053,9 +3801,8 @@ BattleAnim_Swagger: ; cb30d anim_obj ANIM_OBJ_ANGER, 104, 40, $0 anim_wait 40 anim_ret -; cb328 -BattleAnim_MilkDrink: ; cb328 +BattleAnim_MilkDrink: anim_2gfx ANIM_GFX_MISC, ANIM_GFX_BUBBLE anim_call BattleAnim_FollowEnemyFeet_0 anim_obj ANIM_OBJ_MILK_DRINK, 74, 104, $0 @@ -4070,9 +3817,8 @@ BattleAnim_MilkDrink: ; cb328 anim_incbgeffect ANIM_BG_18 anim_call BattleAnim_ShowMon_0 anim_ret -; cb34d -BattleAnim_Spark: ; cb34d +BattleAnim_Spark: anim_2gfx ANIM_GFX_LIGHTNING, ANIM_GFX_EXPLOSION anim_sound 0, 0, SFX_ZAP_CANNON anim_bgeffect ANIM_BG_FLASH_INVERTED, $0, $4, $3 @@ -4093,9 +3839,8 @@ BattleAnim_Spark: ; cb34d anim_obj ANIM_OBJ_33, 136, 56, $0 anim_wait 32 anim_ret -; cb386 -BattleAnim_FuryCutter: ; cb386 +BattleAnim_FuryCutter: anim_1gfx ANIM_GFX_CUT .loop anim_sound 0, 1, SFX_CUT @@ -4109,9 +3854,8 @@ BattleAnim_FuryCutter: ; cb386 anim_wait 16 anim_jumpuntil .loop anim_ret -; cb3a1 -BattleAnim_SteelWing: ; cb3a1 +BattleAnim_SteelWing: anim_1gfx ANIM_GFX_REFLECT anim_obp0 $0 anim_sound 0, 0, SFX_RAGE @@ -4133,9 +3877,8 @@ BattleAnim_SteelWing: ; cb3a1 anim_obj ANIM_OBJ_01, 124, 56, $0 anim_wait 16 anim_ret -; cb3df -BattleAnim_MeanLook: ; cb3df +BattleAnim_MeanLook: anim_1gfx ANIM_GFX_PSYCHIC anim_obp0 $e0 anim_sound 0, 1, SFX_MEAN_LOOK @@ -4150,9 +3893,8 @@ BattleAnim_MeanLook: ; cb3df anim_obj ANIM_OBJ_MEAN_LOOK, 132, 48, $0 anim_wait 128 anim_ret -; cb405 -BattleAnim_Attract: ; cb405 +BattleAnim_Attract: anim_1gfx ANIM_GFX_OBJECTS .loop anim_sound 0, 0, SFX_ATTRACT @@ -4162,9 +3904,8 @@ BattleAnim_Attract: ; cb405 anim_wait 128 anim_wait 64 anim_ret -; cb417 -BattleAnim_SleepTalk: ; cb417 +BattleAnim_SleepTalk: anim_1gfx ANIM_GFX_STATUS .loop anim_sound 0, 0, SFX_STRENGTH @@ -4173,9 +3914,8 @@ BattleAnim_SleepTalk: ; cb417 anim_loop 2, .loop anim_wait 32 anim_ret -; cb428 -BattleAnim_HealBell: ; cb428 +BattleAnim_HealBell: anim_2gfx ANIM_GFX_MISC, ANIM_GFX_NOISE anim_obj ANIM_OBJ_84, 72, 56, $0 anim_wait 32 @@ -4198,9 +3938,8 @@ BattleAnim_HealBell: ; cb428 anim_loop 4, .loop anim_wait 64 anim_ret -; cb464 -BattleAnim_Return: ; cb464 +BattleAnim_Return: anim_1gfx ANIM_GFX_HIT anim_call BattleAnim_FollowPlayerHead_0 anim_bgeffect ANIM_BG_BOUNCE_DOWN, $0, $1, $0 @@ -4215,9 +3954,8 @@ BattleAnim_Return: ; cb464 anim_wait 8 anim_call BattleAnim_ShowMon_0 anim_ret -; cb488 -BattleAnim_Present: ; cb488 +BattleAnim_Present: anim_2gfx ANIM_GFX_STATUS, ANIM_GFX_BUBBLE anim_sound 0, 1, SFX_PRESENT anim_obj ANIM_OBJ_PRESENT, 64, 88, $6c @@ -4244,9 +3982,8 @@ BattleAnim_Present: ; cb488 anim_loop 8, .loop2 anim_wait 128 anim_ret -; cb4c1 -BattleAnim_Frustration: ; cb4c1 +BattleAnim_Frustration: anim_1gfx ANIM_GFX_MISC anim_sound 0, 0, SFX_KINESIS_2 anim_obj ANIM_OBJ_ANGER, 72, 80, $0 @@ -4268,9 +4005,8 @@ BattleAnim_Frustration: ; cb4c1 anim_wait 1 anim_call BattleAnim_ShowMon_0 anim_ret -; cb4f9 -BattleAnim_Safeguard: ; cb4f9 +BattleAnim_Safeguard: anim_1gfx ANIM_GFX_MISC anim_bgeffect ANIM_BG_06, $0, $2, $0 anim_obj ANIM_OBJ_SAFEGUARD, 80, 80, $0 @@ -4281,9 +4017,8 @@ BattleAnim_Safeguard: ; cb4f9 anim_sound 0, 0, SFX_PROTECT anim_wait 96 anim_ret -; cb51e -BattleAnim_PainSplit: ; cb51e +BattleAnim_PainSplit: anim_2gfx ANIM_GFX_HIT, ANIM_GFX_OBJECTS anim_call BattleAnim_FollowPlayerHead_0 anim_bgeffect ANIM_BG_25, $0, $1, $0 @@ -4295,9 +4030,8 @@ BattleAnim_PainSplit: ; cb51e anim_call BattleAnim_ShowMon_0 anim_wait 1 anim_ret -; cb53d -BattleAnim_SacredFire: ; cb53d +BattleAnim_SacredFire: anim_1gfx ANIM_GFX_FIRE anim_bgeffect ANIM_BG_06, $0, $2, $0 anim_bgeffect ANIM_BG_ALTERNATE_HUES, $0, $2, $0 @@ -4320,9 +4054,8 @@ BattleAnim_SacredFire: ; cb53d anim_incobj 9 anim_wait 8 anim_ret -; cb57d -BattleAnim_Magnitude: ; cb57d +BattleAnim_Magnitude: anim_1gfx ANIM_GFX_ROCKS .loop anim_bgeffect ANIM_BG_1F, $e, $4, $0 @@ -4340,9 +4073,8 @@ BattleAnim_Magnitude: ; cb57d anim_jumpuntil .loop anim_wait 96 anim_ret -; cb5aa -BattleAnim_Dynamicpunch: ; cb5aa +BattleAnim_Dynamicpunch: anim_2gfx ANIM_GFX_HIT, ANIM_GFX_EXPLOSION anim_sound 0, 1, SFX_COMET_PUNCH anim_obj ANIM_OBJ_0A, 136, 56, $43 @@ -4351,9 +4083,8 @@ BattleAnim_Dynamicpunch: ; cb5aa anim_call BattleAnim_Dynamicpunch_branch_cbb8f anim_wait 16 anim_ret -; cb5c0 -BattleAnim_Megahorn: ; cb5c0 +BattleAnim_Megahorn: anim_2gfx ANIM_GFX_HORN, ANIM_GFX_HIT anim_bgeffect ANIM_BG_1F, $40, $2, $0 anim_wait 48 @@ -4364,9 +4095,8 @@ BattleAnim_Megahorn: ; cb5c0 anim_obj ANIM_OBJ_00, 136, 56, $0 anim_wait 16 anim_ret -; cb5de -BattleAnim_Dragonbreath: ; cb5de +BattleAnim_Dragonbreath: anim_1gfx ANIM_GFX_FIRE anim_sound 6, 2, SFX_EMBER .loop @@ -4375,18 +4105,16 @@ BattleAnim_Dragonbreath: ; cb5de anim_loop 10, .loop anim_wait 64 anim_ret -; cb5ef -BattleAnim_BatonPass: ; cb5ef +BattleAnim_BatonPass: anim_1gfx ANIM_GFX_MISC anim_obj ANIM_OBJ_BATON_PASS, 44, 104, $20 anim_sound 0, 0, SFX_BATON_PASS anim_call BattleAnim_BatonPass_branch_c9486 anim_wait 64 anim_ret -; cb5fe -BattleAnim_Encore: ; cb5fe +BattleAnim_Encore: anim_1gfx ANIM_GFX_OBJECTS anim_obj ANIM_OBJ_99, 64, 80, $90 anim_obj ANIM_OBJ_99, 64, 80, $10 @@ -4397,18 +4125,16 @@ BattleAnim_Encore: ; cb5fe anim_obj ANIM_OBJ_9A, 64, 72, $34 anim_wait 16 anim_ret -; cb61b -BattleAnim_Pursuit: ; cb61b +BattleAnim_Pursuit: anim_1gfx ANIM_GFX_HIT anim_if_param_equal $1, BattleAnim_Pursuit_branch_cb62b anim_sound 0, 1, SFX_COMET_PUNCH anim_obj ANIM_OBJ_01, 136, 56, $0 anim_wait 16 anim_ret -; cb62b -BattleAnim_Pursuit_branch_cb62b: ; cb62b +BattleAnim_Pursuit_branch_cb62b: anim_bgeffect ANIM_BG_HIDE_MON, $0, $0, $0 anim_wait 4 anim_call BattleAnim_FollowEnemyFeet_1 @@ -4427,9 +4153,8 @@ BattleAnim_Pursuit_branch_cb62b: ; cb62b anim_call BattleAnim_ShowMon_1 anim_wait 1 anim_ret -; cb65e -BattleAnim_RapidSpin: ; cb65e +BattleAnim_RapidSpin: anim_2gfx ANIM_GFX_WIND, ANIM_GFX_HIT anim_obp0 $e4 .loop @@ -4450,9 +4175,8 @@ BattleAnim_RapidSpin: ; cb65e anim_incobj 6 anim_wait 1 anim_ret -; cb68e -BattleAnim_SweetScent: ; cb68e +BattleAnim_SweetScent: anim_2gfx ANIM_GFX_FLOWER, ANIM_GFX_MISC anim_sound 0, 0, SFX_SWEET_SCENT anim_obj ANIM_OBJ_FLOWER, 64, 96, $2 @@ -4466,9 +4190,8 @@ BattleAnim_SweetScent: ; cb68e anim_obj ANIM_OBJ_COTTON, 136, 40, $3f anim_wait 128 anim_ret -; cb6b6 -BattleAnim_IronTail: ; cb6b6 +BattleAnim_IronTail: anim_1gfx ANIM_GFX_REFLECT anim_obp0 $0 anim_sound 0, 0, SFX_RAGE @@ -4485,9 +4208,8 @@ BattleAnim_IronTail: ; cb6b6 anim_incbgeffect ANIM_BG_26 anim_call BattleAnim_ShowMon_0 anim_ret -; cb6dc -BattleAnim_MetalClaw: ; cb6dc +BattleAnim_MetalClaw: anim_1gfx ANIM_GFX_REFLECT anim_obp0 $0 anim_sound 0, 0, SFX_RAGE @@ -4502,9 +4224,8 @@ BattleAnim_MetalClaw: ; cb6dc anim_obj ANIM_OBJ_37, 136, 40, $0 anim_wait 32 anim_ret -; cb703 -BattleAnim_VitalThrow: ; cb703 +BattleAnim_VitalThrow: anim_1gfx ANIM_GFX_HIT anim_call BattleAnim_FollowEnemyFeet_0 anim_bgeffect ANIM_BG_2F, $0, $1, $0 @@ -4525,9 +4246,8 @@ BattleAnim_VitalThrow: ; cb703 anim_obj ANIM_OBJ_03, 132, 56, $0 anim_wait 16 anim_ret -; cb739 -BattleAnim_MorningSun: ; cb739 +BattleAnim_MorningSun: anim_1gfx ANIM_GFX_SHINE anim_bgeffect ANIM_BG_07, $0, $0, $0 anim_sound 0, 0, SFX_MORNING_SUN @@ -4539,14 +4259,12 @@ BattleAnim_MorningSun: ; cb739 anim_if_param_equal 0, .zero anim_call BattleAnim_MorningSun_branch_cbc6a anim_ret -; cb756 .zero anim_call BattleAnim_MorningSun_branch_cbc80 anim_ret -; cb75a -BattleAnim_Synthesis: ; cb75a +BattleAnim_Synthesis: anim_1gfx ANIM_GFX_SHINE anim_call BattleAnim_FollowEnemyFeet_0 anim_bgeffect ANIM_BG_18, $0, $1, $40 @@ -4558,14 +4276,12 @@ BattleAnim_Synthesis: ; cb75a anim_if_param_equal $1, .one anim_call BattleAnim_Synthesis_branch_cbc6a anim_ret -; cb77a .one anim_call BattleAnim_Synthesis_branch_cbc80 anim_ret -; cb77e -BattleAnim_Crunch: ; cb77e +BattleAnim_Crunch: anim_2gfx ANIM_GFX_CUT, ANIM_GFX_HIT anim_bgp $1b anim_obp0 $c0 @@ -4580,9 +4296,8 @@ BattleAnim_Crunch: ; cb77e anim_obj ANIM_OBJ_00, 128, 64, $18 anim_wait 8 anim_ret -; cb7a8 -BattleAnim_Moonlight: ; cb7a8 +BattleAnim_Moonlight: anim_1gfx ANIM_GFX_SHINE anim_bgp $1b anim_bgeffect ANIM_BG_07, $0, $0, $0 @@ -4601,9 +4316,8 @@ BattleAnim_Moonlight: ; cb7a8 .three anim_call BattleAnim_Moonlight_branch_cbc80 anim_ret -; cb7db -BattleAnim_HiddenPower: ; cb7db +BattleAnim_HiddenPower: anim_1gfx ANIM_GFX_CHARGE anim_call BattleAnim_FollowEnemyFeet_0 anim_bgeffect ANIM_BG_1A, $0, $1, $20 @@ -4636,9 +4350,8 @@ BattleAnim_HiddenPower: ; cb7db anim_obj ANIM_OBJ_00, 136, 56, $0 anim_wait 32 anim_ret -; cb83a -BattleAnim_CrossChop: ; cb83a +BattleAnim_CrossChop: anim_1gfx ANIM_GFX_CUT anim_sound 0, 1, SFX_CUT anim_obj ANIM_OBJ_A0, 152, 40, $0 @@ -4650,9 +4363,8 @@ BattleAnim_CrossChop: ; cb83a anim_bgeffect ANIM_BG_FLASH_INVERTED, $0, $8, $10 anim_wait 16 anim_ret -; cb85a -BattleAnim_Twister: ; cb85a +BattleAnim_Twister: anim_2gfx ANIM_GFX_WIND, ANIM_GFX_HIT .loop1 anim_sound 0, 0, SFX_RAZOR_WIND @@ -4694,9 +4406,8 @@ BattleAnim_Twister: ; cb85a anim_incobj 9 anim_wait 32 anim_ret -; cb8b3 -BattleAnim_RainDance: ; cb8b3 +BattleAnim_RainDance: anim_1gfx ANIM_GFX_WATER anim_bgp $f8 anim_obp0 $7c @@ -4708,9 +4419,8 @@ BattleAnim_RainDance: ; cb8b3 anim_obj ANIM_OBJ_RAIN, 88, 0, $2 anim_wait 128 anim_ret -; cb8cf -BattleAnim_SunnyDay: ; cb8cf +BattleAnim_SunnyDay: anim_1gfx ANIM_GFX_WATER anim_bgp $90 anim_sound 0, 1, SFX_MORNING_SUN @@ -4721,9 +4431,8 @@ BattleAnim_SunnyDay: ; cb8cf anim_obj ANIM_OBJ_RAIN, 88, 0, $2 anim_wait 128 anim_ret -; cb8e9 -BattleAnim_MirrorCoat: ; cb8e9 +BattleAnim_MirrorCoat: anim_2gfx ANIM_GFX_REFLECT, ANIM_GFX_SPEED anim_bgeffect ANIM_BG_06, $0, $2, $0 .loop @@ -4740,9 +4449,8 @@ BattleAnim_MirrorCoat: ; cb8e9 anim_loop 3, .loop anim_wait 32 anim_ret -; cb917 -BattleAnim_PsychUp: ; cb917 +BattleAnim_PsychUp: anim_1gfx ANIM_GFX_STATUS anim_call BattleAnim_FollowEnemyFeet_0 anim_bgeffect ANIM_BG_1A, $0, $1, $20 @@ -4756,9 +4464,8 @@ BattleAnim_PsychUp: ; cb917 anim_call BattleAnim_ShowMon_0 anim_wait 16 anim_ret -; cb940 -BattleAnim_Extremespeed: ; cb940 +BattleAnim_Extremespeed: anim_2gfx ANIM_GFX_SPEED, ANIM_GFX_CUT anim_bgeffect ANIM_BG_HIDE_MON, $0, $1, $0 anim_sound 0, 0, SFX_MENU @@ -4775,9 +4482,8 @@ BattleAnim_Extremespeed: ; cb940 anim_bgeffect ANIM_BG_SHOW_MON, $0, $1, $0 anim_wait 16 anim_ret -; cb97a -BattleAnim_Ancientpower: ; cb97a +BattleAnim_Ancientpower: anim_2gfx ANIM_GFX_ROCKS, ANIM_GFX_HIT anim_sound 0, 0, SFX_SPARK anim_obj ANIM_OBJ_ANCIENTPOWER, 64, 108, $20 @@ -4804,9 +4510,8 @@ BattleAnim_Ancientpower: ; cb97a anim_obj ANIM_OBJ_00, 136, 56, $0 anim_wait 6 anim_ret -; cb9c6 -BattleAnim_ShadowBall: ; cb9c6 +BattleAnim_ShadowBall: anim_2gfx ANIM_GFX_EGG, ANIM_GFX_SMOKE anim_bgp $1b anim_sound 6, 2, SFX_SLUDGE_BOMB @@ -4815,9 +4520,8 @@ BattleAnim_ShadowBall: ; cb9c6 anim_obj ANIM_OBJ_BALL_POOF, 132, 56, $10 anim_wait 24 anim_ret -; cb9db -BattleAnim_FutureSight: ; cb9db +BattleAnim_FutureSight: anim_1gfx ANIM_GFX_WIND anim_bgeffect ANIM_BG_06, $0, $2, $0 anim_bgeffect ANIM_BG_ALTERNATE_HUES, $0, $2, $0 @@ -4836,9 +4540,8 @@ BattleAnim_FutureSight: ; cb9db anim_loop 4, .loop anim_incbgeffect ANIM_BG_PSYCHIC anim_ret -; cba1b -BattleAnim_RockSmash: ; cba1b +BattleAnim_RockSmash: anim_2gfx ANIM_GFX_ROCKS, ANIM_GFX_HIT anim_sound 0, 1, SFX_SPARK anim_obj ANIM_OBJ_01, 128, 56, $0 @@ -4860,9 +4563,8 @@ BattleAnim_RockSmash: ; cba1b anim_obj ANIM_OBJ_ROCK_SMASH, 128, 64, $90 anim_wait 32 anim_ret -; cba6a -BattleAnim_Whirlpool: ; cba6a +BattleAnim_Whirlpool: anim_1gfx ANIM_GFX_WIND anim_bgeffect ANIM_BG_WHIRLPOOL, $0, $0, $0 anim_sound 0, 1, SFX_SURF @@ -4875,9 +4577,8 @@ BattleAnim_Whirlpool: ; cba6a anim_incbgeffect ANIM_BG_WHIRLPOOL anim_wait 1 anim_ret -; cba84 -BattleAnim_BeatUp: ; cba84 +BattleAnim_BeatUp: anim_if_param_equal $0, .current_mon anim_sound 0, 0, SFX_BALL_POOF anim_bgeffect ANIM_BG_RETURN_MON, $0, $1, $0 @@ -4896,11 +4597,10 @@ BattleAnim_BeatUp: ; cba84 anim_wait 8 anim_call BattleAnim_ShowMon_0 anim_ret -; cbab3 -BattleAnim_DreamEater_branch_cbab3: ; cbab3 -BattleAnim_GigaDrain_branch_cbab3: ; cbab3 -BattleAnim_LeechLife_branch_cbab3: ; cbab3 +BattleAnim_DreamEater_branch_cbab3: +BattleAnim_GigaDrain_branch_cbab3: +BattleAnim_LeechLife_branch_cbab3: anim_obj ANIM_OBJ_71, 132, 44, $0 anim_obj ANIM_OBJ_71, 132, 44, $8 anim_obj ANIM_OBJ_71, 132, 44, $10 @@ -4910,11 +4610,10 @@ BattleAnim_LeechLife_branch_cbab3: ; cbab3 anim_obj ANIM_OBJ_71, 132, 44, $30 anim_obj ANIM_OBJ_71, 132, 44, $38 anim_ret -; cbadc -BattleAnim_Glare_branch_cbadc: ; cbadc -BattleAnim_Leer_branch_cbadc: ; cbadc -BattleAnim_ScaryFace_branch_cbadc: ; cbadc +BattleAnim_Glare_branch_cbadc: +BattleAnim_Leer_branch_cbadc: +BattleAnim_ScaryFace_branch_cbadc: anim_sound 6, 2, SFX_LEER anim_obj ANIM_OBJ_4E, 72, 84, $0 anim_obj ANIM_OBJ_4E, 64, 80, $0 @@ -4927,10 +4626,9 @@ BattleAnim_ScaryFace_branch_cbadc: ; cbadc anim_obj ANIM_OBJ_4F, 130, 54, $0 anim_obj ANIM_OBJ_4F, 122, 50, $0 anim_ret -; cbb12 -BattleAnim_Fly_branch_cbb12: ; cbb12 -BattleAnim_Teleport_branch_cbb12: ; cbb12 +BattleAnim_Fly_branch_cbb12: +BattleAnim_Teleport_branch_cbb12: anim_sound 0, 0, SFX_WARP_TO anim_obj ANIM_OBJ_44, 44, 108, $0 anim_obj ANIM_OBJ_44, 44, 100, $0 @@ -4940,11 +4638,10 @@ BattleAnim_Teleport_branch_cbb12: ; cbb12 anim_obj ANIM_OBJ_44, 44, 68, $0 anim_obj ANIM_OBJ_44, 44, 60, $0 anim_ret -; cbb39 -BattleAnim_AuroraBeam_branch_cbb39: ; cbb39 -BattleAnim_HyperBeam_branch_cbb39: ; cbb39 -BattleAnim_Solarbeam_branch_cbb39: ; cbb39 +BattleAnim_AuroraBeam_branch_cbb39: +BattleAnim_HyperBeam_branch_cbb39: +BattleAnim_Solarbeam_branch_cbb39: anim_sound 0, 0, SFX_HYPER_BEAM anim_obj ANIM_OBJ_27, 64, 92, $0 anim_wait 4 @@ -4958,10 +4655,9 @@ BattleAnim_Solarbeam_branch_cbb39: ; cbb39 anim_obj ANIM_OBJ_27, 112, 68, $0 anim_obj ANIM_OBJ_28, 126, 62, $0 anim_ret -; cbb62 -BattleAnim_Explosion_branch_cbb62: ; cbb62 -BattleAnim_Selfdestruct_branch_cbb62: ; cbb62 +BattleAnim_Explosion_branch_cbb62: +BattleAnim_Selfdestruct_branch_cbb62: anim_sound 0, 0, SFX_EGG_BOMB anim_obj ANIM_OBJ_17, 24, 64, $0 anim_wait 5 @@ -4977,12 +4673,11 @@ BattleAnim_Selfdestruct_branch_cbb62: ; cbb62 anim_sound 0, 0, SFX_EGG_BOMB anim_obj ANIM_OBJ_17, 40, 84, $0 anim_ret -; cbb8f -BattleAnim_Dynamicpunch_branch_cbb8f: ; cbb8f -BattleAnim_Explosion_branch_cbb8f: ; cbb8f -BattleAnim_Present_branch_cbb8f: ; cbb8f -BattleAnim_Selfdestruct_branch_cbb8f: ; cbb8f +BattleAnim_Dynamicpunch_branch_cbb8f: +BattleAnim_Explosion_branch_cbb8f: +BattleAnim_Present_branch_cbb8f: +BattleAnim_Selfdestruct_branch_cbb8f: anim_sound 0, 1, SFX_EGG_BOMB anim_obj ANIM_OBJ_17, 148, 32, $0 anim_wait 5 @@ -4998,19 +4693,17 @@ BattleAnim_Selfdestruct_branch_cbb8f: ; cbb8f anim_sound 0, 1, SFX_EGG_BOMB anim_obj ANIM_OBJ_17, 132, 52, $0 anim_ret -; cbbbc -BattleAnim_Growl_branch_cbbbc: ; cbbbc -BattleAnim_Roar_branch_cbbbc: ; cbbbc -BattleAnim_Snore_branch_cbbbc: ; cbbbc +BattleAnim_Growl_branch_cbbbc: +BattleAnim_Roar_branch_cbbbc: +BattleAnim_Snore_branch_cbbbc: anim_obj ANIM_OBJ_4B, 64, 76, $0 anim_obj ANIM_OBJ_4B, 64, 88, $1 anim_obj ANIM_OBJ_4B, 64, 100, $2 anim_ret -; cbbcc -BattleAnim_FirePunch_branch_cbbcc: ; cbbcc -BattleAnim_TriAttack_branch_cbbcc: ; cbbcc +BattleAnim_FirePunch_branch_cbbcc: +BattleAnim_TriAttack_branch_cbbcc: anim_sound 0, 1, SFX_EMBER .loop anim_obj ANIM_OBJ_BURNED, 136, 56, $10 @@ -5018,11 +4711,10 @@ BattleAnim_TriAttack_branch_cbbcc: ; cbbcc anim_wait 4 anim_loop 4, .loop anim_ret -; cbbdf -BattleAnim_IcePunch_branch_cbbdf: ; cbbdf -BattleAnim_PowderSnow_branch_cbbdf: ; cbbdf -BattleAnim_TriAttack_branch_cbbdf: ; cbbdf +BattleAnim_IcePunch_branch_cbbdf: +BattleAnim_PowderSnow_branch_cbbdf: +BattleAnim_TriAttack_branch_cbbdf: anim_sound 0, 1, SFX_SHINE anim_obj ANIM_OBJ_12, 128, 42, $0 anim_wait 6 @@ -5041,11 +4733,10 @@ BattleAnim_TriAttack_branch_cbbdf: ; cbbdf anim_sound 0, 1, SFX_SHINE anim_obj ANIM_OBJ_12, 128, 70, $0 anim_ret -; cbc15 -BattleAnim_SludgeBomb_branch_cbc15: ; cbc15 -BattleAnim_Sludge_branch_cbc15: ; cbc15 -BattleAnim_Toxic_branch_cbc15: ; cbc15 +BattleAnim_SludgeBomb_branch_cbc15: +BattleAnim_Sludge_branch_cbc15: +BattleAnim_Toxic_branch_cbc15: .loop anim_sound 0, 1, SFX_UNKNOWN_7F anim_obj ANIM_OBJ_1A, 132, 72, $0 @@ -5058,22 +4749,20 @@ BattleAnim_Toxic_branch_cbc15: ; cbc15 anim_wait 8 anim_loop 5, .loop anim_ret -; cbc35 -BattleAnim_Acid_branch_cbc35: ; cbc35 -BattleAnim_Toxic_branch_cbc35: ; cbc35 +BattleAnim_Acid_branch_cbc35: +BattleAnim_Toxic_branch_cbc35: .loop anim_sound 6, 2, SFX_BUBBLEBEAM anim_obj ANIM_OBJ_19, 64, 92, $10 anim_wait 5 anim_loop 8, .loop anim_ret -; cbc43 -BattleAnim_Harden_branch_cbc43: ; cbc43 -BattleAnim_IronTail_branch_cbc43: ; cbc43 -BattleAnim_MetalClaw_branch_cbc43: ; cbc43 -BattleAnim_SteelWing_branch_cbc43: ; cbc43 +BattleAnim_Harden_branch_cbc43: +BattleAnim_IronTail_branch_cbc43: +BattleAnim_MetalClaw_branch_cbc43: +BattleAnim_SteelWing_branch_cbc43: anim_sound 0, 0, SFX_SHINE anim_bgeffect ANIM_BG_17, $0, $1, $40 anim_wait 8 @@ -5083,10 +4772,9 @@ BattleAnim_SteelWing_branch_cbc43: ; cbc43 anim_wait 64 anim_incbgeffect ANIM_BG_17 anim_ret -; cbc5b -BattleAnim_MudSlap_branch_cbc5b: ; cbc5b -BattleAnim_SandAttack_branch_cbc5b: ; cbc5b +BattleAnim_MudSlap_branch_cbc5b: +BattleAnim_SandAttack_branch_cbc5b: .loop anim_sound 6, 2, SFX_MENU anim_obj ANIM_OBJ_58, 64, 92, $4 @@ -5094,11 +4782,10 @@ BattleAnim_SandAttack_branch_cbc5b: ; cbc5b anim_loop 8, .loop anim_wait 32 anim_ret -; cbc6a -BattleAnim_Moonlight_branch_cbc6a: ; cbc6a -BattleAnim_MorningSun_branch_cbc6a: ; cbc6a -BattleAnim_Synthesis_branch_cbc6a: ; cbc6a +BattleAnim_Moonlight_branch_cbc6a: +BattleAnim_MorningSun_branch_cbc6a: +BattleAnim_Synthesis_branch_cbc6a: anim_sound 0, 0, SFX_METRONOME anim_obj ANIM_OBJ_GLIMMER, 44, 64, $0 anim_wait 5 @@ -5107,11 +4794,10 @@ BattleAnim_Synthesis_branch_cbc6a: ; cbc6a anim_obj ANIM_OBJ_GLIMMER, 56, 104, $0 anim_wait 21 anim_ret -; cbc80 -BattleAnim_Moonlight_branch_cbc80: ; cbc80 -BattleAnim_MorningSun_branch_cbc80: ; cbc80 -BattleAnim_Synthesis_branch_cbc80: ; cbc80 +BattleAnim_Moonlight_branch_cbc80: +BattleAnim_MorningSun_branch_cbc80: +BattleAnim_Synthesis_branch_cbc80: anim_sound 0, 0, SFX_METRONOME .loop anim_obj ANIM_OBJ_GLIMMER, 24, 64, $0 @@ -5127,50 +4813,43 @@ BattleAnim_Synthesis_branch_cbc80: ; cbc80 anim_loop 2, .loop anim_wait 16 anim_ret -; cbca7 -BattleAnim_FollowEnemyFeet_0: ; cbca7 +BattleAnim_FollowEnemyFeet_0: anim_enemyfeetobj anim_bgeffect ANIM_BG_FEET_FOLLOW, $0, $0, $0 anim_wait 6 anim_ret -; cbcaf -BattleAnim_FollowPlayerHead_0: ; cbcaf +BattleAnim_FollowPlayerHead_0: anim_playerheadobj anim_bgeffect ANIM_BG_HEAD_FOLLOW, $0, $0, $0 anim_wait 6 anim_ret -; cbcb7 -BattleAnim_ShowMon_0: ; cbcb7 +BattleAnim_ShowMon_0: anim_wait 1 anim_bgeffect ANIM_BG_SHOW_MON, $0, $0, $0 anim_wait 5 anim_incobj 1 anim_wait 1 anim_ret -; cbcc2 -BattleAnim_FollowEnemyFeet_1: ; cbcc2 +BattleAnim_FollowEnemyFeet_1: anim_enemyfeetobj anim_bgeffect ANIM_BG_FEET_FOLLOW, $0, $1, $0 anim_wait 6 anim_ret -; cbcca -BattleAnim_FollowPlayerHead_1: ; cbcca +BattleAnim_FollowPlayerHead_1: anim_playerheadobj anim_bgeffect ANIM_BG_HEAD_FOLLOW, $0, $1, $0 anim_wait 4 anim_ret -; cbcd2 -BattleAnim_ShowMon_1: ; cbcd2 +BattleAnim_ShowMon_1: anim_wait 1 anim_bgeffect ANIM_BG_SHOW_MON, $0, $1, $0 anim_wait 4 anim_incobj 1 anim_wait 1 anim_ret -; cbcdd diff --git a/data/moves/descriptions.asm b/data/moves/descriptions.asm index 7f35132cf..1d2e5b37f 100644 --- a/data/moves/descriptions.asm +++ b/data/moves/descriptions.asm @@ -1,4 +1,4 @@ -MoveDescriptions:: ; 2cb52 +MoveDescriptions:: ; entries correspond to move ids (see constants/move_constants.asm) dw PoundDescription dw KarateChopDescription @@ -256,7 +256,6 @@ MoveDescriptions:: ; 2cb52 dw MoveFEDescription dw MoveFFDescription dw Move00Description -; 2cd52 MoveFCDescription: MoveFDDescription: @@ -1268,4 +1267,3 @@ WhirlpoolDescription: BeatUpDescription: db "Party #MON join" next "in the attack.@" -; 2ed44 diff --git a/data/moves/effects_pointers.asm b/data/moves/effects_pointers.asm index a12092881..94834de71 100644 --- a/data/moves/effects_pointers.asm +++ b/data/moves/effects_pointers.asm @@ -1,4 +1,4 @@ -MoveEffectsPointers: ; 271f4 +MoveEffectsPointers: ; entries correspond to EFFECT_* constants dw NormalHit dw DoSleep diff --git a/data/moves/effects_priorities.asm b/data/moves/effects_priorities.asm index 6faa6d032..dfdb636a7 100644 --- a/data/moves/effects_priorities.asm +++ b/data/moves/effects_priorities.asm @@ -1,4 +1,4 @@ -MoveEffectPriorities: ; 3c5df +MoveEffectPriorities: db EFFECT_PROTECT, 3 db EFFECT_ENDURE, 3 db EFFECT_PRIORITY_HIT, 2 @@ -6,4 +6,3 @@ MoveEffectPriorities: ; 3c5df db EFFECT_COUNTER, 0 db EFFECT_MIRROR_COAT, 0 db -1 -; 3c5ec diff --git a/data/moves/grammar.asm b/data/moves/grammar.asm index fe637180c..f24748083 100644 --- a/data/moves/grammar.asm +++ b/data/moves/grammar.asm @@ -2,7 +2,7 @@ ; Each move is given an identifier for what usedmovetext to use (0-4). ; Made redundant in English localization, where all are just "[mon]¯used [move]!" -MoveGrammar: ; 105e7a +MoveGrammar: ; 0: originally "[mon]の¯[move]¯つかった!" ("[mon]¯used¯[move]!") db SWORDS_DANCE db GROWTH @@ -99,4 +99,3 @@ MoveGrammar: ; 105e7a ; 4: originally "[mon]の¯[move]!" ("[mon]'s¯[move]!") ; Any move not listed above uses this grammar. db -1 ; end -; 105ed0 diff --git a/data/moves/moves.asm b/data/moves/moves.asm index b576fbaff..b310ba000 100644 --- a/data/moves/moves.asm +++ b/data/moves/moves.asm @@ -10,7 +10,7 @@ move: MACRO db \7 percent ; effect chance ENDM -Moves: ; 41afb +Moves: ; entries correspond to constants/move_constants.asm move POUND, EFFECT_NORMAL_HIT, 40, NORMAL, 100, 35, 0 move KARATE_CHOP, EFFECT_NORMAL_HIT, 50, FIGHTING, 100, 25, 0 diff --git a/data/moves/tmhm_moves.asm b/data/moves/tmhm_moves.asm index fd610d5fa..339f6a5a6 100644 --- a/data/moves/tmhm_moves.asm +++ b/data/moves/tmhm_moves.asm @@ -1,4 +1,4 @@ -TMHMMoves: ; 1167a +TMHMMoves: ; entries correspond to *_TMNUM enums (see constants/item_constants.asm) ; TMs db DYNAMICPUNCH @@ -64,4 +64,3 @@ TMHMMoves: ; 1167a db THUNDERBOLT db ICE_BEAM db 0 ; end -; 116b7 diff --git a/data/party_menu_qualities.asm b/data/party_menu_qualities.asm index c0c1b3df9..3d09ed49d 100644 --- a/data/party_menu_qualities.asm +++ b/data/party_menu_qualities.asm @@ -19,7 +19,7 @@ endr ENDM -PartyMenuQualityPointers: ; 503b2 +PartyMenuQualityPointers: ; entries correspond to PARTYMENUACTION_* constants dw .Default ; PARTYMENUACTION_CHOOSE_POKEMON dw .Default ; PARTYMENUACTION_HEALING_ITEM @@ -31,11 +31,9 @@ PartyMenuQualityPointers: ; 503b2 dw .Gender ; PARTYMENUACTION_GIVE_MON_FEMALE dw .Default ; PARTYMENUACTION_GIVE_ITEM dw .Mobile ; PARTYMENUACTION_MOBILE -; 503c6 .Default: partymenuqualities NICKNAMES, HP_BAR, HP_DIGITS, LEVEL, STATUS .TMHM: partymenuqualities NICKNAMES, TMHM_COMPAT, LEVEL, STATUS .EvoStone: partymenuqualities NICKNAMES, EVO_STONE_COMPAT, LEVEL, STATUS .Gender: partymenuqualities NICKNAMES, GENDER, LEVEL, STATUS .Mobile: partymenuqualities NICKNAMES, MOBILE_SELECTION, LEVEL, STATUS -; 503e0 diff --git a/data/phone/non_trainer_names.asm b/data/phone/non_trainer_names.asm index 184a93113..d7648fa7f 100644 --- a/data/phone/non_trainer_names.asm +++ b/data/phone/non_trainer_names.asm @@ -1,4 +1,4 @@ -NonTrainerCallerNames: ; 903d6 +NonTrainerCallerNames: ; entries correspond to PHONECONTACT_* constants dw .none dw .mom @@ -13,4 +13,3 @@ NonTrainerCallerNames: ; 903d6 .elm: db "PROF.ELM:@" .bikeshop: db "BIKE SHOP:@" .buena: db "BUENA:<LNBRK> DISC JOCKEY@" -; 90423 diff --git a/data/phone/permanent_numbers.asm b/data/phone/permanent_numbers.asm index a5101f2b6..98c6212db 100644 --- a/data/phone/permanent_numbers.asm +++ b/data/phone/permanent_numbers.asm @@ -1,5 +1,4 @@ -PermanentNumbers: ; 90066 +PermanentNumbers: db PHONECONTACT_MOM db PHONECONTACT_ELM db -1 ; end -; 90069 diff --git a/data/phone/phone_contacts.asm b/data/phone/phone_contacts.asm index 349fa2e02..a7a774507 100644 --- a/data/phone/phone_contacts.asm +++ b/data/phone/phone_contacts.asm @@ -8,7 +8,7 @@ phone: MACRO dba \7 ENDM -PhoneContacts: ; 9045f +PhoneContacts: ; entries correspond to PHONE_* constants phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript phone TRAINER_NONE, PHONECONTACT_MOM, PLAYERS_HOUSE_1F, ANYTIME, MomPhoneScript, 0, UnusedPhoneScript @@ -48,4 +48,3 @@ PhoneContacts: ; 9045f phone HIKER, PARRY1, ROUTE_45, ANYTIME, ParryPhoneScript1, ANYTIME, ParryPhoneScript2 phone PICNICKER, ERIN1, ROUTE_46, ANYTIME, ErinPhoneScript1, ANYTIME, ErinPhoneScript2 phone TRAINER_NONE, PHONECONTACT_BUENA, GOLDENROD_DEPT_STORE_ROOF, ANYTIME, BuenaPhoneScript1, ANYTIME, BuenaPhoneScript2 -; 90627 diff --git a/data/phone/special_calls.asm b/data/phone/special_calls.asm index 5dba36fc9..224ca2258 100644 --- a/data/phone/special_calls.asm +++ b/data/phone/special_calls.asm @@ -5,7 +5,7 @@ specialcall: MACRO dba \3 ENDM -SpecialPhoneCallList: ; 90627 +SpecialPhoneCallList: ; entries correspond to SPECIALCALL_* constants specialcall SpecialCallOnlyWhenOutside, PHONECONTACT_ELM, ElmPhoneScript2 specialcall SpecialCallOnlyWhenOutside, PHONECONTACT_ELM, ElmPhoneScript2 @@ -15,4 +15,3 @@ SpecialPhoneCallList: ; 90627 specialcall SpecialCallWhereverYouAre, PHONECONTACT_BIKESHOP, BikeShopPhoneScript specialcall SpecialCallWhereverYouAre, PHONECONTACT_MOM, MomPhoneLectureScript specialcall SpecialCallOnlyWhenOutside, PHONECONTACT_ELM, ElmPhoneScript2 -; 90657 diff --git a/data/player_names.asm b/data/player_names.asm index 3c5a34c77..6263cb828 100644 --- a/data/player_names.asm +++ b/data/player_names.asm @@ -1,15 +1,15 @@ -ChrisNameMenuHeader: ; 882b5 +ChrisNameMenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 0, 0, 10, TEXTBOX_Y - 1 dw .MaleNames db 1 ; ???? db 0 ; default option -.MaleNames: ; 882be +.MaleNames: db STATICMENU_CURSOR | STATICMENU_PLACE_TITLE | STATICMENU_DISABLE_B ; flags db 5 ; items db "NEW NAME@" -MalePlayerNameArray: ; 882c9 +MalePlayerNameArray: db "CHRIS@" db "MAT@" db "ALLAN@" @@ -17,18 +17,18 @@ MalePlayerNameArray: ; 882c9 db 2 ; displacement db " NAME @" ; title -KrisNameMenuHeader: ; 882e5 +KrisNameMenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 0, 0, 10, TEXTBOX_Y - 1 dw .FemaleNames db 1 ; ???? db 0 ; default option -.FemaleNames: ; 882ee +.FemaleNames: db STATICMENU_CURSOR | STATICMENU_PLACE_TITLE | STATICMENU_DISABLE_B ; flags db 5 ; items db "NEW NAME@" -FemalePlayerNameArray: ; 882f9 +FemalePlayerNameArray: db "KRIS@" db "AMANDA@" db "JUANA@" diff --git a/data/pokemon/cries.asm b/data/pokemon/cries.asm index e6f729361..a57eac98c 100644 --- a/data/pokemon/cries.asm +++ b/data/pokemon/cries.asm @@ -3,7 +3,7 @@ mon_cry: MACRO dw \1, \2, \3 ENDM -PokemonCries:: ; f2787 +PokemonCries:: ; entries correspond to constants/pokemon_constants.asm mon_cry CRY_BULBASAUR, $080, $081 ; BULBASAUR mon_cry CRY_BULBASAUR, $020, $100 ; IVYSAUR @@ -260,4 +260,3 @@ PokemonCries:: ; f2787 mon_cry CRY_NIDORAN_M, 0, 0 ; 253 mon_cry CRY_NIDORAN_M, 0, 0 ; 254 mon_cry CRY_NIDORAN_M, 0, 0 ; 255 -; f2d81 diff --git a/data/pokemon/ezchat_order.asm b/data/pokemon/ezchat_order.asm index 8cb860028..cb9a60d98 100644 --- a/data/pokemon/ezchat_order.asm +++ b/data/pokemon/ezchat_order.asm @@ -93,4 +93,3 @@ EZChat_SortedPokemon: .ro: db VULPIX, -1 .wa: db JUMPLUFF, TOTODILE, MACHOP ;, -1 .end: db -1 -; 11d67e diff --git a/data/pokemon/gen1_base_special.asm b/data/pokemon/gen1_base_special.asm index 9998692ab..306ce31d9 100644 --- a/data/pokemon/gen1_base_special.asm +++ b/data/pokemon/gen1_base_special.asm @@ -1,6 +1,6 @@ ; The original base Special stat for each Pokémon from Red/Blue -KantoMonSpecials: ; fb656 +KantoMonSpecials: db 65 ; BULBASAUR db 80 ; IVYSAUR db 100 ; VENUSAUR @@ -152,4 +152,3 @@ KantoMonSpecials: ; fb656 db 100 ; DRAGONITE db 154 ; MEWTWO db 100 ; MEW -; fb6ed diff --git a/data/pokemon/gen1_order.asm b/data/pokemon/gen1_order.asm index e40ba0273..45efcafa0 100644 --- a/data/pokemon/gen1_order.asm +++ b/data/pokemon/gen1_order.asm @@ -1,4 +1,4 @@ -Pokered_MonIndices: ; fb91c +Pokered_MonIndices: db RHYDON db KANGASKHAN db NIDORAN_M @@ -252,4 +252,3 @@ Pokered_MonIndices: ; fb91c db QWILFISH db WOBBUFFET db WOBBUFFET -; fba18 diff --git a/data/pokemon/menu_icons.asm b/data/pokemon/menu_icons.asm index 360b206a2..f378cbfbe 100644 --- a/data/pokemon/menu_icons.asm +++ b/data/pokemon/menu_icons.asm @@ -1,6 +1,6 @@ ; party menu icons -MonMenuIcons: ; 8eac4 +MonMenuIcons: db ICON_BULBASAUR ; BULBASAUR db ICON_BULBASAUR ; IVYSAUR db ICON_BULBASAUR ; VENUSAUR @@ -252,4 +252,3 @@ MonMenuIcons: ; 8eac4 db ICON_LUGIA ; LUGIA db ICON_HO_OH ; HO_OH db ICON_HUMANSHAPE ; CELEBI -; 8ebbf diff --git a/data/pokemon/palettes.asm b/data/pokemon/palettes.asm index ec2cc3c0b..a3507c203 100644 --- a/data/pokemon/palettes.asm +++ b/data/pokemon/palettes.asm @@ -1,4 +1,4 @@ -PokemonPalettes: ; a8ce +PokemonPalettes: ; entries correspond to Pokémon species, two apiece ; 000 @@ -534,5 +534,3 @@ INCLUDE "gfx/pokemon/egg/shiny.pal" ; 255 shiny RGB 23, 23, 23 RGB 17, 17, 17 - -; b0ce diff --git a/data/pokemon/unown_words.asm b/data/pokemon/unown_words.asm index 0b7d93ac2..5b54b84ed 100644 --- a/data/pokemon/unown_words.asm +++ b/data/pokemon/unown_words.asm @@ -7,7 +7,7 @@ endr db -1 ENDM -UnownWords: ; fba5a +UnownWords: ; entries correspond to UNOWN_* form constants dw UnownWordA dw UnownWordA @@ -36,7 +36,6 @@ UnownWords: ; fba5a dw UnownWordX dw UnownWordY dw UnownWordZ -; fba90 UnownWordA: unownword "ANGRY" UnownWordB: unownword "BEAR" @@ -64,4 +63,3 @@ UnownWordW: unownword "WANT" UnownWordX: unownword "XXXXX" UnownWordY: unownword "YIELD" UnownWordZ: unownword "ZOOM" -; fbb32 diff --git a/data/predef_pointers.asm b/data/predef_pointers.asm index 87906597a..1693f22aa 100644 --- a/data/predef_pointers.asm +++ b/data/predef_pointers.asm @@ -6,7 +6,7 @@ add_predef: MACRO dab \1 ENDM -PredefPointers:: ; 856b +PredefPointers:: add_predef LearnMove ; $0 add_predef DummyPredef1 add_predef HealParty ; this is both a special and a predef @@ -82,4 +82,3 @@ PredefPointers:: ; 856b add_predef Unused_HOF_AnimateAlignedFrontpic ; $48 add_predef HOF_AnimateFrontpic dbw -1, InexplicablyEmptyFunction ; ??? -; 864c diff --git a/data/special_pointers.asm b/data/special_pointers.asm index 50e52246e..2b62dc6a3 100644 --- a/data/special_pointers.asm +++ b/data/special_pointers.asm @@ -6,7 +6,7 @@ add_special: MACRO dba \1 ENDM -SpecialsPointers:: ; c029 +SpecialsPointers:: add_special WarpToSpawnPoint ; $0 ; Communications @@ -182,4 +182,3 @@ SpecialsPointers:: ; c029 add_special InitialSetDSTFlag add_special InitialClearDSTFlag add_special DummySpecial_c224 ; $a8 -; c224 diff --git a/data/sprite_anims/framesets.asm b/data/sprite_anims/framesets.asm index d768ec21a..666f2b2e2 100644 --- a/data/sprite_anims/framesets.asm +++ b/data/sprite_anims/framesets.asm @@ -1,4 +1,4 @@ -SpriteAnimFrameData: ; 8d6e6 +SpriteAnimFrameData: ; entries correspond to SPRITE_ANIM_FRAMESET_* constants dw .Frameset_00 dw .Frameset_PartyMon @@ -66,7 +66,6 @@ SpriteAnimFrameData: ; 8d6e6 dw .Frameset_IntroUnownF dw .Frameset_CelebiLeft dw .Frameset_CelebiRight -; 8d76a .Frameset_00: frame SPRITE_ANIM_OAMSET_RED_WALK_1, 32 @@ -496,4 +495,3 @@ SpriteAnimFrameData: ; 8d6e6 frame SPRITE_ANIM_OAMSET_CELEBI_1, 8, OAM_X_FLIP frame SPRITE_ANIM_OAMSET_CELEBI_2, 8, OAM_X_FLIP endanim -; 8d94d diff --git a/data/sprite_anims/oam.asm b/data/sprite_anims/oam.asm index bfd5cbcd3..4fa153504 100644 --- a/data/sprite_anims/oam.asm +++ b/data/sprite_anims/oam.asm @@ -1,4 +1,4 @@ -SpriteAnimOAMData: ; 8d94d +SpriteAnimOAMData: ; entries correspond to SPRITE_ANIM_OAMSET_* constants ; vtile offset, pointer dbw $00, .OAMData_RedWalk ; SPRITE_ANIM_OAMSET_RED_WALK_1 @@ -1126,4 +1126,3 @@ SpriteAnimOAMData: ; 8d94d dsprite 0, 0, -1, 4, $51, 1 dsprite 0, 0, 0, 4, $52, 1 dsprite 0, 0, 1, 4, $53, 1 -; 8e706 diff --git a/data/sprite_anims/sequences.asm b/data/sprite_anims/sequences.asm index 36a0f4afc..77171bb8f 100644 --- a/data/sprite_anims/sequences.asm +++ b/data/sprite_anims/sequences.asm @@ -1,4 +1,4 @@ -SpriteAnimSeqData: ; 8d1c4 +SpriteAnimSeqData: ; entries correspond to SPRITE_ANIM_INDEX_* constants ; frameset sequence, tile db SPRITE_ANIM_FRAMESET_PARTY_MON, SPRITE_ANIM_SEQ_PARTY_MON, $00 ; SPRITE_ANIM_INDEX_PARTY_MON @@ -46,4 +46,3 @@ SpriteAnimSeqData: ; 8d1c4 db SPRITE_ANIM_FRAMESET_INTRO_UNOWN_F, SPRITE_ANIM_SEQ_INTRO_UNOWN_F, $00 ; SPRITE_ANIM_INDEX_INTRO_UNOWN_F db SPRITE_ANIM_FRAMESET_INTRO_SUICUNE_AWAY, SPRITE_ANIM_SEQ_INTRO_SUICUNE_AWAY, $00 ; SPRITE_ANIM_INDEX_INTRO_SUICUNE_AWAY db SPRITE_ANIM_FRAMESET_CELEBI_LEFT, SPRITE_ANIM_SEQ_NULL, $00 ; SPRITE_ANIM_INDEX_CELEBI -; 8d24b diff --git a/data/sprites/emotes.asm b/data/sprites/emotes.asm index 2e25e52b5..76ca2f0b9 100644 --- a/data/sprites/emotes.asm +++ b/data/sprites/emotes.asm @@ -5,7 +5,7 @@ emote: MACRO dw vTiles1 tile \3 ENDM -Emotes: ; 144d +Emotes: ; entries correspond to EMOTE_* constants emote ShockEmote, 4, $78 emote QuestionEmote, 4, $78 @@ -19,4 +19,3 @@ Emotes: ; 144d emote FishingRodGFX, 2, $7c emote BoulderDustGFX, 2, $7e emote GrassRustleGFX, 1, $7e -; 14495 diff --git a/data/sprites/facings.asm b/data/sprites/facings.asm index c321ca462..6e8c304b1 100644 --- a/data/sprites/facings.asm +++ b/data/sprites/facings.asm @@ -1,4 +1,4 @@ -Facings: ; 4049 +Facings: ; entries correspond to FACING_* constants dw FacingStepDown0 dw FacingStepDown1 @@ -52,7 +52,6 @@ FacingWeirdTree2: ; standing down db 0, 8, 0, $01 db 8, 0, RELATIVE_ATTRIBUTES, $02 db 8, 8, RELATIVE_ATTRIBUTES, $03 -; 409c FacingStepDown1: ; walking down 1 db 4 ; # @@ -60,7 +59,6 @@ FacingStepDown1: ; walking down 1 db 0, 8, 0, $81 db 8, 0, RELATIVE_ATTRIBUTES, $82 db 8, 8, RELATIVE_ATTRIBUTES, $83 -; 40ad FacingStepDown3: ; walking down 2 db 4 ; # @@ -68,7 +66,6 @@ FacingStepDown3: ; walking down 2 db 0, 0, X_FLIP, $81 db 8, 8, RELATIVE_ATTRIBUTES | X_FLIP, $82 db 8, 0, RELATIVE_ATTRIBUTES | X_FLIP, $83 -; 40be FacingStepUp0: FacingStepUp2: ; standing up @@ -77,7 +74,6 @@ FacingStepUp2: ; standing up db 0, 8, 0, $05 db 8, 0, RELATIVE_ATTRIBUTES, $06 db 8, 8, RELATIVE_ATTRIBUTES, $07 -; 40cf FacingStepUp1: ; walking up 1 db 4 ; # @@ -85,7 +81,6 @@ FacingStepUp1: ; walking up 1 db 0, 8, 0, $85 db 8, 0, RELATIVE_ATTRIBUTES, $86 db 8, 8, RELATIVE_ATTRIBUTES, $87 -; 40e0 FacingStepUp3: ; walking up 2 db 4 ; # @@ -93,7 +88,6 @@ FacingStepUp3: ; walking up 2 db 0, 0, X_FLIP, $85 db 8, 8, RELATIVE_ATTRIBUTES | X_FLIP, $86 db 8, 0, RELATIVE_ATTRIBUTES | X_FLIP, $87 -; 40f1 FacingStepLeft0: FacingStepLeft2: ; standing left @@ -102,7 +96,6 @@ FacingStepLeft2: ; standing left db 0, 8, 0, $09 db 8, 0, RELATIVE_ATTRIBUTES, $0a db 8, 8, RELATIVE_ATTRIBUTES, $0b -; 4102 FacingStepRight0: FacingStepRight2: ; standing right @@ -111,7 +104,6 @@ FacingStepRight2: ; standing right db 0, 0, X_FLIP, $09 db 8, 8, RELATIVE_ATTRIBUTES | X_FLIP, $0a db 8, 0, RELATIVE_ATTRIBUTES | X_FLIP, $0b -; 4113 FacingStepLeft1: FacingStepLeft3: ; walking left @@ -120,7 +112,6 @@ FacingStepLeft3: ; walking left db 0, 8, 0, $89 db 8, 0, RELATIVE_ATTRIBUTES, $8a db 8, 8, RELATIVE_ATTRIBUTES, $8b -; 4124 FacingStepRight1: FacingStepRight3: ; walking right @@ -129,7 +120,6 @@ FacingStepRight3: ; walking right db 0, 0, X_FLIP, $89 db 8, 8, RELATIVE_ATTRIBUTES | X_FLIP, $8a db 8, 0, RELATIVE_ATTRIBUTES | X_FLIP, $8b -; 4135 FacingFishDown: ; fishing down db 5 ; # @@ -138,7 +128,6 @@ FacingFishDown: ; fishing down db 8, 0, RELATIVE_ATTRIBUTES, $02 db 8, 8, RELATIVE_ATTRIBUTES, $03 db 16, 0, ABSOLUTE_TILE_ID, $fc -; 414a FacingFishUp: ; fishing up db 5 ; # @@ -147,7 +136,6 @@ FacingFishUp: ; fishing up db 8, 0, RELATIVE_ATTRIBUTES, $06 db 8, 8, RELATIVE_ATTRIBUTES, $07 db -8, 0, ABSOLUTE_TILE_ID, $fc -; 415f FacingFishLeft: ; fishing left db 5 ; # @@ -156,7 +144,6 @@ FacingFishLeft: ; fishing left db 8, 0, RELATIVE_ATTRIBUTES, $0a db 8, 8, RELATIVE_ATTRIBUTES, $0b db 5, -8, ABSOLUTE_TILE_ID | X_FLIP, $fd -; 4174 FacingFishRight: ; fishing right db 5 ; # @@ -165,7 +152,6 @@ FacingFishRight: ; fishing right db 8, 8, RELATIVE_ATTRIBUTES | X_FLIP, $0a db 8, 0, RELATIVE_ATTRIBUTES | X_FLIP, $0b db 5, 16, ABSOLUTE_TILE_ID, $fd -; 4189 FacingEmote: ; emote db 4 ; # @@ -173,13 +159,11 @@ FacingEmote: ; emote db 0, 8, ABSOLUTE_TILE_ID, $f9 db 8, 0, ABSOLUTE_TILE_ID, $fa db 8, 8, ABSOLUTE_TILE_ID, $fb -; 419a FacingShadow: ; shadow db 2 ; # db 0, 0, ABSOLUTE_TILE_ID, $fc db 0, 8, ABSOLUTE_TILE_ID | X_FLIP, $fc -; 41a3 FacingBigDollSymmetric: ; big snorlax or lapras doll db 16 ; # @@ -199,23 +183,20 @@ FacingBigDollSymmetric: ; big snorlax or lapras doll db 16, 16, X_FLIP, $05 db 24, 24, X_FLIP, $06 db 24, 16, X_FLIP, $07 -; 41e4 -FacingWeirdTree1: ; 41e4 +FacingWeirdTree1: db 4 ; # db 0, 0, 0, $04 db 0, 8, 0, $05 db 8, 0, 0, $06 db 8, 8, 0, $07 -; 41f5 -FacingWeirdTree3: ; 41f5 +FacingWeirdTree3: db 4 ; # db 0, 8, X_FLIP, $04 db 0, 0, X_FLIP, $05 db 8, 8, X_FLIP, $06 db 8, 0, X_FLIP, $07 -; 4206 FacingBigDollAsymmetric: ; big doll other than snorlax or lapras db 14 ; # @@ -233,7 +214,6 @@ FacingBigDollAsymmetric: ; big doll other than snorlax or lapras db 16, 16, 0, $08 db 24, 24, X_FLIP, $04 db 24, 16, 0, $0b -; 423f FacingBoulderDust1: ; boulder dust 1 db 4 ; # @@ -241,7 +221,6 @@ FacingBoulderDust1: ; boulder dust 1 db 0, 8, ABSOLUTE_TILE_ID, $fe db 8, 0, ABSOLUTE_TILE_ID, $fe db 8, 8, ABSOLUTE_TILE_ID, $fe -; 4250 FacingBoulderDust2: ; boulder dust 2 db 4 ; # @@ -249,16 +228,13 @@ FacingBoulderDust2: ; boulder dust 2 db 0, 8, ABSOLUTE_TILE_ID, $ff db 8, 0, ABSOLUTE_TILE_ID, $ff db 8, 8, ABSOLUTE_TILE_ID, $ff -; 4261 -FacingGrass1: ; 4261 +FacingGrass1: db 2 ; # db 8, 0, ABSOLUTE_TILE_ID, $fe db 8, 8, ABSOLUTE_TILE_ID | X_FLIP, $fe -; 426a -FacingGrass2: ; 426a +FacingGrass2: db 2 ; # db 9, -1, ABSOLUTE_TILE_ID, $fe db 9, 9, ABSOLUTE_TILE_ID | X_FLIP, $fe -; 4273 diff --git a/data/sprites/map_objects.asm b/data/sprites/map_objects.asm index cf577869a..10afaf57b 100644 --- a/data/sprites/map_objects.asm +++ b/data/sprites/map_objects.asm @@ -1,4 +1,4 @@ -SpriteMovementData:: ; 4273 +SpriteMovementData:: ; entries correspond to SPRITEMOVEDATA_* constants ; SPRITEMOVEDATA_00 @@ -304,5 +304,3 @@ SpriteMovementData:: ; 4273 db 0 ; flags1 db 0 ; flags2 db 0 ; palette flags - -; 4357 diff --git a/data/sprites/sprite_mons.asm b/data/sprites/sprite_mons.asm index d3000e2b7..3d53804db 100644 --- a/data/sprites/sprite_mons.asm +++ b/data/sprites/sprite_mons.asm @@ -1,4 +1,4 @@ -SpriteMons: ; 14495 +SpriteMons: ; entries correspond to SPRITE_* constants past SPRITE_POKEMON db UNOWN db GEODUDE @@ -35,4 +35,3 @@ SpriteMons: ; 14495 db GYARADOS db LUGIA db HO_OH -; 144b8 diff --git a/data/sprites/sprites.asm b/data/sprites/sprites.asm index 6a44bea42..b55593c97 100644 --- a/data/sprites/sprites.asm +++ b/data/sprites/sprites.asm @@ -4,7 +4,7 @@ overworld_sprite: MACRO db \2 tiles, BANK(\1), \3, \4 ENDM -OverworldSprites: ; 14736 +OverworldSprites: ; entries correspond to SPRITE_* constants overworld_sprite ChrisSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED overworld_sprite ChrisBikeSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED diff --git a/data/text/mail_input_chars.asm b/data/text/mail_input_chars.asm index ca3833529..ac76e71eb 100644 --- a/data/text/mail_input_chars.asm +++ b/data/text/mail_input_chars.asm @@ -1,19 +1,17 @@ ; see engine/naming_screen.asm -MailEntry_Uppercase: ; 122dd +MailEntry_Uppercase: db "A B C D E F G H I J" db "K L M N O P Q R S T" db "U V W X Y Z , ? !" db "1 2 3 4 5 6 7 8 9 0" db "<PK> <MN> <PO> <KE> é ♂ ♀ ¥ … ×" db "lower DEL END " -; 1224f -MailEntry_Lowercase: ; 1224f +MailEntry_Lowercase: db "a b c d e f g h i j" db "k l m n o p q r s t" db "u v w x y z . - /" db "'d 'l 'm 'r 's 't 'v & ( )" db "“ ” [ ] ' : ; " db "UPPER DEL END " -; 122c1 diff --git a/data/text/unused_gen1_trainer_names.asm b/data/text/unused_gen1_trainer_names.asm index b3d60569d..fa839f366 100644 --- a/data/text/unused_gen1_trainer_names.asm +++ b/data/text/unused_gen1_trainer_names.asm @@ -1,4 +1,4 @@ -Gen1TrainerClassNames: ; 50a42 +Gen1TrainerClassNames: ; Untranslated trainer class names from Red. dw .Youngster dw .BugCatcher diff --git a/data/text_buffers.asm b/data/text_buffers.asm index 7dd7af428..7c28c11e0 100644 --- a/data/text_buffers.asm +++ b/data/text_buffers.asm @@ -1,4 +1,4 @@ -StringBufferPointers:: ; 24000 +StringBufferPointers:: ; entries correspond to arguments for text_buffer (TX_STRINGBUFFER) dw wStringBuffer3 ; 0 dw wStringBuffer4 ; 1 diff --git a/data/tilesets.asm b/data/tilesets.asm index 82052f1e8..b652a01ad 100644 --- a/data/tilesets.asm +++ b/data/tilesets.asm @@ -10,7 +10,7 @@ ENDM ; - The *PalMap are defined in gfx/tileset_palette_maps.asm ; - The *Anim are defined in engine/tileset_anims.asm -Tilesets:: ; 4d596 +Tilesets:: ; entries correspond to TILESET_* constants tileset Tileset0 tileset TilesetJohto @@ -49,4 +49,3 @@ Tilesets:: ; 4d596 tileset TilesetKabutoWordRoom tileset TilesetOmanyteWordRoom tileset TilesetAerodactylWordRoom -; 4d7c1 diff --git a/data/trainers/attributes.asm b/data/trainers/attributes.asm index b64e2b3b4..364f62492 100644 --- a/data/trainers/attributes.asm +++ b/data/trainers/attributes.asm @@ -1,4 +1,4 @@ -TrainerClassAttributes: ; 3959c +TrainerClassAttributes: ; entries correspond to trainer classes (see constants/trainer_constants.asm) ; Falkner @@ -403,4 +403,3 @@ TrainerClassAttributes: ; 3959c dw AI_BASIC | AI_SETUP | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS | AI_RISKY dw CONTEXT_USE | SWITCH_SOMETIMES -; 39771 diff --git a/data/trainers/class_names.asm b/data/trainers/class_names.asm index 48d81f910..66c953492 100644 --- a/data/trainers/class_names.asm +++ b/data/trainers/class_names.asm @@ -1,4 +1,4 @@ -TrainerClassNames:: ; 2c1ef +TrainerClassNames:: ; entries correspond to trainer classes (see constants/trainer_constants.asm) db "LEADER@" db "LEADER@" diff --git a/data/trainers/dvs.asm b/data/trainers/dvs.asm index 20188096c..5ed883681 100644 --- a/data/trainers/dvs.asm +++ b/data/trainers/dvs.asm @@ -1,4 +1,4 @@ -TrainerClassDVs: ; 270d6 +TrainerClassDVs: ; entries correspond to trainer classes (see constants/trainer_constants.asm) ; atk,def,spd,spc dn 9, 10, 7, 7 ; FALKNER @@ -68,4 +68,3 @@ TrainerClassDVs: ; 270d6 dn 9, 8, 8, 8 ; OFFICER dn 7, 14, 10, 8 ; GRUNTF dn 9, 8, 8, 8 ; MYSTICALMAN -; 2715c diff --git a/data/trainers/gendered_trainers.asm b/data/trainers/gendered_trainers.asm index 90df4c5f8..c3ff6ffd4 100644 --- a/data/trainers/gendered_trainers.asm +++ b/data/trainers/gendered_trainers.asm @@ -1,6 +1,6 @@ ; Used by GetMobileOTTrainerClass -MaleTrainers: ; 4e95d +MaleTrainers: db BURGLAR db YOUNGSTER db SCHOOLBOY @@ -28,7 +28,7 @@ MaleTrainers: ; 4e95d db SCIENTIST .End -FemaleTrainers: ; 4e976 +FemaleTrainers: db MEDIUM db LASS db BEAUTY diff --git a/data/trainers/genders.asm b/data/trainers/genders.asm index e9e78f4bf..1bfc925d2 100644 --- a/data/trainers/genders.asm +++ b/data/trainers/genders.asm @@ -1,6 +1,6 @@ ; Used by BattleTowerText -BTTrainerClassGenders: ; 11f2f0 +BTTrainerClassGenders: ; entries correspond to trainer classes db MALE ; FALKNER db FEMALE ; WHITNEY @@ -68,4 +68,3 @@ BTTrainerClassGenders: ; 11f2f0 db MALE ; BLUE db MALE ; OFFICER db FEMALE ; GRUNTF -; 11f332 diff --git a/data/trainers/palettes.asm b/data/trainers/palettes.asm index c502846c4..130c867bc 100644 --- a/data/trainers/palettes.asm +++ b/data/trainers/palettes.asm @@ -1,4 +1,4 @@ -TrainerPalettes: ; b0ce +TrainerPalettes: ; entries correspond to trainer classes PlayerPalette: ; Chris uses the same colors as Cal @@ -71,4 +71,3 @@ INCLUDE "gfx/trainers/blue.pal" INCLUDE "gfx/trainers/officer.pal" INCLUDE "gfx/trainers/grunt_f.pal" INCLUDE "gfx/trainers/mysticalman.pal" -; b1de diff --git a/data/types/names.asm b/data/types/names.asm index ca810aea3..2fe9e959c 100644 --- a/data/types/names.asm +++ b/data/types/names.asm @@ -1,4 +1,4 @@ -TypeNames: ; 5097b +TypeNames: ; entries correspond to types (see constants/type_constants.asm) dw Normal dw Fighting @@ -49,4 +49,3 @@ Steel: db "STEEL@" Dragon: db "DRAGON@" Dark: db "DARK@" -; 50a28 diff --git a/data/types/search_strings.asm b/data/types/search_strings.asm index 7e6eb71c2..d03d2786b 100644 --- a/data/types/search_strings.asm +++ b/data/types/search_strings.asm @@ -1,4 +1,4 @@ -PokedexTypeSearchStrings: ; 40fe4 +PokedexTypeSearchStrings: ; entries correspond with PokedexTypeSearchConversionTable (see data/types/search_types.asm) db " ---- @" db " NORMAL @" @@ -18,4 +18,3 @@ PokedexTypeSearchStrings: ; 40fe4 db " DRAGON @" db " DARK @" db " STEEL @" -; 41086 diff --git a/data/types/search_types.asm b/data/types/search_types.asm index 2c5dbd4f4..a87ec0993 100644 --- a/data/types/search_types.asm +++ b/data/types/search_types.asm @@ -1,4 +1,4 @@ -PokedexTypeSearchConversionTable: ; 410f6 +PokedexTypeSearchConversionTable: ; entries correspond with PokedexTypeSearchStrings (see data/types/search_strings.asm) db NORMAL db FIRE @@ -17,4 +17,3 @@ PokedexTypeSearchConversionTable: ; 410f6 db DRAGON db DARK db STEEL -; 41107 diff --git a/data/types/type_boost_items.asm b/data/types/type_boost_items.asm index 3b7231a59..5b965c4fb 100644 --- a/data/types/type_boost_items.asm +++ b/data/types/type_boost_items.asm @@ -1,4 +1,4 @@ -TypeBoostItems: ; 35703 +TypeBoostItems: db HELD_NORMAL_BOOST, NORMAL ; PINK_BOW/POLKADOT_BOW db HELD_FIGHTING_BOOST, FIGHTING ; BLACKBELT db HELD_FLYING_BOOST, FLYING ; SHARP_BEAK @@ -17,4 +17,3 @@ TypeBoostItems: ; 35703 db HELD_DARK_BOOST, DARK ; BLACKGLASSES db HELD_STEEL_BOOST, STEEL ; METAL_COAT db -1 -; 35726 diff --git a/data/types/type_matchups.asm b/data/types/type_matchups.asm index 3cd0f609b..04bfc3cd1 100644 --- a/data/types/type_matchups.asm +++ b/data/types/type_matchups.asm @@ -1,4 +1,4 @@ -TypeMatchups: ; 34bb1 +TypeMatchups: ; attacker, defender, *= db NORMAL, ROCK, NOT_VERY_EFFECTIVE db NORMAL, STEEL, NOT_VERY_EFFECTIVE @@ -116,4 +116,3 @@ TypeMatchups: ; 34bb1 db FIGHTING, GHOST, NO_EFFECT db -1 ; end -; 34cfd diff --git a/data/wild/bug_contest_mons.asm b/data/wild/bug_contest_mons.asm index c3cdeaa8a..797127038 100644 --- a/data/wild/bug_contest_mons.asm +++ b/data/wild/bug_contest_mons.asm @@ -1,4 +1,4 @@ -ContestMons: ; 97d87 +ContestMons: ; %, species, min, max db 20, CATERPIE, 7, 18 db 20, WEEDLE, 7, 18 @@ -11,4 +11,3 @@ ContestMons: ; 97d87 db 5, SCYTHER, 13, 14 db 5, PINSIR, 13, 14 db -1, VENOMOTH, 30, 40 -; 97db3 diff --git a/data/wild/fish.asm b/data/wild/fish.asm index ee8299ccb..919a75c15 100644 --- a/data/wild/fish.asm +++ b/data/wild/fish.asm @@ -5,7 +5,7 @@ fishgroup: MACRO dbwww \1, \2, \3, \4 ENDM -FishGroups: ; 92488 +FishGroups: ; entries correspond to FISHGROUP_* constants fishgroup 50 percent + 1, .Shore_Old, .Shore_Good, .Shore_Super fishgroup 50 percent + 1, .Ocean_Old, .Ocean_Good, .Ocean_Super @@ -21,192 +21,191 @@ FishGroups: ; 92488 fishgroup 50 percent + 1, .Remoraid_Old, .Remoraid_Good, .Remoraid_Super fishgroup 50 percent + 1, .Qwilfish_NoSwarm_Old, .Qwilfish_NoSwarm_Good, .Qwilfish_NoSwarm_Super -.Shore_Old: ; 924e3 +.Shore_Old: db 70 percent + 1, MAGIKARP, 10 db 85 percent + 1, MAGIKARP, 10 db 100 percent, KRABBY, 10 -.Shore_Good: ; 924ec +.Shore_Good: db 35 percent, MAGIKARP, 20 db 70 percent, KRABBY, 20 db 90 percent + 1, KRABBY, 20 db 100 percent, time_group 0 -.Shore_Super: ; 924f8 +.Shore_Super: db 40 percent, KRABBY, 40 db 70 percent, time_group 1 db 90 percent + 1, KRABBY, 40 db 100 percent, KINGLER, 40 -.Ocean_Old: ; 92504 +.Ocean_Old: db 70 percent + 1, MAGIKARP, 10 db 85 percent + 1, MAGIKARP, 10 db 100 percent, TENTACOOL, 10 -.Ocean_Good: ; 9250d +.Ocean_Good: db 35 percent, MAGIKARP, 20 db 70 percent, TENTACOOL, 20 db 90 percent + 1, CHINCHOU, 20 db 100 percent, time_group 2 -.Ocean_Super: ; 92519 +.Ocean_Super: db 40 percent, CHINCHOU, 40 db 70 percent, time_group 3 db 90 percent + 1, TENTACRUEL, 40 db 100 percent, LANTURN, 40 -.Lake_Old: ; 92525 +.Lake_Old: db 70 percent + 1, MAGIKARP, 10 db 85 percent + 1, MAGIKARP, 10 db 100 percent, GOLDEEN, 10 -.Lake_Good: ; 9252e +.Lake_Good: db 35 percent, MAGIKARP, 20 db 70 percent, GOLDEEN, 20 db 90 percent + 1, GOLDEEN, 20 db 100 percent, time_group 4 -.Lake_Super: ; 9253a +.Lake_Super: db 40 percent, GOLDEEN, 40 db 70 percent, time_group 5 db 90 percent + 1, MAGIKARP, 40 db 100 percent, SEAKING, 40 -.Pond_Old: ; 92546 +.Pond_Old: db 70 percent + 1, MAGIKARP, 10 db 85 percent + 1, MAGIKARP, 10 db 100 percent, POLIWAG, 10 -.Pond_Good: ; 9254f +.Pond_Good: db 35 percent, MAGIKARP, 20 db 70 percent, POLIWAG, 20 db 90 percent + 1, POLIWAG, 20 db 100 percent, time_group 6 -.Pond_Super: ; 9255b +.Pond_Super: db 40 percent, POLIWAG, 40 db 70 percent, time_group 7 db 90 percent + 1, MAGIKARP, 40 db 100 percent, POLIWAG, 40 -.Dratini_Old: ; 92567 +.Dratini_Old: db 70 percent + 1, MAGIKARP, 10 db 85 percent + 1, MAGIKARP, 10 db 100 percent, MAGIKARP, 10 -.Dratini_Good: ; 92570 +.Dratini_Good: db 35 percent, MAGIKARP, 20 db 70 percent, MAGIKARP, 20 db 90 percent + 1, MAGIKARP, 20 db 100 percent, time_group 8 -.Dratini_Super: ; 9257c +.Dratini_Super: db 40 percent, MAGIKARP, 40 db 70 percent, time_group 9 db 90 percent + 1, MAGIKARP, 40 db 100 percent, DRAGONAIR, 40 -.Qwilfish_Swarm_Old: ; 92588 +.Qwilfish_Swarm_Old: db 70 percent + 1, MAGIKARP, 5 db 85 percent + 1, MAGIKARP, 5 db 100 percent, QWILFISH, 5 -.Qwilfish_Swarm_Good: ; 92591 +.Qwilfish_Swarm_Good: db 35 percent, MAGIKARP, 20 db 70 percent, QWILFISH, 20 db 90 percent + 1, QWILFISH, 20 db 100 percent, time_group 10 -.Qwilfish_Swarm_Super: ; 9259d +.Qwilfish_Swarm_Super: db 40 percent, QWILFISH, 40 db 70 percent, time_group 11 db 90 percent + 1, QWILFISH, 40 db 100 percent, QWILFISH, 40 -.Remoraid_Swarm_Old: ; 925a9 +.Remoraid_Swarm_Old: db 70 percent + 1, MAGIKARP, 10 db 85 percent + 1, MAGIKARP, 10 db 100 percent, REMORAID, 10 -.Remoraid_Swarm_Good: ; 925b2 +.Remoraid_Swarm_Good: db 35 percent, MAGIKARP, 20 db 70 percent, REMORAID, 20 db 90 percent + 1, REMORAID, 20 db 100 percent, time_group 12 -.Remoraid_Swarm_Super: ; 925be +.Remoraid_Swarm_Super: db 40 percent, REMORAID, 40 db 70 percent, time_group 13 db 90 percent + 1, REMORAID, 40 db 100 percent, REMORAID, 40 -.Gyarados_Old: ; 925ca +.Gyarados_Old: db 70 percent + 1, MAGIKARP, 10 db 85 percent + 1, MAGIKARP, 10 db 100 percent, MAGIKARP, 10 -.Gyarados_Good: ; 925d3 +.Gyarados_Good: db 35 percent, MAGIKARP, 20 db 70 percent, MAGIKARP, 20 db 90 percent + 1, MAGIKARP, 20 db 100 percent, time_group 14 -.Gyarados_Super: ; 925df +.Gyarados_Super: db 40 percent, MAGIKARP, 40 db 70 percent, time_group 15 db 90 percent + 1, MAGIKARP, 40 db 100 percent, MAGIKARP, 40 -.Dratini_2_Old: ; 925eb +.Dratini_2_Old: db 70 percent + 1, MAGIKARP, 10 db 85 percent + 1, MAGIKARP, 10 db 100 percent, MAGIKARP, 10 -.Dratini_2_Good: ; 925f4 +.Dratini_2_Good: db 35 percent, MAGIKARP, 10 db 70 percent, MAGIKARP, 10 db 90 percent + 1, MAGIKARP, 10 db 100 percent, time_group 16 -.Dratini_2_Super: ; 92600 +.Dratini_2_Super: db 40 percent, MAGIKARP, 10 db 70 percent, time_group 17 db 90 percent + 1, MAGIKARP, 10 db 100 percent, DRAGONAIR, 10 -.WhirlIslands_Old: ; 9260c +.WhirlIslands_Old: db 70 percent + 1, MAGIKARP, 10 db 85 percent + 1, MAGIKARP, 10 db 100 percent, KRABBY, 10 -.WhirlIslands_Good: ; 92615 +.WhirlIslands_Good: db 35 percent, MAGIKARP, 20 db 70 percent, KRABBY, 20 db 90 percent + 1, KRABBY, 20 db 100 percent, time_group 18 -.WhirlIslands_Super: ; 92621 +.WhirlIslands_Super: db 40 percent, KRABBY, 40 db 70 percent, time_group 19 db 90 percent + 1, KINGLER, 40 db 100 percent, SEADRA, 40 .Qwilfish_NoSwarm_Old: -.Qwilfish_Old: ; 9262d +.Qwilfish_Old: db 70 percent + 1, MAGIKARP, 10 db 85 percent + 1, MAGIKARP, 10 db 100 percent, TENTACOOL, 10 .Qwilfish_NoSwarm_Good: -.Qwilfish_Good: ; 92636 +.Qwilfish_Good: db 35 percent, MAGIKARP, 20 db 70 percent, TENTACOOL, 20 db 90 percent + 1, TENTACOOL, 20 db 100 percent, time_group 20 .Qwilfish_NoSwarm_Super: -.Qwilfish_Super: ; 92642 +.Qwilfish_Super: db 40 percent, TENTACOOL, 40 db 70 percent, time_group 21 db 90 percent + 1, MAGIKARP, 40 db 100 percent, QWILFISH, 40 -.Remoraid_Old: ; 9264e +.Remoraid_Old: db 70 percent + 1, MAGIKARP, 10 db 85 percent + 1, MAGIKARP, 10 db 100 percent, POLIWAG, 10 -.Remoraid_Good: ; 92657 +.Remoraid_Good: db 35 percent, MAGIKARP, 20 db 70 percent, POLIWAG, 20 db 90 percent + 1, POLIWAG, 20 db 100 percent, time_group 6 -.Remoraid_Super: ; 92663 +.Remoraid_Super: db 40 percent, POLIWAG, 40 db 70 percent, time_group 7 db 90 percent + 1, MAGIKARP, 40 db 100 percent, REMORAID, 40 -; 9266f -TimeFishGroups: ; 9266f +TimeFishGroups: ; day nite db CORSOLA, 20, STARYU, 20 ; 0 db CORSOLA, 40, STARYU, 40 ; 1 @@ -230,4 +229,3 @@ TimeFishGroups: ; 9266f db HORSEA, 40, HORSEA, 40 ; 19 db TENTACOOL, 20, TENTACOOL, 20 ; 20 db TENTACOOL, 40, TENTACOOL, 40 ; 21 -; 926c7 diff --git a/data/wild/flee_mons.asm b/data/wild/flee_mons.asm index 2c235d2e6..ae2a3a569 100644 --- a/data/wild/flee_mons.asm +++ b/data/wild/flee_mons.asm @@ -1,7 +1,7 @@ FleeMons: ; referenced by TryEnemyFlee and FastBallMultiplier -SometimesFleeMons: ; 3c59a +SometimesFleeMons: db MAGNEMITE db GRIMER db TANGELA @@ -17,7 +17,7 @@ SometimesFleeMons: ; 3c59a db HERACROSS db -1 -OftenFleeMons: ; 3c5a8 +OftenFleeMons: db CUBONE db ARTICUNO db ZAPDOS @@ -28,8 +28,7 @@ OftenFleeMons: ; 3c5a8 db TEDDIURSA db -1 -AlwaysFleeMons: ; 3c5b1 +AlwaysFleeMons: db RAIKOU db ENTEI db -1 -; 3c5b4 diff --git a/data/wild/probabilities.asm b/data/wild/probabilities.asm index 1813603c2..bf3144bbe 100644 --- a/data/wild/probabilities.asm +++ b/data/wild/probabilities.asm @@ -3,7 +3,7 @@ mon_prob: MACRO db \1, \2 * 2 ENDM -GrassMonProbTable: ; 2a1cb +GrassMonProbTable: mon_prob 30, 0 ; 30% chance mon_prob 60, 1 ; 30% chance mon_prob 80, 2 ; 20% chance @@ -11,10 +11,8 @@ GrassMonProbTable: ; 2a1cb mon_prob 95, 4 ; 5% chance mon_prob 99, 5 ; 4% chance mon_prob 100, 6 ; 1% chance -; 2a1d9 -WaterMonProbTable: ; 2a1d9 +WaterMonProbTable: mon_prob 60, 0 ; 60% chance mon_prob 90, 1 ; 30% chance mon_prob 100, 2 ; 10% chance -; 2a1df diff --git a/data/wild/roammon_maps.asm b/data/wild/roammon_maps.asm index a57f561b2..747dffae1 100644 --- a/data/wild/roammon_maps.asm +++ b/data/wild/roammon_maps.asm @@ -11,7 +11,7 @@ endr db 0 ENDM -RoamMaps: ; 2a40f +RoamMaps: ; there are NUM_ROAMMON_MAPS entries ; start map, ...other maps roam_map ROUTE_29, ROUTE_30, ROUTE_46 @@ -31,4 +31,3 @@ RoamMaps: ; 2a40f roam_map ROUTE_45, ROUTE_44, ROUTE_46 roam_map ROUTE_46, ROUTE_45, ROUTE_29 db -1 ; end -; 2a4a0 diff --git a/data/wild/treemon_maps.asm b/data/wild/treemon_maps.asm index 8bc742a3e..b85962399 100644 --- a/data/wild/treemon_maps.asm +++ b/data/wild/treemon_maps.asm @@ -3,7 +3,7 @@ treemon_map: MACRO db \2 ; treemon set ENDM -TreeMonMaps: ; b825e +TreeMonMaps: treemon_map ROUTE_26, TREEMON_SET_KANTO treemon_map ROUTE_27, TREEMON_SET_KANTO treemon_map ROUTE_28, TREEMON_SET_CITY @@ -39,12 +39,10 @@ TreeMonMaps: ; b825e treemon_map SILVER_CAVE_OUTSIDE, TREEMON_SET_CITY treemon_map ILEX_FOREST, TREEMON_SET_FOREST db -1 -; b82c5 -RockMonMaps: ; b82c5 +RockMonMaps: treemon_map CIANWOOD_CITY, TREEMON_SET_ROCK treemon_map ROUTE_40, TREEMON_SET_ROCK treemon_map DARK_CAVE_VIOLET_ENTRANCE, TREEMON_SET_ROCK treemon_map SLOWPOKE_WELL_B1F, TREEMON_SET_ROCK db -1 -; b82d2 diff --git a/data/wild/treemons.asm b/data/wild/treemons.asm index 5a29d675c..a6b1922f3 100644 --- a/data/wild/treemons.asm +++ b/data/wild/treemons.asm @@ -1,4 +1,4 @@ -TreeMons: ; b82e8 +TreeMons: ; entries correspond to TREEMON_SET_* constants dw TreeMonSet_City dw TreeMonSet_Canyon @@ -15,7 +15,7 @@ TreeMons: ; b82e8 ; db %, species, level TreeMonSet_City: -TreeMonSet_Canyon: ; b82fa +TreeMonSet_Canyon: ; common db 50, SPEAROW, 10 db 15, SPEAROW, 10 @@ -33,7 +33,7 @@ TreeMonSet_Canyon: ; b82fa db 5, AIPOM, 10 db -1 -TreeMonSet_Town: ; b8320 +TreeMonSet_Town: ; common db 50, SPEAROW, 10 db 15, EKANS, 10 @@ -51,7 +51,7 @@ TreeMonSet_Town: ; b8320 db 5, AIPOM, 10 db -1 -TreeMonSet_Route: ; b8346 +TreeMonSet_Route: ; common db 50, HOOTHOOT, 10 db 15, SPINARAK, 10 @@ -69,7 +69,7 @@ TreeMonSet_Route: ; b8346 db 5, EXEGGCUTE, 10 db -1 -TreeMonSet_Kanto: ; b836c +TreeMonSet_Kanto: ; common db 50, HOOTHOOT, 10 db 15, EKANS, 10 @@ -87,7 +87,7 @@ TreeMonSet_Kanto: ; b836c db 5, EXEGGCUTE, 10 db -1 -TreeMonSet_Lake: ; b8392 +TreeMonSet_Lake: ; common db 50, HOOTHOOT, 10 db 15, VENONAT, 10 @@ -105,7 +105,7 @@ TreeMonSet_Lake: ; b8392 db 5, EXEGGCUTE, 10 db -1 -TreeMonSet_Forest: ; b83b8 +TreeMonSet_Forest: ; common db 50, HOOTHOOT, 10 db 15, PINECO, 10 @@ -123,8 +123,7 @@ TreeMonSet_Forest: ; b83b8 db 5, KAKUNA, 10 db -1 -TreeMonSet_Rock: ; b83de +TreeMonSet_Rock: db 90, KRABBY, 15 db 10, SHUCKLE, 15 db -1 -; b83e5 |