diff options
Diffstat (limited to 'data')
153 files changed, 2256 insertions, 3696 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/critical_hits.asm b/data/battle/critical_hit_chances.asm index 5800d57f4..0128f1a1e 100644 --- a/data/battle/critical_hits.asm +++ b/data/battle/critical_hit_chances.asm @@ -1,13 +1,3 @@ -CriticalHitMoves: - db KARATE_CHOP - db RAZOR_WIND - db RAZOR_LEAF - db CRABHAMMER - db SLASH - db AEROBLAST - db CROSS_CHOP - db -1 - CriticalHitChances: db 7 percent ; 0 db 12 percent + 2 ; +1 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_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..e0fe57007 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 @@ -1266,5 +1266,3 @@ BattleAnimFrameData: ; ce85e .Frameset_b8: 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 133298d13..432e513dd 100644 --- a/data/battle_anims/object_gfx.asm +++ b/data/battle_anims/object_gfx.asm @@ -1,10 +1,10 @@ anim_obj_gfx: MACRO ; # tiles, label - db \1 + db \1 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..e0d2b4dec 100644 --- a/data/battle_tower/parties.asm +++ b/data/battle_tower/parties.asm @@ -1,7 +1,6 @@ -BattleTowerMons: ; 1f8450 +BattleTowerMons: ; 10 groups of 21 mons. - BattleTowerMons1: db JOLTEON @@ -15,7 +14,7 @@ BattleTowerMons1: bigdw 40000 bigdw 35000 bigdw 40000 - db $dd, $bd ; DVs + dn 13, 13, 11, 13 ; DVs db 15, 5, 15, 20 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -30,7 +29,6 @@ BattleTowerMons1: bigdw 31 ; SDef db "SANDA-SU@@@" - db ESPEON db LEFTOVERS db MUD_SLAP, PSYCHIC_M, PSYCH_UP, TOXIC @@ -42,7 +40,7 @@ BattleTowerMons1: bigdw 35000 bigdw 40000 bigdw 40000 - db $ed, $fb ; DVs + dn 14, 13, 15, 11 ; DVs db 10, 10, 10, 10 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -57,7 +55,6 @@ BattleTowerMons1: bigdw 31 ; SDef db "E-HUi@@@@@@" - db UMBREON db GOLD_BERRY db SHADOW_BALL, IRON_TAIL, PSYCH_UP, TOXIC @@ -69,7 +66,7 @@ BattleTowerMons1: bigdw 45000 bigdw 50000 bigdw 40000 - db $db, $ef ; DVs + dn 13, 11, 14, 15 ; DVs db 15, 15, 10, 10 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -84,7 +81,6 @@ BattleTowerMons1: bigdw 39 ; SDef db "BURAtuKI-@@" - db WOBBUFFET db FOCUS_BAND db COUNTER, MIRROR_COAT, SAFEGUARD, DESTINY_BOND @@ -96,7 +92,7 @@ BattleTowerMons1: bigdw 50000 bigdw 50000 bigdw 50000 - db $7f, $d7 ; DVs + dn 7, 15, 13, 7 ; DVs db 20, 20, 25, 5 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -111,7 +107,6 @@ BattleTowerMons1: bigdw 23 ; SDef db "SO-NANSU@@@" - db KANGASKHAN db MIRACLEBERRY db REVERSAL, HYPER_BEAM, EARTHQUAKE, ATTRACT @@ -123,7 +118,7 @@ BattleTowerMons1: bigdw 40000 bigdw 30000 bigdw 30000 - db $ef, $cf ; DVs + dn 14, 15, 12, 15 ; DVs db 15, 5, 10, 15 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -138,7 +133,6 @@ BattleTowerMons1: bigdw 28 ; SDef db "GARU-RA@@@@" - db CORSOLA db SCOPE_LENS db SURF, PSYCHIC_M, RECOVER, ANCIENTPOWER @@ -150,7 +144,7 @@ BattleTowerMons1: bigdw 33300 bigdw 30000 bigdw 30000 - db $fe, $fd ; DVs + dn 15, 14, 15, 13 ; DVs db 15, 10, 20, 5 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -165,7 +159,6 @@ BattleTowerMons1: bigdw 28 ; SDef db "SANI-GO@@@@" - db MILTANK db GOLD_BERRY db BLIZZARD, EARTHQUAKE, HYPER_BEAM, TOXIC @@ -177,7 +170,7 @@ BattleTowerMons1: bigdw 30000 bigdw 30000 bigdw 35000 - db $bb, $df ; DVs + dn 11, 11, 13, 15 ; DVs db 5, 10, 5, 10 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -192,7 +185,6 @@ BattleTowerMons1: bigdw 26 ; SDef db "MIRUTANKU@@" - db AERODACTYL db LEFTOVERS db HYPER_BEAM, SUPERSONIC, EARTHQUAKE, BITE @@ -204,7 +196,7 @@ BattleTowerMons1: bigdw 30000 bigdw 30000 bigdw 30000 - db $db, $fb ; DVs + dn 13, 11, 15, 11 ; DVs db 5, 20, 10, 25 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -219,7 +211,6 @@ BattleTowerMons1: bigdw 26 ; SDef db "PUTERA@@@@@" - db LAPRAS db MIRACLEBERRY db BLIZZARD, SURF, THUNDERBOLT, PSYCHIC_M @@ -231,7 +222,7 @@ BattleTowerMons1: bigdw 30000 bigdw 30000 bigdw 30000 - db $fd, $eb ; DVs + dn 15, 13, 14, 11 ; DVs db 5, 15, 15, 10 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -246,7 +237,6 @@ BattleTowerMons1: bigdw 30 ; SDef db "RAPURASU@@@" - db SNEASEL db GOLD_BERRY db SLASH, FAINT_ATTACK, SURF, BLIZZARD @@ -258,7 +248,7 @@ BattleTowerMons1: bigdw 30000 bigdw 30000 bigdw 30000 - db $fb, $bf ; DVs + dn 15, 11, 11, 15 ; DVs db 20, 20, 15, 5 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -273,7 +263,6 @@ BattleTowerMons1: bigdw 27 ; SDef db "NIyu-RA@@@@" - db PORYGON2 db BRIGHTPOWDER db PSYCHIC_M, BLIZZARD, HYPER_BEAM, TRI_ATTACK @@ -285,7 +274,7 @@ BattleTowerMons1: bigdw 40000 bigdw 30000 bigdw 30000 - db $fb, $de ; DVs + dn 15, 11, 13, 14 ; DVs db 10, 5, 5, 10 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -300,7 +289,6 @@ BattleTowerMons1: bigdw 31 ; SDef db "PORIGON2@@@" - db MISDREAVUS db FOCUS_BAND db PERISH_SONG, MEAN_LOOK, PAIN_SPLIT, SHADOW_BALL @@ -312,7 +300,7 @@ BattleTowerMons1: bigdw 30000 bigdw 30000 bigdw 30000 - db $ef, $df ; DVs + dn 14, 15, 13, 15 ; DVs db 5, 5, 20, 15 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -327,7 +315,6 @@ BattleTowerMons1: bigdw 29 ; SDef db "MUUMA@@@@@@" - db HOUNDOUR db GOLD_BERRY db FAINT_ATTACK, SOLARBEAM, ROAR, SUNNY_DAY @@ -339,7 +326,7 @@ BattleTowerMons1: bigdw 30000 bigdw 33000 bigdw 30000 - db $fd, $fe ; DVs + dn 15, 13, 15, 14 ; DVs db 20, 10, 20, 5 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -354,7 +341,6 @@ BattleTowerMons1: bigdw 22 ; SDef db "DERUBIRU@@@" - db GIRAFARIG db KINGS_ROCK db PSYBEAM, MUD_SLAP, SHADOW_BALL, AGILITY @@ -366,7 +352,7 @@ BattleTowerMons1: bigdw 30000 bigdw 30000 bigdw 30000 - db $ed, $fd ; DVs + dn 14, 13, 15, 13 ; DVs db 20, 10, 15, 30 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -381,7 +367,6 @@ BattleTowerMons1: bigdw 24 ; SDef db "KIRINRIKI@@" - db BLISSEY db QUICK_CLAW db HEADBUTT, SOLARBEAM, ROLLOUT, STRENGTH @@ -393,7 +378,7 @@ BattleTowerMons1: bigdw 30000 bigdw 30000 bigdw 30000 - db $df, $ce ; DVs + dn 13, 15, 12, 14 ; DVs db 15, 10, 20, 15 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -408,7 +393,6 @@ BattleTowerMons1: bigdw 39 ; SDef db "HAPINASU@@@" - db SNORLAX db MIRACLEBERRY db HEADBUTT, PROTECT, SNORE, SURF @@ -420,7 +404,7 @@ BattleTowerMons1: bigdw 30000 bigdw 30000 bigdw 30000 - db $ef, $f7 ; DVs + dn 14, 15, 15, 7 ; DVs db 15, 10, 15, 15 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -435,7 +419,6 @@ BattleTowerMons1: bigdw 32 ; SDef db "KABIGON@@@@" - db EXEGGUTOR db KINGS_ROCK db TOXIC, GIGA_DRAIN, THIEF, CONFUSION @@ -447,7 +430,7 @@ BattleTowerMons1: bigdw 30000 bigdw 30000 bigdw 30000 - db $fe, $fe ; DVs + dn 15, 14, 15, 14 ; DVs db 10, 5, 10, 25 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -462,7 +445,6 @@ BattleTowerMons1: bigdw 25 ; SDef db "NAtuSI-@@@@" - db HERACROSS db GOLD_BERRY db REVERSAL, ENDURE, COUNTER, ROCK_SMASH @@ -474,7 +456,7 @@ BattleTowerMons1: bigdw 30000 bigdw 30000 bigdw 30000 - db $f7, $f7 ; DVs + dn 15, 7, 15, 7 ; DVs db 15, 10, 20, 15 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -489,7 +471,6 @@ BattleTowerMons1: bigdw 29 ; SDef db "HERAKUROSU@" - db UNOWN db BERRY db HIDDEN_POWER, 0, 0, 0 @@ -501,7 +482,7 @@ BattleTowerMons1: bigdw 30000 bigdw 30000 bigdw 30000 - db $ff, $ff ; DVs + dn 15, 15, 15, 15 ; DVs db 15, 0, 0, 0 ; PP db 0 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -516,7 +497,6 @@ BattleTowerMons1: bigdw 21 ; SDef db "ANNO-N@@@@@" - db TAUROS db KINGS_ROCK db HEADBUTT, SWAGGER, TAIL_WHIP, ICY_WIND @@ -528,7 +508,7 @@ BattleTowerMons1: bigdw 30000 bigdw 30000 bigdw 30000 - db $65, $57 ; DVs + dn 6, 5, 5, 7 ; DVs db 15, 15, 30, 15 ; PP db 0 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -543,7 +523,6 @@ BattleTowerMons1: bigdw 24 ; SDef db "KENTAROSU@@" - db MR__MIME db QUICK_CLAW db TOXIC, PSYCH_UP, FIRE_PUNCH, HEADBUTT @@ -555,7 +534,7 @@ BattleTowerMons1: bigdw 30000 bigdw 30000 bigdw 30000 - db $73, $67 ; DVs + dn 7, 3, 6, 7 ; DVs db 10, 10, 15, 15 ; PP db 0 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -571,8 +550,6 @@ BattleTowerMons1: db "BARIYA-DO@@" - - BattleTowerMons2: db UMBREON @@ -586,7 +563,7 @@ BattleTowerMons2: bigdw 50000 bigdw 50000 bigdw 50000 - db $cf, $bc ; DVs + dn 12, 15, 11, 12 ; DVs db 10, 10, 10, 15 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -601,7 +578,6 @@ BattleTowerMons2: bigdw 72 ; SDef db "BURAtuKI-@@" - db STARMIE db GOLD_BERRY db RECOVER, PSYCHIC_M, SURF, PSYCH_UP @@ -613,7 +589,7 @@ BattleTowerMons2: bigdw 50000 bigdw 50000 bigdw 50000 - db $db, $db ; DVs + dn 13, 11, 13, 11 ; DVs db 20, 10, 15, 10 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -628,7 +604,6 @@ BattleTowerMons2: bigdw 54 ; SDef db "SUTA-MI-@@@" - db GYARADOS db MIRACLEBERRY db HYPER_BEAM, DRAGON_RAGE, THUNDERBOLT, FIRE_BLAST @@ -640,7 +615,7 @@ BattleTowerMons2: bigdw 50000 bigdw 50000 bigdw 50000 - db $fa, $fd ; DVs + dn 15, 10, 15, 13 ; DVs db 5, 10, 15, 5 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -655,7 +630,6 @@ BattleTowerMons2: bigdw 61 ; SDef db "GIyaRADOSU@" - db STEELIX db GOLD_BERRY db ROAR, IRON_TAIL, SWAGGER, EARTHQUAKE @@ -667,7 +641,7 @@ BattleTowerMons2: bigdw 50000 bigdw 30000 bigdw 50000 - db $ff, $ff ; DVs + dn 15, 15, 15, 15 ; DVs db 20, 15, 15, 10 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -682,7 +656,6 @@ BattleTowerMons2: bigdw 48 ; SDef db "HAGANE-RU@@" - db ALAKAZAM db BERRY_JUICE db PSYCHIC_M, PSYCH_UP, TOXIC, THUNDERPUNCH @@ -694,7 +667,7 @@ BattleTowerMons2: bigdw 30000 bigdw 50000 bigdw 40000 - db $fd, $ef ; DVs + dn 15, 13, 14, 15 ; DVs db 10, 10, 10, 15 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -709,7 +682,6 @@ BattleTowerMons2: bigdw 55 ; SDef db "HU-DEiN@@@@" - db ARCANINE db BRIGHTPOWDER db FLAMETHROWER, ROAR, HYPER_BEAM, IRON_TAIL @@ -721,7 +693,7 @@ BattleTowerMons2: bigdw 50000 bigdw 55000 bigdw 50000 - db $db, $fb ; DVs + dn 13, 11, 15, 11 ; DVs db 15, 20, 5, 15 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -736,7 +708,6 @@ BattleTowerMons2: bigdw 52 ; SDef db "UINDEi@@@@@" - db HERACROSS db FOCUS_BAND db ENDURE, REVERSAL, MEGAHORN, EARTHQUAKE @@ -748,7 +719,7 @@ BattleTowerMons2: bigdw 45000 bigdw 30000 bigdw 45000 - db $df, $de ; DVs + dn 13, 15, 13, 14 ; DVs db 10, 15, 10, 10 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -763,7 +734,6 @@ BattleTowerMons2: bigdw 59 ; SDef db "HERAKUROSU@" - db EXEGGUTOR db LEFTOVERS db HYPER_BEAM, PSYCHIC_M, TOXIC, DREAM_EATER @@ -775,7 +745,7 @@ BattleTowerMons2: bigdw 50000 bigdw 45000 bigdw 45000 - db $fd, $eb ; DVs + dn 15, 13, 14, 11 ; DVs db 5, 10, 10, 15 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -790,7 +760,6 @@ BattleTowerMons2: bigdw 46 ; SDef db "NAtuSI-@@@@" - db AERODACTYL db GOLD_BERRY db REST, HYPER_BEAM, EARTHQUAKE, DRAGON_RAGE @@ -802,7 +771,7 @@ BattleTowerMons2: bigdw 40000 bigdw 50000 bigdw 45000 - db $fb, $bb ; DVs + dn 15, 11, 11, 11 ; DVs db 10, 5, 10, 10 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -817,7 +786,6 @@ BattleTowerMons2: bigdw 50 ; SDef db "PUTERA@@@@@" - db BLISSEY db BRIGHTPOWDER db PSYCHIC_M, SUBMISSION, SOFTBOILED, COUNTER @@ -829,7 +797,7 @@ BattleTowerMons2: bigdw 30000 bigdw 30000 bigdw 50000 - db $bd, $fe ; DVs + dn 11, 13, 15, 14 ; DVs db 10, 25, 10, 20 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -844,7 +812,6 @@ BattleTowerMons2: bigdw 75 ; SDef db "HAPINASU@@@" - db LAPRAS db GOLD_BERRY db PSYCHIC_M, THUNDERBOLT, BLIZZARD, CONFUSE_RAY @@ -856,7 +823,7 @@ BattleTowerMons2: bigdw 40000 bigdw 55000 bigdw 30000 - db $fe, $d7 ; DVs + dn 15, 14, 13, 7 ; DVs db 10, 15, 5, 10 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -871,7 +838,6 @@ BattleTowerMons2: bigdw 54 ; SDef db "RAPURASU@@@" - db PIKACHU db LIGHT_BALL db THUNDERBOLT, THUNDER_WAVE, STRENGTH, TOXIC @@ -883,7 +849,7 @@ BattleTowerMons2: bigdw 45000 bigdw 50000 bigdw 50000 - db $fc, $fe ; DVs + dn 15, 12, 15, 14 ; DVs db 15, 20, 15, 10 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -898,7 +864,6 @@ BattleTowerMons2: bigdw 37 ; SDef db "PIKATIyuU@@" - db SCIZOR db FOCUS_BAND db STEEL_WING, SLASH, TOXIC, SANDSTORM @@ -910,7 +875,7 @@ BattleTowerMons2: bigdw 40000 bigdw 45000 bigdw 50000 - db $fd, $fe ; DVs + dn 15, 13, 15, 14 ; DVs db 25, 20, 10, 10 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -925,7 +890,6 @@ BattleTowerMons2: bigdw 53 ; SDef db "HAtuSAMU@@@" - db HITMONCHAN db GOLD_BERRY db THUNDERPUNCH, ICE_PUNCH, FIRE_PUNCH, MEGA_PUNCH @@ -937,7 +901,7 @@ BattleTowerMons2: bigdw 35000 bigdw 50000 bigdw 30000 - db $fb, $fd ; DVs + dn 15, 11, 15, 13 ; DVs db 15, 15, 15, 20 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -952,7 +916,6 @@ BattleTowerMons2: bigdw 62 ; SDef db "EBIWARA-@@@" - db TAUROS db BRIGHTPOWDER db THUNDERBOLT, EARTHQUAKE, HYPER_BEAM, BLIZZARD @@ -964,7 +927,7 @@ BattleTowerMons2: bigdw 50000 bigdw 30000 bigdw 30000 - db $fb, $ef ; DVs + dn 15, 11, 14, 15 ; DVs db 15, 10, 5, 5 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -979,7 +942,6 @@ BattleTowerMons2: bigdw 47 ; SDef db "KENTAROSU@@" - db AZUMARILL db MYSTIC_WATER db SURF, BLIZZARD, ATTRACT, RAIN_DANCE @@ -991,7 +953,7 @@ BattleTowerMons2: bigdw 40000 bigdw 40000 bigdw 40000 - db $ed, $f7 ; DVs + dn 14, 13, 15, 7 ; DVs db 15, 5, 15, 5 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -1006,7 +968,6 @@ BattleTowerMons2: bigdw 49 ; SDef db "MARIRURI@@@" - db MILTANK db KINGS_ROCK db EARTHQUAKE, THUNDER, ATTRACT, SURF @@ -1018,7 +979,7 @@ BattleTowerMons2: bigdw 40000 bigdw 40000 bigdw 40000 - db $df, $fe ; DVs + dn 13, 15, 15, 14 ; DVs db 10, 10, 15, 15 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -1033,7 +994,6 @@ BattleTowerMons2: bigdw 48 ; SDef db "MIRUTANKU@@" - db WIGGLYTUFF db GOLD_BERRY db HYPER_BEAM, BLIZZARD, FIRE_BLAST, ATTRACT @@ -1045,7 +1005,7 @@ BattleTowerMons2: bigdw 40000 bigdw 40000 bigdw 40000 - db $c7, $fe ; DVs + dn 12, 7, 15, 14 ; DVs db 5, 5, 5, 15 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -1060,7 +1020,6 @@ BattleTowerMons2: bigdw 40 ; SDef db "PUKURIN@@@@" - db WIGGLYTUFF db PINK_BOW db PSYCHIC_M, SWAGGER, PSYCH_UP, HEADBUTT @@ -1072,7 +1031,7 @@ BattleTowerMons2: bigdw 30000 bigdw 30000 bigdw 30000 - db $c7, $77 ; DVs + dn 12, 7, 7, 7 ; DVs db 10, 15, 10, 15 ; PP db 0 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -1087,7 +1046,6 @@ BattleTowerMons2: bigdw 36 ; SDef db "PUKURIN@@@@" - db NIDOKING db BERRY db BLIZZARD, EARTHQUAKE, SURF, THUNDERPUNCH @@ -1099,7 +1057,7 @@ BattleTowerMons2: bigdw 30000 bigdw 30000 bigdw 30000 - db $56, $46 ; DVs + dn 5, 6, 4, 6 ; DVs db 5, 10, 15, 15 ; PP db 0 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -1114,7 +1072,6 @@ BattleTowerMons2: bigdw 46 ; SDef db "NIDOKINGU@@" - db QUAGSIRE db QUICK_CLAW db AMNESIA, EARTHQUAKE, SURF, RAIN_DANCE @@ -1126,7 +1083,7 @@ BattleTowerMons2: bigdw 30000 bigdw 30000 bigdw 30000 - db $55, $47 ; DVs + dn 5, 5, 4, 7 ; DVs db 20, 10, 15, 5 ; PP db 0 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -1142,8 +1099,6 @@ BattleTowerMons2: db "NUO-@@@@@@@" - - BattleTowerMons3: db JOLTEON @@ -1157,7 +1112,7 @@ BattleTowerMons3: bigdw 50000 bigdw 50000 bigdw 55000 - db $db, $ed ; DVs + dn 13, 11, 14, 13 ; DVs db 15, 20, 20, 10 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -1172,7 +1127,6 @@ BattleTowerMons3: bigdw 87 ; SDef db "SANDA-SU@@@" - db POLIWRATH db BRIGHTPOWDER db DOUBLE_TEAM, SURF, FISSURE, SUBMISSION @@ -1184,7 +1138,7 @@ BattleTowerMons3: bigdw 55000 bigdw 55000 bigdw 50000 - db $dd, $fb ; DVs + dn 13, 13, 15, 11 ; DVs db 15, 15, 5, 25 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -1199,7 +1153,6 @@ BattleTowerMons3: bigdw 82 ; SDef db "NIyoROBON@@" - db STARMIE db LEFTOVERS db THUNDER_WAVE, PSYCHIC_M, RECOVER, SURF @@ -1211,7 +1164,7 @@ BattleTowerMons3: bigdw 50000 bigdw 50000 bigdw 50000 - db $ff, $ff ; DVs + dn 15, 15, 15, 15 ; DVs db 20, 10, 20, 15 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -1226,7 +1179,6 @@ BattleTowerMons3: bigdw 81 ; SDef db "SUTA-MI-@@@" - db JYNX db GOLD_BERRY db BLIZZARD, LOVELY_KISS, DREAM_EATER, ATTRACT @@ -1238,7 +1190,7 @@ BattleTowerMons3: bigdw 50000 bigdw 30000 bigdw 50000 - db $fb, $ee ; DVs + dn 15, 11, 14, 14 ; DVs db 5, 10, 15, 15 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -1253,7 +1205,6 @@ BattleTowerMons3: bigdw 86 ; SDef db "RU-ZIyuRA@@" - db DUGTRIO db KINGS_ROCK db EARTHQUAKE, SLUDGE_BOMB, SLASH, MUD_SLAP @@ -1265,7 +1216,7 @@ BattleTowerMons3: bigdw 30000 bigdw 50000 bigdw 50000 - db $ef, $ff ; DVs + dn 14, 15, 15, 15 ; DVs db 10, 10, 20, 10 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -1280,7 +1231,6 @@ BattleTowerMons3: bigdw 72 ; SDef db "DAGUTORIO@@" - db BELLOSSOM db BRIGHTPOWDER db GIGA_DRAIN, SUNNY_DAY, SOLARBEAM, DOUBLE_TEAM @@ -1292,7 +1242,7 @@ BattleTowerMons3: bigdw 50000 bigdw 55000 bigdw 50000 - db $df, $db ; DVs + dn 13, 15, 13, 11 ; DVs db 5, 5, 10, 15 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -1307,7 +1257,6 @@ BattleTowerMons3: bigdw 88 ; SDef db "KIREIHANA@@" - db BLISSEY db LEFTOVERS db TOXIC, REFLECT, SOFTBOILED, PROTECT @@ -1319,7 +1268,7 @@ BattleTowerMons3: bigdw 45000 bigdw 30000 bigdw 45000 - db $fb, $ed ; DVs + dn 15, 11, 14, 13 ; DVs db 10, 20, 10, 10 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -1334,7 +1283,6 @@ BattleTowerMons3: bigdw 109 ; SDef db "HAPINASU@@@" - db HOUNDOOM db CHARCOAL db FLAMETHROWER, CRUNCH, SHADOW_BALL, DREAM_EATER @@ -1346,7 +1294,7 @@ BattleTowerMons3: bigdw 50000 bigdw 45000 bigdw 45000 - db $fd, $ed ; DVs + dn 15, 13, 14, 13 ; DVs db 15, 15, 15, 15 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -1361,7 +1309,6 @@ BattleTowerMons3: bigdw 76 ; SDef db "HERUGA-@@@@" - db MACHAMP db MIRACLEBERRY db CROSS_CHOP, ICE_PUNCH, EARTHQUAKE, FIRE_BLAST @@ -1373,7 +1320,7 @@ BattleTowerMons3: bigdw 40000 bigdw 50000 bigdw 45000 - db $fd, $be ; DVs + dn 15, 13, 11, 14 ; DVs db 5, 15, 10, 5 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -1388,7 +1335,6 @@ BattleTowerMons3: bigdw 80 ; SDef db "KAIRIKI-@@@" - db CROBAT db GOLD_BERRY db ATTRACT, CONFUSE_RAY, TOXIC, WING_ATTACK @@ -1400,7 +1346,7 @@ BattleTowerMons3: bigdw 30000 bigdw 30000 bigdw 50000 - db $ef, $dc ; DVs + dn 14, 15, 13, 12 ; DVs db 15, 10, 10, 35 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -1415,7 +1361,6 @@ BattleTowerMons3: bigdw 76 ; SDef db "KUROBAtuTO@" - db PORYGON2 db BRIGHTPOWDER db PSYCHIC_M, RECOVER, HYPER_BEAM, TRI_ATTACK @@ -1427,7 +1372,7 @@ BattleTowerMons3: bigdw 40000 bigdw 55000 bigdw 30000 - db $df, $db ; DVs + dn 13, 15, 13, 11 ; DVs db 10, 20, 5, 10 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -1442,7 +1387,6 @@ BattleTowerMons3: bigdw 81 ; SDef db "PORIGON2@@@" - db MAROWAK db THICK_CLUB db EARTHQUAKE, RETURN, HYPER_BEAM, BONEMERANG @@ -1454,7 +1398,7 @@ BattleTowerMons3: bigdw 45000 bigdw 50000 bigdw 30000 - db $dd, $eb ; DVs + dn 13, 13, 14, 11 ; DVs db 10, 20, 5, 10 ; PP db 255 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -1469,7 +1413,6 @@ BattleTowerMons3: bigdw 72 ; SDef db "GARAGARA@@@" - db ELECTRODE db BRIGHTPOWDER db LIGHT_SCREEN, THUNDERBOLT, PROTECT, THUNDER @@ -1481,7 +1424,7 @@ BattleTowerMons3: bigdw 40000 bigdw 45000 bigdw 50000 - db $bd, $ef ; DVs + dn 11, 13, 14, 15 ; DVs db 30, 15, 10, 10 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -1496,7 +1439,6 @@ BattleTowerMons3: bigdw 78 ; SDef db "MARUMAIN@@@" - db LAPRAS db LEFTOVERS db RAIN_DANCE, WATER_GUN, ICY_WIND, STRENGTH @@ -1508,7 +1450,7 @@ BattleTowerMons3: bigdw 35000 bigdw 50000 bigdw 30000 - db $fd, $eb ; DVs + dn 15, 13, 14, 11 ; DVs db 5, 25, 15, 15 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -1523,7 +1465,6 @@ BattleTowerMons3: bigdw 81 ; SDef db "RAPURASU@@@" - db LANTURN db GOLD_BERRY db RAIN_DANCE, THUNDER, SURF, FLAIL @@ -1535,7 +1476,7 @@ BattleTowerMons3: bigdw 50000 bigdw 30000 bigdw 30000 - db $dd, $eb ; DVs + dn 13, 13, 14, 11 ; DVs db 5, 10, 15, 15 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -1550,7 +1491,6 @@ BattleTowerMons3: bigdw 70 ; SDef db "RANTA-N@@@@" - db ESPEON db MIRACLEBERRY db CONFUSION, SWIFT, TOXIC, PSYCH_UP @@ -1562,7 +1502,7 @@ BattleTowerMons3: bigdw 50000 bigdw 50000 bigdw 50000 - db $ef, $f7 ; DVs + dn 14, 15, 15, 7 ; DVs db 25, 20, 10, 10 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -1577,7 +1517,6 @@ BattleTowerMons3: bigdw 82 ; SDef db "E-HUi@@@@@@" - db TENTACRUEL db KINGS_ROCK db WRAP, TOXIC, SLUDGE_BOMB, BUBBLEBEAM @@ -1589,7 +1528,7 @@ BattleTowerMons3: bigdw 50000 bigdw 47000 bigdw 45000 - db $fe, $fe ; DVs + dn 15, 14, 15, 14 ; DVs db 20, 10, 10, 20 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -1604,7 +1543,6 @@ BattleTowerMons3: bigdw 101 ; SDef db "DOKUKURAGE@" - db GENGAR db GOLD_BERRY db THIEF, LICK, NIGHT_SHADE, GIGA_DRAIN @@ -1616,7 +1554,7 @@ BattleTowerMons3: bigdw 50000 bigdw 50000 bigdw 50000 - db $f7, $f7 ; DVs + dn 15, 7, 15, 7 ; DVs db 10, 30, 15, 5 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -1631,7 +1569,6 @@ BattleTowerMons3: bigdw 70 ; SDef db "GENGA-@@@@@" - db URSARING db GOLD_BERRY db HEADBUTT, PROTECT, ROAR, LEER @@ -1643,7 +1580,7 @@ BattleTowerMons3: bigdw 30000 bigdw 30000 bigdw 30000 - db $77, $45 ; DVs + dn 7, 7, 4, 5 ; DVs db 15, 10, 20, 30 ; PP db 0 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -1658,7 +1595,6 @@ BattleTowerMons3: bigdw 65 ; SDef db "RINGUMA@@@@" - db FEAROW db BRIGHTPOWDER db MIRROR_MOVE, PURSUIT, PECK, SWIFT @@ -1670,7 +1606,7 @@ BattleTowerMons3: bigdw 30000 bigdw 30000 bigdw 30000 - db $67, $77 ; DVs + dn 6, 7, 7, 7 ; DVs db 20, 20, 35, 20 ; PP db 0 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -1685,7 +1621,6 @@ BattleTowerMons3: bigdw 58 ; SDef db "ONIDORIRU@@" - db PRIMEAPE db MIRACLEBERRY db LOW_KICK, KARATE_CHOP, REVERSAL, FOCUS_ENERGY @@ -1697,7 +1632,7 @@ BattleTowerMons3: bigdw 30000 bigdw 30000 bigdw 30000 - db $77, $67 ; DVs + dn 7, 7, 6, 7 ; DVs db 20, 25, 15, 30 ; PP db 0 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -1713,8 +1648,6 @@ BattleTowerMons3: db "OKORIZARU@@" - - BattleTowerMons4: db TAUROS @@ -1728,7 +1661,7 @@ BattleTowerMons4: bigdw 50000 bigdw 50000 bigdw 50000 - db $fd, $fe ; DVs + dn 15, 13, 15, 14 ; DVs db 20, 5, 10, 15 ; PP db 255 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -1743,7 +1676,6 @@ BattleTowerMons4: bigdw 94 ; SDef db "KENTAROSU@@" - db KINGDRA db LEFTOVERS db SURF, DRAGONBREATH, HYPER_BEAM, BLIZZARD @@ -1755,7 +1687,7 @@ BattleTowerMons4: bigdw 50000 bigdw 50000 bigdw 50000 - db $fd, $ef ; DVs + dn 15, 13, 14, 15 ; DVs db 15, 20, 5, 5 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -1770,7 +1702,6 @@ BattleTowerMons4: bigdw 115 ; SDef db "KINGUDORA@@" - db SNORLAX db QUICK_CLAW db ATTRACT, BODY_SLAM, PSYCH_UP, EARTHQUAKE @@ -1782,7 +1713,7 @@ BattleTowerMons4: bigdw 50000 bigdw 50000 bigdw 50000 - db $ed, $dd ; DVs + dn 14, 13, 13, 13 ; DVs db 15, 15, 10, 10 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -1797,7 +1728,6 @@ BattleTowerMons4: bigdw 125 ; SDef db "KABIGON@@@@" - db LAPRAS db LEFTOVERS db THUNDERBOLT, ICE_BEAM, CONFUSE_RAY, SURF @@ -1809,7 +1739,7 @@ BattleTowerMons4: bigdw 50000 bigdw 50000 bigdw 50000 - db $fd, $eb ; DVs + dn 15, 13, 14, 11 ; DVs db 15, 10, 10, 15 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -1824,7 +1754,6 @@ BattleTowerMons4: bigdw 111 ; SDef db "RAPURASU@@@" - db STEELIX db GOLD_BERRY db SANDSTORM, IRON_TAIL, EARTHQUAKE, TOXIC @@ -1836,7 +1765,7 @@ BattleTowerMons4: bigdw 50000 bigdw 50000 bigdw 50000 - db $ef, $db ; DVs + dn 14, 15, 13, 11 ; DVs db 10, 15, 10, 10 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -1851,7 +1780,6 @@ BattleTowerMons4: bigdw 87 ; SDef db "HAGANE-RU@@" - db ALAKAZAM db KINGS_ROCK db PSYCHIC_M, THUNDERPUNCH, RECOVER, FIRE_PUNCH @@ -1863,7 +1791,7 @@ BattleTowerMons4: bigdw 50000 bigdw 55000 bigdw 50000 - db $dd, $ef ; DVs + dn 13, 13, 14, 15 ; DVs db 10, 15, 20, 15 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -1878,7 +1806,6 @@ BattleTowerMons4: bigdw 107 ; SDef db "HU-DEiN@@@@" - db STARMIE db LEFTOVERS db BLIZZARD, THUNDERBOLT, SURF, PSYCHIC_M @@ -1890,7 +1817,7 @@ BattleTowerMons4: bigdw 45000 bigdw 50000 bigdw 45000 - db $fd, $be ; DVs + dn 15, 13, 11, 14 ; DVs db 5, 15, 15, 10 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -1905,7 +1832,6 @@ BattleTowerMons4: bigdw 105 ; SDef db "SUTA-MI-@@@" - db WOBBUFFET db GOLD_BERRY db COUNTER, MIRROR_COAT, SAFEGUARD, DESTINY_BOND @@ -1917,7 +1843,7 @@ BattleTowerMons4: bigdw 50000 bigdw 50000 bigdw 50000 - db $bf, $e7 ; DVs + dn 11, 15, 14, 7 ; DVs db 20, 20, 25, 5 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -1932,7 +1858,6 @@ BattleTowerMons4: bigdw 79 ; SDef db "SO-NANSU@@@" - db GOLEM db FOCUS_BAND db EXPLOSION, EARTHQUAKE, MEGA_PUNCH, ROCK_SLIDE @@ -1944,7 +1869,7 @@ BattleTowerMons4: bigdw 40000 bigdw 50000 bigdw 45000 - db $dd, $ed ; DVs + dn 13, 13, 14, 13 ; DVs db 5, 10, 20, 10 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -1959,7 +1884,6 @@ BattleTowerMons4: bigdw 88 ; SDef db "GORO-NIya@@" - db SCIZOR db SCOPE_LENS db SLASH, STEEL_WING, PURSUIT, HYPER_BEAM @@ -1971,7 +1895,7 @@ BattleTowerMons4: bigdw 50000 bigdw 40000 bigdw 50000 - db $bd, $fe ; DVs + dn 11, 13, 15, 14 ; DVs db 20, 25, 20, 5 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -1986,7 +1910,6 @@ BattleTowerMons4: bigdw 102 ; SDef db "HAtuSAMU@@@" - db DUGTRIO db KINGS_ROCK db EARTHQUAKE, HYPER_BEAM, SLUDGE_BOMB, MUD_SLAP @@ -1998,7 +1921,7 @@ BattleTowerMons4: bigdw 50000 bigdw 50000 bigdw 50000 - db $fe, $bb ; DVs + dn 15, 14, 11, 11 ; DVs db 10, 5, 10, 10 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -2013,7 +1936,6 @@ BattleTowerMons4: bigdw 91 ; SDef db "DAGUTORIO@@" - db SLOWBRO db MIRACLEBERRY db SURF, PSYCHIC_M, EARTHQUAKE, BLIZZARD @@ -2025,7 +1947,7 @@ BattleTowerMons4: bigdw 45000 bigdw 50000 bigdw 50000 - db $bf, $cf ; DVs + dn 11, 15, 12, 15 ; DVs db 15, 10, 10, 5 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -2040,7 +1962,6 @@ BattleTowerMons4: bigdw 103 ; SDef db "YADORAN@@@@" - db PORYGON2 db NO_ITEM db CONVERSION2, CONVERSION, PSYBEAM, THIEF @@ -2052,7 +1973,7 @@ BattleTowerMons4: bigdw 50000 bigdw 50000 bigdw 50000 - db $bc, $ef ; DVs + dn 11, 12, 14, 15 ; DVs db 30, 30, 20, 10 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -2067,7 +1988,6 @@ BattleTowerMons4: bigdw 115 ; SDef db "PORIGON2@@@" - db ARCANINE db CHARCOAL db FLAME_WHEEL, LEER, BODY_SLAM, ROAR @@ -2079,7 +1999,7 @@ BattleTowerMons4: bigdw 50000 bigdw 50000 bigdw 50000 - db $fe, $bb ; DVs + dn 15, 14, 11, 11 ; DVs db 25, 30, 15, 20 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -2094,7 +2014,6 @@ BattleTowerMons4: bigdw 99 ; SDef db "UINDEi@@@@@" - db FORRETRESS db LEFTOVERS db RAPID_SPIN, PROTECT, TOXIC, SANDSTORM @@ -2106,7 +2025,7 @@ BattleTowerMons4: bigdw 50000 bigdw 50000 bigdw 50000 - db $fa, $7f ; DVs + dn 15, 10, 7, 15 ; DVs db 40, 10, 10, 10 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -2121,7 +2040,6 @@ BattleTowerMons4: bigdw 87 ; SDef db "HUoRETOSU@@" - db OMASTAR db GOLD_BERRY db CURSE, WATER_GUN, ANCIENTPOWER, ROCK_SMASH @@ -2133,7 +2051,7 @@ BattleTowerMons4: bigdw 50000 bigdw 50000 bigdw 50000 - db $ef, $f7 ; DVs + dn 14, 15, 15, 7 ; DVs db 10, 25, 5, 15 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -2148,7 +2066,6 @@ BattleTowerMons4: bigdw 88 ; SDef db "OMUSUTA-@@@" - db CHARIZARD db KINGS_ROCK db FIRE_SPIN, DRAGON_RAGE, FLY, SLASH @@ -2160,7 +2077,7 @@ BattleTowerMons4: bigdw 50000 bigdw 50000 bigdw 50000 - db $fe, $fe ; DVs + dn 15, 14, 15, 14 ; DVs db 15, 10, 15, 20 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -2175,7 +2092,6 @@ BattleTowerMons4: bigdw 106 ; SDef db "RIZA-DON@@@" - db EXEGGUTOR db BRIGHTPOWDER db EGG_BOMB, STOMP, PSYCH_UP, CONFUSION @@ -2187,7 +2103,7 @@ BattleTowerMons4: bigdw 50000 bigdw 50000 bigdw 50000 - db $f7, $e7 ; DVs + dn 15, 7, 14, 7 ; DVs db 10, 20, 10, 25 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -2202,7 +2118,6 @@ BattleTowerMons4: bigdw 84 ; SDef db "NAtuSI-@@@@" - db HYPNO db BRIGHTPOWDER db CONFUSION, THUNDERPUNCH, HEADBUTT, DISABLE @@ -2214,7 +2129,7 @@ BattleTowerMons4: bigdw 30000 bigdw 30000 bigdw 30000 - db $77, $7a ; DVs + dn 7, 7, 7, 10 ; DVs db 25, 15, 15, 20 ; PP db 0 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -2229,7 +2144,6 @@ BattleTowerMons4: bigdw 122 ; SDef db "SURI-PA-@@@" - db MUK db QUICK_CLAW db SCREECH, TOXIC, SLUDGE, HARDEN @@ -2241,7 +2155,7 @@ BattleTowerMons4: bigdw 30000 bigdw 30000 bigdw 30000 - db $75, $6b ; DVs + dn 7, 5, 6, 11 ; DVs db 40, 10, 20, 30 ; PP db 0 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -2256,7 +2170,6 @@ BattleTowerMons4: bigdw 111 ; SDef db "BETOBETON@@" - db ELECTABUZZ db KINGS_ROCK db LIGHT_SCREEN, THUNDERPUNCH, SWIFT, SNORE @@ -2268,7 +2181,7 @@ BattleTowerMons4: bigdw 30000 bigdw 30000 bigdw 30000 - db $65, $77 ; DVs + dn 6, 5, 7, 7 ; DVs db 30, 15, 20, 15 ; PP db 0 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -2284,8 +2197,6 @@ BattleTowerMons4: db "EREBU-@@@@@" - - BattleTowerMons5: db KINGDRA @@ -2299,7 +2210,7 @@ BattleTowerMons5: bigdw 60000 bigdw 50000 bigdw 55000 - db $dd, $ff ; DVs + dn 13, 13, 15, 15 ; DVs db 15, 5, 5, 20 ; PP db 0 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -2314,7 +2225,6 @@ BattleTowerMons5: bigdw 144 ; SDef db "KINGUDORA@@" - db HOUNDOOM db MIRACLEBERRY db REST, CRUNCH, DREAM_EATER, FLAMETHROWER @@ -2326,7 +2236,7 @@ BattleTowerMons5: bigdw 60000 bigdw 60000 bigdw 60000 - db $dd, $fc ; DVs + dn 13, 13, 15, 12 ; DVs db 10, 15, 15, 15 ; PP db 0 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -2341,7 +2251,6 @@ BattleTowerMons5: bigdw 127 ; SDef db "HERUGA-@@@@" - db SHUCKLE db LEFTOVERS db SANDSTORM, REST, TOXIC, WRAP @@ -2353,7 +2262,7 @@ BattleTowerMons5: bigdw 60000 bigdw 60000 bigdw 55000 - db $fd, $cf ; DVs + dn 15, 13, 12, 15 ; DVs db 10, 10, 10, 20 ; PP db 0 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -2368,7 +2277,6 @@ BattleTowerMons5: bigdw 279 ; SDef db "TUBOTUBO@@@" - db SNORLAX db LEFTOVERS db HYPER_BEAM, EARTHQUAKE, SURF, PSYCH_UP @@ -2380,7 +2288,7 @@ BattleTowerMons5: bigdw 55000 bigdw 60000 bigdw 55000 - db $fd, $ef ; DVs + dn 15, 13, 14, 15 ; DVs db 5, 10, 15, 10 ; PP db 0 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -2395,7 +2303,6 @@ BattleTowerMons5: bigdw 159 ; SDef db "KABIGON@@@@" - db LAPRAS db GOLD_BERRY db THUNDERBOLT, SURF, CONFUSE_RAY, BLIZZARD @@ -2407,7 +2314,7 @@ BattleTowerMons5: bigdw 60000 bigdw 55000 bigdw 60000 - db $dd, $dd ; DVs + dn 13, 13, 13, 13 ; DVs db 15, 15, 10, 5 ; PP db 0 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -2422,7 +2329,6 @@ BattleTowerMons5: bigdw 143 ; SDef db "RAPURASU@@@" - db JOLTEON db KINGS_ROCK db THUNDERBOLT, THUNDER_WAVE, SHADOW_BALL, HIDDEN_POWER @@ -2434,7 +2340,7 @@ BattleTowerMons5: bigdw 57000 bigdw 55000 bigdw 55000 - db $ed, $ff ; DVs + dn 14, 13, 15, 15 ; DVs db 15, 20, 15, 15 ; PP db 0 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -2449,7 +2355,6 @@ BattleTowerMons5: bigdw 144 ; SDef db "SANDA-SU@@@" - db SCIZOR db LEFTOVERS db HYPER_BEAM, SLASH, AGILITY, METAL_CLAW @@ -2461,7 +2366,7 @@ BattleTowerMons5: bigdw 40000 bigdw 50000 bigdw 45000 - db $df, $ed ; DVs + dn 13, 15, 14, 13 ; DVs db 5, 20, 30, 35 ; PP db 0 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -2476,7 +2381,6 @@ BattleTowerMons5: bigdw 124 ; SDef db "HAtuSAMU@@@" - db SLOWKING db MINT_BERRY db REST, SURF, PSYCHIC_M, AMNESIA @@ -2488,7 +2392,7 @@ BattleTowerMons5: bigdw 45000 bigdw 50000 bigdw 50000 - db $df, $de ; DVs + dn 13, 15, 13, 14 ; DVs db 10, 15, 10, 20 ; PP db 15 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -2503,7 +2407,6 @@ BattleTowerMons5: bigdw 156 ; SDef db "YADOKINGU@@" - db MACHAMP db GOLD_BERRY db CROSS_CHOP, EARTHQUAKE, FIRE_BLAST, THUNDERPUNCH @@ -2515,7 +2418,7 @@ BattleTowerMons5: bigdw 50000 bigdw 40000 bigdw 44000 - db $ff, $ec ; DVs + dn 15, 15, 14, 12 ; DVs db 5, 10, 5, 15 ; PP db 13 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -2530,7 +2433,6 @@ BattleTowerMons5: bigdw 128 ; SDef db "KAIRIKI-@@@" - db STARMIE db SCOPE_LENS db THUNDER_WAVE, RECOVER, THUNDERBOLT, SURF @@ -2542,7 +2444,7 @@ BattleTowerMons5: bigdw 40000 bigdw 45000 bigdw 40000 - db $ff, $ff ; DVs + dn 15, 15, 15, 15 ; DVs db 20, 20, 15, 15 ; PP db 0 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -2557,7 +2459,6 @@ BattleTowerMons5: bigdw 130 ; SDef db "SUTA-MI-@@@" - db DUGTRIO db KINGS_ROCK db EARTHQUAKE, SLASH, HYPER_BEAM, SLUDGE_BOMB @@ -2569,7 +2470,7 @@ BattleTowerMons5: bigdw 50000 bigdw 45000 bigdw 50000 - db $f7, $fe ; DVs + dn 15, 7, 15, 14 ; DVs db 10, 20, 5, 10 ; PP db 0 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -2584,7 +2485,6 @@ BattleTowerMons5: bigdw 116 ; SDef db "DAGUTORIO@@" - db ELECTRODE db MIRACLEBERRY db THUNDERBOLT, EXPLOSION, MIRROR_COAT, REST @@ -2596,7 +2496,7 @@ BattleTowerMons5: bigdw 54000 bigdw 40000 bigdw 50000 - db $7d, $fe ; DVs + dn 7, 13, 15, 14 ; DVs db 15, 5, 20, 10 ; PP db 0 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -2611,7 +2511,6 @@ BattleTowerMons5: bigdw 126 ; SDef db "MARUMAIN@@@" - db AERODACTYL db KINGS_ROCK db HYPER_BEAM, EARTHQUAKE, FIRE_BLAST, IRON_TAIL @@ -2623,7 +2522,7 @@ BattleTowerMons5: bigdw 50000 bigdw 45000 bigdw 45000 - db $fd, $dd ; DVs + dn 15, 13, 13, 13 ; DVs db 5, 10, 5, 15 ; PP db 0 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -2638,7 +2537,6 @@ BattleTowerMons5: bigdw 119 ; SDef db "PUTERA@@@@@" - db CROBAT db LEFTOVERS db CONFUSE_RAY, ATTRACT, HYPER_BEAM, TOXIC @@ -2650,7 +2548,7 @@ BattleTowerMons5: bigdw 50000 bigdw 40000 bigdw 50000 - db $ef, $ff ; DVs + dn 14, 15, 15, 15 ; DVs db 10, 15, 5, 10 ; PP db 0 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -2665,7 +2563,6 @@ BattleTowerMons5: bigdw 127 ; SDef db "KUROBAtuTO@" - db ZAPDOS db MIRACLEBERRY db DRILL_PECK, THUNDERBOLT, THUNDER_WAVE, HYPER_BEAM @@ -2677,7 +2574,7 @@ BattleTowerMons5: bigdw 45000 bigdw 40000 bigdw 50000 - db $fd, $de ; DVs + dn 15, 13, 13, 14 ; DVs db 20, 15, 20, 5 ; PP db 0 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -2692,7 +2589,6 @@ BattleTowerMons5: bigdw 136 ; SDef db "SANDA-@@@@@" - db SKARMORY db GOLD_BERRY db SANDSTORM, FLY, STEEL_WING, TOXIC @@ -2704,7 +2600,7 @@ BattleTowerMons5: bigdw 50000 bigdw 50000 bigdw 40000 - db $d7, $ed ; DVs + dn 13, 7, 14, 13 ; DVs db 10, 15, 25, 10 ; PP db 0 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -2719,7 +2615,6 @@ BattleTowerMons5: bigdw 113 ; SDef db "EA-MUDO@@@@" - db FORRETRESS db LEFTOVERS db SANDSTORM, TOXIC, EXPLOSION, SWAGGER @@ -2731,7 +2626,7 @@ BattleTowerMons5: bigdw 55000 bigdw 45000 bigdw 40000 - db $cf, $dd ; DVs + dn 12, 15, 13, 13 ; DVs db 10, 10, 5, 15 ; PP db 0 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -2746,7 +2641,6 @@ BattleTowerMons5: bigdw 103 ; SDef db "HUoRETOSU@@" - db STEELIX db MIRACLEBERRY db SANDSTORM, IRON_TAIL, REST, EARTHQUAKE @@ -2758,7 +2652,7 @@ BattleTowerMons5: bigdw 50000 bigdw 40000 bigdw 45000 - db $dd, $dd ; DVs + dn 13, 13, 13, 13 ; DVs db 10, 15, 10, 10 ; PP db 0 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -2773,7 +2667,6 @@ BattleTowerMons5: bigdw 109 ; SDef db "HAGANE-RU@@" - db GIRAFARIG db SCOPE_LENS db DREAM_EATER, CRUNCH, PSYCHIC_M, EARTHQUAKE @@ -2785,7 +2678,7 @@ BattleTowerMons5: bigdw 40000 bigdw 40000 bigdw 40000 - db $45, $56 ; DVs + dn 4, 5, 5, 6 ; DVs db 15, 15, 10, 10 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -2800,7 +2693,6 @@ BattleTowerMons5: bigdw 101 ; SDef db "KIRINRIKI@@" - db GYARADOS db MIRACLEBERRY db HYPER_BEAM, SURF, RAIN_DANCE, ZAP_CANNON @@ -2812,7 +2704,7 @@ BattleTowerMons5: bigdw 40000 bigdw 40000 bigdw 40000 - db $75, $65 ; DVs + dn 7, 5, 6, 5 ; DVs db 5, 15, 5, 5 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -2827,7 +2719,6 @@ BattleTowerMons5: bigdw 135 ; SDef db "GIyaRADOSU@" - db ARTICUNO db GOLD_BERRY db BLIZZARD, HYPER_BEAM, ROAR, ICY_WIND @@ -2839,7 +2730,7 @@ BattleTowerMons5: bigdw 40000 bigdw 40000 bigdw 40000 - db $45, $56 ; DVs + dn 4, 5, 5, 6 ; DVs db 5, 5, 20, 15 ; PP db 0 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -2855,8 +2746,6 @@ BattleTowerMons5: db "HURI-ZA-@@@" - - BattleTowerMons6: db KINGDRA @@ -2870,7 +2759,7 @@ BattleTowerMons6: bigdw 50000 bigdw 60000 bigdw 60000 - db $dd, $fe ; DVs + dn 13, 13, 15, 14 ; DVs db 20, 15, 5, 5 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -2885,7 +2774,6 @@ BattleTowerMons6: bigdw 172 ; SDef db "KINGUDORA@@" - db TYRANITAR db GOLD_BERRY db CRUNCH, EARTHQUAKE, ROCK_SLIDE, HYPER_BEAM @@ -2897,7 +2785,7 @@ BattleTowerMons6: bigdw 55000 bigdw 60000 bigdw 55000 - db $fd, $ed ; DVs + dn 15, 13, 14, 13 ; DVs db 15, 10, 10, 5 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -2912,7 +2800,6 @@ BattleTowerMons6: bigdw 175 ; SDef db "BANGIRASU@@" - db HOUNDOOM db MIRACLEBERRY db FLAMETHROWER, CRUNCH, DREAM_EATER, REST @@ -2924,7 +2811,7 @@ BattleTowerMons6: bigdw 55000 bigdw 60000 bigdw 55000 - db $fb, $ef ; DVs + dn 15, 11, 14, 15 ; DVs db 15, 15, 15, 10 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -2939,7 +2826,6 @@ BattleTowerMons6: bigdw 153 ; SDef db "HERUGA-@@@@" - db PORYGON2 db LEFTOVERS db BLIZZARD, RECOVER, TOXIC, PSYCHIC_M @@ -2951,7 +2837,7 @@ BattleTowerMons6: bigdw 50000 bigdw 50000 bigdw 55000 - db $dd, $de ; DVs + dn 13, 13, 13, 14 ; DVs db 5, 20, 10, 10 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -2966,7 +2852,6 @@ BattleTowerMons6: bigdw 170 ; SDef db "PORIGON2@@@" - db MACHAMP db QUICK_CLAW db FIRE_PUNCH, CROSS_CHOP, THUNDERPUNCH, EARTHQUAKE @@ -2978,7 +2863,7 @@ BattleTowerMons6: bigdw 45000 bigdw 50000 bigdw 50000 - db $fd, $ef ; DVs + dn 15, 13, 14, 15 ; DVs db 15, 5, 15, 10 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -2993,7 +2878,6 @@ BattleTowerMons6: bigdw 158 ; SDef db "KAIRIKI-@@@" - db ZAPDOS db MINT_BERRY db REST, DRILL_PECK, THUNDERBOLT, THUNDER_WAVE @@ -3005,7 +2889,7 @@ BattleTowerMons6: bigdw 50000 bigdw 55000 bigdw 50000 - db $dd, $fd ; DVs + dn 13, 13, 15, 13 ; DVs db 10, 20, 15, 20 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -3020,7 +2904,6 @@ BattleTowerMons6: bigdw 161 ; SDef db "SANDA-@@@@@" - db WOBBUFFET db GOLD_BERRY db COUNTER, MIRROR_COAT, DESTINY_BOND, SAFEGUARD @@ -3032,7 +2915,7 @@ BattleTowerMons6: bigdw 45000 bigdw 50000 bigdw 45000 - db $fd, $ed ; DVs + dn 15, 13, 14, 13 ; DVs db 20, 20, 5, 25 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -3047,7 +2930,6 @@ BattleTowerMons6: bigdw 122 ; SDef db "SO-NANSU@@@" - db AERODACTYL db LEFTOVERS db HYPER_BEAM, SUPERSONIC, EARTHQUAKE, BITE @@ -3059,7 +2941,7 @@ BattleTowerMons6: bigdw 50000 bigdw 45000 bigdw 45000 - db $fd, $dd ; DVs + dn 15, 13, 13, 13 ; DVs db 5, 20, 10, 25 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -3074,7 +2956,6 @@ BattleTowerMons6: bigdw 142 ; SDef db "PUTERA@@@@@" - db DRAGONITE db MIRACLEBERRY db HYPER_BEAM, ICY_WIND, THUNDERBOLT, SURF @@ -3086,7 +2967,7 @@ BattleTowerMons6: bigdw 40000 bigdw 50000 bigdw 45000 - db $dd, $fd ; DVs + dn 13, 13, 15, 13 ; DVs db 5, 15, 15, 15 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -3101,7 +2982,6 @@ BattleTowerMons6: bigdw 172 ; SDef db "KAIRIyu-@@@" - db UMBREON db GOLD_BERRY db MUD_SLAP, MOONLIGHT, PSYCHIC_M, FAINT_ATTACK @@ -3113,7 +2993,7 @@ BattleTowerMons6: bigdw 50000 bigdw 50000 bigdw 50000 - db $fd, $ef ; DVs + dn 15, 13, 14, 15 ; DVs db 10, 5, 10, 20 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -3128,7 +3008,6 @@ BattleTowerMons6: bigdw 212 ; SDef db "BURAtuKI-@@" - db ARCANINE db CHARCOAL db FLAMETHROWER, CRUNCH, EXTREMESPEED, IRON_TAIL @@ -3140,7 +3019,7 @@ BattleTowerMons6: bigdw 40000 bigdw 55000 bigdw 50000 - db $fd, $ed ; DVs + dn 15, 13, 14, 13 ; DVs db 15, 15, 5, 15 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -3155,7 +3034,6 @@ BattleTowerMons6: bigdw 149 ; SDef db "UINDEi@@@@@" - db SKARMORY db MIRACLEBERRY db STEEL_WING, FLY, TOXIC, PROTECT @@ -3167,7 +3045,7 @@ BattleTowerMons6: bigdw 45000 bigdw 50000 bigdw 50000 - db $fb, $eb ; DVs + dn 15, 11, 14, 11 ; DVs db 25, 15, 10, 10 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -3182,7 +3060,6 @@ BattleTowerMons6: bigdw 135 ; SDef db "EA-MUDO@@@@" - db BLISSEY db LEFTOVERS db SOFTBOILED, TOXIC, PROTECT, PSYCHIC_M @@ -3194,7 +3071,7 @@ BattleTowerMons6: bigdw 50000 bigdw 45000 bigdw 50000 - db $fb, $cd ; DVs + dn 15, 11, 12, 13 ; DVs db 10, 10, 10, 10 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -3209,7 +3086,6 @@ BattleTowerMons6: bigdw 215 ; SDef db "HAPINASU@@@" - db SNORLAX db PINK_BOW db ROCK_SLIDE, SURF, BODY_SLAM, EARTHQUAKE @@ -3221,7 +3097,7 @@ BattleTowerMons6: bigdw 50000 bigdw 50000 bigdw 50000 - db $fa, $fc ; DVs + dn 15, 10, 15, 12 ; DVs db 10, 15, 15, 10 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -3236,7 +3112,6 @@ BattleTowerMons6: bigdw 184 ; SDef db "KABIGON@@@@" - db HERACROSS db FOCUS_BAND db REVERSAL, MEGAHORN, EARTHQUAKE, COUNTER @@ -3248,7 +3123,7 @@ BattleTowerMons6: bigdw 50000 bigdw 50000 bigdw 50000 - db $df, $ed ; DVs + dn 13, 15, 14, 13 ; DVs db 15, 10, 10, 20 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -3263,7 +3138,6 @@ BattleTowerMons6: bigdw 167 ; SDef db "HERAKUROSU@" - db JYNX db MIRACLEBERRY db BLIZZARD, PSYCHIC_M, SHADOW_BALL, ICY_WIND @@ -3275,7 +3149,7 @@ BattleTowerMons6: bigdw 50000 bigdw 50000 bigdw 50000 - db $ff, $eb ; DVs + dn 15, 15, 14, 11 ; DVs db 5, 10, 15, 15 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -3290,7 +3164,6 @@ BattleTowerMons6: bigdw 165 ; SDef db "RU-ZIyuRA@@" - db BLASTOISE db GOLD_BERRY db SURF, EARTHQUAKE, RAPID_SPIN, BLIZZARD @@ -3302,7 +3175,7 @@ BattleTowerMons6: bigdw 50000 bigdw 50000 bigdw 50000 - db $fe, $fe ; DVs + dn 15, 14, 15, 14 ; DVs db 15, 10, 40, 5 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -3317,7 +3190,6 @@ BattleTowerMons6: bigdw 180 ; SDef db "KAMEtuKUSU@" - db RHYDON db QUICK_CLAW db EARTHQUAKE, SURF, IRON_TAIL, ROCK_SLIDE @@ -3329,7 +3201,7 @@ BattleTowerMons6: bigdw 50000 bigdw 50000 bigdw 50000 - db $fb, $fa ; DVs + dn 15, 11, 15, 10 ; DVs db 10, 15, 15, 10 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -3344,7 +3216,6 @@ BattleTowerMons6: bigdw 104 ; SDef db "SAIDON@@@@@" - db SANDSLASH db SCOPE_LENS db EARTHQUAKE, SLASH, HYPER_BEAM, SNORE @@ -3356,7 +3227,7 @@ BattleTowerMons6: bigdw 30000 bigdw 30000 bigdw 30000 - db $b7, $67 ; DVs + dn 11, 7, 6, 7 ; DVs db 10, 20, 5, 15 ; PP db 0 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -3371,7 +3242,6 @@ BattleTowerMons6: bigdw 105 ; SDef db "SANDOPAN@@@" - db PARASECT db GOLD_BERRY db SPORE, GIGA_DRAIN, HYPER_BEAM, SLUDGE_BOMB @@ -3383,7 +3253,7 @@ BattleTowerMons6: bigdw 30000 bigdw 30000 bigdw 30000 - db $66, $5f ; DVs + dn 6, 6, 5, 15 ; DVs db 15, 5, 5, 10 ; PP db 0 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -3398,7 +3268,6 @@ BattleTowerMons6: bigdw 144 ; SDef db "PARASEKUTO@" - db GOLEM db BRIGHTPOWDER db EXPLOSION, EARTHQUAKE, FIRE_PUNCH, FRUSTRATION @@ -3410,7 +3279,7 @@ BattleTowerMons6: bigdw 30000 bigdw 30000 bigdw 30000 - db $76, $57 ; DVs + dn 7, 6, 5, 7 ; DVs db 5, 10, 15, 20 ; PP db 0 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -3426,8 +3295,6 @@ BattleTowerMons6: db "GORO-NIya@@" - - BattleTowerMons7: db JOLTEON @@ -3441,7 +3308,7 @@ BattleTowerMons7: bigdw 55000 bigdw 50000 bigdw 60000 - db $fb, $ef ; DVs + dn 15, 11, 14, 15 ; DVs db 15, 5, 15, 20 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -3456,7 +3323,6 @@ BattleTowerMons7: bigdw 201 ; SDef db "SANDA-SU@@@" - db VAPOREON db LEFTOVERS db BLIZZARD, SHADOW_BALL, SURF, MUD_SLAP @@ -3468,7 +3334,7 @@ BattleTowerMons7: bigdw 60000 bigdw 60000 bigdw 50000 - db $bf, $ef ; DVs + dn 11, 15, 14, 15 ; DVs db 5, 15, 15, 10 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -3483,7 +3349,6 @@ BattleTowerMons7: bigdw 197 ; SDef db "SIyaWA-ZU@@" - db UMBREON db GOLD_BERRY db FAINT_ATTACK, MOONLIGHT, PSYCH_UP, TOXIC @@ -3495,7 +3360,7 @@ BattleTowerMons7: bigdw 55000 bigdw 50000 bigdw 58000 - db $dd, $dd ; DVs + dn 13, 13, 13, 13 ; DVs db 20, 5, 10, 10 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -3510,7 +3375,6 @@ BattleTowerMons7: bigdw 247 ; SDef db "BURAtuKI-@@" - db BLISSEY db GOLD_BERRY db COUNTER, SOFTBOILED, SHADOW_BALL, THUNDERBOLT @@ -3522,7 +3386,7 @@ BattleTowerMons7: bigdw 55000 bigdw 58000 bigdw 50000 - db $df, $ed ; DVs + dn 13, 15, 14, 13 ; DVs db 20, 10, 15, 15 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -3537,7 +3401,6 @@ BattleTowerMons7: bigdw 250 ; SDef db "HAPINASU@@@" - db SNORLAX db LEFTOVERS db ROCK_SLIDE, EARTHQUAKE, BLIZZARD, SHADOW_BALL @@ -3549,7 +3412,7 @@ BattleTowerMons7: bigdw 60000 bigdw 55000 bigdw 50000 - db $dd, $dd ; DVs + dn 13, 13, 13, 13 ; DVs db 10, 10, 5, 15 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -3564,7 +3427,6 @@ BattleTowerMons7: bigdw 215 ; SDef db "KABIGON@@@@" - db HOUNDOOM db KINGS_ROCK db CRUNCH, FLAMETHROWER, FAINT_ATTACK, ROAR @@ -3576,7 +3438,7 @@ BattleTowerMons7: bigdw 55000 bigdw 60000 bigdw 55000 - db $dd, $cd ; DVs + dn 13, 13, 12, 13 ; DVs db 15, 15, 20, 20 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -3591,7 +3453,6 @@ BattleTowerMons7: bigdw 175 ; SDef db "HERUGA-@@@@" - db TYRANITAR db LEFTOVERS db EARTHQUAKE, CRUNCH, ROCK_SLIDE, HYPER_BEAM @@ -3603,7 +3464,7 @@ BattleTowerMons7: bigdw 45000 bigdw 50000 bigdw 45000 - db $db, $df ; DVs + dn 13, 11, 13, 15 ; DVs db 10, 15, 10, 5 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -3618,7 +3479,6 @@ BattleTowerMons7: bigdw 203 ; SDef db "BANGIRASU@@" - db ZAPDOS db GOLD_BERRY db THUNDERBOLT, DRILL_PECK, THUNDER_WAVE, HYPER_BEAM @@ -3630,7 +3490,7 @@ BattleTowerMons7: bigdw 50000 bigdw 45000 bigdw 45000 - db $db, $df ; DVs + dn 13, 11, 13, 15 ; DVs db 15, 20, 20, 5 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -3645,7 +3505,6 @@ BattleTowerMons7: bigdw 189 ; SDef db "SANDA-@@@@@" - db EXEGGUTOR db MIRACLEBERRY db REST, EXPLOSION, PSYCHIC_M, GIGA_DRAIN @@ -3657,7 +3516,7 @@ BattleTowerMons7: bigdw 40000 bigdw 50000 bigdw 45000 - db $dd, $ed ; DVs + dn 13, 13, 14, 13 ; DVs db 10, 5, 10, 5 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -3672,7 +3531,6 @@ BattleTowerMons7: bigdw 151 ; SDef db "NAtuSI-@@@@" - db UMBREON db GOLD_BERRY db MOONLIGHT, FAINT_ATTACK, PSYCHIC_M, SHADOW_BALL @@ -3684,7 +3542,7 @@ BattleTowerMons7: bigdw 45000 bigdw 45000 bigdw 50000 - db $fd, $eb ; DVs + dn 15, 13, 14, 11 ; DVs db 5, 20, 10, 15 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -3699,7 +3557,6 @@ BattleTowerMons7: bigdw 240 ; SDef db "BURAtuKI-@@" - db GYARADOS db BRIGHTPOWDER db SURF, THUNDERBOLT, HYPER_BEAM, ROAR @@ -3711,7 +3568,7 @@ BattleTowerMons7: bigdw 50000 bigdw 55000 bigdw 50000 - db $db, $ef ; DVs + dn 13, 11, 14, 15 ; DVs db 15, 15, 5, 20 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -3726,7 +3583,6 @@ BattleTowerMons7: bigdw 204 ; SDef db "GIyaRADOSU@" - db QUAGSIRE db MIRACLEBERRY db EARTHQUAKE, SURF, SLUDGE_BOMB, IRON_TAIL @@ -3738,7 +3594,7 @@ BattleTowerMons7: bigdw 45000 bigdw 50000 bigdw 50000 - db $de, $dd ; DVs + dn 13, 14, 13, 13 ; DVs db 10, 15, 10, 15 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -3753,7 +3609,6 @@ BattleTowerMons7: bigdw 152 ; SDef db "NUO-@@@@@@@" - db URSARING db SCOPE_LENS db SLASH, EARTHQUAKE, HYPER_BEAM, THUNDERPUNCH @@ -3765,7 +3620,7 @@ BattleTowerMons7: bigdw 50000 bigdw 45000 bigdw 50000 - db $fd, $ed ; DVs + dn 15, 13, 14, 13 ; DVs db 20, 10, 5, 15 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -3780,7 +3635,6 @@ BattleTowerMons7: bigdw 166 ; SDef db "RINGUMA@@@@" - db MR__MIME db KINGS_ROCK db REFLECT, FIRE_PUNCH, PSYCHIC_M, ENCORE @@ -3792,7 +3646,7 @@ BattleTowerMons7: bigdw 45000 bigdw 50000 bigdw 50000 - db $bd, $fb ; DVs + dn 11, 13, 15, 11 ; DVs db 20, 15, 10, 5 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -3807,7 +3661,6 @@ BattleTowerMons7: bigdw 226 ; SDef db "BARIYA-DO@@" - db PRIMEAPE db QUICK_CLAW db CROSS_CHOP, ICE_PUNCH, THUNDERPUNCH, ROCK_SLIDE @@ -3819,7 +3672,7 @@ BattleTowerMons7: bigdw 50000 bigdw 50000 bigdw 50000 - db $bd, $ef ; DVs + dn 11, 13, 14, 15 ; DVs db 5, 15, 15, 10 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -3834,7 +3687,6 @@ BattleTowerMons7: bigdw 162 ; SDef db "OKORIZARU@@" - db GIRAFARIG db GOLD_BERRY db AGILITY, BATON_PASS, CRUNCH, EARTHQUAKE @@ -3846,7 +3698,7 @@ BattleTowerMons7: bigdw 50000 bigdw 50000 bigdw 50000 - db $fe, $fd ; DVs + dn 15, 14, 15, 13 ; DVs db 30, 40, 15, 10 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -3861,7 +3713,6 @@ BattleTowerMons7: bigdw 152 ; SDef db "KIRINRIKI@@" - db HITMONLEE db FOCUS_BAND db REVERSAL, ENDURE, BODY_SLAM, MEGA_KICK @@ -3873,7 +3724,7 @@ BattleTowerMons7: bigdw 50000 bigdw 50000 bigdw 50000 - db $fe, $fe ; DVs + dn 15, 14, 15, 14 ; DVs db 15, 10, 15, 5 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -3888,7 +3739,6 @@ BattleTowerMons7: bigdw 217 ; SDef db "SAWAMURA-@@" - db HERACROSS db BRIGHTPOWDER db REVERSAL, ENDURE, MEGAHORN, EARTHQUAKE @@ -3900,7 +3750,7 @@ BattleTowerMons7: bigdw 50000 bigdw 50000 bigdw 50000 - db $f7, $f7 ; DVs + dn 15, 7, 15, 7 ; DVs db 15, 10, 10, 10 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -3915,7 +3765,6 @@ BattleTowerMons7: bigdw 186 ; SDef db "HERAKUROSU@" - db VENUSAUR db BRIGHTPOWDER db SUNNY_DAY, SOLARBEAM, SYNTHESIS, HYPER_BEAM @@ -3927,7 +3776,7 @@ BattleTowerMons7: bigdw 30000 bigdw 30000 bigdw 30000 - db $76, $44 ; DVs + dn 7, 6, 4, 4 ; DVs db 5, 10, 5, 5 ; PP db 0 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -3942,7 +3791,6 @@ BattleTowerMons7: bigdw 180 ; SDef db "HUSIGIBANA@" - db CHARIZARD db SCOPE_LENS db SLASH, EARTHQUAKE, HYPER_BEAM, FLAMETHROWER @@ -3954,7 +3802,7 @@ BattleTowerMons7: bigdw 30000 bigdw 30000 bigdw 30000 - db $56, $44 ; DVs + dn 5, 6, 4, 4 ; DVs db 20, 10, 5, 15 ; PP db 0 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -3969,7 +3817,6 @@ BattleTowerMons7: bigdw 159 ; SDef db "RIZA-DON@@@" - db BLASTOISE db QUICK_CLAW db HYDRO_PUMP, ICE_PUNCH, HYPER_BEAM, IRON_TAIL @@ -3981,7 +3828,7 @@ BattleTowerMons7: bigdw 30000 bigdw 30000 bigdw 30000 - db $76, $64 ; DVs + dn 7, 6, 6, 4 ; DVs db 5, 15, 5, 15 ; PP db 0 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -3997,8 +3844,6 @@ BattleTowerMons7: db "KAMEtuKUSU@" - - BattleTowerMons8: db JOLTEON @@ -4012,7 +3857,7 @@ BattleTowerMons8: bigdw 60000 bigdw 55000 bigdw 55000 - db $fd, $eb ; DVs + dn 15, 13, 14, 11 ; DVs db 20, 15, 15, 20 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -4027,7 +3872,6 @@ BattleTowerMons8: bigdw 221 ; SDef db "SANDA-SU@@@" - db SNORLAX db LEFTOVERS db REST, BELLY_DRUM, SNORE, EARTHQUAKE @@ -4039,7 +3883,7 @@ BattleTowerMons8: bigdw 50000 bigdw 55500 bigdw 60000 - db $db, $ed ; DVs + dn 13, 11, 14, 13 ; DVs db 10, 10, 15, 10 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -4054,7 +3898,6 @@ BattleTowerMons8: bigdw 250 ; SDef db "KABIGON@@@@" - db HOUNDOOM db MINT_BERRY db REST, CRUNCH, FLAMETHROWER, SUNNY_DAY @@ -4066,7 +3909,7 @@ BattleTowerMons8: bigdw 55000 bigdw 55000 bigdw 55000 - db $fd, $db ; DVs + dn 15, 13, 13, 11 ; DVs db 10, 15, 15, 5 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -4081,7 +3924,6 @@ BattleTowerMons8: bigdw 197 ; SDef db "HERUGA-@@@@" - db TAUROS db GOLD_BERRY db EARTHQUAKE, BODY_SLAM, IRON_TAIL, HYPER_BEAM @@ -4093,7 +3935,7 @@ BattleTowerMons8: bigdw 50000 bigdw 30000 bigdw 50000 - db $fd, $de ; DVs + dn 15, 13, 13, 14 ; DVs db 10, 15, 15, 5 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -4108,7 +3950,6 @@ BattleTowerMons8: bigdw 183 ; SDef db "KENTAROSU@@" - db LAPRAS db MINT_BERRY db REST, SURF, CONFUSE_RAY, PSYCHIC_M @@ -4120,7 +3961,7 @@ BattleTowerMons8: bigdw 50000 bigdw 55000 bigdw 50000 - db $df, $db ; DVs + dn 13, 15, 13, 11 ; DVs db 10, 15, 10, 10 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -4135,7 +3976,6 @@ BattleTowerMons8: bigdw 218 ; SDef db "RAPURASU@@@" - db TYRANITAR db MIRACLEBERRY db REST, CRUNCH, EARTHQUAKE, ROCK_SLIDE @@ -4147,7 +3987,7 @@ BattleTowerMons8: bigdw 50000 bigdw 55000 bigdw 50000 - db $df, $db ; DVs + dn 13, 15, 13, 11 ; DVs db 10, 15, 10, 10 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -4162,7 +4002,6 @@ BattleTowerMons8: bigdw 226 ; SDef db "BANGIRASU@@" - db GENGAR db NO_ITEM db THUNDERBOLT, SHADOW_BALL, CONFUSE_RAY, THIEF @@ -4174,7 +4013,7 @@ BattleTowerMons8: bigdw 45000 bigdw 55000 bigdw 50000 - db $de, $dd ; DVs + dn 13, 14, 13, 13 ; DVs db 15, 15, 10, 10 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -4189,7 +4028,6 @@ BattleTowerMons8: bigdw 189 ; SDef db "GENGA-@@@@@" - db FORRETRESS db LEFTOVERS db EXPLOSION, TOXIC, SOLARBEAM, SWAGGER @@ -4201,7 +4039,7 @@ BattleTowerMons8: bigdw 50000 bigdw 45000 bigdw 50000 - db $fd, $ed ; DVs + dn 15, 13, 14, 13 ; DVs db 5, 10, 10, 15 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -4216,7 +4054,6 @@ BattleTowerMons8: bigdw 165 ; SDef db "HUoRETOSU@@" - db KINGDRA db MINT_BERRY db REST, SURF, BLIZZARD, DRAGONBREATH @@ -4228,7 +4065,7 @@ BattleTowerMons8: bigdw 40000 bigdw 55000 bigdw 50000 - db $fb, $ed ; DVs + dn 15, 11, 14, 13 ; DVs db 10, 15, 5, 20 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -4243,7 +4080,6 @@ BattleTowerMons8: bigdw 221 ; SDef db "KINGUDORA@@" - db DRAGONITE db GOLD_BERRY db THUNDER_WAVE, SURF, THUNDERBOLT, OUTRAGE @@ -4255,7 +4091,7 @@ BattleTowerMons8: bigdw 50000 bigdw 50000 bigdw 45000 - db $dd, $dd ; DVs + dn 13, 13, 13, 13 ; DVs db 20, 15, 15, 15 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -4270,7 +4106,6 @@ BattleTowerMons8: bigdw 228 ; SDef db "KAIRIyu-@@@" - db PORYGON2 db LEFTOVERS db PSYCHIC_M, RECOVER, HYPER_BEAM, TRI_ATTACK @@ -4282,7 +4117,7 @@ BattleTowerMons8: bigdw 40000 bigdw 55000 bigdw 50000 - db $df, $ed ; DVs + dn 13, 15, 14, 13 ; DVs db 10, 20, 5, 10 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -4297,7 +4132,6 @@ BattleTowerMons8: bigdw 221 ; SDef db "PORIGON2@@@" - db JYNX db QUICK_CLAW db LOVELY_KISS, BLIZZARD, DREAM_EATER, PSYCHIC_M @@ -4309,7 +4143,7 @@ BattleTowerMons8: bigdw 45000 bigdw 50000 bigdw 50000 - db $df, $df ; DVs + dn 13, 15, 13, 15 ; DVs db 10, 5, 15, 10 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -4324,7 +4158,6 @@ BattleTowerMons8: bigdw 225 ; SDef db "RU-ZIyuRA@@" - db MANTINE db GOLD_BERRY db SURF, CONFUSE_RAY, BLIZZARD, WING_ATTACK @@ -4336,7 +4169,7 @@ BattleTowerMons8: bigdw 40000 bigdw 45000 bigdw 50000 - db $df, $dc ; DVs + dn 13, 15, 13, 12 ; DVs db 15, 10, 5, 35 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -4351,7 +4184,6 @@ BattleTowerMons8: bigdw 292 ; SDef db "MANTAIN@@@@" - db SKARMORY db QUICK_CLAW db STEEL_WING, FLY, MUD_SLAP, TOXIC @@ -4363,7 +4195,7 @@ BattleTowerMons8: bigdw 35000 bigdw 50000 bigdw 50000 - db $dd, $ef ; DVs + dn 13, 13, 14, 15 ; DVs db 25, 15, 10, 10 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -4378,7 +4210,6 @@ BattleTowerMons8: bigdw 185 ; SDef db "EA-MUDO@@@@" - db MOLTRES db CHARCOAL db FLAMETHROWER, SKY_ATTACK, STEEL_WING, HYPER_BEAM @@ -4390,7 +4221,7 @@ BattleTowerMons8: bigdw 50000 bigdw 40000 bigdw 50000 - db $dd, $fe ; DVs + dn 13, 13, 15, 14 ; DVs db 15, 5, 25, 5 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -4405,7 +4236,6 @@ BattleTowerMons8: bigdw 207 ; SDef db "HUaIYA-@@@@" - db AERODACTYL db MIRACLEBERRY db HYPER_BEAM, REST, EARTHQUAKE, ROAR @@ -4417,7 +4247,7 @@ BattleTowerMons8: bigdw 50000 bigdw 40000 bigdw 50000 - db $ff, $ed ; DVs + dn 15, 15, 14, 13 ; DVs db 5, 10, 10, 20 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -4432,7 +4262,6 @@ BattleTowerMons8: bigdw 189 ; SDef db "PUTERA@@@@@" - db ELECTRODE db KINGS_ROCK db THUNDERBOLT, EXPLOSION, MIRROR_COAT, TOXIC @@ -4444,7 +4273,7 @@ BattleTowerMons8: bigdw 40000 bigdw 40000 bigdw 50000 - db $ff, $ef ; DVs + dn 15, 15, 14, 15 ; DVs db 15, 5, 20, 10 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -4459,7 +4288,6 @@ BattleTowerMons8: bigdw 201 ; SDef db "MARUMAIN@@@" - db DUGTRIO db SCOPE_LENS db SLASH, EARTHQUAKE, THIEF, MUD_SLAP @@ -4471,7 +4299,7 @@ BattleTowerMons8: bigdw 40000 bigdw 50000 bigdw 40000 - db $fd, $dd ; DVs + dn 15, 13, 13, 13 ; DVs db 20, 10, 10, 10 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -4486,7 +4314,6 @@ BattleTowerMons8: bigdw 177 ; SDef db "DAGUTORIO@@" - db VICTREEBEL db QUICK_CLAW db GIGA_DRAIN, SLUDGE_BOMB, HYPER_BEAM, TOXIC @@ -4498,7 +4325,7 @@ BattleTowerMons8: bigdw 30000 bigdw 30000 bigdw 30000 - db $65, $65 ; DVs + dn 6, 5, 6, 5 ; DVs db 5, 10, 5, 10 ; PP db 0 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -4513,7 +4340,6 @@ BattleTowerMons8: bigdw 143 ; SDef db "UTUBOtuTO@@" - db PINSIR db GOLD_BERRY db HYPER_BEAM, SUBMISSION, STRENGTH, TOXIC @@ -4525,7 +4351,7 @@ BattleTowerMons8: bigdw 30000 bigdw 30000 bigdw 30000 - db $74, $64 ; DVs + dn 7, 4, 6, 4 ; DVs db 5, 25, 15, 10 ; PP db 0 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -4540,7 +4366,6 @@ BattleTowerMons8: bigdw 157 ; SDef db "KAIROSU@@@@" - db GRANBULL db BRIGHTPOWDER db ROAR, SHADOW_BALL, HYPER_BEAM, THUNDERPUNCH @@ -4552,7 +4377,7 @@ BattleTowerMons8: bigdw 30000 bigdw 30000 bigdw 30000 - db $76, $57 ; DVs + dn 7, 6, 5, 7 ; DVs db 20, 15, 5, 15 ; PP db 0 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -4568,8 +4393,6 @@ BattleTowerMons8: db "GURANBURU@@" - - BattleTowerMons9: db UMBREON @@ -4583,7 +4406,7 @@ BattleTowerMons9: bigdw 55000 bigdw 60000 bigdw 55000 - db $fd, $ed ; DVs + dn 15, 13, 14, 13 ; DVs db 20, 10, 5, 10 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -4598,7 +4421,6 @@ BattleTowerMons9: bigdw 314 ; SDef db "BURAtuKI-@@" - db DRAGONITE db QUICK_CLAW db FIRE_BLAST, HYPER_BEAM, OUTRAGE, BLIZZARD @@ -4610,7 +4432,7 @@ BattleTowerMons9: bigdw 56000 bigdw 60000 bigdw 60000 - db $fd, $ed ; DVs + dn 15, 13, 14, 13 ; DVs db 5, 5, 15, 5 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -4625,7 +4447,6 @@ BattleTowerMons9: bigdw 263 ; SDef db "KAIRIyu-@@@" - db STARMIE db LEFTOVERS db RECOVER, THUNDERBOLT, SURF, PSYCHIC_M @@ -4637,7 +4458,7 @@ BattleTowerMons9: bigdw 60000 bigdw 55000 bigdw 60000 - db $df, $dd ; DVs + dn 13, 15, 13, 13 ; DVs db 20, 15, 15, 10 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -4652,7 +4473,6 @@ BattleTowerMons9: bigdw 236 ; SDef db "SUTA-MI-@@@" - db CLOYSTER db LEFTOVERS db EXPLOSION, BLIZZARD, SURF, ICY_WIND @@ -4664,7 +4484,7 @@ BattleTowerMons9: bigdw 50000 bigdw 50000 bigdw 50000 - db $db, $df ; DVs + dn 13, 11, 13, 15 ; DVs db 5, 5, 15, 15 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -4679,7 +4499,6 @@ BattleTowerMons9: bigdw 162 ; SDef db "PARUSIeN@@@" - db CROBAT db GOLD_BERRY db WING_ATTACK, HAZE, HYPER_BEAM, GIGA_DRAIN @@ -4691,7 +4510,7 @@ BattleTowerMons9: bigdw 50000 bigdw 50000 bigdw 50000 - db $fd, $cf ; DVs + dn 15, 13, 12, 15 ; DVs db 35, 30, 5, 5 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -4706,7 +4525,6 @@ BattleTowerMons9: bigdw 225 ; SDef db "KUROBAtuTO@" - db PORYGON2 db QUICK_CLAW db TOXIC, PSYCHIC_M, RECOVER, PROTECT @@ -4718,7 +4536,7 @@ BattleTowerMons9: bigdw 50000 bigdw 55000 bigdw 50000 - db $fd, $ed ; DVs + dn 15, 13, 14, 13 ; DVs db 10, 10, 20, 10 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -4733,7 +4551,6 @@ BattleTowerMons9: bigdw 248 ; SDef db "PORIGON2@@@" - db KINGDRA db LEFTOVERS db DRAGONBREATH, SURF, HYPER_BEAM, BLIZZARD @@ -4745,7 +4562,7 @@ BattleTowerMons9: bigdw 55000 bigdw 50000 bigdw 45000 - db $df, $de ; DVs + dn 13, 15, 13, 14 ; DVs db 20, 15, 5, 5 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -4760,7 +4577,6 @@ BattleTowerMons9: bigdw 248 ; SDef db "KINGUDORA@@" - db TYRANITAR db QUICK_CLAW db HYPER_BEAM, CRUNCH, EARTHQUAKE, ROCK_SLIDE @@ -4772,7 +4588,7 @@ BattleTowerMons9: bigdw 50000 bigdw 45000 bigdw 50000 - db $df, $de ; DVs + dn 13, 15, 13, 14 ; DVs db 5, 15, 10, 10 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -4787,7 +4603,6 @@ BattleTowerMons9: bigdw 259 ; SDef db "BANGIRASU@@" - db LAPRAS db MINT_BERRY db REST, SURF, THUNDERBOLT, PSYCHIC_M @@ -4799,7 +4614,7 @@ BattleTowerMons9: bigdw 50000 bigdw 50000 bigdw 55000 - db $bd, $ef ; DVs + dn 11, 13, 14, 15 ; DVs db 10, 15, 15, 10 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -4814,7 +4629,6 @@ BattleTowerMons9: bigdw 255 ; SDef db "RAPURASU@@@" - db ESPEON db GOLD_BERRY db PSYCHIC_M, SHADOW_BALL, SUNNY_DAY, MORNING_SUN @@ -4826,7 +4640,7 @@ BattleTowerMons9: bigdw 50000 bigdw 55000 bigdw 50000 - db $dd, $fe ; DVs + dn 13, 13, 15, 14 ; DVs db 10, 15, 5, 5 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -4841,7 +4655,6 @@ BattleTowerMons9: bigdw 250 ; SDef db "E-HUi@@@@@@" - db MACHAMP db QUICK_CLAW db CROSS_CHOP, VITAL_THROW, FIRE_BLAST, EARTHQUAKE @@ -4853,7 +4666,7 @@ BattleTowerMons9: bigdw 50000 bigdw 55000 bigdw 50000 - db $dd, $ed ; DVs + dn 13, 13, 14, 13 ; DVs db 5, 10, 5, 10 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -4868,7 +4681,6 @@ BattleTowerMons9: bigdw 230 ; SDef db "KAIRIKI-@@@" - db SNORLAX db MIRACLEBERRY db FIRE_BLAST, SURF, EARTHQUAKE, HYPER_BEAM @@ -4880,7 +4692,7 @@ BattleTowerMons9: bigdw 55000 bigdw 50000 bigdw 50000 - db $fe, $fd ; DVs + dn 15, 14, 15, 13 ; DVs db 5, 15, 10, 5 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -4895,7 +4707,6 @@ BattleTowerMons9: bigdw 275 ; SDef db "KABIGON@@@@" - db ARCANINE db MINT_BERRY db SUNNY_DAY, FLAMETHROWER, EXTREMESPEED, REST @@ -4907,7 +4718,7 @@ BattleTowerMons9: bigdw 50000 bigdw 45000 bigdw 55000 - db $df, $de ; DVs + dn 13, 15, 13, 14 ; DVs db 5, 15, 5, 10 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -4922,7 +4733,6 @@ BattleTowerMons9: bigdw 226 ; SDef db "UINDEi@@@@@" - db BLISSEY db LEFTOVERS db SOLARBEAM, SUNNY_DAY, SOFTBOILED, FIRE_BLAST @@ -4934,7 +4744,7 @@ BattleTowerMons9: bigdw 50000 bigdw 50000 bigdw 50000 - db $bd, $fe ; DVs + dn 11, 13, 15, 14 ; DVs db 10, 5, 10, 5 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -4949,7 +4759,6 @@ BattleTowerMons9: bigdw 322 ; SDef db "HAPINASU@@@" - db HOUNDOOM db BRIGHTPOWDER db FLAMETHROWER, CRUNCH, SUNNY_DAY, SOLARBEAM @@ -4961,7 +4770,7 @@ BattleTowerMons9: bigdw 50000 bigdw 50000 bigdw 50000 - db $db, $fe ; DVs + dn 13, 11, 15, 14 ; DVs db 15, 15, 5, 10 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -4976,7 +4785,6 @@ BattleTowerMons9: bigdw 223 ; SDef db "HERUGA-@@@@" - db SKARMORY db QUICK_CLAW db SANDSTORM, STEEL_WING, TOXIC, RETURN @@ -4988,7 +4796,7 @@ BattleTowerMons9: bigdw 50000 bigdw 50000 bigdw 50000 - db $ef, $f7 ; DVs + dn 14, 15, 15, 7 ; DVs db 10, 25, 10, 20 ; PP db 255 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -5003,7 +4811,6 @@ BattleTowerMons9: bigdw 193 ; SDef db "EA-MUDO@@@@" - db SHUCKLE db LEFTOVERS db TOXIC, WRAP, PROTECT, ENCORE @@ -5015,7 +4822,7 @@ BattleTowerMons9: bigdw 50000 bigdw 50000 bigdw 50000 - db $fe, $fe ; DVs + dn 15, 14, 15, 14 ; DVs db 10, 20, 10, 5 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -5030,7 +4837,6 @@ BattleTowerMons9: bigdw 493 ; SDef db "TUBOTUBO@@@" - db FLAREON db MINT_BERRY db HYPER_BEAM, FLAMETHROWER, SHADOW_BALL, ROAR @@ -5042,7 +4848,7 @@ BattleTowerMons9: bigdw 50000 bigdw 50000 bigdw 50000 - db $f7, $f7 ; DVs + dn 15, 7, 15, 7 ; DVs db 5, 15, 15, 20 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -5057,7 +4863,6 @@ BattleTowerMons9: bigdw 265 ; SDef db "BU-SUTA-@@@" - db MILTANK db LEFTOVERS db MILK_DRINK, EARTHQUAKE, ATTRACT, BODY_SLAM @@ -5069,7 +4874,7 @@ BattleTowerMons9: bigdw 30000 bigdw 30000 bigdw 30000 - db $47, $57 ; DVs + dn 4, 7, 5, 7 ; DVs db 10, 10, 15, 15 ; PP db 0 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -5084,7 +4889,6 @@ BattleTowerMons9: bigdw 182 ; SDef db "MIRUTANKU@@" - db TAUROS db PINK_BOW db THUNDERBOLT, HYPER_BEAM, ATTRACT, EARTHQUAKE @@ -5096,7 +4900,7 @@ BattleTowerMons9: bigdw 30000 bigdw 30000 bigdw 30000 - db $65, $76 ; DVs + dn 6, 5, 7, 6 ; DVs db 15, 5, 15, 10 ; PP db 0 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -5111,7 +4915,6 @@ BattleTowerMons9: bigdw 180 ; SDef db "KENTAROSU@@" - db MUK db QUICK_CLAW db TOXIC, SLUDGE_BOMB, ATTRACT, GIGA_DRAIN @@ -5123,7 +4926,7 @@ BattleTowerMons9: bigdw 30000 bigdw 30000 bigdw 30000 - db $54, $44 ; DVs + dn 5, 4, 4, 4 ; DVs db 10, 10, 15, 5 ; PP db 0 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -5139,8 +4942,6 @@ BattleTowerMons9: db "BETOBETON@@" - - BattleTowerMons10: db HOUNDOOM @@ -5154,7 +4955,7 @@ BattleTowerMons10: bigdw 60000 bigdw 60000 bigdw 60000 - db $fd, $ed ; DVs + dn 15, 13, 14, 13 ; DVs db 15, 15, 20, 10 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -5169,7 +4970,6 @@ BattleTowerMons10: bigdw 252 ; SDef db "HERUGA-@@@@" - db MACHAMP db QUICK_CLAW db CROSS_CHOP, EARTHQUAKE, HYPER_BEAM, VITAL_THROW @@ -5181,7 +4981,7 @@ BattleTowerMons10: bigdw 60000 bigdw 60000 bigdw 60000 - db $fd, $ef ; DVs + dn 15, 13, 14, 15 ; DVs db 5, 10, 5, 10 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -5196,7 +4996,6 @@ BattleTowerMons10: bigdw 266 ; SDef db "KAIRIKI-@@@" - db KINGDRA db LEFTOVERS db SURF, DRAGONBREATH, REST, TOXIC @@ -5208,7 +5007,7 @@ BattleTowerMons10: bigdw 60000 bigdw 60000 bigdw 60000 - db $df, $fe ; DVs + dn 13, 15, 15, 14 ; DVs db 15, 20, 10, 10 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -5223,7 +5022,6 @@ BattleTowerMons10: bigdw 284 ; SDef db "KINGUDORA@@" - db JOLTEON db BRIGHTPOWDER db THUNDERBOLT, ROAR, THUNDER_WAVE, IRON_TAIL @@ -5235,7 +5033,7 @@ BattleTowerMons10: bigdw 50000 bigdw 30000 bigdw 50000 - db $fd, $fe ; DVs + dn 15, 13, 15, 14 ; DVs db 15, 20, 20, 15 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -5250,7 +5048,6 @@ BattleTowerMons10: bigdw 278 ; SDef db "SANDA-SU@@@" - db TAUROS db KINGS_ROCK db HYPER_BEAM, EARTHQUAKE, IRON_TAIL, THUNDERBOLT @@ -5262,7 +5059,7 @@ BattleTowerMons10: bigdw 50000 bigdw 50000 bigdw 50000 - db $fd, $ef ; DVs + dn 15, 13, 14, 15 ; DVs db 5, 10, 15, 15 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -5277,7 +5074,6 @@ BattleTowerMons10: bigdw 230 ; SDef db "KENTAROSU@@" - db ARCANINE db LEFTOVERS db FLAMETHROWER, EXTREMESPEED, IRON_TAIL, HYPER_BEAM @@ -5289,7 +5085,7 @@ BattleTowerMons10: bigdw 50000 bigdw 55000 bigdw 50000 - db $dd, $ef ; DVs + dn 13, 13, 14, 15 ; DVs db 15, 5, 15, 5 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -5304,7 +5100,6 @@ BattleTowerMons10: bigdw 250 ; SDef db "UINDEi@@@@@" - db CHARIZARD db SCOPE_LENS db FLAMETHROWER, EARTHQUAKE, SLASH, FLY @@ -5316,7 +5111,7 @@ BattleTowerMons10: bigdw 55000 bigdw 55000 bigdw 55000 - db $fe, $df ; DVs + dn 15, 14, 13, 15 ; DVs db 15, 10, 20, 15 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -5331,7 +5126,6 @@ BattleTowerMons10: bigdw 263 ; SDef db "RIZA-DON@@@" - db ELECTRODE db BRIGHTPOWDER db THUNDER_WAVE, THUNDERBOLT, EXPLOSION, MIRROR_COAT @@ -5343,7 +5137,7 @@ BattleTowerMons10: bigdw 50000 bigdw 45000 bigdw 45000 - db $fb, $ef ; DVs + dn 15, 11, 14, 15 ; DVs db 20, 15, 5, 20 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -5358,7 +5152,6 @@ BattleTowerMons10: bigdw 248 ; SDef db "MARUMAIN@@@" - db RHYDON db MIRACLEBERRY db SURF, EARTHQUAKE, HYPER_BEAM, ROCK_SLIDE @@ -5370,7 +5163,7 @@ BattleTowerMons10: bigdw 55000 bigdw 50000 bigdw 45000 - db $fd, $ef ; DVs + dn 15, 13, 14, 15 ; DVs db 15, 10, 5, 10 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -5385,7 +5178,6 @@ BattleTowerMons10: bigdw 178 ; SDef db "SAIDON@@@@@" - db STEELIX db LEFTOVERS db EARTHQUAKE, HYPER_BEAM, SWAGGER, CRUNCH @@ -5397,7 +5189,7 @@ BattleTowerMons10: bigdw 55000 bigdw 60000 bigdw 50000 - db $fd, $de ; DVs + dn 15, 13, 13, 14 ; DVs db 10, 5, 15, 15 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -5412,7 +5204,6 @@ BattleTowerMons10: bigdw 218 ; SDef db "HAGANE-RU@@" - db FEAROW db KINGS_ROCK db DRILL_PECK, STEEL_WING, HYPER_BEAM, MUD_SLAP @@ -5424,7 +5215,7 @@ BattleTowerMons10: bigdw 50000 bigdw 55000 bigdw 50000 - db $fd, $cf ; DVs + dn 15, 13, 12, 15 ; DVs db 20, 25, 5, 10 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -5439,7 +5230,6 @@ BattleTowerMons10: bigdw 212 ; SDef db "ONIDORIRU@@" - db MISDREAVUS db FOCUS_BAND db PERISH_SONG, MEAN_LOOK, PAIN_SPLIT, SHADOW_BALL @@ -5451,7 +5241,7 @@ BattleTowerMons10: bigdw 55000 bigdw 50000 bigdw 55000 - db $bd, $ef ; DVs + dn 11, 13, 14, 15 ; DVs db 5, 5, 20, 15 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -5466,7 +5256,6 @@ BattleTowerMons10: bigdw 263 ; SDef db "MUUMA@@@@@@" - db SNEASEL db SCOPE_LENS db SLASH, BLIZZARD, DREAM_EATER, FAINT_ATTACK @@ -5478,7 +5267,7 @@ BattleTowerMons10: bigdw 48000 bigdw 45000 bigdw 50000 - db $fd, $ef ; DVs + dn 15, 13, 14, 15 ; DVs db 20, 5, 15, 20 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -5493,7 +5282,6 @@ BattleTowerMons10: bigdw 240 ; SDef db "NIyu-RA@@@@" - db SCIZOR db QUICK_CLAW db STEEL_WING, HYPER_BEAM, SLASH, TOXIC @@ -5505,7 +5293,7 @@ BattleTowerMons10: bigdw 50000 bigdw 50000 bigdw 45000 - db $fb, $fe ; DVs + dn 15, 11, 15, 14 ; DVs db 25, 5, 20, 10 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -5520,7 +5308,6 @@ BattleTowerMons10: bigdw 246 ; SDef db "HAtuSAMU@@@" - db BLISSEY db LEFTOVERS db THUNDERBOLT, BLIZZARD, FIRE_BLAST, SOFTBOILED @@ -5532,7 +5319,7 @@ BattleTowerMons10: bigdw 50000 bigdw 30000 bigdw 30000 - db $dd, $fe ; DVs + dn 13, 13, 15, 14 ; DVs db 15, 5, 5, 10 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -5547,7 +5334,6 @@ BattleTowerMons10: bigdw 346 ; SDef db "HAPINASU@@@" - db PILOSWINE db MINT_BERRY db REST, BLIZZARD, HYPER_BEAM, EARTHQUAKE @@ -5559,7 +5345,7 @@ BattleTowerMons10: bigdw 50000 bigdw 50000 bigdw 50000 - db $fe, $f7 ; DVs + dn 15, 14, 15, 7 ; DVs db 10, 5, 5, 10 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -5574,7 +5360,6 @@ BattleTowerMons10: bigdw 194 ; SDef db "INOMU-@@@@@" - db EXEGGUTOR db QUICK_CLAW db PSYCHIC_M, TOXIC, EXPLOSION, GIGA_DRAIN @@ -5586,7 +5371,7 @@ BattleTowerMons10: bigdw 50000 bigdw 50000 bigdw 50000 - db $fe, $fe ; DVs + dn 15, 14, 15, 14 ; DVs db 10, 10, 5, 5 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -5601,7 +5386,6 @@ BattleTowerMons10: bigdw 218 ; SDef db "NAtuSI-@@@@" - db OMASTAR db LEFTOVERS db SURF, ANCIENTPOWER, BLIZZARD, TOXIC @@ -5613,7 +5397,7 @@ BattleTowerMons10: bigdw 50000 bigdw 50000 bigdw 50000 - db $fb, $e7 ; DVs + dn 15, 11, 14, 7 ; DVs db 15, 5, 5, 10 ; PP db 100 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -5628,7 +5412,6 @@ BattleTowerMons10: bigdw 214 ; SDef db "OMUSUTA-@@@" - db GOLEM db BRIGHTPOWDER db EXPLOSION, EARTHQUAKE, ROCK_SLIDE, FIRE_BLAST @@ -5640,7 +5423,7 @@ BattleTowerMons10: bigdw 30000 bigdw 30000 bigdw 30000 - db $74, $46 ; DVs + dn 7, 4, 4, 6 ; DVs db 5, 10, 10, 5 ; PP db 0 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -5655,7 +5438,6 @@ BattleTowerMons10: bigdw 190 ; SDef db "GORO-NIya@@" - db HITMONCHAN db FOCUS_BAND db COUNTER, FIRE_PUNCH, THUNDERPUNCH, ICE_PUNCH @@ -5667,7 +5449,7 @@ BattleTowerMons10: bigdw 30000 bigdw 30000 bigdw 30000 - db $67, $76 ; DVs + dn 6, 7, 7, 6 ; DVs db 20, 15, 15, 15 ; PP db 0 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -5682,7 +5464,6 @@ BattleTowerMons10: bigdw 280 ; SDef db "EBIWARA-@@@" - db LANTURN db QUICK_CLAW db SURF, RAIN_DANCE, ZAP_CANNON, CONFUSE_RAY @@ -5694,7 +5475,7 @@ BattleTowerMons10: bigdw 30000 bigdw 30000 bigdw 30000 - db $76, $57 ; DVs + dn 7, 6, 5, 7 ; DVs db 15, 5, 5, 10 ; PP db 0 ; Happiness db 0, 0, 0 ; Pokerus, Caught data diff --git a/data/battle_tower/trainer_text.asm b/data/battle_tower/trainer_text.asm index 1601028a6..9937f8bf9 100644 --- a/data/battle_tower/trainer_text.asm +++ b/data/battle_tower/trainer_text.asm @@ -1,743 +1,623 @@ -BattleTowerText_0x1ec000: ; 0x1ec000 +BattleTowerText_0x1ec000: text "Hello, glad to" line "meet you!" para "I do hope we have" line "a good battle." done -; 0x1ec03b -BattleTowerText_0x1ec03b: ; 0x1ec03b +BattleTowerText_0x1ec03b: text "Thank you! A most" line "enjoyable battle!" done -; 0x1ec060 -UnknownText_0x1ec060: ; 0x1ec060 +UnknownText_0x1ec060: text "Thank you. You are" line "formidable." done -; 0x1ec080 -BattleTowerText_0x1ec080: ; 0x1ec080 +BattleTowerText_0x1ec080: text "Work, work, work…" line "I'm always busy!" done -; 0x1ec0a3 -UnknownText_0x1ec0a3: ; 0x1ec0a3 +UnknownText_0x1ec0a3: text "But, I work hard" line "in battle too!" done -; 0x1ec0c4 -UnknownText_0x1ec0c4: ; 0x1ec0c4 +UnknownText_0x1ec0c4: text "I'm too busy to be" line "battling!" done -; 0x1ec0e1 -UnknownText_0x1ec0e1: ; 0x1ec0e1 +UnknownText_0x1ec0e1: text "Brace yourself for" line "my all-out attack!" done -; 0x1ec108 -UnknownText_0x1ec108: ; 0x1ec108 +UnknownText_0x1ec108: text "What a cakewalk!" line "You're too easy!" done -; 0x1ec12a -UnknownText_0x1ec12a: ; 0x1ec12a +UnknownText_0x1ec12a: text "I won't lose next" line "time, all right?" done -; 0x1ec14d -UnknownText_0x1ec14d: ; 0x1ec14d +UnknownText_0x1ec14d: text "Heh, your #MON" line "look pretty cool." done -; 0x1ec16f -UnknownText_0x1ec16f: ; 0x1ec16f +UnknownText_0x1ec16f: text "Hey, hey, no way!" line "You won't win!" done -; 0x1ec190 -UnknownText_0x1ec190: ; 0x1ec190 +UnknownText_0x1ec190: text "You serious?" line "This is brutal!" done -; 0x1ec1ae -UnknownText_0x1ec1ae: ; 0x1ec1ae +UnknownText_0x1ec1ae: text "#MON every day!" line "I love battling!" done -; 0x1ec1d0 -UnknownText_0x1ec1d0: ; 0x1ec1d0 +UnknownText_0x1ec1d0: text "I'm on top of my" line "game, but not you!" done -; 0x1ec1f4 -UnknownText_0x1ec1f4: ; 0x1ec1f4 +UnknownText_0x1ec1f4: text "I don't care that" line "I lost, really!" done -; 0x1ec216 -UnknownText_0x1ec216: ; 0x1ec216 +UnknownText_0x1ec216: text "Hi, there! Let's" line "keep this clean!" done -; 0x1ec238 -UnknownText_0x1ec238: ; 0x1ec238 +UnknownText_0x1ec238: text "Whoops, sorry for" line "that wipeout!" done -; 0x1ec259 -UnknownText_0x1ec259: ; 0x1ec259 +UnknownText_0x1ec259: text "Whoops! Come on," line "let me win one!" done -; 0x1ec27b -UnknownText_0x1ec27b: ; 0x1ec27b +UnknownText_0x1ec27b: text "Do you want to see" line "my battle level?" done -; 0x1ec2a0 -UnknownText_0x1ec2a0: ; 0x1ec2a0 +UnknownText_0x1ec2a0: text "Hehehe, I know" line "your level now!" done -; 0x1ec2c0 -UnknownText_0x1ec2c0: ; 0x1ec2c0 +UnknownText_0x1ec2c0: text "Ouch… I'm just too" line "weak…" done -; 0x1ec2d9 -UnknownText_0x1ec2d9: ; 0x1ec2d9 +UnknownText_0x1ec2d9: text "Hey, let's battle." line "I'm your opponent." done -; 0x1ec2fe -UnknownText_0x1ec2fe: ; 0x1ec2fe +UnknownText_0x1ec2fe: text "Wow, you're not" line "serious about it!" done -; 0x1ec320 -UnknownText_0x1ec320: ; 0x1ec320 +UnknownText_0x1ec320: text "…Urgh… Nothing" line "positive here…" done -; 0x1ec33f -UnknownText_0x1ec33f: ; 0x1ec33f +UnknownText_0x1ec33f: text "I'm your" line "opponent." para "Get ready to be" line "hammered." done -; 0x1ec36c -UnknownText_0x1ec36c: ; 0x1ec36c +UnknownText_0x1ec36c: text "Hahah! That was a" line "pushover!" done -; 0x1ec389 -UnknownText_0x1ec389: ; 0x1ec389 +UnknownText_0x1ec389: text "No way! There has" line "to be a mistake!" done -; 0x1ec3ad -UnknownText_0x1ec3ad: ; 0x1ec3ad +UnknownText_0x1ec3ad: text "Hah!" line "Let's get rolling!" done -; 0x1ec3c5 -UnknownText_0x1ec3c5: ; 0x1ec3c5 +UnknownText_0x1ec3c5: text "Wahahaha! Didn't" line "break a sweat!" done -; 0x1ec3e5 -UnknownText_0x1ec3e5: ; 0x1ec3e5 +UnknownText_0x1ec3e5: text "Tough! I'm no" line "match for you!" done -; 0x1ec402 -UnknownText_0x1ec402: ; 0x1ec402 +UnknownText_0x1ec402: text "<……><……><……>" line "<……><……>Battle?" done -; 0x1ec411 -UnknownText_0x1ec411: ; 0x1ec411 +UnknownText_0x1ec411: text "<……><……><……>" line "<……><……>I won?" done -; 0x1ec41f -UnknownText_0x1ec41f: ; 0x1ec41f +UnknownText_0x1ec41f: text "<……><……><……>" line "<……><……>I lost?" done -; 0x1ec42e -UnknownText_0x1ec42e: ; 0x1ec42e +UnknownText_0x1ec42e: text "You want to be a" line "leader?" para "Let me battle you," line "then!" done -; 0x1ec461 -UnknownText_0x1ec461: ; 0x1ec461 +UnknownText_0x1ec461: text "You need another" line "ten years of" para "training to get" line "better, I'd say." done -; 0x1ec4a0 -UnknownText_0x1ec4a0: ; 0x1ec4a0 +UnknownText_0x1ec4a0: text "You're incredibly" line "talented." para "No one can touch" line "you now!" done -; 0x1ec4d6 -UnknownText_0x1ec4d6: ; 0x1ec4d6 +UnknownText_0x1ec4d6: text "Today, I'm going" line "to whomp you." done -; 0x1ec4f5 -UnknownText_0x1ec4f5: ; 0x1ec4f5 +UnknownText_0x1ec4f5: text "I knew I'd win." line "I'm so great!" done -; 0x1ec512 -UnknownText_0x1ec512: ; 0x1ec512 +UnknownText_0x1ec512: text "Uh? My plans are" line "out of whack…" done -; 0x1ec532 -UnknownText_0x1ec532: ; 0x1ec532 +UnknownText_0x1ec532: text "I bet you can't" line "beat me!" done -; 0x1ec54b -UnknownText_0x1ec54b: ; 0x1ec54b +UnknownText_0x1ec54b: text "Those #MON" line "aren't enough!" done -; 0x1ec565 -UnknownText_0x1ec565: ; 0x1ec565 +UnknownText_0x1ec565: text "I want your" line "#MON. Please?" done -; 0x1ec580 -UnknownText_0x1ec580: ; 0x1ec580 +UnknownText_0x1ec580: text "I'll show you a" line "real battle!" done -; 0x1ec59d -UnknownText_0x1ec59d: ; 0x1ec59d +UnknownText_0x1ec59d: text "This battle…" line "I'm bored!" done -; 0x1ec5b5 -UnknownText_0x1ec5b5: ; 0x1ec5b5 +UnknownText_0x1ec5b5: text "…I won't turn tail" line "in battle!" done -; 0x1ec5d3 -UnknownText_0x1ec5d3: ; 0x1ec5d3 +UnknownText_0x1ec5d3: text "Let's go!" line "No holds barred!" done -; 0x1ec5ee -UnknownText_0x1ec5ee: ; 0x1ec5ee +UnknownText_0x1ec5ee: text "Sorry! I wanted" line "the win more!" done -; 0x1ec60d -UnknownText_0x1ec60d: ; 0x1ec60d +UnknownText_0x1ec60d: text "Wahah! Congrats!" line "I can't do better!" done -; 0x1ec631 -UnknownText_0x1ec631: ; 0x1ec631 +UnknownText_0x1ec631: text "My #MON skills" line "are phenomenal!" done -; 0x1ec651 -UnknownText_0x1ec651: ; 0x1ec651 +UnknownText_0x1ec651: text "You've got a long" line "way to go." para "Well, keep trying!" line "Best of luck!" done -; 0x1ec68f -UnknownText_0x1ec68f: ; 0x1ec68f +UnknownText_0x1ec68f: text "Aww… Don't lose" line "after beating me." done -; 0x1ec6b1 -UnknownText_0x1ec6b1: ; 0x1ec6b1 +UnknownText_0x1ec6b1: text "Who are you?" line "I don't know you…" done -; 0x1ec6d0 -UnknownText_0x1ec6d0: ; 0x1ec6d0 +UnknownText_0x1ec6d0: text "I must've imagined" line "that." para "There seems to be" line "no one here…" done -; 0x1ec708 -UnknownText_0x1ec708: ; 0x1ec708 +UnknownText_0x1ec708: text "Who am I?" line "I don't know…" done -; 0x1ec720 -UnknownText_0x1ec720: ; 0x1ec720 +UnknownText_0x1ec720: text "Um… Are you that…" line "um…person?" done -; 0x1ec73e -UnknownText_0x1ec73e: ; 0x1ec73e +UnknownText_0x1ec73e: text "It doesn't appear" line "to be you…" done -; 0x1ec75b -UnknownText_0x1ec75b: ; 0x1ec75b +UnknownText_0x1ec75b: text "Then you really" line "are the legendary…" done -; 0x1ec77f -UnknownText_0x1ec77f: ; 0x1ec77f +UnknownText_0x1ec77f: text "I heard that" line "you're hot!" done -; 0x1ec798 -UnknownText_0x1ec798: ; 0x1ec798 +UnknownText_0x1ec798: text "Not bad. I was" line "just a bit better." done -; 0x1ec7bb -UnknownText_0x1ec7bb: ; 0x1ec7bb +UnknownText_0x1ec7bb: text "Eh, you're not" line "that special." done -; 0x1ec7d8 -UnknownText_0x1ec7d8: ; 0x1ec7d8 +UnknownText_0x1ec7d8: text "I'm scared about" line "what might happen." para "My #MON are way" line "too strong." done -; 0x1ec818 -UnknownText_0x1ec818: ; 0x1ec818 +UnknownText_0x1ec818: text "See? My #MON" line "were too strong." done -; 0x1ec837 -UnknownText_0x1ec837: ; 0x1ec837 +UnknownText_0x1ec837: text "Graa! My #MON" line "were total wimps!" done -; 0x1ec858 -UnknownText_0x1ec858: ; 0x1ec858 +UnknownText_0x1ec858: text "Hey, there!" line "I'll take you on!" done -; 0x1ec876 -UnknownText_0x1ec876: ; 0x1ec876 +UnknownText_0x1ec876: text "Don't you have a" line "better strategy?" done -; 0x1ec898 -UnknownText_0x1ec898: ; 0x1ec898 +UnknownText_0x1ec898: text "You've got decent" line "style!" done -; 0x1ec8b1 -UnknownText_0x1ec8b1: ; 0x1ec8b1 +UnknownText_0x1ec8b1: text "I wonder if I can" line "battle properly…" done -; 0x1ec8d5 -UnknownText_0x1ec8d5: ; 0x1ec8d5 +UnknownText_0x1ec8d5: text "Um… Sorry…" line "I think I won." done -; 0x1ec8f0 -UnknownText_0x1ec8f0: ; 0x1ec8f0 +UnknownText_0x1ec8f0: text "I guess I'm not" line "good enough yet…" done -; 0x1ec911 -UnknownText_0x1ec911: ; 0x1ec911 +UnknownText_0x1ec911: text "Wrrooar!" line "I won't lose!" done -; 0x1ec928 -UnknownText_0x1ec928: ; 0x1ec928 +UnknownText_0x1ec928: text "Wrrooar! I knew" line "I was a genius!" done -; 0x1ec949 -UnknownText_0x1ec949: ; 0x1ec949 +UnknownText_0x1ec949: text "Arrooh! I hate it" line "when I lose!" done -; 0x1ec969 -UnknownText_0x1ec969: ; 0x1ec969 +UnknownText_0x1ec969: text "Sorry, but I'm" line "going to win." done -; 0x1ec986 -UnknownText_0x1ec986: ; 0x1ec986 +UnknownText_0x1ec986: text "Yeah! My #MON" line "rule!" done -; 0x1ec99b -UnknownText_0x1ec99b: ; 0x1ec99b +UnknownText_0x1ec99b: text "Oh, close! I lost" line "by just a bit!" done -; 0x1ec9bd -UnknownText_0x1ec9bd: ; 0x1ec9bd +UnknownText_0x1ec9bd: text "OK, I'm not" line "fooling around!" done -; 0x1ec9d9 -UnknownText_0x1ec9d9: ; 0x1ec9d9 +UnknownText_0x1ec9d9: text "Yay! Too easy!" line "Like, no way!" done -; 0x1ec9f7 -UnknownText_0x1ec9f7: ; 0x1ec9f7 +UnknownText_0x1ec9f7: text "No!" line "Like, no way!" done -; 0x1eca0a -UnknownText_0x1eca0a: ; 0x1eca0a +UnknownText_0x1eca0a: text "Look! My #MON" line "are really cute!" done -; 0x1eca2a -UnknownText_0x1eca2a: ; 0x1eca2a +UnknownText_0x1eca2a: text "Aren't they really" line "adorable?" done -; 0x1eca47 -UnknownText_0x1eca47: ; 0x1eca47 +UnknownText_0x1eca47: text "I'm sorry, it's" line "all my fault!" done -; 0x1eca64 -UnknownText_0x1eca64: ; 0x1eca64 +UnknownText_0x1eca64: text "Let's get our" line "battle started!" done -; 0x1eca82 -UnknownText_0x1eca82: ; 0x1eca82 +UnknownText_0x1eca82: text "Was I too strong" line "for you?" done -; 0x1eca9d -UnknownText_0x1eca9d: ; 0x1eca9d +UnknownText_0x1eca9d: text "Ooh, you're in a" line "different class." done -; 0x1ecabf -UnknownText_0x1ecabf: ; 0x1ecabf +UnknownText_0x1ecabf: text "Are we going to" line "battle? Let's!" done -; 0x1ecade -UnknownText_0x1ecade: ; 0x1ecade +UnknownText_0x1ecade: text "Oh, you're too" line "weak. Shame." done -; 0x1ecafa -UnknownText_0x1ecafa: ; 0x1ecafa +UnknownText_0x1ecafa: text "Wow! Are you quite" line "satisfied?" done -; 0x1ecb19 -UnknownText_0x1ecb19: ; 0x1ecb19 +UnknownText_0x1ecb19: text "Oh, you have some" line "rare #MON." done -; 0x1ecb37 -UnknownText_0x1ecb37: ; 0x1ecb37 +UnknownText_0x1ecb37: text "May I have one of" line "your #MON?" done -; 0x1ecb55 -UnknownText_0x1ecb55: ; 0x1ecb55 +UnknownText_0x1ecb55: text "…I want one of" line "your #MON." done -; 0x1ecb70 -UnknownText_0x1ecb70: ; 0x1ecb70 +UnknownText_0x1ecb70: text "Want to hear about" line "my cute #MON?" done -; 0x1ecb92 -UnknownText_0x1ecb92: ; 0x1ecb92 +UnknownText_0x1ecb92: text "What do you think" line "about my cuties?" done -; 0x1ecbb6 -UnknownText_0x1ecbb6: ; 0x1ecbb6 +UnknownText_0x1ecbb6: text "Oh! My! You're a" line "dreadful trainer!" done -; 0x1ecbd9 -UnknownText_0x1ecbd9: ; 0x1ecbd9 +UnknownText_0x1ecbd9: text "Battle? Sure!" line "Right now!" done -; 0x1ecbf3 -UnknownText_0x1ecbf3: ; 0x1ecbf3 +UnknownText_0x1ecbf3: text "Oh, I love it!" line "Battling is wild!" done -; 0x1ecc15 -UnknownText_0x1ecc15: ; 0x1ecc15 +UnknownText_0x1ecc15: text "Oh, how rude! Wait" line "till next time!" done -; 0x1ecc39 -UnknownText_0x1ecc39: ; 0x1ecc39 +UnknownText_0x1ecc39: text "Please let me win!" line "Please?" done -; 0x1ecc55 -UnknownText_0x1ecc55: ; 0x1ecc55 +UnknownText_0x1ecc55: text "Wow, thank you!" line "You're so nice!" done -; 0x1ecc75 -UnknownText_0x1ecc75: ; 0x1ecc75 +UnknownText_0x1ecc75: text "You're mean!" line "I hate meanies!" done -; 0x1ecc92 -UnknownText_0x1ecc92: ; 0x1ecc92 +UnknownText_0x1ecc92: text "Well, can we" line "begin?" done -; 0x1ecca7 -UnknownText_0x1ecca7: ; 0x1ecca7 +UnknownText_0x1ecca7: text "Well, I beg your" line "pardon…" done -; 0x1eccc1 -UnknownText_0x1eccc1: ; 0x1eccc1 +UnknownText_0x1eccc1: text "Sob… That's not" line "fair!" done -; 0x1eccd7 -UnknownText_0x1eccd7: ; 0x1eccd7 +UnknownText_0x1eccd7: text "I'm good!" line "You can't win." done -; 0x1eccef -UnknownText_0x1eccef: ; 0x1eccef +UnknownText_0x1eccef: text "Giving up? You're" line "pretty weak!" done -; 0x1ecd0e -UnknownText_0x1ecd0e: ; 0x1ecd0e +UnknownText_0x1ecd0e: text "I won't accept" line "this… No way!" done -; 0x1ecd2b -UnknownText_0x1ecd2b: ; 0x1ecd2b +UnknownText_0x1ecd2b: text "Are you treating" line "this seriously?" done -; 0x1ecd4d -UnknownText_0x1ecd4d: ; 0x1ecd4d +UnknownText_0x1ecd4d: text "Oh, sorry! Looks" line "like I won!" done -; 0x1ecd6b -UnknownText_0x1ecd6b: ; 0x1ecd6b +UnknownText_0x1ecd6b: text "Oh, how nasty!" line "You were serious!" done -; 0x1ecd8d -UnknownText_0x1ecd8d: ; 0x1ecd8d +UnknownText_0x1ecd8d: text "Ahahah! I'll take" line "it easy on you!" done -; 0x1ecdaf -UnknownText_0x1ecdaf: ; 0x1ecdaf +UnknownText_0x1ecdaf: text "Oops, sorry! But" line "I'm happy too!" done -; 0x1ecdcf -UnknownText_0x1ecdcf: ; 0x1ecdcf +UnknownText_0x1ecdcf: text "Oh, oh, I lost!" line "Thanks. Bye!" done -; 0x1ecded -UnknownText_0x1ecded: ; 0x1ecded +UnknownText_0x1ecded: text "BATTLE TOWER is a" line "tough place!" done -; 0x1ece0d -UnknownText_0x1ece0d: ; 0x1ece0d +UnknownText_0x1ece0d: text "You might have a" line "hard time." done -; 0x1ece2a -UnknownText_0x1ece2a: ; 0x1ece2a +UnknownText_0x1ece2a: text "Ooh, you might" line "make a run here!" done -; 0x1ece4b -UnknownText_0x1ece4b: ; 0x1ece4b +UnknownText_0x1ece4b: text "I want to see your" line "style in action!" done -; 0x1ece70 -UnknownText_0x1ece70: ; 0x1ece70 +UnknownText_0x1ece70: text "Every battle is a" line "drama!" done -; 0x1ece8a -UnknownText_0x1ece8a: ; 0x1ece8a +UnknownText_0x1ece8a: text "Oh… Want to trade" line "something?" done -; 0x1ecea8 -UnknownText_0x1ecea8: ; 0x1ecea8 +UnknownText_0x1ecea8: text "OK, here goes!" line "I have momentum!" done -; 0x1ecec9 -UnknownText_0x1ecec9: ; 0x1ecec9 +UnknownText_0x1ecec9: text "See, I rolled" line "right over you!" done -; 0x1ecee8 -UnknownText_0x1ecee8: ; 0x1ecee8 +UnknownText_0x1ecee8: text "No! This did not" line "happen!" done -; 0x1ecf02 diff --git a/data/collision_permissions.asm b/data/collision_permissions.asm index 867bacbb0..2307ec98a 100644 --- a/data/collision_permissions.asm +++ b/data/collision_permissions.asm @@ -1,7 +1,7 @@ NONTALKABLE EQUS "db" TALKABLE EQUS "db TALK +" -TileCollisionTable:: ; 4ce1f +TileCollisionTable:: ; entries correspond to COLL_* constants NONTALKABLE LANDTILE ; COLL_FLOOR NONTALKABLE LANDTILE ; COLL_01 @@ -259,4 +259,3 @@ TileCollisionTable:: ; 4ce1f NONTALKABLE LANDTILE ; fd NONTALKABLE LANDTILE ; fe NONTALKABLE WALLTILE ; COLL_FF -; 4cf1f 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/credits_strings.asm b/data/credits_strings.asm index f23fe3723..7d1996a4c 100644 --- a/data/credits_strings.asm +++ b/data/credits_strings.asm @@ -188,7 +188,7 @@ CreditsStrings: .MonsterDesign: db " MONSTER DESIGN@" ; "# デザイン@" .GraphicsDesign: db " GRAPHICS DESIGN@" ; "グラフィック デザイン@" .Music: db " MUSIC@" ; "おんがく@" -.SoundEffects: db " SOUND EFFECTS@" ; "サウンド エフ→クト@" +.SoundEffects: db " SOUND EFFECTS@" ; "サウンド エフェクト@" .GameDesign: db " GAME DESIGN@" ; "ゲームデザイン@" .GameScenario: db " GAME SCENARIO@" ; "シナりオ@" .ToolProgramming: db " TOOL PROGRAMMING@" ; "ツール プログラム@" @@ -202,7 +202,7 @@ CreditsStrings: .ExecutiveProducer: db " EXECUTIVE PRODUCER@" ; "エグゼクティブ プロデューサー@" .PokemonAnimation: db " #MON ANIMATION@" ; "# アニメーション@" .PokedexText: db " #DEX TEXT@" ; "ずかん テキスト@" -.MobilePrjLeader: db " MOBILE PRJ. LEADER@" ; "モバイルプロジ→クト りーダー@" +.MobilePrjLeader: db " MOBILE PRJ. LEADER@" ; "モバイルプロジェクト りーダー@" .MobileSystemAd: db " MOBILE SYSTEM AD.@" ; "モバイル システムアドバイザー@" .MobileStadiumDir: db "MOBILE STADIUM DIR.@" ; "モバイルスタジアム ディレクター@" .Coordination: db " COORDINATION@" ; "コーディネーター@" 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..333f7ef02 100644 --- a/data/default_options.asm +++ b/data/default_options.asm @@ -1,8 +1,8 @@ -DefaultOptions: ; 14f7c +DefaultOptions: ; wOptions: med text speed db TEXT_DELAY_MED ; wSaveFileExists: no - db $00 + db FALSE ; wTextBoxFrame: frame 1 db FRAME_1 ; wTextBoxFlags: use text speed @@ -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..21f8ca0fe 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 @@ -197,5 +197,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/collision_stdscripts.asm b/data/events/collision_stdscripts.asm index 8156d039d..dff26dd85 100644 --- a/data/events/collision_stdscripts.asm +++ b/data/events/collision_stdscripts.asm @@ -10,4 +10,4 @@ TileCollisionStdScripts: dbw COLL_TV, tv dbw COLL_WINDOW, window dbw COLL_INCENSE_BURNER, incenseburner - db -1 ; end + db -1 ; end diff --git a/data/events/field_move_blocks.asm b/data/events/field_move_blocks.asm index d97fdc995..fea80f537 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 @@ -42,8 +42,7 @@ CutTreeBlockPointers: ; c862 db $0f, $17, 0 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..dd3dc3bbf 100644 --- a/data/events/odd_eggs.asm +++ b/data/events/odd_eggs.asm @@ -26,10 +26,8 @@ prob_total = 0 ; Tyrogue prob 10 prob 1 -; 1fb56e - -OddEggs: ; 1fb56e +OddEggs: OddEgg1: db PICHU @@ -43,7 +41,7 @@ OddEgg1: bigdw 0 bigdw 0 bigdw 0 - db $0, $0 ; DVs + dn 0, 0, 0, 0 ; DVs db 30, 20, 10, 0 ; PP db 20 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -57,8 +55,8 @@ OddEgg1: bigdw 8 ; SAtk bigdw 8 ; SDef db "EGG@@@@@@@@" +OddEgg1End: -OddEgg2: db PICHU db NO_ITEM db THUNDERSHOCK, CHARM, DIZZY_PUNCH, 0 @@ -70,7 +68,7 @@ OddEgg2: bigdw 0 bigdw 0 bigdw 0 - db $2a, $aa ; DVs + dn 2, 10, 10, 10 ; DVs db 30, 20, 10, 0 ; PP db 20 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -122,7 +120,7 @@ OddEgg2: bigdw 0 bigdw 0 bigdw 0 - db $2a, $aa ; DVs + dn 2, 10, 10, 10 ; DVs db 35, 20, 10, 0 ; PP db 20 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -174,7 +172,7 @@ OddEgg2: bigdw 0 bigdw 0 bigdw 0 - db $2a, $aa ; DVs + dn 2, 10, 10, 10 ; DVs db 15, 20, 10, 0 ; PP db 20 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -226,7 +224,7 @@ OddEgg2: bigdw 0 bigdw 0 bigdw 0 - db $2a, $aa ; DVs + dn 2, 10, 10, 10 ; DVs db 35, 30, 10, 0 ; PP db 20 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -278,7 +276,7 @@ OddEgg2: bigdw 0 bigdw 0 bigdw 0 - db $2a, $aa ; DVs + dn 2, 10, 10, 10 ; DVs db 25, 10, 0, 0 ; PP db 20 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -330,7 +328,7 @@ OddEgg2: bigdw 0 bigdw 0 bigdw 0 - db $2a, $aa ; DVs + dn 2, 10, 10, 10 ; DVs db 30, 30, 10, 0 ; PP db 20 ; Happiness db 0, 0, 0 ; Pokerus, Caught data @@ -382,7 +380,7 @@ OddEgg2: bigdw 0 bigdw 0 bigdw 0 - db $2a, $aa ; DVs + dn 2, 10, 10, 10 ; DVs db 35, 10, 0, 0 ; PP db 20 ; Happiness db 0, 0, 0 ; Pokerus, Caught data diff --git a/data/events/pokedex_ratings.asm b/data/events/pokedex_ratings.asm index 3bc45ead2..2a0488603 100644 --- a/data/events/pokedex_ratings.asm +++ b/data/events/pokedex_ratings.asm @@ -3,7 +3,7 @@ rating: MACRO dbww \1, \2, \3 ENDM -OakRatings: ; 0x2667f +OakRatings: ; if you caught at most this many, play this sound, load this text ; (text is defined in engine/events/prof_oaks_pc.asm) rating 9, SFX_DEX_FANFARE_LESS_THAN_20, OakRating01 @@ -25,5 +25,3 @@ OakRatings: ; 0x2667f rating 239, SFX_DEX_FANFARE_230_PLUS, OakRating17 rating 248, SFX_DEX_FANFARE_230_PLUS, OakRating18 rating 255, SFX_DEX_FANFARE_230_PLUS, OakRating19 - ; 0x266de -
\ No newline at end of file diff --git a/data/events/unown_walls.asm b/data/events/unown_walls.asm index d7fa26cbc..624b1e678 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,9 +30,8 @@ UnownWalls: ; 8aebc ; UNOWNWORDS_HO_OH ; db $0e, $2c, $64, $2c, $0e, -1 unownwall "H", "O", "-", "O", "H" -; 8aed5 -MenuHeaders_UnownWalls: ; 0x8aed5 +MenuHeaders_UnownWalls: ; UNOWNWORDS_ESCAPE db MENU_BACKUP_TILES ; flags menu_coords 3, 4, 16, 9 @@ -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 9f669e979..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 @@ -269,7 +269,7 @@ ItemAttributes: ; 67c1 item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; STARDUST item_attribute 2000, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE -; STAR PIECE +; STAR_PIECE item_attribute 9800, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; BASEMENT_KEY item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE 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 fbab7d434..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 @@ -15,5 +15,4 @@ TimeCapsule_CatchRateItems: ; 28785 db ITEM_DC, BERRY db ITEM_FA, BERRY db -1, BERRY - db 0 ; end -; 2879e + db 0 ; end 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..1d48ea532 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,16 @@ 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 +52,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 +66,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 +79,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 +88,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 +99,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 +111,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 +122,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 +131,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 +163,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 +176,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 +190,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 +211,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 +224,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 +237,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 +248,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 +261,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 +273,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 +285,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 +296,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 +310,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 +319,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 +335,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 +346,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 +357,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 +369,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 +379,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 +390,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/attributes.asm b/data/maps/attributes.asm index f6e961406..fa42c461e 100644 --- a/data/maps/attributes.asm +++ b/data/maps/attributes.asm @@ -63,7 +63,6 @@ elif "\1" == "east" endc ENDM - map_attributes NewBarkTown, NEW_BARK_TOWN, $05, WEST | EAST connection west, Route29, ROUTE_29, 0, 0, 9 connection east, Route27, ROUTE_27, 0, 0, 9 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/landmarks.asm b/data/maps/landmarks.asm index 2ef8a2dea..d34b85987 100644 --- a/data/maps/landmarks.asm +++ b/data/maps/landmarks.asm @@ -1,108 +1,107 @@ landmark: MACRO ; x, y, name - db \1, \2 + db \1 + 8, \2 + 16 dw \3 ENDM -Landmarks: ; 0x1ca8c3 +Landmarks: ; entries correspond to constants/landmark_constants.asm - landmark 0, 0, SpecialMapName - landmark 148, 116, NewBarkTownName - landmark 136, 116, Route29Name - landmark 108, 116, CherrygroveCityName - landmark 108, 96, Route30Name - landmark 104, 76, Route31Name - landmark 92, 76, VioletCityName - landmark 93, 74, SproutTowerName - landmark 92, 108, Route32Name - landmark 84, 92, RuinsOfAlphName - landmark 92, 140, UnionCaveName - landmark 90, 140, Route33Name - landmark 76, 140, AzaleaTownName - landmark 78, 138, SlowpokeWellName - landmark 60, 136, IlexForestName - landmark 60, 128, Route34Name - landmark 60, 108, GoldenrodCityName - landmark 58, 108, RadioTowerName - landmark 60, 92, Route35Name - landmark 60, 76, NationalParkName - landmark 72, 76, Route36Name - landmark 76, 68, Route37Name - landmark 76, 60, EcruteakCityName - landmark 78, 58, TinTowerName - landmark 74, 58, BurnedTowerName - landmark 60, 60, Route38Name - landmark 44, 64, Route39Name - landmark 44, 76, OlivineCityName - landmark 46, 78, LighthouseName - landmark 36, 72, BattleTowerName - landmark 36, 80, Route40Name - landmark 36, 108, WhirlIslandsName - landmark 36, 116, Route41Name - landmark 28, 116, CianwoodCityName - landmark 100, 60, Route42Name - landmark 92, 60, MtMortarName - landmark 116, 60, MahoganyTownName - landmark 116, 52, Route43Name - landmark 116, 44, LakeOfRageName - landmark 128, 60, Route44Name - landmark 138, 54, IcePathName - landmark 140, 60, BlackthornCityName - landmark 140, 52, DragonsDenName - landmark 140, 80, Route45Name - landmark 120, 88, DarkCaveName - landmark 132, 104, Route46Name - landmark 156, 84, SilverCaveName - landmark 60, 124, PalletTownName - landmark 60, 108, Route1Name - landmark 60, 92, ViridianCityName - landmark 60, 80, Route2Name - landmark 60, 68, PewterCityName - landmark 72, 68, Route3Name - landmark 84, 68, MtMoonName - landmark 96, 68, Route4Name - landmark 108, 68, CeruleanCityName - landmark 108, 60, Route24Name - landmark 116, 52, Route25Name - landmark 108, 76, Route5Name - landmark 116, 92, UndergroundName - landmark 108, 92, Route6Name - landmark 108, 100, VermilionCityName - landmark 96, 76, DiglettsCaveName - landmark 96, 84, Route7Name - landmark 124, 84, Route8Name - landmark 124, 68, Route9Name - landmark 140, 68, RockTunnelName - landmark 140, 72, Route10Name - landmark 140, 76, PowerPlantName - landmark 140, 84, LavenderTownName - landmark 148, 84, LavRadioTowerName - landmark 84, 84, CeladonCityName - landmark 108, 84, SaffronCityName - landmark 124, 100, Route11Name - landmark 140, 96, Route12Name - landmark 132, 116, Route13Name - landmark 124, 128, Route14Name - landmark 112, 132, Route15Name - landmark 76, 84, Route16Name - landmark 76, 108, Route17Name - landmark 88, 132, Route18Name - landmark 100, 132, FuchsiaCityName - landmark 100, 144, Route19Name - landmark 84, 148, Route20Name - landmark 76, 148, SeafoamIslandsName - landmark 60, 148, CinnabarIslandName - landmark 60, 136, Route21Name - landmark 44, 84, Route22Name - landmark 36, 68, VictoryRoadName - landmark 36, 60, Route23Name - landmark 36, 52, IndigoPlateauName - landmark 36, 108, Route26Name - landmark 28, 116, Route27Name - landmark 20, 116, TohjoFallsName - landmark 28, 84, Route28Name - landmark 148, 132, FastShipName -; 0x1caa43 + dbbw 0, 0, SpecialMapName + landmark 140, 100, NewBarkTownName + landmark 128, 100, Route29Name + landmark 100, 100, CherrygroveCityName + landmark 100, 80, Route30Name + landmark 96, 60, Route31Name + landmark 84, 60, VioletCityName + landmark 85, 58, SproutTowerName + landmark 84, 92, Route32Name + landmark 76, 76, RuinsOfAlphName + landmark 84, 124, UnionCaveName + landmark 82, 124, Route33Name + landmark 68, 124, AzaleaTownName + landmark 70, 122, SlowpokeWellName + landmark 52, 120, IlexForestName + landmark 52, 112, Route34Name + landmark 52, 92, GoldenrodCityName + landmark 50, 92, RadioTowerName + landmark 52, 76, Route35Name + landmark 52, 60, NationalParkName + landmark 64, 60, Route36Name + landmark 68, 52, Route37Name + landmark 68, 44, EcruteakCityName + landmark 70, 42, TinTowerName + landmark 66, 42, BurnedTowerName + landmark 52, 44, Route38Name + landmark 36, 48, Route39Name + landmark 36, 60, OlivineCityName + landmark 38, 62, LighthouseName + landmark 28, 56, BattleTowerName + landmark 28, 64, Route40Name + landmark 28, 92, WhirlIslandsName + landmark 28, 100, Route41Name + landmark 20, 100, CianwoodCityName + landmark 92, 44, Route42Name + landmark 84, 44, MtMortarName + landmark 108, 44, MahoganyTownName + landmark 108, 36, Route43Name + landmark 108, 28, LakeOfRageName + landmark 120, 44, Route44Name + landmark 130, 38, IcePathName + landmark 132, 44, BlackthornCityName + landmark 132, 36, DragonsDenName + landmark 132, 64, Route45Name + landmark 112, 72, DarkCaveName + landmark 124, 88, Route46Name + landmark 148, 68, SilverCaveName + landmark 52, 108, PalletTownName + landmark 52, 92, Route1Name + landmark 52, 76, ViridianCityName + landmark 52, 64, Route2Name + landmark 52, 52, PewterCityName + landmark 64, 52, Route3Name + landmark 76, 52, MtMoonName + landmark 88, 52, Route4Name + landmark 100, 52, CeruleanCityName + landmark 100, 44, Route24Name + landmark 108, 36, Route25Name + landmark 100, 60, Route5Name + landmark 108, 76, UndergroundName + landmark 100, 76, Route6Name + landmark 100, 84, VermilionCityName + landmark 88, 60, DiglettsCaveName + landmark 88, 68, Route7Name + landmark 116, 68, Route8Name + landmark 116, 52, Route9Name + landmark 132, 52, RockTunnelName + landmark 132, 56, Route10Name + landmark 132, 60, PowerPlantName + landmark 132, 68, LavenderTownName + landmark 140, 68, LavRadioTowerName + landmark 76, 68, CeladonCityName + landmark 100, 68, SaffronCityName + landmark 116, 84, Route11Name + landmark 132, 80, Route12Name + landmark 124, 100, Route13Name + landmark 116, 112, Route14Name + landmark 104, 116, Route15Name + landmark 68, 68, Route16Name + landmark 68, 92, Route17Name + landmark 80, 116, Route18Name + landmark 92, 116, FuchsiaCityName + landmark 92, 128, Route19Name + landmark 76, 132, Route20Name + landmark 68, 132, SeafoamIslandsName + landmark 52, 132, CinnabarIslandName + landmark 52, 120, Route21Name + landmark 36, 68, Route22Name + landmark 28, 52, VictoryRoadName + landmark 28, 44, Route23Name + landmark 28, 36, IndigoPlateauName + landmark 28, 92, Route26Name + landmark 20, 100, Route27Name + landmark 12, 100, TohjoFallsName + landmark 20, 68, Route28Name + landmark 140, 116, FastShipName NewBarkTownName: db "NEW BARK¯TOWN@" CherrygroveCityName: db "CHERRYGROVE¯CITY@" diff --git a/data/maps/map_data.asm b/data/maps/map_data.asm index 2e1b7c618..15ff249fe 100644 --- a/data/maps/map_data.asm +++ b/data/maps/map_data.asm @@ -6,7 +6,6 @@ SECTION "Maps", ROMX INCLUDE "data/maps/maps.asm" INCLUDE "data/maps/attributes.asm" - INCLUDE "data/maps/blocks.asm" INCLUDE "data/maps/scripts.asm" diff --git a/data/maps/maps.asm b/data/maps/maps.asm index e86cef4c4..1cc528738 100644 --- a/data/maps/maps.asm +++ b/data/maps/maps.asm @@ -43,7 +43,6 @@ MapGroupPointers:: dw MapGroup_Saffron ; 25 dw MapGroup_Cherrygrove ; 26 - MapGroup_Olivine: map OlivinePokecenter1F, TILESET_POKECENTER, INDOOR, OLIVINE_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE map OlivineGym, TILESET_CHAMPIONS_ROOM, INDOOR, OLIVINE_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE diff --git a/data/maps/outdoor_sprites.asm b/data/maps/outdoor_sprites.asm index c7e30114a..03f4076f9 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,8 @@ OutdoorSprites: ; 144b8 dw NewBarkGroupSprites dw SaffronGroupSprites dw CherrygroveGroupSprites -; 144ec - -PalletGroupSprites: ; 144ec +PalletGroupSprites: db SPRITE_SUICUNE db SPRITE_SILVER_TROPHY db SPRITE_FAMICOM @@ -56,9 +54,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 +79,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 +104,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 +129,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 +154,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 +179,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 +204,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 +229,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 +254,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 +279,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 +304,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 +329,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 +354,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 +379,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 +404,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 +429,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 +454,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 +479,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 +504,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 +529,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 +554,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 +579,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 +604,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 +629,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 +654,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 +667,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..9ac3e8d07 100644 --- a/data/maps/spawn_points.asm +++ b/data/maps/spawn_points.asm @@ -4,7 +4,7 @@ spawn: MACRO db \2, \3 ENDM -SpawnPoints: ; 0x152ab +SpawnPoints: ; entries correspond to SPAWN_* constants spawn PLAYERS_HOUSE_2F, 3, 3 @@ -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..95518af3d 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,39 +4733,36 @@ 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_sound 0, 1, SFX_TOXIC anim_obj ANIM_OBJ_1A, 132, 72, $0 anim_wait 8 - anim_sound 0, 1, SFX_UNKNOWN_7F + anim_sound 0, 1, SFX_TOXIC anim_obj ANIM_OBJ_1A, 116, 72, $0 anim_wait 8 - anim_sound 0, 1, SFX_UNKNOWN_7F + anim_sound 0, 1, SFX_TOXIC anim_obj ANIM_OBJ_1A, 148, 72, $0 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/critical_hit_moves.asm b/data/moves/critical_hit_moves.asm new file mode 100644 index 000000000..4a4730574 --- /dev/null +++ b/data/moves/critical_hit_moves.asm @@ -0,0 +1,9 @@ +CriticalHitMoves: + db KARATE_CHOP + db RAZOR_WIND + db RAZOR_LEAF + db CRABHAMMER + db SLASH + db AEROBLAST + db CROSS_CHOP + db -1 diff --git a/data/moves/descriptions.asm b/data/moves/descriptions.asm index d86ceea37..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: @@ -836,6 +835,7 @@ LovelyKissDescription: SkyAttackDescription: db "1st turn: Prepare" next "2nd turn: Attack@" + TransformDescription: db "The user assumes" next "the foe's guise.@" @@ -1267,4 +1267,3 @@ WhirlpoolDescription: BeatUpDescription: db "Party #MON join" next "in the attack.@" -; 2ed44 diff --git a/data/moves/effects.asm b/data/moves/effects.asm index eeb02b3a1..81bd89f5f 100644 --- a/data/moves/effects.asm +++ b/data/moves/effects.asm @@ -1,4 +1,6 @@ -MoveEffects: ; 2732e +INCLUDE "data/moves/effects_pointers.asm" + +MoveEffects: ; used only for BANK(MoveEffects) NormalHit: checkobedience 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/battle/metronome_exception_moves.asm b/data/moves/metronome_exception_moves.asm index e9cd7f860..a5aa44132 100644 --- a/data/battle/metronome_exception_moves.asm +++ b/data/moves/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/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..b488f4eb1 100644 --- a/data/party_menu_qualities.asm +++ b/data/party_menu_qualities.asm @@ -18,8 +18,7 @@ endr db -1 ; end ENDM - -PartyMenuQualityPointers: ; 503b2 +PartyMenuQualityPointers: ; entries correspond to PARTYMENUACTION_* constants dw .Default ; PARTYMENUACTION_CHOOSE_POKEMON dw .Default ; PARTYMENUACTION_HEALING_ITEM @@ -31,11 +30,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..1792c506a 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 @@ -12,5 +12,4 @@ NonTrainerCallerNames: ; 903d6 .bill: db "BILL:@" .elm: db "PROF.ELM:@" .bikeshop: db "BIKE SHOP:@" -.buena: db "BUENA:<LNBRK> DISC JOCKEY@" -; 90423 +.buena: db "BUENA:<LF> DISC JOCKEY@" 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/phone/text/bill.asm b/data/phone/text/bill.asm index 899e0c742..0db92c198 100644 --- a/data/phone/text/bill.asm +++ b/data/phone/text/bill.asm @@ -1,4 +1,4 @@ -BillPhoneMornGreetingText: ; 0x1b4427 +BillPhoneMornGreetingText: text "Good morning!" para "This is the #-" @@ -8,7 +8,7 @@ BillPhoneMornGreetingText: ; 0x1b4427 line "SERVICE." done -BillPhoneDayGreetingText: ; 0x1b4470 +BillPhoneDayGreetingText: text "Good day!" para "This is the #-" @@ -18,7 +18,7 @@ BillPhoneDayGreetingText: ; 0x1b4470 line "SERVICE." done -BillPhoneNiteGreetingText: ; 0x1b44b5 +BillPhoneNiteGreetingText: text "Good evening!" para "This is the #-" @@ -28,7 +28,7 @@ BillPhoneNiteGreetingText: ; 0x1b44b5 line "SERVICE." done -BillPhoneGenericText: ; 0x1b44fe +BillPhoneGenericText: text "Who's calling?" para "<PLAY_G>, is it?" @@ -38,7 +38,7 @@ BillPhoneGenericText: ; 0x1b44fe line $56 done -BillPhoneNotFullText: ; 0x1b452a +BillPhoneNotFullText: text "Thanks for" line "waiting!" @@ -52,7 +52,7 @@ BillPhoneNotFullText: ; 0x1b452a line "fill it up!" done -BillPhoneNearlyFullText: ; 0x1b4587 +BillPhoneNearlyFullText: text "Thanks for" line "waiting!" @@ -66,7 +66,7 @@ BillPhoneNearlyFullText: ; 0x1b4587 line "switch your BOX." done -BillPhoneFullText: ; 0x1b45ed +BillPhoneFullText: text "Thanks for" line "waiting!" @@ -80,7 +80,7 @@ BillPhoneFullText: ; 0x1b45ed line "more #MON." done -BillPhoneNewlyFullText: ; 0x1b4652 +BillPhoneNewlyFullText: text "Hi, <PLAY_G>?" line "It's me, BILL!" diff --git a/data/phone/text/buena.asm b/data/phone/text/buena.asm index d3df60110..951a0a9b8 100644 --- a/data/phone/text/buena.asm +++ b/data/phone/text/buena.asm @@ -1,4 +1,4 @@ -UnknownText_0xa0c28: ; 0xa0c28 +UnknownText_0xa0c28: text "Hi, this is BUENA…" para "Oh! Good morning," @@ -7,18 +7,16 @@ UnknownText_0xa0c28: ; 0xa0c28 para "I'm kind of foggy" line "in the morning…" done -; 0xa0c72 -UnknownText_0xa0c72: ; 0xa0c72 +UnknownText_0xa0c72: text "Hi, this is BUENA…" line "Oh! Hi, <PLAY_G>!" para "Do you tune into" line "BUENA's show?" done -; 0xa0caf -UnknownText_0xa0caf: ; 0xa0caf +UnknownText_0xa0caf: text "This is BUENA." line "I can't come to" @@ -34,9 +32,8 @@ UnknownText_0xa0caf: ; 0xa0caf para "give me a call" line "after midnight!" done -; 0xa0d42 -UnknownText_0xa0d42: ; 0xa0d42 +UnknownText_0xa0d42: text "Hi, this is BUENA…" line "Oh! Hi, <PLAY_G>!" @@ -46,45 +43,40 @@ UnknownText_0xa0d42: ; 0xa0d42 para "Let me tell you," line "I'm exhausted!" done -; 0xa0d96 -UnknownText_0xa0d96: ; 0xa0d96 +UnknownText_0xa0d96: text "<PLAY_G>!" line "Hi, it's BUENA!" para "I got up early, so" line "I decided to call!" done -; 0xa0dcf -UnknownText_0xa0dcf: ; 0xa0dcf +UnknownText_0xa0dcf: text "<PLAY_G>!" line "Hi, it's BUENA!" para "I needed someone" line "to chat with!" done -; 0xa0e01 -UnknownText_0xa0e01: ; 0xa0e01 +UnknownText_0xa0e01: text "<PLAY_G>!" line "Hi, it's BUENA!" para "I'm just on my" line "break." done -; 0xa0e29 -UnknownText_0xa0e29: ; 0xa0e29 +UnknownText_0xa0e29: text "<PLAY_G>!" line "Hi, it's BUENA!" para "I couldn't sleep," line "so I called you." done -; 0xa0e5e -UnknownText_0xa0e5e: ; 0xa0e5e +UnknownText_0xa0e5e: text "Oh. Hi, <PLAY_G>!" para "You are how?" @@ -101,9 +93,8 @@ UnknownText_0xa0e5e: ; 0xa0e5e para "<PLAY_G>, you'd" line "better be careful!" done -; 0xa0efb -UnknownText_0xa0efb: ; 0xa0efb +UnknownText_0xa0efb: text "The other day, I" line "went out to eat" @@ -125,9 +116,8 @@ UnknownText_0xa0efb: ; 0xa0efb para "show! I'll catch" line "you later!" done -; 0xa0fcf -UnknownText_0xa0fcf: ; 0xa0fcf +UnknownText_0xa0fcf: text "You know the" line "receptionist at" cont "the RADIO TOWER?" @@ -149,9 +139,8 @@ UnknownText_0xa0fcf: ; 0xa0fcf para "Catch you later!" done -; 0xa109d -UnknownText_0xa109d: ; 0xa109d +UnknownText_0xa109d: text "Tell me, <PLAY_G>." line "Have you ever won" @@ -167,9 +156,8 @@ UnknownText_0xa109d: ; 0xa109d para "Let's chat again!" done -; 0xa1143 -UnknownText_0xa1143: ; 0xa1143 +UnknownText_0xa1143: text "You know, last" line "night…" @@ -198,9 +186,8 @@ UnknownText_0xa1143: ; 0xa1143 para "Uh… Um… I… Sorry," line "wrong number!" done -; 0xa1244 -UnknownText_0xa1244: ; 0xa1244 +UnknownText_0xa1244: text "Yesterday, PROF." line "OAK was in the" @@ -221,9 +208,8 @@ UnknownText_0xa1244: ; 0xa1244 para "Catch you later!" done -; 0xa1318 -UnknownText_0xa1318: ; 0xa1318 +UnknownText_0xa1318: text "…Cough, cough!" para "Uhm sorry uh got" @@ -242,9 +228,8 @@ UnknownText_0xa1318: ; 0xa1318 line "the fly. This has" cont "been BUENA!" done -; 0xa13d8 -UnknownText_0xa13d8: ; 0xa13d8 +UnknownText_0xa13d8: text "Hey, <PLAY_G>." line "You won that RADIO" @@ -263,9 +248,8 @@ UnknownText_0xa13d8: ; 0xa13d8 para "Well, let's chat" line "again!" done -; 0xa1488 -UnknownText_0xa1488: ; 0xa1488 +UnknownText_0xa1488: text "I'm elated that" line "more people are" @@ -298,9 +282,8 @@ UnknownText_0xa1488: ; 0xa1488 para "Let's chat again!" done -; 0xa15de -UnknownText_0xa15de: ; 0xa15de +UnknownText_0xa15de: text "Guess what?" line "The RADIO TOWER's" @@ -331,9 +314,8 @@ UnknownText_0xa15de: ; 0xa15de para "Later! Tune into" line "my show!" done -; 0xa1717 -UnknownText_0xa1717: ; 0xa1717 +UnknownText_0xa1717: text "<PLAY_G>, tell me." para "When do you relax" @@ -364,9 +346,8 @@ UnknownText_0xa1717: ; 0xa1717 para "Please forget this" line "happened! Later!" done -; 0xa183d -UnknownText_0xa183d: ; 0xa183d +UnknownText_0xa183d: text "<PLAY_G>, what was" line "the first #MON" cont "you ever caught?" @@ -405,9 +386,8 @@ UnknownText_0xa183d: ; 0xa183d para "Bye-bye!" done -; 0xa19b1 -UnknownText_0xa19b1: ; 0xa19b1 +UnknownText_0xa19b1: text "Guess what? All of" line "us from the RADIO" @@ -434,9 +414,8 @@ UnknownText_0xa19b1: ; 0xa19b1 para "Bye-bye!" done -; 0xa1ac0 -UnknownText_0xa1ac0: ; 0xa1ac0 +UnknownText_0xa1ac0: text "Did you know…?" para "BEN and FERN talk" @@ -465,9 +444,8 @@ UnknownText_0xa1ac0: ; 0xa1ac0 para "Let's chat again!" done -; 0xa1bed -UnknownText_0xa1bed: ; 0xa1bed +UnknownText_0xa1bed: text "I'm going shopping" line "with MARY and LILY" cont "soon." @@ -483,9 +461,8 @@ UnknownText_0xa1bed: ; 0xa1bed para "Catch you later!" done -; 0xa1c88 -UnknownText_0xa1c88: ; 0xa1c88 +UnknownText_0xa1c88: text "I'm thinking of" line "going to the GAME" @@ -506,9 +483,8 @@ UnknownText_0xa1c88: ; 0xa1c88 para "Catch you later!" done -; 0xa1d5f -UnknownText_0xa1d5f: ; 0xa1d5f +UnknownText_0xa1d5f: text "Hey, <PLAY_G>. You" line "use your #GEAR" @@ -530,9 +506,8 @@ UnknownText_0xa1d5f: ; 0xa1d5f para "Anyway, thanks for" line "calling! Later!" done -; 0xa1e2f -UnknownText_0xa1e2f: ; 0xa1e2f +UnknownText_0xa1e2f: text "Is it sunny" line "outside today?" @@ -547,4 +522,3 @@ UnknownText_0xa1e2f: ; 0xa1e2f para "Please call again!" done -; 0xa1eca diff --git a/data/phone/text/elm.asm b/data/phone/text/elm.asm index cea36061f..0e4dc5bc3 100644 --- a/data/phone/text/elm.asm +++ b/data/phone/text/elm.asm @@ -1,4 +1,4 @@ -ElmPhoneStartText: ; 0x1b46fc +ElmPhoneStartText: text "Hello, <PLAY_G>?" para "Try not to overdo" @@ -9,7 +9,7 @@ ElmPhoneStartText: ; 0x1b46fc cont "they are hurt." done -ElmPhoneSawMrPokemonText: ; 0x1b4749 +ElmPhoneSawMrPokemonText: text "Hello, <PLAY_G>?" para "Did you meet MR." @@ -17,7 +17,7 @@ ElmPhoneSawMrPokemonText: ; 0x1b4749 cont "Come back safely!" done -ElmPhonePokemonStolenText: ; 0x1b4784 +ElmPhonePokemonStolenText: text "<PLAY_G>? I'm very" line "upset now." @@ -28,7 +28,7 @@ ElmPhonePokemonStolenText: ; 0x1b4784 line "do that?" done -ElmPhoneCheckingEggText: ; 0x1b47d5 +ElmPhoneCheckingEggText: text "Hello, <PLAY_G>?" para "We're checking the" @@ -38,7 +38,7 @@ ElmPhoneCheckingEggText: ; 0x1b47d5 line "#MON EGG." done -ElmPhoneAssistantText: ; 0x1b481c +ElmPhoneAssistantText: text "Hello, <PLAY_G>?" para "Did you see my" @@ -48,7 +48,7 @@ ElmPhoneAssistantText: ; 0x1b481c line "in VIOLET CITY." done -ElmPhoneEggUnhatchedText: ; 0x1b4868 +ElmPhoneEggUnhatchedText: text "Hello, <PLAY_G>?" para "How's the EGG? Has" @@ -58,7 +58,7 @@ ElmPhoneEggUnhatchedText: ; 0x1b4868 line "pens, please call." done -ElmPhoneEggHatchedText: ; 0x1b48bb +ElmPhoneEggHatchedText: text "Hello, <PLAY_G>?" line "How is the EGG?" @@ -70,7 +70,7 @@ ElmPhoneEggHatchedText: ; 0x1b48bb line "me now!" done -ElmPhoneDiscovery1Text: ; 0x1b491f +ElmPhoneDiscovery1Text: text "Hello, <PLAY_G>?" para "I just made a new" @@ -83,7 +83,7 @@ ElmPhoneDiscovery1Text: ; 0x1b491f line "the #MON." done -ElmPhoneDiscovery2Text: ; 0x1b4982 +ElmPhoneDiscovery2Text: text "Hello, <PLAY_G>?" para "It's still a" @@ -96,7 +96,7 @@ ElmPhoneDiscovery2Text: ; 0x1b4982 line "ing that now." done -ElmPhonePokerusText: ; 0x1b49e7 +ElmPhonePokerusText: text "Hello, <PLAY_G>?" para "I discovered an" @@ -129,7 +129,7 @@ ElmPhonePokerusText: ; 0x1b49e7 cont "about. Bye!" done -ElmPhoneDisasterText: ; 0x1b4b17 +ElmPhoneDisasterText: text "H-hello? <PLAY_G>?" line "It's a disaster!" @@ -143,7 +143,7 @@ ElmPhoneDisasterText: ; 0x1b4b17 line "here now!" done -ElmPhoneEggAssistantText: ; 0x1b4b87 +ElmPhoneEggAssistantText: text "Hello, <PLAY_G>? We" line "discovered some-" @@ -158,7 +158,7 @@ ElmPhoneEggAssistantText: ; 0x1b4b87 cont "him?" done -ElmPhoneRocketText: ; 0x1b4c06 +ElmPhoneRocketText: text "<PLAY_G>, how are" line "things going?" @@ -185,7 +185,7 @@ ElmPhoneRocketText: ; 0x1b4c06 line "Take care!" done -ElmPhoneGiftText: ; 0x1b4d09 +ElmPhoneGiftText: text "Hello, <PLAY_G>?" para "I have something" @@ -197,7 +197,7 @@ ElmPhoneGiftText: ; 0x1b4d09 para "See you later!" done -ElmPhoneUnusedText: ; 0x1b4d5d +ElmPhoneUnusedText: text "Hello, <PLAY_G>?" line "How's it going?" diff --git a/data/phone/text/extra.asm b/data/phone/text/extra.asm index b4ae1d0c5..101f46ba9 100644 --- a/data/phone/text/extra.asm +++ b/data/phone/text/extra.asm @@ -1,13 +1,12 @@ -UnknownText_0x64000: ; 0x64000 +UnknownText_0x64000: text "I hate having to" line "hang up on you!" para "Call you later!" done -; 0x64032 -UnknownText_0x64032: ; 0x64032 +UnknownText_0x64032: text "<PLAY_G>, have you" line "heard?" @@ -20,9 +19,8 @@ UnknownText_0x64032: ; 0x64032 para "…Um… What's TEAM" line "ROCKET?" done -; 0x64099 -UnknownText_0x64099: ; 0x64099 +UnknownText_0x64099: text "<PLAY_G>, I heard!" para "You defeated that" @@ -31,9 +29,8 @@ UnknownText_0x64099: ; 0x64099 para "It makes me proud" line "to be your friend!" done -; 0x640e6 -UnknownText_0x640e6: ; 0x640e6 +UnknownText_0x640e6: text "Hey, I heard about" line "you!" @@ -49,9 +46,8 @@ UnknownText_0x640e6: ; 0x640e6 para "when I'm sick in" line "bed with a cold!" done -; 0x6416d -UnknownText_0x6416d: ; 0x6416d +UnknownText_0x6416d: text "I heard, I heard," line "I heard!" @@ -64,9 +60,8 @@ UnknownText_0x6416d: ; 0x6416d para "But um… What was" line "TEAM ROCKET?" done -; 0x641e8 -UnknownText_0x641e8: ; 0x641e8 +UnknownText_0x641e8: text "I heard, I heard," line "I heard!" @@ -76,9 +71,8 @@ UnknownText_0x641e8: ; 0x641e8 para "RADIO TOWER! You" line "rock so hard!" done -; 0x64247 -UnknownText_0x64247: ; 0x64247 +UnknownText_0x64247: text "I saw, I saw!" para "I saw you go into" @@ -90,9 +84,8 @@ UnknownText_0x64247: ; 0x64247 para "need to be modest!" line "You can't fail!" done -; 0x642bb -UnknownText_0x642bb: ; 0x642bb +UnknownText_0x642bb: text "Yesterday, I went" line "out to NEW BARK" @@ -120,9 +113,8 @@ UnknownText_0x642bb: ; 0x642bb para "if I were your" line "mom, believe me!" done -; 0x643d4 -UnknownText_0x643d4: ; 0x643d4 +UnknownText_0x643d4: text "I saw, I saw," line "I saw!" @@ -135,9 +127,8 @@ UnknownText_0x643d4: ; 0x643d4 para "with the sea as" line "your backdrop!" done -; 0x64448 -UnknownText_0x64448: ; 0x64448 +UnknownText_0x64448: text "I heard, I heard!" para "You got a MAGNET" @@ -164,9 +155,8 @@ UnknownText_0x64448: ; 0x64448 para "What do you mean" line "by FLY?" done -; 0x6455b -UnknownText_0x6455b: ; 0x6455b +UnknownText_0x6455b: text "I saw, I saw!" para "You waking up" @@ -184,9 +174,8 @@ UnknownText_0x6455b: ; 0x6455b para "Wow! That's like" line "magic!" done -; 0x645ff -UnknownText_0x645ff: ; 0x645ff +UnknownText_0x645ff: text "I hear rumors" line "about you all over" cont "the place." @@ -203,18 +192,16 @@ UnknownText_0x645ff: ; 0x645ff para "I'll always be" line "cheering you on!" done -; 0x646a3 -IrwinCalledRightAwayText: ; 0x646a3 +IrwinCalledRightAwayText: text "Hehe, I called" line "right away!" para "I think we can be" line "good friends!" done -; 0x646df -UnknownText_0x646df: ; 0x646df +UnknownText_0x646df: text "I saw, I heard!" para "You beat MORTY of" @@ -238,9 +225,8 @@ UnknownText_0x646df: ; 0x646df para "chickened out and" line "took off for home…" done -; 0x647d8 -UnknownText_0x647d8: ; 0x647d8 +UnknownText_0x647d8: text "<PLAY_G>, I heard!" para "You're kicking up" @@ -254,18 +240,16 @@ UnknownText_0x647d8: ; 0x647d8 para "You so rock!" done -; 0x64846 -UnknownText_0x64846: ; 0x64846 +UnknownText_0x64846: text "Hearing about your" line "escapades rocks my" para "soul!" line "It sure does!" done -; 0x64881 -UnknownText_0x64881: ; 0x64881 +UnknownText_0x64881: text "I'm so glad you" line "called!" @@ -275,9 +259,8 @@ UnknownText_0x64881: ; 0x64881 para "I guess we must be" line "a good match!" done -; 0x648dc -UnknownText_0x648dc: ; 0x648dc +UnknownText_0x648dc: text "How are you?" para "What are you" @@ -305,9 +288,8 @@ UnknownText_0x648dc: ; 0x648dc para "chat about! This" line "is going nowhere!" done -; 0x649dc -ArnieLovesTheCuteText: ; 0x649dc +ArnieLovesTheCuteText: text "I'm always with my" line "@" text_from_ram wStringBuffer4 @@ -316,9 +298,8 @@ ArnieLovesTheCuteText: ; 0x649dc para "It's so cute!" line "I just love it!" done -; 0x64a13 -UnknownText_0x64a13: ; 0x64a13 +UnknownText_0x64a13: text "Changing the topic" line "here, I saw this" @@ -330,9 +311,8 @@ UnknownText_0x64a13: ; 0x64a13 para "It was easy to" line "beat, actually." done -; 0x64a71 -UnknownText_0x64a71: ; 0x64a71 +UnknownText_0x64a71: text "I was wondering," line "do you happen to" cont "have @" @@ -345,9 +325,8 @@ UnknownText_0x64a71: ; 0x64a71 para "its weakness, I" line "wonder." done -; 0x64ada -UnknownText_0x64ada: ; 0x64ada +UnknownText_0x64ada: text "Hey, let's battle" line "our #MON!" @@ -362,15 +341,13 @@ UnknownText_0x64ada: ; 0x64ada text_from_ram wStringBuffer5 text "!" done -; 0x64b48 -UnknownText_0x64b48: ; 0x64b48 +UnknownText_0x64b48: text "Let's talk again," line "huh?" done -; 0x64b5f -UnknownText_0x64b5f: ; 0x64b5f +UnknownText_0x64b5f: text "Boy, am I glad I" line "caught you!" @@ -387,9 +364,8 @@ UnknownText_0x64b5f: ; 0x64b5f para "You have to see" line "this!" done -; 0x64bc6 -UnknownText_0x64bc6: ; 0x64bc6 +UnknownText_0x64bc6: text "I haven't had any" line "luck seeing rare" cont "#MON lately…" @@ -397,9 +373,8 @@ UnknownText_0x64bc6: ; 0x64bc6 para "But I know they're" line "out there!" done -; 0x64c13 -UnknownText_0x64c13: ; 0x64c13 +UnknownText_0x64c13: text "Hey, where are you" line "now?" @@ -409,9 +384,8 @@ UnknownText_0x64c13: ; 0x64c13 text_from_ram wStringBuffer5 text "!" done -; 0x64c5a -UnknownText_0x64c5a: ; 0x64c5a +UnknownText_0x64c5a: text "Hello? Are you" line "coming or what?" @@ -421,9 +395,8 @@ UnknownText_0x64c5a: ; 0x64c5a para "Get down to ROUTE" line "35 right now!" done -; 0x64cbd -AlanGettingStrongerText: ; 0x64cbd +AlanGettingStrongerText: text "My @" text_from_ram wStringBuffer4 text "'s" @@ -432,9 +405,8 @@ AlanGettingStrongerText: ; 0x64cbd para "exactly as I" line "calculated!" done -; 0x64cf3 -UnknownText_0x64cf3: ; 0x64cf3 +UnknownText_0x64cf3: text "By the way, we" line "knocked out a wild" @@ -446,9 +418,8 @@ UnknownText_0x64cf3: ; 0x64cf3 para "Studying up in" line "advance worked!" done -; 0x64d4f -UnknownText_0x64d4f: ; 0x64d4f +UnknownText_0x64d4f: text "By the way, a wild" line "@" text_from_ram wStringBuffer4 @@ -458,9 +429,8 @@ UnknownText_0x64d4f: ; 0x64d4f para "A computational" line "error on my part…" done -; 0x64da4 -UnknownText_0x64da4: ; 0x64da4 +UnknownText_0x64da4: text "I've studied quite" line "a bit since then," @@ -475,14 +445,12 @@ UnknownText_0x64da4: ; 0x64da4 para "Can you come down" line "for a battle?" done -; 0x64e1f -UnknownText_0x64e1f: ; 0x64e1f +UnknownText_0x64e1f: text "See you later!" done -; 0x64e2f -UnknownText_0x64e2f: ; 0x64e2f +UnknownText_0x64e2f: text "Hehehe, I picked" line "up something nice!" @@ -494,18 +462,16 @@ UnknownText_0x64e2f: ; 0x64e2f text_start line "and pick it up?" done -; 0x64e90 -UnknownText_0x64e90: ; 0x64e90 +UnknownText_0x64e90: text "I haven't picked" line "up anything yet." para "I'll call you if I" line "find something." done -; 0x64ed4 -UnknownText_0x64ed4: ; 0x64ed4 +UnknownText_0x64ed4: text "If we don't battle" line "soon, I'll forget" cont "my strategy!" @@ -515,9 +481,8 @@ UnknownText_0x64ed4: ; 0x64ed4 text_from_ram wStringBuffer5 text "!" done -; 0x64f1a -UnknownText_0x64f1a: ; 0x64f1a +UnknownText_0x64f1a: text "I have to do my" line "homework, so can" @@ -529,9 +494,8 @@ UnknownText_0x64f1a: ; 0x64f1a text_from_ram wStringBuffer5 text "!" done -; 0x64f74 -UnknownText_0x64f74: ; 0x64f74 +UnknownText_0x64f74: text "My @" text_from_ram wStringBuffer4 text " is" @@ -540,9 +504,8 @@ UnknownText_0x64f74: ; 0x64f74 para "I've been taking" line "photos galore!" done -; 0x64fb2 -UnknownText_0x64fb2: ; 0x64fb2 +UnknownText_0x64fb2: text "It took only an" line "instant to KO a" cont "wild @" @@ -555,9 +518,8 @@ UnknownText_0x64fb2: ; 0x64fb2 para "battling tips last" line "time." done -; 0x6501c -UnknownText_0x6501c: ; 0x6501c +UnknownText_0x6501c: text "You know what?" line "A wild @" text_from_ram wStringBuffer4 @@ -571,9 +533,8 @@ UnknownText_0x6501c: ; 0x6501c para "little bit more," line "and I would've…" done -; 0x65091 -UnknownText_0x65091: ; 0x65091 +UnknownText_0x65091: text "Right now, I'm on" line "@" text_from_ram wStringBuffer5 @@ -585,14 +546,12 @@ UnknownText_0x65091: ; 0x65091 para "I'll be waiting" line "for you!" done -; 0x650e2 -UnknownText_0x650e2: ; 0x650e2 +UnknownText_0x650e2: text "See you!" done -; 0x650ec -UnknownText_0x650ec: ; 0x650ec +UnknownText_0x650ec: text "You know what?" line "I got a good gift!" @@ -607,9 +566,8 @@ UnknownText_0x650ec: ; 0x650ec text_from_ram wStringBuffer5 text "!" done -; 0x65161 -UnknownText_0x65161: ; 0x65161 +UnknownText_0x65161: text "Oh! You wanted a" line "gift, right?" @@ -619,9 +577,8 @@ UnknownText_0x65161: ; 0x65161 para "Can you wait a bit" line "longer?" done -; 0x651bf -UnknownText_0x651bf: ; 0x651bf +UnknownText_0x651bf: text "Hi! You haven't" line "forgotten about" @@ -633,9 +590,8 @@ UnknownText_0x651bf: ; 0x651bf text_from_ram wStringBuffer5 text "!" done -; 0x6520f -UnknownText_0x6520f: ; 0x6520f +UnknownText_0x6520f: text "Hello?" para "If you don't come" @@ -649,9 +605,8 @@ UnknownText_0x6520f: ; 0x6520f text_from_ram wStringBuffer5 text "!" done -; 0x65271 -ChadObservingWildText: ; 0x65271 +ChadObservingWildText: text "I recently began" line "observing wild" cont "@" @@ -670,9 +625,8 @@ ChadObservingWildText: ; 0x65271 para "researcher like" line "PROF.OAK soon." done -; 0x65318 -UnknownText_0x65318: ; 0x65318 +UnknownText_0x65318: text "Oh yes, I managed" line "to knock out a" @@ -687,9 +641,8 @@ UnknownText_0x65318: ; 0x65318 para "do every day, it" line "was inevitable." done -; 0x65399 -UnknownText_0x65399: ; 0x65399 +UnknownText_0x65399: text "Oh yes, I came" line "close to catching" @@ -706,9 +659,8 @@ UnknownText_0x65399: ; 0x65399 text_from_ram wStringBuffer4 text ". Rats…" done -; 0x65419 -UnknownText_0x65419: ; 0x65419 +UnknownText_0x65419: text "Want to battle?" line "I have to battle" @@ -720,14 +672,12 @@ UnknownText_0x65419: ; 0x65419 text_from_ram wStringBuffer5 text "!" done -; 0x65471 -UnknownText_0x65471: ; 0x65471 +UnknownText_0x65471: text "See you later!" done -; 0x65481 -ChadBlueGossipText: ; 0x65481 +ChadBlueGossipText: text "Do you know BLUE?" para "He's PROF.OAK's" @@ -739,9 +689,8 @@ ChadBlueGossipText: ; 0x65481 para "He's one super" line "#MON trainer!" done -; 0x654ea -ChadDaisyGossipText: ; 0x654ea +ChadDaisyGossipText: text "PROF.OAK has a" line "granddaughter" cont "named DAISY." @@ -752,9 +701,8 @@ ChadDaisyGossipText: ; 0x654ea para "ferocious #MON" line "calm right down." done -; 0x65555 -ChadProfElmGossipText: ; 0x65555 +ChadProfElmGossipText: text "Everyone's talking" line "about PROF.ELM." @@ -765,9 +713,8 @@ ChadProfElmGossipText: ; 0x65555 para "That is so cool!" line "I envy him!" done -; 0x655c7 -ChadDreamGossipText: ; 0x655c7 +ChadDreamGossipText: text "PROF.OAK's dream" line "is to compile a" @@ -778,9 +725,8 @@ ChadDreamGossipText: ; 0x655c7 line "taking part in" cont "that project…" done -; 0x65628 -ChadKurtGossipText: ; 0x65628 +ChadKurtGossipText: text "Do you know KURT," line "the BALL creator?" @@ -791,9 +737,8 @@ ChadKurtGossipText: ; 0x65628 line "people attract one" cont "another!" done -; 0x6569b -ChadLeagueGossipText: ; 0x6569b +ChadLeagueGossipText: text "#MON LEAGUE is" line "the great gather-" cont "ing place for all" @@ -810,9 +755,8 @@ ChadLeagueGossipText: ; 0x6569b para "He really is a" line "great man." done -; 0x6574a -ChadRadioShowGossipText: ; 0x6574a +ChadRadioShowGossipText: text "PROF.OAK'S #MON" line "TALK is a popular" cont "radio show, right?" @@ -830,9 +774,8 @@ ChadRadioShowGossipText: ; 0x6574a para "So we have MARY to" line "thank for it!" done -; 0x65810 -ChadBattlingGossipText: ; 0x65810 +ChadBattlingGossipText: text "PROF.OAK used to" line "be a trainer a" cont "long time ago." @@ -849,9 +792,8 @@ ChadBattlingGossipText: ; 0x65810 para "focus on becoming" line "a researcher." done -; 0x658c6 -ChadDaisyTeaGossipText: ; 0x658c6 +ChadDaisyTeaGossipText: text "PROF.OAK has a" line "granddaughter" cont "named DAISY." @@ -868,9 +810,8 @@ ChadDaisyTeaGossipText: ; 0x658c6 para "and chat about" line "PROF.OAK." done -; 0x65969 -ChadTravelGossipText: ; 0x65969 +ChadTravelGossipText: text "Did you know?" line "PROF.OAK traveled" @@ -889,18 +830,16 @@ ChadTravelGossipText: ; 0x65969 para "and learn about" line "things too…" done -; 0x65a23 -UnknownText_0x65a23: ; 0x65a23 +UnknownText_0x65a23: text "I'm going to study" line "hard so PROF.OAK" para "will make me his" line "assistant!" done -; 0x65a63 -UnknownText_0x65a63: ; 0x65a63 +UnknownText_0x65a63: text "Do you remember" line "about our battle?" @@ -912,9 +851,8 @@ UnknownText_0x65a63: ; 0x65a63 para "Hurry over--I'm" line "waiting." done -; 0x65ab2 -DerekCheekPincherText: ; 0x65ab2 +DerekCheekPincherText: text "Listen to this." line "My @" text_from_ram wStringBuffer4 @@ -927,9 +865,8 @@ DerekCheekPincherText: ; 0x65ab2 para "I must be special." done -; 0x65b29 -UnknownText_0x65b29: ; 0x65b29 +UnknownText_0x65b29: text "Oh, and recently," line "my PIKACHU beat a" cont "wild @" @@ -950,9 +887,8 @@ UnknownText_0x65b29: ; 0x65b29 para "My PIKACHU is the" line "greatest!" done -; 0x65bc8 -UnknownText_0x65bc8: ; 0x65bc8 +UnknownText_0x65bc8: text "Oh, and I saw a" line "wild @" text_from_ram wStringBuffer4 @@ -968,15 +904,13 @@ UnknownText_0x65bc8: ; 0x65bc8 para "cute. They're no" line "good otherwise." done -; 0x65c4e -UnknownText_0x65c4e: ; 0x65c4e +UnknownText_0x65c4e: text "Well, let's talk" line "again!" done -; 0x65c66 -DerekBugCatchingContestText: ; 0x65c66 +DerekBugCatchingContestText: text "Did you remember?" line "The Bug-Catching" cont "Contest is today." @@ -990,9 +924,8 @@ DerekBugCatchingContestText: ; 0x65c66 para "PIKACHU to show" line "off its cuteness." done -; 0x65cf9 -UnknownText_0x65cf9: ; 0x65cf9 +UnknownText_0x65cf9: text "I'd like you to" line "have a NUGGET." @@ -1003,9 +936,8 @@ UnknownText_0x65cf9: ; 0x65cf9 line "PIKACHU will love" cont "it too!" done -; 0x65d5c -UnknownText_0x65d5c: ; 0x65d5c +UnknownText_0x65d5c: text "How is your" line "PIKACHU doing?" @@ -1013,9 +945,8 @@ UnknownText_0x65d5c: ; 0x65d5c line "and brag about our" cont "PIKACHU!" done -; 0x65da6 -UnknownText_0x65da6: ; 0x65da6 +UnknownText_0x65da6: text "What's wrong?" para "I'm waiting on" @@ -1026,9 +957,8 @@ UnknownText_0x65da6: ; 0x65da6 para "Come pick this up" line "anytime." done -; 0x65de4 -TullyGrownText: ; 0x65de4 +TullyGrownText: text "My @" text_from_ram wStringBuffer4 text " has" @@ -1040,9 +970,8 @@ TullyGrownText: ; 0x65de4 para "caught it, but now" line "it's way bigger." done -; 0x65e42 -UnknownText_0x65e42: ; 0x65e42 +UnknownText_0x65e42: text "Oh yeah, I KO'd a" line "wild @" text_from_ram wStringBuffer4 @@ -1055,9 +984,8 @@ UnknownText_0x65e42: ; 0x65e42 line "can't tell over" cont "the phone…" done -; 0x65eac -UnknownText_0x65eac: ; 0x65eac +UnknownText_0x65eac: text "Oh yeah, I lost a" line "wild @" text_from_ram wStringBuffer4 @@ -1070,9 +998,8 @@ UnknownText_0x65eac: ; 0x65eac line "can't tell over" cont "the phone…" done -; 0x65f17 -UnknownText_0x65f17: ; 0x65f17 +UnknownText_0x65f17: text "We should get a" line "battle going!" @@ -1084,15 +1011,13 @@ UnknownText_0x65f17: ; 0x65f17 para "Swing by if you" line "have the time." done -; 0x65f6e -UnknownText_0x65f6e: ; 0x65f6e +UnknownText_0x65f6e: text "Well, I'll be" line "seeing you." done -; 0x65f88 -UnknownText_0x65f88: ; 0x65f88 +UnknownText_0x65f88: text "I picked up a good" line "little thing at" cont "the water's edge." @@ -1105,9 +1030,8 @@ UnknownText_0x65f88: ; 0x65f88 text_from_ram wStringBuffer5 text "." done -; 0x65ff2 -UnknownText_0x65ff2: ; 0x65ff2 +UnknownText_0x65ff2: text "Have I found" line "anything good?" @@ -1116,9 +1040,8 @@ UnknownText_0x65ff2: ; 0x65ff2 para "It's like fishing," line "you need patience." done -; 0x66043 -UnknownText_0x66043: ; 0x66043 +UnknownText_0x66043: text "Yup, TULLY here…" para "<PLAY_G>? What?" @@ -1129,9 +1052,8 @@ UnknownText_0x66043: ; 0x66043 text_from_ram wStringBuffer5 text "." done -; 0x66087 -UnknownText_0x66087: ; 0x66087 +UnknownText_0x66087: text "I've got something" line "good for you." @@ -1140,9 +1062,8 @@ UnknownText_0x66087: ; 0x66087 text_from_ram wStringBuffer5 text "." done -; 0x660be -BrentRareTradeText: ; 0x660be +BrentRareTradeText: text "Oh yeah, I got an" line "extremely rare" @@ -1155,9 +1076,8 @@ BrentRareTradeText: ; 0x660be para "Hehe, I'm keeping" line "it a secret!" done -; 0x6613c -UnknownText_0x6613c: ; 0x6613c +UnknownText_0x6613c: text "Oh yeah, I took" line "down this wild" @@ -1169,9 +1089,8 @@ UnknownText_0x6613c: ; 0x6613c para "enough to bother" line "catching." done -; 0x6618c -UnknownText_0x6618c: ; 0x6618c +UnknownText_0x6618c: text "Oh yeah, I saw a" line "rare #MON about" cont "an hour ago." @@ -1185,9 +1104,8 @@ UnknownText_0x6618c: ; 0x6618c para "Would BILL laugh" line "at my mistakes?" done -; 0x66214 -UnknownText_0x66214: ; 0x66214 +UnknownText_0x66214: text "You've got time" line "like usual, right?" @@ -1205,102 +1123,90 @@ UnknownText_0x66214: ; 0x66214 text_from_ram wStringBuffer5 text "." done -; 0x662a9 -UnknownText_0x662a9: ; 0x662a9 +UnknownText_0x662a9: text "So that's it then." done -; 0x662bc -UnknownText_0x662bc: ; 0x662bc +UnknownText_0x662bc: text "Did you know…?" line "BILL's father is" para "supposed to be a" line "great #MANIAC." done -; 0x662fc -UnknownText_0x662fc: ; 0x662fc +UnknownText_0x662fc: text "Did you know…?" line "Apparently BILL's" para "grandpa isn't a" line "#MANIAC." done -; 0x66335 -UnknownText_0x66335: ; 0x66335 +UnknownText_0x66335: text "Did you know…?" line "BILL's originally" cont "from GOLDENROD." done -; 0x66366 -UnknownText_0x66366: ; 0x66366 +UnknownText_0x66366: text "Did you know…?" line "BILL evidently" para "lives on ROUTE 25" line "in KANTO." done -; 0x663a1 -UnknownText_0x663a1: ; 0x663a1 +UnknownText_0x663a1: text "Did you know…?" line "ABRA was the first" para "#MON that BILL" line "ostensibly caught." done -; 0x663e6 -UnknownText_0x663e6: ; 0x663e6 +UnknownText_0x663e6: text "Did you know…?" line "BILL's younger" para "sister apparently" line "can't wink." done -; 0x66421 -UnknownText_0x66421: ; 0x66421 +UnknownText_0x66421: text "Did you know…?" line "BILL supposedly" para "hates milk and" line "can't drink it." done -; 0x6645f -UnknownText_0x6645f: ; 0x6645f +UnknownText_0x6645f: text "Did you know…?" line "Evidently, BILL" para "isn't very good at" line "battling." done -; 0x6649b -UnknownText_0x6649b: ; 0x6649b +UnknownText_0x6649b: text "Did you know…?" line "BILL appears to" para "like the lady at" line "the FLOWER SHOP." done -; 0x664dd -UnknownText_0x664dd: ; 0x664dd +UnknownText_0x664dd: text "Did you know…?" line "BILL's mother is" para "said to have been" line "a KIMONO GIRL." done -; 0x6651e -UnknownText_0x6651e: ; 0x6651e +UnknownText_0x6651e: text "You wanted to hear" line "about BILL?" @@ -1310,9 +1216,8 @@ UnknownText_0x6651e: ; 0x6651e para "I'll call when I" line "have time." done -; 0x66579 -UnknownText_0x66579: ; 0x66579 +UnknownText_0x66579: text "You want to see my" line "rare #MON." @@ -1321,9 +1226,8 @@ UnknownText_0x66579: ; 0x66579 text_from_ram wStringBuffer5 text "." done -; 0x665ad -UnknownText_0x665ad: ; 0x665ad +UnknownText_0x665ad: text "My @" text_from_ram wStringBuffer4 text "'s" @@ -1335,9 +1239,8 @@ UnknownText_0x665ad: ; 0x665ad para "with it--it's so" line "fluffy and warm!" done -; 0x66605 -UnknownText_0x66605: ; 0x66605 +UnknownText_0x66605: text "Oh, and we had to" line "battle a wild" @@ -1356,9 +1259,8 @@ UnknownText_0x66605: ; 0x66605 text_from_ram wStringBuffer4 text "!" done -; 0x66688 -UnknownText_0x66688: ; 0x66688 +UnknownText_0x66688: text "Oh, and we had to" line "battle a wild" @@ -1377,9 +1279,8 @@ UnknownText_0x66688: ; 0x66688 line "feeling protective" cont "of my CLEFAIRY." done -; 0x66730 -UnknownText_0x66730: ; 0x66730 +UnknownText_0x66730: text "I know this might" line "surprise you, but" @@ -1392,9 +1293,8 @@ UnknownText_0x66730: ; 0x66730 text_from_ram wStringBuffer5 text "." done -; 0x66796 -TiffanyItsAwfulText: ; 0x66796 +TiffanyItsAwfulText: text_from_ram wStringBuffer4 text "!" @@ -1409,14 +1309,12 @@ TiffanyItsAwfulText: ; 0x66796 para "I have to go!" line "Bye-bye!" done -; 0x667f7 -UnknownText_0x667f7: ; 0x667f7 +UnknownText_0x667f7: text "Bye-bye!" done -; 0x66801 -UnknownText_0x66801: ; 0x66801 +UnknownText_0x66801: text "I bought some PINK" line "BOWS at GOLDENROD" @@ -1431,15 +1329,13 @@ UnknownText_0x66801: ; 0x66801 text_from_ram wStringBuffer5 text "." done -; 0x66882 -UnknownText_0x66882: ; 0x66882 +UnknownText_0x66882: text "I love dressing up" line "my CLEFAIRY!" done -; 0x668a3 -UnknownText_0x668a3: ; 0x668a3 +UnknownText_0x668a3: text "What's wrong?" line "Can't you visit?" @@ -1454,9 +1350,8 @@ UnknownText_0x668a3: ; 0x668a3 text_from_ram wStringBuffer5 text "!" done -; 0x6691d -UnknownText_0x6691d: ; 0x6691d +UnknownText_0x6691d: text "What's wrong?" line "Can't you visit?" @@ -1469,9 +1364,8 @@ UnknownText_0x6691d: ; 0x6691d text_from_ram wStringBuffer5 text "!" done -; 0x66980 -VanceLiftoffText: ; 0x66980 +VanceLiftoffText: text "My @" text_from_ram wStringBuffer4 text "'s" @@ -1480,9 +1374,8 @@ VanceLiftoffText: ; 0x66980 para "We've achieved" line "liftoff!" done -; 0x669b2 -UnknownText_0x669b2: ; 0x669b2 +UnknownText_0x669b2: text "We can easily beat" line "@" text_from_ram wStringBuffer4 @@ -1491,9 +1384,8 @@ UnknownText_0x669b2: ; 0x669b2 para "…Huh? You too?" line "Isn't that great?" done -; 0x669ed -UnknownText_0x669ed: ; 0x669ed +UnknownText_0x669ed: text "But get this, a" line "wild @" text_from_ram wStringBuffer4 @@ -1504,9 +1396,8 @@ UnknownText_0x669ed: ; 0x669ed para "I wanted to FLY" line "after it…" done -; 0x66a3a -UnknownText_0x66a3a: ; 0x66a3a +UnknownText_0x66a3a: text "Right now, I'm on" line "@" text_from_ram wStringBuffer5 @@ -1518,21 +1409,18 @@ UnknownText_0x66a3a: ; 0x66a3a para "Want to battle?" line "I'll wait here." done -; 0x66a93 -UnknownText_0x66a93: ; 0x66a93 +UnknownText_0x66a93: text "OK, bye for now!" done -; 0x66aa5 -VanceLookingForwardText: ; 0x66aa5 +VanceLookingForwardText: text "I'll be looking" line "forward to our" cont "next battle!" done -; 0x66ad1 -VanceHurryHurryText: ; 0x66ad1 +VanceHurryHurryText: text "Oh, <PLAY_G>!" line "Hurry, hurry!" @@ -1541,9 +1429,8 @@ VanceHurryHurryText: ; 0x66ad1 text "!" line "FLY over now!" done -; 0x66afc -WiltonGrownText: ; 0x66afc +WiltonGrownText: text "My @" text_from_ram wStringBuffer4 text "'s" @@ -1552,9 +1439,8 @@ WiltonGrownText: ; 0x66afc para "My fishing skills" line "have improved too!" done -; 0x66b3e -UnknownText_0x66b3e: ; 0x66b3e +UnknownText_0x66b3e: text "We beat a wild" line "@" text_from_ram wStringBuffer4 @@ -1566,9 +1452,8 @@ UnknownText_0x66b3e: ; 0x66b3e para "than beating wild" line "#MON." done -; 0x66b8f -UnknownText_0x66b8f: ; 0x66b8f +UnknownText_0x66b8f: text "But a while back," line "we came this close" @@ -1580,9 +1465,8 @@ UnknownText_0x66b8f: ; 0x66b8f para "I tell you, it was" line "huge. Believe me." done -; 0x66bf3 -UnknownText_0x66bf3: ; 0x66bf3 +UnknownText_0x66bf3: text "I'm fishing on" line "@" text_from_ram wStringBuffer5 @@ -1595,14 +1479,12 @@ UnknownText_0x66bf3: ; 0x66bf3 line "time away, come" cont "over for a battle." done -; 0x66c58 -UnknownText_0x66c58: ; 0x66c58 +UnknownText_0x66c58: text "All right, later." done -; 0x66c6b -UnknownText_0x66c6b: ; 0x66c6b +UnknownText_0x66c6b: text "I snagged an item" line "while fishing." @@ -1611,9 +1493,8 @@ UnknownText_0x66c6b: ; 0x66c6b text_from_ram wStringBuffer5 text "." done -; 0x66ca7 -WiltonHaventFoundAnythingText: ; 0x66ca7 +WiltonHaventFoundAnythingText: text "Nah, I haven't" line "found anything" @@ -1623,9 +1504,8 @@ WiltonHaventFoundAnythingText: ; 0x66ca7 para "You have to have" line "patience." done -; 0x66cf7 -WiltonNotBitingText: ; 0x66cf7 +WiltonNotBitingText: text "Sigh…" line "They're not biting" @@ -1637,9 +1517,8 @@ WiltonNotBitingText: ; 0x66cf7 para "You have to come" line "for a battle!" done -; 0x66d45 -WiltonWantThisText: ; 0x66d45 +WiltonWantThisText: text "Don't you want" line "this item?" @@ -1654,15 +1533,13 @@ WiltonWantThisText: ; 0x66d45 para "MAHOGANY toward" line "BLACKTHORN!" done -; 0x66dab -UnknownText_0x66dab: ; 0x66dab +UnknownText_0x66dab: text "Anyway, we'll chat" line "again!" done -; 0x66dc5 -UnknownText_0x66dc5: ; 0x66dc5 +UnknownText_0x66dc5: text "Are you still on" line "your journey?" @@ -1671,9 +1548,8 @@ UnknownText_0x66dc5: ; 0x66dc5 para "Oooooaaarrrgh!" done -; 0x66e17 -UnknownText_0x66e17: ; 0x66e17 +UnknownText_0x66e17: text "I'm in training" line "now. I apologize," @@ -1682,9 +1558,8 @@ UnknownText_0x66e17: ; 0x66e17 para "Oooooaaarrrgh!" done -; 0x66e67 -UnknownText_0x66e67: ; 0x66e67 +UnknownText_0x66e67: text "I apologize, but I" line "don't have time to" @@ -1696,27 +1571,24 @@ UnknownText_0x66e67: ; 0x66e67 para "Yiiihah!" done -; 0x66ed3 -UnknownText_0x66ed3: ; 0x66ed3 +UnknownText_0x66ed3: text "I plan to take a" line "lunch break, so" para "come see me then!" line "Ayiiiyah!" done -; 0x66f11 -KenjiBreakText: ; 0x66f11 +KenjiBreakText: text "I'm taking a break" line "on ROUTE 45!" para "Why not drop by if" line "you are free?" done -; 0x66f52 -UnknownText_0x66f52: ; 0x66f52 +UnknownText_0x66f52: text "I rested up over" line "my lunch break." @@ -1725,17 +1597,15 @@ UnknownText_0x66f52: ; 0x66f52 para "Oooryaah!" done -; 0x66f9f -ParryNoMatchText: ; 0x66f9f +ParryNoMatchText: text "Nothing can match" line "my @" text_from_ram wStringBuffer4 text " now." done -; 0x66fc0 -UnknownText_0x66fc0: ; 0x66fc0 +UnknownText_0x66fc0: text "Yeah, we KO'd a" line "wild @" text_from_ram wStringBuffer4 @@ -1744,9 +1614,8 @@ UnknownText_0x66fc0: ; 0x66fc0 para "That was OK, but I" line "wanted to get it…" done -; 0x67001 -UnknownText_0x67001: ; 0x67001 +UnknownText_0x67001: text "And yesterday, we" line "spotted a wild" @@ -1764,9 +1633,8 @@ UnknownText_0x67001: ; 0x67001 para "caught it!" line "How about that!" done -; 0x67096 -UnknownText_0x67096: ; 0x67096 +UnknownText_0x67096: text "You're thinking" line "you'd like to" @@ -1778,21 +1646,18 @@ UnknownText_0x67096: ; 0x67096 text_from_ram wStringBuffer5 text "!" done -; 0x670eb -UnknownText_0x670eb: ; 0x670eb +UnknownText_0x670eb: text "OK, give me a call" line "again!" done -; 0x67106 -ParryBattleWithMeText: ; 0x67106 +ParryBattleWithMeText: text "You'll battle with" line "me again, right?" done -; 0x6712a -ParryHaventYouGottenToText: ; 0x6712a +ParryHaventYouGottenToText: text "Haven't you gotten" line "to @" text_from_ram wStringBuffer5 @@ -1802,9 +1667,8 @@ ParryHaventYouGottenToText: ; 0x6712a line "bad, but I'd sure" cont "like to battle!" done -; 0x6717a -UnknownText_0x6717a: ; 0x6717a +UnknownText_0x6717a: text_from_ram wStringBuffer3 text "'s @" text_from_ram wStringBuffer4 @@ -1812,9 +1676,8 @@ UnknownText_0x6717a: ; 0x6717a line "is much stronger" cont "than before!" done -; 0x671a4 -UnknownText_0x671a4: ; 0x671a4 +UnknownText_0x671a4: text "And, and…" line "I just battled and" cont "beat @" @@ -1824,9 +1687,8 @@ UnknownText_0x671a4: ; 0x671a4 para "I've raised my" line "#MON properly!" done -; 0x671eb -UnknownText_0x671eb: ; 0x671eb +UnknownText_0x671eb: text "But, but…" para "A wild @" @@ -1837,9 +1699,8 @@ UnknownText_0x671eb: ; 0x671eb para "again. It's just" line "not fair!" done -; 0x6722e -UnknownText_0x6722e: ; 0x6722e +UnknownText_0x6722e: text "I'm ERIN. Want to" line "battle me again?" @@ -1851,14 +1712,12 @@ UnknownText_0x6722e: ; 0x6722e text_from_ram wStringBuffer5 text "!" done -; 0x67281 -UnknownText_0x67281: ; 0x67281 +UnknownText_0x67281: text "See you. Bye-bye!" done -; 0x67294 -ErinWorkingHardText: ; 0x67294 +ErinWorkingHardText: text "I'm working hard" line "to raise my" cont "#MON!" @@ -1866,9 +1725,8 @@ ErinWorkingHardText: ; 0x67294 para "Come back for" line "another battle!" done -; 0x672d5 -ErinComeBattleText: ; 0x672d5 +ErinComeBattleText: text "Oh, <PLAY_G>!" line "Come battle ERIN!" @@ -1877,4 +1735,3 @@ ErinComeBattleText: ; 0x672d5 text_from_ram wStringBuffer5 text "!" done -; 0x67308 diff --git a/data/phone/text/extra2.asm b/data/phone/text/extra2.asm index 887353536..e14378832 100644 --- a/data/phone/text/extra2.asm +++ b/data/phone/text/extra2.asm @@ -1,4 +1,4 @@ -UnknownText_0x174000: ; 0x174000 +UnknownText_0x174000: text "Hi, <PLAY_G>!" line "Our BICYCLE sales" @@ -17,9 +17,8 @@ UnknownText_0x174000: ; 0x174000 para "keep that BICYCLE." line "Thanks again!" done -; 0x1740c0 -JackIntelligenceText: ; 0x1740c0 +JackIntelligenceText: text "My @" text_from_ram wStringBuffer4 text "'s" @@ -29,9 +28,8 @@ JackIntelligenceText: ; 0x1740c0 line "be smarter than" cont "yours!" done -; 0x174106 -JackDefeatedMonText: ; 0x174106 +JackDefeatedMonText: text "The other day, I" line "easily defeated a" cont "@" @@ -42,9 +40,8 @@ JackDefeatedMonText: ; 0x174106 line "tips with you is" cont "starting to help." done -; 0x174165 -UnknownText_0x174165: ; 0x174165 +UnknownText_0x174165: text "Oh, and listen." line "I missed catching" @@ -59,9 +56,8 @@ UnknownText_0x174165: ; 0x174165 para "sure I would've" line "caught it…" done -; 0x1741e1 -UnknownText_0x1741e1: ; 0x1741e1 +UnknownText_0x1741e1: text "Do you want to" line "battle? I'll show" @@ -76,23 +72,20 @@ UnknownText_0x1741e1: ; 0x1741e1 para "Give me a shout if" line "you're nearby." done -; 0x174251 -UnknownText_0x174251: ; 0x174251 +UnknownText_0x174251: text "See you later!" done -; 0x174261 -JackThunderTriviaText: ; 0x174261 +JackThunderTriviaText: text "Did you know?" para "When it's raining," line "THUNDER is sure to" cont "strike." done -; 0x17429d -JackRolloutTriviaText: ; 0x17429d +JackRolloutTriviaText: text "Did you know…?" para "If you use DEFENSE" @@ -101,9 +94,8 @@ JackRolloutTriviaText: ; 0x17429d para "power goes way up" line "past normal." done -; 0x1742ee -JackSolarbeamTriviaText: ; 0x1742ee +JackSolarbeamTriviaText: text "Did you know…?" para "If the sunlight is" @@ -112,9 +104,8 @@ JackSolarbeamTriviaText: ; 0x1742ee para "doesn't need to be" line "charged up." done -; 0x174340 -JackStompTriviaText: ; 0x174340 +JackStompTriviaText: text "Did you know…?" para "If the opponent" @@ -123,9 +114,8 @@ JackStompTriviaText: ; 0x174340 para "your STOMP becomes" line "more powerful." done -; 0x174391 -JackGustTriviaText: ; 0x174391 +JackGustTriviaText: text "Did you know…?" para "If your opponent" @@ -134,9 +124,8 @@ JackGustTriviaText: ; 0x174391 para "GUST becomes much" line "more powerful." done -; 0x1743e3 -JackTwisterTriviaText: ; 0x1743e3 +JackTwisterTriviaText: text "Did you know…?" para "If your opponent" @@ -145,9 +134,8 @@ JackTwisterTriviaText: ; 0x1743e3 para "TWISTER becomes" line "more powerful." done -; 0x174433 -JackEarthquakeTriviaText: ; 0x174433 +JackEarthquakeTriviaText: text "Did you know…?" para "If your opponent" @@ -156,9 +144,8 @@ JackEarthquakeTriviaText: ; 0x174433 para "EARTHQUAKE becomes" line "more powerful." done -; 0x174485 -JackMagnitudeTriviaText: ; 0x174485 +JackMagnitudeTriviaText: text "Did you know…?" para "If your opponent" @@ -167,9 +154,8 @@ JackMagnitudeTriviaText: ; 0x174485 para "MAGNITUDE becomes" line "more powerful." done -; 0x1744d6 -JackSandstormTriviaText: ; 0x1744d6 +JackSandstormTriviaText: text "Did you know…?" para "The rock, ground" @@ -178,9 +164,8 @@ JackSandstormTriviaText: ; 0x1744d6 para "can't be hurt by" line "SANDSTORM." done -; 0x174522 -JackSunnyDayTriviaText: ; 0x174522 +JackSunnyDayTriviaText: text "Did you know…?" para "If the sunlight is" @@ -189,9 +174,8 @@ JackSunnyDayTriviaText: ; 0x174522 para "moves become much" line "weaker." done -; 0x174571 -JackRainDanceTriviaText: ; 0x174571 +JackRainDanceTriviaText: text "Did you know…?" para "When it's raining," @@ -200,9 +184,8 @@ JackRainDanceTriviaText: ; 0x174571 para "become much weaker" line "than usual." done -; 0x1745c2 -UnknownText_0x1745c2: ; 0x1745c2 +UnknownText_0x1745c2: text "My friend heard" line "some great tips." @@ -213,9 +196,8 @@ UnknownText_0x1745c2: ; 0x1745c2 line "I'll call right" cont "away and tell you." done -; 0x174638 -UnknownText_0x174638: ; 0x174638 +UnknownText_0x174638: text "Hey, <PLAY_G>!" para "Do you remember" @@ -229,9 +211,8 @@ UnknownText_0x174638: ; 0x174638 text_from_ram wStringBuffer5 text "." done -; 0x174688 -UnknownText_0x174688: ; 0x174688 +UnknownText_0x174688: text "I fancied up my" line "@" text_from_ram wStringBuffer4 @@ -240,9 +221,8 @@ UnknownText_0x174688: ; 0x174688 para "made it even cuter" line "than before!" done -; 0x1746c3 -UnknownText_0x1746c3: ; 0x1746c3 +UnknownText_0x1746c3: text "I happened to come" line "across a wild" cont "SNUBBULL recently." @@ -253,9 +233,8 @@ UnknownText_0x1746c3: ; 0x1746c3 para "far cuter than the" line "wild one." done -; 0x174734 -UnknownText_0x174734: ; 0x174734 +UnknownText_0x174734: text "I happened to see" line "a wild MARILL the" @@ -270,15 +249,13 @@ UnknownText_0x174734: ; 0x174734 text ". I was" line "quite miffed." done -; 0x1747ac -UnknownText_0x1747ac: ; 0x1747ac +UnknownText_0x1747ac: text "You can expect a" line "call from me." done -; 0x1747cc -BeverlyFoundNuggetText: ; 0x1747cc +BeverlyFoundNuggetText: text "My husband got" line "some NUGGETS." @@ -296,18 +273,16 @@ BeverlyFoundNuggetText: ; 0x1747cc para "Please come see me" line "when you can." done -; 0x17485b -UnknownText_0x17485b: ; 0x17485b +UnknownText_0x17485b: text "Are your #MON" line "in prime form?" para "Let's chat about" line "#MON again." done -; 0x174895 -UnknownText_0x174895: ; 0x174895 +UnknownText_0x174895: text "Pardon?" line "Oh, the NUGGET?" @@ -319,9 +294,8 @@ UnknownText_0x174895: ; 0x174895 text_start line "when you can." done -; 0x1748ea -UnknownText_0x1748ea: ; 0x1748ea +UnknownText_0x1748ea: text "Hey, I challenge" line "you to a battle!" @@ -336,14 +310,12 @@ UnknownText_0x1748ea: ; 0x1748ea para "for you. Hustle" line "over here pronto!" done -; 0x174962 -UnknownText_0x174962: ; 0x174962 +UnknownText_0x174962: text "See ya!" done -; 0x17496b -UnknownText_0x17496b: ; 0x17496b +UnknownText_0x17496b: text "We have to battle" line "again sometime." @@ -353,9 +325,8 @@ UnknownText_0x17496b: ; 0x17496b para "challenging you" line "till I win." done -; 0x1749c7 -UnknownText_0x1749c7: ; 0x1749c7 +UnknownText_0x1749c7: text "Hey, you'd better" line "not have forgotten" cont "about our battle!" @@ -367,9 +338,8 @@ UnknownText_0x1749c7: ; 0x1749c7 para "Hustle over quick!" line "I'm waiting!" done -; 0x174a24 -GavenGreaterText: ; 0x174a24 +GavenGreaterText: text "My @" text_from_ram wStringBuffer4 text_start @@ -382,9 +352,8 @@ GavenGreaterText: ; 0x174a24 text " that's" cont "better than mine." done -; 0x174a80 -UnknownText_0x174a80: ; 0x174a80 +UnknownText_0x174a80: text "Oh, and I managed" line "to barely defeat" @@ -406,9 +375,8 @@ UnknownText_0x174a80: ; 0x174a80 line "#MON you're" cont "used to seeing." done -; 0x174b2d -UnknownText_0x174b2d: ; 0x174b2d +UnknownText_0x174b2d: text "And a while back," line "I tried to catch a" cont "wild @" @@ -424,9 +392,8 @@ UnknownText_0x174b2d: ; 0x174b2d para "failure… You ought" line "to be careful too." done -; 0x174bc5 -UnknownText_0x174bc5: ; 0x174bc5 +UnknownText_0x174bc5: text "Let's battle!" para "I'll be waiting on" @@ -437,21 +404,18 @@ UnknownText_0x174bc5: ; 0x174bc5 para "Give me a shout" line "when you're close." done -; 0x174c0e -UnknownText_0x174c0e: ; 0x174c0e +UnknownText_0x174c0e: text "OK, I'll talk to" line "you soon!" done -; 0x174c29 -UnknownText_0x174c29: ; 0x174c29 +UnknownText_0x174c29: text "I obsess over how" line "to beat you." done -; 0x174c49 -UnknownText_0x174c49: ; 0x174c49 +UnknownText_0x174c49: text "<PLAY_G>, why" line "aren't you here?" @@ -460,9 +424,8 @@ UnknownText_0x174c49: ; 0x174c49 text_from_ram wStringBuffer5 text "!" done -; 0x174c7f -UnknownText_0x174c7f: ; 0x174c7f +UnknownText_0x174c7f: text "Do you remember my" line "sweet @" text_from_ram wStringBuffer4 @@ -479,9 +442,8 @@ UnknownText_0x174c7f: ; 0x174c7f para "back when it" line "really gets going." done -; 0x174cf6 -UnknownText_0x174cf6: ; 0x174cf6 +UnknownText_0x174cf6: text "Oh, have you ever" line "seen a @" text_from_ram wStringBuffer4 @@ -500,9 +462,8 @@ UnknownText_0x174cf6: ; 0x174cf6 para "I still won, of" line "course." done -; 0x174d86 -UnknownText_0x174d86: ; 0x174d86 +UnknownText_0x174d86: text "Oh, I just saw a" line "wild @" text_from_ram wStringBuffer4 @@ -524,9 +485,8 @@ UnknownText_0x174d86: ; 0x174d86 para "I hope you learn" line "from my mistake." done -; 0x174e4e -UnknownText_0x174e4e: ; 0x174e4e +UnknownText_0x174e4e: text "Do you want to" line "battle? I'm going" cont "to win this time!" @@ -539,20 +499,17 @@ UnknownText_0x174e4e: ; 0x174e4e text "." line "Look for me, OK?" done -; 0x174eb7 -UnknownText_0x174eb7: ; 0x174eb7 +UnknownText_0x174eb7: text "OK, bye-bye!" done -; 0x174ec5 -UnknownText_0x174ec5: ; 0x174ec5 +UnknownText_0x174ec5: text "Let's battle again" line "sometime!" done -; 0x174ee2 -BethForgetDealText: ; 0x174ee2 +BethForgetDealText: text "Um… <PLAY_G>?" line "What's wrong?" @@ -566,9 +523,8 @@ BethForgetDealText: ; 0x174ee2 para "That's where I'm" line "waiting." done -; 0x174f2f -JoseAromaText: ; 0x174f2f +JoseAromaText: text "Hey listen, my" line "@" text_from_ram wStringBuffer4 @@ -580,9 +536,8 @@ JoseAromaText: ; 0x174f2f para "That aroma gets my" line "appetite going!" done -; 0x174f90 -UnknownText_0x174f90: ; 0x174f90 +UnknownText_0x174f90: text "A while ago, my" line "FARFETCH'D KO'd" cont "this @" @@ -595,9 +550,8 @@ UnknownText_0x174f90: ; 0x174f90 para "wield that stick." line "Amazing stuff!" done -; 0x174ffd -UnknownText_0x174ffd: ; 0x174ffd +UnknownText_0x174ffd: text "I ran into a wild" line "@" text_from_ram wStringBuffer4 @@ -612,9 +566,8 @@ UnknownText_0x174ffd: ; 0x174ffd para "would. It was a" line "bit disappointing." done -; 0x17507d -UnknownText_0x17507d: ; 0x17507d +UnknownText_0x17507d: text "Want to battle" line "again?" @@ -632,14 +585,12 @@ UnknownText_0x17507d: ; 0x17507d para "Keep an eye out" line "for me, OK?" done -; 0x175106 -UnknownText_0x175106: ; 0x175106 +UnknownText_0x175106: text "Be seeing you!" done -; 0x175116 -JoseFoundSomethingText: ; 0x175116 +JoseFoundSomethingText: text "My FARFETCH'D had" line "something pretty" cont "in its beak." @@ -655,9 +606,8 @@ JoseFoundSomethingText: ; 0x175116 para "and I'll let you" line "have it." done -; 0x17519b -UnknownText_0x17519b: ; 0x17519b +UnknownText_0x17519b: text "I haven't gotten" line "what I promised" cont "you yet." @@ -668,9 +618,8 @@ UnknownText_0x17519b: ; 0x17519b para "so could you wait" line "a little longer?" done -; 0x17520a -UnknownText_0x17520a: ; 0x17520a +UnknownText_0x17520a: text "<PLAY_G>, could you" line "hurry over?" @@ -690,9 +639,8 @@ UnknownText_0x17520a: ; 0x17520a para "Please come as" line "soon as you can!" done -; 0x17529c -UnknownText_0x17529c: ; 0x17529c +UnknownText_0x17529c: text "What's wrong?" para "Don't you want" @@ -706,9 +654,8 @@ UnknownText_0x17529c: ; 0x17529c para "and I'll let you" line "have it." done -; 0x1752f5 -UnknownText_0x1752f5: ; 0x1752f5 +UnknownText_0x1752f5: text "Listen, dear…" para "Do you recall my" @@ -725,9 +672,8 @@ UnknownText_0x1752f5: ; 0x1752f5 line "it's a perfect" cont "match for me?" done -; 0x17536b -UnknownText_0x17536b: ; 0x17536b +UnknownText_0x17536b: text "Have I ever faced" line "a wild @" text_from_ram wStringBuffer4 @@ -741,9 +687,8 @@ UnknownText_0x17536b: ; 0x17536b line "beaten on numerous" cont "occasions!" done -; 0x1753c5 -UnknownText_0x1753c5: ; 0x1753c5 +UnknownText_0x1753c5: text "Have I ever failed" line "to catch a wild" cont "#MON?" @@ -758,9 +703,8 @@ UnknownText_0x1753c5: ; 0x1753c5 text "…" line "Oh! Never mind!" done -; 0x17543a -UnknownText_0x17543a: ; 0x17543a +UnknownText_0x17543a: text "We are going to" line "battle!" @@ -772,14 +716,12 @@ UnknownText_0x17543a: ; 0x17543a para "Don't make me" line "wait! Got it?" done -; 0x175488 -UnknownText_0x175488: ; 0x175488 +UnknownText_0x175488: text "Fine, you may go." done -; 0x17549b -UnknownText_0x17549b: ; 0x17549b +UnknownText_0x17549b: text "Don't be too proud" line "just because you" @@ -788,9 +730,8 @@ UnknownText_0x17549b: ; 0x17549b para "It was a fluke!" done -; 0x1754e5 -UnknownText_0x1754e5: ; 0x1754e5 +UnknownText_0x1754e5: text "What are you" line "doing?" @@ -802,9 +743,8 @@ UnknownText_0x1754e5: ; 0x1754e5 text "!" line "Don't try to run!" done -; 0x175530 -JoeySharperText: ; 0x175530 +JoeySharperText: text "My @" text_from_ram wStringBuffer4 text "'s" @@ -817,9 +757,8 @@ JoeySharperText: ; 0x175530 para "this guy in your" line "party!" done -; 0x175591 -UnknownText_0x175591: ; 0x175591 +UnknownText_0x175591: text "Oh yeah, I took" line "down a @" text_from_ram wStringBuffer4 @@ -833,9 +772,8 @@ UnknownText_0x175591: ; 0x175591 para "can't be helped," line "us being so tough." done -; 0x175611 -UnknownText_0x175611: ; 0x175611 +UnknownText_0x175611: text "Oh yeah, I saw a" line "wild @" text_from_ram wStringBuffer4 @@ -850,9 +788,8 @@ UnknownText_0x175611: ; 0x175611 para "only right to the" line "extreme end." done -; 0x175693 -UnknownText_0x175693: ; 0x175693 +UnknownText_0x175693: text "Let's get together" line "and battle!" @@ -867,14 +804,12 @@ UnknownText_0x175693: ; 0x175693 para "Give me a shout" line "when you come." done -; 0x17570a -UnknownText_0x17570a: ; 0x17570a +UnknownText_0x17570a: text "All right. Later!" done -; 0x17571d -UnknownText_0x17571d: ; 0x17571d +UnknownText_0x17571d: text "I'm checking out" line "@" text_from_ram wStringBuffer4 @@ -887,9 +822,8 @@ UnknownText_0x17571d: ; 0x17571d line "with a good one," cont "let's battle!" done -; 0x175786 -UnknownText_0x175786: ; 0x175786 +UnknownText_0x175786: text "What's keeping" line "you, <PLAYER>!" @@ -901,9 +835,8 @@ UnknownText_0x175786: ; 0x175786 text_from_ram wStringBuffer5 text "!" done -; 0x1757d4 -WadeAreYouGrowingText: ; 0x1757d4 +WadeAreYouGrowingText: text "Are your #MON" line "growing?" @@ -921,9 +854,8 @@ WadeAreYouGrowingText: ; 0x1757d4 para "quickly. I think" line "it'll get tough." done -; 0x175869 -UnknownText_0x175869: ; 0x175869 +UnknownText_0x175869: text "Oh yeah, we KO'd a" line "wild @" text_from_ram wStringBuffer4 @@ -937,9 +869,8 @@ UnknownText_0x175869: ; 0x175869 para "little sorry for" line "the poor thing." done -; 0x1758e4 -UnknownText_0x1758e4: ; 0x1758e4 +UnknownText_0x1758e4: text "Oh yeah, a wild" line "@" text_from_ram wStringBuffer4 @@ -957,9 +888,8 @@ UnknownText_0x1758e4: ; 0x1758e4 para "away when I almost" line "had it." done -; 0x175976 -UnknownText_0x175976: ; 0x175976 +UnknownText_0x175976: text "Do you feel like a" line "#MON battle?" @@ -974,14 +904,12 @@ UnknownText_0x175976: ; 0x175976 para "Let me know when" line "you get there." done -; 0x1759e7 -UnknownText_0x1759e7: ; 0x1759e7 +UnknownText_0x1759e7: text "See you later!" done -; 0x1759f7 -WadeBugCatchingContestText: ; 0x1759f7 +WadeBugCatchingContestText: text "The Bug-Catching" line "Contest is at the" @@ -994,9 +922,8 @@ WadeBugCatchingContestText: ; 0x1759f7 para "I'm trying to make" line "up my mind." done -; 0x175a60 -WadeFoundBerryText: ; 0x175a60 +WadeFoundBerryText: text "I found all kinds" line "of BERRIES. If you" @@ -1008,9 +935,8 @@ WadeFoundBerryText: ; 0x175a60 text_from_ram wStringBuffer5 text "." done -; 0x175abe -UnknownText_0x175abe: ; 0x175abe +UnknownText_0x175abe: text "Huh? BERRIES?" para "Sorry, I haven't" @@ -1020,9 +946,8 @@ UnknownText_0x175abe: ; 0x175abe line "find any. Will you" cont "please wait?" done -; 0x175b1e -UnknownText_0x175b1e: ; 0x175b1e +UnknownText_0x175b1e: text "Let's battle" line "already!" @@ -1034,9 +959,8 @@ UnknownText_0x175b1e: ; 0x175b1e para "Please get here as" line "soon as you can!" done -; 0x175b6d -UnknownText_0x175b6d: ; 0x175b6d +UnknownText_0x175b6d: text "How come you're" line "not here yet?" @@ -1048,9 +972,8 @@ UnknownText_0x175b6d: ; 0x175b6d para "Please get here as" line "soon as you can!" done -; 0x175bc4 -RalphNeglectingKidsText: ; 0x175bc4 +RalphNeglectingKidsText: text "I've been spending" line "more time with my" @@ -1062,9 +985,8 @@ RalphNeglectingKidsText: ; 0x175bc4 para "That's a bit sad," line "actually." done -; 0x175c24 -UnknownText_0x175c24: ; 0x175c24 +UnknownText_0x175c24: text "I just beat a wild" line "@" text_from_ram wStringBuffer4 @@ -1079,9 +1001,8 @@ UnknownText_0x175c24: ; 0x175c24 para "Boy, has he gotten" line "cocky…" done -; 0x175c9f -UnknownText_0x175c9f: ; 0x175c9f +UnknownText_0x175c9f: text "Yesterday a wild" line "@" text_from_ram wStringBuffer4 @@ -1099,9 +1020,8 @@ UnknownText_0x175c9f: ; 0x175c9f para "Hahah, that sure" line "made my day!" done -; 0x175d40 -UnknownText_0x175d40: ; 0x175d40 +UnknownText_0x175d40: text "What do you say to" line "a battle with me?" @@ -1116,15 +1036,13 @@ UnknownText_0x175d40: ; 0x175d40 text " is" line "the spot!" done -; 0x175db7 -UnknownText_0x175db7: ; 0x175db7 +UnknownText_0x175db7: text "You call your mom" line "sometimes too!" done -; 0x175dd9 -UnknownText_0x175dd9: ; 0x175dd9 +UnknownText_0x175dd9: text "Listen, I… Yowch!" para "Uh, sorry! See," @@ -1152,9 +1070,8 @@ UnknownText_0x175dd9: ; 0x175dd9 para "sight! Get ready" line "to fish!" done -; 0x175eaf -UnknownText_0x175eaf: ; 0x175eaf +UnknownText_0x175eaf: text "Yeah, I know." para "You're looking for" @@ -1164,9 +1081,8 @@ UnknownText_0x175eaf: ; 0x175eaf line "been catching are" cont "MAGIKARP, though…" done -; 0x175f11 -UnknownText_0x175f11: ; 0x175f11 +UnknownText_0x175f11: text "So where are you?" line "I'm waiting for" @@ -1178,9 +1094,8 @@ UnknownText_0x175f11: ; 0x175f11 para "You shouldn't make" line "your elders wait!" done -; 0x175f70 -UnknownText_0x175f70: ; 0x175f70 +UnknownText_0x175f70: text "Hey, what's the" line "matter with you?" @@ -1191,9 +1106,8 @@ UnknownText_0x175f70: ; 0x175f70 para "I'm on ROUTE 32," line "so hurry up!" done -; 0x175fda -UnknownText_0x175fda: ; 0x175fda +UnknownText_0x175fda: text "Oh, you have to" line "hear this." @@ -1205,9 +1119,8 @@ UnknownText_0x175fda: ; 0x175fda para "It always wants to" line "nuzzle me!" done -; 0x17602d -UnknownText_0x17602d: ; 0x17602d +UnknownText_0x17602d: text "And, and! Um…" para "We beat a wild" @@ -1221,9 +1134,8 @@ UnknownText_0x17602d: ; 0x17602d para "We felt sorry for" line "it, though." done -; 0x176095 -UnknownText_0x176095: ; 0x176095 +UnknownText_0x176095: text "And, and! Uh…" para "We just saw a" @@ -1238,9 +1150,8 @@ UnknownText_0x176095: ; 0x176095 para "away. It made us" line "really angry!" done -; 0x17610a -UnknownText_0x17610a: ; 0x17610a +UnknownText_0x17610a: text "Hi! Do you have" line "some free time?" @@ -1258,9 +1169,8 @@ UnknownText_0x17610a: ; 0x17610a para "Let me know when" line "you get here!" done -; 0x1761a7 -LizHiTaniaText: ; 0x1761a7 +LizHiTaniaText: text "Hi, TANIA. How are" line "you? This is LIZ." @@ -1270,15 +1180,13 @@ LizHiTaniaText: ; 0x1761a7 para "Huh… Wrong number?" line "Oops! Sorry!" done -; 0x17620a -UnknownText_0x17620a: ; 0x17620a +UnknownText_0x17620a: text "OK, I'll call you" line "later!" done -; 0x176223 -UnknownText_0x176223: ; 0x176223 +UnknownText_0x176223: text "Listen, listen!" para "I was listening to" @@ -1293,9 +1201,8 @@ UnknownText_0x176223: ; 0x176223 para "I wonder what it" line "was. So strange!" done -; 0x1762c3 -UnknownText_0x1762c3: ; 0x1762c3 +UnknownText_0x1762c3: text "Listen, listen!" para "Don't you think" @@ -1316,9 +1223,8 @@ UnknownText_0x1762c3: ; 0x1762c3 para "I wish I could" line "meet him!" done -; 0x17638a -UnknownText_0x17638a: ; 0x17638a +UnknownText_0x17638a: text "Listen, listen!" para "Do you know EARL," @@ -1333,9 +1239,8 @@ UnknownText_0x17638a: ; 0x17638a para "he was running. It" line "was wildly funny!" done -; 0x176424 -UnknownText_0x176424: ; 0x176424 +UnknownText_0x176424: text "Listen, listen!" para "I collect #MON" @@ -1354,9 +1259,8 @@ UnknownText_0x176424: ; 0x176424 line "brag about it if" cont "you had one." done -; 0x1764eb -UnknownText_0x1764eb: ; 0x1764eb +UnknownText_0x1764eb: text "Listen, listen!" para "Do you know about" @@ -1374,9 +1278,8 @@ UnknownText_0x1764eb: ; 0x1764eb para "try some. I bet" line "it's delicious!" done -; 0x176599 -UnknownText_0x176599: ; 0x176599 +UnknownText_0x176599: text "Listen, listen!" para "There's a #MON" @@ -1403,9 +1306,8 @@ UnknownText_0x176599: ; 0x176599 para "trying to decide" line "whom I should use…" done -; 0x1766ac -UnknownText_0x1766ac: ; 0x1766ac +UnknownText_0x1766ac: text "Listen, listen!" para "GOLDENROD GYM's" @@ -1421,9 +1323,8 @@ UnknownText_0x1766ac: ; 0x1766ac para "I bet she must be" line "totally talented." done -; 0x17674f -UnknownText_0x17674f: ; 0x17674f +UnknownText_0x17674f: text "Listen, listen!" para "Have you ever" @@ -1443,9 +1344,8 @@ UnknownText_0x17674f: ; 0x17674f line "CATERPIE. Isn't" cont "that great?" done -; 0x176816 -UnknownText_0x176816: ; 0x176816 +UnknownText_0x176816: text "Listen, listen!" para "I saw a beautiful" @@ -1459,9 +1359,8 @@ UnknownText_0x176816: ; 0x176816 text_from_ram wStringBuffer4 text " too." done -; 0x17686d -UnknownText_0x17686d: ; 0x17686d +UnknownText_0x17686d: text "Listen, listen!" para "Uh… Um… Whoops!" @@ -1469,9 +1368,8 @@ UnknownText_0x17686d: ; 0x17686d para "I forgot what I" line "was going to say!" done -; 0x1768b0 -UnknownText_0x1768b0: ; 0x1768b0 +UnknownText_0x1768b0: text "Listen, listen!" para "My @" @@ -1504,9 +1402,8 @@ UnknownText_0x1768b0: ; 0x1768b0 para "time!" line "I love chatting!" done -; 0x1769da -UnknownText_0x1769da: ; 0x1769da +UnknownText_0x1769da: text "I've got too much" line "time on my hands!" @@ -1518,9 +1415,8 @@ UnknownText_0x1769da: ; 0x1769da text_from_ram wStringBuffer5 text "!" done -; 0x176a2f -AnthonyAteBerriesText: ; 0x176a2f +AnthonyAteBerriesText: text "The other day, I" line "was watching my" @@ -1541,9 +1437,8 @@ AnthonyAteBerriesText: ; 0x176a2f para "that stuff, but it" line "was delicious!" done -; 0x176aef -UnknownText_0x176aef: ; 0x176aef +UnknownText_0x176aef: text "Lately, I've been" line "running across" @@ -1555,9 +1450,8 @@ UnknownText_0x176aef: ; 0x176aef para "They're easily" line "taken care of." done -; 0x176b45 -UnknownText_0x176b45: ; 0x176b45 +UnknownText_0x176b45: text "Oh yeah, I was" line "battling this" @@ -1576,9 +1470,8 @@ UnknownText_0x176b45: ; 0x176b45 para "stay focused on" line "the job at hand!" done -; 0x176bee -UnknownText_0x176bee: ; 0x176bee +UnknownText_0x176bee: text "Come on--let's" line "battle right now!" @@ -1590,15 +1483,13 @@ UnknownText_0x176bee: ; 0x176bee para "Come on down if" line "you feel up to it!" done -; 0x176c47 -UnknownText_0x176c47: ; 0x176c47 +UnknownText_0x176c47: text "All right then!" line "Be good!" done -; 0x176c61 -UnknownText_0x176c61: ; 0x176c61 +UnknownText_0x176c61: text "<PLAYER>! It's" line "mind-blowing!" @@ -1625,9 +1516,8 @@ UnknownText_0x176c61: ; 0x176c61 para "where there are" line "strong #MON." done -; 0x176d32 -UnknownText_0x176d32: ; 0x176d32 +UnknownText_0x176d32: text "Rare #MON?" para "Hey, sorry! I was" @@ -1636,9 +1526,8 @@ UnknownText_0x176d32: ; 0x176d32 para "hike, so I wasn't" line "paying attention." done -; 0x176d85 -UnknownText_0x176d85: ; 0x176d85 +UnknownText_0x176d85: text "Hello! You haven't" line "forgotten about" @@ -1650,9 +1539,8 @@ UnknownText_0x176d85: ; 0x176d85 text "!" line "I'm waiting!" done -; 0x176dd1 -UnknownText_0x176dd1: ; 0x176dd1 +UnknownText_0x176dd1: text "Hello? What? Where" line "is DUNSPARCE?" @@ -1667,9 +1555,8 @@ UnknownText_0x176dd1: ; 0x176dd1 para "are strong #MON" line "around." done -; 0x176e5d -ToddLooksCuteLikeMeText: ; 0x176e5d +ToddLooksCuteLikeMeText: text "My @" text_from_ram wStringBuffer4 text " is" @@ -1678,9 +1565,8 @@ ToddLooksCuteLikeMeText: ; 0x176e5d para "more like me. It's" line "getting cuter!" done -; 0x176e9c -UnknownText_0x176e9c: ; 0x176e9c +UnknownText_0x176e9c: text "And, you know?" para "Now we can KO" @@ -1691,9 +1577,8 @@ UnknownText_0x176e9c: ; 0x176e9c para "I should challenge" line "the GOLDENROD GYM." done -; 0x176eee -UnknownText_0x176eee: ; 0x176eee +UnknownText_0x176eee: text "And, you know?" line "We just failed to" @@ -1708,9 +1593,8 @@ UnknownText_0x176eee: ; 0x176eee para "aren't high enough" line "yet…" done -; 0x176f60 -UnknownText_0x176f60: ; 0x176f60 +UnknownText_0x176f60: text "You must be a lot" line "better now, huh?" @@ -1725,14 +1609,12 @@ UnknownText_0x176f60: ; 0x176f60 text_from_ram wStringBuffer5 text "." done -; 0x176fdb -UnknownText_0x176fdb: ; 0x176fdb +UnknownText_0x176fdb: text "See you later!" done -; 0x176feb -UnknownText_0x176feb: ; 0x176feb +UnknownText_0x176feb: text "This is it--the" line "one we've all been" cont "waiting for!" @@ -1757,18 +1639,16 @@ UnknownText_0x176feb: ; 0x176feb line "to get there as" cont "soon as you can!" done -; 0x1770fb -UnknownText_0x1770fb: ; 0x1770fb +UnknownText_0x1770fb: text "I'm saving up for" line "the next bargain" para "sale. When's the" line "next one?" done -; 0x177138 -UnknownText_0x177138: ; 0x177138 +UnknownText_0x177138: text "Where are you?" para "Let's have our" @@ -1779,9 +1659,8 @@ UnknownText_0x177138: ; 0x177138 text_from_ram wStringBuffer5 text "." done -; 0x17717c -UnknownText_0x17717c: ; 0x17717c +UnknownText_0x17717c: text "Haven't you gone" line "to GOLDENROD DEPT." @@ -1794,9 +1673,8 @@ UnknownText_0x17717c: ; 0x17717c para "You should get" line "there quickly." done -; 0x1771fd -UnknownText_0x1771fd: ; 0x1771fd +UnknownText_0x1771fd: text "My @" text_from_ram wStringBuffer4 text " and" @@ -1805,9 +1683,8 @@ UnknownText_0x1771fd: ; 0x1771fd para "in sync with each" line "other." done -; 0x177237 -UnknownText_0x177237: ; 0x177237 +UnknownText_0x177237: text "We battled a wild" line "@" text_from_ram wStringBuffer4 @@ -1819,9 +1696,8 @@ UnknownText_0x177237: ; 0x177237 para "We're getting into" line "the groove!" done -; 0x177297 -UnknownText_0x177297: ; 0x177297 +UnknownText_0x177297: text "But, you know?" para "I still haven't" @@ -1832,9 +1708,8 @@ UnknownText_0x177297: ; 0x177297 para "It's getting past" line "frustrating…" done -; 0x1772e2 -UnknownText_0x1772e2: ; 0x1772e2 +UnknownText_0x1772e2: text "Would you be my" line "practice partner" cont "again sometime?" @@ -1848,15 +1723,13 @@ UnknownText_0x1772e2: ; 0x1772e2 line "a little easier on" cont "me next time?" done -; 0x177361 -UnknownText_0x177361: ; 0x177361 +UnknownText_0x177361: text "Bye! Let's chat" line "again!" done -; 0x177378 -UnknownText_0x177378: ; 0x177378 +UnknownText_0x177378: text "Have you heard" line "about TEAM ROCKET?" @@ -1867,9 +1740,8 @@ UnknownText_0x177378: ; 0x177378 para "Are the people" line "inside safe?" done -; 0x1773e7 -UnknownText_0x1773e7: ; 0x1773e7 +UnknownText_0x1773e7: text "I picked up some-" line "thing nice today." @@ -1884,9 +1756,8 @@ UnknownText_0x1773e7: ; 0x1773e7 text " is" line "where I am." done -; 0x177465 -UnknownText_0x177465: ; 0x177465 +UnknownText_0x177465: text "Sorry, I haven't" line "found anything" @@ -1896,9 +1767,8 @@ UnknownText_0x177465: ; 0x177465 para "find anything, you" line "can have it!" done -; 0x1774c1 -UnknownText_0x1774c1: ; 0x1774c1 +UnknownText_0x1774c1: text "Oh, <PLAY_G>!" line "How soon can I" @@ -1910,9 +1780,8 @@ UnknownText_0x1774c1: ; 0x1774c1 text_from_ram wStringBuffer5 text "!" done -; 0x17750e -UnknownText_0x17750e: ; 0x17750e +UnknownText_0x17750e: text "I'm getting really" line "impatient, waiting" @@ -1924,4 +1793,3 @@ UnknownText_0x17750e: ; 0x17750e text_from_ram wStringBuffer5 text "!" done -; 0x177561 diff --git a/data/phone/text/mom.asm b/data/phone/text/mom.asm index ddec4cf77..e392a609e 100644 --- a/data/phone/text/mom.asm +++ b/data/phone/text/mom.asm @@ -1,11 +1,11 @@ -MomPhoneGreetingText: ; 0x1b4000 +MomPhoneGreetingText: text "Hello?" para "Oh, hi, <PLAYER>!" line "Working hard?" done -MomPhoneLandmarkText: ; 0x1b4021 +MomPhoneLandmarkText: text "Oh, so you're in" line "@" text_from_ram wStringBuffer3 @@ -19,7 +19,7 @@ MomPhoneLandmarkText: ; 0x1b4021 line "take a look?" done -MomPhoneGenericAreaText: ; 0x1b406b +MomPhoneGenericAreaText: text "Really, you're in" line "@" text_from_ram wStringBuffer3 @@ -30,7 +30,7 @@ MomPhoneGenericAreaText: ; 0x1b406b cont "of neat, <PLAYER>." done -MomPhoneNewBarkText: ; 0x1b40b1 +MomPhoneNewBarkText: text "What? You're in" line "@" text_from_ram wStringBuffer3 @@ -40,7 +40,7 @@ MomPhoneNewBarkText: ; 0x1b40b1 line "sometime!" done -MomPhoneCherrygroveText: ; 0x1b40e4 +MomPhoneCherrygroveText: text "You're visiting" line "@" text_from_ram wStringBuffer3 @@ -50,7 +50,7 @@ MomPhoneCherrygroveText: ; 0x1b40e4 line "home for a bit?" done -MomOtherAreaText: ; 0x1b411c +MomOtherAreaText: text "Wow, you're in" line "@" text_from_ram wStringBuffer3 @@ -60,7 +60,7 @@ MomOtherAreaText: ; 0x1b411c line "#MON quest!" done -MomDeterminedText: ; 0x1b4150 +MomDeterminedText: text "That sounds really" line "tough." @@ -71,7 +71,7 @@ MomDeterminedText: ; 0x1b4150 line "be OK, right?" done -MomCheckBalanceText: ; 0x1b41a7 +MomCheckBalanceText: text "By the way, you've" line "saved up ¥@" text_from_ram wStringBuffer3 @@ -81,12 +81,12 @@ MomCheckBalanceText: ; 0x1b41a7 line "keep on saving?" done -MomImportantToSaveText: ; 0x1b41ea +MomImportantToSaveText: text "It's important to" line "save your money." done -MomYoureNotSavingText: ; 0x1b420d +MomYoureNotSavingText: text "Oh, <PLAYER>," line "you're not saving" @@ -94,7 +94,7 @@ MomYoureNotSavingText: ; 0x1b420d line "you like to save?" done -MomYouveSavedText: ; 0x1b4249 +MomYouveSavedText: text "By the way, you've" line "saved up ¥@" text_from_ram wStringBuffer3 @@ -104,23 +104,23 @@ MomYouveSavedText: ; 0x1b4249 line "saving again?" done -MomOKIllSaveText: ; 0x1b4289 +MomOKIllSaveText: text "OK. I'll save your" line "money." done -MomPhoneWontSaveMoneyText: ; 0x1b42a3 +MomPhoneWontSaveMoneyText: text "OK. I won't save" line "your money." done -MomPhoneHangUpText: ; 0x1b42c0 +MomPhoneHangUpText: text "<PLAYER>, keep it" line "up! I'm rooting" cont "for you, baby!" done -MomPhoneNoPokemonText: ; 0x1b42ea +MomPhoneNoPokemonText: text "Hello?" para "Oh, hi, <PLAYER>!" @@ -128,7 +128,7 @@ MomPhoneNoPokemonText: ; 0x1b42ea cont "waiting for you?" done -MomPhoneNoPokedexText: ; 0x1b431d +MomPhoneNoPokedexText: text "Hello?" para "Oh, hi, <PLAYER>!" @@ -138,7 +138,7 @@ MomPhoneNoPokedexText: ; 0x1b431d line "ELM? Be good!" done -MomPhoneNoGymQuestText: ; 0x1b435f +MomPhoneNoGymQuestText: text "Hello?" para "Hi, <PLAYER>! If" @@ -148,7 +148,7 @@ MomPhoneNoGymQuestText: ; 0x1b435f line "on home, dear." done -MomPhoneLectureText: ; 0x1b43a1 +MomPhoneLectureText: text "Hello?" para "…… <PLAYER>?" diff --git a/data/phone/text/trainers.asm b/data/phone/text/trainers.asm index e5dcccddf..a907f62fe 100644 --- a/data/phone/text/trainers.asm +++ b/data/phone/text/trainers.asm @@ -1,4 +1,4 @@ -UnknownText_0x1b4dc5: ; 0x1b4dc5 +UnknownText_0x1b4dc5: text "Hello. This is" line "@" text_from_ram wStringBuffer3 @@ -8,7 +8,7 @@ UnknownText_0x1b4dc5: ; 0x1b4dc5 line "<PLAY_G>!" done -UnknownText_0x1b4ded: ; 0x1b4ded +UnknownText_0x1b4ded: text "Hello. This is" line "@" text_from_ram wStringBuffer3 @@ -18,7 +18,7 @@ UnknownText_0x1b4ded: ; 0x1b4ded line "<PLAY_G>?" done -UnknownText_0x1b4e16: ; 0x1b4e16 +UnknownText_0x1b4e16: text "Hello. This is" line "@" text_from_ram wStringBuffer3 @@ -28,7 +28,7 @@ UnknownText_0x1b4e16: ; 0x1b4e16 line "<PLAY_G>!" done -UnknownText_0x1b4e3e: ; 0x1b4e3e +UnknownText_0x1b4e3e: text "<PLAY_G>, good" line "morning!" @@ -38,7 +38,7 @@ UnknownText_0x1b4e3e: ; 0x1b4e3e line "How are you doing?" done -UnknownText_0x1b4e72: ; 0x1b4e72 +UnknownText_0x1b4e72: text "<PLAY_G>, howdy!" para "It's me, @" @@ -47,7 +47,7 @@ UnknownText_0x1b4e72: ; 0x1b4e72 line "Isn't it nice out?" done -UnknownText_0x1b4e9e: ; 0x1b4e9e +UnknownText_0x1b4e9e: text "<PLAY_G>, good" line "evening!" @@ -57,7 +57,7 @@ UnknownText_0x1b4e9e: ; 0x1b4e9e line "Got a minute?" done -UnknownText_0x1b4ecd: ; 0x1b4ecd +UnknownText_0x1b4ecd: text "How are your" line "#MON doing?" @@ -70,7 +70,7 @@ UnknownText_0x1b4ecd: ; 0x1b4ecd line "it's like me…" done -UnknownText_0x1b4f21: ; 0x1b4f21 +UnknownText_0x1b4f21: text "Hello, this is" line "@" text_from_ram wStringBuffer3 @@ -80,7 +80,7 @@ UnknownText_0x1b4f21: ; 0x1b4f21 line "<PLAYER>." done -UnknownText_0x1b4f4d: ; 0x1b4f4d +UnknownText_0x1b4f4d: text "Hello, this is" line "@" text_from_ram wStringBuffer3 @@ -90,7 +90,7 @@ UnknownText_0x1b4f4d: ; 0x1b4f4d line "<PLAYER>." done -UnknownText_0x1b4f75: ; 0x1b4f75 +UnknownText_0x1b4f75: text "Hello, this is" line "@" text_from_ram wStringBuffer3 @@ -100,7 +100,7 @@ UnknownText_0x1b4f75: ; 0x1b4f75 line "<PLAYER>." done -UnknownText_0x1b4fa1: ; 0x1b4fa1 +UnknownText_0x1b4fa1: text "Hello, <PLAYER>." line "Good morning." @@ -110,7 +110,7 @@ UnknownText_0x1b4fa1: ; 0x1b4fa1 line "Were you asleep?" done -UnknownText_0x1b4fda: ; 0x1b4fda +UnknownText_0x1b4fda: text "Hi, <PLAYER>." line "This is @" text_from_ram wStringBuffer3 @@ -119,7 +119,7 @@ UnknownText_0x1b4fda: ; 0x1b4fda para "How are you doing?" done -UnknownText_0x1b5004: ; 0x1b5004 +UnknownText_0x1b5004: text "Hi, <PLAYER>." line "This is @" text_from_ram wStringBuffer3 @@ -128,7 +128,7 @@ UnknownText_0x1b5004: ; 0x1b5004 para "Were you awake?" done -UnknownText_0x1b502b: ; 0x1b502b +UnknownText_0x1b502b: text "Keeping your" line "#MON happy?" @@ -139,7 +139,7 @@ UnknownText_0x1b502b: ; 0x1b502b cont "lot every day." done -UnknownText_0x1b5073: ; 0x1b5073 +UnknownText_0x1b5073: text "Yeah, this is" line "@" text_from_ram wStringBuffer3 @@ -149,7 +149,7 @@ UnknownText_0x1b5073: ; 0x1b5073 line "<PLAYER>?" done -UnknownText_0x1b509b: ; 0x1b509b +UnknownText_0x1b509b: text "Yeah, this is" line "@" text_from_ram wStringBuffer3 @@ -159,7 +159,7 @@ UnknownText_0x1b509b: ; 0x1b509b line "<PLAYER>?" done -UnknownText_0x1b50c2: ; 0x1b50c2 +UnknownText_0x1b50c2: text "Yeah, this is" line "@" text_from_ram wStringBuffer3 @@ -169,7 +169,7 @@ UnknownText_0x1b50c2: ; 0x1b50c2 line "<PLAYER>?" done -UnknownText_0x1b50e9: ; 0x1b50e9 +UnknownText_0x1b50e9: text "Yo, <PLAYER>!" line "You awake?" @@ -179,7 +179,7 @@ UnknownText_0x1b50e9: ; 0x1b50e9 line "How's it going?" done -UnknownText_0x1b511a: ; 0x1b511a +UnknownText_0x1b511a: text "Yo, <PLAYER>! You" line "free right now?" @@ -189,7 +189,7 @@ UnknownText_0x1b511a: ; 0x1b511a line "How's it going?" done -UnknownText_0x1b5154: ; 0x1b5154 +UnknownText_0x1b5154: text "Yo, <PLAYER>!" line "Were you asleep?" @@ -199,7 +199,7 @@ UnknownText_0x1b5154: ; 0x1b5154 line "How's it going?" done -UnknownText_0x1b518b: ; 0x1b518b +UnknownText_0x1b518b: text "How are your" line "#MON doing?" @@ -219,7 +219,7 @@ UnknownText_0x1b518b: ; 0x1b518b line "bit much for me!" done -UnknownText_0x1b522b: ; 0x1b522b +UnknownText_0x1b522b: text "My @" text_from_ram wStringBuffer4 text "'s" @@ -230,7 +230,7 @@ UnknownText_0x1b522b: ; 0x1b522b line "tougher than me!" done -UnknownText_0x1b5270: ; 0x1b5270 +UnknownText_0x1b5270: text "Hello, this is" line "@" text_from_ram wStringBuffer3 @@ -240,7 +240,7 @@ UnknownText_0x1b5270: ; 0x1b5270 line "Good morning!" done -UnknownText_0x1b52a5: ; 0x1b52a5 +UnknownText_0x1b52a5: text "Hello, this is" line "@" text_from_ram wStringBuffer3 @@ -249,7 +249,7 @@ UnknownText_0x1b52a5: ; 0x1b52a5 para "Hi, <PLAY_G>!" done -UnknownText_0x1b52cc: ; 0x1b52cc +UnknownText_0x1b52cc: text "Hello, this is" line "@" text_from_ram wStringBuffer3 @@ -259,7 +259,7 @@ UnknownText_0x1b52cc: ; 0x1b52cc line "Good evening!" done -UnknownText_0x1b5301: ; 0x1b5301 +UnknownText_0x1b5301: text "<PLAY_G>, good" line "morning!" @@ -269,7 +269,7 @@ UnknownText_0x1b5301: ; 0x1b5301 line "How are you doing?" done -UnknownText_0x1b5335: ; 0x1b5335 +UnknownText_0x1b5335: text "Hi, <PLAY_G>!" para "It's me, @" @@ -278,7 +278,7 @@ UnknownText_0x1b5335: ; 0x1b5335 line "How are you doing?" done -UnknownText_0x1b535f: ; 0x1b535f +UnknownText_0x1b535f: text "<PLAY_G>, good" line "evening!" @@ -288,7 +288,7 @@ UnknownText_0x1b535f: ; 0x1b535f line "How are you doing?" done -UnknownText_0x1b5393: ; 0x1b5393 +UnknownText_0x1b5393: text "How are your" line "#MON doing?" @@ -303,7 +303,7 @@ UnknownText_0x1b5393: ; 0x1b5393 cont "CHAMPS!" done -UnknownText_0x1b53f7: ; 0x1b53f7 +UnknownText_0x1b53f7: text "Hello, this is" line "@" text_from_ram wStringBuffer3 @@ -315,7 +315,7 @@ UnknownText_0x1b53f7: ; 0x1b53f7 para "" done -UnknownText_0x1b5424: ; 0x1b5424 +UnknownText_0x1b5424: text "Hello, this is" line "@" text_from_ram wStringBuffer3 @@ -324,7 +324,7 @@ UnknownText_0x1b5424: ; 0x1b5424 para "Oh. Hi, <PLAY_G>." done -UnknownText_0x1b5446: ; 0x1b5446 +UnknownText_0x1b5446: text "Hello, this is" line "@" text_from_ram wStringBuffer3 @@ -334,7 +334,7 @@ UnknownText_0x1b5446: ; 0x1b5446 line "Good evening." done -UnknownText_0x1b5472: ; 0x1b5472 +UnknownText_0x1b5472: text "Good morning," line "<PLAY_G>!" @@ -344,7 +344,7 @@ UnknownText_0x1b5472: ; 0x1b5472 line "Were you sleeping?" done -UnknownText_0x1b54a6: ; 0x1b54a6 +UnknownText_0x1b54a6: text "<PLAY_G>, hi!" line "This is @" text_from_ram wStringBuffer3 @@ -354,7 +354,7 @@ UnknownText_0x1b54a6: ; 0x1b54a6 line "time?" done -UnknownText_0x1b54d4: ; 0x1b54d4 +UnknownText_0x1b54d4: text "Hi, <PLAY_G>." line "Good evening." @@ -366,7 +366,7 @@ UnknownText_0x1b54d4: ; 0x1b54d4 line "awake." done -UnknownText_0x1b5510: ; 0x1b5510 +UnknownText_0x1b5510: text "Are you the kind" line "of person who goes" @@ -383,7 +383,7 @@ UnknownText_0x1b5510: ; 0x1b5510 line "#MON trainer." done -UnknownText_0x1b55ae: ; 0x1b55ae +UnknownText_0x1b55ae: text "Hello, this is" line "@" text_from_ram wStringBuffer3 @@ -393,7 +393,7 @@ UnknownText_0x1b55ae: ; 0x1b55ae line "Good morning!" done -UnknownText_0x1b55da: ; 0x1b55da +UnknownText_0x1b55da: text "Hello, this is" line "@" text_from_ram wStringBuffer3 @@ -402,7 +402,7 @@ UnknownText_0x1b55da: ; 0x1b55da para "Oh, <PLAY_G>? Hi!" done -UnknownText_0x1b55fc: ; 0x1b55fc +UnknownText_0x1b55fc: text "Hello, this is" line "@" text_from_ram wStringBuffer3 @@ -412,7 +412,7 @@ UnknownText_0x1b55fc: ; 0x1b55fc line "Good evening!" done -UnknownText_0x1b5628: ; 0x1b5628 +UnknownText_0x1b5628: text "Oh, <PLAY_G>?" para "Tweet! Yeah, it's" @@ -421,7 +421,7 @@ UnknownText_0x1b5628: ; 0x1b5628 text "." done -UnknownText_0x1b564c: ; 0x1b564c +UnknownText_0x1b564c: text "Oh, <PLAY_G>?" para "Tweet! Yeah, it's" @@ -430,7 +430,7 @@ UnknownText_0x1b564c: ; 0x1b564c text "." done -UnknownText_0x1b5670: ; 0x1b5670 +UnknownText_0x1b5670: text "Oh, <PLAY_G>?" para "Tweet! Yeah, it's" @@ -439,7 +439,7 @@ UnknownText_0x1b5670: ; 0x1b5670 text "." done -UnknownText_0x1b5694: ; 0x1b5694 +UnknownText_0x1b5694: text "Are your #MON" line "still cooking?" @@ -453,7 +453,7 @@ UnknownText_0x1b5694: ; 0x1b5694 cont "for a while." done -UnknownText_0x1b5702: ; 0x1b5702 +UnknownText_0x1b5702: text "Hello, this is" line "@" text_from_ram wStringBuffer3 @@ -463,7 +463,7 @@ UnknownText_0x1b5702: ; 0x1b5702 line "What's up?" done -UnknownText_0x1b572e: ; 0x1b572e +UnknownText_0x1b572e: text "Hello, this is" line "@" text_from_ram wStringBuffer3 @@ -473,7 +473,7 @@ UnknownText_0x1b572e: ; 0x1b572e line "what's up?" done -UnknownText_0x1b575a: ; 0x1b575a +UnknownText_0x1b575a: text "Hello, this is" line "@" text_from_ram wStringBuffer3 @@ -483,7 +483,7 @@ UnknownText_0x1b575a: ; 0x1b575a line "what's up?" done -UnknownText_0x1b5786: ; 0x1b5786 +UnknownText_0x1b5786: text "You're slow! Hurry" line "up and answer!" @@ -492,7 +492,7 @@ UnknownText_0x1b5786: ; 0x1b5786 text "!" done -UnknownText_0x1b57b7: ; 0x1b57b7 +UnknownText_0x1b57b7: text "You're slow! Hurry" line "up and answer!" @@ -501,7 +501,7 @@ UnknownText_0x1b57b7: ; 0x1b57b7 text "!" done -UnknownText_0x1b57e8: ; 0x1b57e8 +UnknownText_0x1b57e8: text "You're slow! Hurry" line "up and answer!" @@ -510,7 +510,7 @@ UnknownText_0x1b57e8: ; 0x1b57e8 text "!" done -UnknownText_0x1b5819: ; 0x1b5819 +UnknownText_0x1b5819: text "Hey, how are your" line "#MON doing?" @@ -526,7 +526,7 @@ UnknownText_0x1b5819: ; 0x1b5819 line "is that?" done -UnknownText_0x1b589a: ; 0x1b589a +UnknownText_0x1b589a: text "Hi, @" text_from_ram wStringBuffer3 text " here!" @@ -535,7 +535,7 @@ UnknownText_0x1b589a: ; 0x1b589a line "doing well?" done -UnknownText_0x1b58c2: ; 0x1b58c2 +UnknownText_0x1b58c2: text "Hi, @" text_from_ram wStringBuffer3 text " here!" @@ -544,7 +544,7 @@ UnknownText_0x1b58c2: ; 0x1b58c2 line "doing well?" done -UnknownText_0x1b58ea: ; 0x1b58ea +UnknownText_0x1b58ea: text "Hi, @" text_from_ram wStringBuffer3 text " here!" @@ -553,7 +553,7 @@ UnknownText_0x1b58ea: ; 0x1b58ea line "doing well?" done -UnknownText_0x1b5912: ; 0x1b5912 +UnknownText_0x1b5912: text "Yo, <PLAYER>!" line "How're you doing?" @@ -563,7 +563,7 @@ UnknownText_0x1b5912: ; 0x1b5912 line "got a minute?" done -UnknownText_0x1b5948: ; 0x1b5948 +UnknownText_0x1b5948: text "Yo, <PLAYER>! How's" line "it going?" @@ -573,7 +573,7 @@ UnknownText_0x1b5948: ; 0x1b5948 line "Got a minute?" done -UnknownText_0x1b597c: ; 0x1b597c +UnknownText_0x1b597c: text "Yo, <PLAYER>!" line "How're you doing?" @@ -583,7 +583,7 @@ UnknownText_0x1b597c: ; 0x1b597c line "got a minute?" done -UnknownText_0x1b59b2: ; 0x1b59b2 +UnknownText_0x1b59b2: text "How are your" line "#MON doing?" @@ -600,7 +600,7 @@ UnknownText_0x1b59b2: ; 0x1b59b2 line "trainer with it!" done -UnknownText_0x1b5a3b: ; 0x1b5a3b +UnknownText_0x1b5a3b: text "Hello? This is" line "@" text_from_ram wStringBuffer3 @@ -610,7 +610,7 @@ UnknownText_0x1b5a3b: ; 0x1b5a3b line "Good morning!" done -UnknownText_0x1b5a74: ; 0x1b5a74 +UnknownText_0x1b5a74: text "Hello? This is" line "@" text_from_ram wStringBuffer3 @@ -619,7 +619,7 @@ UnknownText_0x1b5a74: ; 0x1b5a74 para "Oh, hi, <PLAY_G>!" done -UnknownText_0x1b5a9f: ; 0x1b5a9f +UnknownText_0x1b5a9f: text "Hello? This is" line "@" text_from_ram wStringBuffer3 @@ -629,7 +629,7 @@ UnknownText_0x1b5a9f: ; 0x1b5a9f line "Good evening!" done -UnknownText_0x1b5ad8: ; 0x1b5ad8 +UnknownText_0x1b5ad8: text "<PLAY_G>, good" line "morning!" @@ -639,7 +639,7 @@ UnknownText_0x1b5ad8: ; 0x1b5ad8 line "Isn't it nice out?" done -UnknownText_0x1b5b0b: ; 0x1b5b0b +UnknownText_0x1b5b0b: text "<PLAY_G>, howdy!" para "It's me, @" @@ -648,7 +648,7 @@ UnknownText_0x1b5b0b: ; 0x1b5b0b line "Isn't it nice out?" done -UnknownText_0x1b5b37: ; 0x1b5b37 +UnknownText_0x1b5b37: text "Good evening," line "<PLAY_G>!" @@ -658,7 +658,7 @@ UnknownText_0x1b5b37: ; 0x1b5b37 line "Were you awake?" done -UnknownText_0x1b5b68: ; 0x1b5b68 +UnknownText_0x1b5b68: text "How are your" line "#MON doing?" @@ -678,7 +678,7 @@ UnknownText_0x1b5b68: ; 0x1b5b68 line "exhausting." done -UnknownText_0x1b5c10: ; 0x1b5c10 +UnknownText_0x1b5c10: text "Yes? Ah, <PLAY_G>." para "You're courteous" @@ -688,7 +688,7 @@ UnknownText_0x1b5c10: ; 0x1b5c10 line "call on the phone." done -UnknownText_0x1b5c63: ; 0x1b5c63 +UnknownText_0x1b5c63: text "Yes? Ah, <PLAY_G>." para "You're courteous" @@ -698,7 +698,7 @@ UnknownText_0x1b5c63: ; 0x1b5c63 line "call on the phone." done -UnknownText_0x1b5cb6: ; 0x1b5cb6 +UnknownText_0x1b5cb6: text "Yes? Ah, <PLAY_G>." para "You're courteous" @@ -708,28 +708,28 @@ UnknownText_0x1b5cb6: ; 0x1b5cb6 line "call on the phone." done -UnknownText_0x1b5d09: ; 0x1b5d09 +UnknownText_0x1b5d09: text "Hiya, it's Uncle" line "@" text_from_ram wStringBuffer3 text "." done -UnknownText_0x1b5d21: ; 0x1b5d21 +UnknownText_0x1b5d21: text "Hiya, it's Uncle" line "@" text_from_ram wStringBuffer3 text "." done -UnknownText_0x1b5d39: ; 0x1b5d39 +UnknownText_0x1b5d39: text "Hiya, it's Uncle" line "@" text_from_ram wStringBuffer3 text "." done -UnknownText_0x1b5d51: ; 0x1b5d51 +UnknownText_0x1b5d51: text "Are you taking" line "good care of your" @@ -738,7 +738,7 @@ UnknownText_0x1b5d51: ; 0x1b5d51 cont "partners!" done -UnknownText_0x1b5d9f: ; 0x1b5d9f +UnknownText_0x1b5d9f: text "Hello, @" text_from_ram wStringBuffer3 text_start @@ -748,7 +748,7 @@ UnknownText_0x1b5d9f: ; 0x1b5d9f line "Good morning." done -UnknownText_0x1b5dcc: ; 0x1b5dcc +UnknownText_0x1b5dcc: text "Hello, @" text_from_ram wStringBuffer3 text_start @@ -758,7 +758,7 @@ UnknownText_0x1b5dcc: ; 0x1b5dcc line "How are you?" done -UnknownText_0x1b5df8: ; 0x1b5df8 +UnknownText_0x1b5df8: text "Hello, @" text_from_ram wStringBuffer3 text_start @@ -768,7 +768,7 @@ UnknownText_0x1b5df8: ; 0x1b5df8 line "Good evening." done -UnknownText_0x1b5e25: ; 0x1b5e25 +UnknownText_0x1b5e25: text "Good morning," line "<PLAY_G>." @@ -778,7 +778,7 @@ UnknownText_0x1b5e25: ; 0x1b5e25 line "Were you sleeping?" done -UnknownText_0x1b5e59: ; 0x1b5e59 +UnknownText_0x1b5e59: text "Hi, <PLAY_G>." line "This is @" text_from_ram wStringBuffer3 @@ -788,7 +788,7 @@ UnknownText_0x1b5e59: ; 0x1b5e59 line "going for you?" done -UnknownText_0x1b5e8e: ; 0x1b5e8e +UnknownText_0x1b5e8e: text "Good evening," line "<PLAY_G>." @@ -798,7 +798,7 @@ UnknownText_0x1b5e8e: ; 0x1b5e8e line "Are you awake?" done -UnknownText_0x1b5ebe: ; 0x1b5ebe +UnknownText_0x1b5ebe: text "I had some time," line "so I called you." @@ -820,7 +820,7 @@ UnknownText_0x1b5ebe: ; 0x1b5ebe line "the receptionist!" done -UnknownText_0x1b5f7a: ; 0x1b5f7a +UnknownText_0x1b5f7a: text "Yeah, @" text_from_ram wStringBuffer3 text " the" @@ -829,7 +829,7 @@ UnknownText_0x1b5f7a: ; 0x1b5f7a para "Ah, <PLAYER>!" done -UnknownText_0x1b5f9e: ; 0x1b5f9e +UnknownText_0x1b5f9e: text "Yeah, @" text_from_ram wStringBuffer3 text " the" @@ -839,7 +839,7 @@ UnknownText_0x1b5f9e: ; 0x1b5f9e line "right?" done -UnknownText_0x1b5fc9: ; 0x1b5fc9 +UnknownText_0x1b5fc9: text "Yeah, @" text_from_ram wStringBuffer3 text " the" @@ -849,7 +849,7 @@ UnknownText_0x1b5fc9: ; 0x1b5fc9 line "it?" done -UnknownText_0x1b5ff6: ; 0x1b5ff6 +UnknownText_0x1b5ff6: text "Yo, <PLAYER>?" para "This is @" @@ -858,7 +858,7 @@ UnknownText_0x1b5ff6: ; 0x1b5ff6 line "the HIKER!" done -UnknownText_0x1b6017: ; 0x1b6017 +UnknownText_0x1b6017: text "Hey, is this" line "<PLAYER>?" @@ -868,7 +868,7 @@ UnknownText_0x1b6017: ; 0x1b6017 line "the HIKER!" done -UnknownText_0x1b6041: ; 0x1b6041 +UnknownText_0x1b6041: text "<PLAYER>, you still" line "awake?" @@ -878,7 +878,7 @@ UnknownText_0x1b6041: ; 0x1b6041 line "the HIKER!" done -UnknownText_0x1b606f: ; 0x1b606f +UnknownText_0x1b606f: text "Are your #MON" line "as feisty as ever?" @@ -894,7 +894,7 @@ UnknownText_0x1b606f: ; 0x1b606f line "all our energy." done -UnknownText_0x1b60f5: ; 0x1b60f5 +UnknownText_0x1b60f5: text "Yes? This is" line "@" text_from_ram wStringBuffer3 @@ -903,7 +903,7 @@ UnknownText_0x1b60f5: ; 0x1b60f5 para "Hey, <PLAY_G>!" done -UnknownText_0x1b611b: ; 0x1b611b +UnknownText_0x1b611b: text "Yes? This is" line "@" text_from_ram wStringBuffer3 @@ -913,7 +913,7 @@ UnknownText_0x1b611b: ; 0x1b611b line "<PLAY_G>." done -UnknownText_0x1b6149: ; 0x1b6149 +UnknownText_0x1b6149: text "Yes? This is" line "@" text_from_ram wStringBuffer3 @@ -922,7 +922,7 @@ UnknownText_0x1b6149: ; 0x1b6149 para "Ah, <PLAY_G>!" done -UnknownText_0x1b616e: ; 0x1b616e +UnknownText_0x1b616e: text "Hello, this is" line "@" text_from_ram wStringBuffer3 @@ -931,7 +931,7 @@ UnknownText_0x1b616e: ; 0x1b616e para "<PLAY_G>, right?" done -UnknownText_0x1b618f: ; 0x1b618f +UnknownText_0x1b618f: text "Hello, this is" line "@" text_from_ram wStringBuffer3 @@ -941,7 +941,7 @@ UnknownText_0x1b618f: ; 0x1b618f line "you doing?" done -UnknownText_0x1b61bd: ; 0x1b61bd +UnknownText_0x1b61bd: text "Hello, this is" line "@" text_from_ram wStringBuffer3 @@ -951,7 +951,7 @@ UnknownText_0x1b61bd: ; 0x1b61bd line "call you so late." done -UnknownText_0x1b61f2: ; 0x1b61f2 +UnknownText_0x1b61f2: text "How do you raise" line "your #MON?" @@ -965,7 +965,7 @@ UnknownText_0x1b61f2: ; 0x1b61f2 line "with items." done -UnknownText_0x1b626a: ; 0x1b626a +UnknownText_0x1b626a: text "Hello? This is" line "@" text_from_ram wStringBuffer3 @@ -975,7 +975,7 @@ UnknownText_0x1b626a: ; 0x1b626a line "Good morning!" done -UnknownText_0x1b6296: ; 0x1b6296 +UnknownText_0x1b6296: text "Hello? This is" line "@" text_from_ram wStringBuffer3 @@ -985,7 +985,7 @@ UnknownText_0x1b6296: ; 0x1b6296 line "Hi, how are you?" done -UnknownText_0x1b62c5: ; 0x1b62c5 +UnknownText_0x1b62c5: text "Hello? This is" line "@" text_from_ram wStringBuffer3 @@ -995,7 +995,7 @@ UnknownText_0x1b62c5: ; 0x1b62c5 line "Good evening!" done -UnknownText_0x1b62f1: ; 0x1b62f1 +UnknownText_0x1b62f1: text "<PLAY_G>?" para "It's @" @@ -1004,7 +1004,7 @@ UnknownText_0x1b62f1: ; 0x1b62f1 line "Good morning!" done -UnknownText_0x1b630e: ; 0x1b630e +UnknownText_0x1b630e: text "<PLAY_G>?" para "It's @" @@ -1013,7 +1013,7 @@ UnknownText_0x1b630e: ; 0x1b630e line "this a bad time?" done -UnknownText_0x1b6331: ; 0x1b6331 +UnknownText_0x1b6331: text "<PLAY_G>?" para "It's @" @@ -1022,7 +1022,7 @@ UnknownText_0x1b6331: ; 0x1b6331 line "Got time to chat?" done -UnknownText_0x1b6352: ; 0x1b6352 +UnknownText_0x1b6352: text "Are your #MON" line "still tough?" @@ -1032,7 +1032,7 @@ UnknownText_0x1b6352: ; 0x1b6352 text "." done -UnknownText_0x1b638c: ; 0x1b638c +UnknownText_0x1b638c: text "Hello? @" text_from_ram wStringBuffer3 text_start @@ -1041,7 +1041,7 @@ UnknownText_0x1b638c: ; 0x1b638c para "Hey, <PLAY_G>!" done -UnknownText_0x1b63a8: ; 0x1b63a8 +UnknownText_0x1b63a8: text "Hello? @" text_from_ram wStringBuffer3 text_start @@ -1050,7 +1050,7 @@ UnknownText_0x1b63a8: ; 0x1b63a8 para "Wow, <PLAY_G>!" done -UnknownText_0x1b63c4: ; 0x1b63c4 +UnknownText_0x1b63c4: text "Hello? @" text_from_ram wStringBuffer3 text_start @@ -1059,7 +1059,7 @@ UnknownText_0x1b63c4: ; 0x1b63c4 para "Yippee, <PLAY_G>!" done -UnknownText_0x1b63e3: ; 0x1b63e3 +UnknownText_0x1b63e3: text "Uh, hello." line "<PLAY_G>?" @@ -1069,7 +1069,7 @@ UnknownText_0x1b63e3: ; 0x1b63e3 text "!" done -UnknownText_0x1b6407: ; 0x1b6407 +UnknownText_0x1b6407: text "Uh, hello," line "<PLAY_G>?" @@ -1079,7 +1079,7 @@ UnknownText_0x1b6407: ; 0x1b6407 text "!" done -UnknownText_0x1b642c: ; 0x1b642c +UnknownText_0x1b642c: text "Uh, hello," line "<PLAY_G>?" @@ -1089,7 +1089,7 @@ UnknownText_0x1b642c: ; 0x1b642c text "!" done -UnknownText_0x1b6454: ; 0x1b6454 +UnknownText_0x1b6454: text "Yeah, hello." line "This is @" text_from_ram wStringBuffer3 @@ -1098,7 +1098,7 @@ UnknownText_0x1b6454: ; 0x1b6454 para "…Huh, <PLAY_G>? Yo!" done -UnknownText_0x1b647e: ; 0x1b647e +UnknownText_0x1b647e: text "Yeah, hello, you" line "got @" text_from_ram wStringBuffer3 @@ -1107,7 +1107,7 @@ UnknownText_0x1b647e: ; 0x1b647e para "…Huh, <PLAY_G>? Yo!" done -UnknownText_0x1b64a8: ; 0x1b64a8 +UnknownText_0x1b64a8: text "Yeah, hello, you" line "got @" text_from_ram wStringBuffer3 @@ -1116,7 +1116,7 @@ UnknownText_0x1b64a8: ; 0x1b64a8 para "…Huh, <PLAY_G>? Yo!" done -UnknownText_0x1b64d2: ; 0x1b64d2 +UnknownText_0x1b64d2: text "Yeah, hello?" line "@" text_from_ram wStringBuffer3 @@ -1126,7 +1126,7 @@ UnknownText_0x1b64d2: ; 0x1b64d2 line "to, <PLAY_G>?" done -UnknownText_0x1b6506: ; 0x1b6506 +UnknownText_0x1b6506: text "Yeah, hello?" line "@" text_from_ram wStringBuffer3 @@ -1136,7 +1136,7 @@ UnknownText_0x1b6506: ; 0x1b6506 line "<PLAY_G>?" done -UnknownText_0x1b6539: ; 0x1b6539 +UnknownText_0x1b6539: text "Yeah, hello?" line "@" text_from_ram wStringBuffer3 @@ -1146,13 +1146,13 @@ UnknownText_0x1b6539: ; 0x1b6539 line "<PLAY_G>?" done -UnknownText_0x1b656c: ; 0x1b656c +UnknownText_0x1b656c: text "I bet your #MON" line "are a lot stronger" cont "than before." done -UnknownText_0x1b659d: ; 0x1b659d +UnknownText_0x1b659d: text "Yup, it's @" text_from_ram wStringBuffer3 text "!" @@ -1161,7 +1161,7 @@ UnknownText_0x1b659d: ; 0x1b659d line "Good morning!" done -UnknownText_0x1b65c7: ; 0x1b65c7 +UnknownText_0x1b65c7: text "Yup, it's @" text_from_ram wStringBuffer3 text "!" @@ -1169,7 +1169,7 @@ UnknownText_0x1b65c7: ; 0x1b65c7 para "Is that <PLAY_G>?" done -UnknownText_0x1b65e3: ; 0x1b65e3 +UnknownText_0x1b65e3: text "Yup, it's @" text_from_ram wStringBuffer3 text "!" @@ -1178,28 +1178,28 @@ UnknownText_0x1b65e3: ; 0x1b65e3 line "Good evening!" done -UnknownText_0x1b660d: ; 0x1b660d +UnknownText_0x1b660d: text "Hello! It's me," line "@" text_from_ram wStringBuffer3 text "!" done -UnknownText_0x1b6624: ; 0x1b6624 +UnknownText_0x1b6624: text "Hello! It's me," line "@" text_from_ram wStringBuffer3 text "!" done -UnknownText_0x1b663b: ; 0x1b663b +UnknownText_0x1b663b: text "Hello! It's me," line "@" text_from_ram wStringBuffer3 text "!" done -UnknownText_0x1b6652: ; 0x1b6652 +UnknownText_0x1b6652: text "<PLAY_G>, are you" line "raising your" cont "#MON properly?" @@ -1212,7 +1212,7 @@ UnknownText_0x1b6652: ; 0x1b6652 cont "love and care." done -UnknownText_0x1b66c8: ; 0x1b66c8 +UnknownText_0x1b66c8: text "Hi, @" text_from_ram wStringBuffer3 text " on the" @@ -1221,7 +1221,7 @@ UnknownText_0x1b66c8: ; 0x1b66c8 para "Hey! It's <PLAY_G>!" done -UnknownText_0x1b66ec: ; 0x1b66ec +UnknownText_0x1b66ec: text "Hi, @" text_from_ram wStringBuffer3 text " on the" @@ -1231,7 +1231,7 @@ UnknownText_0x1b66ec: ; 0x1b66ec line "It's <PLAY_G>!" done -UnknownText_0x1b6713: ; 0x1b6713 +UnknownText_0x1b6713: text "Hi, @" text_from_ram wStringBuffer3 text " on the" @@ -1241,7 +1241,7 @@ UnknownText_0x1b6713: ; 0x1b6713 line "What's up?" done -UnknownText_0x1b6738: ; 0x1b6738 +UnknownText_0x1b6738: text "Uh, <PLAY_G>?" para "It's me!" @@ -1250,7 +1250,7 @@ UnknownText_0x1b6738: ; 0x1b6738 text "!" done -UnknownText_0x1b6757: ; 0x1b6757 +UnknownText_0x1b6757: text "Uh, <PLAY_G>?" para "It's me!" @@ -1259,7 +1259,7 @@ UnknownText_0x1b6757: ; 0x1b6757 text "!" done -UnknownText_0x1b6776: ; 0x1b6776 +UnknownText_0x1b6776: text "Uh, <PLAY_G>?" para "It's me!" @@ -1268,7 +1268,7 @@ UnknownText_0x1b6776: ; 0x1b6776 text "!" done -UnknownText_0x1b6795: ; 0x1b6795 +UnknownText_0x1b6795: text "My @" text_from_ram wStringBuffer4 text " is" @@ -1281,7 +1281,7 @@ UnknownText_0x1b6795: ; 0x1b6795 line "#MON doing?" done -UnknownText_0x1b67e2: ; 0x1b67e2 +UnknownText_0x1b67e2: text "Hello, this is" line "@" text_from_ram wStringBuffer3 @@ -1291,7 +1291,7 @@ UnknownText_0x1b67e2: ; 0x1b67e2 line "Good morning!" done -UnknownText_0x1b680e: ; 0x1b680e +UnknownText_0x1b680e: text "Hello, this is" line "@" text_from_ram wStringBuffer3 @@ -1301,7 +1301,7 @@ UnknownText_0x1b680e: ; 0x1b680e line "day!" done -UnknownText_0x1b6836: ; 0x1b6836 +UnknownText_0x1b6836: text "Hello, this is" line "@" text_from_ram wStringBuffer3 @@ -1311,7 +1311,7 @@ UnknownText_0x1b6836: ; 0x1b6836 line "evening!" done -UnknownText_0x1b6862: ; 0x1b6862 +UnknownText_0x1b6862: text "Hi, <PLAY_G>, good" line "morning!" @@ -1321,7 +1321,7 @@ UnknownText_0x1b6862: ; 0x1b6862 line "How are you?" done -UnknownText_0x1b6890: ; 0x1b6890 +UnknownText_0x1b6890: text "Hi, <PLAY_G>, good" line "day!" @@ -1331,7 +1331,7 @@ UnknownText_0x1b6890: ; 0x1b6890 line "How are you?" done -UnknownText_0x1b68ba: ; 0x1b68ba +UnknownText_0x1b68ba: text "Hi, <PLAY_G>, good" line "evening!" @@ -1341,7 +1341,7 @@ UnknownText_0x1b68ba: ; 0x1b68ba line "How are you?" done -UnknownText_0x1b68e8: ; 0x1b68e8 +UnknownText_0x1b68e8: text "How are your" line "#MON doing?" @@ -1360,28 +1360,28 @@ UnknownText_0x1b68e8: ; 0x1b68e8 cont "be a big surprise." done -UnknownText_0x1b69a8: ; 0x1b69a8 +UnknownText_0x1b69a8: text "Hi, <PLAY_G>?" para "Good morning pika." line "What's up pika?" done -UnknownText_0x1b69d2: ; 0x1b69d2 +UnknownText_0x1b69d2: text "Hi, <PLAY_G>?" para "Good day pika," line "what's up pika?" done -UnknownText_0x1b69f8: ; 0x1b69f8 +UnknownText_0x1b69f8: text "Hi, <PLAY_G>?" para "Good evening pika," line "what's up pika?" done -UnknownText_0x1b6a22: ; 0x1b6a22 +UnknownText_0x1b6a22: text "<PLAY_G> pika, good" line "morning!" @@ -1391,7 +1391,7 @@ UnknownText_0x1b6a22: ; 0x1b6a22 line "pika are you?" done -UnknownText_0x1b6a56: ; 0x1b6a56 +UnknownText_0x1b6a56: text "<PLAY_G> pika, good" line "pika day!" @@ -1401,7 +1401,7 @@ UnknownText_0x1b6a56: ; 0x1b6a56 line "pika are you?" done -UnknownText_0x1b6a8b: ; 0x1b6a8b +UnknownText_0x1b6a8b: text "<PLAY_G> pika, good" line "evening!" @@ -1411,7 +1411,7 @@ UnknownText_0x1b6a8b: ; 0x1b6a8b line "you pika awake?" done -UnknownText_0x1b6ac2: ; 0x1b6ac2 +UnknownText_0x1b6ac2: text "You have to hear" line "this! My lovable" @@ -1425,7 +1425,7 @@ UnknownText_0x1b6ac2: ; 0x1b6ac2 cont "together as one!" done -UnknownText_0x1b6b39: ; 0x1b6b39 +UnknownText_0x1b6b39: text "Hello, this is" line "@" text_from_ram wStringBuffer3 @@ -1435,7 +1435,7 @@ UnknownText_0x1b6b39: ; 0x1b6b39 line "<PLAY_G>." done -UnknownText_0x1b6b65: ; 0x1b6b65 +UnknownText_0x1b6b65: text "Hello, this is" line "@" text_from_ram wStringBuffer3 @@ -1445,7 +1445,7 @@ UnknownText_0x1b6b65: ; 0x1b6b65 line "<PLAY_G>, right?" done -UnknownText_0x1b6b92: ; 0x1b6b92 +UnknownText_0x1b6b92: text "Hello, this is" line "@" text_from_ram wStringBuffer3 @@ -1455,7 +1455,7 @@ UnknownText_0x1b6b92: ; 0x1b6b92 line "<PLAY_G>!" done -UnknownText_0x1b6bb9: ; 0x1b6bb9 +UnknownText_0x1b6bb9: text "Hello!" line "@" text_from_ram wStringBuffer3 @@ -1465,7 +1465,7 @@ UnknownText_0x1b6bb9: ; 0x1b6bb9 line "weather's great!" done -UnknownText_0x1b6bef: ; 0x1b6bef +UnknownText_0x1b6bef: text "Hello!" line "@" text_from_ram wStringBuffer3 @@ -1475,7 +1475,7 @@ UnknownText_0x1b6bef: ; 0x1b6bef line "for fishing!" done -UnknownText_0x1b6c23: ; 0x1b6c23 +UnknownText_0x1b6c23: text "Hello!" line "@" text_from_ram wStringBuffer3 @@ -1485,7 +1485,7 @@ UnknownText_0x1b6c23: ; 0x1b6c23 line "for fishing!" done -UnknownText_0x1b6c56: ; 0x1b6c56 +UnknownText_0x1b6c56: text "How's your trip" line "coming along?" @@ -1493,7 +1493,7 @@ UnknownText_0x1b6c56: ; 0x1b6c56 line "about my fishing!" done -UnknownText_0x1b6c96: ; 0x1b6c96 +UnknownText_0x1b6c96: text "Yes? @" text_from_ram wStringBuffer3 text " here…" @@ -1502,7 +1502,7 @@ UnknownText_0x1b6c96: ; 0x1b6c96 line "can I do for you?" done -UnknownText_0x1b6cc6: ; 0x1b6cc6 +UnknownText_0x1b6cc6: text "Yes? @" text_from_ram wStringBuffer3 text " here…" @@ -1511,7 +1511,7 @@ UnknownText_0x1b6cc6: ; 0x1b6cc6 line "can I do for you?" done -UnknownText_0x1b6cf6: ; 0x1b6cf6 +UnknownText_0x1b6cf6: text "Yes? @" text_from_ram wStringBuffer3 text " here…" @@ -1520,7 +1520,7 @@ UnknownText_0x1b6cf6: ; 0x1b6cf6 line "can I do for you?" done -UnknownText_0x1b6d26: ; 0x1b6d26 +UnknownText_0x1b6d26: text "Hiya, <PLAYER>. How" line "are you doing?" @@ -1530,7 +1530,7 @@ UnknownText_0x1b6d26: ; 0x1b6d26 text "." done -UnknownText_0x1b6d57: ; 0x1b6d57 +UnknownText_0x1b6d57: text "Hiya, <PLAYER>, how" line "are you doing?" @@ -1540,7 +1540,7 @@ UnknownText_0x1b6d57: ; 0x1b6d57 text "." done -UnknownText_0x1b6d88: ; 0x1b6d88 +UnknownText_0x1b6d88: text "Hiya, <PLAYER>, how" line "are you doing?" @@ -1550,7 +1550,7 @@ UnknownText_0x1b6d88: ; 0x1b6d88 text "." done -UnknownText_0x1b6db9: ; 0x1b6db9 +UnknownText_0x1b6db9: text "Oh yeah, I saw you" line "coming out of a" @@ -1573,7 +1573,7 @@ UnknownText_0x1b6db9: ; 0x1b6db9 cont "often. Heheh!" done -UnknownText_0x1b6e7c: ; 0x1b6e7c +UnknownText_0x1b6e7c: text "Yes? This is" line "@" text_from_ram wStringBuffer3 @@ -1583,7 +1583,7 @@ UnknownText_0x1b6e7c: ; 0x1b6e7c line "Good morning." done -UnknownText_0x1b6ea6: ; 0x1b6ea6 +UnknownText_0x1b6ea6: text "Yes? This is" line "@" text_from_ram wStringBuffer3 @@ -1593,7 +1593,7 @@ UnknownText_0x1b6ea6: ; 0x1b6ea6 line "Hello." done -UnknownText_0x1b6ec9: ; 0x1b6ec9 +UnknownText_0x1b6ec9: text "Yes? This is" line "@" text_from_ram wStringBuffer3 @@ -1603,7 +1603,7 @@ UnknownText_0x1b6ec9: ; 0x1b6ec9 line "evening." done -UnknownText_0x1b6ef3: ; 0x1b6ef3 +UnknownText_0x1b6ef3: text "Is this <PLAY_G>?" para "Good morning. This" @@ -1612,7 +1612,7 @@ UnknownText_0x1b6ef3: ; 0x1b6ef3 text "." done -UnknownText_0x1b6f1c: ; 0x1b6f1c +UnknownText_0x1b6f1c: text "Is this <PLAY_G>?" para "Hi, it's @" @@ -1620,7 +1620,7 @@ UnknownText_0x1b6f1c: ; 0x1b6f1c text "." done -UnknownText_0x1b6f37: ; 0x1b6f37 +UnknownText_0x1b6f37: text "Is this <PLAY_G>?" para "Good evening. This" @@ -1629,7 +1629,7 @@ UnknownText_0x1b6f37: ; 0x1b6f37 text "." done -UnknownText_0x1b6f60: ; 0x1b6f60 +UnknownText_0x1b6f60: text "Are your #MON" line "doing well?" @@ -1652,7 +1652,7 @@ UnknownText_0x1b6f60: ; 0x1b6f60 line "every day." done -UnknownText_0x1b7019: ; 0x1b7019 +UnknownText_0x1b7019: text "Yes, hello?" line "@" text_from_ram wStringBuffer3 @@ -1664,7 +1664,7 @@ UnknownText_0x1b7019: ; 0x1b7019 line "#MON?" done -UnknownText_0x1b7057: ; 0x1b7057 +UnknownText_0x1b7057: text "Yes, hello?" line "@" text_from_ram wStringBuffer3 @@ -1676,7 +1676,7 @@ UnknownText_0x1b7057: ; 0x1b7057 line "#MON flying?" done -UnknownText_0x1b7092: ; 0x1b7092 +UnknownText_0x1b7092: text "Yes, hello?" line "@" text_from_ram wStringBuffer3 @@ -1689,7 +1689,7 @@ UnknownText_0x1b7092: ; 0x1b7092 line "see some action?" done -UnknownText_0x1b70e7: ; 0x1b70e7 +UnknownText_0x1b70e7: text "Good morning," line "<PLAY_G>!" @@ -1699,7 +1699,7 @@ UnknownText_0x1b70e7: ; 0x1b70e7 line "Good morning!" done -UnknownText_0x1b7112: ; 0x1b7112 +UnknownText_0x1b7112: text "Hi, <PLAY_G>!" para "It's @" @@ -1708,7 +1708,7 @@ UnknownText_0x1b7112: ; 0x1b7112 line "Remember me?" done -UnknownText_0x1b7132: ; 0x1b7132 +UnknownText_0x1b7132: text "Good evening," line "<PLAY_G>!" @@ -1718,7 +1718,7 @@ UnknownText_0x1b7132: ; 0x1b7132 line "Are you free now?" done -UnknownText_0x1b7161: ; 0x1b7161 +UnknownText_0x1b7161: text "Are you and your" line "#MON fine?" @@ -1734,7 +1734,7 @@ UnknownText_0x1b7161: ; 0x1b7161 line "#MON!" done -UnknownText_0x1b71d5: ; 0x1b71d5 +UnknownText_0x1b71d5: text "Hello, you have" line "reached @" text_from_ram wStringBuffer3 @@ -1743,7 +1743,7 @@ UnknownText_0x1b71d5: ; 0x1b71d5 para "Ah, <PLAY_G>." done -UnknownText_0x1b71fc: ; 0x1b71fc +UnknownText_0x1b71fc: text "Hello, you have" line "reached @" text_from_ram wStringBuffer3 @@ -1753,7 +1753,7 @@ UnknownText_0x1b71fc: ; 0x1b71fc line "it?" done -UnknownText_0x1b722a: ; 0x1b722a +UnknownText_0x1b722a: text "Hello, you have" line "reached @" text_from_ram wStringBuffer3 @@ -1763,7 +1763,7 @@ UnknownText_0x1b722a: ; 0x1b722a line "<PLAY_G>." done -UnknownText_0x1b725c: ; 0x1b725c +UnknownText_0x1b725c: text "Ah, it's @" text_from_ram wStringBuffer3 text "…" @@ -1772,7 +1772,7 @@ UnknownText_0x1b725c: ; 0x1b725c line "moment?" done -UnknownText_0x1b7283: ; 0x1b7283 +UnknownText_0x1b7283: text "Ah, it's @" text_from_ram wStringBuffer3 text "…" @@ -1780,7 +1780,7 @@ UnknownText_0x1b7283: ; 0x1b7283 para "Can you talk now?" done -UnknownText_0x1b72a5: ; 0x1b72a5 +UnknownText_0x1b72a5: text "Ah, it's @" text_from_ram wStringBuffer3 text "…" @@ -1789,7 +1789,7 @@ UnknownText_0x1b72a5: ; 0x1b72a5 line "so late." done -UnknownText_0x1b72d0: ; 0x1b72d0 +UnknownText_0x1b72d0: text "Have your #MON" line "grown any?" @@ -1799,7 +1799,7 @@ UnknownText_0x1b72d0: ; 0x1b72d0 line "grown quite a bit." done -UnknownText_0x1b730b: ; 0x1b730b +UnknownText_0x1b730b: text_from_ram wStringBuffer3 text " here…" @@ -1807,7 +1807,7 @@ UnknownText_0x1b730b: ; 0x1b730b line "morning, hey?" done -UnknownText_0x1b7331: ; 0x1b7331 +UnknownText_0x1b7331: text_from_ram wStringBuffer3 text " here…" @@ -1815,7 +1815,7 @@ UnknownText_0x1b7331: ; 0x1b7331 line "weather, hey?" done -UnknownText_0x1b7357: ; 0x1b7357 +UnknownText_0x1b7357: text_from_ram wStringBuffer3 text " here…" @@ -1823,28 +1823,28 @@ UnknownText_0x1b7357: ; 0x1b7357 line "moonlight, hey?" done -UnknownText_0x1b737f: ; 0x1b737f +UnknownText_0x1b737f: text "Hey, <PLAYER>!" line "This is @" text_from_ram wStringBuffer3 text "!" done -UnknownText_0x1b7397: ; 0x1b7397 +UnknownText_0x1b7397: text "Hey, <PLAYER>!" line "This is @" text_from_ram wStringBuffer3 text "!" done -UnknownText_0x1b73af: ; 0x1b73af +UnknownText_0x1b73af: text "Hey, <PLAYER>!" line "This is @" text_from_ram wStringBuffer3 text "!" done -UnknownText_0x1b73c7: ; 0x1b73c7 +UnknownText_0x1b73c7: text "Yup, yup!" line "It's @" text_from_ram wStringBuffer3 @@ -1854,7 +1854,7 @@ UnknownText_0x1b73c7: ; 0x1b73c7 line "<PLAY_G>!" done -UnknownText_0x1b73ef: ; 0x1b73ef +UnknownText_0x1b73ef: text "Yup, yup!" line "It's @" text_from_ram wStringBuffer3 @@ -1864,7 +1864,7 @@ UnknownText_0x1b73ef: ; 0x1b73ef line "<PLAY_G>!" done -UnknownText_0x1b7417: ; 0x1b7417 +UnknownText_0x1b7417: text "Yup, yup!" line "It's @" text_from_ram wStringBuffer3 @@ -1874,7 +1874,7 @@ UnknownText_0x1b7417: ; 0x1b7417 line "<PLAY_G>!" done -UnknownText_0x1b743f: ; 0x1b743f +UnknownText_0x1b743f: text "<PLAY_G>, it's" line "@" text_from_ram wStringBuffer3 @@ -1884,7 +1884,7 @@ UnknownText_0x1b743f: ; 0x1b743f line "proper breakfast?" done -UnknownText_0x1b746f: ; 0x1b746f +UnknownText_0x1b746f: text "<PLAY_G>, it's" line "@" text_from_ram wStringBuffer3 @@ -1894,7 +1894,7 @@ UnknownText_0x1b746f: ; 0x1b746f line "proper lunch?" done -UnknownText_0x1b749b: ; 0x1b749b +UnknownText_0x1b749b: text "<PLAY_G>, it's" line "@" text_from_ram wStringBuffer3 @@ -1904,7 +1904,7 @@ UnknownText_0x1b749b: ; 0x1b749b line "proper dinner?" done -UnknownText_0x1b74c8: ; 0x1b74c8 +UnknownText_0x1b74c8: text "Are your #MON" line "looking good?" @@ -1917,7 +1917,7 @@ UnknownText_0x1b74c8: ; 0x1b74c8 line "Hahahah!" done -UnknownText_0x1b751a: ; 0x1b751a +UnknownText_0x1b751a: text "Yes, this is" line "@" text_from_ram wStringBuffer3 @@ -1927,7 +1927,7 @@ UnknownText_0x1b751a: ; 0x1b751a line "Good morning!" done -UnknownText_0x1b7548: ; 0x1b7548 +UnknownText_0x1b7548: text "Yes, this is" line "@" text_from_ram wStringBuffer3 @@ -1937,7 +1937,7 @@ UnknownText_0x1b7548: ; 0x1b7548 line "Yahoo!" done -UnknownText_0x1b756f: ; 0x1b756f +UnknownText_0x1b756f: text "Yes, this is" line "@" text_from_ram wStringBuffer3 @@ -1946,7 +1946,7 @@ UnknownText_0x1b756f: ; 0x1b756f para "Oh, hi, <PLAY_G>!" done -UnknownText_0x1b758f: ; 0x1b758f +UnknownText_0x1b758f: text "<PLAY_G>!" para "It's @" @@ -1955,7 +1955,7 @@ UnknownText_0x1b758f: ; 0x1b758f line "Good morning!" done -UnknownText_0x1b75ac: ; 0x1b75ac +UnknownText_0x1b75ac: text "<PLAY_G>!" para "It's @" @@ -1964,7 +1964,7 @@ UnknownText_0x1b75ac: ; 0x1b75ac line "Working hard?" done -UnknownText_0x1b75c9: ; 0x1b75c9 +UnknownText_0x1b75c9: text "<PLAY_G>!" para "It's @" @@ -1973,7 +1973,7 @@ UnknownText_0x1b75c9: ; 0x1b75c9 line "Were you up?" done -UnknownText_0x1b75e5: ; 0x1b75e5 +UnknownText_0x1b75e5: text "Are you raising" line "your #MON?" @@ -1986,6 +1986,6 @@ UnknownText_0x1b75e5: ; 0x1b75e5 cont "looking good!" done -UnusedPhoneText: ; 0x1b7624 +UnusedPhoneText: text "Good morning." done 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/dex_entries.asm b/data/pokemon/dex_entries.asm index 7381a4262..a66f16737 100644 --- a/data/pokemon/dex_entries.asm +++ b/data/pokemon/dex_entries.asm @@ -3,7 +3,6 @@ INCLUDE "constants.asm" SECTION "Pokedex Entries 001-064", ROMX -PokedexEntries1:: BulbasaurPokedexEntry:: INCLUDE "data/pokemon/dex_entries/bulbasaur.asm" IvysaurPokedexEntry:: INCLUDE "data/pokemon/dex_entries/ivysaur.asm" VenusaurPokedexEntry:: INCLUDE "data/pokemon/dex_entries/venusaur.asm" @@ -72,7 +71,6 @@ KadabraPokedexEntry:: INCLUDE "data/pokemon/dex_entries/kadabra.asm" SECTION "Pokedex Entries 065-128", ROMX -PokedexEntries2:: AlakazamPokedexEntry:: INCLUDE "data/pokemon/dex_entries/alakazam.asm" MachopPokedexEntry:: INCLUDE "data/pokemon/dex_entries/machop.asm" MachokePokedexEntry:: INCLUDE "data/pokemon/dex_entries/machoke.asm" @@ -141,7 +139,6 @@ TaurosPokedexEntry:: INCLUDE "data/pokemon/dex_entries/tauros.asm" SECTION "Pokedex Entries 129-192", ROMX -PokedexEntries3:: MagikarpPokedexEntry:: INCLUDE "data/pokemon/dex_entries/magikarp.asm" GyaradosPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gyarados.asm" LaprasPokedexEntry:: INCLUDE "data/pokemon/dex_entries/lapras.asm" @@ -210,7 +207,6 @@ SunfloraPokedexEntry:: INCLUDE "data/pokemon/dex_entries/sunflora.asm" SECTION "Pokedex Entries 193-251", ROMX -PokedexEntries4:: YanmaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/yanma.asm" WooperPokedexEntry:: INCLUDE "data/pokemon/dex_entries/wooper.asm" QuagsirePokedexEntry:: INCLUDE "data/pokemon/dex_entries/quagsire.asm" diff --git a/data/pokemon/dex_entry_pointers.asm b/data/pokemon/dex_entry_pointers.asm index c4ddc7280..6081757e5 100644 --- a/data/pokemon/dex_entry_pointers.asm +++ b/data/pokemon/dex_entry_pointers.asm @@ -1,4 +1,4 @@ -PokedexDataPointerTable: ; 0x44378 +PokedexDataPointerTable: ; entries correspond to constants/pokemon_constants.asm dw BulbasaurPokedexEntry dw IvysaurPokedexEntry @@ -251,4 +251,3 @@ PokedexDataPointerTable: ; 0x44378 dw LugiaPokedexEntry dw HoOhPokedexEntry dw CelebiPokedexEntry -; 0x4456e diff --git a/data/pokemon/dex_order_alpha.asm b/data/pokemon/dex_order_alpha.asm index 8fcb0acd1..b93238cb9 100644 --- a/data/pokemon/dex_order_alpha.asm +++ b/data/pokemon/dex_order_alpha.asm @@ -1,6 +1,6 @@ ; Every Pokémon sorted alphabetically by name. -AlphabeticalPokedexOrder: ; 0x40c65 +AlphabeticalPokedexOrder: db ABRA db AERODACTYL db AIPOM @@ -252,4 +252,3 @@ AlphabeticalPokedexOrder: ; 0x40c65 db YANMA db ZAPDOS db ZUBAT -; 0x40d60 diff --git a/data/pokemon/dex_order_new.asm b/data/pokemon/dex_order_new.asm index bf7e3d298..853fbe73d 100644 --- a/data/pokemon/dex_order_new.asm +++ b/data/pokemon/dex_order_new.asm @@ -1,6 +1,6 @@ ; Every Pokémon sorted in New Pokédex Order. -NewPokedexOrder: ; 0x40d60 +NewPokedexOrder: db CHIKORITA db BAYLEEF db MEGANIUM @@ -252,4 +252,3 @@ NewPokedexOrder: ; 0x40d60 db MEWTWO db MEW db CELEBI -; 0x40e5b diff --git a/data/pokemon/egg_move_pointers.asm b/data/pokemon/egg_move_pointers.asm index caa9ed7c0..3f4de2d2a 100644 --- a/data/pokemon/egg_move_pointers.asm +++ b/data/pokemon/egg_move_pointers.asm @@ -1,4 +1,4 @@ -EggMovePointers:: ; 0x23b11 +EggMovePointers:: dw BulbasaurEggMoves dw NoEggMoves dw NoEggMoves @@ -254,4 +254,3 @@ endc dw NoEggMoves dw NoEggMoves dw NoEggMoves -; 0x23d07 diff --git a/data/pokemon/egg_moves.asm b/data/pokemon/egg_moves.asm index 886c47349..1ababff89 100644 --- a/data/pokemon/egg_moves.asm +++ b/data/pokemon/egg_moves.asm @@ -11,12 +11,8 @@ SECTION "Egg Moves", ROMX ; Staryu's egg moves were removed in Crystal, because Staryu is genderless ; and can only breed with Ditto. - INCLUDE "data/pokemon/egg_move_pointers.asm" - -EggMoves:: - BulbasaurEggMoves: db LIGHT_SCREEN db SKULL_BASH diff --git a/data/pokemon/evos_attacks.asm b/data/pokemon/evos_attacks.asm index b57f88408..1ec2f2886 100644 --- a/data/pokemon/evos_attacks.asm +++ b/data/pokemon/evos_attacks.asm @@ -3,11 +3,6 @@ INCLUDE "constants.asm" SECTION "Evolutions and Attacks", ROMX - -INCLUDE "data/pokemon/evos_attacks_pointers.asm" - - -EvosAttacks:: ; Evos+attacks data structure: ; - Evolution methods: ; * db EVOLVE_LEVEL, level, species @@ -20,6 +15,7 @@ EvosAttacks:: ; * db level, move ; - db 0 ; no more level-up moves +INCLUDE "data/pokemon/evos_attacks_pointers.asm" BulbasaurEvosAttacks: db EVOLVE_LEVEL, 16, IVYSAUR diff --git a/data/pokemon/evos_attacks_pointers.asm b/data/pokemon/evos_attacks_pointers.asm index f6582e786..7b27c6a74 100644 --- a/data/pokemon/evos_attacks_pointers.asm +++ b/data/pokemon/evos_attacks_pointers.asm @@ -1,6 +1,6 @@ ; Evolutions and attacks are grouped together since they're both checked at level-up. -EvosAttacksPointers:: ; 0x425b1 +EvosAttacksPointers:: dw BulbasaurEvosAttacks dw IvysaurEvosAttacks dw VenusaurEvosAttacks @@ -252,4 +252,3 @@ EvosAttacksPointers:: ; 0x425b1 dw LugiaEvosAttacks dw HoOhEvosAttacks dw CelebiEvosAttacks -; 0x427a7 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/pokemon/unused_pic_banks.asm b/data/pokemon/unused_pic_banks.asm new file mode 100644 index 000000000..2ede9c3f9 --- /dev/null +++ b/data/pokemon/unused_pic_banks.asm @@ -0,0 +1,17 @@ +; This was a table of Pokémon sprite banks in the 1997 G/S prototype. +; See pokegold-spaceworld's gfx/pokemon/pkmn_pic_banks.asm. + +Unreferenced_MonPicBanks: + ; last mon in bank, bank # + db RAICHU, $15 + 0 + db DUGTRIO, $15 + 1 + db GRAVELER, $15 + 2 + db KRABBY, $15 + 3 + db STARMIE, $15 + 4 + db ARTICUNO, $15 + 5 + db ARIADOS, $15 + 6 ; JARANRA in pokegold-spaceworld + db ESPEON, $15 + 7 ; KOUNYA in pokegold-spaceworld + db OCTILLERY, $15 + 8 ; BOMBSEEKER in pokegold-spaceworld + db LARVITAR, $15 + 9 ; NYULA in pokegold-spaceworld + db $ff, $15 + 10 + db $ff, $15 + 11 diff --git a/data/predef_pointers.asm b/data/predef_pointers.asm index 3a14a19ee..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 @@ -58,7 +58,7 @@ PredefPointers:: ; 856b add_predef InitSGBBorder ; $30 add_predef LoadSGBLayout add_predef Pokedex_GetArea - add_predef Unused_CheckContestMon + add_predef Unused_CheckShininess add_predef DoBattleTransition add_predef DummyPredef35 add_predef DummyPredef36 @@ -82,4 +82,3 @@ PredefPointers:: ; 856b add_predef Unused_HOF_AnimateAlignedFrontpic ; $48 add_predef HOF_AnimateFrontpic dbw -1, InexplicablyEmptyFunction ; ??? -; 864c diff --git a/data/sgb_ctrl_packets.asm b/data/sgb_ctrl_packets.asm index a8c1e25f5..b3c2b0404 100644 --- a/data/sgb_ctrl_packets.asm +++ b/data/sgb_ctrl_packets.asm @@ -37,7 +37,6 @@ sgb_data_snd: MACRO db \3 ; length (1-11) ENDM - ; Crystal does not support SGB, so this is unused. PalTrnPacket: sgb_pal_trn @@ -49,7 +48,6 @@ PctTrnPacket: sgb_pct_trn MaskEnFreezePacket: sgb_mask_en 1 MaskEnCancelPacket: sgb_mask_en 0 - ; These are packets containing SNES code. ; This set of packets is found in several Japanese SGB-compatible titles. ; It appears to be part of NCL's SGB devkit. 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..2371c4624 100644 --- a/data/sprites/emotes.asm +++ b/data/sprites/emotes.asm @@ -2,21 +2,20 @@ emote: MACRO ; graphics pointer, length, starting tile dw \1 db \2 tiles, BANK(\1) - dw vTiles1 tile \3 + dw vTiles0 tile \3 ENDM -Emotes: ; 144d +Emotes: ; entries correspond to EMOTE_* constants - emote ShockEmote, 4, $78 - emote QuestionEmote, 4, $78 - emote HappyEmote, 4, $78 - emote SadEmote, 4, $78 - emote HeartEmote, 4, $78 - emote BoltEmote, 4, $78 - emote SleepEmote, 4, $78 - emote FishEmote, 4, $78 - emote JumpShadowGFX, 1, $7c - emote FishingRodGFX, 2, $7c - emote BoulderDustGFX, 2, $7e - emote GrassRustleGFX, 1, $7e -; 14495 + emote ShockEmote, 4, $f8 + emote QuestionEmote, 4, $f8 + emote HappyEmote, 4, $f8 + emote SadEmote, 4, $f8 + emote HeartEmote, 4, $f8 + emote BoltEmote, 4, $f8 + emote SleepEmote, 4, $f8 + emote FishEmote, 4, $f8 + emote JumpShadowGFX, 1, $fc + emote FishingRodGFX, 2, $fc + emote BoulderDustGFX, 2, $fe + emote GrassRustleGFX, 1, $fe diff --git a/data/sprites/facings.asm b/data/sprites/facings.asm index 166455707..aebf97ff5 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 @@ -37,7 +37,6 @@ Facings: ; 4049 NUM_FACINGS EQU (Facings.End - Facings) / 2 - ; Tables used as a reference to transform OAM data. ; Format: @@ -50,136 +49,120 @@ FacingWeirdTree2: ; standing down db 4 ; # db 0, 0, 0, $00 db 0, 8, 0, $01 - db 8, 0, 2, $02 - db 8, 8, 2, $03 -; 409c + db 8, 0, RELATIVE_ATTRIBUTES, $02 + db 8, 8, RELATIVE_ATTRIBUTES, $03 FacingStepDown1: ; walking down 1 db 4 ; # db 0, 0, 0, $80 db 0, 8, 0, $81 - db 8, 0, 2, $82 - db 8, 8, 2, $83 -; 40ad + db 8, 0, RELATIVE_ATTRIBUTES, $82 + db 8, 8, RELATIVE_ATTRIBUTES, $83 FacingStepDown3: ; walking down 2 db 4 ; # db 0, 8, X_FLIP, $80 db 0, 0, X_FLIP, $81 - db 8, 8, 2 | X_FLIP, $82 - db 8, 0, 2 | X_FLIP, $83 -; 40be + db 8, 8, RELATIVE_ATTRIBUTES | X_FLIP, $82 + db 8, 0, RELATIVE_ATTRIBUTES | X_FLIP, $83 FacingStepUp0: FacingStepUp2: ; standing up db 4 ; # db 0, 0, 0, $04 db 0, 8, 0, $05 - db 8, 0, 2, $06 - db 8, 8, 2, $07 -; 40cf + db 8, 0, RELATIVE_ATTRIBUTES, $06 + db 8, 8, RELATIVE_ATTRIBUTES, $07 FacingStepUp1: ; walking up 1 db 4 ; # db 0, 0, 0, $84 db 0, 8, 0, $85 - db 8, 0, 2, $86 - db 8, 8, 2, $87 -; 40e0 + db 8, 0, RELATIVE_ATTRIBUTES, $86 + db 8, 8, RELATIVE_ATTRIBUTES, $87 FacingStepUp3: ; walking up 2 db 4 ; # db 0, 8, X_FLIP, $84 db 0, 0, X_FLIP, $85 - db 8, 8, 2 | X_FLIP, $86 - db 8, 0, 2 | X_FLIP, $87 -; 40f1 + db 8, 8, RELATIVE_ATTRIBUTES | X_FLIP, $86 + db 8, 0, RELATIVE_ATTRIBUTES | X_FLIP, $87 FacingStepLeft0: FacingStepLeft2: ; standing left db 4 ; # db 0, 0, 0, $08 db 0, 8, 0, $09 - db 8, 0, 2, $0a - db 8, 8, 2, $0b -; 4102 + db 8, 0, RELATIVE_ATTRIBUTES, $0a + db 8, 8, RELATIVE_ATTRIBUTES, $0b FacingStepRight0: FacingStepRight2: ; standing right db 4 ; # db 0, 8, X_FLIP, $08 db 0, 0, X_FLIP, $09 - db 8, 8, 2 | X_FLIP, $0a - db 8, 0, 2 | X_FLIP, $0b -; 4113 + db 8, 8, RELATIVE_ATTRIBUTES | X_FLIP, $0a + db 8, 0, RELATIVE_ATTRIBUTES | X_FLIP, $0b FacingStepLeft1: FacingStepLeft3: ; walking left db 4 ; # db 0, 0, 0, $88 db 0, 8, 0, $89 - db 8, 0, 2, $8a - db 8, 8, 2, $8b -; 4124 + db 8, 0, RELATIVE_ATTRIBUTES, $8a + db 8, 8, RELATIVE_ATTRIBUTES, $8b FacingStepRight1: FacingStepRight3: ; walking right db 4 ; # db 0, 8, X_FLIP, $88 db 0, 0, X_FLIP, $89 - db 8, 8, 2 | X_FLIP, $8a - db 8, 0, 2 | X_FLIP, $8b -; 4135 + db 8, 8, RELATIVE_ATTRIBUTES | X_FLIP, $8a + db 8, 0, RELATIVE_ATTRIBUTES | X_FLIP, $8b FacingFishDown: ; fishing down db 5 ; # db 0, 0, 0, $00 db 0, 8, 0, $01 - db 8, 0, 2, $02 - db 8, 8, 2, $03 - db 16, 0, 4, $fc -; 414a + db 8, 0, RELATIVE_ATTRIBUTES, $02 + db 8, 8, RELATIVE_ATTRIBUTES, $03 + db 16, 0, ABSOLUTE_TILE_ID, $fc FacingFishUp: ; fishing up db 5 ; # db 0, 0, 0, $04 db 0, 8, 0, $05 - db 8, 0, 2, $06 - db 8, 8, 2, $07 - db -8, 0, 4, $fc -; 415f + db 8, 0, RELATIVE_ATTRIBUTES, $06 + db 8, 8, RELATIVE_ATTRIBUTES, $07 + db -8, 0, ABSOLUTE_TILE_ID, $fc FacingFishLeft: ; fishing left db 5 ; # db 0, 0, 0, $08 db 0, 8, 0, $09 - db 8, 0, 2, $0a - db 8, 8, 2, $0b - db 5, -8, 4 | X_FLIP, $fd -; 4174 + db 8, 0, RELATIVE_ATTRIBUTES, $0a + db 8, 8, RELATIVE_ATTRIBUTES, $0b + db 5, -8, ABSOLUTE_TILE_ID | X_FLIP, $fd FacingFishRight: ; fishing right db 5 ; # db 0, 8, X_FLIP, $08 db 0, 0, X_FLIP, $09 - db 8, 8, 2 | X_FLIP, $0a - db 8, 0, 2 | X_FLIP, $0b - db 5, 16, 4, $fd -; 4189 + db 8, 8, RELATIVE_ATTRIBUTES | X_FLIP, $0a + db 8, 0, RELATIVE_ATTRIBUTES | X_FLIP, $0b + db 5, 16, ABSOLUTE_TILE_ID, $fd FacingEmote: ; emote db 4 ; # - db 0, 0, 4, $f8 - db 0, 8, 4, $f9 - db 8, 0, 4, $fa - db 8, 8, 4, $fb -; 419a + db 0, 0, ABSOLUTE_TILE_ID, $f8 + db 0, 8, ABSOLUTE_TILE_ID, $f9 + db 8, 0, ABSOLUTE_TILE_ID, $fa + db 8, 8, ABSOLUTE_TILE_ID, $fb FacingShadow: ; shadow db 2 ; # - db 0, 0, 4, $fc - db 0, 8, 4 | X_FLIP, $fc -; 41a3 + db 0, 0, ABSOLUTE_TILE_ID, $fc + db 0, 8, ABSOLUTE_TILE_ID | X_FLIP, $fc FacingBigDollSymmetric: ; big snorlax or lapras doll db 16 ; # @@ -199,23 +182,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,32 +213,27 @@ 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 ; # - db 0, 0, 4, $fe - db 0, 8, 4, $fe - db 8, 0, 4, $fe - db 8, 8, 4, $fe -; 4250 + db 0, 0, ABSOLUTE_TILE_ID, $fe + db 0, 8, ABSOLUTE_TILE_ID, $fe + db 8, 0, ABSOLUTE_TILE_ID, $fe + db 8, 8, ABSOLUTE_TILE_ID, $fe FacingBoulderDust2: ; boulder dust 2 db 4 ; # - db 0, 0, 4, $ff - db 0, 8, 4, $ff - db 8, 0, 4, $ff - db 8, 8, 4, $ff -; 4261 + db 0, 0, ABSOLUTE_TILE_ID, $ff + db 0, 8, ABSOLUTE_TILE_ID, $ff + db 8, 0, ABSOLUTE_TILE_ID, $ff + db 8, 8, ABSOLUTE_TILE_ID, $ff -FacingGrass1: ; 4261 +FacingGrass1: db 2 ; # - db 8, 0, 4, $fe - db 8, 8, 4 | X_FLIP, $fe -; 426a + db 8, 0, ABSOLUTE_TILE_ID, $fe + db 8, 8, ABSOLUTE_TILE_ID | X_FLIP, $fe -FacingGrass2: ; 426a +FacingGrass2: db 2 ; # - db 9, -1, 4, $fe - db 9, 9, 4 | X_FLIP, $fe -; 4273 + db 9, -1, ABSOLUTE_TILE_ID, $fe + db 9, 9, ABSOLUTE_TILE_ID | X_FLIP, $fe diff --git a/data/sprites/map_objects.asm b/data/sprites/map_objects.asm index 8821f8a1b..10afaf57b 100644 --- a/data/sprites/map_objects.asm +++ b/data/sprites/map_objects.asm @@ -1,308 +1,306 @@ -SpriteMovementData:: ; 4273 +SpriteMovementData:: ; entries correspond to SPRITEMOVEDATA_* constants ; SPRITEMOVEDATA_00 db SPRITEMOVEFN_00 ; movement function db DOWN ; facing db OBJECT_ACTION_STAND ; action - db %00000010 ; flags1 - db %00000000 ; flags2 - db %00000000 ; palette flags + db WONT_DELETE ; flags1 + db 0 ; flags2 + db 0 ; palette flags ; SPRITEMOVEDATA_STILL db SPRITEMOVEFN_STANDING ; movement function db DOWN ; facing db OBJECT_ACTION_STAND ; action - db %00001100 ; flags1 - db %00000000 ; flags2 - db %00000000 ; palette flags + db FIXED_FACING | SLIDING ; flags1 + db 0 ; flags2 + db 0 ; palette flags ; SPRITEMOVEDATA_WANDER db SPRITEMOVEFN_RANDOM_WALK_XY ; movement function db DOWN ; facing db OBJECT_ACTION_STAND ; action - db %00000000 ; flags1 - db %00000000 ; flags2 - db %00000000 ; palette flags + db 0 ; flags1 + db 0 ; flags2 + db 0 ; palette flags ; SPRITEMOVEDATA_SPINRANDOM_SLOW db SPRITEMOVEFN_SLOW_RANDOM_SPIN ; movement function db DOWN ; facing db OBJECT_ACTION_STAND ; action - db %00000000 ; flags1 - db %00000000 ; flags2 - db %00000000 ; palette flags + db 0 ; flags1 + db 0 ; flags2 + db 0 ; palette flags ; SPRITEMOVEDATA_WALK_UP_DOWN db SPRITEMOVEFN_RANDOM_WALK_Y ; movement function db DOWN ; facing db OBJECT_ACTION_STAND ; action - db %00000000 ; flags1 - db %00000000 ; flags2 - db %00000000 ; palette flags + db 0 ; flags1 + db 0 ; flags2 + db 0 ; palette flags ; SPRITEMOVEDATA_WALK_LEFT_RIGHT db SPRITEMOVEFN_RANDOM_WALK_X ; movement function db DOWN ; facing db OBJECT_ACTION_STAND ; action - db %00000000 ; flags1 - db %00000000 ; flags2 - db %00000000 ; palette flags + db 0 ; flags1 + db 0 ; flags2 + db 0 ; palette flags ; SPRITEMOVEDATA_STANDING_DOWN db SPRITEMOVEFN_STANDING ; movement function db DOWN ; facing db OBJECT_ACTION_STAND ; action - db %00000000 ; flags1 - db %00000000 ; flags2 - db %00000000 ; palette flags + db 0 ; flags1 + db 0 ; flags2 + db 0 ; palette flags ; SPRITEMOVEDATA_STANDING_UP db SPRITEMOVEFN_STANDING ; movement function db UP ; facing db OBJECT_ACTION_STAND ; action - db %00000000 ; flags1 - db %00000000 ; flags2 - db %00000000 ; palette flags + db 0 ; flags1 + db 0 ; flags2 + db 0 ; palette flags ; SPRITEMOVEDATA_STANDING_LEFT db SPRITEMOVEFN_STANDING ; movement function db LEFT ; facing db OBJECT_ACTION_STAND ; action - db %00000000 ; flags1 - db %00000000 ; flags2 - db %00000000 ; palette flags + db 0 ; flags1 + db 0 ; flags2 + db 0 ; palette flags ; SPRITEMOVEDATA_STANDING_RIGHT db SPRITEMOVEFN_STANDING ; movement function db RIGHT ; facing db OBJECT_ACTION_STAND ; action - db %00000000 ; flags1 - db %00000000 ; flags2 - db %00000000 ; palette flags + db 0 ; flags1 + db 0 ; flags2 + db 0 ; palette flags ; SPRITEMOVEDATA_SPINRANDOM_FAST db SPRITEMOVEFN_FAST_RANDOM_SPIN ; movement function db DOWN ; facing db OBJECT_ACTION_STAND ; action - db %00000000 ; flags1 - db %00000000 ; flags2 - db %00000000 ; palette flags + db 0 ; flags1 + db 0 ; flags2 + db 0 ; palette flags ; SPRITEMOVEDATA_PLAYER db SPRITEMOVEFN_OBEY_DPAD ; movement function db DOWN ; facing db OBJECT_ACTION_STAND ; action - db %00000010 ; flags1 - db %00000000 ; flags2 - db %00000000 ; palette flags + db WONT_DELETE ; flags1 + db 0 ; flags2 + db 0 ; palette flags ; SPRITEMOVEDATA_0C db SPRITEMOVEFN_08 ; movement function db DOWN ; facing db OBJECT_ACTION_STAND ; action - db %00000000 ; flags1 - db %00000000 ; flags2 - db %00000000 ; palette flags + db 0 ; flags1 + db 0 ; flags2 + db 0 ; palette flags ; SPRITEMOVEDATA_0D db SPRITEMOVEFN_09 ; movement function db DOWN ; facing db OBJECT_ACTION_STAND ; action - db %00000000 ; flags1 - db %00000000 ; flags2 - db %00000000 ; palette flags + db 0 ; flags1 + db 0 ; flags2 + db 0 ; palette flags ; SPRITEMOVEDATA_0E db SPRITEMOVEFN_0A ; movement function db DOWN ; facing db OBJECT_ACTION_STAND ; action - db %00000000 ; flags1 - db %00000000 ; flags2 - db %00000000 ; palette flags + db 0 ; flags1 + db 0 ; flags2 + db 0 ; palette flags ; SPRITEMOVEDATA_0F db SPRITEMOVEFN_0B ; movement function db DOWN ; facing db OBJECT_ACTION_STAND ; action - db %00000000 ; flags1 - db %00000000 ; flags2 - db %00000000 ; palette flags + db 0 ; flags1 + db 0 ; flags2 + db 0 ; palette flags ; SPRITEMOVEDATA_10 db SPRITEMOVEFN_0C ; movement function db DOWN ; facing db OBJECT_ACTION_STAND ; action - db %00000000 ; flags1 - db %00000000 ; flags2 - db %00000000 ; palette flags + db 0 ; flags1 + db 0 ; flags2 + db 0 ; palette flags ; SPRITEMOVEDATA_11 db SPRITEMOVEFN_0D ; movement function db DOWN ; facing db OBJECT_ACTION_STAND ; action - db %00000000 ; flags1 - db %00000000 ; flags2 - db %00000000 ; palette flags + db 0 ; flags1 + db 0 ; flags2 + db 0 ; palette flags ; SPRITEMOVEDATA_12 db SPRITEMOVEFN_0E ; movement function db DOWN ; facing db OBJECT_ACTION_STAND ; action - db %00000000 ; flags1 - db %00000000 ; flags2 - db %00000000 ; palette flags + db 0 ; flags1 + db 0 ; flags2 + db 0 ; palette flags ; SPRITEMOVEDATA_FOLLOWING db SPRITEMOVEFN_FOLLOW ; movement function db DOWN ; facing db OBJECT_ACTION_STAND ; action - db %00000010 ; flags1 - db %00000000 ; flags2 - db %00000000 ; palette flags + db WONT_DELETE ; flags1 + db 0 ; flags2 + db 0 ; palette flags ; SPRITEMOVEDATA_SCRIPTED db SPRITEMOVEFN_SCRIPTED ; movement function db DOWN ; facing db OBJECT_ACTION_STAND ; action - db %00000010 ; flags1 - db %00000000 ; flags2 - db %00000000 ; palette flags + db WONT_DELETE ; flags1 + db 0 ; flags2 + db 0 ; palette flags ; SPRITEMOVEDATA_BIGDOLLSYM db SPRITEMOVEFN_BIG_SNORLAX ; movement function db DOWN ; facing db OBJECT_ACTION_BIG_DOLL_SYM ; action - db %00101110 ; flags1 - db %00000001 ; flags2 - db %11000000 ; palette flags + db WONT_DELETE | FIXED_FACING | SLIDING | MOVE_ANYWHERE ; flags1 + db LOW_PRIORITY ; flags2 + db STRENGTH_BOULDER | BIG_OBJECT ; palette flags ; SPRITEMOVEDATA_POKEMON db SPRITEMOVEFN_BOUNCE ; movement function db DOWN ; facing db OBJECT_ACTION_BOUNCE ; action - db %00101110 ; flags1 - db %00000000 ; flags2 - db %00000000 ; palette flags + db WONT_DELETE | FIXED_FACING | SLIDING | MOVE_ANYWHERE ; flags1 + db 0 ; flags2 + db 0 ; palette flags ; SPRITEMOVEDATA_SUDOWOODO db SPRITEMOVEFN_STANDING ; movement function db DOWN ; facing db OBJECT_ACTION_STAND ; action - db %00001100 ; flags1 - db %00000000 ; flags2 - db %00000000 ; palette flags + db FIXED_FACING | SLIDING ; flags1 + db 0 ; flags2 + db 0 ; palette flags ; SPRITEMOVEDATA_SMASHABLE_ROCK db SPRITEMOVEFN_STANDING ; movement function db DOWN ; facing db OBJECT_ACTION_STAND ; action - db %00101110 ; flags1 - db %00010000 ; flags2 - db %00000000 ; palette flags + db WONT_DELETE | FIXED_FACING | SLIDING | MOVE_ANYWHERE ; flags1 + db USE_OBP1 ; flags2 + db 0 ; palette flags ; SPRITEMOVEDATA_STRENGTH_BOULDER db SPRITEMOVEFN_STRENGTH ; movement function db DOWN ; facing db OBJECT_ACTION_STAND ; action - db %00101110 ; flags1 - db %00000000 ; flags2 - db %01000000 ; palette flags + db WONT_DELETE | FIXED_FACING | SLIDING | MOVE_ANYWHERE ; flags1 + db 0 ; flags2 + db STRENGTH_BOULDER ; palette flags ; SPRITEMOVEDATA_FOLLOWNOTEXACT db SPRITEMOVEFN_FOLLOWNOTEXACT ; movement function db DOWN ; facing db OBJECT_ACTION_STAND ; action - db %00000010 ; flags1 - db %00000000 ; flags2 - db %00000000 ; palette flags + db WONT_DELETE ; flags1 + db 0 ; flags2 + db 0 ; palette flags ; SPRITEMOVEDATA_SHADOW db SPRITEMOVEFN_SHADOW ; movement function db DOWN ; facing db OBJECT_ACTION_00 ; action - db %10001110 ; flags1 - db %00000001 ; flags2 - db %00000000 ; palette flags + db WONT_DELETE | FIXED_FACING | SLIDING | EMOTE_OBJECT ; flags1 + db LOW_PRIORITY ; flags2 + db 0 ; palette flags ; SPRITEMOVEDATA_EMOTE db SPRITEMOVEFN_EMOTE ; movement function db DOWN ; facing db OBJECT_ACTION_EMOTE ; action - db %10001110 ; flags1 - db %00000010 ; flags2 - db %00000000 ; palette flags + db WONT_DELETE | FIXED_FACING | SLIDING | EMOTE_OBJECT ; flags1 + db HIGH_PRIORITY ; flags2 + db 0 ; palette flags ; SPRITEMOVEDATA_SCREENSHAKE db SPRITEMOVEFN_SCREENSHAKE ; movement function db DOWN ; facing db OBJECT_ACTION_00 ; action - db %10000010 ; flags1 - db %00000000 ; flags2 - db %00000000 ; palette flags + db WONT_DELETE | EMOTE_OBJECT ; flags1 + db 0 ; flags2 + db 0 ; palette flags ; SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE db SPRITEMOVEFN_SPIN_COUNTERCLOCKWISE ; movement function db LEFT ; facing db OBJECT_ACTION_STAND ; action - db %00000000 ; flags1 - db %00000000 ; flags2 - db %00000000 ; palette flags + db 0 ; flags1 + db 0 ; flags2 + db 0 ; palette flags ; SPRITEMOVEDATA_SPINCLOCKWISE db SPRITEMOVEFN_SPIN_CLOCKWISE ; movement function db RIGHT ; facing db OBJECT_ACTION_STAND ; action - db %00000000 ; flags1 - db %00000000 ; flags2 - db %00000000 ; palette flags + db 0 ; flags1 + db 0 ; flags2 + db 0 ; palette flags ; SPRITEMOVEDATA_BIGDOLLASYM db SPRITEMOVEFN_STRENGTH ; movement function db DOWN ; facing db OBJECT_ACTION_BIG_DOLL_ASYM ; action - db %00101110 ; flags1 - db %00000001 ; flags2 - db %11000000 ; palette flags + db WONT_DELETE | FIXED_FACING | SLIDING | MOVE_ANYWHERE ; flags1 + db LOW_PRIORITY ; flags2 + db STRENGTH_BOULDER | BIG_OBJECT ; palette flags ; SPRITEMOVEDATA_BIGDOLL db SPRITEMOVEFN_STRENGTH ; movement function db DOWN ; facing db OBJECT_ACTION_BIG_DOLL ; action - db %00101110 ; flags1 - db %00000001 ; flags2 - db %11000000 ; palette flags + db WONT_DELETE | FIXED_FACING | SLIDING | MOVE_ANYWHERE ; flags1 + db LOW_PRIORITY ; flags2 + db STRENGTH_BOULDER | BIG_OBJECT ; palette flags ; SPRITEMOVEDATA_BOULDERDUST db SPRITEMOVEFN_BOULDERDUST ; movement function db DOWN ; facing db OBJECT_ACTION_BOULDER_DUST ; action - db %10001110 ; flags1 - db %00000001 ; flags2 - db %00000000 ; palette flags + db WONT_DELETE | FIXED_FACING | SLIDING | EMOTE_OBJECT ; flags1 + db LOW_PRIORITY ; flags2 + db 0 ; palette flags ; SPRITEMOVEDATA_GRASS db SPRITEMOVEFN_GRASS ; movement function db DOWN ; facing db OBJECT_ACTION_GRASS_SHAKE ; action - db %10001110 ; flags1 - db %00000010 ; flags2 - db %00000000 ; palette flags + db WONT_DELETE | FIXED_FACING | SLIDING | EMOTE_OBJECT ; flags1 + db HIGH_PRIORITY ; flags2 + db 0 ; palette flags ; SPRITEMOVEDATA_SWIM_WANDER db SPRITEMOVEFN_RANDOM_WALK_XY ; movement function db DOWN ; facing db OBJECT_ACTION_STAND ; action - db %00000000 ; flags1 - db %00000000 ; flags2 - db %00100000 ; palette flags + db 0 ; flags1 + db 0 ; flags2 + db SWIMMING ; palette flags ; 25 db SPRITEMOVEFN_00 ; movement function db DOWN ; facing db OBJECT_ACTION_STAND ; action - db %00000000 ; flags1 - db %00000000 ; flags2 - db %00000000 ; palette flags - -; 4357 + db 0 ; flags1 + db 0 ; flags2 + db 0 ; palette flags 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/battle.asm b/data/text/battle.asm index 9508c8c80..97152ebbb 100644 --- a/data/text/battle.asm +++ b/data/text/battle.asm @@ -1,198 +1,170 @@ -BattleText:: +BattleText:: ; used only for BANK(BattleText) -BattleText_PlayerPickedUpPayDayMoney: ; 0x80730 +BattleText_PlayerPickedUpPayDayMoney: text "<PLAYER> picked up" line "¥@" deciram wPayDayMoney, 3, 6 text "!" prompt -; 0x80746 -WildPokemonAppearedText: ; 0x80746 +WildPokemonAppearedText: text "Wild @" text_from_ram wEnemyMonNick text_start line "appeared!" prompt -; 0x8075c -HookedPokemonAttackedText: ; 0x8075c +HookedPokemonAttackedText: text "The hooked" line "@" text_from_ram wEnemyMonNick text_start cont "attacked!" prompt -; 0x80778 -PokemonFellFromTreeText: ; 0x80778 +PokemonFellFromTreeText: text_from_ram wEnemyMonNick text " fell" line "out of the tree!" prompt -; 0x80793 -WildCelebiAppearedText: ; 0x80793 +WildCelebiAppearedText: text "Wild @" text_from_ram wEnemyMonNick text_start line "appeared!" prompt -; 0x807a9 -WantsToBattleText:: ; 0x807a9 +WantsToBattleText:: text "<ENEMY>" line "wants to battle!" prompt -; 0x807bd -BattleText_WildFled: ; 0x807bd +BattleText_WildFled: text "Wild @" text_from_ram wEnemyMonNick text_start line "fled!" prompt -; 0x807cf -BattleText_EnemyFled: ; 0x807cf +BattleText_EnemyFled: text "Enemy @" text_from_ram wEnemyMonNick text_start line "fled!" prompt -; 0x807e2 -HurtByPoisonText: ; 0x807e2 +HurtByPoisonText: text "<USER>" line "is hurt by poison!" prompt -; 0x807f8 -HurtByBurnText: ; 0x807f8 +HurtByBurnText: text "<USER>'s" line "hurt by its burn!" prompt -; 0x8080e -LeechSeedSapsText: ; 0x8080e +LeechSeedSapsText: text "LEECH SEED saps" line "<USER>!" prompt -; 0x80822 -HasANightmareText: ; 0x80822 +HasANightmareText: text "<USER>" line "has a NIGHTMARE!" prompt -; 0x80836 -HurtByCurseText: ; 0x80836 +HurtByCurseText: text "<USER>'s" line "hurt by the CURSE!" prompt -; 0x8084d -SandstormHitsText: ; 0x8084d +SandstormHitsText: text "The SANDSTORM hits" line "<USER>!" prompt -; 0x80864 -PerishCountText: ; 0x80864 +PerishCountText: text "<USER>'s" line "PERISH count is @" deciram wd265, 1, 1 text "!" prompt -; 0x80880 -BattleText_TargetRecoveredWithItem: ; 0x80880 +BattleText_TargetRecoveredWithItem: text "<TARGET>" line "recovered with" cont "@" text_from_ram wStringBuffer1 text "." prompt -; 0x80899 -BattleText_UserRecoveredPPUsing: ; 0x80899 +BattleText_UserRecoveredPPUsing: text "<USER>" line "recovered PP using" cont "@" text_from_ram wStringBuffer1 text "." prompt -; 0x808b6 -BattleText_TargetWasHitByFutureSight: ; 0x808b6 +BattleText_TargetWasHitByFutureSight: text "<TARGET>" line "was hit by FUTURE" cont "SIGHT!" prompt -; 0x808d2 -BattleText_SafeguardFaded: ; 0x808d2 +BattleText_SafeguardFaded: text "<USER>'s" line "SAFEGUARD faded!" prompt -; 0x808e7 -BattleText_MonsLightScreenFell: ; 0x808e7 +BattleText_MonsLightScreenFell: text_from_ram wStringBuffer1 text " #MON's" line "LIGHT SCREEN fell!" prompt -; 0x80905 -BattleText_MonsReflectFaded: ; 0x80905 +BattleText_MonsReflectFaded: text_from_ram wStringBuffer1 text " #MON's" line "REFLECT faded!" prompt -; 0x8091f -BattleText_RainContinuesToFall: ; 0x8091f +BattleText_RainContinuesToFall: text "Rain continues to" line "fall." prompt -; 0x80938 -BattleText_TheSunlightIsStrong: ; 0x80938 +BattleText_TheSunlightIsStrong: text "The sunlight is" line "strong." prompt -; 0x80951 -BattleText_TheSandstormRages: ; 0x80951 +BattleText_TheSandstormRages: text "The SANDSTORM" line "rages." prompt -; 0x80967 -BattleText_TheRainStopped: ; 0x80967 +BattleText_TheRainStopped: text "The rain stopped." prompt -; 0x8097a -BattleText_TheSunlightFaded: ; 0x8097a +BattleText_TheSunlightFaded: text "The sunlight" line "faded." prompt -; 0x8098f -BattleText_TheSandstormSubsided: ; 0x8098f +BattleText_TheSandstormSubsided: text "The SANDSTORM" line "subsided." prompt -; 0x809a8 -BattleText_EnemyMonFainted: ; 0x809a8 +BattleText_EnemyMonFainted: text "Enemy @" text_from_ram wEnemyMonNick text_start line "fainted!" prompt -; 0x809be GotMoneyForWinningText: text "<PLAYER> got ¥@" @@ -201,17 +173,15 @@ GotMoneyForWinningText: line "for winning!" prompt -BattleText_EnemyWasDefeated: ; 0x809da +BattleText_EnemyWasDefeated: text "<ENEMY>" line "was defeated!" prompt -; 0x809eb -TiedAgainstText: ; 0x809eb +TiedAgainstText: text "Tied against" line "<ENEMY>!" prompt -; 0x809fc SentSomeToMomText: text "<PLAYER> got ¥@" @@ -229,39 +199,34 @@ SentAllToMomText: text "Sent all to MOM!" prompt -BattleText_0x80a4f: ; 0x80a4f +BattleText_0x80a4f: text "<RIVAL>: Huh? I" line "should've chosen" cont "your #MON!" prompt -; 0x80a75 -BattleText_MonFainted: ; 0x80a75 +BattleText_MonFainted: text_from_ram wBattleMonNick text_start line "fainted!" prompt -; 0x80a83 -BattleText_UseNextMon: ; 0x80a83 +BattleText_UseNextMon: text "Use next #MON?" done -; 0x80a93 -BattleText_0x80a93: ; 0x80a93 +BattleText_0x80a93: text "<RIVAL>: Yes!" line "I guess I chose a" cont "good #MON!" prompt -; 0x80ab9 -LostAgainstText: ; 0x80ab9 +LostAgainstText: text "Lost against" line "<ENEMY>!" prompt -; 0x80aca -BattleText_EnemyIsAboutToUseWillPlayerChangeMon: ; 0x80aca +BattleText_EnemyIsAboutToUseWillPlayerChangeMon: text "<ENEMY>" line "is about to use" cont "@" @@ -271,128 +236,111 @@ BattleText_EnemyIsAboutToUseWillPlayerChangeMon: ; 0x80aca para "Will <PLAYER>" line "change #MON?" done -; 0x80af8 -BattleText_EnemySentOut: ; 0x80af8 +BattleText_EnemySentOut: text "<ENEMY>" line "sent out" cont "@" text_from_ram wEnemyMonNick text "!" done -; 0x80b0b -BattleText_TheresNoWillToBattle: ; 0x80b0b +BattleText_TheresNoWillToBattle: text "There's no will to" line "battle!" prompt -; 0x80b26 -BattleText_AnEGGCantBattle: ; 0x80b26 +BattleText_AnEGGCantBattle: text "An EGG can't" line "battle!" prompt -; 0x80b3b -BattleText_CantEscape2: ; 0x80b3b +BattleText_CantEscape2: text "Can't escape!" prompt -; 0x80b49 -BattleText_TheresNoEscapeFromTrainerBattle: ; 0x80b49 +BattleText_TheresNoEscapeFromTrainerBattle: text "No! There's no" line "running from a" cont "trainer battle!" prompt -BattleText_GotAwaySafely: ; 0x80b77 +BattleText_GotAwaySafely: text "Got away safely!" prompt -BattleText_UserFledUsingAStringBuffer1: ; 0x80b89 +BattleText_UserFledUsingAStringBuffer1: text "<USER>" line "fled using a" cont "@" text_from_ram wStringBuffer1 text "!" prompt -; 0x80ba0 -BattleText_CantEscape: ; 0x80ba0 +BattleText_CantEscape: text "Can't escape!" prompt -; 0x80bae -BattleText_UserHurtBySpikes: ; 0x80bae +BattleText_UserHurtBySpikes: text "<USER>'s" line "hurt by SPIKES!" prompt -; 0x80bc2 -RecoveredUsingText: ; 0x80bc2 +RecoveredUsingText: text "<TARGET>" line "recovered using a" cont "@" text_from_ram wStringBuffer1 text "!" prompt -; 0x80bde -BattleText_UsersStringBuffer1Activated: ; 0x80bde +BattleText_UsersStringBuffer1Activated: text "<USER>'s" line "@" text_from_ram wStringBuffer1 text_start cont "activated!" prompt -; 0x80bf3 -BattleText_ItemsCantBeUsedHere: ; 0x80bf3 +BattleText_ItemsCantBeUsedHere: text "Items can't be" line "used here." prompt -; 0x80c0d -BattleText_MonIsAlreadyOut: ; 0x80c0d +BattleText_MonIsAlreadyOut: text_from_ram wBattleMonNick text_start line "is already out." prompt -; 0x80c22 -BattleText_MonCantBeRecalled: ; 0x80c22 +BattleText_MonCantBeRecalled: text_from_ram wBattleMonNick text_start line "can't be recalled!" prompt -; 0x80c39 -BattleText_TheresNoPPLeftForThisMove: ; 0x80c39 +BattleText_TheresNoPPLeftForThisMove: text "There's no PP left" line "for this move!" prompt -; 0x80c5b -BattleText_TheMoveIsDisabled: ; 0x80c5b +BattleText_TheMoveIsDisabled: text "The move is" line "DISABLED!" prompt -; 0x80c72 -BattleText_MonHasNoMovesLeft: ; 0x80c72 +BattleText_MonHasNoMovesLeft: text_from_ram wBattleMonNick text_start line "has no moves left!" done -; 0x80c8a -BattleText_TargetsEncoreEnded: ; 0x80c8a +BattleText_TargetsEncoreEnded: text "<TARGET>'s" line "ENCORE ended!" prompt -; 0x80c9c -BattleText_StringBuffer1GrewToLevel: ; 0x80c9c +BattleText_StringBuffer1GrewToLevel: text_from_ram wStringBuffer1 text " grew to" line "level @" @@ -400,79 +348,67 @@ BattleText_StringBuffer1GrewToLevel: ; 0x80c9c text "!@" sound_dex_fanfare_50_79 db "@@" -; 0x80cb9 -BattleText_WildMonIsEating: ; 0x80cba +BattleText_WildMonIsEating: text "Wild @" text_from_ram wEnemyMonNick text_start line "is eating!" prompt -; 0x80cd1 -BattleText_WildMonIsAngry: ; 0x80cd1 +BattleText_WildMonIsAngry: text "Wild @" text_from_ram wEnemyMonNick text_start line "is angry!" prompt -; 0x80ce7 -FastAsleepText: ; 0x80ce7 +FastAsleepText: text "<USER>" line "is fast asleep!" prompt -; 0x80cfa -WokeUpText: ; 0x80cfa +WokeUpText: text "<USER>" line "woke up!" prompt -; 0x80d06 -FrozenSolidText: ; 0x80d06 +FrozenSolidText: text "<USER>" line "is frozen solid!" prompt -; 0x80d1a -FlinchedText: ; 0x80d1a +FlinchedText: text "<USER>" line "flinched!" prompt -; 0x80d27 -MustRechargeText: ; 0x80d27 +MustRechargeText: text "<USER>" line "must recharge!" prompt -; 0x80d39 -DisabledNoMoreText: ; 0x80d39 +DisabledNoMoreText: text "<USER>'s" line "disabled no more!" prompt -; 0x80d4f -IsConfusedText: ; 0x80d4f +IsConfusedText: text "<USER>" line "is confused!" prompt -; 0x80d5f -HurtItselfText: ; 0x80d5f +HurtItselfText: text "It hurt itself in" line "its confusion!" prompt -; 0x80d81 -ConfusedNoMoreText: ; 0x80d81 +ConfusedNoMoreText: text "<USER>'s" line "confused no more!" prompt -; 0x80d97 -BecameConfusedText: ; 0x80d97 +BecameConfusedText: text "<TARGET>" line "became confused!" prompt @@ -485,292 +421,249 @@ BattleText_ItemHealedConfusion: ; ItemHealedConfusion line "<TARGET>" cont "of its confusion." prompt -; 0x80dcc -AlreadyConfusedText: ; 0x80dcc +AlreadyConfusedText: text "<TARGET>'s" line "already confused!" prompt -; 0x80de2 -BattleText_UsersHurtByStringBuffer1: ; 0x80de2 +BattleText_UsersHurtByStringBuffer1: text "<USER>'s" line "hurt by" cont "@" text_from_ram wStringBuffer1 text "!" prompt -; 0x80df5 -BattleText_UserWasReleasedFromStringBuffer1: ; 0x80df5 +BattleText_UserWasReleasedFromStringBuffer1: text "<USER>" line "was released from" cont "@" text_from_ram wStringBuffer1 text "!" prompt -; 0x80e11 -UsedBindText: ; 0x80e11 +UsedBindText: text "<USER>" line "used BIND on" cont "<TARGET>!" prompt -; 0x80e24 -WhirlpoolTrapText: ; 0x80e24 +WhirlpoolTrapText: text "<TARGET>" line "was trapped!" prompt -; 0x80e34 -FireSpinTrapText: ; 0x80e34 +FireSpinTrapText: text "<TARGET>" line "was trapped!" prompt -; 0x80e44 -WrappedByText: ; 0x80e44 +WrappedByText: text "<TARGET>" line "was WRAPPED by" cont "<USER>!" prompt -; 0x80e59 -ClampedByText: ; 0x80e59 +ClampedByText: text "<TARGET>" line "was CLAMPED by" cont "<USER>!" prompt -; 0x80e6e -StoringEnergyText: ; 0x80e6e +StoringEnergyText: text "<USER>" line "is storing energy!" prompt -; 0x80e84 -UnleashedEnergyText: ; 0x80e84 +UnleashedEnergyText: text "<USER>" line "unleashed energy!" prompt -; 0x80e99 -HungOnText: ; 0x80e99 +HungOnText: text "<TARGET>" line "hung on with" cont "@" text_from_ram wStringBuffer1 text "!" prompt -; 0x80eb0 -EnduredText: ; 0x80eb0 +EnduredText: text "<TARGET>" line "ENDURED the hit!" prompt -; 0x80ec4 -InLoveWithText: ; 0x80ec4 +InLoveWithText: text "<USER>" line "is in love with" cont "<TARGET>!" prompt -; 0x80eda -InfatuationText: ; 0x80eda +InfatuationText: text "<USER>'s" line "infatuation kept" cont "it from attacking!" prompt -; 0x80f02 -DisabledMoveText: ; 0x80f02 +DisabledMoveText: text "<USER>'s" line "@" text_from_ram wStringBuffer1 text " is" cont "DISABLED!" prompt -; 0x80f19 -LoafingAroundText: ; 0x80f19 +LoafingAroundText: text_from_ram wBattleMonNick text " is" line "loafing around." prompt -; 0x80f31 -BeganToNapText: ; 0x80f31 +BeganToNapText: text_from_ram wBattleMonNick text " began" line "to nap!" prompt -; 0x80f44 -WontObeyText: ; 0x80f44 +WontObeyText: text_from_ram wBattleMonNick text " won't" line "obey!" prompt -; 0x80f54 -TurnedAwayText: ; 0x80f54 +TurnedAwayText: text_from_ram wBattleMonNick text " turned" line "away!" prompt -; 0x80f66 -IgnoredOrdersText: ; 0x80f66 +IgnoredOrdersText: text_from_ram wBattleMonNick text " ignored" line "orders!" prompt -; 0x80f7b -IgnoredSleepingText: ; 0x80f7b +IgnoredSleepingText: text_from_ram wBattleMonNick text " ignored" line "orders…sleeping!" prompt -; 0x80f99 -NoPPLeftText: ; 0x80f99 +NoPPLeftText: text "But no PP is left" line "for the move!" prompt -; 0x80fba -HasNoPPLeftText: ; 0x80fba +HasNoPPLeftText: text "<USER>" line "has no PP left for" cont "@" text_from_ram wStringBuffer2 text "!" prompt -; 0x80fd7 -WentToSleepText: ; 0x80fd7 +WentToSleepText: text "<USER>" line "went to sleep!" done -; 0x80fe9 -RestedText: ; 0x80fe9 +RestedText: text "<USER>" line "fell asleep and" cont "became healthy!" done -; 0x8100c -RegainedHealthText: ; 0x8100c +RegainedHealthText: text "<USER>" line "regained health!" prompt -; 0x81020 -AttackMissedText: ; 0x81020 +AttackMissedText: text "<USER>'s" line "attack missed!" prompt -; 0x81033 -AttackMissed2Text: ; 0x81033 +AttackMissed2Text: text "<USER>'s" line "attack missed!" prompt -; 0x81046 -CrashedText: ; 0x81046 +CrashedText: text "<USER>" line "kept going and" cont "crashed!" prompt -; 0x81061 -UnaffectedText: ; 0x81061 +UnaffectedText: text "<TARGET>'s" line "unaffected!" prompt -; 0x81071 -DoesntAffectText: ; 0x81071 +DoesntAffectText: text "It doesn't affect" line "<TARGET>!" prompt -; 0x81086 -CriticalHitText: ; 0x81086 +CriticalHitText: text "A critical hit!" prompt -; 0x81097 -OneHitKOText: ; 0x81097 +OneHitKOText: text "It's a one-hit KO!" prompt -; 0x810aa -SuperEffectiveText: ; 0x810aa +SuperEffectiveText: text "It's super-" line "effective!" prompt -; 0x810c1 -NotVeryEffectiveText: ; 0x810c1 +NotVeryEffectiveText: text "It's not very" line "effective…" prompt -; 0x810da -TookDownWithItText: ; 0x810da +TookDownWithItText: text "<TARGET>" line "took down with it," cont "<USER>!" prompt -; 0x810f3 -RageBuildingText: ; 0x810f3 +RageBuildingText: text "<USER>'s" line "RAGE is building!" prompt -; 0x81109 -GotAnEncoreText: ; 0x81109 +GotAnEncoreText: text "<TARGET>" line "got an ENCORE!" prompt -; 0x8111b -SharedPainText: ; 0x8111b +SharedPainText: text "The battlers" line "shared pain!" prompt -; 0x81136 -TookAimText: ; 0x81136 +TookAimText: text "<USER>" line "took aim!" prompt -; 0x81143 -SketchedText: ; 0x81143 +SketchedText: text "<USER>" line "SKETCHED" cont "@" text_from_ram wStringBuffer1 text "!" prompt -; 0x81156 -DestinyBondEffectText: ; 0x81156 +DestinyBondEffectText: text "<USER>'s" line "trying to take its" cont "opponent with it!" prompt -; 0x8117f -SpiteEffectText: ; 0x8117f +SpiteEffectText: text "<TARGET>'s" line "@" text_from_ram wStringBuffer1 @@ -779,515 +672,436 @@ SpiteEffectText: ; 0x8117f deciram wd265, 1, 1 text "!" prompt -; 0x811a0 -BellChimedText: ; 0x811a0 +BellChimedText: text "A bell chimed!" line "" prompt -; 0x811b1 -FellAsleepText: ; 0x811b1 +FellAsleepText: text "<TARGET>" line "fell asleep!" prompt -; 0x811c1 -AlreadyAsleepText: ; 0x811c1 +AlreadyAsleepText: text "<TARGET>'s" line "already asleep!" prompt -; 0x811d5 -WasPoisonedText: ; 0x811d5 +WasPoisonedText: text "<TARGET>" line "was poisoned!" prompt -; 0x811e6 -BadlyPoisonedText: ; 0x811e6 +BadlyPoisonedText: text "<TARGET>'s" line "badly poisoned!" prompt -; 0x811fa -AlreadyPoisonedText: ; 0x811fa +AlreadyPoisonedText: text "<TARGET>'s" line "already poisoned!" prompt -; 0x81210 -SuckedHealthText: ; 0x81210 +SuckedHealthText: text "Sucked health from" line "<TARGET>!" prompt -; 0x81227 -DreamEatenText: ; 0x81227 +DreamEatenText: text "<TARGET>'s" line "dream was eaten!" prompt -; 0x8123c -WasBurnedText: ; 0x8123c +WasBurnedText: text "<TARGET>" line "was burned!" prompt -; 0x8124b -DefrostedOpponentText: ; 0x8124b +DefrostedOpponentText: text "<TARGET>" line "was defrosted!" prompt -; 0x8125d -WasFrozenText: ; 0x8125d +WasFrozenText: text "<TARGET>" line "was frozen solid!" prompt -; 0x81272 -WontRiseAnymoreText: ; 0x81272 +WontRiseAnymoreText: text "<USER>'s" line "@" text_from_ram wStringBuffer2 text " won't" cont "rise anymore!" prompt -; 0x8128f -WontDropAnymoreText: ; 0x8128f +WontDropAnymoreText: text "<TARGET>'s" line "@" text_from_ram wStringBuffer2 text " won't" cont "drop anymore!" prompt -; 0x812ac -FledFromBattleText:: ; 0x812ac +FledFromBattleText:: text "<USER>" line "fled from battle!" prompt -; 0x812c1 -FledInFearText: ; 0x812c1 +FledInFearText: text "<TARGET>" line "fled in fear!" prompt -; 0x812d2 -BlownAwayText: ; 0x812d2 +BlownAwayText: text "<TARGET>" line "was blown away!" prompt -; 0x812e5 -PlayerHitTimesText: ; 0x812e5 +PlayerHitTimesText: text "Hit @" deciram wPlayerDamageTaken, 1, 1 text " times!" prompt -; 0x812f8 -EnemyHitTimesText: ; 0x812f8 +EnemyHitTimesText: text "Hit @" deciram wEnemyDamageTaken, 1, 1 text " times!" prompt -; 0x8130b -MistText: ; 0x8130b +MistText: text "<USER>'s" line "shrouded in MIST!" prompt -; 0x81321 -ProtectedByMistText: ; 0x81321 +ProtectedByMistText: text "<TARGET>'s" line "protected by MIST." prompt -; 0x81338 -GettingPumpedText: ; 0x81338 +GettingPumpedText: interpret_data text "<USER>'s" line "getting pumped!" prompt -; 0x8134d -RecoilText: ; 0x8134d +RecoilText: text "<USER>'s" line "hit with recoil!" prompt -; 0x81362 -MadeSubstituteText: ; 0x81362 +MadeSubstituteText: text "<USER>" line "made a SUBSTITUTE!" prompt -; 0x81378 -HasSubstituteText: ; 0x81378 +HasSubstituteText: text "<USER>" line "has a SUBSTITUTE!" prompt -; 0x8138d -TooWeakSubText: ; 0x8138d +TooWeakSubText: text "Too weak to make" line "a SUBSTITUTE!" prompt -; 0x813ad -SubTookDamageText: ; 0x813ad +SubTookDamageText: text "The SUBSTITUTE" line "took damage for" cont "<TARGET>!" prompt -; 0x813d0 -SubFadedText: ; 0x813d0 +SubFadedText: text "<TARGET>'s" line "SUBSTITUTE faded!" prompt -; 0x813e6 -LearnedMoveText: ; 0x813e6 +LearnedMoveText: text "<USER>" line "learned" cont "@" text_from_ram wStringBuffer1 text "!" prompt -; 0x813f8 -WasSeededText: ; 0x813f8 +WasSeededText: text "<TARGET>" line "was seeded!" prompt -; 0x81407 -EvadedText: ; 0x81407 +EvadedText: text "<TARGET>" line "evaded the attack!" prompt -; 0x8141d -WasDisabledText: ; 0x8141d +WasDisabledText: text "<TARGET>'s" line "@" text_from_ram wStringBuffer1 text " was" cont "DISABLED!" prompt -; 0x81435 -CoinsScatteredText: ; 0x81435 +CoinsScatteredText: text "Coins scattered" line "everywhere!" prompt -; 0x81452 -TransformedTypeText: ; 0x81452 +TransformedTypeText: text "<USER>" line "transformed into" cont "the @" text_from_ram wStringBuffer1 text "-type!" prompt -; 0x81476 -EliminatedStatsText: ; 0x81476 +EliminatedStatsText: text "All stat changes" line "were eliminated!" prompt -; 0x81499 -TransformedText: ; 0x81499 +TransformedText: text "<USER>" line "TRANSFORMED into" cont "@" text_from_ram wStringBuffer1 text "!" prompt -; 0x814b4 -LightScreenEffectText: ; 0x814b4 +LightScreenEffectText: text "<USER>'s" line "SPCL.DEF rose!" prompt -; 0x814c7 -ReflectEffectText: ; 0x814c7 +ReflectEffectText: text "<USER>'s" line "DEFENSE rose!" prompt -; 0x814d9 -NothingHappenedText: ; 0x814d9 +NothingHappenedText: text "But nothing" line "happened." prompt -; 0x814f0 -ButItFailedText: ; 0x814f0 +ButItFailedText: text "But it failed!" prompt -; 0x81500 -ItFailedText: ; 0x81500 +ItFailedText: text "It failed!" prompt -; 0x8150c -DidntAffect1Text: ; 0x8150c +DidntAffect1Text: text "It didn't affect" line "<TARGET>!" prompt -; 0x81520 -DidntAffect2Text: ; 0x81520 +DidntAffect2Text: text "It didn't affect" line "<TARGET>!" prompt -; 0x81534 -HPIsFullText: ; 0x81534 +HPIsFullText: text "<USER>'s" line "HP is full!" prompt -; 0x81544 -DraggedOutText: ; 0x81544 +DraggedOutText: text "<USER>" line "was dragged out!" prompt -; 0x81558 -ParalyzedText: ; 0x81558 +ParalyzedText: text "<TARGET>'s" line "paralyzed! Maybe" cont "it can't attack!" prompt -; 0x8157d -FullyParalyzedText: ; 0x8157d +FullyParalyzedText: text "<USER>'s" line "fully paralyzed!" prompt -; 0x81592 -AlreadyParalyzedText: ; 0x81592 +AlreadyParalyzedText: text "<TARGET>'s" line "already paralyzed!" prompt -; 0x815a9 -ProtectedByText: ; 0x815a9 +ProtectedByText: text "<TARGET>'s" line "protected by" cont "@" text_from_ram wStringBuffer1 text "!" prompt -; 0x815c1 -MirrorMoveFailedText: ; 0x815c1 +MirrorMoveFailedText: text "The MIRROR MOVE" next "failed!" prompt -; 0x815da -StoleText: ; 0x815da +StoleText: text "<USER>" line "stole @" text_from_ram wStringBuffer1 text_start cont "from its foe!" prompt -; 0x815f7 -CantEscapeNowText: ; 0x815f7 +CantEscapeNowText: text "<TARGET>" line "can't escape now!" prompt -; 0x8160b -StartedNightmareText: ; 0x8160b +StartedNightmareText: text "<TARGET>" line "started to have a" cont "NIGHTMARE!" prompt -; 0x8162b -WasDefrostedText: ; 0x8162b +WasDefrostedText: text "<USER>" line "was defrosted!" prompt -; 0x8163d -PutACurseText: ; 0x8163d +PutACurseText: text "<USER>" line "cut its own HP and" para "put a CURSE on" line "<TARGET>!" prompt -; 0x81665 -ProtectedItselfText: ; 0x81665 +ProtectedItselfText: text "<USER>" line "PROTECTED itself!" prompt -; 0x8167a -ProtectingItselfText: ; 0x8167a +ProtectingItselfText: text "<TARGET>'s" line "PROTECTING itself!" done -; 0x81691 -SpikesText: ; 0x81691 +SpikesText: text "SPIKES scattered" line "all around" cont "<TARGET>!" prompt -; 0x816b1 -IdentifiedText: ; 0x816b1 +IdentifiedText: text "<USER>" line "identified" cont "<TARGET>!" prompt -; 0x816c2 -StartPerishText: ; 0x816c2 +StartPerishText: text "Both #MON will" line "faint in 3 turns!" prompt -; 0x816e4 -SandstormBrewedText: ; 0x816e4 +SandstormBrewedText: text "A SANDSTORM" line "brewed!" prompt -; 0x816f9 -BracedItselfText: ; 0x816f9 +BracedItselfText: text "<USER>" line "braced itself!" prompt -; 0x8170b -FellInLoveText: ; 0x8170b +FellInLoveText: text "<TARGET>" line "fell in love!" prompt -; 0x8171c -CoveredByVeilText: ; 0x8171c +CoveredByVeilText: text "<USER>'s" line "covered by a veil!" prompt -; 0x81733 -SafeguardProtectText: ; 0x81733 +SafeguardProtectText: text "<TARGET>" line "is protected by" cont "SAFEGUARD!" prompt -; 0x81751 -MagnitudeText: ; 0x81751 +MagnitudeText: text "Magnitude @" deciram wd265, 1, 1 text "!" prompt -; 0x81764 -ReleasedByText: ; 0x81764 +ReleasedByText: text "<USER>" line "was released by" cont "<TARGET>!" prompt -; 0x8177a -ShedLeechSeedText: ; 0x8177a +ShedLeechSeedText: text "<USER>" line "shed LEECH SEED!" prompt -; 0x8178e -BlewSpikesText: ; 0x8178e +BlewSpikesText: text "<USER>" line "blew away SPIKES!" prompt -; 0x817a3 -DownpourText: ; 0x817a3 +DownpourText: text "A downpour" line "started!" prompt -; 0x817b8 -SunGotBrightText: ; 0x817b8 +SunGotBrightText: text "The sunlight got" line "bright!" prompt -; 0x817d2 -BellyDrumText: ; 0x817d2 +BellyDrumText: text "<USER>" line "cut its HP and" cont "maximized ATTACK!" prompt -; 0x817f6 -CopiedStatsText: ; 0x817f6 +CopiedStatsText: text "<USER>" line "copied the stat" para "changes of" line "<TARGET>!" prompt -; 0x81817 -ForesawAttackText: ; 0x81817 +ForesawAttackText: text "<USER>" line "foresaw an attack!" prompt -; 0x8182d -BeatUpAttackText: ; 0x8182d +BeatUpAttackText: text_from_ram wStringBuffer1 text "'s" line "attack!" done -; 0x8183b -RefusedGiftText: ; 0x8183b +RefusedGiftText: text "<TARGET>" line "refused the gift!" prompt -; 0x81850 -IgnoredOrders2Text: ; 0x81850 +IgnoredOrders2Text: text "<USER>" line "ignored orders!" prompt -; 0x81863 -BattleText_LinkErrorBattleCanceled: ; 0x81863 +BattleText_LinkErrorBattleCanceled: text "Link error…" para "The battle has" line "been canceled…" prompt -; 0x8188e -BattleText_0x8188e: ; 0x8188e +BattleText_0x8188e: text "There is no time" line "left today!" done -; 0x818ac diff --git a/data/text/common_1.asm b/data/text/common_1.asm index a6e867498..c99f7eb29 100644 --- a/data/text/common_1.asm +++ b/data/text/common_1.asm @@ -93,7 +93,7 @@ UnknownText_0x1bc14f:: line "level @" deciram wCurPartyLevel, 1, 3 text "!@" - sound_dex_fanfare_50_79 + sound_dex_fanfare_50_79 ; plays SFX_DEX_FANFARE_50_79, identical to SFX_LEVEL_UP text_waitbutton db "@@" 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/unused_sweet_honey.asm b/data/text/unused_sweet_honey.asm index 9bfa4f6b1..04ceae2e6 100644 --- a/data/text/unused_sweet_honey.asm +++ b/data/text/unused_sweet_honey.asm @@ -8,7 +8,7 @@ ; Most of these texts seem to be associated with a single NPC. ; The last text is associated with a second NPC, probably a Butterfree. -UnusedSweetHoneyText: ; 0x5578a +UnusedSweetHoneyText: text "My #MON is an" line "expert at collect-" cont "ing SWEET HONEY." @@ -17,7 +17,7 @@ UnusedSweetHoneyText: ; 0x5578a line "with you." done -UnusedSweetHoneyBagFullText: ; 0x557d6 +UnusedSweetHoneyBagFullText: text "I want to give you" line "some SWEET HONEY," @@ -25,17 +25,17 @@ UnusedSweetHoneyBagFullText: ; 0x557d6 line "room for it." done -UnusedSweetHoneyGiveText: ; 0x55819 +UnusedSweetHoneyGiveText: text "Here you go! Have" line "some SWEET HONEY!" done -UnusedGotSweetHoneyText: ; 0x5583e +UnusedGotSweetHoneyText: text "<PLAYER> received" line "SWEET HONEY." done -UnusedSweetHoneyAfterText1: ; 0x55856 +UnusedSweetHoneyAfterText1: text "My little brother" line "takes SWEET HONEY" @@ -46,7 +46,7 @@ UnusedSweetHoneyAfterText1: ; 0x55856 line "up to?" done -UnusedSweetHoneyAfterText2: ; 0x558b1 +UnusedSweetHoneyAfterText2: text "Did you put SWEET" line "HONEY on a tree?" @@ -54,7 +54,7 @@ UnusedSweetHoneyAfterText2: ; 0x558b1 line "it?" done -UnusedSweetHoneyAfterText3: ; 0x558ea +UnusedSweetHoneyAfterText3: text "Did you put SWEET" line "HONEY on a tree?" @@ -63,6 +63,6 @@ UnusedSweetHoneyAfterText3: ; 0x558ea cont "be drawn to it." done -UnusedSweetHoneyButterfreeText: ; 0x5593f +UnusedSweetHoneyButterfreeText: text "BUTTERFREE: Freeh!" done 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..b95c20f40 100644 --- a/data/tilesets.asm +++ b/data/tilesets.asm @@ -8,9 +8,9 @@ ENDM ; Associated data: ; - The *GFX, *Meta, and *Coll are defined in gfx/tilesets.asm ; - The *PalMap are defined in gfx/tileset_palette_maps.asm -; - The *Anim are defined in engine/tileset_anims.asm +; - The *Anim are defined in engine/tilesets/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..67d852d83 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 @@ -402,5 +402,3 @@ TrainerClassAttributes: ; 3959c db 25 ; base reward 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 06f486774..5ed883681 100644 --- a/data/trainers/dvs.asm +++ b/data/trainers/dvs.asm @@ -1,72 +1,70 @@ -TrainerClassDVs: ; 270d6 +TrainerClassDVs: ; entries correspond to trainer classes (see constants/trainer_constants.asm) - ; Atk Spd - ; Def Spc - db $9A, $77 ; falkner - db $88, $88 ; bugsy - db $98, $88 ; whitney - db $98, $88 ; morty - db $98, $88 ; pryce - db $98, $88 ; jasmine - db $98, $88 ; chuck - db $7C, $DD ; clair - db $DD, $DD ; rival1 - db $98, $88 ; pokemon prof - db $DC, $DD ; will - db $DC, $DD ; cal - db $DC, $DD ; bruno - db $7F, $DF ; karen - db $DC, $DD ; koga - db $DC, $DD ; champion - db $98, $88 ; brock - db $78, $88 ; misty - db $98, $88 ; lt surge - db $98, $88 ; scientist - db $78, $88 ; erika - db $98, $88 ; youngster - db $98, $88 ; schoolboy - db $98, $88 ; bird keeper - db $58, $88 ; lass - db $98, $88 ; janine - db $D8, $C8 ; cooltrainerm - db $7C, $C8 ; cooltrainerf - db $69, $C8 ; beauty - db $98, $88 ; pokemaniac - db $D8, $A8 ; gruntm - db $98, $88 ; gentleman - db $98, $88 ; skier - db $68, $88 ; teacher - db $7D, $87 ; sabrina - db $98, $88 ; bug catcher - db $98, $88 ; fisher - db $98, $88 ; swimmerm - db $78, $88 ; swimmerf - db $98, $88 ; sailor - db $98, $88 ; super nerd - db $98, $88 ; rival2 - db $98, $88 ; guitarist - db $A8, $88 ; hiker - db $98, $88 ; biker - db $98, $88 ; blaine - db $98, $88 ; burglar - db $98, $88 ; firebreather - db $98, $88 ; juggler - db $98, $88 ; blackbelt - db $D8, $A8 ; executivem - db $98, $88 ; psychic - db $6A, $A8 ; picnicker - db $98, $88 ; camper - db $7E, $A8 ; executivef - db $98, $88 ; sage - db $78, $88 ; medium - db $98, $88 ; boarder - db $98, $88 ; pokefanm - db $68, $8A ; kimono girl - db $68, $A8 ; twins - db $6D, $88 ; pokefanf - db $FD, $DE ; red - db $9D, $DD ; blue - db $98, $88 ; officer - db $7E, $A8 ; gruntf - db $98, $88 ; mysticalman -; 2715c + ; atk,def,spd,spc + dn 9, 10, 7, 7 ; FALKNER + dn 8, 8, 8, 8 ; BUGSY + dn 9, 8, 8, 8 ; WHITNEY + dn 9, 8, 8, 8 ; MORTY + dn 9, 8, 8, 8 ; PRYCE + dn 9, 8, 8, 8 ; JASMINE + dn 9, 8, 8, 8 ; CHUCK + dn 7, 12, 13, 13 ; CLAIR + dn 13, 13, 13, 13 ; RIVAL1 + dn 9, 8, 8, 8 ; POKEMON_PROF + dn 13, 12, 13, 13 ; WILL + dn 13, 12, 13, 13 ; CAL + dn 13, 12, 13, 13 ; BRUNO + dn 7, 15, 13, 15 ; KAREN + dn 13, 12, 13, 13 ; KOGA + dn 13, 12, 13, 13 ; CHAMPION + dn 9, 8, 8, 8 ; BROCK + dn 7, 8, 8, 8 ; MISTY + dn 9, 8, 8, 8 ; LT_SURGE + dn 9, 8, 8, 8 ; SCIENTIST + dn 7, 8, 8, 8 ; ERIKA + dn 9, 8, 8, 8 ; YOUNGSTER + dn 9, 8, 8, 8 ; SCHOOLBOY + dn 9, 8, 8, 8 ; BIRD_KEEPER + dn 5, 8, 8, 8 ; LASS + dn 9, 8, 8, 8 ; JANINE + dn 13, 8, 12, 8 ; COOLTRAINERM + dn 7, 12, 12, 8 ; COOLTRAINERF + dn 6, 9, 12, 8 ; BEAUTY + dn 9, 8, 8, 8 ; POKEMANIAC + dn 13, 8, 10, 8 ; GRUNTM + dn 9, 8, 8, 8 ; GENTLEMAN + dn 9, 8, 8, 8 ; SKIER + dn 6, 8, 8, 8 ; TEACHER + dn 7, 13, 8, 7 ; SABRINA + dn 9, 8, 8, 8 ; BUG_CATCHER + dn 9, 8, 8, 8 ; FISHER + dn 9, 8, 8, 8 ; SWIMMERM + dn 7, 8, 8, 8 ; SWIMMERF + dn 9, 8, 8, 8 ; SAILOR + dn 9, 8, 8, 8 ; SUPER_NERD + dn 9, 8, 8, 8 ; RIVAL2 + dn 9, 8, 8, 8 ; GUITARIST + dn 10, 8, 8, 8 ; HIKER + dn 9, 8, 8, 8 ; BIKER + dn 9, 8, 8, 8 ; BLAINE + dn 9, 8, 8, 8 ; BURGLAR + dn 9, 8, 8, 8 ; FIREBREATHER + dn 9, 8, 8, 8 ; JUGGLER + dn 9, 8, 8, 8 ; BLACKBELT_T + dn 13, 8, 10, 8 ; EXECUTIVEM + dn 9, 8, 8, 8 ; PSYCHIC_T + dn 6, 10, 10, 8 ; PICNICKER + dn 9, 8, 8, 8 ; CAMPER + dn 7, 14, 10, 8 ; EXECUTIVEF + dn 9, 8, 8, 8 ; SAGE + dn 7, 8, 8, 8 ; MEDIUM + dn 9, 8, 8, 8 ; BOARDER + dn 9, 8, 8, 8 ; POKEFANM + dn 6, 8, 8, 10 ; KIMONO_GIRL + dn 6, 8, 10, 8 ; TWINS + dn 6, 13, 8, 8 ; POKEFANF + dn 15, 13, 13, 14 ; RED + dn 9, 13, 13, 13 ; BLUE + dn 9, 8, 8, 8 ; OFFICER + dn 7, 14, 10, 8 ; GRUNTF + dn 9, 8, 8, 8 ; MYSTICALMAN 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/trainers/parties.asm b/data/trainers/parties.asm index 3c07e6597..35de91e85 100644 --- a/data/trainers/parties.asm +++ b/data/trainers/parties.asm @@ -1,3 +1,5 @@ +INCLUDE "data/trainers/party_pointers.asm" + Trainers: ; Trainer data structure: ; - db "NAME@", TRAINERTYPE_* constant @@ -8,7 +10,6 @@ Trainers: ; * for TRAINERTYPE_ITEM_MOVES: db level, species, item, 4 moves ; - db -1 ; end - FalknerGroup: ; FALKNER (1) db "FALKNER@", TRAINERTYPE_MOVES @@ -16,7 +17,6 @@ FalknerGroup: db 9, PIDGEOTTO, TACKLE, MUD_SLAP, GUST, NO_MOVE db -1 ; end - WhitneyGroup: ; WHITNEY (1) db "WHITNEY@", TRAINERTYPE_MOVES @@ -24,7 +24,6 @@ WhitneyGroup: db 20, MILTANK, ROLLOUT, ATTRACT, STOMP, MILK_DRINK db -1 ; end - BugsyGroup: ; BUGSY (1) db "BUGSY@", TRAINERTYPE_MOVES @@ -33,7 +32,6 @@ BugsyGroup: db 16, SCYTHER, QUICK_ATTACK, LEER, FURY_CUTTER, NO_MOVE db -1 ; end - MortyGroup: ; MORTY (1) db "MORTY@", TRAINERTYPE_MOVES @@ -43,7 +41,6 @@ MortyGroup: db 23, HAUNTER, SPITE, MEAN_LOOK, MIMIC, NIGHT_SHADE db -1 ; end - PryceGroup: ; PRYCE (1) db "PRYCE@", TRAINERTYPE_MOVES @@ -52,7 +49,6 @@ PryceGroup: db 31, PILOSWINE, ICY_WIND, FURY_ATTACK, MIST, BLIZZARD db -1 ; end - JasmineGroup: ; JASMINE (1) db "JASMINE@", TRAINERTYPE_MOVES @@ -61,7 +57,6 @@ JasmineGroup: db 35, STEELIX, SCREECH, SUNNY_DAY, ROCK_THROW, IRON_TAIL db -1 ; end - ChuckGroup: ; CHUCK (1) db "CHUCK@", TRAINERTYPE_MOVES @@ -69,7 +64,6 @@ ChuckGroup: db 30, POLIWRATH, HYPNOSIS, MIND_READER, SURF, DYNAMICPUNCH db -1 ; end - ClairGroup: ; CLAIR (1) db "CLAIR@", TRAINERTYPE_MOVES @@ -79,7 +73,6 @@ ClairGroup: db 40, KINGDRA, SMOKESCREEN, SURF, HYPER_BEAM, DRAGONBREATH db -1 ; end - Rival1Group: ; RIVAL1 (1) db "?@", TRAINERTYPE_NORMAL @@ -198,10 +191,8 @@ Rival1Group: db 38, FERALIGATR, RAGE, WATER_GUN, SCARY_FACE, SLASH db -1 ; end - PokemonProfGroup: - WillGroup: ; WILL (1) db "WILL@", TRAINERTYPE_MOVES @@ -212,7 +203,6 @@ WillGroup: db 42, XATU, QUICK_ATTACK, FUTURE_SIGHT, CONFUSE_RAY, PSYCHIC_M db -1 ; end - PKMNTrainerGroup: ; CAL (1) db "CAL@", TRAINERTYPE_NORMAL @@ -235,7 +225,6 @@ PKMNTrainerGroup: db 50, FERALIGATR db -1 ; end - BrunoGroup: ; BRUNO (1) db "BRUNO@", TRAINERTYPE_MOVES @@ -246,7 +235,6 @@ BrunoGroup: db 46, MACHAMP, ROCK_SLIDE, FORESIGHT, VITAL_THROW, CROSS_CHOP db -1 ; end - KarenGroup: ; KAREN (1) db "KAREN@", TRAINERTYPE_MOVES @@ -257,7 +245,6 @@ KarenGroup: db 47, HOUNDOOM, ROAR, PURSUIT, FLAMETHROWER, CRUNCH db -1 ; end - KogaGroup: ; KOGA (1) db "KOGA@", TRAINERTYPE_MOVES @@ -268,7 +255,6 @@ KogaGroup: db 44, CROBAT, DOUBLE_TEAM, QUICK_ATTACK, WING_ATTACK, TOXIC db -1 ; end - ChampionGroup: ; CHAMPION (1) db "LANCE@", TRAINERTYPE_MOVES @@ -280,7 +266,6 @@ ChampionGroup: db 50, DRAGONITE, FIRE_BLAST, SAFEGUARD, OUTRAGE, HYPER_BEAM db -1 ; end - BrockGroup: ; BROCK (1) db "BROCK@", TRAINERTYPE_MOVES @@ -291,7 +276,6 @@ BrockGroup: db 42, KABUTOPS, SLASH, SURF, ENDURE, GIGA_DRAIN db -1 ; end - MistyGroup: ; MISTY (1) db "MISTY@", TRAINERTYPE_MOVES @@ -301,7 +285,6 @@ MistyGroup: db 47, STARMIE, SURF, CONFUSE_RAY, RECOVER, ICE_BEAM db -1 ; end - LtSurgeGroup: ; LT_SURGE (1) db "LT.SURGE@", TRAINERTYPE_MOVES @@ -312,7 +295,6 @@ LtSurgeGroup: db 46, ELECTABUZZ, QUICK_ATTACK, THUNDERPUNCH, LIGHT_SCREEN, THUNDER db -1 ; end - ScientistGroup: ; SCIENTIST (1) db "ROSS@", TRAINERTYPE_NORMAL @@ -344,7 +326,6 @@ ScientistGroup: db 30, PORYGON, CONVERSION, CONVERSION2, RECOVER, TRI_ATTACK db -1 ; end - ErikaGroup: ; ERIKA (1) db "ERIKA@", TRAINERTYPE_MOVES @@ -354,7 +335,6 @@ ErikaGroup: db 46, BELLOSSOM, SUNNY_DAY, SYNTHESIS, PETAL_DANCE, SOLARBEAM db -1 ; end - YoungsterGroup: ; YOUNGSTER (1) db "JOEY@", TRAINERTYPE_NORMAL @@ -434,7 +414,6 @@ YoungsterGroup: db 37, RATICATE, HYPER_BEAM, QUICK_ATTACK, HYPER_FANG, PURSUIT db -1 ; end - SchoolboyGroup: ; SCHOOLBOY (1) db "JACK@", TRAINERTYPE_NORMAL @@ -591,7 +570,6 @@ SchoolboyGroup: db 38, MAGNETON, ZAP_CANNON, THUNDER_WAVE, LOCK_ON, SWIFT db -1 ; end - BirdKeeperGroup: ; BIRD_KEEPER (1) db "ROD@", TRAINERTYPE_NORMAL @@ -708,7 +686,6 @@ BirdKeeperGroup: db 38, PIDGEOT, SWIFT, DETECT, STEEL_WING, FLY db -1 ; end - LassGroup: ; LASS (1) db "CARRIE@", TRAINERTYPE_MOVES @@ -814,7 +791,6 @@ LassGroup: db 36, GOLDUCK, DISABLE, SURF, PSYCHIC_M, SCREECH db -1 ; end - JanineGroup: ; JANINE (1) db "JANINE@", TRAINERTYPE_MOVES @@ -825,7 +801,6 @@ JanineGroup: db 39, VENOMOTH, FORESIGHT, DOUBLE_TEAM, GUST, PSYCHIC_M db -1 ; end - CooltrainerMGroup: ; COOLTRAINERM (1) db "NICK@", TRAINERTYPE_MOVES @@ -956,7 +931,6 @@ CooltrainerMGroup: db 37, DRAGONAIR, WRAP, SURF, DRAGON_RAGE, SLAM db -1 ; end - CooltrainerFGroup: ; COOLTRAINERF (1) db "GWEN@", TRAINERTYPE_NORMAL @@ -1088,7 +1062,6 @@ CooltrainerFGroup: db 35, SEADRA, SWIFT, LEER, WATERFALL, TWISTER db -1 ; end - BeautyGroup: ; BEAUTY (1) db "VICTORIA@", TRAINERTYPE_NORMAL @@ -1184,7 +1157,6 @@ BeautyGroup: db 19, CORSOLA db -1 ; end - PokemaniacGroup: ; POKEMANIAC (1) db "LARRY@", TRAINERTYPE_NORMAL @@ -1266,7 +1238,6 @@ PokemaniacGroup: db 17, NIDOQUEEN db -1 ; end - GruntMGroup: ; GRUNTM (1) db "GRUNT@", TRAINERTYPE_NORMAL @@ -1458,7 +1429,6 @@ GruntMGroup: db 30, GOLBAT db -1 ; end - GentlemanGroup: ; GENTLEMAN (1) db "PRESTON@", TRAINERTYPE_NORMAL @@ -1487,7 +1457,6 @@ GentlemanGroup: db 20, NOCTOWL db -1 ; end - SkierGroup: ; SKIER (1) db "ROXANNE@", TRAINERTYPE_NORMAL @@ -1499,7 +1468,6 @@ SkierGroup: db 28, DEWGONG db -1 ; end - TeacherGroup: ; TEACHER (1) db "COLETTE@", TRAINERTYPE_NORMAL @@ -1517,7 +1485,6 @@ TeacherGroup: db 35, JIGGLYPUFF db -1 ; end - SabrinaGroup: ; SABRINA (1) db "SABRINA@", TRAINERTYPE_MOVES @@ -1526,7 +1493,6 @@ SabrinaGroup: db 48, ALAKAZAM, RECOVER, FUTURE_SIGHT, PSYCHIC_M, REFLECT db -1 ; end - BugCatcherGroup: ; BUG_CATCHER (1) db "DON@", TRAINERTYPE_NORMAL @@ -1647,7 +1613,6 @@ BugCatcherGroup: db 10, PARAS db -1 ; end - FisherGroup: ; FISHER (1) db "JUSTIN@", TRAINERTYPE_NORMAL @@ -1811,7 +1776,6 @@ FisherGroup: db 37, QWILFISH, ROLLOUT, SURF, PIN_MISSILE, TAKE_DOWN db -1 ; end - SwimmerMGroup: ; SWIMMERM (1) db "HAROLD@", TRAINERTYPE_NORMAL @@ -1953,7 +1917,6 @@ SwimmerMGroup: db 35, SEADRA db -1 ; end - SwimmerFGroup: ; SWIMMERF (1) db "ELAINE@", TRAINERTYPE_NORMAL @@ -2063,7 +2026,6 @@ SwimmerFGroup: db 35, SEAKING db -1 ; end - SailorGroup: ; SAILOR (1) db "EUGENE@", TRAINERTYPE_NORMAL @@ -2145,7 +2107,6 @@ SailorGroup: db 38, POLIWRATH, SURF, STRENGTH, ICE_PUNCH, SUBMISSION db -1 ; end - SuperNerdGroup: ; SUPER_NERD (1) db "STAN@", TRAINERTYPE_NORMAL @@ -2231,7 +2192,6 @@ SuperNerdGroup: db 19, SLOWPOKE, CURSE, WATER_GUN, GROWL, STRENGTH db -1 ; end - Rival2Group: ; RIVAL2 (1) db "?@", TRAINERTYPE_MOVES @@ -2293,7 +2253,6 @@ Rival2Group: db 50, FERALIGATR, SURF, RAIN_DANCE, SLASH, SCREECH db -1 ; end - GuitaristGroup: ; GUITARIST (1) db "CLYDE@", TRAINERTYPE_NORMAL @@ -2308,7 +2267,6 @@ GuitaristGroup: db 32, MAGNEMITE db -1 ; end - HikerGroup: ; HIKER (1) db "ANTHONY@", TRAINERTYPE_NORMAL @@ -2454,7 +2412,6 @@ HikerGroup: db 34, MACHOKE, KARATE_CHOP, VITAL_THROW, HEADBUTT, DIG db -1 ; end - BikerGroup: ; BIKER (1) db "BENNY@", TRAINERTYPE_NORMAL @@ -2514,7 +2471,6 @@ BikerGroup: db 32, WEEZING db -1 ; end - BlaineGroup: ; BLAINE (1) db "BLAINE@", TRAINERTYPE_MOVES @@ -2523,7 +2479,6 @@ BlaineGroup: db 50, RAPIDASH, QUICK_ATTACK, FIRE_SPIN, FURY_ATTACK, FIRE_BLAST db -1 ; end - BurglarGroup: ; BURGLAR (1) db "DUNCAN@", TRAINERTYPE_NORMAL @@ -2546,7 +2501,6 @@ BurglarGroup: db 30, KOFFING db -1 ; end - FirebreatherGroup: ; FIREBREATHER (1) db "OTIS@", TRAINERTYPE_NORMAL @@ -2597,7 +2551,6 @@ FirebreatherGroup: db 28, KOFFING db -1 ; end - JugglerGroup: ; JUGGLER (1) db "IRWIN@", TRAINERTYPE_NORMAL @@ -2646,7 +2599,6 @@ JugglerGroup: db 30, ELECTRODE db -1 ; end - BlackbeltGroup: ; BLACKBELT_T (1) db "KENJI@", TRAINERTYPE_NORMAL @@ -2705,7 +2657,6 @@ BlackbeltGroup: db 34, MACHOKE db -1 ; end - ExecutiveMGroup: ; EXECUTIVEM (1) db "EXECUTIVE@", TRAINERTYPE_MOVES @@ -2736,7 +2687,6 @@ ExecutiveMGroup: db 22, KOFFING db -1 ; end - PsychicGroup: ; PSYCHIC_T (1) db "NATHAN@", TRAINERTYPE_NORMAL @@ -2809,7 +2759,6 @@ PsychicGroup: db 33, HYPNO db -1 ; end - PicnickerGroup: ; PICNICKER (1) db "LIZ@", TRAINERTYPE_NORMAL @@ -2965,7 +2914,6 @@ PicnickerGroup: db 43, CLEFAIRY, METRONOME, ENCORE, MOONLIGHT, MINIMIZE db -1 ; end - CamperGroup: ; CAMPER (1) db "ROLAND@", TRAINERTYPE_NORMAL @@ -3109,7 +3057,6 @@ CamperGroup: db 30, TAUROS db -1 ; end - ExecutiveFGroup: ; EXECUTIVEF (1) db "EXECUTIVE@", TRAINERTYPE_MOVES @@ -3125,7 +3072,6 @@ ExecutiveFGroup: db 25, MURKROW, PECK, PURSUIT, HAZE, NO_MOVE db -1 ; end - SageGroup: ; SAGE (1) db "CHOW@", TRAINERTYPE_NORMAL @@ -3203,7 +3149,6 @@ SageGroup: db 32, VAPOREON db -1 ; end - MediumGroup: ; MEDIUM (1) db "MARTHA@", TRAINERTYPE_NORMAL @@ -3245,7 +3190,6 @@ MediumGroup: db 36, SLOWBRO db -1 ; end - BoarderGroup: ; BOARDER (1) db "RONALD@", TRAINERTYPE_NORMAL @@ -3267,7 +3211,6 @@ BoarderGroup: db 24, SHELLDER db -1 ; end - PokefanMGroup: ; POKEFANM (1) db "WILLIAM@", TRAINERTYPE_ITEM @@ -3350,7 +3293,6 @@ PokefanMGroup: db 35, TEDDIURSA, BERRY db -1 ; end - KimonoGirlGroup: ; KIMONO_GIRL (1) db "NAOKO@", TRAINERTYPE_NORMAL @@ -3384,7 +3326,6 @@ KimonoGirlGroup: db 17, JOLTEON db -1 ; end - TwinsGroup: ; TWINS (1) db "AMY & MAY@", TRAINERTYPE_NORMAL @@ -3446,7 +3387,6 @@ TwinsGroup: db 38, DRATINI, THUNDER_WAVE, TWISTER, FLAMETHROWER, HEADBUTT db -1 ; end - PokefanFGroup: ; POKEFANF (1) db "BEVERLY@", TRAINERTYPE_ITEM @@ -3482,7 +3422,6 @@ PokefanFGroup: db 16, MEOWTH, BERRY db -1 ; end - RedGroup: ; RED (1) db "RED@", TRAINERTYPE_MOVES @@ -3494,7 +3433,6 @@ RedGroup: db 77, BLASTOISE, RAIN_DANCE, SURF, BLIZZARD, WHIRLPOOL db -1 ; end - BlueGroup: ; BLUE (1) db "BLUE@", TRAINERTYPE_MOVES @@ -3506,7 +3444,6 @@ BlueGroup: db 58, ARCANINE, ROAR, SWIFT, FLAMETHROWER, EXTREMESPEED db -1 ; end - OfficerGroup: ; OFFICER (1) db "KEITH@", TRAINERTYPE_NORMAL @@ -3519,7 +3456,6 @@ OfficerGroup: db 14, GROWLITHE db -1 ; end - GruntFGroup: ; GRUNTF (1) db "GRUNT@", TRAINERTYPE_NORMAL @@ -3552,7 +3488,6 @@ GruntFGroup: db 18, GLOOM, ABSORB, SWEET_SCENT, STUN_SPORE, SLEEP_POWDER db -1 ; end - MysticalmanGroup: ; MYSTICALMAN (1) db "EUSINE@", TRAINERTYPE_MOVES diff --git a/data/trainers/party_pointers.asm b/data/trainers/party_pointers.asm index 887544126..45ba65b85 100644 --- a/data/trainers/party_pointers.asm +++ b/data/trainers/party_pointers.asm @@ -1,6 +1,6 @@ ; Groups are defined in data/trainers/parties.asm. -TrainerGroups: ; 0x39999 +TrainerGroups: ; entries correspond to trainer classes (see constants/trainer_constants.asm) dw FalknerGroup dw WhitneyGroup diff --git a/data/types/names.asm b/data/types/names.asm index ca810aea3..62d8e13bf 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 @@ -48,5 +48,3 @@ Ghost: db "GHOST@" 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 90e38ae2c..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 @@ -109,11 +109,10 @@ TypeMatchups: ; 34bb1 db STEEL, ROCK, SUPER_EFFECTIVE db STEEL, STEEL, NOT_VERY_EFFECTIVE - db -2 ; end + db -2 ; end (with Foresight) ; Foresight removes Ghost's immunities. db NORMAL, GHOST, NO_EFFECT db FIGHTING, GHOST, NO_EFFECT - db -1 ; end (with Foresight) -; 34cfd + db -1 ; end diff --git a/data/unused_53d84.asm b/data/unused_53d84.asm deleted file mode 100644 index 026ec5275..000000000 --- a/data/unused_53d84.asm +++ /dev/null @@ -1,13 +0,0 @@ -Unreferenced_53d84: - db $1a, $15 - db $33, $16 - db $4b, $17 - db $62, $18 - db $79, $19 - db $90, $1a - db $a8, $1b - db $c4, $1c - db $e0, $1d - db $f6, $1e - db $ff, $1f - db $ff, $20 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..1976c8f95 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,190 @@ 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 +228,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/johto_grass.asm b/data/wild/johto_grass.asm index c48de0408..2567e9fcf 100644 --- a/data/wild/johto_grass.asm +++ b/data/wild/johto_grass.asm @@ -1,6 +1,6 @@ ; Johto Pokémon in grass -JohtoGrassWildMons: ; 0x2a5e9 +JohtoGrassWildMons: map_id SPROUT_TOWER_2F db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite diff --git a/data/wild/johto_water.asm b/data/wild/johto_water.asm index 778d5f409..83e33b2d5 100644 --- a/data/wild/johto_water.asm +++ b/data/wild/johto_water.asm @@ -1,6 +1,6 @@ ; Johto Pokémon in water -JohtoWaterWildMons: ; 0x2b11d +JohtoWaterWildMons: map_id RUINS_OF_ALPH_OUTSIDE db 2 percent ; encounter rate diff --git a/data/wild/kanto_grass.asm b/data/wild/kanto_grass.asm index bc9e2cae9..ff1720972 100644 --- a/data/wild/kanto_grass.asm +++ b/data/wild/kanto_grass.asm @@ -1,6 +1,6 @@ ; Kanto Pokémon in grass -KantoGrassWildMons: ; 0x2b274 +KantoGrassWildMons: map_id DIGLETTS_CAVE db 4 percent, 2 percent, 8 percent ; encounter rates: morn/day/nite diff --git a/data/wild/kanto_water.asm b/data/wild/kanto_water.asm index 1cbd473a0..c9abda73d 100644 --- a/data/wild/kanto_water.asm +++ b/data/wild/kanto_water.asm @@ -1,6 +1,6 @@ ; Kanto Pokémon in water -KantoWaterWildMons: ; 0x2b7f7 +KantoWaterWildMons: map_id TOHJO_FALLS db 4 percent ; encounter rate 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/swarm_grass.asm b/data/wild/swarm_grass.asm index 408a0157e..dd7110e16 100644 --- a/data/wild/swarm_grass.asm +++ b/data/wild/swarm_grass.asm @@ -1,6 +1,6 @@ ; Pokémon swarms in grass -SwarmGrassWildMons: ; 0x2b8d0 +SwarmGrassWildMons: ; Dunsparce swarm map_id DARK_CAVE_VIOLET_ENTRANCE diff --git a/data/wild/swarm_water.asm b/data/wild/swarm_water.asm index 3f69af512..ec105c003 100644 --- a/data/wild/swarm_water.asm +++ b/data/wild/swarm_water.asm @@ -1,6 +1,6 @@ ; Pokémon swarms in water -SwarmWaterWildMons: ; 0x2b92f +SwarmWaterWildMons: ; No swarms encountered while surfing in Crystal diff --git a/data/wild/treemon_maps.asm b/data/wild/treemon_maps.asm index 59eba43cc..b85962399 100644 --- a/data/wild/treemon_maps.asm +++ b/data/wild/treemon_maps.asm @@ -1,9 +1,9 @@ treemon_map: MACRO map_id \1 - db \2 ; treemon set + 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 |