diff options
Diffstat (limited to 'data')
724 files changed, 10809 insertions, 16985 deletions
diff --git a/data/battle/accuracy_multipliers.asm b/data/battle/accuracy_multipliers.asm index a5a309bbd..4b52a0909 100644 --- a/data/battle/accuracy_multipliers.asm +++ b/data/battle/accuracy_multipliers.asm @@ -1,5 +1,5 @@ ; Multiplier ratios for accuracy from modifier -6 to +6 -; (for other stats, see data/battle/stat_multipliers.asm) +; (for other stats, see data/battle/stat_multipliers.asm). AccuracyLevelMultipliers: db 33, 100 ; -6 = 33% diff --git a/data/battle/ai/constant_damage_effects.asm b/data/battle/ai/constant_damage_effects.asm new file mode 100644 index 000000000..cd812d415 --- /dev/null +++ b/data/battle/ai/constant_damage_effects.asm @@ -0,0 +1,10 @@ +; AIDamageCalc uses BattleCommand_ConstantDamage +; to calculate damage for these instead of +; BattleCommand_DamageCalc and BattleCommand_Stab. + +ConstantDamageEffects: + db EFFECT_SUPER_FANG + db EFFECT_STATIC_DAMAGE + db EFFECT_LEVEL_DAMAGE + db EFFECT_PSYWAVE + db -1 ; end diff --git a/data/battle/ai/encore_moves.asm b/data/battle/ai/encore_moves.asm new file mode 100644 index 000000000..03e028bd1 --- /dev/null +++ b/data/battle/ai/encore_moves.asm @@ -0,0 +1,34 @@ +; AI_SMART encourages these moves with Encore. + +EncoreMoves: + db SWORDS_DANCE + db WHIRLWIND + db LEER + db ROAR + db DISABLE + db MIST + db LEECH_SEED + db GROWTH + db POISONPOWDER + db STRING_SHOT + db MEDITATE + db AGILITY + db TELEPORT + db SCREECH + db HAZE + db FOCUS_ENERGY + db DREAM_EATER + db POISON_GAS + db SPLASH + db SHARPEN + db CONVERSION + db SUPER_FANG + db SUBSTITUTE + db TRIPLE_KICK + db SPIDER_WEB + db MIND_READER + db FLAME_WHEEL + db AEROBLAST + db COTTON_SPORE + db POWDER_SNOW + db -1 ; end diff --git a/data/battle/ai/rain_dance_moves.asm b/data/battle/ai/rain_dance_moves.asm new file mode 100644 index 000000000..c00e0b60a --- /dev/null +++ b/data/battle/ai/rain_dance_moves.asm @@ -0,0 +1,15 @@ +; AI_SMART prefers these moves during rain. + +RainDanceMoves: + db WATER_GUN + db HYDRO_PUMP + db SURF + db BUBBLEBEAM + db THUNDER + db WATERFALL + db CLAMP + db BUBBLE + db CRABHAMMER + db OCTAZOOKA + db WHIRLPOOL + db -1 ; end diff --git a/data/battle/ai/reckless_moves.asm b/data/battle/ai/reckless_moves.asm new file mode 100644 index 000000000..67252979b --- /dev/null +++ b/data/battle/ai/reckless_moves.asm @@ -0,0 +1,9 @@ +; AI_AGGRESSIVE does not discourage these moves +; even if a stronger one is available. + +RecklessMoves: + db EFFECT_SELFDESTRUCT + db EFFECT_RAMPAGE + db EFFECT_MULTI_HIT + db EFFECT_DOUBLE_HIT + db -1 ; end diff --git a/data/battle/ai/residual_moves.asm b/data/battle/ai/residual_moves.asm new file mode 100644 index 000000000..c99ac0f5e --- /dev/null +++ b/data/battle/ai/residual_moves.asm @@ -0,0 +1,16 @@ +; AI_CAUTIOUS discourages these moves after the first turn. + +ResidualMoves: + db MIST + db LEECH_SEED + db POISONPOWDER + db STUN_SPORE + db THUNDER_WAVE + db FOCUS_ENERGY + db BIDE + db POISON_GAS + db TRANSFORM + db CONVERSION + db SUBSTITUTE + db SPIKES + db -1 ; end diff --git a/data/battle/ai/risky_effects.asm b/data/battle/ai/risky_effects.asm new file mode 100644 index 000000000..529436c48 --- /dev/null +++ b/data/battle/ai/risky_effects.asm @@ -0,0 +1,7 @@ +; AI_RISKY will not use these effects at max HP +; even if they would KO the player. + +RiskyEffects: + db EFFECT_SELFDESTRUCT + db EFFECT_OHKO + db -1 ; end diff --git a/data/battle/ai/stall_moves.asm b/data/battle/ai/stall_moves.asm new file mode 100644 index 000000000..65838e0f0 --- /dev/null +++ b/data/battle/ai/stall_moves.asm @@ -0,0 +1,37 @@ +; AI_OPPORTUNIST discourages these moves +; when the player's HP is low. + +StallMoves: + db SWORDS_DANCE + db TAIL_WHIP + db LEER + db GROWL + db DISABLE + db MIST + db COUNTER + db LEECH_SEED + db GROWTH + db STRING_SHOT + db MEDITATE + db AGILITY + db RAGE + db MIMIC + db SCREECH + db HARDEN + db WITHDRAW + db DEFENSE_CURL + db BARRIER + db LIGHT_SCREEN + db HAZE + db REFLECT + db FOCUS_ENERGY + db BIDE + db AMNESIA + db TRANSFORM + db SPLASH + db ACID_ARMOR + db SHARPEN + db CONVERSION + db SUBSTITUTE + db FLAME_WHEEL + db -1 ; end diff --git a/data/battle/ai/status_only_effects.asm b/data/battle/ai/status_only_effects.asm new file mode 100644 index 000000000..8748d93b3 --- /dev/null +++ b/data/battle/ai/status_only_effects.asm @@ -0,0 +1,9 @@ +; AI_BASIC discourages these effects if the player +; already has a status condition. + +StatusOnlyEffects: + db EFFECT_SLEEP + db EFFECT_TOXIC + db EFFECT_POISON + db EFFECT_PARALYZE + db -1 ; end diff --git a/data/battle/ai/sunny_day_moves.asm b/data/battle/ai/sunny_day_moves.asm new file mode 100644 index 000000000..38d6a8ee7 --- /dev/null +++ b/data/battle/ai/sunny_day_moves.asm @@ -0,0 +1,12 @@ +; AI_SMART prefers these moves during harsh sunlight. + +SunnyDayMoves: + db FIRE_PUNCH + db EMBER + db FLAMETHROWER + db FIRE_SPIN + db FIRE_BLAST + db SACRED_FIRE + db MORNING_SUN + db SYNTHESIS + db -1 ; end diff --git a/data/battle/ai/useful_moves.asm b/data/battle/ai/useful_moves.asm new file mode 100644 index 000000000..456bda2da --- /dev/null +++ b/data/battle/ai/useful_moves.asm @@ -0,0 +1,23 @@ +; AI_SMART knows these moves are usable all-around. + +UsefulMoves: + db DOUBLE_EDGE + db SING + db FLAMETHROWER + db HYDRO_PUMP + db SURF + db ICE_BEAM + db BLIZZARD + db HYPER_BEAM + db SLEEP_POWDER + db THUNDERBOLT + db THUNDER + db EARTHQUAKE + db TOXIC + db PSYCHIC_M + db HYPNOSIS + db RECOVER + db FIRE_BLAST + db SOFTBOILED + db SUPER_FANG + db -1 ; end 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 b3eeea273..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_HitTargetNoSub ; 34f60 - dw BattleCommand_RaiseSub ; 35004 - dw BattleCommand_FailureText ; 35023 - dw BattleCommand_CheckFaint ; 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 BattleCommanda5 ; 35165 - dw BattleCommand_RaiseSubNoAnim ; 365af - dw BattleCommand_LowerSubNoAnim ; 365c3 - dw BattleCommanda8 ; 355b5 - dw BattleCommand_ClearMissDamage ; 355d5 - a9 - dw BattleCommand_MoveDelay ; 37e80 - dw BattleCommand_HitTarget ; 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 new file mode 100644 index 000000000..bd47c1d83 --- /dev/null +++ b/data/battle/held_consumables.asm @@ -0,0 +1,25 @@ +; Held item effects that are consumed on use + +ConsumableEffects: + db HELD_BERRY + db HELD_2 + db HELD_5 + db HELD_HEAL_POISON + db HELD_HEAL_FREEZE + db HELD_HEAL_BURN + db HELD_HEAL_SLEEP + db HELD_HEAL_PARALYZE + db HELD_HEAL_STATUS + db HELD_30 + db HELD_ATTACK_UP + db HELD_DEFENSE_UP + db HELD_SPEED_UP + db HELD_SP_ATTACK_UP + db HELD_SP_DEFENSE_UP + db HELD_ACCURACY_UP + db HELD_EVASION_UP + db HELD_38 + db HELD_71 + db HELD_ESCAPE + db HELD_CRITICAL_UP + db -1 diff --git a/data/battle/held_heal_status.asm b/data/battle/held_heal_status.asm new file mode 100644 index 000000000..ac11b645b --- /dev/null +++ b/data/battle/held_heal_status.asm @@ -0,0 +1,10 @@ +; See also data/items/heal_status.asm + +HeldStatusHealingEffects: + db HELD_HEAL_POISON, 1 << PSN + db HELD_HEAL_FREEZE, 1 << FRZ + db HELD_HEAL_BURN, 1 << BRN + db HELD_HEAL_SLEEP, SLP + db HELD_HEAL_PARALYZE, 1 << PAR + db HELD_HEAL_STATUS, ALL_STATUS + db -1 ; end diff --git a/data/battle/held_stat_up.asm b/data/battle/held_stat_up.asm new file mode 100644 index 000000000..4f28c0d08 --- /dev/null +++ b/data/battle/held_stat_up.asm @@ -0,0 +1,9 @@ +HeldStatUpItems: + dbw HELD_ATTACK_UP, BattleCommand_AttackUp + dbw HELD_DEFENSE_UP, BattleCommand_DefenseUp + dbw HELD_SPEED_UP, BattleCommand_SpeedUp + dbw HELD_SP_ATTACK_UP, BattleCommand_SpecialAttackUp + dbw HELD_SP_DEFENSE_UP, BattleCommand_SpecialDefenseUp + dbw HELD_ACCURACY_UP, BattleCommand_AccuracyUp + dbw HELD_EVASION_UP, BattleCommand_EvasionUp + db -1 ; end diff --git a/data/battle/stat_multipliers.asm b/data/battle/stat_multipliers.asm index e7cf8e472..1b9b08588 100644 --- a/data/battle/stat_multipliers.asm +++ b/data/battle/stat_multipliers.asm @@ -1,5 +1,8 @@ ; Multiplier ratios for all stats from modifier -6 to +6 -; (except accuracy, see data/battle/accuracy_multipliers.asm) +; (except accuracy, see data/battle/accuracy_multipliers.asm). + +; This table is identical to data/battle/stat_multipliers_2.asm. +; This one is used by CalcStats. StatLevelMultipliers: db 25, 100 ; -6 = 25% diff --git a/data/battle/stat_multipliers_2.asm b/data/battle/stat_multipliers_2.asm new file mode 100644 index 000000000..3f3dc2348 --- /dev/null +++ b/data/battle/stat_multipliers_2.asm @@ -0,0 +1,20 @@ +; Multiplier ratios for all stats from modifier -6 to +6 +; (except accuracy, see data/battle/accuracy_multipliers.asm). + +; This table is identical to data/battle/stat_multipliers.asm. +; This one is used by ApplyStatLevelMultiplier. + +StatLevelMultipliers_Applied: + db 25, 100 ; -6 = 25% + db 28, 100 ; -5 = 28% + db 33, 100 ; -4 = 33% + db 40, 100 ; -3 = 40% + db 50, 100 ; -2 = 50% + db 66, 100 ; -1 = 66% + db 1, 1 ; 0 = 100% + db 15, 10 ; +1 = 150% + db 2, 1 ; +2 = 200% + db 25, 10 ; +3 = 250% + db 3, 1 ; +4 = 300% + db 35, 10 ; +5 = 350% + db 4, 1 ; +6 = 400% diff --git a/data/battle/weather_modifiers.asm b/data/battle/weather_modifiers.asm new file mode 100644 index 000000000..d0acdc25f --- /dev/null +++ b/data/battle/weather_modifiers.asm @@ -0,0 +1,10 @@ +WeatherTypeModifiers: + db WEATHER_RAIN, WATER, MORE_EFFECTIVE + db WEATHER_RAIN, FIRE, NOT_VERY_EFFECTIVE + db WEATHER_SUN, FIRE, MORE_EFFECTIVE + db WEATHER_SUN, WATER, NOT_VERY_EFFECTIVE + db -1 ; end + +WeatherMoveModifiers: + db WEATHER_RAIN, EFFECT_SOLARBEAM, NOT_VERY_EFFECTIVE + db -1 ; end diff --git a/data/battle/wobble_probabilities.asm b/data/battle/wobble_probabilities.asm new file mode 100644 index 000000000..38e9a12c6 --- /dev/null +++ b/data/battle/wobble_probabilities.asm @@ -0,0 +1,27 @@ +WobbleProbabilities: +; catch rate, chance of wobbling / 255 +; nLeft/255 = (nRight/255) ** 4 + db 1, 63 + db 2, 75 + db 3, 84 + db 4, 90 + db 5, 95 + db 7, 103 + db 10, 113 + db 15, 126 + db 20, 134 + db 30, 149 + db 40, 160 + db 50, 169 + db 60, 177 + db 80, 191 + db 100, 201 + db 120, 211 + db 140, 220 + db 160, 227 + db 180, 234 + db 200, 240 + db 220, 246 + db 240, 251 + db 254, 253 + db 255, 255 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 100755..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 100755..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 100755..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 100755..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/battle_tower/unknown.asm b/data/battle_tower/unknown.asm index 81c9515fb..81c9515fb 100755..100644 --- a/data/battle_tower/unknown.asm +++ b/data/battle_tower/unknown.asm 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/common_text/common_text.asm b/data/common_text/common_text.asm deleted file mode 100644 index 2f88b4e9d..000000000 --- a/data/common_text/common_text.asm +++ /dev/null @@ -1,16 +0,0 @@ -INCLUDE "constants.asm" - - -SECTION "Text 1", ROMX - -INCLUDE "data/common_text/common_text_1.asm" - - -SECTION "Text 2", ROMX - -INCLUDE "data/common_text/common_text_2.asm" - - -SECTION "Text 3", ROMX - -INCLUDE "data/common_text/common_text_3.asm" 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 209662a6f..1be457395 100644 --- a/data/decorations/attributes.asm +++ b/data/decorations/attributes.asm @@ -5,38 +5,38 @@ decoration: MACRO db \5 ENDM -DecorationAttributes: ; 26a4f +DecorationAttributes: ; entries correspond to deco constants - decoration DECO_PLANT, $00, $0, EVENT_GAVE_KURT_APRICORNS, $00 - decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_BED, EVENT_GAVE_KURT_APRICORNS, $00 + 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 decoration DECO_BED, FEATHERY_BED, SET_UP_BED, EVENT_DECO_BED_1, $1b decoration DECO_BED, PINK_BED, SET_UP_BED, EVENT_DECO_BED_2, $1c decoration DECO_BED, POLKADOT_BED, SET_UP_BED, EVENT_DECO_BED_3, $1d decoration DECO_BED, PIKACHU_BED, SET_UP_BED, EVENT_DECO_BED_4, $1e - decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_CARPET, EVENT_GAVE_KURT_APRICORNS, $00 + decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_CARPET, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1, $00 decoration DECO_CARPET, RED_CARPET, SET_UP_CARPET, EVENT_DECO_CARPET_1, $08 decoration DECO_CARPET, BLUE_CARPET, SET_UP_CARPET, EVENT_DECO_CARPET_2, $0b decoration DECO_CARPET, YELLOW_CARPET, SET_UP_CARPET, EVENT_DECO_CARPET_3, $0e decoration DECO_CARPET, GREEN_CARPET, SET_UP_CARPET, EVENT_DECO_CARPET_4, $11 - decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_PLANT, EVENT_GAVE_KURT_APRICORNS, $00 + decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_PLANT, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1, $00 decoration DECO_PLANT, MAGNAPLANT, SET_UP_PLANT, EVENT_DECO_PLANT_1, $20 decoration DECO_PLANT, TROPICPLANT, SET_UP_PLANT, EVENT_DECO_PLANT_2, $21 decoration DECO_PLANT, JUMBOPLANT, SET_UP_PLANT, EVENT_DECO_PLANT_3, $22 - decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_POSTER, EVENT_GAVE_KURT_APRICORNS, $00 + decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_POSTER, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1, $00 decoration DECO_PLANT, TOWN_MAP_D, SET_UP_POSTER, EVENT_DECO_PLANT_4, $1f decoration DECO_POSTER, PIKACHU, SET_UP_POSTER, EVENT_DECO_POSTER_1, $23 decoration DECO_POSTER, CLEFAIRY, SET_UP_POSTER, EVENT_DECO_POSTER_2, $24 decoration DECO_POSTER, JIGGLYPUFF, SET_UP_POSTER, EVENT_DECO_POSTER_3, $25 - decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_CONSOLE, EVENT_GAVE_KURT_APRICORNS, $00 + decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_CONSOLE, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1, $00 decoration DECO_PLANT, FAMICOM, SET_UP_CONSOLE, EVENT_DECO_FAMICOM, SPRITE_FAMICOM decoration DECO_PLANT, SUPER_NES, SET_UP_CONSOLE, EVENT_DECO_SNES, SPRITE_SNES decoration DECO_PLANT, NINTENDO_64, SET_UP_CONSOLE, EVENT_DECO_N64, SPRITE_N64 decoration DECO_PLANT, VIRTUAL_BOY, SET_UP_CONSOLE, EVENT_DECO_VIRTUAL_BOY, SPRITE_VIRTUAL_BOY - decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_BIG_DOLL, EVENT_GAVE_KURT_APRICORNS, $00 + decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_BIG_DOLL, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1, $00 decoration DECO_BIGDOLL, SNORLAX, SET_UP_BIG_DOLL, EVENT_DECO_BIG_SNORLAX_DOLL, SPRITE_BIG_SNORLAX decoration DECO_BIGDOLL, ONIX, SET_UP_BIG_DOLL, EVENT_DECO_BIG_ONIX_DOLL, SPRITE_BIG_ONIX decoration DECO_BIGDOLL, LAPRAS, SET_UP_BIG_DOLL, EVENT_DECO_BIG_LAPRAS_DOLL, SPRITE_BIG_LAPRAS - decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_DOLL, EVENT_GAVE_KURT_APRICORNS, $00 + decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_DOLL, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1, $00 decoration DECO_DOLL, PIKACHU, SET_UP_DOLL, EVENT_DECO_PIKACHU_DOLL, SPRITE_PIKACHU decoration DECO_PLANT, SURF_PIKA_DOLL, SET_UP_DOLL, EVENT_DECO_SURFING_PIKACHU_DOLL, SPRITE_SURFING_PIKACHU decoration DECO_DOLL, CLEFAIRY, SET_UP_DOLL, EVENT_DECO_CLEFAIRY_DOLL, SPRITE_CLEFAIRY @@ -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 bdd4694c6..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 @@ -36,5 +36,4 @@ MysteryGiftDecos: ; 2c74a db DECOFLAG_PIKACHU_BED db DECOFLAG_GRIMER_DOLL db DECOFLAG_UNOWN_DOLL -MysteryGiftDecosEnd -; 2c76f +.End 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 9c2dda5a6..21f8ca0fe 100644 --- a/data/engine_flags.asm +++ b/data/engine_flags.asm @@ -1,206 +1,199 @@ engine_flag: MACRO - dwb \1, 1 << \2 +; location, bit +; (all locations are in WRAM bank 1) + dwb \1 + (\2 / 8), 1 << (\2 % 8) ENDM -EngineFlags: ; 80462 - ; location, bit - ; (all locations are in WRAM bank 1) +EngineFlags: +; entries correspond to ENGINE_* constants ; pokegear - engine_flag wPokegearFlags, 1 ; radio card ; $0 - engine_flag wPokegearFlags, 0 ; map card - engine_flag wPokegearFlags, 2 ; phone card - engine_flag wPokegearFlags, 3 ; expn card - engine_flag wPokegearFlags, 7 ; on/off + engine_flag wPokegearFlags, POKEGEAR_RADIO_CARD_F ; $0 + engine_flag wPokegearFlags, POKEGEAR_MAP_CARD_F + engine_flag wPokegearFlags, POKEGEAR_PHONE_CARD_F + engine_flag wPokegearFlags, POKEGEAR_EXPN_CARD_F + engine_flag wPokegearFlags, POKEGEAR_OBTAINED_F - ; wDayCareMan, 7 ; day-care 1 on - engine_flag wDayCareMan, 6 ; egg is ready - ; wDayCareMan, 5 ; monster 1 and 2 are compatible - engine_flag wDayCareMan, 0 ; monster 1 in day-care + ; day-care + engine_flag wDayCareMan, DAYCAREMAN_HAS_EGG_F + engine_flag wDayCareMan, DAYCAREMAN_HAS_MON_F + engine_flag wDayCareLady, DAYCARELADY_HAS_MON_F - ; wDayCareLady, 7 = day-care 2 on - engine_flag wDayCareLady, 0 ; monster 2 in day-care - - engine_flag wMomSavingMoney, 0 ; mom saving money ; $8 - engine_flag wMomSavingMoney, 7 ; dst + engine_flag wMomSavingMoney, MOM_SAVING_SOME_MONEY_F ; $8 + engine_flag wMomSavingMoney, MOM_ACTIVE_F engine_flag wUnusedTwoDayTimerOn, 0 ; unused, possibly related to a 2-day timer - engine_flag wStatusFlags, 0 ; pokedex - engine_flag wStatusFlags, 1 ; unown dex - engine_flag wStatusFlags, 3 ; pokerus - engine_flag wStatusFlags, 4 ; rocket signal on ch20 - engine_flag wStatusFlags, 6 ; credits skip - engine_flag wStatusFlags, 7 ; bug contest on ; $10 - engine_flag wStatusFlags2, 2 ; bug contest timer - engine_flag wStatusFlags2, 1 ; safari zone? - engine_flag wStatusFlags2, 0 ; rockets in radio tower - engine_flag wStatusFlags2, 4 ; bike shop call enabled (1024 bike steps reqd) - engine_flag wStatusFlags2, 5 ; give pokerus - engine_flag wStatusFlags2, 6 ; berry -> berry juice when trading? - engine_flag wStatusFlags2, 7 ; rockets in mahogany - - engine_flag wBikeFlags, 0 ; strength active ; $18 - engine_flag wBikeFlags, 1 ; always on bike (cant surf) - engine_flag wBikeFlags, 2 ; downhill (cycling road) - - engine_flag wJohtoBadges, 0 ; zephyrbadge - engine_flag wJohtoBadges, 1 ; hivebadge - engine_flag wJohtoBadges, 2 ; plainbadge - engine_flag wJohtoBadges, 3 ; fogbadge - engine_flag wJohtoBadges, 4 ; mineralbadge - engine_flag wJohtoBadges, 5 ; stormbadge ; $20 - engine_flag wJohtoBadges, 6 ; glacierbadge - engine_flag wJohtoBadges, 7 ; risingbadge - - engine_flag wKantoBadges, 0 ; boulderbadge - engine_flag wKantoBadges, 1 ; cascadebadge - engine_flag wKantoBadges, 2 ; thunderbadge - engine_flag wKantoBadges, 3 ; rainbowbadge - engine_flag wKantoBadges, 4 ; soulbadge - engine_flag wKantoBadges, 5 ; marshbadge ; $28 - engine_flag wKantoBadges, 6 ; volcanobadge - engine_flag wKantoBadges, 7 ; earthbadge - - ; unown sets - engine_flag wUnlockedUnowns, 0 ; 1 - engine_flag wUnlockedUnowns, 1 ; 2 - engine_flag wUnlockedUnowns, 2 ; 3 - engine_flag wUnlockedUnowns, 3 ; 4 - engine_flag wUnlockedUnowns, 4 ; 5 - engine_flag wUnlockedUnowns, 5 ; 6 ; $30 - engine_flag wUnlockedUnowns, 6 ; 7 - engine_flag wUnlockedUnowns, 7 ; 8 + engine_flag wStatusFlags, STATUSFLAGS_POKEDEX_F + engine_flag wStatusFlags, STATUSFLAGS_UNOWN_DEX_F + engine_flag wStatusFlags, STATUSFLAGS_CAUGHT_POKERUS_F + engine_flag wStatusFlags, STATUSFLAGS_ROCKET_SIGNAL_F + engine_flag wStatusFlags, STATUSFLAGS_HALL_OF_FAME_F + engine_flag wStatusFlags, STATUSFLAGS_MAIN_MENU_MOBILE_CHOICES_F + + engine_flag wStatusFlags2, STATUSFLAGS2_BUG_CONTEST_TIMER_F + engine_flag wStatusFlags2, STATUSFLAGS2_SAFARI_GAME_F + engine_flag wStatusFlags2, STATUSFLAGS2_ROCKETS_IN_RADIO_TOWER_F + engine_flag wStatusFlags2, STATUSFLAGS2_BIKE_SHOP_CALL_F + engine_flag wStatusFlags2, STATUSFLAGS2_UNUSED_5_F + engine_flag wStatusFlags2, STATUSFLAGS2_REACHED_GOLDENROD_F + engine_flag wStatusFlags2, STATUSFLAGS2_ROCKETS_IN_MAHOGANY_F + + engine_flag wBikeFlags, BIKEFLAGS_STRENGTH_ACTIVE_F ; $18 + engine_flag wBikeFlags, BIKEFLAGS_ALWAYS_ON_BIKE_F + engine_flag wBikeFlags, BIKEFLAGS_DOWNHILL_F + + engine_flag wJohtoBadges, ZEPHYRBADGE + engine_flag wJohtoBadges, HIVEBADGE + engine_flag wJohtoBadges, PLAINBADGE + engine_flag wJohtoBadges, FOGBADGE + engine_flag wJohtoBadges, MINERALBADGE + engine_flag wJohtoBadges, STORMBADGE ; $20 + engine_flag wJohtoBadges, GLACIERBADGE + engine_flag wJohtoBadges, RISINGBADGE + + engine_flag wKantoBadges, BOULDERBADGE + engine_flag wKantoBadges, CASCADEBADGE + engine_flag wKantoBadges, THUNDERBADGE + engine_flag wKantoBadges, RAINBOWBADGE + engine_flag wKantoBadges, SOULBADGE + engine_flag wKantoBadges, MARSHBADGE ; $28 + engine_flag wKantoBadges, VOLCANOBADGE + engine_flag wKantoBadges, EARTHBADGE + + ; unown sets (see data/wild/unlocked_unowns.asm) + engine_flag wUnlockedUnowns, 0 ; A-K + engine_flag wUnlockedUnowns, 1 ; L-R + engine_flag wUnlockedUnowns, 2 ; S-W + engine_flag wUnlockedUnowns, 3 ; X-Z + engine_flag wUnlockedUnowns, 4 ; unused + engine_flag wUnlockedUnowns, 5 ; unused ; $30 + engine_flag wUnlockedUnowns, 6 ; unused + engine_flag wUnlockedUnowns, 7 ; unused ; fly - engine_flag wVisitedSpawns, 0 ; your house - engine_flag wVisitedSpawns, 1 ; viridian pokecenter - engine_flag wVisitedSpawns, 2 ; pallet - engine_flag wVisitedSpawns, 3 ; viridian - engine_flag wVisitedSpawns, 4 ; pewter - engine_flag wVisitedSpawns, 5 ; cerulean ; $38 - engine_flag wVisitedSpawns, 6 ; rock tunnel - engine_flag wVisitedSpawns, 7 ; vermilion - engine_flag wVisitedSpawns + 1, 0 ; lavender - engine_flag wVisitedSpawns + 1, 1 ; saffron - engine_flag wVisitedSpawns + 1, 2 ; celadon - engine_flag wVisitedSpawns + 1, 3 ; fuchsia - engine_flag wVisitedSpawns + 1, 4 ; cinnabar - engine_flag wVisitedSpawns + 1, 5 ; indigo plateau ; $40 - engine_flag wVisitedSpawns + 1, 6 ; new bark - engine_flag wVisitedSpawns + 1, 7 ; cherrygrove - engine_flag wVisitedSpawns + 2, 0 ; violet - ; union cave - engine_flag wVisitedSpawns + 2, 2 ; azalea - engine_flag wVisitedSpawns + 2, 3 ; cianwood - engine_flag wVisitedSpawns + 2, 4 ; goldenrod - engine_flag wVisitedSpawns + 2, 5 ; olivine - engine_flag wVisitedSpawns + 2, 6 ; ecruteak ; $48 - engine_flag wVisitedSpawns + 2, 7 ; mahogany - engine_flag wVisitedSpawns + 3, 0 ; lake of rage - engine_flag wVisitedSpawns + 3, 1 ; blackthorn - engine_flag wVisitedSpawns + 3, 2 ; silver cave - ; fast ship - engine_flag wVisitedSpawns + 3, 4 ; unused - - engine_flag wLuckyNumberShowFlag, 0 ; lucky number show - engine_flag wStatusFlags2, 3 ; ???? - - engine_flag wDailyFlags, 0 ; kurt making balls ; $50 - engine_flag wDailyFlags, 1 ; ???? - engine_flag wDailyFlags, 2 ; special wilddata? - engine_flag wDailyFlags, 3 ; time capsule (24h wait) - engine_flag wDailyFlags, 4 ; all fruit trees - engine_flag wDailyFlags, 5 ; shuckle given - engine_flag wDailyFlags, 6 ; goldenrod underground merchant closed - engine_flag wDailyFlags, 7 ; fought in trainer hall today - - engine_flag wWeeklyFlags, 0 ; mt moon square clefairy ; $58 - engine_flag wWeeklyFlags, 1 ; union cave lapras - engine_flag wWeeklyFlags, 2 ; goldenrod underground haircut used - engine_flag wWeeklyFlags, 3 ; goldenrod mall happiness event floor05 object07 - engine_flag wWeeklyFlags, 4 ; tea in blues house - engine_flag wWeeklyFlags, 5 ; indigo plateau rival fight - engine_flag wWeeklyFlags, 6 ; move tutor - engine_flag wWeeklyFlags, 7 ; buenas password - - engine_flag wSwarmFlags, 0 ; buenas password 2 - engine_flag wSwarmFlags, 1 ; goldenrod dept store sale is on - - engine_flag wGameTimerPause, 7 ; $62 - - engine_flag wPlayerGender, 0 ; player is female - - engine_flag wCelebiEvent, 2 ; have gs ball after kurt examined it + engine_flag wVisitedSpawns, SPAWN_HOME + engine_flag wVisitedSpawns, SPAWN_DEBUG + engine_flag wVisitedSpawns, SPAWN_PALLET + engine_flag wVisitedSpawns, SPAWN_VIRIDIAN + engine_flag wVisitedSpawns, SPAWN_PEWTER + engine_flag wVisitedSpawns, SPAWN_CERULEAN ; $38 + engine_flag wVisitedSpawns, SPAWN_ROCK_TUNNEL + engine_flag wVisitedSpawns, SPAWN_VERMILION + engine_flag wVisitedSpawns, SPAWN_LAVENDER + engine_flag wVisitedSpawns, SPAWN_SAFFRON + engine_flag wVisitedSpawns, SPAWN_CELADON + engine_flag wVisitedSpawns, SPAWN_FUCHSIA + engine_flag wVisitedSpawns, SPAWN_CINNABAR + engine_flag wVisitedSpawns, SPAWN_INDIGO ; $40 + engine_flag wVisitedSpawns, SPAWN_NEW_BARK + engine_flag wVisitedSpawns, SPAWN_CHERRYGROVE + engine_flag wVisitedSpawns, SPAWN_VIOLET + engine_flag wVisitedSpawns, SPAWN_AZALEA + engine_flag wVisitedSpawns, SPAWN_CIANWOOD + engine_flag wVisitedSpawns, SPAWN_GOLDENROD + engine_flag wVisitedSpawns, SPAWN_OLIVINE + engine_flag wVisitedSpawns, SPAWN_ECRUTEAK ; $48 + engine_flag wVisitedSpawns, SPAWN_MAHOGANY + engine_flag wVisitedSpawns, SPAWN_LAKE_OF_RAGE + engine_flag wVisitedSpawns, SPAWN_BLACKTHORN + engine_flag wVisitedSpawns, SPAWN_MT_SILVER + engine_flag wVisitedSpawns, NUM_SPAWNS ; unused + + engine_flag wLuckyNumberShowFlag, LUCKYNUMBERSHOW_GAME_OVER_F + + engine_flag wStatusFlags2, STATUSFLAGS2_UNUSED_3_F + + engine_flag wDailyFlags, DAILYFLAGS_KURT_MAKING_BALLS_F ; $50 + engine_flag wDailyFlags, DAILYFLAGS_BUG_CONTEST_F + engine_flag wDailyFlags, DAILYFLAGS_FISH_SWARM_F + engine_flag wDailyFlags, DAILYFLAGS_TIME_CAPSULE_F + engine_flag wDailyFlags, DAILYFLAGS_ALL_FRUIT_TREES_F + engine_flag wDailyFlags, DAILYFLAGS_GOT_SHUCKIE_TODAY_F + engine_flag wDailyFlags, DAILYFLAGS_GOLDENROD_UNDERGROUND_BARGAIN_F + engine_flag wDailyFlags, DAILYFLAGS_TRAINER_HOUSE_F + + engine_flag wWeeklyFlags, WEEKLYFLAGS_MT_MOON_SQUARE_CLEFAIRY_F ; $58 + engine_flag wWeeklyFlags, WEEKLYFLAGS_UNION_CAVE_LAPRAS_F + engine_flag wWeeklyFlags, WEEKLYFLAGS_GOLDENROD_UNDERGROUND_GOT_HAIRCUT_F + engine_flag wWeeklyFlags, WEEKLYFLAGS_GOLDENROD_DEPT_STORE_TM27_RETURN_F + engine_flag wWeeklyFlags, WEEKLYFLAGS_DAISYS_GROOMING_F + engine_flag wWeeklyFlags, WEEKLYFLAGS_INDIGO_PLATEAU_RIVAL_FIGHT_F + engine_flag wWeeklyFlags, WEEKLYFLAGS_DAILY_MOVE_TUTOR_F + engine_flag wWeeklyFlags, WEEKLYFLAGS_BUENAS_PASSWORD_F + + engine_flag wSwarmFlags, SWARMFLAGS_BUENAS_PASSWORD_F ; $60 + engine_flag wSwarmFlags, SWARMFLAGS_GOLDENROD_DEPT_STORE_SALE_F + + engine_flag wGameTimerPause, GAMETIMERPAUSE_MOBILE_7_F + + engine_flag wPlayerGender, PLAYERGENDER_FEMALE_F + + engine_flag wCelebiEvent, CELEBIEVENT_FOREST_IS_RESTLESS_F ; rematches - engine_flag wDailyRematchFlags, 0 ; jack - engine_flag wDailyRematchFlags, 1 ; huey - engine_flag wDailyRematchFlags, 2 ; gaven - engine_flag wDailyRematchFlags, 3 ; beth ; $68 - engine_flag wDailyRematchFlags, 4 ; jose - engine_flag wDailyRematchFlags, 5 ; reena - engine_flag wDailyRematchFlags, 6 ; joey - engine_flag wDailyRematchFlags, 7 ; wade - engine_flag wDailyRematchFlags + 1, 0 ; ralph - engine_flag wDailyRematchFlags + 1, 1 ; liz - engine_flag wDailyRematchFlags + 1, 2 ; anthony - engine_flag wDailyRematchFlags + 1, 3 ; todd ; $70 - engine_flag wDailyRematchFlags + 1, 4 ; gina - engine_flag wDailyRematchFlags + 1, 5 ; arnie - engine_flag wDailyRematchFlags + 1, 6 ; alan - engine_flag wDailyRematchFlags + 1, 7 ; dana - engine_flag wDailyRematchFlags + 2, 0 ; chad - engine_flag wDailyRematchFlags + 2, 1 ; tully - engine_flag wDailyRematchFlags + 2, 2 ; brent - engine_flag wDailyRematchFlags + 2, 3 ; tiffany ; $78 - engine_flag wDailyRematchFlags + 2, 4 ; vance - engine_flag wDailyRematchFlags + 2, 5 ; wilton - engine_flag wDailyRematchFlags + 2, 6 ; parry - engine_flag wDailyRematchFlags + 2, 7 ; erin + engine_flag wDailyRematchFlags, 0 ; jack + engine_flag wDailyRematchFlags, 1 ; huey + engine_flag wDailyRematchFlags, 2 ; gaven + engine_flag wDailyRematchFlags, 3 ; beth ; $68 + engine_flag wDailyRematchFlags, 4 ; jose + engine_flag wDailyRematchFlags, 5 ; reena + engine_flag wDailyRematchFlags, 6 ; joey + engine_flag wDailyRematchFlags, 7 ; wade + engine_flag wDailyRematchFlags, 8 ; ralph + engine_flag wDailyRematchFlags, 9 ; liz + engine_flag wDailyRematchFlags, 10 ; anthony + engine_flag wDailyRematchFlags, 11 ; todd ; $70 + engine_flag wDailyRematchFlags, 12 ; gina + engine_flag wDailyRematchFlags, 13 ; arnie + engine_flag wDailyRematchFlags, 14 ; alan + engine_flag wDailyRematchFlags, 15 ; dana + engine_flag wDailyRematchFlags, 16 ; chad + engine_flag wDailyRematchFlags, 17 ; tully + engine_flag wDailyRematchFlags, 18 ; brent + engine_flag wDailyRematchFlags, 19 ; tiffany ; $78 + engine_flag wDailyRematchFlags, 20 ; vance + engine_flag wDailyRematchFlags, 21 ; wilton + engine_flag wDailyRematchFlags, 22 ; parry + engine_flag wDailyRematchFlags, 23 ; erin engine_flag wDailyPhoneItemFlags, 0 ; beverly has nugget engine_flag wDailyPhoneItemFlags, 1 ; jose has star piece engine_flag wDailyPhoneItemFlags, 2 ; wade has item (see EVENT_WADE_HAS_*** in constants/event_flags.asm) - engine_flag wDailyPhoneItemFlags, 3 ; gina has leaf stone ; $80 + engine_flag wDailyPhoneItemFlags, 3 ; gina has leaf stone ; $80 engine_flag wDailyPhoneItemFlags, 4 ; alan has fire stone engine_flag wDailyPhoneItemFlags, 5 ; liz has thunderstone engine_flag wDailyPhoneItemFlags, 6 ; derek has nugget engine_flag wDailyPhoneItemFlags, 7 ; tully has water stone - - engine_flag wDailyPhoneItemFlags + 1, 0 ; tiffany has pink bow - engine_flag wDailyPhoneItemFlags + 1, 1 ; wilton has item (see EVENT_WILTON_HAS_*** in constants/event_flags.asm) - - engine_flag wDailyPhoneTimeOfDayFlags, 0 - engine_flag wDailyPhoneTimeOfDayFlags, 1 ; $88 - engine_flag wDailyPhoneTimeOfDayFlags, 2 - engine_flag wDailyPhoneTimeOfDayFlags, 3 - engine_flag wDailyPhoneTimeOfDayFlags, 4 - engine_flag wDailyPhoneTimeOfDayFlags, 5 - engine_flag wDailyPhoneTimeOfDayFlags, 6 - engine_flag wDailyPhoneTimeOfDayFlags, 7 - - engine_flag wDailyPhoneTimeOfDayFlags + 1, 0 - engine_flag wDailyPhoneTimeOfDayFlags + 1, 1 ; $90 - engine_flag wDailyPhoneTimeOfDayFlags + 1, 2 - engine_flag wDailyPhoneTimeOfDayFlags + 1, 3 - engine_flag wDailyPhoneTimeOfDayFlags + 1, 4 - engine_flag wDailyPhoneTimeOfDayFlags + 1, 5 - engine_flag wDailyPhoneTimeOfDayFlags + 1, 6 - engine_flag wDailyPhoneTimeOfDayFlags + 1, 7 - - engine_flag wDailyPhoneTimeOfDayFlags + 2, 0 - engine_flag wDailyPhoneTimeOfDayFlags + 2, 1 ; $98 - engine_flag wDailyPhoneTimeOfDayFlags + 2, 2 - engine_flag wDailyPhoneTimeOfDayFlags + 2, 3 - engine_flag wDailyPhoneTimeOfDayFlags + 2, 4 - engine_flag wDailyPhoneTimeOfDayFlags + 2, 5 - engine_flag wDailyPhoneTimeOfDayFlags + 2, 6 - engine_flag wDailyPhoneTimeOfDayFlags + 2, 7 - - engine_flag wPlayerSpriteSetupFlags, 2 ; female player has been transformed into male - - engine_flag wSwarmFlags, 2 ; dunsparce swarm ; $a0 - engine_flag wSwarmFlags, 3 ; yanma swarm - -; 80648 + engine_flag wDailyPhoneItemFlags, 8 ; tiffany has pink bow + engine_flag wDailyPhoneItemFlags, 9 ; wilton has item (see EVENT_WILTON_HAS_*** in constants/event_flags.asm) + + engine_flag wDailyPhoneTimeOfDayFlags, 0 ; jack + engine_flag wDailyPhoneTimeOfDayFlags, 1 ; huey ; $88 + engine_flag wDailyPhoneTimeOfDayFlags, 2 ; gaven + engine_flag wDailyPhoneTimeOfDayFlags, 3 ; beth + engine_flag wDailyPhoneTimeOfDayFlags, 4 ; jose + engine_flag wDailyPhoneTimeOfDayFlags, 5 ; reena + engine_flag wDailyPhoneTimeOfDayFlags, 6 ; joey + engine_flag wDailyPhoneTimeOfDayFlags, 7 ; wade + engine_flag wDailyPhoneTimeOfDayFlags, 8 ; ralph + engine_flag wDailyPhoneTimeOfDayFlags, 9 ; liz ; $90 + engine_flag wDailyPhoneTimeOfDayFlags, 10 ; anthony + engine_flag wDailyPhoneTimeOfDayFlags, 11 ; todd + engine_flag wDailyPhoneTimeOfDayFlags, 12 ; gina + engine_flag wDailyPhoneTimeOfDayFlags, 13 ; arnie + engine_flag wDailyPhoneTimeOfDayFlags, 14 ; alan + engine_flag wDailyPhoneTimeOfDayFlags, 15 ; dana + engine_flag wDailyPhoneTimeOfDayFlags, 16 ; chad + engine_flag wDailyPhoneTimeOfDayFlags, 17 ; tully ; $98 + engine_flag wDailyPhoneTimeOfDayFlags, 18 ; brent + engine_flag wDailyPhoneTimeOfDayFlags, 19 ; tiffany + engine_flag wDailyPhoneTimeOfDayFlags, 20 ; vance + engine_flag wDailyPhoneTimeOfDayFlags, 21 ; wilton + engine_flag wDailyPhoneTimeOfDayFlags, 22 ; parry + engine_flag wDailyPhoneTimeOfDayFlags, 23 ; erin + + engine_flag wPlayerSpriteSetupFlags, PLAYERSPRITESETUP_FEMALE_TO_MALE_F + + engine_flag wSwarmFlags, SWARMFLAGS_DUNSPARCE_SWARM_F ; $a0 + engine_flag wSwarmFlags, SWARMFLAGS_YANMA_SWARM_F diff --git a/data/bug_contest_flags.asm b/data/events/bug_contest_flags.asm index 04d748270..734bf11f8 100644 --- a/data/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/bug_contest_winners.asm b/data/events/bug_contest_winners.asm index 7a465edf5..e29ce0436 100644 --- a/data/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/collision_stdscripts.asm b/data/events/collision_stdscripts.asm index 8156d039d..dff26dd85 100644 --- a/data/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/elevator_floors.asm b/data/events/elevator_floors.asm index abc793cf2..abc793cf2 100644 --- a/data/elevator_floors.asm +++ b/data/events/elevator_floors.asm diff --git a/data/field_move_blocks.asm b/data/events/field_move_blocks.asm index d97fdc995..fea80f537 100644 --- a/data/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/happiness_changes.asm b/data/events/happiness_changes.asm index de60ea32d..de60ea32d 100644 --- a/data/happiness_changes.asm +++ b/data/events/happiness_changes.asm diff --git a/data/events/happiness_probabilities.asm b/data/events/happiness_probabilities.asm new file mode 100644 index 000000000..0dc08ac7e --- /dev/null +++ b/data/events/happiness_probabilities.asm @@ -0,0 +1,12 @@ +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: + db $9a, 2, HAPPINESS_OLDERCUT1 ; 60% chance + db $4c, 3, HAPPINESS_OLDERCUT2 ; 10% chance + db $ff, 4, HAPPINESS_OLDERCUT3 ; 30% chance + +HappinessData_DaisysGrooming: + db $ff, 2, HAPPINESS_GROOMING ; 99.6% chance diff --git a/data/events/magikarp_lengths.asm b/data/events/magikarp_lengths.asm new file mode 100644 index 000000000..1a1040d6c --- /dev/null +++ b/data/events/magikarp_lengths.asm @@ -0,0 +1,20 @@ +MagikarpLengths: +; [wMagikarpLength] = z * 100 + (bc - x) / y +; First argument is the bc threshold as well as x. +; Second argument is y. +; In reality, due to the bug at .BCLessThanDE, +; the threshold is determined by only register b. + dwb 110, 1 ; not used unless the bug is fixed + dwb 310, 2 + dwb 710, 4 + dwb 2710, 20 + dwb 7710, 50 + dwb 17710, 100 + dwb 32710, 150 + dwb 47710, 150 + dwb 57710, 100 + dwb 62710, 50 + dwb 64710, 20 + dwb 65210, 5 + dwb 65410, 2 + dwb 65510, 1 ; not used diff --git a/data/events/npc_trades.asm b/data/events/npc_trades.asm new file mode 100644 index 000000000..03d409571 --- /dev/null +++ b/data/events/npc_trades.asm @@ -0,0 +1,17 @@ +npctrade: MACRO +; dialog set, requested mon, offered mon, nickname, dvs, item, OT ID, OT name, gender requested + db \1, \2, \3, \4, \5, \6, \7 + shift + dw \7 + db \8, \9, 0 +ENDM + +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 + npctrade TRADE_DIALOGSET_HAPPY, KRABBY, VOLTORB, "VOLTY@@@@@@", $98, $88, PRZCUREBERRY, 29189, "TIM@@@@@@@@", TRADE_GENDER_EITHER + npctrade TRADE_DIALOGSET_GIRL, DRAGONAIR, DODRIO, "DORIS@@@@@@", $77, $66, SMOKE_BALL, 00283, "EMY@@@@@@@@", TRADE_GENDER_FEMALE + 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 diff --git a/data/odd_eggs.asm b/data/events/odd_eggs.asm index aa7e8176b..dd3dc3bbf 100644 --- a/data/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 new file mode 100644 index 000000000..2a0488603 --- /dev/null +++ b/data/events/pokedex_ratings.asm @@ -0,0 +1,27 @@ +rating: MACRO +; count, sfx, text + dbww \1, \2, \3 +ENDM + +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 + rating 19, SFX_DEX_FANFARE_LESS_THAN_20, OakRating02 + rating 34, SFX_DEX_FANFARE_20_49, OakRating03 + rating 49, SFX_DEX_FANFARE_20_49, OakRating04 + rating 64, SFX_DEX_FANFARE_50_79, OakRating05 + rating 79, SFX_DEX_FANFARE_50_79, OakRating06 + rating 94, SFX_DEX_FANFARE_80_109, OakRating07 + rating 109, SFX_DEX_FANFARE_80_109, OakRating08 + rating 124, SFX_CAUGHT_MON, OakRating09 + rating 139, SFX_CAUGHT_MON, OakRating10 + rating 154, SFX_DEX_FANFARE_140_169, OakRating11 + rating 169, SFX_DEX_FANFARE_140_169, OakRating12 + rating 184, SFX_DEX_FANFARE_170_199, OakRating13 + rating 199, SFX_DEX_FANFARE_170_199, OakRating14 + rating 214, SFX_DEX_FANFARE_200_229, OakRating15 + rating 229, SFX_DEX_FANFARE_200_229, OakRating16 + rating 239, SFX_DEX_FANFARE_230_PLUS, OakRating17 + rating 248, SFX_DEX_FANFARE_230_PLUS, OakRating18 + rating 255, SFX_DEX_FANFARE_230_PLUS, OakRating19 diff --git a/data/unown_walls.asm b/data/events/unown_walls.asm index eae376730..624b1e678 100644 --- a/data/unown_walls.asm +++ b/data/events/unown_walls.asm @@ -2,43 +2,36 @@ unownwall: MACRO rept _NARG if \1 == "-" x = $64 -else -if \1 >= "Y" +elif \1 >= "Y" x = 2 * (\1 - "Y") + $60 -else -if \1 >= "Q" +elif \1 >= "Q" x = 2 * (\1 - "Q") + $40 -else -if \1 >= "I" +elif \1 >= "I" x = 2 * (\1 - "I") + $20 else x = 2 * (\1 - "A") endc -endc -endc -endc db x -shift + shift endr db -1 ; end ENDM -UnownWalls: ; 8aebc +UnownWalls: ; UNOWNWORDS_ESCAPE - ; db $08, $44, $04, $00, $2e, $08, $ff + ; db $08, $44, $04, $00, $2e, $08, -1 unownwall "E", "S", "C", "A", "P", "E" ; UNOWNWORDS_LIGHT - ; db $26, $20, $0c, $0e, $46, $ff + ; db $26, $20, $0c, $0e, $46, -1 unownwall "L", "I", "G", "H", "T" ; UNOWNWORDS_WATER - ; db $4c, $00, $46, $08, $42, $ff + ; db $4c, $00, $46, $08, $42, -1 unownwall "W", "A", "T", "E", "R" ; UNOWNWORDS_HO_OH - ; db $0e, $2c, $64, $2c, $0e, $ff + ; db $0e, $2c, $64, $2c, $0e, -1 unownwall "H", "O", "-", "O", "H" -; 8aed5 -MenuDataHeaders_UnownWalls: ; 0x8aed5 +MenuHeaders_UnownWalls: ; UNOWNWORDS_ESCAPE db MENU_BACKUP_TILES ; flags menu_coords 3, 4, 16, 9 @@ -51,4 +44,3 @@ MenuDataHeaders_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 4a1564515..aee2a16e7 100644 --- a/data/growth_rates.asm +++ b/data/growth_rates.asm @@ -9,12 +9,11 @@ growth_rate: MACRO db \4, \5 ENDM -GrowthRates: ; 50efa -; entries correspond to base growth rate constants (see constants/pokemon_data_constants.asm) +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 growth_rate 3, 4, 20, 0, 70 ; Slightly Slow 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 5212be6d2..806a2ef28 100644 --- a/data/items/attributes.asm +++ b/data/items/attributes.asm @@ -5,158 +5,158 @@ item_attribute: MACRO dn \6, \7 ENDM -ItemAttributes: ; 67c1 -; entries correspond to constants/item_constants.asm +ItemAttributes: +; entries correspond to item ids ; MASTER_BALL - item_attribute 0, 0, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE + item_attribute 0, HELD_NONE, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE ; ULTRA_BALL - item_attribute 1200, 0, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE + item_attribute 1200, HELD_NONE, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE ; BRIGHTPOWDER item_attribute 10, HELD_BRIGHTPOWDER, 20, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; GREAT_BALL - item_attribute 600, 0, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE + item_attribute 600, HELD_NONE, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE ; POKE_BALL - item_attribute 200, 0, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE + item_attribute 200, HELD_NONE, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE ; TOWN_MAP - item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; BICYCLE - item_attribute 0, 0, 0, CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE + item_attribute 0, HELD_NONE, 0, CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE ; MOON_STONE - item_attribute 0, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 0, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; ANTIDOTE - item_attribute 100, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY + item_attribute 100, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY ; BURN_HEAL - item_attribute 250, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY + item_attribute 250, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY ; ICE_HEAL - item_attribute 250, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY + item_attribute 250, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY ; AWAKENING - item_attribute 250, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY + item_attribute 250, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY ; PARLYZ_HEAL - item_attribute 200, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY + item_attribute 200, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY ; FULL_RESTORE - item_attribute 3000, 0, -1, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY + item_attribute 3000, HELD_NONE, -1, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY ; MAX_POTION - item_attribute 2500, 0, -1, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY + item_attribute 2500, HELD_NONE, -1, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY ; HYPER_POTION - item_attribute 1200, 0, 200, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY + item_attribute 1200, HELD_NONE, 200, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY ; SUPER_POTION - item_attribute 700, 0, 50, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY + item_attribute 700, HELD_NONE, 50, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY ; POTION - item_attribute 300, 0, 20, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY + item_attribute 300, HELD_NONE, 20, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY ; ESCAPE_ROPE - item_attribute 550, 0, 0, CANT_SELECT, ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE + item_attribute 550, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE ; REPEL - item_attribute 350, 0, 0, CANT_SELECT, ITEM, ITEMMENU_CURRENT, ITEMMENU_NOUSE + item_attribute 350, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_CURRENT, ITEMMENU_NOUSE ; MAX_ELIXER - item_attribute 4500, 0, -1, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY + item_attribute 4500, HELD_NONE, -1, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY ; FIRE_STONE - item_attribute 2100, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 2100, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; THUNDERSTONE - item_attribute 2100, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 2100, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; WATER_STONE - item_attribute 2100, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 2100, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; ITEM_19 - item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; HP_UP - item_attribute 9800, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 9800, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; PROTEIN - item_attribute 9800, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 9800, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; IRON - item_attribute 9800, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 9800, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; CARBOS - item_attribute 9800, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 9800, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; LUCKY_PUNCH - item_attribute 10, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 10, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; CALCIUM - item_attribute 9800, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 9800, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; RARE_CANDY - item_attribute 4800, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 4800, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; X_ACCURACY - item_attribute 950, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_CLOSE + item_attribute 950, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_CLOSE ; LEAF_STONE - item_attribute 2100, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 2100, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; METAL_POWDER item_attribute 10, HELD_METAL_POWDER, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; NUGGET - item_attribute 10000, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 10000, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; POKE_DOLL - item_attribute 1000, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_CLOSE + item_attribute 1000, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_CLOSE ; FULL_HEAL - item_attribute 600, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY + item_attribute 600, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY ; REVIVE - item_attribute 1500, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY + item_attribute 1500, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY ; MAX_REVIVE - item_attribute 4000, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY + item_attribute 4000, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY ; GUARD_SPEC - item_attribute 700, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_CLOSE + item_attribute 700, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_CLOSE ; SUPER_REPEL - item_attribute 500, 0, 0, CANT_SELECT, ITEM, ITEMMENU_CURRENT, ITEMMENU_NOUSE + item_attribute 500, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_CURRENT, ITEMMENU_NOUSE ; MAX_REPEL - item_attribute 700, 0, 0, CANT_SELECT, ITEM, ITEMMENU_CURRENT, ITEMMENU_NOUSE + item_attribute 700, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_CURRENT, ITEMMENU_NOUSE ; DIRE_HIT - item_attribute 650, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_CLOSE + item_attribute 650, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_CLOSE ; ITEM_2D - item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; FRESH_WATER - item_attribute 200, 0, 50, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY + item_attribute 200, HELD_NONE, 50, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY ; SODA_POP - item_attribute 300, 0, 60, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY + item_attribute 300, HELD_NONE, 60, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY ; LEMONADE - item_attribute 350, 0, 80, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY + item_attribute 350, HELD_NONE, 80, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY ; X_ATTACK - item_attribute 500, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_CLOSE + item_attribute 500, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_CLOSE ; ITEM_32 - item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; X_DEFEND - item_attribute 550, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_CLOSE + item_attribute 550, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_CLOSE ; X_SPEED - item_attribute 350, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_CLOSE + item_attribute 350, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_CLOSE ; X_SPECIAL - item_attribute 350, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_CLOSE + item_attribute 350, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_CLOSE ; COIN_CASE - item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_CURRENT, ITEMMENU_NOUSE + item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_CURRENT, ITEMMENU_NOUSE ; ITEMFINDER - item_attribute 0, 0, 0, CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE + item_attribute 0, HELD_NONE, 0, CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE ; POKE_FLUTE - item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; EXP_SHARE - item_attribute 3000, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 3000, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; OLD_ROD - item_attribute 0, 0, 0, CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE + item_attribute 0, HELD_NONE, 0, CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE ; GOOD_ROD - item_attribute 0, 0, 0, CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE + item_attribute 0, HELD_NONE, 0, CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE ; SILVER_LEAF - item_attribute 1000, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 1000, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; SUPER_ROD - item_attribute 0, 0, 0, CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE + item_attribute 0, HELD_NONE, 0, CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE ; PP_UP - item_attribute 9800, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 9800, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; ETHER - item_attribute 1200, 0, 10, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY + item_attribute 1200, HELD_NONE, 10, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY ; MAX_ETHER - item_attribute 2000, 0, -1, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY + item_attribute 2000, HELD_NONE, -1, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY ; ELIXER - item_attribute 3000, 0, 10, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY + item_attribute 3000, HELD_NONE, 10, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY ; RED_SCALE - item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; SECRETPOTION - item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; S_S_TICKET - item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; MYSTERY_EGG - item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; CLEAR_BELL - item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; SILVER_WING - item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; MOOMOO_MILK - item_attribute 500, 0, 100, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY + item_attribute 500, HELD_NONE, 100, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY ; QUICK_CLAW item_attribute 100, HELD_QUICK_CLAW, 60, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; PSNCUREBERRY item_attribute 10, HELD_HEAL_POISON, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY ; GOLD_LEAF - item_attribute 1000, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 1000, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; SOFT_SAND item_attribute 100, HELD_GROUND_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; SHARP_BEAK @@ -176,23 +176,23 @@ ItemAttributes: ; 67c1 ; MINT_BERRY item_attribute 10, HELD_HEAL_SLEEP, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY ; RED_APRICORN - item_attribute 200, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 200, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; TINYMUSHROOM - item_attribute 500, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 500, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; BIG_MUSHROOM - item_attribute 5000, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 5000, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; SILVERPOWDER item_attribute 100, HELD_BUG_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; BLU_APRICORN - item_attribute 200, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 200, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; ITEM_5A - item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; AMULET_COIN item_attribute 100, HELD_AMULET_COIN, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; YLW_APRICORN - item_attribute 200, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 200, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; GRN_APRICORN - item_attribute 200, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 200, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; CLEANSE_TAG item_attribute 200, HELD_CLEANSE_TAG, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; MYSTIC_WATER @@ -200,23 +200,23 @@ ItemAttributes: ; 67c1 ; TWISTEDSPOON item_attribute 100, HELD_PSYCHIC_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; WHT_APRICORN - item_attribute 200, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 200, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; BLACKBELT item_attribute 100, HELD_FIGHTING_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; BLK_APRICORN - item_attribute 200, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 200, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; ITEM_64 - item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; PNK_APRICORN - item_attribute 200, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 200, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; BLACKGLASSES item_attribute 100, HELD_DARK_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; SLOWPOKETAIL - item_attribute 9800, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 9800, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; PINK_BOW item_attribute 100, HELD_NORMAL_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; STICK - item_attribute 200, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 200, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; SMOKE_BALL item_attribute 200, HELD_ESCAPE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; NEVERMELTICE @@ -226,61 +226,61 @@ ItemAttributes: ; 67c1 ; MIRACLEBERRY item_attribute 10, HELD_HEAL_STATUS, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY ; PEARL - item_attribute 1400, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 1400, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; BIG_PEARL - item_attribute 7500, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 7500, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; EVERSTONE - item_attribute 200, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 200, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; SPELL_TAG item_attribute 100, HELD_GHOST_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; RAGECANDYBAR - item_attribute 300, 0, 20, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY + item_attribute 300, HELD_NONE, 20, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY ; GS_BALL - item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; BLUE_CARD - item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_CURRENT, ITEMMENU_NOUSE + item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_CURRENT, ITEMMENU_NOUSE ; MIRACLE_SEED item_attribute 100, HELD_GRASS_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; THICK_CLUB - item_attribute 500, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 500, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; FOCUS_BAND item_attribute 200, HELD_FOCUS_BAND, 30, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; ITEM_78 - item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; ENERGYPOWDER - item_attribute 500, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY + item_attribute 500, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY ; ENERGY_ROOT - item_attribute 800, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY + item_attribute 800, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY ; HEAL_POWDER - item_attribute 450, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY + item_attribute 450, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY ; REVIVAL_HERB - item_attribute 2800, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY + item_attribute 2800, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY ; HARD_STONE item_attribute 100, HELD_ROCK_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; LUCKY_EGG - item_attribute 200, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 200, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; CARD_KEY - item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE + item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE ; MACHINE_PART - item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; EGG_TICKET - item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; LOST_ITEM - item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; STARDUST - item_attribute 2000, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE -; STAR PIECE - item_attribute 9800, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 2000, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE +; STAR_PIECE + item_attribute 9800, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; BASEMENT_KEY - item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE + item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE ; PASS - item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; ITEM_87 - item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; ITEM_88 - item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; ITEM_89 - item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; CHARCOAL item_attribute 9800, HELD_FIRE_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; BERRY_JUICE @@ -288,234 +288,234 @@ ItemAttributes: ; 67c1 ; SCOPE_LENS item_attribute 200, HELD_CRITICAL_UP, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; ITEM_8D - item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; ITEM_8E - item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; METAL_COAT item_attribute 100, HELD_STEEL_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; DRAGON_FANG - item_attribute 100, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 100, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; ITEM_91 - item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; LEFTOVERS item_attribute 200, HELD_LEFTOVERS, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; ITEM_93 - item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; ITEM_94 - item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; ITEM_95 - item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; MYSTERYBERRY item_attribute 10, HELD_RESTORE_PP, -1, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY ; DRAGON_SCALE item_attribute 2100, HELD_DRAGON_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; BERSERK_GENE - item_attribute 200, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 200, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; ITEM_99 - item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; ITEM_9A - item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; ITEM_9B - item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; SACRED_ASH - item_attribute 200, 0, 0, CANT_SELECT, ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE + item_attribute 200, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE ; HEAVY_BALL - item_attribute 150, 0, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE + item_attribute 150, HELD_NONE, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE ; FLOWER_MAIL - item_attribute 50, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 50, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; LEVEL_BALL - item_attribute 150, 0, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE + item_attribute 150, HELD_NONE, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE ; LURE_BALL - item_attribute 150, 0, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE + item_attribute 150, HELD_NONE, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE ; FAST_BALL - item_attribute 150, 0, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE + item_attribute 150, HELD_NONE, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE ; ITEM_A2 - item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; LIGHT_BALL - item_attribute 100, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 100, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; FRIEND_BALL - item_attribute 150, 0, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE + item_attribute 150, HELD_NONE, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE ; MOON_BALL - item_attribute 150, 0, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE + item_attribute 150, HELD_NONE, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE ; LOVE_BALL - item_attribute 150, 0, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE + item_attribute 150, HELD_NONE, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE ; NORMAL_BOX - item_attribute 10, 0, 0, CANT_SELECT, ITEM, ITEMMENU_CURRENT, ITEMMENU_NOUSE + item_attribute 10, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_CURRENT, ITEMMENU_NOUSE ; GORGEOUS_BOX - item_attribute 10, 0, 0, CANT_SELECT, ITEM, ITEMMENU_CURRENT, ITEMMENU_NOUSE + item_attribute 10, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_CURRENT, ITEMMENU_NOUSE ; SUN_STONE - item_attribute 2100, 0, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 2100, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; POLKADOT_BOW item_attribute 100, HELD_NORMAL_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; ITEM_AB - item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; UP_GRADE - item_attribute 2100, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 2100, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; BERRY item_attribute 10, HELD_BERRY, 10, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY ; GOLD_BERRY item_attribute 10, HELD_BERRY, 30, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY ; SQUIRTBOTTLE - item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE + item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE ; ITEM_B0 - item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; PARK_BALL - item_attribute 0, 0, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE + item_attribute 0, HELD_NONE, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE ; RAINBOW_WING - item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; ITEM_B3 - item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; BRICK_PIECE - item_attribute 50, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 50, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; SURF_MAIL - item_attribute 50, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 50, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; LITEBLUEMAIL - item_attribute 50, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 50, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; PORTRAITMAIL - item_attribute 50, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 50, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; LOVELY_MAIL - item_attribute 50, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 50, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; EON_MAIL - item_attribute 50, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 50, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; MORPH_MAIL - item_attribute 50, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 50, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; BLUESKY_MAIL - item_attribute 50, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 50, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; MUSIC_MAIL - item_attribute 50, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 50, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; MIRAGE_MAIL - item_attribute 50, 0, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute 50, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; ITEM_BE - item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; TM01 - item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 3000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM02 - item_attribute 2000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 2000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM03 - item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 3000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM04 - item_attribute 2000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 2000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; ITEM_C3 - item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; TM05 - item_attribute 1000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 1000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM06 - item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 3000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM07 - item_attribute 2000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 2000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM08 - item_attribute 1000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 1000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM09 - item_attribute 1000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 1000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM10 - item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 3000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM11 - item_attribute 2000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 2000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM12 - item_attribute 1000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 1000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM13 - item_attribute 1000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 1000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM14 - item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 3000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM15 - item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 3000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM16 - item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 3000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM17 - item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 3000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM18 - item_attribute 2000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 2000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM19 - item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 3000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM20 - item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 3000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM21 - item_attribute 1000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 1000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM22 - item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 3000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM23 - item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 3000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM24 - item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 3000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM25 - item_attribute 2000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 2000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM26 - item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 3000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM27 - item_attribute 1000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 1000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM28 - item_attribute 2000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 2000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; ITEM_DC - item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; TM29 - item_attribute 2000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 2000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM30 - item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 3000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM31 - item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 3000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM32 - item_attribute 2000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 2000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM33 - item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 3000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM34 - item_attribute 1000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 1000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM35 - item_attribute 1000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 1000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM36 - item_attribute 1000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 1000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM37 - item_attribute 2000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 2000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM38 - item_attribute 2000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 2000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM39 - item_attribute 2000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 2000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM40 - item_attribute 1000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 1000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM41 - item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 3000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM42 - item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 3000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM43 - item_attribute 1000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 1000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM44 - item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 3000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM45 - item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 3000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM46 - item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 3000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM47 - item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 3000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM48 - item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 3000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM49 - item_attribute 3000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 3000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; TM50 - item_attribute 2000, 0, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 2000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; HM01 - item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; HM02 - item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; HM03 - item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; HM04 - item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; HM05 - item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; HM06 - item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; HM07 - item_attribute 0, 0, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE + item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE ; ITEM_FA - item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; $fb - item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; $fc - item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; $fd - item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; $fe - item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; $ff - item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE ; $00 - item_attribute $9999, 0, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE + item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, 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 d0a0e6b88..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 @@ -9,5 +9,4 @@ BuenaPrizeItems: ; 8b15e db CARBOS, 5 db CALCIUM, 5 db HP_UP, 5 -BuenaPrizeItemsEnd: -; 8b170 +.End 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/descriptions.asm b/data/items/descriptions.asm index 20542b9e0..e0f009047 100644 --- a/data/items/descriptions.asm +++ b/data/items/descriptions.asm @@ -1,4 +1,5 @@ ItemDescriptions: +; entries correspond to item ids dw MasterBallDesc dw UltraBallDesc dw BrightpowderDesc 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 f0b0148bb..b39f2f80d 100644 --- a/data/items/heal_status.asm +++ b/data/items/heal_status.asm @@ -1,4 +1,6 @@ -StatusHealingActions: ; f071 +; See also data/battle/held_heal_status.asm + +StatusHealingActions: ; item, party menu action text, status db ANTIDOTE, PARTYMENUTEXT_HEAL_PSN, 1 << PSN db BURN_HEAL, PARTYMENUTEXT_HEAL_BRN, 1 << BRN @@ -15,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 fd156225d..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 @@ -34,20 +34,17 @@ Marts: ; 160a9 dw MartMtMoon dw MartIndigoPlateau dw MartUnderground -MartsEnd -; 160ed +.End - -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 288a14acc..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 -MomItems_1End: ; 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 -MomItems_2End: ; fd1ae +.End diff --git a/data/items/mystery_gift_items.asm b/data/items/mystery_gift_items.asm index b2379071e..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 @@ -36,5 +36,4 @@ MysteryGiftItems: ; 2c725 db RARE_CANDY db BLUESKY_MAIL db MIRAGE_MAIL -MysteryGiftItemsEnd: -; 2c74a +.End diff --git a/data/items/pocket_names.asm b/data/items/pocket_names.asm new file mode 100644 index 000000000..880e08fe3 --- /dev/null +++ b/data/items/pocket_names.asm @@ -0,0 +1,11 @@ +ItemPocketNames: +; entries correspond to item type constants + dw .Item + dw .Key + dw .Ball + dw .TM + +.Item: db "ITEM POCKET@" +.Key: db "KEY POCKET@" +.Ball: db "BALL POCKET@" +.TM: db "TM POCKET@" diff --git a/data/items/rooftop_sale.asm b/data/items/rooftop_sale.asm index b16724cdc..9606ef21e 100644 --- a/data/items/rooftop_sale.asm +++ b/data/items/rooftop_sale.asm @@ -1,4 +1,4 @@ -RooftopSaleData1: ; 15aee +RooftopSaleMart1: db 5 dbw POKE_BALL, 150 dbw GREAT_BALL, 500 @@ -7,7 +7,7 @@ RooftopSaleData1: ; 15aee dbw REVIVE, 1200 db -1 -RooftopSaleData2: ; 15aff +RooftopSaleMart2: db 5 dbw HYPER_POTION, 1000 dbw FULL_RESTORE, 2000 @@ -15,4 +15,3 @@ RooftopSaleData2: ; 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 new file mode 100644 index 000000000..fa42c461e --- /dev/null +++ b/data/maps/attributes.asm @@ -0,0 +1,663 @@ +map_attributes: MACRO +;\1: map name +;\2: map id +;\3: border block +;\4: connections: combo of NORTH, SOUTH, WEST, and/or EAST, or 0 for none +CURRENT_MAP_WIDTH = \2_WIDTH +CURRENT_MAP_HEIGHT = \2_HEIGHT +\1_MapAttributes:: + db \3 + db CURRENT_MAP_HEIGHT, CURRENT_MAP_WIDTH + db BANK(\1_Blocks) + dw \1_Blocks + db BANK(\1_MapScripts) ; BANK(\1_MapEvents) + dw \1_MapScripts + dw \1_MapEvents + db \4 +ENDM + +; Connections go in order: north, south, west, east +connection: MACRO +;\1: direction +;\2: map name +;\3: map id +;\4: x offset for east/west, y offset for north/south +;\5: distance offset? +;\6: strip length +if "\1" == "north" + map_id \3 + dw \2_Blocks + \3_WIDTH * (\3_HEIGHT - 3) + \5 + dw wOverworldMapBlocks + \4 + 3 + db \6 + db \3_WIDTH + db \3_HEIGHT * 2 - 1 + db (\4 - \5) * -2 + dw wOverworldMapBlocks + \3_HEIGHT * (\3_WIDTH + 6) + 1 +elif "\1" == "south" + map_id \3 + dw \2_Blocks + \5 + dw wOverworldMapBlocks + (CURRENT_MAP_HEIGHT + 3) * (CURRENT_MAP_WIDTH + 6) + \4 + 3 + db \6 + db \3_WIDTH + db 0 + db (\4 - \5) * -2 + dw wOverworldMapBlocks + \3_WIDTH + 7 +elif "\1" == "west" + map_id \3 + dw \2_Blocks + (\3_WIDTH * \5) + \3_WIDTH - 3 + dw wOverworldMapBlocks + (CURRENT_MAP_WIDTH + 6) * (\4 + 3) + db \6 + db \3_WIDTH + db (\4 - \5) * -2 + db \3_WIDTH * 2 - 1 + dw wOverworldMapBlocks + \3_WIDTH * 2 + 6 +elif "\1" == "east" + map_id \3 + dw \2_Blocks + (\3_WIDTH * \5) + dw wOverworldMapBlocks + (CURRENT_MAP_WIDTH + 6) * (\4 + 3 + 1) - 3 + db \6 + db \3_WIDTH + db (\4 - \5) * -2 + db 0 + dw wOverworldMapBlocks + \3_WIDTH + 7 +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 + + map_attributes CherrygroveCity, CHERRYGROVE_CITY, $35, NORTH | EAST + connection north, Route30, ROUTE_30, 5, 0, 10 + connection east, Route29, ROUTE_29, 0, 0, 9 + + map_attributes VioletCity, VIOLET_CITY, $05, SOUTH | WEST | EAST + connection south, Route32, ROUTE_32, 0, 0, 10 + connection west, Route36, ROUTE_36, 0, 0, 9 + connection east, Route31, ROUTE_31, 9, 0, 9 + + map_attributes AzaleaTown, AZALEA_TOWN, $05, WEST | EAST + connection west, Route34, ROUTE_34, -3, 15, 12 + connection east, Route33, ROUTE_33, 0, 0, 9 + + map_attributes CianwoodCity, CIANWOOD_CITY, $35, EAST + connection east, Route41, ROUTE_41, 0, 0, 27 + + map_attributes GoldenrodCity, GOLDENROD_CITY, $35, NORTH | SOUTH + connection north, Route35, ROUTE_35, 5, 0, 10 + connection south, Route34, ROUTE_34, 5, 0, 10 + + map_attributes OlivineCity, OLIVINE_CITY, $35, NORTH | WEST + connection north, Route39, ROUTE_39, 5, 0, 10 + connection west, Route40, ROUTE_40, 9, 0, 12 + + map_attributes EcruteakCity, ECRUTEAK_CITY, $05, SOUTH | WEST | EAST + connection south, Route37, ROUTE_37, 5, 0, 10 + connection west, Route38, ROUTE_38, 5, 0, 9 + connection east, Route42, ROUTE_42, 9, 0, 9 + + map_attributes MahoganyTown, MAHOGANY_TOWN, $71, NORTH | WEST | EAST + connection north, Route43, ROUTE_43, 0, 0, 10 + connection west, Route42, ROUTE_42, 0, 0, 9 + connection east, Route44, ROUTE_44, 0, 0, 9 + + map_attributes LakeOfRage, LAKE_OF_RAGE, $05, SOUTH + connection south, Route43, ROUTE_43, 5, 0, 10 + + map_attributes BlackthornCity, BLACKTHORN_CITY, $71, SOUTH | WEST + connection south, Route45, ROUTE_45, 0, 0, 10 + connection west, Route44, ROUTE_44, 9, 0, 9 + + map_attributes SilverCaveOutside, SILVER_CAVE_OUTSIDE, $2c, EAST + connection east, Route28, ROUTE_28, 9, 0, 9 + + map_attributes Route26, ROUTE_26, $05, WEST + connection west, Route27, ROUTE_27, 45, 0, 9 + + map_attributes Route27, ROUTE_27, $35, WEST | EAST + connection west, NewBarkTown, NEW_BARK_TOWN, 0, 0, 9 + connection east, Route26, ROUTE_26, -3, 42, 12 + + map_attributes Route28, ROUTE_28, $2c, WEST + connection west, SilverCaveOutside, SILVER_CAVE_OUTSIDE, -3, 6, 12 + + map_attributes Route29, ROUTE_29, $05, NORTH | WEST | EAST + connection north, Route46, ROUTE_46, 10, 0, 10 + connection west, CherrygroveCity, CHERRYGROVE_CITY, 0, 0, 9 + connection east, NewBarkTown, NEW_BARK_TOWN, 0, 0, 9 + + map_attributes Route30, ROUTE_30, $05, NORTH | SOUTH + connection north, Route31, ROUTE_31, -3, 7, 13 + connection south, CherrygroveCity, CHERRYGROVE_CITY, -3, 2, 16 + + map_attributes Route31, ROUTE_31, $05, SOUTH | WEST + connection south, Route30, ROUTE_30, 10, 0, 10 + connection west, VioletCity, VIOLET_CITY, -3, 6, 12 + + map_attributes Route32, ROUTE_32, $05, NORTH | SOUTH + connection north, VioletCity, VIOLET_CITY, 0, 0, 13 + connection south, Route33, ROUTE_33, 0, 0, 10 + + map_attributes Route33, ROUTE_33, $05, NORTH | WEST + connection north, Route32, ROUTE_32, 0, 0, 10 + connection west, AzaleaTown, AZALEA_TOWN, 0, 0, 9 + + map_attributes Route34, ROUTE_34, $05, NORTH | EAST + connection north, GoldenrodCity, GOLDENROD_CITY, -3, 2, 16 + connection east, AzaleaTown, AZALEA_TOWN, 18, 0, 9 + + map_attributes Route35, ROUTE_35, $05, NORTH | SOUTH + connection north, Route36, ROUTE_36, 0, 0, 13 + connection south, GoldenrodCity, GOLDENROD_CITY, -3, 2, 16 + + map_attributes Route36, ROUTE_36, $05, NORTH | SOUTH | EAST + connection north, Route37, ROUTE_37, 10, 0, 10 + connection south, Route35, ROUTE_35, 0, 0, 10 + connection east, VioletCity, VIOLET_CITY, 0, 0, 12 + + map_attributes Route37, ROUTE_37, $05, NORTH | SOUTH + connection north, EcruteakCity, ECRUTEAK_CITY, -3, 2, 16 + connection south, Route36, ROUTE_36, -3, 7, 16 + + map_attributes Route38, ROUTE_38, $05, WEST | EAST + connection west, Route39, ROUTE_39, 0, 0, 12 + connection east, EcruteakCity, ECRUTEAK_CITY, -3, 2, 15 + + map_attributes Route39, ROUTE_39, $05, SOUTH | EAST + connection south, OlivineCity, OLIVINE_CITY, -3, 2, 16 + connection east, Route38, ROUTE_38, 0, 0, 9 + + map_attributes Route40, ROUTE_40, $35, SOUTH | EAST + connection south, Route41, ROUTE_41, -3, 12, 13 + connection east, OlivineCity, OLIVINE_CITY, -3, 6, 12 + + map_attributes Route41, ROUTE_41, $35, NORTH | WEST + connection north, Route40, ROUTE_40, 15, 0, 10 + connection west, CianwoodCity, CIANWOOD_CITY, 0, 0, 27 + + map_attributes Route42, ROUTE_42, $05, WEST | EAST + connection west, EcruteakCity, ECRUTEAK_CITY, -3, 6, 12 + connection east, MahoganyTown, MAHOGANY_TOWN, 0, 0, 9 + + map_attributes Route43, ROUTE_43, $05, NORTH | SOUTH + connection north, LakeOfRage, LAKE_OF_RAGE, -3, 2, 16 + connection south, MahoganyTown, MAHOGANY_TOWN, 0, 0, 10 + + map_attributes Route44, ROUTE_44, $71, WEST | EAST + connection west, MahoganyTown, MAHOGANY_TOWN, 0, 0, 9 + connection east, BlackthornCity, BLACKTHORN_CITY, -3, 6, 12 + + map_attributes Route45, ROUTE_45, $71, NORTH | WEST + connection north, BlackthornCity, BLACKTHORN_CITY, 0, 0, 13 + connection west, Route46, ROUTE_46, 36, 0, 12 + + map_attributes Route46, ROUTE_46, $05, SOUTH | EAST + connection south, Route29, ROUTE_29, -3, 7, 16 + connection east, Route45, ROUTE_45, -3, 33, 12 + + map_attributes PewterCity, PEWTER_CITY, $0f, SOUTH | EAST + connection south, Route2, ROUTE_2, 5, 0, 10 + connection east, Route3, ROUTE_3, 5, 0, 9 + + map_attributes Route2, ROUTE_2, $0f, NORTH | SOUTH + connection north, PewterCity, PEWTER_CITY, -3, 2, 16 + connection south, ViridianCity, VIRIDIAN_CITY, -3, 2, 16 + + map_attributes ViridianCity, VIRIDIAN_CITY, $0f, NORTH | SOUTH | WEST + connection north, Route2, ROUTE_2, 5, 0, 10 + connection south, Route1, ROUTE_1, 10, 0, 10 + connection west, Route22, ROUTE_22, 4, 0, 9 + + map_attributes Route22, ROUTE_22, $2c, EAST + connection east, ViridianCity, VIRIDIAN_CITY, -3, 1, 15 + + map_attributes Route1, ROUTE_1, $0f, NORTH | SOUTH + connection north, ViridianCity, VIRIDIAN_CITY, -3, 7, 13 + connection south, PalletTown, PALLET_TOWN, 0, 0, 10 + + map_attributes PalletTown, PALLET_TOWN, $0f, NORTH | SOUTH + connection north, Route1, ROUTE_1, 0, 0, 10 + connection south, Route21, ROUTE_21, 0, 0, 10 + + map_attributes Route21, ROUTE_21, $43, NORTH | SOUTH + connection north, PalletTown, PALLET_TOWN, 0, 0, 10 + connection south, CinnabarIsland, CINNABAR_ISLAND, 0, 0, 10 + + map_attributes CinnabarIsland, CINNABAR_ISLAND, $43, NORTH | EAST + connection north, Route21, ROUTE_21, 0, 0, 10 + connection east, Route20, ROUTE_20, 0, 0, 9 + + map_attributes Route20, ROUTE_20, $43, WEST | EAST + connection west, CinnabarIsland, CINNABAR_ISLAND, 0, 0, 9 + connection east, Route19, ROUTE_19, -3, 6, 12 + + map_attributes Route19, ROUTE_19, $43, NORTH | WEST + connection north, FuchsiaCity, FUCHSIA_CITY, 0, 0, 13 + connection west, Route20, ROUTE_20, 9, 0, 9 + + map_attributes FuchsiaCity, FUCHSIA_CITY, $0f, SOUTH | WEST | EAST + connection south, Route19, ROUTE_19, 0, 0, 10 + connection west, Route18, ROUTE_18, 7, 0, 9 + connection east, Route15, ROUTE_15, 9, 0, 9 + + map_attributes Route18, ROUTE_18, $43, WEST | EAST + connection west, Route17, ROUTE_17, -3, 35, 10 + connection east, FuchsiaCity, FUCHSIA_CITY, -3, 4, 14 + + map_attributes Route17, ROUTE_17, $43, NORTH | EAST + connection north, Route16, ROUTE_16, 0, 0, 10 + connection east, Route18, ROUTE_18, 38, 0, 9 + + map_attributes Route16, ROUTE_16, $0f, SOUTH | EAST + connection south, Route17, ROUTE_17, 0, 0, 10 + connection east, CeladonCity, CELADON_CITY, -3, 6, 12 + + map_attributes CeladonCity, CELADON_CITY, $0f, WEST | EAST + connection west, Route16, ROUTE_16, 9, 0, 9 + connection east, Route7, ROUTE_7, 5, 0, 9 + + map_attributes Route7, ROUTE_7, $0f, WEST | EAST + connection west, CeladonCity, CELADON_CITY, -3, 2, 15 + connection east, SaffronCity, SAFFRON_CITY, -3, 6, 12 + + map_attributes Route15, ROUTE_15, $0f, WEST | EAST + connection west, FuchsiaCity, FUCHSIA_CITY, -3, 6, 12 + connection east, Route14, ROUTE_14, -3, 6, 12 + + map_attributes Route14, ROUTE_14, $43, NORTH | WEST + connection north, Route13, ROUTE_13, 0, 0, 13 + connection west, Route15, ROUTE_15, 9, 0, 9 + + map_attributes Route13, ROUTE_13, $43, NORTH | SOUTH + connection north, Route12, ROUTE_12, 20, 0, 10 + connection south, Route14, ROUTE_14, 0, 0, 10 + + map_attributes Route12, ROUTE_12, $43, NORTH | SOUTH | WEST + connection north, LavenderTown, LAVENDER_TOWN, 0, 0, 10 + connection south, Route13, ROUTE_13, -3, 17, 13 + connection west, Route11, ROUTE_11, 9, 0, 9 + + map_attributes Route11, ROUTE_11, $0f, WEST | EAST + connection west, VermilionCity, VERMILION_CITY, 0, 0, 12 + connection east, Route12, ROUTE_12, -3, 6, 15 + + map_attributes LavenderTown, LAVENDER_TOWN, $2c, NORTH | SOUTH | WEST + connection north, Route10South, ROUTE_10_SOUTH, 0, 0, 10 + connection south, Route12, ROUTE_12, 0, 0, 10 + connection west, Route8, ROUTE_8, 0, 0, 9 + + map_attributes VermilionCity, VERMILION_CITY, $43, NORTH | EAST + connection north, Route6, ROUTE_6, 5, 0, 10 + connection east, Route11, ROUTE_11, 0, 0, 9 + + map_attributes Route6, ROUTE_6, $0f, NORTH | SOUTH + connection north, SaffronCity, SAFFRON_CITY, -3, 2, 16 + connection south, VermilionCity, VERMILION_CITY, -3, 2, 16 + + map_attributes SaffronCity, SAFFRON_CITY, $0f, NORTH | SOUTH | WEST | EAST + connection north, Route5, ROUTE_5, 5, 0, 10 + connection south, Route6, ROUTE_6, 5, 0, 10 + connection west, Route7, ROUTE_7, 9, 0, 9 + connection east, Route8, ROUTE_8, 9, 0, 9 + + map_attributes Route5, ROUTE_5, $0f, NORTH | SOUTH + connection north, CeruleanCity, CERULEAN_CITY, -3, 2, 16 + connection south, SaffronCity, SAFFRON_CITY, -3, 2, 16 + + map_attributes CeruleanCity, CERULEAN_CITY, $0f, NORTH | SOUTH | WEST | EAST + connection north, Route24, ROUTE_24, 6, 0, 10 + connection south, Route5, ROUTE_5, 5, 0, 10 + connection west, Route4, ROUTE_4, 5, 0, 9 + connection east, Route9, ROUTE_9, 9, 0, 9 + + map_attributes Route9, ROUTE_9, $2c, SOUTH | WEST + connection south, Route10North, ROUTE_10_NORTH, 20, 0, 10 + connection west, CeruleanCity, CERULEAN_CITY, -3, 6, 12 + + map_attributes Route24, ROUTE_24, $2c, NORTH | SOUTH + connection north, Route25, ROUTE_25, 0, 0, 13 + connection south, CeruleanCity, CERULEAN_CITY, -3, 3, 16 + + map_attributes Route25, ROUTE_25, $2c, SOUTH + connection south, Route24, ROUTE_24, 0, 0, 10 + + map_attributes Route3, ROUTE_3, $2c, WEST | EAST + connection west, PewterCity, PEWTER_CITY, -3, 2, 15 + connection east, Route4, ROUTE_4, 0, 0, 9 + + map_attributes Route4, ROUTE_4, $2c, WEST | EAST + connection west, Route3, ROUTE_3, 0, 0, 9 + connection east, CeruleanCity, CERULEAN_CITY, -3, 2, 15 + + map_attributes Route8, ROUTE_8, $2c, WEST | EAST + connection west, SaffronCity, SAFFRON_CITY, -3, 6, 12 + connection east, LavenderTown, LAVENDER_TOWN, 0, 0, 9 + + map_attributes Route10North, ROUTE_10_NORTH, $2c, NORTH | SOUTH + connection north, Route9, ROUTE_9, -3, 17, 13 + connection south, Route10South, ROUTE_10_SOUTH, 0, 0, 10 + + map_attributes Route10South, ROUTE_10_SOUTH, $2c, NORTH | SOUTH + connection north, Route10North, ROUTE_10_NORTH, 0, 0, 10 + connection south, LavenderTown, LAVENDER_TOWN, 0, 0, 10 + + map_attributes Route23, ROUTE_23, $0f, 0 + map_attributes SproutTower1F, SPROUT_TOWER_1F, $00, 0 + map_attributes SproutTower2F, SPROUT_TOWER_2F, $00, 0 + map_attributes SproutTower3F, SPROUT_TOWER_3F, $00, 0 + map_attributes TinTower1F, TIN_TOWER_1F, $00, 0 + map_attributes TinTower2F, TIN_TOWER_2F, $00, 0 + map_attributes TinTower3F, TIN_TOWER_3F, $00, 0 + map_attributes TinTower4F, TIN_TOWER_4F, $00, 0 + map_attributes TinTower5F, TIN_TOWER_5F, $00, 0 + map_attributes TinTower6F, TIN_TOWER_6F, $00, 0 + map_attributes TinTower7F, TIN_TOWER_7F, $00, 0 + map_attributes TinTower8F, TIN_TOWER_8F, $00, 0 + map_attributes TinTower9F, TIN_TOWER_9F, $00, 0 + map_attributes BurnedTower1F, BURNED_TOWER_1F, $00, 0 + map_attributes BurnedTowerB1F, BURNED_TOWER_B1F, $09, 0 + map_attributes NationalPark, NATIONAL_PARK, $00, 0 + map_attributes NationalParkBugContest, NATIONAL_PARK_BUG_CONTEST, $00, 0 + map_attributes RadioTower1F, RADIO_TOWER_1F, $00, 0 + map_attributes RadioTower2F, RADIO_TOWER_2F, $00, 0 + map_attributes RadioTower3F, RADIO_TOWER_3F, $00, 0 + map_attributes RadioTower4F, RADIO_TOWER_4F, $00, 0 + map_attributes RadioTower5F, RADIO_TOWER_5F, $00, 0 + map_attributes RuinsOfAlphOutside, RUINS_OF_ALPH_OUTSIDE, $05, 0 + map_attributes RuinsOfAlphHoOhChamber, RUINS_OF_ALPH_HO_OH_CHAMBER, $00, 0 + map_attributes RuinsOfAlphKabutoChamber, RUINS_OF_ALPH_KABUTO_CHAMBER, $00, 0 + map_attributes RuinsOfAlphOmanyteChamber, RUINS_OF_ALPH_OMANYTE_CHAMBER, $00, 0 + map_attributes RuinsOfAlphAerodactylChamber, RUINS_OF_ALPH_AERODACTYL_CHAMBER, $00, 0 + map_attributes RuinsOfAlphInnerChamber, RUINS_OF_ALPH_INNER_CHAMBER, $00, 0 + map_attributes RuinsOfAlphResearchCenter, RUINS_OF_ALPH_RESEARCH_CENTER, $00, 0 + map_attributes RuinsOfAlphHoOhItemRoom, RUINS_OF_ALPH_HO_OH_ITEM_ROOM, $00, 0 + map_attributes RuinsOfAlphKabutoItemRoom, RUINS_OF_ALPH_KABUTO_ITEM_ROOM, $00, 0 + map_attributes RuinsOfAlphOmanyteItemRoom, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM, $00, 0 + map_attributes RuinsOfAlphAerodactylItemRoom, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM, $00, 0 + map_attributes RuinsOfAlphHoOhWordRoom, RUINS_OF_ALPH_HO_OH_WORD_ROOM, $00, 0 + map_attributes RuinsOfAlphKabutoWordRoom, RUINS_OF_ALPH_KABUTO_WORD_ROOM, $00, 0 + map_attributes RuinsOfAlphOmanyteWordRoom, RUINS_OF_ALPH_OMANYTE_WORD_ROOM, $00, 0 + map_attributes RuinsOfAlphAerodactylWordRoom, RUINS_OF_ALPH_AERODACTYL_WORD_ROOM, $00, 0 + map_attributes UnionCave1F, UNION_CAVE_1F, $09, 0 + map_attributes UnionCaveB1F, UNION_CAVE_B1F, $09, 0 + map_attributes UnionCaveB2F, UNION_CAVE_B2F, $09, 0 + map_attributes SlowpokeWellB1F, SLOWPOKE_WELL_B1F, $09, 0 + map_attributes SlowpokeWellB2F, SLOWPOKE_WELL_B2F, $09, 0 + map_attributes OlivineLighthouse1F, OLIVINE_LIGHTHOUSE_1F, $00, 0 + map_attributes OlivineLighthouse2F, OLIVINE_LIGHTHOUSE_2F, $00, 0 + map_attributes OlivineLighthouse3F, OLIVINE_LIGHTHOUSE_3F, $00, 0 + map_attributes OlivineLighthouse4F, OLIVINE_LIGHTHOUSE_4F, $00, 0 + map_attributes OlivineLighthouse5F, OLIVINE_LIGHTHOUSE_5F, $00, 0 + map_attributes OlivineLighthouse6F, OLIVINE_LIGHTHOUSE_6F, $00, 0 + map_attributes MahoganyMart1F, MAHOGANY_MART_1F, $00, 0 + map_attributes TeamRocketBaseB1F, TEAM_ROCKET_BASE_B1F, $00, 0 + map_attributes TeamRocketBaseB2F, TEAM_ROCKET_BASE_B2F, $00, 0 + map_attributes TeamRocketBaseB3F, TEAM_ROCKET_BASE_B3F, $00, 0 + map_attributes IlexForest, ILEX_FOREST, $05, 0 + map_attributes GoldenrodUnderground, GOLDENROD_UNDERGROUND, $00, 0 + map_attributes GoldenrodUndergroundSwitchRoomEntrances, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, $00, 0 + map_attributes GoldenrodDeptStoreB1F, GOLDENROD_DEPT_STORE_B1F, $00, 0 + map_attributes GoldenrodUndergroundWarehouse, GOLDENROD_UNDERGROUND_WAREHOUSE, $00, 0 + map_attributes MountMortar1FOutside, MOUNT_MORTAR_1F_OUTSIDE, $09, 0 + map_attributes MountMortar1FInside, MOUNT_MORTAR_1F_INSIDE, $09, 0 + map_attributes MountMortar2FInside, MOUNT_MORTAR_2F_INSIDE, $09, 0 + map_attributes MountMortarB1F, MOUNT_MORTAR_B1F, $09, 0 + map_attributes IcePath1F, ICE_PATH_1F, $09, 0 + map_attributes IcePathB1F, ICE_PATH_B1F, $19, 0 + map_attributes IcePathB2FMahoganySide, ICE_PATH_B2F_MAHOGANY_SIDE, $19, 0 + map_attributes IcePathB2FBlackthornSide, ICE_PATH_B2F_BLACKTHORN_SIDE, $19, 0 + map_attributes IcePathB3F, ICE_PATH_B3F, $19, 0 + map_attributes WhirlIslandNW, WHIRL_ISLAND_NW, $09, 0 + map_attributes WhirlIslandNE, WHIRL_ISLAND_NE, $09, 0 + map_attributes WhirlIslandSW, WHIRL_ISLAND_SW, $09, 0 + map_attributes WhirlIslandCave, WHIRL_ISLAND_CAVE, $09, 0 + map_attributes WhirlIslandSE, WHIRL_ISLAND_SE, $0f, 0 + map_attributes WhirlIslandB1F, WHIRL_ISLAND_B1F, $09, 0 + map_attributes WhirlIslandB2F, WHIRL_ISLAND_B2F, $2e, 0 + map_attributes WhirlIslandLugiaChamber, WHIRL_ISLAND_LUGIA_CHAMBER, $0f, 0 + map_attributes SilverCaveRoom1, SILVER_CAVE_ROOM_1, $09, 0 + map_attributes SilverCaveRoom2, SILVER_CAVE_ROOM_2, $09, 0 + map_attributes SilverCaveRoom3, SILVER_CAVE_ROOM_3, $09, 0 + map_attributes SilverCaveItemRooms, SILVER_CAVE_ITEM_ROOMS, $09, 0 + map_attributes DarkCaveVioletEntrance, DARK_CAVE_VIOLET_ENTRANCE, $09, 0 + map_attributes DarkCaveBlackthornEntrance, DARK_CAVE_BLACKTHORN_ENTRANCE, $09, 0 + map_attributes DragonsDen1F, DRAGONS_DEN_1F, $09, 0 + map_attributes DragonsDenB1F, DRAGONS_DEN_B1F, $71, 0 + map_attributes DragonShrine, DRAGON_SHRINE, $00, 0 + map_attributes TohjoFalls, TOHJO_FALLS, $09, 0 + map_attributes OlivinePokecenter1F, OLIVINE_POKECENTER_1F, $00, 0 + map_attributes OlivineGym, OLIVINE_GYM, $00, 0 + map_attributes OlivineTimsHouse, OLIVINE_TIMS_HOUSE, $00, 0 + map_attributes OlivineHouseBeta, OLIVINE_HOUSE_BETA, $00, 0 + map_attributes OlivinePunishmentSpeechHouse, OLIVINE_PUNISHMENT_SPEECH_HOUSE, $00, 0 + map_attributes OlivineGoodRodHouse, OLIVINE_GOOD_ROD_HOUSE, $00, 0 + map_attributes OlivineCafe, OLIVINE_CAFE, $00, 0 + map_attributes OlivineMart, OLIVINE_MART, $00, 0 + map_attributes Route38EcruteakGate, ROUTE_38_ECRUTEAK_GATE, $00, 0 + map_attributes Route39Barn, ROUTE_39_BARN, $00, 0 + map_attributes Route39Farmhouse, ROUTE_39_FARMHOUSE, $00, 0 + map_attributes MahoganyRedGyaradosSpeechHouse, MAHOGANY_RED_GYARADOS_SPEECH_HOUSE, $00, 0 + map_attributes MahoganyGym, MAHOGANY_GYM, $00, 0 + map_attributes MahoganyPokecenter1F, MAHOGANY_POKECENTER_1F, $00, 0 + map_attributes Route42EcruteakGate, ROUTE_42_ECRUTEAK_GATE, $00, 0 + map_attributes DiglettsCave, DIGLETTS_CAVE, $09, 0 + map_attributes MountMoon, MOUNT_MOON, $09, 0 + map_attributes UndergroundPath, UNDERGROUND_PATH, $00, 0 + map_attributes RockTunnel1F, ROCK_TUNNEL_1F, $09, 0 + map_attributes RockTunnelB1F, ROCK_TUNNEL_B1F, $09, 0 + map_attributes SafariZoneFuchsiaGateBeta, SAFARI_ZONE_FUCHSIA_GATE_BETA, $00, 0 + map_attributes SafariZoneBeta, SAFARI_ZONE_BETA, $13, 0 + map_attributes VictoryRoad, VICTORY_ROAD, $1d, 0 + map_attributes EcruteakTinTowerEntrance, ECRUTEAK_TIN_TOWER_ENTRANCE, $00, 0 + map_attributes WiseTriosRoom, WISE_TRIOS_ROOM, $00, 0 + map_attributes EcruteakPokecenter1F, ECRUTEAK_POKECENTER_1F, $00, 0 + map_attributes EcruteakLugiaSpeechHouse, ECRUTEAK_LUGIA_SPEECH_HOUSE, $00, 0 + map_attributes DanceTheatre, DANCE_THEATRE, $00, 0 + map_attributes EcruteakMart, ECRUTEAK_MART, $00, 0 + map_attributes EcruteakGym, ECRUTEAK_GYM, $00, 0 + map_attributes EcruteakItemfinderHouse, ECRUTEAK_ITEMFINDER_HOUSE, $00, 0 + map_attributes BlackthornGym1F, BLACKTHORN_GYM_1F, $00, 0 + map_attributes BlackthornGym2F, BLACKTHORN_GYM_2F, $00, 0 + map_attributes BlackthornDragonSpeechHouse, BLACKTHORN_DRAGON_SPEECH_HOUSE, $00, 0 + map_attributes BlackthornEmysHouse, BLACKTHORN_EMYS_HOUSE, $00, 0 + map_attributes BlackthornMart, BLACKTHORN_MART, $00, 0 + map_attributes BlackthornPokecenter1F, BLACKTHORN_POKECENTER_1F, $00, 0 + map_attributes MoveDeletersHouse, MOVE_DELETERS_HOUSE, $00, 0 + map_attributes CinnabarPokecenter1F, CINNABAR_POKECENTER_1F, $00, 0 + map_attributes CinnabarPokecenter2FBeta, CINNABAR_POKECENTER_2F_BETA, $00, 0 + map_attributes Route19FuchsiaGate, ROUTE_19_FUCHSIA_GATE, $00, 0 + map_attributes SeafoamGym, SEAFOAM_GYM, $09, 0 + map_attributes CeruleanGymBadgeSpeechHouse, CERULEAN_GYM_BADGE_SPEECH_HOUSE, $00, 0 + map_attributes CeruleanPoliceStation, CERULEAN_POLICE_STATION, $00, 0 + map_attributes CeruleanTradeSpeechHouse, CERULEAN_TRADE_SPEECH_HOUSE, $00, 0 + map_attributes CeruleanPokecenter1F, CERULEAN_POKECENTER_1F, $00, 0 + map_attributes CeruleanPokecenter2FBeta, CERULEAN_POKECENTER_2F_BETA, $00, 0 + map_attributes CeruleanGym, CERULEAN_GYM, $00, 0 + map_attributes CeruleanMart, CERULEAN_MART, $00, 0 + map_attributes Route10Pokecenter1F, ROUTE_10_POKECENTER_1F, $00, 0 + map_attributes Route10Pokecenter2FBeta, ROUTE_10_POKECENTER_2F_BETA, $00, 0 + map_attributes PowerPlant, POWER_PLANT, $00, 0 + map_attributes BillsHouse, BILLS_HOUSE, $00, 0 + map_attributes AzaleaPokecenter1F, AZALEA_POKECENTER_1F, $00, 0 + map_attributes CharcoalKiln, CHARCOAL_KILN, $00, 0 + map_attributes AzaleaMart, AZALEA_MART, $00, 0 + map_attributes KurtsHouse, KURTS_HOUSE, $00, 0 + map_attributes AzaleaGym, AZALEA_GYM, $00, 0 + map_attributes LakeOfRageHiddenPowerHouse, LAKE_OF_RAGE_HIDDEN_POWER_HOUSE, $00, 0 + map_attributes LakeOfRageMagikarpHouse, LAKE_OF_RAGE_MAGIKARP_HOUSE, $00, 0 + map_attributes Route43MahoganyGate, ROUTE_43_MAHOGANY_GATE, $00, 0 + map_attributes Route43Gate, ROUTE_43_GATE, $00, 0 + map_attributes VioletMart, VIOLET_MART, $00, 0 + map_attributes VioletGym, VIOLET_GYM, $00, 0 + map_attributes EarlsPokemonAcademy, EARLS_POKEMON_ACADEMY, $00, 0 + map_attributes VioletNicknameSpeechHouse, VIOLET_NICKNAME_SPEECH_HOUSE, $00, 0 + map_attributes VioletPokecenter1F, VIOLET_POKECENTER_1F, $00, 0 + map_attributes VioletKylesHouse, VIOLET_KYLES_HOUSE, $00, 0 + map_attributes Route32RuinsOfAlphGate, ROUTE_32_RUINS_OF_ALPH_GATE, $00, 0 + map_attributes Route32Pokecenter1F, ROUTE_32_POKECENTER_1F, $00, 0 + map_attributes Route35GoldenrodGate, ROUTE_35_GOLDENROD_GATE, $00, 0 + map_attributes Route35NationalParkGate, ROUTE_35_NATIONAL_PARK_GATE, $00, 0 + map_attributes Route36RuinsOfAlphGate, ROUTE_36_RUINS_OF_ALPH_GATE, $00, 0 + map_attributes Route36NationalParkGate, ROUTE_36_NATIONAL_PARK_GATE, $00, 0 + map_attributes GoldenrodGym, GOLDENROD_GYM, $00, 0 + map_attributes GoldenrodBikeShop, GOLDENROD_BIKE_SHOP, $00, 0 + map_attributes GoldenrodHappinessRater, GOLDENROD_HAPPINESS_RATER, $00, 0 + map_attributes BillsFamilysHouse, BILLS_FAMILYS_HOUSE, $00, 0 + map_attributes GoldenrodMagnetTrainStation, GOLDENROD_MAGNET_TRAIN_STATION, $00, 0 + map_attributes GoldenrodFlowerShop, GOLDENROD_FLOWER_SHOP, $00, 0 + map_attributes GoldenrodPPSpeechHouse, GOLDENROD_PP_SPEECH_HOUSE, $00, 0 + map_attributes GoldenrodNameRater, GOLDENROD_NAME_RATER, $00, 0 + map_attributes GoldenrodDeptStore1F, GOLDENROD_DEPT_STORE_1F, $00, 0 + map_attributes GoldenrodDeptStore2F, GOLDENROD_DEPT_STORE_2F, $00, 0 + map_attributes GoldenrodDeptStore3F, GOLDENROD_DEPT_STORE_3F, $00, 0 + map_attributes GoldenrodDeptStore4F, GOLDENROD_DEPT_STORE_4F, $00, 0 + map_attributes GoldenrodDeptStore5F, GOLDENROD_DEPT_STORE_5F, $00, 0 + map_attributes GoldenrodDeptStore6F, GOLDENROD_DEPT_STORE_6F, $00, 0 + map_attributes GoldenrodDeptStoreElevator, GOLDENROD_DEPT_STORE_ELEVATOR, $00, 0 + map_attributes GoldenrodDeptStoreRoof, GOLDENROD_DEPT_STORE_ROOF, $24, 0 + map_attributes GoldenrodGameCorner, GOLDENROD_GAME_CORNER, $00, 0 + map_attributes GoldenrodPokecenter1F, GOLDENROD_POKECENTER_1F, $00, 0 + map_attributes PokecomCenterAdminOfficeMobile, POKECOM_CENTER_ADMIN_OFFICE_MOBILE, $00, 0 + map_attributes IlexForestAzaleaGate, ILEX_FOREST_AZALEA_GATE, $00, 0 + map_attributes Route34IlexForestGate, ROUTE_34_ILEX_FOREST_GATE, $00, 0 + map_attributes DayCare, DAY_CARE, $00, 0 + map_attributes VermilionFishingSpeechHouse, VERMILION_FISHING_SPEECH_HOUSE, $00, 0 + map_attributes VermilionPokecenter1F, VERMILION_POKECENTER_1F, $00, 0 + map_attributes VermilionPokecenter2FBeta, VERMILION_POKECENTER_2F_BETA, $00, 0 + map_attributes PokemonFanClub, POKEMON_FAN_CLUB, $00, 0 + map_attributes VermilionMagnetTrainSpeechHouse, VERMILION_MAGNET_TRAIN_SPEECH_HOUSE, $00, 0 + map_attributes VermilionMart, VERMILION_MART, $00, 0 + map_attributes VermilionDiglettsCaveSpeechHouse, VERMILION_DIGLETTS_CAVE_SPEECH_HOUSE, $00, 0 + map_attributes VermilionGym, VERMILION_GYM, $00, 0 + map_attributes Route6SaffronGate, ROUTE_6_SAFFRON_GATE, $00, 0 + map_attributes Route6UndergroundPathEntrance, ROUTE_6_UNDERGROUND_PATH_ENTRANCE, $00, 0 + map_attributes RedsHouse1F, REDS_HOUSE_1F, $00, 0 + map_attributes RedsHouse2F, REDS_HOUSE_2F, $00, 0 + map_attributes BluesHouse, BLUES_HOUSE, $00, 0 + map_attributes OaksLab, OAKS_LAB, $00, 0 + map_attributes PewterNidoranSpeechHouse, PEWTER_NIDORAN_SPEECH_HOUSE, $00, 0 + map_attributes PewterGym, PEWTER_GYM, $00, 0 + map_attributes PewterMart, PEWTER_MART, $00, 0 + map_attributes PewterPokecenter1F, PEWTER_POKECENTER_1F, $00, 0 + map_attributes PewterPokecenter2FBeta, PEWTER_POKECENTER_2F_BETA, $00, 0 + map_attributes PewterSnoozeSpeechHouse, PEWTER_SNOOZE_SPEECH_HOUSE, $00, 0 + map_attributes OlivinePort, OLIVINE_PORT, $0a, 0 + map_attributes VermilionPort, VERMILION_PORT, $0a, 0 + map_attributes FastShip1F, FAST_SHIP_1F, $00, 0 + map_attributes FastShipCabins_NNW_NNE_NE, FAST_SHIP_CABINS_NNW_NNE_NE, $00, 0 + map_attributes FastShipCabins_SW_SSW_NW, FAST_SHIP_CABINS_SW_SSW_NW, $00, 0 + map_attributes FastShipCabins_SE_SSE_CaptainsCabin, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN, $00, 0 + map_attributes FastShipB1F, FAST_SHIP_B1F, $00, 0 + map_attributes OlivinePortPassage, OLIVINE_PORT_PASSAGE, $00, 0 + map_attributes VermilionPortPassage, VERMILION_PORT_PASSAGE, $00, 0 + map_attributes MountMoonSquare, MOUNT_MOON_SQUARE, $2d, 0 + map_attributes MountMoonGiftShop, MOUNT_MOON_GIFT_SHOP, $00, 0 + map_attributes TinTowerRoof, TIN_TOWER_ROOF, $00, 0 + map_attributes IndigoPlateauPokecenter1F, INDIGO_PLATEAU_POKECENTER_1F, $00, 0 + map_attributes WillsRoom, WILLS_ROOM, $00, 0 + map_attributes KogasRoom, KOGAS_ROOM, $00, 0 + map_attributes BrunosRoom, BRUNOS_ROOM, $00, 0 + map_attributes KarensRoom, KARENS_ROOM, $00, 0 + map_attributes LancesRoom, LANCES_ROOM, $00, 0 + map_attributes HallOfFame, HALL_OF_FAME, $00, 0 + map_attributes FuchsiaMart, FUCHSIA_MART, $00, 0 + map_attributes SafariZoneMainOffice, SAFARI_ZONE_MAIN_OFFICE, $00, 0 + map_attributes FuchsiaGym, FUCHSIA_GYM, $00, 0 + map_attributes BillsBrothersHouse, BILLS_BROTHERS_HOUSE, $00, 0 + map_attributes FuchsiaPokecenter1F, FUCHSIA_POKECENTER_1F, $00, 0 + map_attributes FuchsiaPokecenter2FBeta, FUCHSIA_POKECENTER_2F_BETA, $00, 0 + map_attributes SafariZoneWardensHome, SAFARI_ZONE_WARDENS_HOME, $00, 0 + map_attributes Route15FuchsiaGate, ROUTE_15_FUCHSIA_GATE, $00, 0 + map_attributes LavenderPokecenter1F, LAVENDER_POKECENTER_1F, $00, 0 + map_attributes LavenderPokecenter2FBeta, LAVENDER_POKECENTER_2F_BETA, $00, 0 + map_attributes MrFujisHouse, MR_FUJIS_HOUSE, $00, 0 + map_attributes LavenderSpeechHouse, LAVENDER_SPEECH_HOUSE, $00, 0 + map_attributes LavenderNameRater, LAVENDER_NAME_RATER, $00, 0 + map_attributes LavenderMart, LAVENDER_MART, $00, 0 + map_attributes SoulHouse, SOUL_HOUSE, $00, 0 + map_attributes LavRadioTower1F, LAV_RADIO_TOWER_1F, $00, 0 + map_attributes Route8SaffronGate, ROUTE_8_SAFFRON_GATE, $00, 0 + map_attributes Route12SuperRodHouse, ROUTE_12_SUPER_ROD_HOUSE, $00, 0 + map_attributes SilverCavePokecenter1F, SILVER_CAVE_POKECENTER_1F, $00, 0 + map_attributes Route28SteelWingHouse, ROUTE_28_STEEL_WING_HOUSE, $00, 0 + map_attributes Pokecenter2F, POKECENTER_2F, $00, 0 + map_attributes TradeCenter, TRADE_CENTER, $00, 0 + map_attributes Colosseum, COLOSSEUM, $00, 0 + map_attributes TimeCapsule, TIME_CAPSULE, $00, 0 + map_attributes MobileTradeRoom, MOBILE_TRADE_ROOM, $00, 0 + map_attributes MobileBattleRoom, MOBILE_BATTLE_ROOM, $00, 0 + map_attributes CeladonDeptStore1F, CELADON_DEPT_STORE_1F, $00, 0 + map_attributes CeladonDeptStore2F, CELADON_DEPT_STORE_2F, $00, 0 + map_attributes CeladonDeptStore3F, CELADON_DEPT_STORE_3F, $00, 0 + map_attributes CeladonDeptStore4F, CELADON_DEPT_STORE_4F, $00, 0 + map_attributes CeladonDeptStore5F, CELADON_DEPT_STORE_5F, $00, 0 + map_attributes CeladonDeptStore6F, CELADON_DEPT_STORE_6F, $00, 0 + map_attributes CeladonDeptStoreElevator, CELADON_DEPT_STORE_ELEVATOR, $00, 0 + map_attributes CeladonMansion1F, CELADON_MANSION_1F, $00, 0 + map_attributes CeladonMansion2F, CELADON_MANSION_2F, $00, 0 + map_attributes CeladonMansion3F, CELADON_MANSION_3F, $00, 0 + map_attributes CeladonMansionRoof, CELADON_MANSION_ROOF, $01, 0 + map_attributes CeladonMansionRoofHouse, CELADON_MANSION_ROOF_HOUSE, $00, 0 + map_attributes CeladonPokecenter1F, CELADON_POKECENTER_1F, $00, 0 + map_attributes CeladonPokecenter2FBeta, CELADON_POKECENTER_2F_BETA, $00, 0 + map_attributes CeladonGameCorner, CELADON_GAME_CORNER, $00, 0 + map_attributes CeladonGameCornerPrizeRoom, CELADON_GAME_CORNER_PRIZE_ROOM, $00, 0 + map_attributes CeladonGym, CELADON_GYM, $00, 0 + map_attributes CeladonCafe, CELADON_CAFE, $00, 0 + map_attributes Route16FuchsiaSpeechHouse, ROUTE_16_FUCHSIA_SPEECH_HOUSE, $00, 0 + map_attributes Route16Gate, ROUTE_16_GATE, $00, 0 + map_attributes Route7SaffronGate, ROUTE_7_SAFFRON_GATE, $00, 0 + map_attributes Route17Route18Gate, ROUTE_17_ROUTE_18_GATE, $00, 0 + map_attributes ManiasHouse, MANIAS_HOUSE, $00, 0 + map_attributes CianwoodGym, CIANWOOD_GYM, $00, 0 + map_attributes CianwoodPokecenter1F, CIANWOOD_POKECENTER_1F, $00, 0 + map_attributes CianwoodPharmacy, CIANWOOD_PHARMACY, $00, 0 + map_attributes CianwoodPhotoStudio, CIANWOOD_PHOTO_STUDIO, $00, 0 + map_attributes CianwoodLugiaSpeechHouse, CIANWOOD_LUGIA_SPEECH_HOUSE, $00, 0 + map_attributes PokeSeersHouse, POKE_SEERS_HOUSE, $00, 0 + map_attributes BattleTower1F, BATTLE_TOWER_1F, $00, 0 + map_attributes BattleTowerBattleRoom, BATTLE_TOWER_BATTLE_ROOM, $00, 0 + map_attributes BattleTowerElevator, BATTLE_TOWER_ELEVATOR, $00, 0 + map_attributes BattleTowerHallway, BATTLE_TOWER_HALLWAY, $00, 0 + map_attributes Route40BattleTowerGate, ROUTE_40_BATTLE_TOWER_GATE, $00, 0 + map_attributes BattleTowerOutside, BATTLE_TOWER_OUTSIDE, $05, 0 + map_attributes ViridianGym, VIRIDIAN_GYM, $00, 0 + map_attributes ViridianNicknameSpeechHouse, VIRIDIAN_NICKNAME_SPEECH_HOUSE, $00, 0 + map_attributes TrainerHouse1F, TRAINER_HOUSE_1F, $00, 0 + map_attributes TrainerHouseB1F, TRAINER_HOUSE_B1F, $00, 0 + map_attributes ViridianMart, VIRIDIAN_MART, $00, 0 + map_attributes ViridianPokecenter1F, VIRIDIAN_POKECENTER_1F, $00, 0 + map_attributes ViridianPokecenter2FBeta, VIRIDIAN_POKECENTER_2F_BETA, $00, 0 + map_attributes Route2NuggetHouse, ROUTE_2_NUGGET_HOUSE, $00, 0 + map_attributes Route2Gate, ROUTE_2_GATE, $00, 0 + map_attributes VictoryRoadGate, VICTORY_ROAD_GATE, $00, 0 + map_attributes ElmsLab, ELMS_LAB, $00, 0 + map_attributes PlayersHouse1F, PLAYERS_HOUSE_1F, $00, 0 + map_attributes PlayersHouse2F, PLAYERS_HOUSE_2F, $00, 0 + map_attributes PlayersNeighborsHouse, PLAYERS_NEIGHBORS_HOUSE, $00, 0 + map_attributes ElmsHouse, ELMS_HOUSE, $00, 0 + map_attributes Route26HealHouse, ROUTE_26_HEAL_HOUSE, $00, 0 + map_attributes DayOfWeekSiblingsHouse, DAY_OF_WEEK_SIBLINGS_HOUSE, $00, 0 + map_attributes Route27SandstormHouse, ROUTE_27_SANDSTORM_HOUSE, $00, 0 + map_attributes Route29Route46Gate, ROUTE_29_ROUTE_46_GATE, $00, 0 + map_attributes FightingDojo, FIGHTING_DOJO, $00, 0 + map_attributes SaffronGym, SAFFRON_GYM, $00, 0 + map_attributes SaffronMart, SAFFRON_MART, $00, 0 + map_attributes SaffronPokecenter1F, SAFFRON_POKECENTER_1F, $00, 0 + map_attributes SaffronPokecenter2FBeta, SAFFRON_POKECENTER_2F_BETA, $00, 0 + map_attributes MrPsychicsHouse, MR_PSYCHICS_HOUSE, $00, 0 + map_attributes SaffronMagnetTrainStation, SAFFRON_MAGNET_TRAIN_STATION, $00, 0 + map_attributes SilphCo1F, SILPH_CO_1F, $00, 0 + map_attributes CopycatsHouse1F, COPYCATS_HOUSE_1F, $00, 0 + map_attributes CopycatsHouse2F, COPYCATS_HOUSE_2F, $00, 0 + map_attributes Route5UndergroundPathEntrance, ROUTE_5_UNDERGROUND_PATH_ENTRANCE, $00, 0 + map_attributes Route5SaffronGate, ROUTE_5_SAFFRON_GATE, $00, 0 + map_attributes Route5CleanseTagHouse, ROUTE_5_CLEANSE_TAG_HOUSE, $00, 0 + map_attributes CherrygroveMart, CHERRYGROVE_MART, $00, 0 + map_attributes CherrygrovePokecenter1F, CHERRYGROVE_POKECENTER_1F, $00, 0 + map_attributes CherrygroveGymSpeechHouse, CHERRYGROVE_GYM_SPEECH_HOUSE, $00, 0 + map_attributes GuideGentsHouse, GUIDE_GENTS_HOUSE, $00, 0 + map_attributes CherrygroveEvolutionSpeechHouse, CHERRYGROVE_EVOLUTION_SPEECH_HOUSE, $00, 0 + map_attributes Route30BerryHouse, ROUTE_30_BERRY_HOUSE, $00, 0 + map_attributes MrPokemonsHouse, MR_POKEMONS_HOUSE, $00, 0 + map_attributes Route31VioletGate, ROUTE_31_VIOLET_GATE, $00, 0 diff --git a/data/maps/blocks.asm b/data/maps/blocks.asm index 7f008b5b2..c4f180b8f 100644 --- a/data/maps/blocks.asm +++ b/data/maps/blocks.asm @@ -165,20 +165,20 @@ CharcoalKiln_Blocks: LakeOfRageHiddenPowerHouse_Blocks: LakeOfRageMagikarpHouse_Blocks: GoldenrodHappinessRater_Blocks: -GoldenrodBillsHouse_Blocks: +BillsFamilysHouse_Blocks: GoldenrodPPSpeechHouse_Blocks: GoldenrodNameRater_Blocks: -VermilionHouseFishingSpeechHouse_Blocks: +VermilionFishingSpeechHouse_Blocks: VermilionMagnetTrainSpeechHouse_Blocks: -VermilionHouseDiglettsCaveSpeechHouse_Blocks: +VermilionDiglettsCaveSpeechHouse_Blocks: BluesHouse_Blocks: PewterNidoranSpeechHouse_Blocks: PewterSnoozeSpeechHouse_Blocks: -FuchsiaBillSpeechHouse_Blocks: +BillsBrothersHouse_Blocks: LavenderSpeechHouse_Blocks: LavenderNameRater_Blocks: Route12SuperRodHouse_Blocks: -Route28FamousSpeechHouse_Blocks: +Route28SteelWingHouse_Blocks: CeladonMansionRoofHouse_Blocks: Route16FuchsiaSpeechHouse_Blocks: ManiasHouse_Blocks: @@ -187,17 +187,17 @@ CianwoodPhotoStudio_Blocks: CianwoodLugiaSpeechHouse_Blocks: PokeSeersHouse_Blocks: ViridianNicknameSpeechHouse_Blocks: -Route2NuggetSpeechHouse_Blocks: -KrissNeighborsHouse_Blocks: -Route26HealSpeechHouse_Blocks: -Route26DayofWeekSiblingsHouse_Blocks: +Route2NuggetHouse_Blocks: +PlayersNeighborsHouse_Blocks: +Route26HealHouse_Blocks: +DayOfWeekSiblingsHouse_Blocks: Route27SandstormHouse_Blocks: MrPsychicsHouse_Blocks: -Route5CleanseTagSpeechHouse_Blocks: +Route5CleanseTagHouse_Blocks: CherrygroveGymSpeechHouse_Blocks: GuideGentsHouse_Blocks: CherrygroveEvolutionSpeechHouse_Blocks: -Route30BerrySpeechHouse_Blocks: +Route30BerryHouse_Blocks: INCBIN "maps/House1.blk" SafariZoneFuchsiaGateBeta_Blocks: @@ -265,8 +265,8 @@ Route43_Blocks: Route39_Blocks: INCBIN "maps/Route39.blk" -KrissHouse1F_Blocks: - INCBIN "maps/KrissHouse1F.blk" +PlayersHouse1F_Blocks: + INCBIN "maps/PlayersHouse1F.blk" Route38EcruteakGate_Blocks: Route42EcruteakGate_Blocks: @@ -806,8 +806,8 @@ GoldenrodBikeShop_Blocks: DanceTheatre_Blocks: INCBIN "maps/DanceTheatre.blk" -EcruteakHouse_Blocks: - INCBIN "maps/EcruteakHouse.blk" +EcruteakTinTowerEntrance_Blocks: + INCBIN "maps/EcruteakTinTowerEntrance.blk" GoldenrodGameCorner_Blocks: INCBIN "maps/GoldenrodGameCorner.blk" @@ -846,8 +846,8 @@ OlivineCafe_Blocks: SafariZoneMainOffice_Blocks: INCBIN "maps/OlivineCafe.blk" -KrissHouse2F_Blocks: - INCBIN "maps/KrissHouse2F.blk" +PlayersHouse2F_Blocks: + INCBIN "maps/PlayersHouse2F.blk" SaffronMagnetTrainStation_Blocks: INCBIN "maps/SaffronMagnetTrainStation.blk" @@ -1022,11 +1022,11 @@ BattleTower1F_Blocks: BattleTowerBattleRoom_Blocks: INCBIN "maps/BattleTowerBattleRoom.blk" -GoldenrodPokeComCenter2FMobile_Blocks: - INCBIN "maps/GoldenrodPokeComCenter2FMobile.blk" +PokecomCenterAdminOfficeMobile_Blocks: + INCBIN "maps/PokecomCenterAdminOfficeMobile.blk" -MobileTradeRoomMobile_Blocks: - INCBIN "maps/MobileTradeRoomMobile.blk" +MobileTradeRoom_Blocks: + INCBIN "maps/MobileTradeRoom.blk" MobileBattleRoom_Blocks: INCBIN "maps/MobileBattleRoom.blk" diff --git a/data/maps/data.asm b/data/maps/data.asm deleted file mode 100644 index 6344f0572..000000000 --- a/data/maps/data.asm +++ /dev/null @@ -1,685 +0,0 @@ -map_data: MACRO -;\1: map name -;\2: map id -;\3: border block -;\4: connections: combo of NORTH, SOUTH, WEST, and/or EAST, or 0 for none -\1_MapData:: - db \3 - db \2_HEIGHT, \2_WIDTH - db BANK(\1_Blocks) - dw \1_Blocks - db BANK(\1_MapScripts) - dw \1_MapScripts - dw \1_MapEvents - db \4 -ENDM - -connection: MACRO -if "\1" == "north" -;\2: map id -;\3: map name (eventually will be rolled into map id) -;\4: x -;\5: offset? -;\6: strip length -;\7: this map id - map \2 - dw \3_Blocks + \2_WIDTH * (\2_HEIGHT - 3) + \5 - dw wOverworldMap + \4 + 3 - db \6 - db \2_WIDTH - db \2_HEIGHT * 2 - 1 - db (\4 - \5) * -2 - dw wOverworldMap + \2_HEIGHT * (\2_WIDTH + 6) + 1 -endc - -if "\1" == "south" -;\2: map id -;\3: map name (eventually will be rolled into map id) -;\4: x -;\5: offset? -;\6: strip length -;\7: this map id - map \2 - dw \3_Blocks + \5 - dw wOverworldMap + (\7_HEIGHT + 3) * (\7_WIDTH + 6) + \4 + 3 - db \6 - db \2_WIDTH - db 0 - db (\4 - \5) * -2 - dw wOverworldMap + \2_WIDTH + 7 -endc - -if "\1" == "west" -;\2: map id -;\3: map name (eventually will be rolled into map id) -;\4: y -;\5: offset? -;\6: strip length -;\7: this map id - map \2 - dw \3_Blocks + (\2_WIDTH * \5) + \2_WIDTH - 3 - dw wOverworldMap + (\7_WIDTH + 6) * (\4 + 3) - db \6 - db \2_WIDTH - db (\4 - \5) * -2 - db \2_WIDTH * 2 - 1 - dw wOverworldMap + \2_WIDTH * 2 + 6 -endc - -if "\1" == "east" -;\2: map id -;\3: map name (eventually will be rolled into map id) -;\4: y -;\5: offset? -;\6: strip length -;\7: this map id - map \2 - dw \3_Blocks + (\2_WIDTH * \5) - dw wOverworldMap + (\7_WIDTH + 6) * (\4 + 3 + 1) - 3 - db \6 - db \2_WIDTH - db (\4 - \5) * -2 - db 0 - dw wOverworldMap + \2_WIDTH + 7 -endc -ENDM - - - map_data NewBarkTown, NEW_BARK_TOWN, $05, WEST | EAST - connection west, ROUTE_29, Route29, 0, 0, 9, NEW_BARK_TOWN - connection east, ROUTE_27, Route27, 0, 0, 9, NEW_BARK_TOWN - - map_data CherrygroveCity, CHERRYGROVE_CITY, $35, NORTH | EAST - connection north, ROUTE_30, Route30, 5, 0, 10, CHERRYGROVE_CITY - connection east, ROUTE_29, Route29, 0, 0, 9, CHERRYGROVE_CITY - - map_data VioletCity, VIOLET_CITY, $05, SOUTH | WEST | EAST - connection south, ROUTE_32, Route32, 0, 0, 10, VIOLET_CITY - connection west, ROUTE_36, Route36, 0, 0, 9, VIOLET_CITY - connection east, ROUTE_31, Route31, 9, 0, 9, VIOLET_CITY - - map_data AzaleaTown, AZALEA_TOWN, $05, WEST | EAST - connection west, ROUTE_34, Route34, -3, 15, 12, AZALEA_TOWN - connection east, ROUTE_33, Route33, 0, 0, 9, AZALEA_TOWN - - map_data CianwoodCity, CIANWOOD_CITY, $35, EAST - connection east, ROUTE_41, Route41, 0, 0, 27, CIANWOOD_CITY - - map_data GoldenrodCity, GOLDENROD_CITY, $35, NORTH | SOUTH - connection north, ROUTE_35, Route35, 5, 0, 10, GOLDENROD_CITY - connection south, ROUTE_34, Route34, 5, 0, 10, GOLDENROD_CITY - - map_data OlivineCity, OLIVINE_CITY, $35, NORTH | WEST - connection north, ROUTE_39, Route39, 5, 0, 10, OLIVINE_CITY - connection west, ROUTE_40, Route40, 9, 0, 12, OLIVINE_CITY - - map_data EcruteakCity, ECRUTEAK_CITY, $05, SOUTH | WEST | EAST - connection south, ROUTE_37, Route37, 5, 0, 10, ECRUTEAK_CITY - connection west, ROUTE_38, Route38, 5, 0, 9, ECRUTEAK_CITY - connection east, ROUTE_42, Route42, 9, 0, 9, ECRUTEAK_CITY - - map_data MahoganyTown, MAHOGANY_TOWN, $71, NORTH | WEST | EAST - connection north, ROUTE_43, Route43, 0, 0, 10, MAHOGANY_TOWN - connection west, ROUTE_42, Route42, 0, 0, 9, MAHOGANY_TOWN - connection east, ROUTE_44, Route44, 0, 0, 9, MAHOGANY_TOWN - - map_data LakeOfRage, LAKE_OF_RAGE, $05, SOUTH - connection south, ROUTE_43, Route43, 5, 0, 10, LAKE_OF_RAGE - - map_data BlackthornCity, BLACKTHORN_CITY, $71, SOUTH | WEST - connection south, ROUTE_45, Route45, 0, 0, 10, BLACKTHORN_CITY - connection west, ROUTE_44, Route44, 9, 0, 9, BLACKTHORN_CITY - - map_data SilverCaveOutside, SILVER_CAVE_OUTSIDE, $2c, EAST - connection east, ROUTE_28, Route28, 9, 0, 9, SILVER_CAVE_OUTSIDE - - map_data Route26, ROUTE_26, $05, WEST - connection west, ROUTE_27, Route27, 45, 0, 9, ROUTE_26 - - map_data Route27, ROUTE_27, $35, WEST | EAST - connection west, NEW_BARK_TOWN, NewBarkTown, 0, 0, 9, ROUTE_27 - connection east, ROUTE_26, Route26, -3, 42, 12, ROUTE_27 - - map_data Route28, ROUTE_28, $2c, WEST - connection west, SILVER_CAVE_OUTSIDE, SilverCaveOutside, -3, 6, 12, ROUTE_28 - - map_data Route29, ROUTE_29, $05, NORTH | WEST | EAST - connection north, ROUTE_46, Route46, 10, 0, 10, ROUTE_29 - connection west, CHERRYGROVE_CITY, CherrygroveCity, 0, 0, 9, ROUTE_29 - connection east, NEW_BARK_TOWN, NewBarkTown, 0, 0, 9, ROUTE_29 - - map_data Route30, ROUTE_30, $05, NORTH | SOUTH - connection north, ROUTE_31, Route31, -3, 7, 13, ROUTE_30 - connection south, CHERRYGROVE_CITY, CherrygroveCity, -3, 2, 16, ROUTE_30 - - map_data Route31, ROUTE_31, $05, SOUTH | WEST - connection south, ROUTE_30, Route30, 10, 0, 10, ROUTE_31 - connection west, VIOLET_CITY, VioletCity, -3, 6, 12, ROUTE_31 - - map_data Route32, ROUTE_32, $05, NORTH | SOUTH - connection north, VIOLET_CITY, VioletCity, 0, 0, 13, ROUTE_32 - connection south, ROUTE_33, Route33, 0, 0, 10, ROUTE_32 - - map_data Route33, ROUTE_33, $05, NORTH | WEST - connection north, ROUTE_32, Route32, 0, 0, 10, ROUTE_33 - connection west, AZALEA_TOWN, AzaleaTown, 0, 0, 9, ROUTE_33 - - map_data Route34, ROUTE_34, $05, NORTH | EAST - connection north, GOLDENROD_CITY, GoldenrodCity, -3, 2, 16, ROUTE_34 - connection east, AZALEA_TOWN, AzaleaTown, 18, 0, 9, ROUTE_34 - - map_data Route35, ROUTE_35, $05, NORTH | SOUTH - connection north, ROUTE_36, Route36, 0, 0, 13, ROUTE_35 - connection south, GOLDENROD_CITY, GoldenrodCity, -3, 2, 16, ROUTE_35 - - map_data Route36, ROUTE_36, $05, NORTH | SOUTH | EAST - connection north, ROUTE_37, Route37, 10, 0, 10, ROUTE_36 - connection south, ROUTE_35, Route35, 0, 0, 10, ROUTE_36 - connection east, VIOLET_CITY, VioletCity, 0, 0, 12, ROUTE_36 - - map_data Route37, ROUTE_37, $05, NORTH | SOUTH - connection north, ECRUTEAK_CITY, EcruteakCity, -3, 2, 16, ROUTE_37 - connection south, ROUTE_36, Route36, -3, 7, 16, ROUTE_37 - - map_data Route38, ROUTE_38, $05, WEST | EAST - connection west, ROUTE_39, Route39, 0, 0, 12, ROUTE_38 - connection east, ECRUTEAK_CITY, EcruteakCity, -3, 2, 15, ROUTE_38 - - map_data Route39, ROUTE_39, $05, SOUTH | EAST - connection south, OLIVINE_CITY, OlivineCity, -3, 2, 16, ROUTE_39 - connection east, ROUTE_38, Route38, 0, 0, 9, ROUTE_39 - - map_data Route40, ROUTE_40, $35, SOUTH | EAST - connection south, ROUTE_41, Route41, -3, 12, 13, ROUTE_40 - connection east, OLIVINE_CITY, OlivineCity, -3, 6, 12, ROUTE_40 - - map_data Route41, ROUTE_41, $35, NORTH | WEST - connection north, ROUTE_40, Route40, 15, 0, 10, ROUTE_41 - connection west, CIANWOOD_CITY, CianwoodCity, 0, 0, 27, ROUTE_41 - - map_data Route42, ROUTE_42, $05, WEST | EAST - connection west, ECRUTEAK_CITY, EcruteakCity, -3, 6, 12, ROUTE_42 - connection east, MAHOGANY_TOWN, MahoganyTown, 0, 0, 9, ROUTE_42 - - map_data Route43, ROUTE_43, $05, NORTH | SOUTH - connection north, LAKE_OF_RAGE, LakeOfRage, -3, 2, 16, ROUTE_43 - connection south, MAHOGANY_TOWN, MahoganyTown, 0, 0, 10, ROUTE_43 - - map_data Route44, ROUTE_44, $71, WEST | EAST - connection west, MAHOGANY_TOWN, MahoganyTown, 0, 0, 9, ROUTE_44 - connection east, BLACKTHORN_CITY, BlackthornCity, -3, 6, 12, ROUTE_44 - - map_data Route45, ROUTE_45, $71, NORTH | WEST - connection north, BLACKTHORN_CITY, BlackthornCity, 0, 0, 13, ROUTE_45 - connection west, ROUTE_46, Route46, 36, 0, 12, ROUTE_45 - - map_data Route46, ROUTE_46, $05, SOUTH | EAST - connection south, ROUTE_29, Route29, -3, 7, 16, ROUTE_46 - connection east, ROUTE_45, Route45, -3, 33, 12, ROUTE_46 - - map_data PewterCity, PEWTER_CITY, $0f, SOUTH | EAST - connection south, ROUTE_2, Route2, 5, 0, 10, PEWTER_CITY - connection east, ROUTE_3, Route3, 5, 0, 9, PEWTER_CITY - - map_data Route2, ROUTE_2, $0f, NORTH | SOUTH - connection north, PEWTER_CITY, PewterCity, -3, 2, 16, ROUTE_2 - connection south, VIRIDIAN_CITY, ViridianCity, -3, 2, 16, ROUTE_2 - - map_data ViridianCity, VIRIDIAN_CITY, $0f, NORTH | SOUTH | WEST - connection north, ROUTE_2, Route2, 5, 0, 10, VIRIDIAN_CITY - connection south, ROUTE_1, Route1, 10, 0, 10, VIRIDIAN_CITY - connection west, ROUTE_22, Route22, 4, 0, 9, VIRIDIAN_CITY - - map_data Route22, ROUTE_22, $2c, EAST - connection east, VIRIDIAN_CITY, ViridianCity, -3, 1, 15, ROUTE_22 - - map_data Route1, ROUTE_1, $0f, NORTH | SOUTH - connection north, VIRIDIAN_CITY, ViridianCity, -3, 7, 13, ROUTE_1 - connection south, PALLET_TOWN, PalletTown, 0, 0, 10, ROUTE_1 - - map_data PalletTown, PALLET_TOWN, $0f, NORTH | SOUTH - connection north, ROUTE_1, Route1, 0, 0, 10, PALLET_TOWN - connection south, ROUTE_21, Route21, 0, 0, 10, PALLET_TOWN - - map_data Route21, ROUTE_21, $43, NORTH | SOUTH - connection north, PALLET_TOWN, PalletTown, 0, 0, 10, ROUTE_21 - connection south, CINNABAR_ISLAND, CinnabarIsland, 0, 0, 10, ROUTE_21 - - map_data CinnabarIsland, CINNABAR_ISLAND, $43, NORTH | EAST - connection north, ROUTE_21, Route21, 0, 0, 10, CINNABAR_ISLAND - connection east, ROUTE_20, Route20, 0, 0, 9, CINNABAR_ISLAND - - map_data Route20, ROUTE_20, $43, WEST | EAST - connection west, CINNABAR_ISLAND, CinnabarIsland, 0, 0, 9, ROUTE_20 - connection east, ROUTE_19, Route19, -3, 6, 12, ROUTE_20 - - map_data Route19, ROUTE_19, $43, NORTH | WEST - connection north, FUCHSIA_CITY, FuchsiaCity, 0, 0, 13, ROUTE_19 - connection west, ROUTE_20, Route20, 9, 0, 9, ROUTE_19 - - map_data FuchsiaCity, FUCHSIA_CITY, $0f, SOUTH | WEST | EAST - connection south, ROUTE_19, Route19, 0, 0, 10, FUCHSIA_CITY - connection west, ROUTE_18, Route18, 7, 0, 9, FUCHSIA_CITY - connection east, ROUTE_15, Route15, 9, 0, 9, FUCHSIA_CITY - - map_data Route18, ROUTE_18, $43, WEST | EAST - connection west, ROUTE_17, Route17, -3, 35, 10, ROUTE_18 - connection east, FUCHSIA_CITY, FuchsiaCity, -3, 4, 14, ROUTE_18 - - map_data Route17, ROUTE_17, $43, NORTH | EAST - connection north, ROUTE_16, Route16, 0, 0, 10, ROUTE_17 - connection east, ROUTE_18, Route18, 38, 0, 9, ROUTE_17 - - map_data Route16, ROUTE_16, $0f, SOUTH | EAST - connection south, ROUTE_17, Route17, 0, 0, 10, ROUTE_16 - connection east, CELADON_CITY, CeladonCity, -3, 6, 12, ROUTE_16 - - map_data CeladonCity, CELADON_CITY, $0f, WEST | EAST - connection west, ROUTE_16, Route16, 9, 0, 9, CELADON_CITY - connection east, ROUTE_7, Route7, 5, 0, 9, CELADON_CITY - - map_data Route7, ROUTE_7, $0f, WEST | EAST - connection west, CELADON_CITY, CeladonCity, -3, 2, 15, ROUTE_7 - connection east, SAFFRON_CITY, SaffronCity, -3, 6, 12, ROUTE_7 - - map_data Route15, ROUTE_15, $0f, WEST | EAST - connection west, FUCHSIA_CITY, FuchsiaCity, -3, 6, 12, ROUTE_15 - connection east, ROUTE_14, Route14, -3, 6, 12, ROUTE_15 - - map_data Route14, ROUTE_14, $43, NORTH | WEST - connection north, ROUTE_13, Route13, 0, 0, 13, ROUTE_14 - connection west, ROUTE_15, Route15, 9, 0, 9, ROUTE_14 - - map_data Route13, ROUTE_13, $43, NORTH | SOUTH - connection north, ROUTE_12, Route12, 20, 0, 10, ROUTE_13 - connection south, ROUTE_14, Route14, 0, 0, 10, ROUTE_13 - - map_data Route12, ROUTE_12, $43, NORTH | SOUTH | WEST - connection north, LAVENDER_TOWN, LavenderTown, 0, 0, 10, ROUTE_12 - connection south, ROUTE_13, Route13, -3, 17, 13, ROUTE_12 - connection west, ROUTE_11, Route11, 9, 0, 9, ROUTE_12 - - map_data Route11, ROUTE_11, $0f, WEST | EAST - connection west, VERMILION_CITY, VermilionCity, 0, 0, 12, ROUTE_11 - connection east, ROUTE_12, Route12, -3, 6, 15, ROUTE_11 - - map_data LavenderTown, LAVENDER_TOWN, $2c, NORTH | SOUTH | WEST - connection north, ROUTE_10_SOUTH, Route10South, 0, 0, 10, LAVENDER_TOWN - connection south, ROUTE_12, Route12, 0, 0, 10, LAVENDER_TOWN - connection west, ROUTE_8, Route8, 0, 0, 9, LAVENDER_TOWN - - map_data VermilionCity, VERMILION_CITY, $43, NORTH | EAST - connection north, ROUTE_6, Route6, 5, 0, 10, VERMILION_CITY - connection east, ROUTE_11, Route11, 0, 0, 9, VERMILION_CITY - - map_data Route6, ROUTE_6, $0f, NORTH | SOUTH - connection north, SAFFRON_CITY, SaffronCity, -3, 2, 16, ROUTE_6 - connection south, VERMILION_CITY, VermilionCity, -3, 2, 16, ROUTE_6 - - map_data SaffronCity, SAFFRON_CITY, $0f, NORTH | SOUTH | WEST | EAST - connection north, ROUTE_5, Route5, 5, 0, 10, SAFFRON_CITY - connection south, ROUTE_6, Route6, 5, 0, 10, SAFFRON_CITY - connection west, ROUTE_7, Route7, 9, 0, 9, SAFFRON_CITY - connection east, ROUTE_8, Route8, 9, 0, 9, SAFFRON_CITY - - map_data Route5, ROUTE_5, $0f, NORTH | SOUTH - connection north, CERULEAN_CITY, CeruleanCity, -3, 2, 16, ROUTE_5 - connection south, SAFFRON_CITY, SaffronCity, -3, 2, 16, ROUTE_5 - - map_data CeruleanCity, CERULEAN_CITY, $0f, NORTH | SOUTH | WEST | EAST - connection north, ROUTE_24, Route24, 6, 0, 10, CERULEAN_CITY - connection south, ROUTE_5, Route5, 5, 0, 10, CERULEAN_CITY - connection west, ROUTE_4, Route4, 5, 0, 9, CERULEAN_CITY - connection east, ROUTE_9, Route9, 9, 0, 9, CERULEAN_CITY - - map_data Route9, ROUTE_9, $2c, SOUTH | WEST - connection south, ROUTE_10_NORTH, Route10North, 20, 0, 10, ROUTE_9 - connection west, CERULEAN_CITY, CeruleanCity, -3, 6, 12, ROUTE_9 - - map_data Route24, ROUTE_24, $2c, NORTH | SOUTH - connection north, ROUTE_25, Route25, 0, 0, 13, ROUTE_24 - connection south, CERULEAN_CITY, CeruleanCity, -3, 3, 16, ROUTE_24 - - map_data Route25, ROUTE_25, $2c, SOUTH - connection south, ROUTE_24, Route24, 0, 0, 10, ROUTE_25 - - map_data Route3, ROUTE_3, $2c, WEST | EAST - connection west, PEWTER_CITY, PewterCity, -3, 2, 15, ROUTE_3 - connection east, ROUTE_4, Route4, 0, 0, 9, ROUTE_3 - - map_data Route4, ROUTE_4, $2c, WEST | EAST - connection west, ROUTE_3, Route3, 0, 0, 9, ROUTE_4 - connection east, CERULEAN_CITY, CeruleanCity, -3, 2, 15, ROUTE_4 - - map_data Route8, ROUTE_8, $2c, WEST | EAST - connection west, SAFFRON_CITY, SaffronCity, -3, 6, 12, ROUTE_8 - connection east, LAVENDER_TOWN, LavenderTown, 0, 0, 9, ROUTE_8 - - map_data Route10North, ROUTE_10_NORTH, $2c, NORTH | SOUTH - connection north, ROUTE_9, Route9, -3, 17, 13, ROUTE_10_NORTH - connection south, ROUTE_10_SOUTH, Route10South, 0, 0, 10, ROUTE_10_NORTH - - map_data Route10South, ROUTE_10_SOUTH, $2c, NORTH | SOUTH - connection north, ROUTE_10_NORTH, Route10North, 0, 0, 10, ROUTE_10_SOUTH - connection south, LAVENDER_TOWN, LavenderTown, 0, 0, 10, ROUTE_10_SOUTH - - map_data Route23, ROUTE_23, $0f, 0 - map_data SproutTower1F, SPROUT_TOWER_1F, $00, 0 - map_data SproutTower2F, SPROUT_TOWER_2F, $00, 0 - map_data SproutTower3F, SPROUT_TOWER_3F, $00, 0 - map_data TinTower1F, TIN_TOWER_1F, $00, 0 - map_data TinTower2F, TIN_TOWER_2F, $00, 0 - map_data TinTower3F, TIN_TOWER_3F, $00, 0 - map_data TinTower4F, TIN_TOWER_4F, $00, 0 - map_data TinTower5F, TIN_TOWER_5F, $00, 0 - map_data TinTower6F, TIN_TOWER_6F, $00, 0 - map_data TinTower7F, TIN_TOWER_7F, $00, 0 - map_data TinTower8F, TIN_TOWER_8F, $00, 0 - map_data TinTower9F, TIN_TOWER_9F, $00, 0 - map_data BurnedTower1F, BURNED_TOWER_1F, $00, 0 - map_data BurnedTowerB1F, BURNED_TOWER_B1F, $09, 0 - map_data NationalPark, NATIONAL_PARK, $00, 0 - map_data NationalParkBugContest, NATIONAL_PARK_BUG_CONTEST, $00, 0 - map_data RadioTower1F, RADIO_TOWER_1F, $00, 0 - map_data RadioTower2F, RADIO_TOWER_2F, $00, 0 - map_data RadioTower3F, RADIO_TOWER_3F, $00, 0 - map_data RadioTower4F, RADIO_TOWER_4F, $00, 0 - map_data RadioTower5F, RADIO_TOWER_5F, $00, 0 - map_data RuinsOfAlphOutside, RUINS_OF_ALPH_OUTSIDE, $05, 0 - map_data RuinsOfAlphHoOhChamber, RUINS_OF_ALPH_HO_OH_CHAMBER, $00, 0 - map_data RuinsOfAlphKabutoChamber, RUINS_OF_ALPH_KABUTO_CHAMBER, $00, 0 - map_data RuinsOfAlphOmanyteChamber, RUINS_OF_ALPH_OMANYTE_CHAMBER, $00, 0 - map_data RuinsOfAlphAerodactylChamber, RUINS_OF_ALPH_AERODACTYL_CHAMBER, $00, 0 - map_data RuinsOfAlphInnerChamber, RUINS_OF_ALPH_INNER_CHAMBER, $00, 0 - map_data RuinsOfAlphResearchCenter, RUINS_OF_ALPH_RESEARCH_CENTER, $00, 0 - map_data RuinsOfAlphHoOhItemRoom, RUINS_OF_ALPH_HO_OH_ITEM_ROOM, $00, 0 - map_data RuinsOfAlphKabutoItemRoom, RUINS_OF_ALPH_KABUTO_ITEM_ROOM, $00, 0 - map_data RuinsOfAlphOmanyteItemRoom, RUINS_OF_ALPH_OMANYTE_ITEM_ROOM, $00, 0 - map_data RuinsOfAlphAerodactylItemRoom, RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM, $00, 0 - map_data RuinsOfAlphHoOhWordRoom, RUINS_OF_ALPH_HO_OH_WORD_ROOM, $00, 0 - map_data RuinsOfAlphKabutoWordRoom, RUINS_OF_ALPH_KABUTO_WORD_ROOM, $00, 0 - map_data RuinsOfAlphOmanyteWordRoom, RUINS_OF_ALPH_OMANYTE_WORD_ROOM, $00, 0 - map_data RuinsOfAlphAerodactylWordRoom, RUINS_OF_ALPH_AERODACTYL_WORD_ROOM, $00, 0 - map_data UnionCave1F, UNION_CAVE_1F, $09, 0 - map_data UnionCaveB1F, UNION_CAVE_B1F, $09, 0 - map_data UnionCaveB2F, UNION_CAVE_B2F, $09, 0 - map_data SlowpokeWellB1F, SLOWPOKE_WELL_B1F, $09, 0 - map_data SlowpokeWellB2F, SLOWPOKE_WELL_B2F, $09, 0 - map_data OlivineLighthouse1F, OLIVINE_LIGHTHOUSE_1F, $00, 0 - map_data OlivineLighthouse2F, OLIVINE_LIGHTHOUSE_2F, $00, 0 - map_data OlivineLighthouse3F, OLIVINE_LIGHTHOUSE_3F, $00, 0 - map_data OlivineLighthouse4F, OLIVINE_LIGHTHOUSE_4F, $00, 0 - map_data OlivineLighthouse5F, OLIVINE_LIGHTHOUSE_5F, $00, 0 - map_data OlivineLighthouse6F, OLIVINE_LIGHTHOUSE_6F, $00, 0 - map_data MahoganyMart1F, MAHOGANY_MART_1F, $00, 0 - map_data TeamRocketBaseB1F, TEAM_ROCKET_BASE_B1F, $00, 0 - map_data TeamRocketBaseB2F, TEAM_ROCKET_BASE_B2F, $00, 0 - map_data TeamRocketBaseB3F, TEAM_ROCKET_BASE_B3F, $00, 0 - map_data IlexForest, ILEX_FOREST, $05, 0 - map_data GoldenrodUnderground, GOLDENROD_UNDERGROUND, $00, 0 - map_data GoldenrodUndergroundSwitchRoomEntrances, GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, $00, 0 - map_data GoldenrodDeptStoreB1F, GOLDENROD_DEPT_STORE_B1F, $00, 0 - map_data GoldenrodUndergroundWarehouse, GOLDENROD_UNDERGROUND_WAREHOUSE, $00, 0 - map_data MountMortar1FOutside, MOUNT_MORTAR_1F_OUTSIDE, $09, 0 - map_data MountMortar1FInside, MOUNT_MORTAR_1F_INSIDE, $09, 0 - map_data MountMortar2FInside, MOUNT_MORTAR_2F_INSIDE, $09, 0 - map_data MountMortarB1F, MOUNT_MORTAR_B1F, $09, 0 - map_data IcePath1F, ICE_PATH_1F, $09, 0 - map_data IcePathB1F, ICE_PATH_B1F, $19, 0 - map_data IcePathB2FMahoganySide, ICE_PATH_B2F_MAHOGANY_SIDE, $19, 0 - map_data IcePathB2FBlackthornSide, ICE_PATH_B2F_BLACKTHORN_SIDE, $19, 0 - map_data IcePathB3F, ICE_PATH_B3F, $19, 0 - map_data WhirlIslandNW, WHIRL_ISLAND_NW, $09, 0 - map_data WhirlIslandNE, WHIRL_ISLAND_NE, $09, 0 - map_data WhirlIslandSW, WHIRL_ISLAND_SW, $09, 0 - map_data WhirlIslandCave, WHIRL_ISLAND_CAVE, $09, 0 - map_data WhirlIslandSE, WHIRL_ISLAND_SE, $0f, 0 - map_data WhirlIslandB1F, WHIRL_ISLAND_B1F, $09, 0 - map_data WhirlIslandB2F, WHIRL_ISLAND_B2F, $2e, 0 - map_data WhirlIslandLugiaChamber, WHIRL_ISLAND_LUGIA_CHAMBER, $0f, 0 - map_data SilverCaveRoom1, SILVER_CAVE_ROOM_1, $09, 0 - map_data SilverCaveRoom2, SILVER_CAVE_ROOM_2, $09, 0 - map_data SilverCaveRoom3, SILVER_CAVE_ROOM_3, $09, 0 - map_data SilverCaveItemRooms, SILVER_CAVE_ITEM_ROOMS, $09, 0 - map_data DarkCaveVioletEntrance, DARK_CAVE_VIOLET_ENTRANCE, $09, 0 - map_data DarkCaveBlackthornEntrance, DARK_CAVE_BLACKTHORN_ENTRANCE, $09, 0 - map_data DragonsDen1F, DRAGONS_DEN_1F, $09, 0 - map_data DragonsDenB1F, DRAGONS_DEN_B1F, $71, 0 - map_data DragonShrine, DRAGON_SHRINE, $00, 0 - map_data TohjoFalls, TOHJO_FALLS, $09, 0 - map_data OlivinePokecenter1F, OLIVINE_POKECENTER_1F, $00, 0 - map_data OlivineGym, OLIVINE_GYM, $00, 0 - map_data OlivineTimsHouse, OLIVINE_TIMS_HOUSE, $00, 0 - map_data OlivineHouseBeta, OLIVINE_HOUSE_BETA, $00, 0 - map_data OlivinePunishmentSpeechHouse, OLIVINE_PUNISHMENT_SPEECH_HOUSE, $00, 0 - map_data OlivineGoodRodHouse, OLIVINE_GOOD_ROD_HOUSE, $00, 0 - map_data OlivineCafe, OLIVINE_CAFE, $00, 0 - map_data OlivineMart, OLIVINE_MART, $00, 0 - map_data Route38EcruteakGate, ROUTE_38_ECRUTEAK_GATE, $00, 0 - map_data Route39Barn, ROUTE_39_BARN, $00, 0 - map_data Route39Farmhouse, ROUTE_39_FARMHOUSE, $00, 0 - map_data MahoganyRedGyaradosSpeechHouse, MAHOGANY_RED_GYARADOS_SPEECH_HOUSE, $00, 0 - map_data MahoganyGym, MAHOGANY_GYM, $00, 0 - map_data MahoganyPokecenter1F, MAHOGANY_POKECENTER_1F, $00, 0 - map_data Route42EcruteakGate, ROUTE_42_ECRUTEAK_GATE, $00, 0 - map_data DiglettsCave, DIGLETTS_CAVE, $09, 0 - map_data MountMoon, MOUNT_MOON, $09, 0 - map_data UndergroundPath, UNDERGROUND_PATH, $00, 0 - map_data RockTunnel1F, ROCK_TUNNEL_1F, $09, 0 - map_data RockTunnelB1F, ROCK_TUNNEL_B1F, $09, 0 - map_data SafariZoneFuchsiaGateBeta, SAFARI_ZONE_FUCHSIA_GATE_BETA, $00, 0 - map_data SafariZoneBeta, SAFARI_ZONE_BETA, $13, 0 - map_data VictoryRoad, VICTORY_ROAD, $1d, 0 - map_data EcruteakHouse, ECRUTEAK_HOUSE, $00, 0 - map_data WiseTriosRoom, WISE_TRIOS_ROOM, $00, 0 - map_data EcruteakPokecenter1F, ECRUTEAK_POKECENTER_1F, $00, 0 - map_data EcruteakLugiaSpeechHouse, ECRUTEAK_LUGIA_SPEECH_HOUSE, $00, 0 - map_data DanceTheatre, DANCE_THEATRE, $00, 0 - map_data EcruteakMart, ECRUTEAK_MART, $00, 0 - map_data EcruteakGym, ECRUTEAK_GYM, $00, 0 - map_data EcruteakItemfinderHouse, ECRUTEAK_ITEMFINDER_HOUSE, $00, 0 - map_data BlackthornGym1F, BLACKTHORN_GYM_1F, $00, 0 - map_data BlackthornGym2F, BLACKTHORN_GYM_2F, $00, 0 - map_data BlackthornDragonSpeechHouse, BLACKTHORN_DRAGON_SPEECH_HOUSE, $00, 0 - map_data BlackthornEmysHouse, BLACKTHORN_EMYS_HOUSE, $00, 0 - map_data BlackthornMart, BLACKTHORN_MART, $00, 0 - map_data BlackthornPokecenter1F, BLACKTHORN_POKECENTER_1F, $00, 0 - map_data MoveDeletersHouse, MOVE_DELETERS_HOUSE, $00, 0 - map_data CinnabarPokecenter1F, CINNABAR_POKECENTER_1F, $00, 0 - map_data CinnabarPokecenter2FBeta, CINNABAR_POKECENTER_2F_BETA, $00, 0 - map_data Route19FuchsiaGate, ROUTE_19_FUCHSIA_GATE, $00, 0 - map_data SeafoamGym, SEAFOAM_GYM, $09, 0 - map_data CeruleanGymBadgeSpeechHouse, CERULEAN_GYM_BADGE_SPEECH_HOUSE, $00, 0 - map_data CeruleanPoliceStation, CERULEAN_POLICE_STATION, $00, 0 - map_data CeruleanTradeSpeechHouse, CERULEAN_TRADE_SPEECH_HOUSE, $00, 0 - map_data CeruleanPokecenter1F, CERULEAN_POKECENTER_1F, $00, 0 - map_data CeruleanPokecenter2FBeta, CERULEAN_POKECENTER_2F_BETA, $00, 0 - map_data CeruleanGym, CERULEAN_GYM, $00, 0 - map_data CeruleanMart, CERULEAN_MART, $00, 0 - map_data Route10Pokecenter1F, ROUTE_10_POKECENTER_1F, $00, 0 - map_data Route10Pokecenter2FBeta, ROUTE_10_POKECENTER_2F_BETA, $00, 0 - map_data PowerPlant, POWER_PLANT, $00, 0 - map_data BillsHouse, BILLS_HOUSE, $00, 0 - map_data AzaleaPokecenter1F, AZALEA_POKECENTER_1F, $00, 0 - map_data CharcoalKiln, CHARCOAL_KILN, $00, 0 - map_data AzaleaMart, AZALEA_MART, $00, 0 - map_data KurtsHouse, KURTS_HOUSE, $00, 0 - map_data AzaleaGym, AZALEA_GYM, $00, 0 - map_data LakeOfRageHiddenPowerHouse, LAKE_OF_RAGE_HIDDEN_POWER_HOUSE, $00, 0 - map_data LakeOfRageMagikarpHouse, LAKE_OF_RAGE_MAGIKARP_HOUSE, $00, 0 - map_data Route43MahoganyGate, ROUTE_43_MAHOGANY_GATE, $00, 0 - map_data Route43Gate, ROUTE_43_GATE, $00, 0 - map_data VioletMart, VIOLET_MART, $00, 0 - map_data VioletGym, VIOLET_GYM, $00, 0 - map_data EarlsPokemonAcademy, EARLS_POKEMON_ACADEMY, $00, 0 - map_data VioletNicknameSpeechHouse, VIOLET_NICKNAME_SPEECH_HOUSE, $00, 0 - map_data VioletPokecenter1F, VIOLET_POKECENTER_1F, $00, 0 - map_data VioletKylesHouse, VIOLET_KYLES_HOUSE, $00, 0 - map_data Route32RuinsOfAlphGate, ROUTE_32_RUINS_OF_ALPH_GATE, $00, 0 - map_data Route32Pokecenter1F, ROUTE_32_POKECENTER_1F, $00, 0 - map_data Route35GoldenrodGate, ROUTE_35_GOLDENROD_GATE, $00, 0 - map_data Route35NationalParkGate, ROUTE_35_NATIONAL_PARK_GATE, $00, 0 - map_data Route36RuinsOfAlphGate, ROUTE_36_RUINS_OF_ALPH_GATE, $00, 0 - map_data Route36NationalParkGate, ROUTE_36_NATIONAL_PARK_GATE, $00, 0 - map_data GoldenrodGym, GOLDENROD_GYM, $00, 0 - map_data GoldenrodBikeShop, GOLDENROD_BIKE_SHOP, $00, 0 - map_data GoldenrodHappinessRater, GOLDENROD_HAPPINESS_RATER, $00, 0 - map_data GoldenrodBillsHouse, GOLDENROD_BILLS_HOUSE, $00, 0 - map_data GoldenrodMagnetTrainStation, GOLDENROD_MAGNET_TRAIN_STATION, $00, 0 - map_data GoldenrodFlowerShop, GOLDENROD_FLOWER_SHOP, $00, 0 - map_data GoldenrodPPSpeechHouse, GOLDENROD_PP_SPEECH_HOUSE, $00, 0 - map_data GoldenrodNameRater, GOLDENROD_NAME_RATER, $00, 0 - map_data GoldenrodDeptStore1F, GOLDENROD_DEPT_STORE_1F, $00, 0 - map_data GoldenrodDeptStore2F, GOLDENROD_DEPT_STORE_2F, $00, 0 - map_data GoldenrodDeptStore3F, GOLDENROD_DEPT_STORE_3F, $00, 0 - map_data GoldenrodDeptStore4F, GOLDENROD_DEPT_STORE_4F, $00, 0 - map_data GoldenrodDeptStore5F, GOLDENROD_DEPT_STORE_5F, $00, 0 - map_data GoldenrodDeptStore6F, GOLDENROD_DEPT_STORE_6F, $00, 0 - map_data GoldenrodDeptStoreElevator, GOLDENROD_DEPT_STORE_ELEVATOR, $00, 0 - map_data GoldenrodDeptStoreRoof, GOLDENROD_DEPT_STORE_ROOF, $24, 0 - map_data GoldenrodGameCorner, GOLDENROD_GAME_CORNER, $00, 0 - map_data GoldenrodPokecenter1F, GOLDENROD_POKECENTER_1F, $00, 0 - map_data GoldenrodPokeComCenter2FMobile, GOLDENROD_POKECOM_CENTER_2F_MOBILE, $00, 0 - map_data IlexForestAzaleaGate, ILEX_FOREST_AZALEA_GATE, $00, 0 - map_data Route34IlexForestGate, ROUTE_34_ILEX_FOREST_GATE, $00, 0 - map_data DayCare, DAY_CARE, $00, 0 - map_data VermilionHouseFishingSpeechHouse, VERMILION_HOUSE_FISHING_SPEECH_HOUSE, $00, 0 - map_data VermilionPokecenter1F, VERMILION_POKECENTER_1F, $00, 0 - map_data VermilionPokecenter2FBeta, VERMILION_POKECENTER_2F_BETA, $00, 0 - map_data PokemonFanClub, POKEMON_FAN_CLUB, $00, 0 - map_data VermilionMagnetTrainSpeechHouse, VERMILION_MAGNET_TRAIN_SPEECH_HOUSE, $00, 0 - map_data VermilionMart, VERMILION_MART, $00, 0 - map_data VermilionHouseDiglettsCaveSpeechHouse, VERMILION_HOUSE_DIGLETTS_CAVE_SPEECH_HOUSE, $00, 0 - map_data VermilionGym, VERMILION_GYM, $00, 0 - map_data Route6SaffronGate, ROUTE_6_SAFFRON_GATE, $00, 0 - map_data Route6UndergroundPathEntrance, ROUTE_6_UNDERGROUND_PATH_ENTRANCE, $00, 0 - map_data RedsHouse1F, REDS_HOUSE_1F, $00, 0 - map_data RedsHouse2F, REDS_HOUSE_2F, $00, 0 - map_data BluesHouse, BLUES_HOUSE, $00, 0 - map_data OaksLab, OAKS_LAB, $00, 0 - map_data PewterNidoranSpeechHouse, PEWTER_NIDORAN_SPEECH_HOUSE, $00, 0 - map_data PewterGym, PEWTER_GYM, $00, 0 - map_data PewterMart, PEWTER_MART, $00, 0 - map_data PewterPokecenter1F, PEWTER_POKECENTER_1F, $00, 0 - map_data PewterPokecenter2FBeta, PEWTER_POKECENTER_2F_BETA, $00, 0 - map_data PewterSnoozeSpeechHouse, PEWTER_SNOOZE_SPEECH_HOUSE, $00, 0 - map_data OlivinePort, OLIVINE_PORT, $0a, 0 - map_data VermilionPort, VERMILION_PORT, $0a, 0 - map_data FastShip1F, FAST_SHIP_1F, $00, 0 - map_data FastShipCabins_NNW_NNE_NE, FAST_SHIP_CABINS_NNW_NNE_NE, $00, 0 - map_data FastShipCabins_SW_SSW_NW, FAST_SHIP_CABINS_SW_SSW_NW, $00, 0 - map_data FastShipCabins_SE_SSE_CaptainsCabin, FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN, $00, 0 - map_data FastShipB1F, FAST_SHIP_B1F, $00, 0 - map_data OlivinePortPassage, OLIVINE_PORT_PASSAGE, $00, 0 - map_data VermilionPortPassage, VERMILION_PORT_PASSAGE, $00, 0 - map_data MountMoonSquare, MOUNT_MOON_SQUARE, $2d, 0 - map_data MountMoonGiftShop, MOUNT_MOON_GIFT_SHOP, $00, 0 - map_data TinTowerRoof, TIN_TOWER_ROOF, $00, 0 - map_data IndigoPlateauPokecenter1F, INDIGO_PLATEAU_POKECENTER_1F, $00, 0 - map_data WillsRoom, WILLS_ROOM, $00, 0 - map_data KogasRoom, KOGAS_ROOM, $00, 0 - map_data BrunosRoom, BRUNOS_ROOM, $00, 0 - map_data KarensRoom, KARENS_ROOM, $00, 0 - map_data LancesRoom, LANCES_ROOM, $00, 0 - map_data HallOfFame, HALL_OF_FAME, $00, 0 - map_data FuchsiaMart, FUCHSIA_MART, $00, 0 - map_data SafariZoneMainOffice, SAFARI_ZONE_MAIN_OFFICE, $00, 0 - map_data FuchsiaGym, FUCHSIA_GYM, $00, 0 - map_data FuchsiaBillSpeechHouse, FUCHSIA_BILL_SPEECH_HOUSE, $00, 0 - map_data FuchsiaPokecenter1F, FUCHSIA_POKECENTER_1F, $00, 0 - map_data FuchsiaPokecenter2FBeta, FUCHSIA_POKECENTER_2F_BETA, $00, 0 - map_data SafariZoneWardensHome, SAFARI_ZONE_WARDENS_HOME, $00, 0 - map_data Route15FuchsiaGate, ROUTE_15_FUCHSIA_GATE, $00, 0 - map_data LavenderPokecenter1F, LAVENDER_POKECENTER_1F, $00, 0 - map_data LavenderPokecenter2FBeta, LAVENDER_POKECENTER_2F_BETA, $00, 0 - map_data MrFujisHouse, MR_FUJIS_HOUSE, $00, 0 - map_data LavenderSpeechHouse, LAVENDER_SPEECH_HOUSE, $00, 0 - map_data LavenderNameRater, LAVENDER_NAME_RATER, $00, 0 - map_data LavenderMart, LAVENDER_MART, $00, 0 - map_data SoulHouse, SOUL_HOUSE, $00, 0 - map_data LavRadioTower1F, LAV_RADIO_TOWER_1F, $00, 0 - map_data Route8SaffronGate, ROUTE_8_SAFFRON_GATE, $00, 0 - map_data Route12SuperRodHouse, ROUTE_12_SUPER_ROD_HOUSE, $00, 0 - map_data SilverCavePokecenter1F, SILVER_CAVE_POKECENTER_1F, $00, 0 - map_data Route28FamousSpeechHouse, ROUTE_28_FAMOUS_SPEECH_HOUSE, $00, 0 - map_data Pokecenter2F, POKECENTER_2F, $00, 0 - map_data TradeCenter, TRADE_CENTER, $00, 0 - map_data Colosseum, COLOSSEUM, $00, 0 - map_data TimeCapsule, TIME_CAPSULE, $00, 0 - map_data MobileTradeRoomMobile, MOBILE_TRADE_ROOM_MOBILE, $00, 0 - map_data MobileBattleRoom, MOBILE_BATTLE_ROOM, $00, 0 - map_data CeladonDeptStore1F, CELADON_DEPT_STORE_1F, $00, 0 - map_data CeladonDeptStore2F, CELADON_DEPT_STORE_2F, $00, 0 - map_data CeladonDeptStore3F, CELADON_DEPT_STORE_3F, $00, 0 - map_data CeladonDeptStore4F, CELADON_DEPT_STORE_4F, $00, 0 - map_data CeladonDeptStore5F, CELADON_DEPT_STORE_5F, $00, 0 - map_data CeladonDeptStore6F, CELADON_DEPT_STORE_6F, $00, 0 - map_data CeladonDeptStoreElevator, CELADON_DEPT_STORE_ELEVATOR, $00, 0 - map_data CeladonMansion1F, CELADON_MANSION_1F, $00, 0 - map_data CeladonMansion2F, CELADON_MANSION_2F, $00, 0 - map_data CeladonMansion3F, CELADON_MANSION_3F, $00, 0 - map_data CeladonMansionRoof, CELADON_MANSION_ROOF, $01, 0 - map_data CeladonMansionRoofHouse, CELADON_MANSION_ROOF_HOUSE, $00, 0 - map_data CeladonPokecenter1F, CELADON_POKECENTER_1F, $00, 0 - map_data CeladonPokecenter2FBeta, CELADON_POKECENTER_2F_BETA, $00, 0 - map_data CeladonGameCorner, CELADON_GAME_CORNER, $00, 0 - map_data CeladonGameCornerPrizeRoom, CELADON_GAME_CORNER_PRIZE_ROOM, $00, 0 - map_data CeladonGym, CELADON_GYM, $00, 0 - map_data CeladonCafe, CELADON_CAFE, $00, 0 - map_data Route16FuchsiaSpeechHouse, ROUTE_16_FUCHSIA_SPEECH_HOUSE, $00, 0 - map_data Route16Gate, ROUTE_16_GATE, $00, 0 - map_data Route7SaffronGate, ROUTE_7_SAFFRON_GATE, $00, 0 - map_data Route17Route18Gate, ROUTE_17_ROUTE_18_GATE, $00, 0 - map_data ManiasHouse, MANIAS_HOUSE, $00, 0 - map_data CianwoodGym, CIANWOOD_GYM, $00, 0 - map_data CianwoodPokecenter1F, CIANWOOD_POKECENTER_1F, $00, 0 - map_data CianwoodPharmacy, CIANWOOD_PHARMACY, $00, 0 - map_data CianwoodPhotoStudio, CIANWOOD_PHOTO_STUDIO, $00, 0 - map_data CianwoodLugiaSpeechHouse, CIANWOOD_LUGIA_SPEECH_HOUSE, $00, 0 - map_data PokeSeersHouse, POKE_SEERS_HOUSE, $00, 0 - map_data BattleTower1F, BATTLE_TOWER_1F, $00, 0 - map_data BattleTowerBattleRoom, BATTLE_TOWER_BATTLE_ROOM, $00, 0 - map_data BattleTowerElevator, BATTLE_TOWER_ELEVATOR, $00, 0 - map_data BattleTowerHallway, BATTLE_TOWER_HALLWAY, $00, 0 - map_data Route40BattleTowerGate, ROUTE_40_BATTLE_TOWER_GATE, $00, 0 - map_data BattleTowerOutside, BATTLE_TOWER_OUTSIDE, $05, 0 - map_data ViridianGym, VIRIDIAN_GYM, $00, 0 - map_data ViridianNicknameSpeechHouse, VIRIDIAN_NICKNAME_SPEECH_HOUSE, $00, 0 - map_data TrainerHouse1F, TRAINER_HOUSE_1F, $00, 0 - map_data TrainerHouseB1F, TRAINER_HOUSE_B1F, $00, 0 - map_data ViridianMart, VIRIDIAN_MART, $00, 0 - map_data ViridianPokecenter1F, VIRIDIAN_POKECENTER_1F, $00, 0 - map_data ViridianPokecenter2FBeta, VIRIDIAN_POKECENTER_2F_BETA, $00, 0 - map_data Route2NuggetSpeechHouse, ROUTE_2_NUGGET_SPEECH_HOUSE, $00, 0 - map_data Route2Gate, ROUTE_2_GATE, $00, 0 - map_data VictoryRoadGate, VICTORY_ROAD_GATE, $00, 0 - map_data ElmsLab, ELMS_LAB, $00, 0 - map_data KrissHouse1F, KRISS_HOUSE_1F, $00, 0 - map_data KrissHouse2F, KRISS_HOUSE_2F, $00, 0 - map_data KrissNeighborsHouse, KRISS_NEIGHBORS_HOUSE, $00, 0 - map_data ElmsHouse, ELMS_HOUSE, $00, 0 - map_data Route26HealSpeechHouse, ROUTE_26_HEAL_SPEECH_HOUSE, $00, 0 - map_data Route26DayofWeekSiblingsHouse, ROUTE_26_DAY_OF_WEEK_SIBLINGS_HOUSE, $00, 0 - map_data Route27SandstormHouse, ROUTE_27_SANDSTORM_HOUSE, $00, 0 - map_data Route29Route46Gate, ROUTE_29_ROUTE_46_GATE, $00, 0 - map_data FightingDojo, FIGHTING_DOJO, $00, 0 - map_data SaffronGym, SAFFRON_GYM, $00, 0 - map_data SaffronMart, SAFFRON_MART, $00, 0 - map_data SaffronPokecenter1F, SAFFRON_POKECENTER_1F, $00, 0 - map_data SaffronPokecenter2FBeta, SAFFRON_POKECENTER_2F_BETA, $00, 0 - map_data MrPsychicsHouse, MR_PSYCHICS_HOUSE, $00, 0 - map_data SaffronMagnetTrainStation, SAFFRON_MAGNET_TRAIN_STATION, $00, 0 - map_data SilphCo1F, SILPH_CO_1F, $00, 0 - map_data CopycatsHouse1F, COPYCATS_HOUSE_1F, $00, 0 - map_data CopycatsHouse2F, COPYCATS_HOUSE_2F, $00, 0 - map_data Route5UndergroundPathEntrance, ROUTE_5_UNDERGROUND_PATH_ENTRANCE, $00, 0 - map_data Route5SaffronGate, ROUTE_5_SAFFRON_GATE, $00, 0 - map_data Route5CleanseTagSpeechHouse, ROUTE_5_CLEANSE_TAG_SPEECH_HOUSE, $00, 0 - map_data CherrygroveMart, CHERRYGROVE_MART, $00, 0 - map_data CherrygrovePokecenter1F, CHERRYGROVE_POKECENTER_1F, $00, 0 - map_data CherrygroveGymSpeechHouse, CHERRYGROVE_GYM_SPEECH_HOUSE, $00, 0 - map_data GuideGentsHouse, GUIDE_GENTS_HOUSE, $00, 0 - map_data CherrygroveEvolutionSpeechHouse, CHERRYGROVE_EVOLUTION_SPEECH_HOUSE, $00, 0 - map_data Route30BerrySpeechHouse, ROUTE_30_BERRY_SPEECH_HOUSE, $00, 0 - map_data MrPokemonsHouse, MR_POKEMONS_HOUSE, $00, 0 - map_data Route31VioletGate, ROUTE_31_VIOLET_GATE, $00, 0 diff --git a/data/maps/definitions.asm b/data/maps/definitions.asm deleted file mode 100644 index 44cb85ac6..000000000 --- a/data/maps/definitions.asm +++ /dev/null @@ -1,485 +0,0 @@ -map_def: MACRO -;\1: map name: for the MapData pointer (see data/maps/data.asm) -;\2: tileset: a TILESET_* constant -;\3: environment: TOWN, ROUTE, INDOOR, CAVE, ENVIRONMENT_5, GATE, or DUNGEON -;\4: location: from constants/landmark_constants.asm -;\5: music: a MUSIC_* constant -;\6: phone service flag: TRUE to prevent phone calls -;\7: time of day: a PALETTE_* constant -;\8: fishing group: a FISHGROUP_* constant - db BANK(\1_MapData), \2, \3 - dw \1_MapData - db \4, \5 - dn \6, \7 - db \8 -ENDM - -MapGroupPointers:: -; pointers to the first map header of each map group - dw MapGroup_Olivine ; 1 - dw MapGroup_Mahogany ; 2 - dw MapGroup_Dungeons ; 3 - dw MapGroup_Ecruteak ; 4 - dw MapGroup_Blackthorn ; 5 - dw MapGroup_Cinnabar ; 6 - dw MapGroup_Cerulean ; 7 - dw MapGroup_Azalea ; 8 - dw MapGroup_LakeOfRage ; 9 - dw MapGroup_Violet ; 10 - dw MapGroup_Goldenrod ; 11 - dw MapGroup_Vermilion ; 12 - dw MapGroup_Pallet ; 13 - dw MapGroup_Pewter ; 14 - dw MapGroup_FastShip ; 15 - dw MapGroup_Indigo ; 16 - dw MapGroup_Fuchsia ; 17 - dw MapGroup_Lavender ; 18 - dw MapGroup_Silver ; 19 - dw MapGroup_CableClub ; 20 - dw MapGroup_Celadon ; 21 - dw MapGroup_Cianwood ; 22 - dw MapGroup_Viridian ; 23 - dw MapGroup_NewBark ; 24 - dw MapGroup_Saffron ; 25 - dw MapGroup_Cherrygrove ; 26 - - -MapGroup_Olivine: - map_def OlivinePokecenter1F, TILESET_POKECENTER, INDOOR, OLIVINE_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def OlivineGym, TILESET_CHAMPIONS_ROOM, INDOOR, OLIVINE_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE - map_def OlivineTimsHouse, TILESET_HOUSE, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def OlivineHouseBeta, TILESET_HOUSE, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def OlivinePunishmentSpeechHouse, TILESET_HOUSE, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def OlivineGoodRodHouse, TILESET_HOUSE, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def OlivineCafe, TILESET_GAME_CORNER, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def OlivineMart, TILESET_MART, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def Route38EcruteakGate, TILESET_GATE, GATE, ROUTE_38, MUSIC_ROUTE_37, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def Route39Barn, TILESET_TRADITIONAL_HOUSE, INDOOR, ROUTE_39, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def Route39Farmhouse, TILESET_HOUSE, INDOOR, ROUTE_39, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def Route38, TILESET_JOHTO, ROUTE, ROUTE_38, MUSIC_ROUTE_37, FALSE, PALETTE_AUTO, FISHGROUP_SHORE - map_def Route39, TILESET_JOHTO, ROUTE, ROUTE_39, MUSIC_ROUTE_37, FALSE, PALETTE_AUTO, FISHGROUP_SHORE - map_def OlivineCity, TILESET_JOHTO, TOWN, OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE - -MapGroup_Mahogany: - map_def MahoganyRedGyaradosSpeechHouse, TILESET_HOUSE, INDOOR, MAHOGANY_TOWN, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def MahoganyGym, TILESET_ELITE_FOUR_ROOM, INDOOR, MAHOGANY_TOWN, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE - map_def MahoganyPokecenter1F, TILESET_POKECENTER, INDOOR, MAHOGANY_TOWN, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def Route42EcruteakGate, TILESET_GATE, GATE, ROUTE_42, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def Route42, TILESET_JOHTO, ROUTE, ROUTE_42, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_LAKE - map_def Route44, TILESET_JOHTO, ROUTE, ROUTE_44, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_POND - map_def MahoganyTown, TILESET_JOHTO, TOWN, MAHOGANY_TOWN, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE - -MapGroup_Dungeons: - map_def SproutTower1F, TILESET_TOWER, DUNGEON, SPROUT_TOWER, MUSIC_SPROUT_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def SproutTower2F, TILESET_TOWER, DUNGEON, SPROUT_TOWER, MUSIC_SPROUT_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def SproutTower3F, TILESET_TOWER, DUNGEON, SPROUT_TOWER, MUSIC_SPROUT_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def TinTower1F, TILESET_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def TinTower2F, TILESET_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def TinTower3F, TILESET_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def TinTower4F, TILESET_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def TinTower5F, TILESET_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def TinTower6F, TILESET_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def TinTower7F, TILESET_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def TinTower8F, TILESET_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def TinTower9F, TILESET_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def BurnedTower1F, TILESET_TOWER, DUNGEON, BURNED_TOWER, MUSIC_BURNED_TOWER, TRUE, PALETTE_NITE, FISHGROUP_SHORE - map_def BurnedTowerB1F, TILESET_CAVE, CAVE, BURNED_TOWER, MUSIC_BURNED_TOWER, TRUE, PALETTE_NITE, FISHGROUP_SHORE - map_def NationalPark, TILESET_PARK, ROUTE, NATIONAL_PARK, MUSIC_NATIONAL_PARK, FALSE, PALETTE_AUTO, FISHGROUP_SHORE - map_def NationalParkBugContest, TILESET_PARK, ROUTE, NATIONAL_PARK, MUSIC_BUG_CATCHING_CONTEST, FALSE, PALETTE_AUTO, FISHGROUP_SHORE - map_def RadioTower1F, TILESET_RADIO_TOWER, INDOOR, RADIO_TOWER, RADIO_TOWER_MUSIC | MUSIC_GOLDENROD_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE - map_def RadioTower2F, TILESET_RADIO_TOWER, INDOOR, RADIO_TOWER, RADIO_TOWER_MUSIC | MUSIC_GOLDENROD_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE - map_def RadioTower3F, TILESET_RADIO_TOWER, INDOOR, RADIO_TOWER, RADIO_TOWER_MUSIC | MUSIC_GOLDENROD_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE - map_def RadioTower4F, TILESET_RADIO_TOWER, INDOOR, RADIO_TOWER, RADIO_TOWER_MUSIC | MUSIC_GOLDENROD_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE - map_def RadioTower5F, TILESET_RADIO_TOWER, INDOOR, RADIO_TOWER, RADIO_TOWER_MUSIC | MUSIC_GOLDENROD_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE - map_def RuinsOfAlphOutside, TILESET_JOHTO, ROUTE, RUINS_OF_ALPH, MUSIC_UNION_CAVE, FALSE, PALETTE_AUTO, FISHGROUP_POND - map_def RuinsOfAlphHoOhChamber, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE - map_def RuinsOfAlphKabutoChamber, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE - map_def RuinsOfAlphOmanyteChamber, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE - map_def RuinsOfAlphAerodactylChamber, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE - map_def RuinsOfAlphInnerChamber, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_RUINS_OF_ALPH_INTERIOR, TRUE, PALETTE_DAY, FISHGROUP_SHORE - map_def RuinsOfAlphResearchCenter, TILESET_FACILITY, INDOOR, RUINS_OF_ALPH, MUSIC_UNION_CAVE, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def RuinsOfAlphHoOhItemRoom, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE - map_def RuinsOfAlphKabutoItemRoom, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE - map_def RuinsOfAlphOmanyteItemRoom, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE - map_def RuinsOfAlphAerodactylItemRoom, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE - map_def RuinsOfAlphHoOhWordRoom, TILESET_HO_OH_WORD_ROOM, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE - map_def RuinsOfAlphKabutoWordRoom, TILESET_KABUTO_WORD_ROOM, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE - map_def RuinsOfAlphOmanyteWordRoom, TILESET_OMANYTE_WORD_ROOM, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE - map_def RuinsOfAlphAerodactylWordRoom, TILESET_AERODACTYL_WORD_ROOM, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE - map_def UnionCave1F, TILESET_CAVE, CAVE, UNION_CAVE, MUSIC_UNION_CAVE, TRUE, PALETTE_NITE, FISHGROUP_LAKE - map_def UnionCaveB1F, TILESET_CAVE, CAVE, UNION_CAVE, MUSIC_UNION_CAVE, TRUE, PALETTE_NITE, FISHGROUP_LAKE - map_def UnionCaveB2F, TILESET_CAVE, CAVE, UNION_CAVE, MUSIC_UNION_CAVE, TRUE, PALETTE_NITE, FISHGROUP_SHORE - map_def SlowpokeWellB1F, TILESET_CAVE, CAVE, SLOWPOKE_WELL, MUSIC_DARK_CAVE, TRUE, PALETTE_NITE, FISHGROUP_LAKE - map_def SlowpokeWellB2F, TILESET_CAVE, CAVE, SLOWPOKE_WELL, MUSIC_DARK_CAVE, TRUE, PALETTE_NITE, FISHGROUP_LAKE - map_def OlivineLighthouse1F, TILESET_LIGHTHOUSE, DUNGEON, LIGHTHOUSE, MUSIC_LIGHTHOUSE, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def OlivineLighthouse2F, TILESET_LIGHTHOUSE, DUNGEON, LIGHTHOUSE, MUSIC_LIGHTHOUSE, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def OlivineLighthouse3F, TILESET_LIGHTHOUSE, DUNGEON, LIGHTHOUSE, MUSIC_LIGHTHOUSE, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def OlivineLighthouse4F, TILESET_LIGHTHOUSE, DUNGEON, LIGHTHOUSE, MUSIC_LIGHTHOUSE, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def OlivineLighthouse5F, TILESET_LIGHTHOUSE, DUNGEON, LIGHTHOUSE, MUSIC_LIGHTHOUSE, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def OlivineLighthouse6F, TILESET_LIGHTHOUSE, DUNGEON, LIGHTHOUSE, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def MahoganyMart1F, TILESET_TRADITIONAL_HOUSE, INDOOR, MAHOGANY_TOWN, MUSIC_MAHOGANY_MART, TRUE, PALETTE_DAY, FISHGROUP_SHORE - map_def TeamRocketBaseB1F, TILESET_UNDERGROUND, DUNGEON, MAHOGANY_TOWN, MUSIC_ROCKET_HIDEOUT, TRUE, PALETTE_DAY, FISHGROUP_SHORE - map_def TeamRocketBaseB2F, TILESET_FACILITY, DUNGEON, MAHOGANY_TOWN, MUSIC_ROCKET_HIDEOUT, TRUE, PALETTE_DAY, FISHGROUP_SHORE - map_def TeamRocketBaseB3F, TILESET_FACILITY, DUNGEON, MAHOGANY_TOWN, MUSIC_ROCKET_HIDEOUT, TRUE, PALETTE_DAY, FISHGROUP_SHORE - map_def IlexForest, TILESET_FOREST, CAVE, ILEX_FOREST, MUSIC_UNION_CAVE, FALSE, PALETTE_NITE, FISHGROUP_POND - map_def GoldenrodUnderground, TILESET_GATE, DUNGEON, GOLDENROD_CITY, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE - map_def GoldenrodUndergroundSwitchRoomEntrances, TILESET_ELITE_FOUR_ROOM, DUNGEON, GOLDENROD_CITY, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE - map_def GoldenrodDeptStoreB1F, TILESET_UNDERGROUND, DUNGEON, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE - map_def GoldenrodUndergroundWarehouse, TILESET_UNDERGROUND, DUNGEON, GOLDENROD_CITY, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE - map_def MountMortar1FOutside, TILESET_DARK_CAVE, CAVE, MT_MORTAR, MUSIC_UNION_CAVE, TRUE, PALETTE_NITE, FISHGROUP_LAKE - map_def MountMortar1FInside, TILESET_DARK_CAVE, CAVE, MT_MORTAR, MUSIC_UNION_CAVE, TRUE, PALETTE_NITE, FISHGROUP_LAKE - map_def MountMortar2FInside, TILESET_DARK_CAVE, CAVE, MT_MORTAR, MUSIC_UNION_CAVE, TRUE, PALETTE_NITE, FISHGROUP_LAKE - map_def MountMortarB1F, TILESET_DARK_CAVE, CAVE, MT_MORTAR, MUSIC_UNION_CAVE, TRUE, PALETTE_NITE, FISHGROUP_LAKE - map_def IcePath1F, TILESET_ICE_PATH, CAVE, ICE_PATH, MUSIC_DARK_CAVE, TRUE, PALETTE_NITE, FISHGROUP_DRATINI - map_def IcePathB1F, TILESET_ICE_PATH, CAVE, ICE_PATH, MUSIC_DARK_CAVE, TRUE, PALETTE_NITE, FISHGROUP_DRATINI - map_def IcePathB2FMahoganySide, TILESET_ICE_PATH, CAVE, ICE_PATH, MUSIC_DARK_CAVE, TRUE, PALETTE_NITE, FISHGROUP_DRATINI - map_def IcePathB2FBlackthornSide, TILESET_ICE_PATH, CAVE, ICE_PATH, MUSIC_DARK_CAVE, TRUE, PALETTE_NITE, FISHGROUP_DRATINI - map_def IcePathB3F, TILESET_ICE_PATH, CAVE, ICE_PATH, MUSIC_DARK_CAVE, TRUE, PALETTE_NITE, FISHGROUP_DRATINI - map_def WhirlIslandNW, TILESET_DARK_CAVE, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, TRUE, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS - map_def WhirlIslandNE, TILESET_DARK_CAVE, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, TRUE, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS - map_def WhirlIslandSW, TILESET_DARK_CAVE, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, TRUE, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS - map_def WhirlIslandCave, TILESET_DARK_CAVE, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, TRUE, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS - map_def WhirlIslandSE, TILESET_DARK_CAVE, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, TRUE, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS - map_def WhirlIslandB1F, TILESET_DARK_CAVE, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, TRUE, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS - map_def WhirlIslandB2F, TILESET_DARK_CAVE, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, TRUE, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS - map_def WhirlIslandLugiaChamber, TILESET_DARK_CAVE, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, TRUE, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS - map_def SilverCaveRoom1, TILESET_DARK_CAVE, CAVE, SILVER_CAVE, MUSIC_LIGHTHOUSE, TRUE, PALETTE_DARK, FISHGROUP_LAKE - map_def SilverCaveRoom2, TILESET_CAVE, CAVE, SILVER_CAVE, MUSIC_LIGHTHOUSE, TRUE, PALETTE_NITE, FISHGROUP_LAKE - map_def SilverCaveRoom3, TILESET_CAVE, CAVE, SILVER_CAVE, MUSIC_LIGHTHOUSE, TRUE, PALETTE_DAY, FISHGROUP_LAKE - map_def SilverCaveItemRooms, TILESET_CAVE, CAVE, SILVER_CAVE, MUSIC_LIGHTHOUSE, TRUE, PALETTE_NITE, FISHGROUP_LAKE - map_def DarkCaveVioletEntrance, TILESET_DARK_CAVE, CAVE, DARK_CAVE, MUSIC_DARK_CAVE, TRUE, PALETTE_DARK, FISHGROUP_LAKE - map_def DarkCaveBlackthornEntrance, TILESET_DARK_CAVE, CAVE, DARK_CAVE, MUSIC_DARK_CAVE, TRUE, PALETTE_DARK, FISHGROUP_LAKE - map_def DragonsDen1F, TILESET_CAVE, CAVE, DRAGONS_DEN, MUSIC_DRAGONS_DEN, TRUE, PALETTE_NITE, FISHGROUP_DRATINI - map_def DragonsDenB1F, TILESET_JOHTO, CAVE, DRAGONS_DEN, MUSIC_DRAGONS_DEN, TRUE, PALETTE_NITE, FISHGROUP_DRATINI - map_def DragonShrine, TILESET_LAB, INDOOR, DRAGONS_DEN, MUSIC_DRAGONS_DEN, TRUE, PALETTE_NITE, FISHGROUP_SHORE - map_def TohjoFalls, TILESET_CAVE, CAVE, TOHJO_FALLS, MUSIC_UNION_CAVE, TRUE, PALETTE_NITE, FISHGROUP_LAKE - map_def DiglettsCave, TILESET_CAVE, CAVE, DIGLETTS_CAVE, MUSIC_MT_MOON, TRUE, PALETTE_NITE, FISHGROUP_SHORE - map_def MountMoon, TILESET_CAVE, CAVE, MT_MOON, MUSIC_MT_MOON, TRUE, PALETTE_NITE, FISHGROUP_SHORE - map_def UndergroundPath, TILESET_UNDERGROUND, GATE, UNDERGROUND_PATH, MUSIC_MT_MOON, FALSE, PALETTE_NITE, FISHGROUP_SHORE - map_def RockTunnel1F, TILESET_DARK_CAVE, CAVE, ROCK_TUNNEL, MUSIC_MT_MOON, TRUE, PALETTE_DARK, FISHGROUP_SHORE - map_def RockTunnelB1F, TILESET_DARK_CAVE, CAVE, ROCK_TUNNEL, MUSIC_MT_MOON, TRUE, PALETTE_DARK, FISHGROUP_SHORE - map_def SafariZoneFuchsiaGateBeta, TILESET_GATE, INDOOR, FUCHSIA_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def SafariZoneBeta, TILESET_PARK, CAVE, FUCHSIA_CITY, MUSIC_EVOLUTION, FALSE, PALETTE_AUTO, FISHGROUP_SHORE - map_def VictoryRoad, TILESET_CAVE, CAVE, VICTORY_ROAD, MUSIC_VICTORY_ROAD, TRUE, PALETTE_NITE, FISHGROUP_SHORE - -MapGroup_Ecruteak: - map_def EcruteakHouse, TILESET_TOWER, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def WiseTriosRoom, TILESET_TRADITIONAL_HOUSE, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE - map_def EcruteakPokecenter1F, TILESET_POKECENTER, INDOOR, ECRUTEAK_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def EcruteakLugiaSpeechHouse, TILESET_TRADITIONAL_HOUSE, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def DanceTheatre, TILESET_TRADITIONAL_HOUSE, INDOOR, ECRUTEAK_CITY, MUSIC_DANCING_HALL, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def EcruteakMart, TILESET_MART, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def EcruteakGym, TILESET_TOWER, INDOOR, ECRUTEAK_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE - map_def EcruteakItemfinderHouse, TILESET_TRADITIONAL_HOUSE, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def EcruteakCity, TILESET_JOHTO, TOWN, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_AUTO, FISHGROUP_POND - -MapGroup_Blackthorn: - map_def BlackthornGym1F, TILESET_ELITE_FOUR_ROOM, INDOOR, BLACKTHORN_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE - map_def BlackthornGym2F, TILESET_ELITE_FOUR_ROOM, INDOOR, BLACKTHORN_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE - map_def BlackthornDragonSpeechHouse, TILESET_HOUSE, INDOOR, BLACKTHORN_CITY, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def BlackthornEmysHouse, TILESET_HOUSE, INDOOR, BLACKTHORN_CITY, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def BlackthornMart, TILESET_MART, INDOOR, BLACKTHORN_CITY, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def BlackthornPokecenter1F, TILESET_POKECENTER, INDOOR, BLACKTHORN_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def MoveDeletersHouse, TILESET_HOUSE, INDOOR, BLACKTHORN_CITY, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def Route45, TILESET_JOHTO, ROUTE, ROUTE_45, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_DRATINI_2 - map_def Route46, TILESET_JOHTO, ROUTE, ROUTE_46, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_SHORE - map_def BlackthornCity, TILESET_JOHTO, TOWN, BLACKTHORN_CITY, MUSIC_AZALEA_TOWN, FALSE, PALETTE_AUTO, FISHGROUP_POND - -MapGroup_Cinnabar: - map_def CinnabarPokecenter1F, TILESET_POKECENTER, INDOOR, CINNABAR_ISLAND, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def CinnabarPokecenter2FBeta, TILESET_POKECENTER, INDOOR, CINNABAR_ISLAND, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def Route19FuchsiaGate, TILESET_GATE, GATE, ROUTE_19, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def SeafoamGym, TILESET_CAVE, INDOOR, SEAFOAM_ISLANDS, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE - map_def Route19, TILESET_KANTO, ROUTE, ROUTE_19, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_SHORE - map_def Route20, TILESET_KANTO, ROUTE, ROUTE_20, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN - map_def Route21, TILESET_KANTO, ROUTE, ROUTE_21, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN - map_def CinnabarIsland, TILESET_KANTO, TOWN, CINNABAR_ISLAND, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN - -MapGroup_Cerulean: - map_def CeruleanGymBadgeSpeechHouse, TILESET_HOUSE, INDOOR, CERULEAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def CeruleanPoliceStation, TILESET_HOUSE, INDOOR, CERULEAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def CeruleanTradeSpeechHouse, TILESET_HOUSE, INDOOR, CERULEAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def CeruleanPokecenter1F, TILESET_POKECENTER, INDOOR, CERULEAN_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def CeruleanPokecenter2FBeta, TILESET_POKECENTER, INDOOR, CERULEAN_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def CeruleanGym, TILESET_PORT, INDOOR, CERULEAN_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_NONE - map_def CeruleanMart, TILESET_MART, INDOOR, CERULEAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def Route10Pokecenter1F, TILESET_POKECENTER, INDOOR, ROUTE_10, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def Route10Pokecenter2FBeta, TILESET_POKECENTER, INDOOR, ROUTE_10, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def PowerPlant, TILESET_FACILITY, INDOOR, POWER_PLANT, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def BillsHouse, TILESET_HOUSE, INDOOR, ROUTE_25, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def Route4, TILESET_KANTO, ROUTE, ROUTE_4, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_NONE - map_def Route9, TILESET_KANTO, ROUTE, ROUTE_9, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_LAKE - map_def Route10North, TILESET_KANTO, ROUTE, ROUTE_10, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_LAKE - map_def Route24, TILESET_KANTO, ROUTE, ROUTE_24, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_LAKE - map_def Route25, TILESET_KANTO, ROUTE, ROUTE_25, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_LAKE - map_def CeruleanCity, TILESET_KANTO, TOWN, CERULEAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_AUTO, FISHGROUP_NONE - -MapGroup_Azalea: - map_def AzaleaPokecenter1F, TILESET_POKECENTER, INDOOR, AZALEA_TOWN, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def CharcoalKiln, TILESET_HOUSE, INDOOR, AZALEA_TOWN, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def AzaleaMart, TILESET_MART, INDOOR, AZALEA_TOWN, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def KurtsHouse, TILESET_TRADITIONAL_HOUSE, INDOOR, AZALEA_TOWN, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def AzaleaGym, TILESET_ELITE_FOUR_ROOM, INDOOR, AZALEA_TOWN, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE - map_def Route33, TILESET_JOHTO_MODERN, ROUTE, ROUTE_33, MUSIC_ROUTE_30, FALSE, PALETTE_AUTO, FISHGROUP_SHORE - map_def AzaleaTown, TILESET_JOHTO_MODERN, TOWN, AZALEA_TOWN, MUSIC_AZALEA_TOWN, FALSE, PALETTE_AUTO, FISHGROUP_SHORE - -MapGroup_LakeOfRage: - map_def LakeOfRageHiddenPowerHouse, TILESET_HOUSE, INDOOR, LAKE_OF_RAGE, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def LakeOfRageMagikarpHouse, TILESET_HOUSE, INDOOR, LAKE_OF_RAGE, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def Route43MahoganyGate, TILESET_GATE, GATE, ROUTE_43, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def Route43Gate, TILESET_GATE, GATE, ROUTE_43, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def Route43, TILESET_JOHTO, ROUTE, ROUTE_43, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_POND - map_def LakeOfRage, TILESET_JOHTO, TOWN, LAKE_OF_RAGE, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_GYARADOS - -MapGroup_Violet: - map_def Route32, TILESET_JOHTO, ROUTE, ROUTE_32, MUSIC_ROUTE_30, FALSE, PALETTE_AUTO, FISHGROUP_QWILFISH - map_def Route35, TILESET_JOHTO, ROUTE, ROUTE_35, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_POND - map_def Route36, TILESET_JOHTO, ROUTE, ROUTE_36, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_SHORE - map_def Route37, TILESET_JOHTO, ROUTE, ROUTE_37, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_SHORE - map_def VioletCity, TILESET_JOHTO, TOWN, VIOLET_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_AUTO, FISHGROUP_POND - map_def VioletMart, TILESET_MART, INDOOR, VIOLET_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def VioletGym, TILESET_ELITE_FOUR_ROOM, INDOOR, VIOLET_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE - map_def EarlsPokemonAcademy, TILESET_LAB, INDOOR, VIOLET_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def VioletNicknameSpeechHouse, TILESET_TRADITIONAL_HOUSE, INDOOR, VIOLET_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def VioletPokecenter1F, TILESET_POKECENTER, INDOOR, VIOLET_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def VioletKylesHouse, TILESET_TRADITIONAL_HOUSE, INDOOR, VIOLET_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def Route32RuinsOfAlphGate, TILESET_GATE, GATE, ROUTE_32, MUSIC_ROUTE_30, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def Route32Pokecenter1F, TILESET_POKECENTER, INDOOR, ROUTE_32, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def Route35GoldenrodGate, TILESET_GATE, GATE, ROUTE_35, MUSIC_ROUTE_36, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def Route35NationalParkGate, TILESET_GATE, INDOOR, ROUTE_35, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def Route36RuinsOfAlphGate, TILESET_GATE, GATE, ROUTE_36, MUSIC_ROUTE_36, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def Route36NationalParkGate, TILESET_GATE, INDOOR, ROUTE_36, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - -MapGroup_Goldenrod: - map_def Route34, TILESET_JOHTO_MODERN, ROUTE, ROUTE_34, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_SHORE - map_def GoldenrodCity, TILESET_JOHTO_MODERN, TOWN, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE - map_def GoldenrodGym, TILESET_ELITE_FOUR_ROOM, INDOOR, GOLDENROD_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE - map_def GoldenrodBikeShop, TILESET_CHAMPIONS_ROOM, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def GoldenrodHappinessRater, TILESET_HOUSE, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def GoldenrodBillsHouse, TILESET_HOUSE, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def GoldenrodMagnetTrainStation, TILESET_TRAIN_STATION, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def GoldenrodFlowerShop, TILESET_HOUSE, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def GoldenrodPPSpeechHouse, TILESET_HOUSE, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def GoldenrodNameRater, TILESET_HOUSE, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def GoldenrodDeptStore1F, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def GoldenrodDeptStore2F, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def GoldenrodDeptStore3F, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def GoldenrodDeptStore4F, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def GoldenrodDeptStore5F, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def GoldenrodDeptStore6F, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def GoldenrodDeptStoreElevator, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def GoldenrodDeptStoreRoof, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def GoldenrodGameCorner, TILESET_GAME_CORNER, INDOOR, GOLDENROD_CITY, MUSIC_GAME_CORNER, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def GoldenrodPokecenter1F, TILESET_POKECENTER, INDOOR, GOLDENROD_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def GoldenrodPokeComCenter2FMobile, TILESET_POKECOM_CENTER, INDOOR, GOLDENROD_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def IlexForestAzaleaGate, TILESET_GATE, GATE, ROUTE_34, MUSIC_ROUTE_36, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def Route34IlexForestGate, TILESET_GATE, GATE, ROUTE_34, MUSIC_ROUTE_36, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def DayCare, TILESET_HOUSE, INDOOR, ROUTE_34, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE - -MapGroup_Vermilion: - map_def Route6, TILESET_KANTO, ROUTE, ROUTE_6, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_POND - map_def Route11, TILESET_KANTO, ROUTE, ROUTE_11, MUSIC_ROUTE_12, FALSE, PALETTE_AUTO, FISHGROUP_SHORE - map_def VermilionCity, TILESET_KANTO, TOWN, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN - map_def VermilionHouseFishingSpeechHouse, TILESET_HOUSE, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def VermilionPokecenter1F, TILESET_POKECENTER, INDOOR, VERMILION_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def VermilionPokecenter2FBeta, TILESET_POKECENTER, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def PokemonFanClub, TILESET_HOUSE, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def VermilionMagnetTrainSpeechHouse, TILESET_HOUSE, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def VermilionMart, TILESET_MART, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def VermilionHouseDiglettsCaveSpeechHouse, TILESET_HOUSE, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def VermilionGym, TILESET_GAME_CORNER, INDOOR, VERMILION_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE - map_def Route6SaffronGate, TILESET_GATE, GATE, ROUTE_6, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def Route6UndergroundPathEntrance, TILESET_GATE, GATE, ROUTE_6, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE - -MapGroup_Pallet: - map_def Route1, TILESET_KANTO, ROUTE, ROUTE_1, MUSIC_ROUTE_1, FALSE, PALETTE_AUTO, FISHGROUP_SHORE - map_def PalletTown, TILESET_KANTO, TOWN, PALLET_TOWN, MUSIC_PALLET_TOWN, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN - map_def RedsHouse1F, TILESET_PLAYERS_HOUSE, INDOOR, PALLET_TOWN, MUSIC_PALLET_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def RedsHouse2F, TILESET_PLAYERS_HOUSE, INDOOR, PALLET_TOWN, MUSIC_PALLET_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def BluesHouse, TILESET_HOUSE, INDOOR, PALLET_TOWN, MUSIC_PALLET_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def OaksLab, TILESET_LAB, INDOOR, PALLET_TOWN, MUSIC_POKEMON_TALK, FALSE, PALETTE_DAY, FISHGROUP_SHORE - -MapGroup_Pewter: - map_def Route3, TILESET_KANTO, ROUTE, ROUTE_3, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_SHORE - map_def PewterCity, TILESET_KANTO, TOWN, PEWTER_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE - map_def PewterNidoranSpeechHouse, TILESET_HOUSE, INDOOR, PEWTER_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def PewterGym, TILESET_TOWER, INDOOR, PEWTER_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE - map_def PewterMart, TILESET_MART, INDOOR, PEWTER_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def PewterPokecenter1F, TILESET_POKECENTER, INDOOR, PEWTER_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def PewterPokecenter2FBeta, TILESET_POKECENTER, INDOOR, PEWTER_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def PewterSnoozeSpeechHouse, TILESET_HOUSE, INDOOR, PEWTER_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - -MapGroup_FastShip: - map_def OlivinePort, TILESET_PORT, ROUTE, OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN - map_def VermilionPort, TILESET_PORT, ROUTE, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN - map_def FastShip1F, TILESET_LIGHTHOUSE, INDOOR, FAST_SHIP, MUSIC_SS_AQUA, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def FastShipCabins_NNW_NNE_NE, TILESET_LIGHTHOUSE, INDOOR, FAST_SHIP, MUSIC_SS_AQUA, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def FastShipCabins_SW_SSW_NW, TILESET_LIGHTHOUSE, INDOOR, FAST_SHIP, MUSIC_SS_AQUA, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def FastShipCabins_SE_SSE_CaptainsCabin, TILESET_LIGHTHOUSE, INDOOR, FAST_SHIP, MUSIC_SS_AQUA, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def FastShipB1F, TILESET_LIGHTHOUSE, INDOOR, FAST_SHIP, MUSIC_SS_AQUA, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def OlivinePortPassage, TILESET_UNDERGROUND, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def VermilionPortPassage, TILESET_UNDERGROUND, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def MountMoonSquare, TILESET_KANTO, ROUTE, MT_MOON, MUSIC_MT_MOON_SQUARE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE - map_def MountMoonGiftShop, TILESET_TRADITIONAL_HOUSE, INDOOR, MT_MOON, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def TinTowerRoof, TILESET_TOWER, ROUTE, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_AUTO, FISHGROUP_SHORE - -MapGroup_Indigo: - map_def Route23, TILESET_KANTO, TOWN, ROUTE_23, MUSIC_INDIGO_PLATEAU, FALSE, PALETTE_AUTO, FISHGROUP_SHORE - map_def IndigoPlateauPokecenter1F, TILESET_POKECENTER, INDOOR, INDIGO_PLATEAU, MUSIC_INDIGO_PLATEAU, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def WillsRoom, TILESET_ELITE_FOUR_ROOM, INDOOR, INDIGO_PLATEAU, MUSIC_INDIGO_PLATEAU, TRUE, PALETTE_DAY, FISHGROUP_SHORE - map_def KogasRoom, TILESET_ELITE_FOUR_ROOM, INDOOR, INDIGO_PLATEAU, MUSIC_INDIGO_PLATEAU, TRUE, PALETTE_DAY, FISHGROUP_SHORE - map_def BrunosRoom, TILESET_ELITE_FOUR_ROOM, INDOOR, INDIGO_PLATEAU, MUSIC_INDIGO_PLATEAU, TRUE, PALETTE_DAY, FISHGROUP_SHORE - map_def KarensRoom, TILESET_ELITE_FOUR_ROOM, INDOOR, INDIGO_PLATEAU, MUSIC_INDIGO_PLATEAU, TRUE, PALETTE_DAY, FISHGROUP_SHORE - map_def LancesRoom, TILESET_CHAMPIONS_ROOM, INDOOR, INDIGO_PLATEAU, MUSIC_INDIGO_PLATEAU, TRUE, PALETTE_DAY, FISHGROUP_SHORE - map_def HallOfFame, TILESET_ICE_PATH, INDOOR, INDIGO_PLATEAU, MUSIC_NEW_BARK_TOWN, TRUE, PALETTE_DAY, FISHGROUP_SHORE - -MapGroup_Fuchsia: - map_def Route13, TILESET_KANTO, ROUTE, ROUTE_13, MUSIC_ROUTE_12, FALSE, PALETTE_AUTO, FISHGROUP_QWILFISH_NO_SWARM - map_def Route14, TILESET_KANTO, ROUTE, ROUTE_14, MUSIC_ROUTE_12, FALSE, PALETTE_AUTO, FISHGROUP_SHORE - map_def Route15, TILESET_KANTO, ROUTE, ROUTE_15, MUSIC_ROUTE_12, FALSE, PALETTE_AUTO, FISHGROUP_SHORE - map_def Route18, TILESET_KANTO, ROUTE, ROUTE_18, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_SHORE - map_def FuchsiaCity, TILESET_KANTO, TOWN, FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_AUTO, FISHGROUP_GYARADOS - map_def FuchsiaMart, TILESET_MART, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def SafariZoneMainOffice, TILESET_GAME_CORNER, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def FuchsiaGym, TILESET_LAB, INDOOR, FUCHSIA_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE - map_def FuchsiaBillSpeechHouse, TILESET_HOUSE, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def FuchsiaPokecenter1F, TILESET_POKECENTER, INDOOR, FUCHSIA_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def FuchsiaPokecenter2FBeta, TILESET_POKECENTER, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def SafariZoneWardensHome, TILESET_HOUSE, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def Route15FuchsiaGate, TILESET_GATE, GATE, ROUTE_15, MUSIC_ROUTE_12, FALSE, PALETTE_DAY, FISHGROUP_SHORE - -MapGroup_Lavender: - map_def Route8, TILESET_KANTO, ROUTE, ROUTE_8, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_SHORE - map_def Route12, TILESET_KANTO, ROUTE, ROUTE_12, MUSIC_ROUTE_12, FALSE, PALETTE_AUTO, FISHGROUP_QWILFISH_NO_SWARM - map_def Route10South, TILESET_KANTO, ROUTE, ROUTE_10, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_LAKE - map_def LavenderTown, TILESET_KANTO, TOWN, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, FALSE, PALETTE_AUTO, FISHGROUP_SHORE - map_def LavenderPokecenter1F, TILESET_POKECENTER, INDOOR, LAVENDER_TOWN, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def LavenderPokecenter2FBeta, TILESET_POKECENTER, INDOOR, LAVENDER_TOWN, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def MrFujisHouse, TILESET_HOUSE, INDOOR, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def LavenderSpeechHouse, TILESET_HOUSE, INDOOR, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def LavenderNameRater, TILESET_HOUSE, INDOOR, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def LavenderMart, TILESET_MART, INDOOR, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def SoulHouse, TILESET_HOUSE, INDOOR, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def LavRadioTower1F, TILESET_RADIO_TOWER, INDOOR, LAV_RADIO_TOWER, MUSIC_LAVENDER_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def Route8SaffronGate, TILESET_GATE, GATE, ROUTE_8, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def Route12SuperRodHouse, TILESET_HOUSE, INDOOR, ROUTE_12, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - -MapGroup_Silver: - map_def Route28, TILESET_KANTO, ROUTE, ROUTE_28, MUSIC_INDIGO_PLATEAU, FALSE, PALETTE_AUTO, FISHGROUP_POND - map_def SilverCaveOutside, TILESET_KANTO, TOWN, SILVER_CAVE, MUSIC_INDIGO_PLATEAU, FALSE, PALETTE_AUTO, FISHGROUP_POND - map_def SilverCavePokecenter1F, TILESET_POKECENTER, INDOOR, SILVER_CAVE, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def Route28FamousSpeechHouse, TILESET_HOUSE, INDOOR, ROUTE_28, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE - -MapGroup_CableClub: - map_def Pokecenter2F, TILESET_POKECENTER, INDOOR, SPECIAL_MAP, MUSIC_POKEMON_CENTER, TRUE, PALETTE_DAY, FISHGROUP_SHORE - map_def TradeCenter, TILESET_GATE, INDOOR, SPECIAL_MAP, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE - map_def Colosseum, TILESET_GATE, INDOOR, SPECIAL_MAP, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE - map_def TimeCapsule, TILESET_GATE, INDOOR, SPECIAL_MAP, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE - map_def MobileTradeRoomMobile, TILESET_MANSION, INDOOR, SPECIAL_MAP, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE - map_def MobileBattleRoom, TILESET_MANSION, INDOOR, SPECIAL_MAP, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE - -MapGroup_Celadon: - map_def Route7, TILESET_KANTO, ROUTE, ROUTE_7, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_SHORE - map_def Route16, TILESET_KANTO, ROUTE, ROUTE_16, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_SHORE - map_def Route17, TILESET_KANTO, ROUTE, ROUTE_17, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_NONE - map_def CeladonCity, TILESET_KANTO, TOWN, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_AUTO, FISHGROUP_NONE - map_def CeladonDeptStore1F, TILESET_MART, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def CeladonDeptStore2F, TILESET_MART, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def CeladonDeptStore3F, TILESET_MART, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def CeladonDeptStore4F, TILESET_MART, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def CeladonDeptStore5F, TILESET_MART, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def CeladonDeptStore6F, TILESET_MART, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def CeladonDeptStoreElevator, TILESET_MART, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def CeladonMansion1F, TILESET_MANSION, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def CeladonMansion2F, TILESET_MANSION, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def CeladonMansion3F, TILESET_MANSION, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def CeladonMansionRoof, TILESET_MANSION, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def CeladonMansionRoofHouse, TILESET_HOUSE, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def CeladonPokecenter1F, TILESET_POKECENTER, INDOOR, CELADON_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def CeladonPokecenter2FBeta, TILESET_POKECENTER, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def CeladonGameCorner, TILESET_GAME_CORNER, INDOOR, CELADON_CITY, MUSIC_GAME_CORNER, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def CeladonGameCornerPrizeRoom, TILESET_GAME_CORNER, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def CeladonGym, TILESET_TRAIN_STATION, INDOOR, CELADON_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE - map_def CeladonCafe, TILESET_GAME_CORNER, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def Route16FuchsiaSpeechHouse, TILESET_HOUSE, INDOOR, ROUTE_16, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def Route16Gate, TILESET_GATE, GATE, ROUTE_16, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def Route7SaffronGate, TILESET_GATE, GATE, ROUTE_7, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def Route17Route18Gate, TILESET_GATE, GATE, ROUTE_17, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE - -MapGroup_Cianwood: - map_def Route40, TILESET_JOHTO, ROUTE, ROUTE_40, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_SHORE - map_def Route41, TILESET_JOHTO, ROUTE, ROUTE_41, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN - map_def CianwoodCity, TILESET_JOHTO, TOWN, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE - map_def ManiasHouse, TILESET_HOUSE, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def CianwoodGym, TILESET_TOWER, INDOOR, CIANWOOD_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE - map_def CianwoodPokecenter1F, TILESET_POKECENTER, INDOOR, CIANWOOD_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def CianwoodPharmacy, TILESET_HOUSE, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def CianwoodPhotoStudio, TILESET_HOUSE, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def CianwoodLugiaSpeechHouse, TILESET_HOUSE, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def PokeSeersHouse, TILESET_HOUSE, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def BattleTower1F, TILESET_BATTLE_TOWER, INDOOR, BATTLE_TOWER, MUSIC_BATTLE_TOWER_LOBBY, TRUE, PALETTE_DAY, FISHGROUP_SHORE - map_def BattleTowerBattleRoom, TILESET_BATTLE_TOWER, INDOOR, BATTLE_TOWER, MUSIC_BATTLE_TOWER_THEME, TRUE, PALETTE_DAY, FISHGROUP_SHORE - map_def BattleTowerElevator, TILESET_BATTLE_TOWER, INDOOR, BATTLE_TOWER, MUSIC_NONE, TRUE, PALETTE_DAY, FISHGROUP_SHORE - map_def BattleTowerHallway, TILESET_BATTLE_TOWER, INDOOR, BATTLE_TOWER, MUSIC_BATTLE_TOWER_THEME, TRUE, PALETTE_DAY, FISHGROUP_SHORE - map_def Route40BattleTowerGate, TILESET_GATE, GATE, BATTLE_TOWER, MUSIC_ROUTE_36, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def BattleTowerOutside, TILESET_BATTLE_TOWER_OUTSIDE, ROUTE, BATTLE_TOWER, MUSIC_BATTLE_TOWER_THEME, FALSE, PALETTE_AUTO, FISHGROUP_SHORE - -MapGroup_Viridian: - map_def Route2, TILESET_KANTO, ROUTE, ROUTE_2, MUSIC_ROUTE_2, FALSE, PALETTE_AUTO, FISHGROUP_SHORE - map_def Route22, TILESET_KANTO, ROUTE, ROUTE_22, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_POND - map_def ViridianCity, TILESET_KANTO, TOWN, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_AUTO, FISHGROUP_POND - map_def ViridianGym, TILESET_TRAIN_STATION, INDOOR, VIRIDIAN_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE - map_def ViridianNicknameSpeechHouse, TILESET_HOUSE, INDOOR, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def TrainerHouse1F, TILESET_HOUSE, INDOOR, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def TrainerHouseB1F, TILESET_FACILITY, INDOOR, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def ViridianMart, TILESET_MART, INDOOR, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def ViridianPokecenter1F, TILESET_POKECENTER, INDOOR, VIRIDIAN_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def ViridianPokecenter2FBeta, TILESET_POKECENTER, INDOOR, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def Route2NuggetSpeechHouse, TILESET_HOUSE, INDOOR, ROUTE_2, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def Route2Gate, TILESET_GATE, GATE, ROUTE_2, MUSIC_ROUTE_2, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def VictoryRoadGate, TILESET_GATE, GATE, ROUTE_26, MUSIC_INDIGO_PLATEAU, FALSE, PALETTE_DAY, FISHGROUP_SHORE - -MapGroup_NewBark: - map_def Route26, TILESET_JOHTO, ROUTE, ROUTE_26, MUSIC_ROUTE_26, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN - map_def Route27, TILESET_JOHTO, ROUTE, ROUTE_27, MUSIC_ROUTE_26, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN - map_def Route29, TILESET_JOHTO, ROUTE, ROUTE_29, MUSIC_ROUTE_29, FALSE, PALETTE_AUTO, FISHGROUP_SHORE - map_def NewBarkTown, TILESET_JOHTO, TOWN, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN - map_def ElmsLab, TILESET_LAB, INDOOR, NEW_BARK_TOWN, MUSIC_PROF_ELM, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def KrissHouse1F, TILESET_PLAYERS_HOUSE, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def KrissHouse2F, TILESET_PLAYERS_ROOM, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def KrissNeighborsHouse, TILESET_HOUSE, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def ElmsHouse, TILESET_PLAYERS_HOUSE, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def Route26HealSpeechHouse, TILESET_HOUSE, INDOOR, ROUTE_26, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def Route26DayofWeekSiblingsHouse, TILESET_HOUSE, INDOOR, ROUTE_26, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def Route27SandstormHouse, TILESET_HOUSE, INDOOR, ROUTE_27, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def Route29Route46Gate, TILESET_GATE, GATE, ROUTE_29, MUSIC_ROUTE_29, FALSE, PALETTE_DAY, FISHGROUP_SHORE - -MapGroup_Saffron: - map_def Route5, TILESET_KANTO, ROUTE, ROUTE_5, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_SHORE - map_def SaffronCity, TILESET_KANTO, TOWN, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE - map_def FightingDojo, TILESET_TRAIN_STATION, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def SaffronGym, TILESET_UNDERGROUND, INDOOR, SAFFRON_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE - map_def SaffronMart, TILESET_MART, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def SaffronPokecenter1F, TILESET_POKECENTER, INDOOR, SAFFRON_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def SaffronPokecenter2FBeta, TILESET_POKECENTER, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def MrPsychicsHouse, TILESET_HOUSE, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def SaffronMagnetTrainStation, TILESET_TRAIN_STATION, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def SilphCo1F, TILESET_FACILITY, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def CopycatsHouse1F, TILESET_PLAYERS_HOUSE, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def CopycatsHouse2F, TILESET_PLAYERS_HOUSE, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def Route5UndergroundPathEntrance, TILESET_GATE, GATE, ROUTE_5, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def Route5SaffronGate, TILESET_GATE, GATE, ROUTE_5, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def Route5CleanseTagSpeechHouse, TILESET_HOUSE, INDOOR, ROUTE_5, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - -MapGroup_Cherrygrove: - map_def Route30, TILESET_JOHTO, ROUTE, ROUTE_30, MUSIC_ROUTE_30, FALSE, PALETTE_AUTO, FISHGROUP_POND - map_def Route31, TILESET_JOHTO, ROUTE, ROUTE_31, MUSIC_ROUTE_30, FALSE, PALETTE_AUTO, FISHGROUP_POND - map_def CherrygroveCity, TILESET_JOHTO, TOWN, CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE - map_def CherrygroveMart, TILESET_MART, INDOOR, CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def CherrygrovePokecenter1F, TILESET_POKECENTER, INDOOR, CHERRYGROVE_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def CherrygroveGymSpeechHouse, TILESET_HOUSE, INDOOR, CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def GuideGentsHouse, TILESET_HOUSE, INDOOR, CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def CherrygroveEvolutionSpeechHouse, TILESET_HOUSE, INDOOR, CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def Route30BerrySpeechHouse, TILESET_HOUSE, INDOOR, ROUTE_30, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def MrPokemonsHouse, TILESET_FACILITY, INDOOR, ROUTE_30, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map_def Route31VioletGate, TILESET_GATE, GATE, ROUTE_31, MUSIC_ROUTE_30, FALSE, PALETTE_DAY, FISHGROUP_SHORE diff --git a/data/maps/environment_colors.asm b/data/maps/environment_colors.asm index aeddb83bc..3497b2b93 100644 --- a/data/maps/environment_colors.asm +++ b/data/maps/environment_colors.asm @@ -9,7 +9,7 @@ EnvironmentColorsPointers: dw .IndoorColors ; GATE dw .DungeonColors ; DUNGEON -; Valid indices: $00 - $29 +; Valid indices: $00 - $29 (see gfx/tilesets/bg_tiles.pal) .OutdoorColors: db $00, $01, $02, $28, $04, $05, $06, $07 ; morn db $08, $09, $0a, $28, $0c, $0d, $0e, $0f ; day diff --git a/data/maps/flypoints.asm b/data/maps/flypoints.asm index b41db0ea1..007b59073 100644 --- a/data/maps/flypoints.asm +++ b/data/maps/flypoints.asm @@ -3,36 +3,35 @@ flypoint: MACRO db \2, SPAWN_\1 ENDM -Flypoints: ; 91c5e +Flypoints: ; landmark, spawn point const_def ; Johto - flypoint NEW_BARK, NEW_BARK_TOWN - flypoint CHERRYGROVE, CHERRYGROVE_CITY - flypoint VIOLET, VIOLET_CITY - flypoint AZALEA, AZALEA_TOWN - flypoint GOLDENROD, GOLDENROD_CITY - flypoint ECRUTEAK, ECRUTEAK_CITY - flypoint OLIVINE, OLIVINE_CITY - flypoint CIANWOOD, CIANWOOD_CITY - flypoint MAHOGANY, MAHOGANY_TOWN - flypoint LAKE, LAKE_OF_RAGE - flypoint BLACKTHORN, BLACKTHORN_CITY - flypoint MT_SILVER, SILVER_CAVE + flypoint NEW_BARK, NEW_BARK_TOWN + flypoint CHERRYGROVE, CHERRYGROVE_CITY + flypoint VIOLET, VIOLET_CITY + flypoint AZALEA, AZALEA_TOWN + flypoint GOLDENROD, GOLDENROD_CITY + flypoint ECRUTEAK, ECRUTEAK_CITY + flypoint OLIVINE, OLIVINE_CITY + flypoint CIANWOOD, CIANWOOD_CITY + flypoint MAHOGANY, MAHOGANY_TOWN + flypoint LAKE_OF_RAGE, LAKE_OF_RAGE + flypoint BLACKTHORN, BLACKTHORN_CITY + flypoint MT_SILVER, SILVER_CAVE ; Kanto KANTO_FLYPOINT EQU const_value - flypoint PALLET, PALLET_TOWN - flypoint VIRIDIAN, VIRIDIAN_CITY - flypoint PEWTER, PEWTER_CITY - flypoint CERULEAN, CERULEAN_CITY - flypoint VERMILION, VERMILION_CITY - flypoint ROCK_TUNNEL, ROCK_TUNNEL - flypoint LAVENDER, LAVENDER_TOWN - flypoint CELADON, CELADON_CITY - flypoint SAFFRON, SAFFRON_CITY - flypoint FUCHSIA, FUCHSIA_CITY - flypoint CINNABAR, CINNABAR_ISLAND - flypoint INDIGO, INDIGO_PLATEAU + flypoint PALLET, PALLET_TOWN + flypoint VIRIDIAN, VIRIDIAN_CITY + flypoint PEWTER, PEWTER_CITY + flypoint CERULEAN, CERULEAN_CITY + flypoint VERMILION, VERMILION_CITY + flypoint ROCK_TUNNEL, ROCK_TUNNEL + flypoint LAVENDER, LAVENDER_TOWN + flypoint CELADON, CELADON_CITY + flypoint SAFFRON, SAFFRON_CITY + flypoint FUCHSIA, FUCHSIA_CITY + flypoint CINNABAR, CINNABAR_ISLAND + flypoint INDIGO, INDIGO_PLATEAU db -1 -; 91c8f diff --git a/data/maps/landmarks.asm b/data/maps/landmarks.asm index 0b927aaf6..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@" @@ -129,7 +128,7 @@ WhirlIslandsName: db "WHIRL¯ISLANDS@" MtMortarName: db "MT.MORTAR@" DragonsDenName: db "DRAGON'S¯DEN@" IcePathName: db "ICE PATH@" -NotApplicableName: db "N/A@" +NotApplicableName: db "N/A@" ; "オバケやしき" ("HAUNTED HOUSE") in Japanese PalletTownName: db "PALLET TOWN@" ViridianCityName: db "VIRIDIAN¯CITY@" PewterCityName: db "PEWTER CITY@" diff --git a/data/maps/map_data.asm b/data/maps/map_data.asm new file mode 100644 index 000000000..15ff249fe --- /dev/null +++ b/data/maps/map_data.asm @@ -0,0 +1,11 @@ +INCLUDE "constants.asm" + + +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 56958ccfc..1cc528738 100644 --- a/data/maps/maps.asm +++ b/data/maps/maps.asm @@ -1,12 +1,484 @@ -INCLUDE "constants.asm" +map: MACRO +;\1: map name: for the MapAttributes pointer (see data/maps/attributes.asm) +;\2: tileset: a TILESET_* constant +;\3: environment: TOWN, ROUTE, INDOOR, CAVE, ENVIRONMENT_5, GATE, or DUNGEON +;\4: location: from constants/landmark_constants.asm +;\5: music: a MUSIC_* constant +;\6: phone service flag: TRUE to prevent phone calls +;\7: time of day: a PALETTE_* constant +;\8: fishing group: a FISHGROUP_* constant + db BANK(\1_MapAttributes), \2, \3 + dw \1_MapAttributes + db \4, \5 + dn \6, \7 + db \8 +ENDM +MapGroupPointers:: +; pointers to the first map of each map group + dw MapGroup_Olivine ; 1 + dw MapGroup_Mahogany ; 2 + dw MapGroup_Dungeons ; 3 + dw MapGroup_Ecruteak ; 4 + dw MapGroup_Blackthorn ; 5 + dw MapGroup_Cinnabar ; 6 + dw MapGroup_Cerulean ; 7 + dw MapGroup_Azalea ; 8 + dw MapGroup_LakeOfRage ; 9 + dw MapGroup_Violet ; 10 + dw MapGroup_Goldenrod ; 11 + dw MapGroup_Vermilion ; 12 + dw MapGroup_Pallet ; 13 + dw MapGroup_Pewter ; 14 + dw MapGroup_FastShip ; 15 + dw MapGroup_Indigo ; 16 + dw MapGroup_Fuchsia ; 17 + dw MapGroup_Lavender ; 18 + dw MapGroup_Silver ; 19 + dw MapGroup_CableClub ; 20 + dw MapGroup_Celadon ; 21 + dw MapGroup_Cianwood ; 22 + dw MapGroup_Viridian ; 23 + dw MapGroup_NewBark ; 24 + dw MapGroup_Saffron ; 25 + dw MapGroup_Cherrygrove ; 26 -SECTION "Maps", ROMX +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 + map OlivineTimsHouse, TILESET_HOUSE, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map OlivineHouseBeta, TILESET_HOUSE, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map OlivinePunishmentSpeechHouse, TILESET_HOUSE, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map OlivineGoodRodHouse, TILESET_HOUSE, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map OlivineCafe, TILESET_GAME_CORNER, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map OlivineMart, TILESET_MART, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map Route38EcruteakGate, TILESET_GATE, GATE, ROUTE_38, MUSIC_ROUTE_37, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map Route39Barn, TILESET_TRADITIONAL_HOUSE, INDOOR, ROUTE_39, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map Route39Farmhouse, TILESET_HOUSE, INDOOR, ROUTE_39, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map Route38, TILESET_JOHTO, ROUTE, ROUTE_38, MUSIC_ROUTE_37, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map Route39, TILESET_JOHTO, ROUTE, ROUTE_39, MUSIC_ROUTE_37, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map OlivineCity, TILESET_JOHTO, TOWN, OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE -INCLUDE "data/maps/definitions.asm" -INCLUDE "data/maps/data.asm" +MapGroup_Mahogany: + map MahoganyRedGyaradosSpeechHouse, TILESET_HOUSE, INDOOR, MAHOGANY_TOWN, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map MahoganyGym, TILESET_ELITE_FOUR_ROOM, INDOOR, MAHOGANY_TOWN, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map MahoganyPokecenter1F, TILESET_POKECENTER, INDOOR, MAHOGANY_TOWN, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map Route42EcruteakGate, TILESET_GATE, GATE, ROUTE_42, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map Route42, TILESET_JOHTO, ROUTE, ROUTE_42, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_LAKE + map Route44, TILESET_JOHTO, ROUTE, ROUTE_44, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_POND + map MahoganyTown, TILESET_JOHTO, TOWN, MAHOGANY_TOWN, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE +MapGroup_Dungeons: + map SproutTower1F, TILESET_TOWER, DUNGEON, SPROUT_TOWER, MUSIC_SPROUT_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map SproutTower2F, TILESET_TOWER, DUNGEON, SPROUT_TOWER, MUSIC_SPROUT_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map SproutTower3F, TILESET_TOWER, DUNGEON, SPROUT_TOWER, MUSIC_SPROUT_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map TinTower1F, TILESET_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map TinTower2F, TILESET_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map TinTower3F, TILESET_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map TinTower4F, TILESET_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map TinTower5F, TILESET_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map TinTower6F, TILESET_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map TinTower7F, TILESET_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map TinTower8F, TILESET_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map TinTower9F, TILESET_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map BurnedTower1F, TILESET_TOWER, DUNGEON, BURNED_TOWER, MUSIC_BURNED_TOWER, TRUE, PALETTE_NITE, FISHGROUP_SHORE + map BurnedTowerB1F, TILESET_CAVE, CAVE, BURNED_TOWER, MUSIC_BURNED_TOWER, TRUE, PALETTE_NITE, FISHGROUP_SHORE + map NationalPark, TILESET_PARK, ROUTE, NATIONAL_PARK, MUSIC_NATIONAL_PARK, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map NationalParkBugContest, TILESET_PARK, ROUTE, NATIONAL_PARK, MUSIC_BUG_CATCHING_CONTEST, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map RadioTower1F, TILESET_RADIO_TOWER, INDOOR, RADIO_TOWER, RADIO_TOWER_MUSIC | MUSIC_GOLDENROD_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map RadioTower2F, TILESET_RADIO_TOWER, INDOOR, RADIO_TOWER, RADIO_TOWER_MUSIC | MUSIC_GOLDENROD_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map RadioTower3F, TILESET_RADIO_TOWER, INDOOR, RADIO_TOWER, RADIO_TOWER_MUSIC | MUSIC_GOLDENROD_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map RadioTower4F, TILESET_RADIO_TOWER, INDOOR, RADIO_TOWER, RADIO_TOWER_MUSIC | MUSIC_GOLDENROD_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map RadioTower5F, TILESET_RADIO_TOWER, INDOOR, RADIO_TOWER, RADIO_TOWER_MUSIC | MUSIC_GOLDENROD_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map RuinsOfAlphOutside, TILESET_JOHTO, ROUTE, RUINS_OF_ALPH, MUSIC_UNION_CAVE, FALSE, PALETTE_AUTO, FISHGROUP_POND + map RuinsOfAlphHoOhChamber, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map RuinsOfAlphKabutoChamber, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map RuinsOfAlphOmanyteChamber, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map RuinsOfAlphAerodactylChamber, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map RuinsOfAlphInnerChamber, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_RUINS_OF_ALPH_INTERIOR, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map RuinsOfAlphResearchCenter, TILESET_FACILITY, INDOOR, RUINS_OF_ALPH, MUSIC_UNION_CAVE, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map RuinsOfAlphHoOhItemRoom, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map RuinsOfAlphKabutoItemRoom, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map RuinsOfAlphOmanyteItemRoom, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map RuinsOfAlphAerodactylItemRoom, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map RuinsOfAlphHoOhWordRoom, TILESET_HO_OH_WORD_ROOM, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map RuinsOfAlphKabutoWordRoom, TILESET_KABUTO_WORD_ROOM, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map RuinsOfAlphOmanyteWordRoom, TILESET_OMANYTE_WORD_ROOM, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map RuinsOfAlphAerodactylWordRoom, TILESET_AERODACTYL_WORD_ROOM, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map UnionCave1F, TILESET_CAVE, CAVE, UNION_CAVE, MUSIC_UNION_CAVE, TRUE, PALETTE_NITE, FISHGROUP_LAKE + map UnionCaveB1F, TILESET_CAVE, CAVE, UNION_CAVE, MUSIC_UNION_CAVE, TRUE, PALETTE_NITE, FISHGROUP_LAKE + map UnionCaveB2F, TILESET_CAVE, CAVE, UNION_CAVE, MUSIC_UNION_CAVE, TRUE, PALETTE_NITE, FISHGROUP_SHORE + map SlowpokeWellB1F, TILESET_CAVE, CAVE, SLOWPOKE_WELL, MUSIC_DARK_CAVE, TRUE, PALETTE_NITE, FISHGROUP_LAKE + map SlowpokeWellB2F, TILESET_CAVE, CAVE, SLOWPOKE_WELL, MUSIC_DARK_CAVE, TRUE, PALETTE_NITE, FISHGROUP_LAKE + map OlivineLighthouse1F, TILESET_LIGHTHOUSE, DUNGEON, LIGHTHOUSE, MUSIC_LIGHTHOUSE, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map OlivineLighthouse2F, TILESET_LIGHTHOUSE, DUNGEON, LIGHTHOUSE, MUSIC_LIGHTHOUSE, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map OlivineLighthouse3F, TILESET_LIGHTHOUSE, DUNGEON, LIGHTHOUSE, MUSIC_LIGHTHOUSE, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map OlivineLighthouse4F, TILESET_LIGHTHOUSE, DUNGEON, LIGHTHOUSE, MUSIC_LIGHTHOUSE, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map OlivineLighthouse5F, TILESET_LIGHTHOUSE, DUNGEON, LIGHTHOUSE, MUSIC_LIGHTHOUSE, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map OlivineLighthouse6F, TILESET_LIGHTHOUSE, DUNGEON, LIGHTHOUSE, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map MahoganyMart1F, TILESET_TRADITIONAL_HOUSE, INDOOR, MAHOGANY_TOWN, MUSIC_MAHOGANY_MART, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map TeamRocketBaseB1F, TILESET_UNDERGROUND, DUNGEON, MAHOGANY_TOWN, MUSIC_ROCKET_HIDEOUT, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map TeamRocketBaseB2F, TILESET_FACILITY, DUNGEON, MAHOGANY_TOWN, MUSIC_ROCKET_HIDEOUT, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map TeamRocketBaseB3F, TILESET_FACILITY, DUNGEON, MAHOGANY_TOWN, MUSIC_ROCKET_HIDEOUT, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map IlexForest, TILESET_FOREST, CAVE, ILEX_FOREST, MUSIC_UNION_CAVE, FALSE, PALETTE_NITE, FISHGROUP_POND + map GoldenrodUnderground, TILESET_GATE, DUNGEON, GOLDENROD_CITY, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map GoldenrodUndergroundSwitchRoomEntrances, TILESET_ELITE_FOUR_ROOM, DUNGEON, GOLDENROD_CITY, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map GoldenrodDeptStoreB1F, TILESET_UNDERGROUND, DUNGEON, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map GoldenrodUndergroundWarehouse, TILESET_UNDERGROUND, DUNGEON, GOLDENROD_CITY, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map MountMortar1FOutside, TILESET_DARK_CAVE, CAVE, MT_MORTAR, MUSIC_UNION_CAVE, TRUE, PALETTE_NITE, FISHGROUP_LAKE + map MountMortar1FInside, TILESET_DARK_CAVE, CAVE, MT_MORTAR, MUSIC_UNION_CAVE, TRUE, PALETTE_NITE, FISHGROUP_LAKE + map MountMortar2FInside, TILESET_DARK_CAVE, CAVE, MT_MORTAR, MUSIC_UNION_CAVE, TRUE, PALETTE_NITE, FISHGROUP_LAKE + map MountMortarB1F, TILESET_DARK_CAVE, CAVE, MT_MORTAR, MUSIC_UNION_CAVE, TRUE, PALETTE_NITE, FISHGROUP_LAKE + map IcePath1F, TILESET_ICE_PATH, CAVE, ICE_PATH, MUSIC_DARK_CAVE, TRUE, PALETTE_NITE, FISHGROUP_DRATINI + map IcePathB1F, TILESET_ICE_PATH, CAVE, ICE_PATH, MUSIC_DARK_CAVE, TRUE, PALETTE_NITE, FISHGROUP_DRATINI + map IcePathB2FMahoganySide, TILESET_ICE_PATH, CAVE, ICE_PATH, MUSIC_DARK_CAVE, TRUE, PALETTE_NITE, FISHGROUP_DRATINI + map IcePathB2FBlackthornSide, TILESET_ICE_PATH, CAVE, ICE_PATH, MUSIC_DARK_CAVE, TRUE, PALETTE_NITE, FISHGROUP_DRATINI + map IcePathB3F, TILESET_ICE_PATH, CAVE, ICE_PATH, MUSIC_DARK_CAVE, TRUE, PALETTE_NITE, FISHGROUP_DRATINI + map WhirlIslandNW, TILESET_DARK_CAVE, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, TRUE, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS + map WhirlIslandNE, TILESET_DARK_CAVE, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, TRUE, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS + map WhirlIslandSW, TILESET_DARK_CAVE, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, TRUE, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS + map WhirlIslandCave, TILESET_DARK_CAVE, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, TRUE, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS + map WhirlIslandSE, TILESET_DARK_CAVE, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, TRUE, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS + map WhirlIslandB1F, TILESET_DARK_CAVE, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, TRUE, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS + map WhirlIslandB2F, TILESET_DARK_CAVE, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, TRUE, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS + map WhirlIslandLugiaChamber, TILESET_DARK_CAVE, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, TRUE, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS + map SilverCaveRoom1, TILESET_DARK_CAVE, CAVE, SILVER_CAVE, MUSIC_LIGHTHOUSE, TRUE, PALETTE_DARK, FISHGROUP_LAKE + map SilverCaveRoom2, TILESET_CAVE, CAVE, SILVER_CAVE, MUSIC_LIGHTHOUSE, TRUE, PALETTE_NITE, FISHGROUP_LAKE + map SilverCaveRoom3, TILESET_CAVE, CAVE, SILVER_CAVE, MUSIC_LIGHTHOUSE, TRUE, PALETTE_DAY, FISHGROUP_LAKE + map SilverCaveItemRooms, TILESET_CAVE, CAVE, SILVER_CAVE, MUSIC_LIGHTHOUSE, TRUE, PALETTE_NITE, FISHGROUP_LAKE + map DarkCaveVioletEntrance, TILESET_DARK_CAVE, CAVE, DARK_CAVE, MUSIC_DARK_CAVE, TRUE, PALETTE_DARK, FISHGROUP_LAKE + map DarkCaveBlackthornEntrance, TILESET_DARK_CAVE, CAVE, DARK_CAVE, MUSIC_DARK_CAVE, TRUE, PALETTE_DARK, FISHGROUP_LAKE + map DragonsDen1F, TILESET_CAVE, CAVE, DRAGONS_DEN, MUSIC_DRAGONS_DEN, TRUE, PALETTE_NITE, FISHGROUP_DRATINI + map DragonsDenB1F, TILESET_JOHTO, CAVE, DRAGONS_DEN, MUSIC_DRAGONS_DEN, TRUE, PALETTE_NITE, FISHGROUP_DRATINI + map DragonShrine, TILESET_LAB, INDOOR, DRAGONS_DEN, MUSIC_DRAGONS_DEN, TRUE, PALETTE_NITE, FISHGROUP_SHORE + map TohjoFalls, TILESET_CAVE, CAVE, TOHJO_FALLS, MUSIC_UNION_CAVE, TRUE, PALETTE_NITE, FISHGROUP_LAKE + map DiglettsCave, TILESET_CAVE, CAVE, DIGLETTS_CAVE, MUSIC_MT_MOON, TRUE, PALETTE_NITE, FISHGROUP_SHORE + map MountMoon, TILESET_CAVE, CAVE, MT_MOON, MUSIC_MT_MOON, TRUE, PALETTE_NITE, FISHGROUP_SHORE + map UndergroundPath, TILESET_UNDERGROUND, GATE, UNDERGROUND_PATH, MUSIC_MT_MOON, FALSE, PALETTE_NITE, FISHGROUP_SHORE + map RockTunnel1F, TILESET_DARK_CAVE, CAVE, ROCK_TUNNEL, MUSIC_MT_MOON, TRUE, PALETTE_DARK, FISHGROUP_SHORE + map RockTunnelB1F, TILESET_DARK_CAVE, CAVE, ROCK_TUNNEL, MUSIC_MT_MOON, TRUE, PALETTE_DARK, FISHGROUP_SHORE + map SafariZoneFuchsiaGateBeta, TILESET_GATE, INDOOR, FUCHSIA_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map SafariZoneBeta, TILESET_PARK, CAVE, FUCHSIA_CITY, MUSIC_EVOLUTION, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map VictoryRoad, TILESET_CAVE, CAVE, VICTORY_ROAD, MUSIC_VICTORY_ROAD, TRUE, PALETTE_NITE, FISHGROUP_SHORE -INCLUDE "data/maps/blocks.asm" +MapGroup_Ecruteak: + map EcruteakTinTowerEntrance, TILESET_TOWER, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map WiseTriosRoom, TILESET_TRADITIONAL_HOUSE, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map EcruteakPokecenter1F, TILESET_POKECENTER, INDOOR, ECRUTEAK_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map EcruteakLugiaSpeechHouse, TILESET_TRADITIONAL_HOUSE, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map DanceTheatre, TILESET_TRADITIONAL_HOUSE, INDOOR, ECRUTEAK_CITY, MUSIC_DANCING_HALL, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map EcruteakMart, TILESET_MART, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map EcruteakGym, TILESET_TOWER, INDOOR, ECRUTEAK_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map EcruteakItemfinderHouse, TILESET_TRADITIONAL_HOUSE, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map EcruteakCity, TILESET_JOHTO, TOWN, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_AUTO, FISHGROUP_POND -INCLUDE "data/maps/scripts.asm" +MapGroup_Blackthorn: + map BlackthornGym1F, TILESET_ELITE_FOUR_ROOM, INDOOR, BLACKTHORN_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map BlackthornGym2F, TILESET_ELITE_FOUR_ROOM, INDOOR, BLACKTHORN_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map BlackthornDragonSpeechHouse, TILESET_HOUSE, INDOOR, BLACKTHORN_CITY, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map BlackthornEmysHouse, TILESET_HOUSE, INDOOR, BLACKTHORN_CITY, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map BlackthornMart, TILESET_MART, INDOOR, BLACKTHORN_CITY, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map BlackthornPokecenter1F, TILESET_POKECENTER, INDOOR, BLACKTHORN_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map MoveDeletersHouse, TILESET_HOUSE, INDOOR, BLACKTHORN_CITY, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map Route45, TILESET_JOHTO, ROUTE, ROUTE_45, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_DRATINI_2 + map Route46, TILESET_JOHTO, ROUTE, ROUTE_46, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map BlackthornCity, TILESET_JOHTO, TOWN, BLACKTHORN_CITY, MUSIC_AZALEA_TOWN, FALSE, PALETTE_AUTO, FISHGROUP_POND + +MapGroup_Cinnabar: + map CinnabarPokecenter1F, TILESET_POKECENTER, INDOOR, CINNABAR_ISLAND, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map CinnabarPokecenter2FBeta, TILESET_POKECENTER, INDOOR, CINNABAR_ISLAND, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map Route19FuchsiaGate, TILESET_GATE, GATE, ROUTE_19, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map SeafoamGym, TILESET_CAVE, INDOOR, SEAFOAM_ISLANDS, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map Route19, TILESET_KANTO, ROUTE, ROUTE_19, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map Route20, TILESET_KANTO, ROUTE, ROUTE_20, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN + map Route21, TILESET_KANTO, ROUTE, ROUTE_21, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN + map CinnabarIsland, TILESET_KANTO, TOWN, CINNABAR_ISLAND, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN + +MapGroup_Cerulean: + map CeruleanGymBadgeSpeechHouse, TILESET_HOUSE, INDOOR, CERULEAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map CeruleanPoliceStation, TILESET_HOUSE, INDOOR, CERULEAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map CeruleanTradeSpeechHouse, TILESET_HOUSE, INDOOR, CERULEAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map CeruleanPokecenter1F, TILESET_POKECENTER, INDOOR, CERULEAN_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map CeruleanPokecenter2FBeta, TILESET_POKECENTER, INDOOR, CERULEAN_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map CeruleanGym, TILESET_PORT, INDOOR, CERULEAN_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_NONE + map CeruleanMart, TILESET_MART, INDOOR, CERULEAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map Route10Pokecenter1F, TILESET_POKECENTER, INDOOR, ROUTE_10, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map Route10Pokecenter2FBeta, TILESET_POKECENTER, INDOOR, ROUTE_10, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map PowerPlant, TILESET_FACILITY, INDOOR, POWER_PLANT, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map BillsHouse, TILESET_HOUSE, INDOOR, ROUTE_25, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map Route4, TILESET_KANTO, ROUTE, ROUTE_4, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_NONE + map Route9, TILESET_KANTO, ROUTE, ROUTE_9, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_LAKE + map Route10North, TILESET_KANTO, ROUTE, ROUTE_10, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_LAKE + map Route24, TILESET_KANTO, ROUTE, ROUTE_24, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_LAKE + map Route25, TILESET_KANTO, ROUTE, ROUTE_25, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_LAKE + map CeruleanCity, TILESET_KANTO, TOWN, CERULEAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_AUTO, FISHGROUP_NONE + +MapGroup_Azalea: + map AzaleaPokecenter1F, TILESET_POKECENTER, INDOOR, AZALEA_TOWN, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map CharcoalKiln, TILESET_HOUSE, INDOOR, AZALEA_TOWN, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map AzaleaMart, TILESET_MART, INDOOR, AZALEA_TOWN, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map KurtsHouse, TILESET_TRADITIONAL_HOUSE, INDOOR, AZALEA_TOWN, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map AzaleaGym, TILESET_ELITE_FOUR_ROOM, INDOOR, AZALEA_TOWN, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map Route33, TILESET_JOHTO_MODERN, ROUTE, ROUTE_33, MUSIC_ROUTE_30, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map AzaleaTown, TILESET_JOHTO_MODERN, TOWN, AZALEA_TOWN, MUSIC_AZALEA_TOWN, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + +MapGroup_LakeOfRage: + map LakeOfRageHiddenPowerHouse, TILESET_HOUSE, INDOOR, LAKE_OF_RAGE, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map LakeOfRageMagikarpHouse, TILESET_HOUSE, INDOOR, LAKE_OF_RAGE, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map Route43MahoganyGate, TILESET_GATE, GATE, ROUTE_43, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map Route43Gate, TILESET_GATE, GATE, ROUTE_43, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map Route43, TILESET_JOHTO, ROUTE, ROUTE_43, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_POND + map LakeOfRage, TILESET_JOHTO, TOWN, LAKE_OF_RAGE, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_GYARADOS + +MapGroup_Violet: + map Route32, TILESET_JOHTO, ROUTE, ROUTE_32, MUSIC_ROUTE_30, FALSE, PALETTE_AUTO, FISHGROUP_QWILFISH + map Route35, TILESET_JOHTO, ROUTE, ROUTE_35, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_POND + map Route36, TILESET_JOHTO, ROUTE, ROUTE_36, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map Route37, TILESET_JOHTO, ROUTE, ROUTE_37, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map VioletCity, TILESET_JOHTO, TOWN, VIOLET_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_AUTO, FISHGROUP_POND + map VioletMart, TILESET_MART, INDOOR, VIOLET_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map VioletGym, TILESET_ELITE_FOUR_ROOM, INDOOR, VIOLET_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map EarlsPokemonAcademy, TILESET_LAB, INDOOR, VIOLET_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map VioletNicknameSpeechHouse, TILESET_TRADITIONAL_HOUSE, INDOOR, VIOLET_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map VioletPokecenter1F, TILESET_POKECENTER, INDOOR, VIOLET_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map VioletKylesHouse, TILESET_TRADITIONAL_HOUSE, INDOOR, VIOLET_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map Route32RuinsOfAlphGate, TILESET_GATE, GATE, ROUTE_32, MUSIC_ROUTE_30, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map Route32Pokecenter1F, TILESET_POKECENTER, INDOOR, ROUTE_32, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map Route35GoldenrodGate, TILESET_GATE, GATE, ROUTE_35, MUSIC_ROUTE_36, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map Route35NationalParkGate, TILESET_GATE, INDOOR, ROUTE_35, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map Route36RuinsOfAlphGate, TILESET_GATE, GATE, ROUTE_36, MUSIC_ROUTE_36, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map Route36NationalParkGate, TILESET_GATE, INDOOR, ROUTE_36, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + +MapGroup_Goldenrod: + map Route34, TILESET_JOHTO_MODERN, ROUTE, ROUTE_34, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map GoldenrodCity, TILESET_JOHTO_MODERN, TOWN, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map GoldenrodGym, TILESET_ELITE_FOUR_ROOM, INDOOR, GOLDENROD_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map GoldenrodBikeShop, TILESET_CHAMPIONS_ROOM, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map GoldenrodHappinessRater, TILESET_HOUSE, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map BillsFamilysHouse, TILESET_HOUSE, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map GoldenrodMagnetTrainStation, TILESET_TRAIN_STATION, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map GoldenrodFlowerShop, TILESET_HOUSE, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map GoldenrodPPSpeechHouse, TILESET_HOUSE, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map GoldenrodNameRater, TILESET_HOUSE, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map GoldenrodDeptStore1F, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map GoldenrodDeptStore2F, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map GoldenrodDeptStore3F, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map GoldenrodDeptStore4F, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map GoldenrodDeptStore5F, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map GoldenrodDeptStore6F, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map GoldenrodDeptStoreElevator, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map GoldenrodDeptStoreRoof, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map GoldenrodGameCorner, TILESET_GAME_CORNER, INDOOR, GOLDENROD_CITY, MUSIC_GAME_CORNER, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map GoldenrodPokecenter1F, TILESET_POKECENTER, INDOOR, GOLDENROD_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map PokecomCenterAdminOfficeMobile, TILESET_POKECOM_CENTER, INDOOR, GOLDENROD_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map IlexForestAzaleaGate, TILESET_GATE, GATE, ROUTE_34, MUSIC_ROUTE_36, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map Route34IlexForestGate, TILESET_GATE, GATE, ROUTE_34, MUSIC_ROUTE_36, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map DayCare, TILESET_HOUSE, INDOOR, ROUTE_34, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE + +MapGroup_Vermilion: + map Route6, TILESET_KANTO, ROUTE, ROUTE_6, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_POND + map Route11, TILESET_KANTO, ROUTE, ROUTE_11, MUSIC_ROUTE_12, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map VermilionCity, TILESET_KANTO, TOWN, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN + map VermilionFishingSpeechHouse, TILESET_HOUSE, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map VermilionPokecenter1F, TILESET_POKECENTER, INDOOR, VERMILION_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map VermilionPokecenter2FBeta, TILESET_POKECENTER, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map PokemonFanClub, TILESET_HOUSE, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map VermilionMagnetTrainSpeechHouse, TILESET_HOUSE, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map VermilionMart, TILESET_MART, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map VermilionDiglettsCaveSpeechHouse, TILESET_HOUSE, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map VermilionGym, TILESET_GAME_CORNER, INDOOR, VERMILION_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map Route6SaffronGate, TILESET_GATE, GATE, ROUTE_6, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map Route6UndergroundPathEntrance, TILESET_GATE, GATE, ROUTE_6, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE + +MapGroup_Pallet: + map Route1, TILESET_KANTO, ROUTE, ROUTE_1, MUSIC_ROUTE_1, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map PalletTown, TILESET_KANTO, TOWN, PALLET_TOWN, MUSIC_PALLET_TOWN, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN + map RedsHouse1F, TILESET_PLAYERS_HOUSE, INDOOR, PALLET_TOWN, MUSIC_PALLET_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map RedsHouse2F, TILESET_PLAYERS_HOUSE, INDOOR, PALLET_TOWN, MUSIC_PALLET_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map BluesHouse, TILESET_HOUSE, INDOOR, PALLET_TOWN, MUSIC_PALLET_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map OaksLab, TILESET_LAB, INDOOR, PALLET_TOWN, MUSIC_POKEMON_TALK, FALSE, PALETTE_DAY, FISHGROUP_SHORE + +MapGroup_Pewter: + map Route3, TILESET_KANTO, ROUTE, ROUTE_3, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map PewterCity, TILESET_KANTO, TOWN, PEWTER_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map PewterNidoranSpeechHouse, TILESET_HOUSE, INDOOR, PEWTER_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map PewterGym, TILESET_TOWER, INDOOR, PEWTER_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map PewterMart, TILESET_MART, INDOOR, PEWTER_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map PewterPokecenter1F, TILESET_POKECENTER, INDOOR, PEWTER_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map PewterPokecenter2FBeta, TILESET_POKECENTER, INDOOR, PEWTER_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map PewterSnoozeSpeechHouse, TILESET_HOUSE, INDOOR, PEWTER_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + +MapGroup_FastShip: + map OlivinePort, TILESET_PORT, ROUTE, OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN + map VermilionPort, TILESET_PORT, ROUTE, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN + map FastShip1F, TILESET_LIGHTHOUSE, INDOOR, FAST_SHIP, MUSIC_SS_AQUA, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map FastShipCabins_NNW_NNE_NE, TILESET_LIGHTHOUSE, INDOOR, FAST_SHIP, MUSIC_SS_AQUA, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map FastShipCabins_SW_SSW_NW, TILESET_LIGHTHOUSE, INDOOR, FAST_SHIP, MUSIC_SS_AQUA, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map FastShipCabins_SE_SSE_CaptainsCabin, TILESET_LIGHTHOUSE, INDOOR, FAST_SHIP, MUSIC_SS_AQUA, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map FastShipB1F, TILESET_LIGHTHOUSE, INDOOR, FAST_SHIP, MUSIC_SS_AQUA, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map OlivinePortPassage, TILESET_UNDERGROUND, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map VermilionPortPassage, TILESET_UNDERGROUND, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map MountMoonSquare, TILESET_KANTO, ROUTE, MT_MOON, MUSIC_MT_MOON_SQUARE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map MountMoonGiftShop, TILESET_TRADITIONAL_HOUSE, INDOOR, MT_MOON, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map TinTowerRoof, TILESET_TOWER, ROUTE, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + +MapGroup_Indigo: + map Route23, TILESET_KANTO, TOWN, ROUTE_23, MUSIC_INDIGO_PLATEAU, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map IndigoPlateauPokecenter1F, TILESET_POKECENTER, INDOOR, INDIGO_PLATEAU, MUSIC_INDIGO_PLATEAU, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map WillsRoom, TILESET_ELITE_FOUR_ROOM, INDOOR, INDIGO_PLATEAU, MUSIC_INDIGO_PLATEAU, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map KogasRoom, TILESET_ELITE_FOUR_ROOM, INDOOR, INDIGO_PLATEAU, MUSIC_INDIGO_PLATEAU, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map BrunosRoom, TILESET_ELITE_FOUR_ROOM, INDOOR, INDIGO_PLATEAU, MUSIC_INDIGO_PLATEAU, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map KarensRoom, TILESET_ELITE_FOUR_ROOM, INDOOR, INDIGO_PLATEAU, MUSIC_INDIGO_PLATEAU, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map LancesRoom, TILESET_CHAMPIONS_ROOM, INDOOR, INDIGO_PLATEAU, MUSIC_INDIGO_PLATEAU, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map HallOfFame, TILESET_ICE_PATH, INDOOR, INDIGO_PLATEAU, MUSIC_NEW_BARK_TOWN, TRUE, PALETTE_DAY, FISHGROUP_SHORE + +MapGroup_Fuchsia: + map Route13, TILESET_KANTO, ROUTE, ROUTE_13, MUSIC_ROUTE_12, FALSE, PALETTE_AUTO, FISHGROUP_QWILFISH_NO_SWARM + map Route14, TILESET_KANTO, ROUTE, ROUTE_14, MUSIC_ROUTE_12, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map Route15, TILESET_KANTO, ROUTE, ROUTE_15, MUSIC_ROUTE_12, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map Route18, TILESET_KANTO, ROUTE, ROUTE_18, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map FuchsiaCity, TILESET_KANTO, TOWN, FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_AUTO, FISHGROUP_GYARADOS + map FuchsiaMart, TILESET_MART, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map SafariZoneMainOffice, TILESET_GAME_CORNER, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map FuchsiaGym, TILESET_LAB, INDOOR, FUCHSIA_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map BillsBrothersHouse, TILESET_HOUSE, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map FuchsiaPokecenter1F, TILESET_POKECENTER, INDOOR, FUCHSIA_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map FuchsiaPokecenter2FBeta, TILESET_POKECENTER, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map SafariZoneWardensHome, TILESET_HOUSE, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map Route15FuchsiaGate, TILESET_GATE, GATE, ROUTE_15, MUSIC_ROUTE_12, FALSE, PALETTE_DAY, FISHGROUP_SHORE + +MapGroup_Lavender: + map Route8, TILESET_KANTO, ROUTE, ROUTE_8, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map Route12, TILESET_KANTO, ROUTE, ROUTE_12, MUSIC_ROUTE_12, FALSE, PALETTE_AUTO, FISHGROUP_QWILFISH_NO_SWARM + map Route10South, TILESET_KANTO, ROUTE, ROUTE_10, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_LAKE + map LavenderTown, TILESET_KANTO, TOWN, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map LavenderPokecenter1F, TILESET_POKECENTER, INDOOR, LAVENDER_TOWN, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map LavenderPokecenter2FBeta, TILESET_POKECENTER, INDOOR, LAVENDER_TOWN, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map MrFujisHouse, TILESET_HOUSE, INDOOR, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map LavenderSpeechHouse, TILESET_HOUSE, INDOOR, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map LavenderNameRater, TILESET_HOUSE, INDOOR, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map LavenderMart, TILESET_MART, INDOOR, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map SoulHouse, TILESET_HOUSE, INDOOR, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map LavRadioTower1F, TILESET_RADIO_TOWER, INDOOR, LAV_RADIO_TOWER, MUSIC_LAVENDER_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map Route8SaffronGate, TILESET_GATE, GATE, ROUTE_8, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map Route12SuperRodHouse, TILESET_HOUSE, INDOOR, ROUTE_12, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + +MapGroup_Silver: + map Route28, TILESET_KANTO, ROUTE, ROUTE_28, MUSIC_INDIGO_PLATEAU, FALSE, PALETTE_AUTO, FISHGROUP_POND + map SilverCaveOutside, TILESET_KANTO, TOWN, SILVER_CAVE, MUSIC_INDIGO_PLATEAU, FALSE, PALETTE_AUTO, FISHGROUP_POND + map SilverCavePokecenter1F, TILESET_POKECENTER, INDOOR, SILVER_CAVE, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map Route28SteelWingHouse, TILESET_HOUSE, INDOOR, ROUTE_28, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE + +MapGroup_CableClub: + map Pokecenter2F, TILESET_POKECENTER, INDOOR, SPECIAL_MAP, MUSIC_POKEMON_CENTER, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map TradeCenter, TILESET_GATE, INDOOR, SPECIAL_MAP, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map Colosseum, TILESET_GATE, INDOOR, SPECIAL_MAP, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map TimeCapsule, TILESET_GATE, INDOOR, SPECIAL_MAP, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map MobileTradeRoom, TILESET_MANSION, INDOOR, SPECIAL_MAP, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map MobileBattleRoom, TILESET_MANSION, INDOOR, SPECIAL_MAP, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE + +MapGroup_Celadon: + map Route7, TILESET_KANTO, ROUTE, ROUTE_7, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map Route16, TILESET_KANTO, ROUTE, ROUTE_16, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map Route17, TILESET_KANTO, ROUTE, ROUTE_17, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_NONE + map CeladonCity, TILESET_KANTO, TOWN, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_AUTO, FISHGROUP_NONE + map CeladonDeptStore1F, TILESET_MART, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map CeladonDeptStore2F, TILESET_MART, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map CeladonDeptStore3F, TILESET_MART, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map CeladonDeptStore4F, TILESET_MART, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map CeladonDeptStore5F, TILESET_MART, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map CeladonDeptStore6F, TILESET_MART, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map CeladonDeptStoreElevator, TILESET_MART, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map CeladonMansion1F, TILESET_MANSION, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map CeladonMansion2F, TILESET_MANSION, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map CeladonMansion3F, TILESET_MANSION, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map CeladonMansionRoof, TILESET_MANSION, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map CeladonMansionRoofHouse, TILESET_HOUSE, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map CeladonPokecenter1F, TILESET_POKECENTER, INDOOR, CELADON_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map CeladonPokecenter2FBeta, TILESET_POKECENTER, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map CeladonGameCorner, TILESET_GAME_CORNER, INDOOR, CELADON_CITY, MUSIC_GAME_CORNER, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map CeladonGameCornerPrizeRoom, TILESET_GAME_CORNER, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map CeladonGym, TILESET_TRAIN_STATION, INDOOR, CELADON_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map CeladonCafe, TILESET_GAME_CORNER, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map Route16FuchsiaSpeechHouse, TILESET_HOUSE, INDOOR, ROUTE_16, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map Route16Gate, TILESET_GATE, GATE, ROUTE_16, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map Route7SaffronGate, TILESET_GATE, GATE, ROUTE_7, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map Route17Route18Gate, TILESET_GATE, GATE, ROUTE_17, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE + +MapGroup_Cianwood: + map Route40, TILESET_JOHTO, ROUTE, ROUTE_40, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map Route41, TILESET_JOHTO, ROUTE, ROUTE_41, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN + map CianwoodCity, TILESET_JOHTO, TOWN, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map ManiasHouse, TILESET_HOUSE, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map CianwoodGym, TILESET_TOWER, INDOOR, CIANWOOD_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map CianwoodPokecenter1F, TILESET_POKECENTER, INDOOR, CIANWOOD_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map CianwoodPharmacy, TILESET_HOUSE, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map CianwoodPhotoStudio, TILESET_HOUSE, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map CianwoodLugiaSpeechHouse, TILESET_HOUSE, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map PokeSeersHouse, TILESET_HOUSE, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map BattleTower1F, TILESET_BATTLE_TOWER, INDOOR, BATTLE_TOWER, MUSIC_BATTLE_TOWER_LOBBY, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map BattleTowerBattleRoom, TILESET_BATTLE_TOWER, INDOOR, BATTLE_TOWER, MUSIC_BATTLE_TOWER_THEME, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map BattleTowerElevator, TILESET_BATTLE_TOWER, INDOOR, BATTLE_TOWER, MUSIC_NONE, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map BattleTowerHallway, TILESET_BATTLE_TOWER, INDOOR, BATTLE_TOWER, MUSIC_BATTLE_TOWER_THEME, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map Route40BattleTowerGate, TILESET_GATE, GATE, BATTLE_TOWER, MUSIC_ROUTE_36, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map BattleTowerOutside, TILESET_BATTLE_TOWER_OUTSIDE, ROUTE, BATTLE_TOWER, MUSIC_BATTLE_TOWER_THEME, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + +MapGroup_Viridian: + map Route2, TILESET_KANTO, ROUTE, ROUTE_2, MUSIC_ROUTE_2, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map Route22, TILESET_KANTO, ROUTE, ROUTE_22, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_POND + map ViridianCity, TILESET_KANTO, TOWN, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_AUTO, FISHGROUP_POND + map ViridianGym, TILESET_TRAIN_STATION, INDOOR, VIRIDIAN_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map ViridianNicknameSpeechHouse, TILESET_HOUSE, INDOOR, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map TrainerHouse1F, TILESET_HOUSE, INDOOR, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map TrainerHouseB1F, TILESET_FACILITY, INDOOR, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map ViridianMart, TILESET_MART, INDOOR, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map ViridianPokecenter1F, TILESET_POKECENTER, INDOOR, VIRIDIAN_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map ViridianPokecenter2FBeta, TILESET_POKECENTER, INDOOR, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map Route2NuggetHouse, TILESET_HOUSE, INDOOR, ROUTE_2, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map Route2Gate, TILESET_GATE, GATE, ROUTE_2, MUSIC_ROUTE_2, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map VictoryRoadGate, TILESET_GATE, GATE, ROUTE_26, MUSIC_INDIGO_PLATEAU, FALSE, PALETTE_DAY, FISHGROUP_SHORE + +MapGroup_NewBark: + map Route26, TILESET_JOHTO, ROUTE, ROUTE_26, MUSIC_ROUTE_26, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN + map Route27, TILESET_JOHTO, ROUTE, ROUTE_27, MUSIC_ROUTE_26, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN + map Route29, TILESET_JOHTO, ROUTE, ROUTE_29, MUSIC_ROUTE_29, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map NewBarkTown, TILESET_JOHTO, TOWN, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN + map ElmsLab, TILESET_LAB, INDOOR, NEW_BARK_TOWN, MUSIC_PROF_ELM, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map PlayersHouse1F, TILESET_PLAYERS_HOUSE, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map PlayersHouse2F, TILESET_PLAYERS_ROOM, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map PlayersNeighborsHouse, TILESET_HOUSE, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map ElmsHouse, TILESET_PLAYERS_HOUSE, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map Route26HealHouse, TILESET_HOUSE, INDOOR, ROUTE_26, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map DayOfWeekSiblingsHouse, TILESET_HOUSE, INDOOR, ROUTE_26, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map Route27SandstormHouse, TILESET_HOUSE, INDOOR, ROUTE_27, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map Route29Route46Gate, TILESET_GATE, GATE, ROUTE_29, MUSIC_ROUTE_29, FALSE, PALETTE_DAY, FISHGROUP_SHORE + +MapGroup_Saffron: + map Route5, TILESET_KANTO, ROUTE, ROUTE_5, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map SaffronCity, TILESET_KANTO, TOWN, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map FightingDojo, TILESET_TRAIN_STATION, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map SaffronGym, TILESET_UNDERGROUND, INDOOR, SAFFRON_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map SaffronMart, TILESET_MART, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map SaffronPokecenter1F, TILESET_POKECENTER, INDOOR, SAFFRON_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map SaffronPokecenter2FBeta, TILESET_POKECENTER, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map MrPsychicsHouse, TILESET_HOUSE, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map SaffronMagnetTrainStation, TILESET_TRAIN_STATION, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map SilphCo1F, TILESET_FACILITY, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map CopycatsHouse1F, TILESET_PLAYERS_HOUSE, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map CopycatsHouse2F, TILESET_PLAYERS_HOUSE, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map Route5UndergroundPathEntrance, TILESET_GATE, GATE, ROUTE_5, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map Route5SaffronGate, TILESET_GATE, GATE, ROUTE_5, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map Route5CleanseTagHouse, TILESET_HOUSE, INDOOR, ROUTE_5, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + +MapGroup_Cherrygrove: + map Route30, TILESET_JOHTO, ROUTE, ROUTE_30, MUSIC_ROUTE_30, FALSE, PALETTE_AUTO, FISHGROUP_POND + map Route31, TILESET_JOHTO, ROUTE, ROUTE_31, MUSIC_ROUTE_30, FALSE, PALETTE_AUTO, FISHGROUP_POND + map CherrygroveCity, TILESET_JOHTO, TOWN, CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map CherrygroveMart, TILESET_MART, INDOOR, CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map CherrygrovePokecenter1F, TILESET_POKECENTER, INDOOR, CHERRYGROVE_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map CherrygroveGymSpeechHouse, TILESET_HOUSE, INDOOR, CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map GuideGentsHouse, TILESET_HOUSE, INDOOR, CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map CherrygroveEvolutionSpeechHouse, TILESET_HOUSE, INDOOR, CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map Route30BerryHouse, TILESET_HOUSE, INDOOR, ROUTE_30, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map MrPokemonsHouse, TILESET_FACILITY, INDOOR, ROUTE_30, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map Route31VioletGate, TILESET_GATE, GATE, ROUTE_31, MUSIC_ROUTE_30, FALSE, 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 2a1b8d3eb..0a27e97ca 100644 --- a/data/maps/roofs.asm +++ b/data/maps/roofs.asm @@ -1,39 +1,46 @@ -MapGroupRoofs: ; 1c021i +; MapGroupRoofs values; Roofs indexes + const_def + const ROOF_NEW_BARK ; 0 + const ROOF_VIOLET ; 1 + const ROOF_AZALEA ; 2 + const ROOF_OLIVINE ; 3 + const ROOF_GOLDENROD ; 4 + +MapGroupRoofs: ; entries correspond to map groups ; values are indexes for Roofs (see below) - db -1 ; group 0 (unused) - db 3 ; group 1 (Olivine) - db 2 ; group 2 (Mahogany) - db -1 ; group 3 - db 1 ; group 4 (Ecruteak) - db 2 ; group 5 (Blackthorn) - db -1 ; group 6 - db -1 ; group 7 - db 2 ; group 8 (Azalea) - db 2 ; group 9 (Lake of Rage) - db 1 ; group 10 (Violet) - db 4 ; group 11 (Goldenrod) - db -1 ; group 12 - db -1 ; group 13 - db -1 ; group 14 - db -1 ; group 15 - db -1 ; group 16 - db -1 ; group 17 - db -1 ; group 18 - db 0 ; group 19 (Silver Cave) - db -1 ; group 20 - db -1 ; group 21 - db 3 ; group 22 (Cianwood) - db -1 ; group 23 - db 0 ; group 24 (New Bark) - db -1 ; group 25 - db 0 ; group 26 (Cherrygrove) -; 1c03c + db -1 ; 0 + db ROOF_OLIVINE ; 1 (Olivine) + db ROOF_AZALEA ; 2 (Mahogany) + db -1 ; 3 + db ROOF_VIOLET ; 4 (Ecruteak) + db ROOF_AZALEA ; 5 (Blackthorn) + db -1 ; 6 + db -1 ; 7 + db ROOF_AZALEA ; 8 (Azalea) + db ROOF_AZALEA ; 9 (Lake of Rage) + db ROOF_VIOLET ; 10 (Violet) + db ROOF_GOLDENROD ; 11 (Goldenrod) + db -1 ; 12 + db -1 ; 13 + db -1 ; 14 + db -1 ; 15 + db -1 ; 16 + db -1 ; 17 + db -1 ; 18 + db ROOF_NEW_BARK ; 19 (Silver Cave) + db -1 ; 20 + db -1 ; 21 + db ROOF_OLIVINE ; 22 (Cianwood) + db -1 ; 23 + db ROOF_NEW_BARK ; 24 (New Bark) + db -1 ; 25 + db ROOF_NEW_BARK ; 26 (Cherrygrove) -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 a835d4895..9c820f9a6 100644 --- a/data/maps/scenes.asm +++ b/data/maps/scenes.asm @@ -1,89 +1,87 @@ -scene_def: MACRO -; db group, map -; dw address - map \1 +scene_var: MACRO +; map, variable + map_id \1 dw \2 ENDM -MapScenes:: ; 4d01e - scene_def POKECENTER_2F, wPokecenter2FSceneID - scene_def TRADE_CENTER, wTradeCenterSceneID - scene_def COLOSSEUM, wColosseumSceneID - scene_def TIME_CAPSULE, wTimeCapsuleSceneID - scene_def POWER_PLANT, wPowerPlantSceneID - scene_def CERULEAN_GYM, wCeruleanGymSceneID - scene_def ROUTE_25, wRoute25SceneID - scene_def TRAINER_HOUSE_B1F, wTrainerHouseB1FSceneID - scene_def VICTORY_ROAD_GATE, wVictoryRoadGateSceneID - scene_def SAFFRON_MAGNET_TRAIN_STATION, wSaffronMagnetTrainStationSceneID - scene_def ROUTE_16_GATE, wRoute16GateSceneID - scene_def ROUTE_17_ROUTE_18_GATE, wRoute17Route18GateSceneID - scene_def INDIGO_PLATEAU_POKECENTER_1F, wIndigoPlateauPokecenter1FSceneID - scene_def WILLS_ROOM, wWillsRoomSceneID - scene_def KOGAS_ROOM, wKogasRoomSceneID - scene_def BRUNOS_ROOM, wBrunosRoomSceneID - scene_def KARENS_ROOM, wKarensRoomSceneID - scene_def LANCES_ROOM, wLancesRoomSceneID - scene_def HALL_OF_FAME, wHallOfFameSceneID - scene_def ROUTE_27, wRoute27SceneID - scene_def NEW_BARK_TOWN, wNewBarkTownSceneID - scene_def ELMS_LAB, wElmsLabSceneID - scene_def KRISS_HOUSE_1F, wKrissHouse1FSceneID - scene_def ROUTE_29, wRoute29SceneID - scene_def CHERRYGROVE_CITY, wCherrygroveCitySceneID - scene_def MR_POKEMONS_HOUSE, wMrPokemonsHouseSceneID - scene_def ROUTE_32, wRoute32SceneID - scene_def ROUTE_35_NATIONAL_PARK_GATE, wRoute35NationalParkGateSceneID - scene_def ROUTE_36, wRoute36SceneID - scene_def ROUTE_36_NATIONAL_PARK_GATE, wRoute36NationalParkGateSceneID - scene_def AZALEA_TOWN, wAzaleaTownSceneID - scene_def GOLDENROD_GYM, wGoldenrodGymSceneID - scene_def GOLDENROD_MAGNET_TRAIN_STATION, wGoldenrodMagnetTrainStationSceneID - scene_def GOLDENROD_POKECENTER_1F, wGoldenrodPokecenter1FSceneID - scene_def OLIVINE_CITY, wOlivineCitySceneID - scene_def ROUTE_34, wRoute34SceneID - scene_def ROUTE_34_ILEX_FOREST_GATE, wRoute34IlexForestGateSceneID - scene_def ECRUTEAK_HOUSE, wEcruteakHouseSceneID - scene_def WISE_TRIOS_ROOM, wWiseTriosRoomSceneID - scene_def ECRUTEAK_POKECENTER_1F, wEcruteakPokecenter1FSceneID - scene_def ECRUTEAK_GYM, wEcruteakGymSceneID - scene_def MAHOGANY_TOWN, wMahoganyTownSceneID - scene_def ROUTE_42, wRoute42SceneID - scene_def CIANWOOD_CITY, wCianwoodCitySceneID - scene_def BATTLE_TOWER_1F, wBattleTower1FSceneID - scene_def BATTLE_TOWER_BATTLE_ROOM, wBattleTowerBattleRoomSceneID - scene_def BATTLE_TOWER_ELEVATOR, wBattleTowerElevatorSceneID - scene_def BATTLE_TOWER_HALLWAY, wBattleTowerHallwaySceneID - scene_def BATTLE_TOWER_OUTSIDE, wBattleTowerOutsideSceneID - scene_def ROUTE_43_GATE, wRoute43GateSceneID - scene_def MOUNT_MOON, wMountMoonSceneID - scene_def SPROUT_TOWER_3F, wSproutTower3FSceneID - scene_def TIN_TOWER_1F, wTinTower1FSceneID - scene_def BURNED_TOWER_1F, wBurnedTower1FSceneID - scene_def BURNED_TOWER_B1F, wBurnedTowerB1FSceneID - scene_def RADIO_TOWER_5F, wRadioTower5FSceneID - scene_def RUINS_OF_ALPH_OUTSIDE, wRuinsOfAlphOutsideSceneID - scene_def RUINS_OF_ALPH_RESEARCH_CENTER, wRuinsOfAlphResearchCenterSceneID - scene_def RUINS_OF_ALPH_HO_OH_CHAMBER, wRuinsOfAlphHoOhChamberSceneID - scene_def RUINS_OF_ALPH_KABUTO_CHAMBER, wRuinsOfAlphKabutoChamberSceneID - scene_def RUINS_OF_ALPH_OMANYTE_CHAMBER, wRuinsOfAlphOmanyteChamberSceneID - scene_def RUINS_OF_ALPH_AERODACTYL_CHAMBER, wRuinsOfAlphAerodactylChamberSceneID - scene_def RUINS_OF_ALPH_INNER_CHAMBER, wRuinsOfAlphInnerChamberSceneID - scene_def MAHOGANY_MART_1F, wMahoganyMart1FSceneID - scene_def TEAM_ROCKET_BASE_B1F, wTeamRocketBaseB1FSceneID - scene_def TEAM_ROCKET_BASE_B2F, wTeamRocketBaseB2FSceneID - scene_def TEAM_ROCKET_BASE_B3F, wTeamRocketBaseB3FSceneID - scene_def GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, wGoldenrodUndergroundSwitchRoomEntrancesSceneID - scene_def SILVER_CAVE_ROOM_3, wSilverCaveRoom3SceneID - scene_def VICTORY_ROAD, wVictoryRoadSceneID - scene_def DRAGONS_DEN_B1F, wDragonsDenB1FSceneID - scene_def DRAGON_SHRINE, wDragonShrineSceneID - scene_def OLIVINE_PORT, wOlivinePortSceneID - scene_def VERMILION_PORT, wVermilionPortSceneID - scene_def FAST_SHIP_1F, wFastShip1FSceneID - scene_def FAST_SHIP_B1F, wFastShipB1FSceneID - scene_def MOUNT_MOON_SQUARE, wMountMoonSquareSceneID - scene_def MOBILE_TRADE_ROOM_MOBILE, wMobileTradeRoomMobileSceneID - scene_def MOBILE_BATTLE_ROOM, wMobileBattleRoomSceneID +MapScenes:: + scene_var POKECENTER_2F, wPokecenter2FSceneID + scene_var TRADE_CENTER, wTradeCenterSceneID + scene_var COLOSSEUM, wColosseumSceneID + scene_var TIME_CAPSULE, wTimeCapsuleSceneID + scene_var POWER_PLANT, wPowerPlantSceneID + scene_var CERULEAN_GYM, wCeruleanGymSceneID + scene_var ROUTE_25, wRoute25SceneID + scene_var TRAINER_HOUSE_B1F, wTrainerHouseB1FSceneID + scene_var VICTORY_ROAD_GATE, wVictoryRoadGateSceneID + scene_var SAFFRON_MAGNET_TRAIN_STATION, wSaffronMagnetTrainStationSceneID + scene_var ROUTE_16_GATE, wRoute16GateSceneID + scene_var ROUTE_17_ROUTE_18_GATE, wRoute17Route18GateSceneID + scene_var INDIGO_PLATEAU_POKECENTER_1F, wIndigoPlateauPokecenter1FSceneID + scene_var WILLS_ROOM, wWillsRoomSceneID + scene_var KOGAS_ROOM, wKogasRoomSceneID + scene_var BRUNOS_ROOM, wBrunosRoomSceneID + scene_var KARENS_ROOM, wKarensRoomSceneID + scene_var LANCES_ROOM, wLancesRoomSceneID + scene_var HALL_OF_FAME, wHallOfFameSceneID + scene_var ROUTE_27, wRoute27SceneID + scene_var NEW_BARK_TOWN, wNewBarkTownSceneID + scene_var ELMS_LAB, wElmsLabSceneID + scene_var PLAYERS_HOUSE_1F, wPlayersHouse1FSceneID + scene_var ROUTE_29, wRoute29SceneID + scene_var CHERRYGROVE_CITY, wCherrygroveCitySceneID + scene_var MR_POKEMONS_HOUSE, wMrPokemonsHouseSceneID + scene_var ROUTE_32, wRoute32SceneID + scene_var ROUTE_35_NATIONAL_PARK_GATE, wRoute35NationalParkGateSceneID + scene_var ROUTE_36, wRoute36SceneID + scene_var ROUTE_36_NATIONAL_PARK_GATE, wRoute36NationalParkGateSceneID + scene_var AZALEA_TOWN, wAzaleaTownSceneID + scene_var GOLDENROD_GYM, wGoldenrodGymSceneID + scene_var GOLDENROD_MAGNET_TRAIN_STATION, wGoldenrodMagnetTrainStationSceneID + scene_var GOLDENROD_POKECENTER_1F, wGoldenrodPokecenter1FSceneID + scene_var OLIVINE_CITY, wOlivineCitySceneID + scene_var ROUTE_34, wRoute34SceneID ; unused + scene_var ROUTE_34_ILEX_FOREST_GATE, wRoute34IlexForestGateSceneID ; unused + scene_var ECRUTEAK_TIN_TOWER_ENTRANCE, wEcruteakTinTowerEntranceSceneID + scene_var WISE_TRIOS_ROOM, wWiseTriosRoomSceneID + scene_var ECRUTEAK_POKECENTER_1F, wEcruteakPokecenter1FSceneID + scene_var ECRUTEAK_GYM, wEcruteakGymSceneID + scene_var MAHOGANY_TOWN, wMahoganyTownSceneID + scene_var ROUTE_42, wRoute42SceneID + scene_var CIANWOOD_CITY, wCianwoodCitySceneID + scene_var BATTLE_TOWER_1F, wBattleTower1FSceneID + scene_var BATTLE_TOWER_BATTLE_ROOM, wBattleTowerBattleRoomSceneID + scene_var BATTLE_TOWER_ELEVATOR, wBattleTowerElevatorSceneID + scene_var BATTLE_TOWER_HALLWAY, wBattleTowerHallwaySceneID + scene_var BATTLE_TOWER_OUTSIDE, wBattleTowerOutsideSceneID ; unused + scene_var ROUTE_43_GATE, wRoute43GateSceneID + scene_var MOUNT_MOON, wMountMoonSceneID + scene_var SPROUT_TOWER_3F, wSproutTower3FSceneID + scene_var TIN_TOWER_1F, wTinTower1FSceneID + scene_var BURNED_TOWER_1F, wBurnedTower1FSceneID + scene_var BURNED_TOWER_B1F, wBurnedTowerB1FSceneID + scene_var RADIO_TOWER_5F, wRadioTower5FSceneID + scene_var RUINS_OF_ALPH_OUTSIDE, wRuinsOfAlphOutsideSceneID + scene_var RUINS_OF_ALPH_RESEARCH_CENTER, wRuinsOfAlphResearchCenterSceneID + scene_var RUINS_OF_ALPH_HO_OH_CHAMBER, wRuinsOfAlphHoOhChamberSceneID + scene_var RUINS_OF_ALPH_KABUTO_CHAMBER, wRuinsOfAlphKabutoChamberSceneID + scene_var RUINS_OF_ALPH_OMANYTE_CHAMBER, wRuinsOfAlphOmanyteChamberSceneID + scene_var RUINS_OF_ALPH_AERODACTYL_CHAMBER, wRuinsOfAlphAerodactylChamberSceneID + scene_var RUINS_OF_ALPH_INNER_CHAMBER, wRuinsOfAlphInnerChamberSceneID + scene_var MAHOGANY_MART_1F, wMahoganyMart1FSceneID + scene_var TEAM_ROCKET_BASE_B1F, wTeamRocketBaseB1FSceneID + scene_var TEAM_ROCKET_BASE_B2F, wTeamRocketBaseB2FSceneID + scene_var TEAM_ROCKET_BASE_B3F, wTeamRocketBaseB3FSceneID + scene_var GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES, wGoldenrodUndergroundSwitchRoomEntrancesSceneID + scene_var SILVER_CAVE_ROOM_3, wSilverCaveRoom3SceneID ; unused + scene_var VICTORY_ROAD, wVictoryRoadSceneID + scene_var DRAGONS_DEN_B1F, wDragonsDenB1FSceneID + scene_var DRAGON_SHRINE, wDragonShrineSceneID + scene_var OLIVINE_PORT, wOlivinePortSceneID + scene_var VERMILION_PORT, wVermilionPortSceneID + scene_var FAST_SHIP_1F, wFastShip1FSceneID + scene_var FAST_SHIP_B1F, wFastShipB1FSceneID + scene_var MOUNT_MOON_SQUARE, wMountMoonSquareSceneID + scene_var MOBILE_TRADE_ROOM, wMobileTradeRoomSceneID + scene_var MOBILE_BATTLE_ROOM, wMobileBattleRoomSceneID db -1 -; 4d15b diff --git a/data/maps/scripts.asm b/data/maps/scripts.asm index 51725fb4f..ff9974833 100644 --- a/data/maps/scripts.asm +++ b/data/maps/scripts.asm @@ -3,7 +3,7 @@ SECTION "Map Scripts 1", ROMX INCLUDE "maps/GoldenrodGym.asm" INCLUDE "maps/GoldenrodBikeShop.asm" INCLUDE "maps/GoldenrodHappinessRater.asm" -INCLUDE "maps/GoldenrodBillsHouse.asm" +INCLUDE "maps/BillsFamilysHouse.asm" INCLUDE "maps/GoldenrodMagnetTrainStation.asm" INCLUDE "maps/GoldenrodFlowerShop.asm" INCLUDE "maps/GoldenrodPPSpeechHouse.asm" @@ -63,7 +63,7 @@ INCLUDE "maps/RadioTower5F.asm" INCLUDE "maps/OlivineLighthouse5F.asm" INCLUDE "maps/OlivineLighthouse6F.asm" INCLUDE "maps/GoldenrodPokecenter1F.asm" -INCLUDE "maps/GoldenrodPokeComCenter2FMobile.asm" +INCLUDE "maps/PokecomCenterAdminOfficeMobile.asm" INCLUDE "maps/IlexForestAzaleaGate.asm" INCLUDE "maps/Route34IlexForestGate.asm" INCLUDE "maps/DayCare.asm" @@ -151,12 +151,12 @@ SECTION "Map Scripts 9", ROMX INCLUDE "maps/Route34.asm" INCLUDE "maps/ElmsLab.asm" -INCLUDE "maps/KrissHouse1F.asm" -INCLUDE "maps/KrissHouse2F.asm" -INCLUDE "maps/KrissNeighborsHouse.asm" +INCLUDE "maps/PlayersHouse1F.asm" +INCLUDE "maps/PlayersHouse2F.asm" +INCLUDE "maps/PlayersNeighborsHouse.asm" INCLUDE "maps/ElmsHouse.asm" -INCLUDE "maps/Route26HealSpeechHouse.asm" -INCLUDE "maps/Route26DayofWeekSiblingsHouse.asm" +INCLUDE "maps/Route26HealHouse.asm" +INCLUDE "maps/DayOfWeekSiblingsHouse.asm" INCLUDE "maps/Route27SandstormHouse.asm" INCLUDE "maps/Route29Route46Gate.asm" @@ -191,7 +191,7 @@ INCLUDE "maps/Route12SuperRodHouse.asm" SECTION "Map Scripts 11", ROMX -INCLUDE "maps/EcruteakHouse.asm" +INCLUDE "maps/EcruteakTinTowerEntrance.asm" INCLUDE "maps/WiseTriosRoom.asm" INCLUDE "maps/EcruteakPokecenter1F.asm" INCLUDE "maps/EcruteakLugiaSpeechHouse.asm" @@ -206,7 +206,7 @@ INCLUDE "maps/TrainerHouseB1F.asm" INCLUDE "maps/ViridianMart.asm" INCLUDE "maps/ViridianPokecenter1F.asm" INCLUDE "maps/ViridianPokecenter2FBeta.asm" -INCLUDE "maps/Route2NuggetSpeechHouse.asm" +INCLUDE "maps/Route2NuggetHouse.asm" INCLUDE "maps/Route2Gate.asm" INCLUDE "maps/VictoryRoadGate.asm" @@ -294,7 +294,7 @@ INCLUDE "maps/CopycatsHouse1F.asm" INCLUDE "maps/CopycatsHouse2F.asm" INCLUDE "maps/Route5UndergroundPathEntrance.asm" INCLUDE "maps/Route5SaffronGate.asm" -INCLUDE "maps/Route5CleanseTagSpeechHouse.asm" +INCLUDE "maps/Route5CleanseTagHouse.asm" SECTION "Map Scripts 16", ROMX @@ -329,13 +329,13 @@ SECTION "Map Scripts 17", ROMX INCLUDE "maps/MahoganyTown.asm" INCLUDE "maps/Route32.asm" -INCLUDE "maps/VermilionHouseFishingSpeechHouse.asm" +INCLUDE "maps/VermilionFishingSpeechHouse.asm" INCLUDE "maps/VermilionPokecenter1F.asm" INCLUDE "maps/VermilionPokecenter2FBeta.asm" INCLUDE "maps/PokemonFanClub.asm" INCLUDE "maps/VermilionMagnetTrainSpeechHouse.asm" INCLUDE "maps/VermilionMart.asm" -INCLUDE "maps/VermilionHouseDiglettsCaveSpeechHouse.asm" +INCLUDE "maps/VermilionDiglettsCaveSpeechHouse.asm" INCLUDE "maps/VermilionGym.asm" INCLUDE "maps/Route6SaffronGate.asm" INCLUDE "maps/Route6UndergroundPathEntrance.asm" @@ -343,7 +343,7 @@ INCLUDE "maps/Pokecenter2F.asm" INCLUDE "maps/TradeCenter.asm" INCLUDE "maps/Colosseum.asm" INCLUDE "maps/TimeCapsule.asm" -INCLUDE "maps/MobileTradeRoomMobile.asm" +INCLUDE "maps/MobileTradeRoom.asm" INCLUDE "maps/MobileBattleRoom.asm" @@ -361,7 +361,7 @@ INCLUDE "maps/MoveDeletersHouse.asm" INCLUDE "maps/FuchsiaMart.asm" INCLUDE "maps/SafariZoneMainOffice.asm" INCLUDE "maps/FuchsiaGym.asm" -INCLUDE "maps/FuchsiaBillSpeechHouse.asm" +INCLUDE "maps/BillsBrothersHouse.asm" INCLUDE "maps/FuchsiaPokecenter1F.asm" INCLUDE "maps/FuchsiaPokecenter2FBeta.asm" INCLUDE "maps/SafariZoneWardensHome.asm" @@ -371,7 +371,7 @@ INCLUDE "maps/CherrygrovePokecenter1F.asm" INCLUDE "maps/CherrygroveGymSpeechHouse.asm" INCLUDE "maps/GuideGentsHouse.asm" INCLUDE "maps/CherrygroveEvolutionSpeechHouse.asm" -INCLUDE "maps/Route30BerrySpeechHouse.asm" +INCLUDE "maps/Route30BerryHouse.asm" INCLUDE "maps/MrPokemonsHouse.asm" INCLUDE "maps/Route31VioletGate.asm" @@ -477,7 +477,7 @@ INCLUDE "maps/Route4.asm" INCLUDE "maps/Route10South.asm" INCLUDE "maps/Route23.asm" INCLUDE "maps/SilverCavePokecenter1F.asm" -INCLUDE "maps/Route28FamousSpeechHouse.asm" +INCLUDE "maps/Route28SteelWingHouse.asm" SECTION "Map Scripts 25", ROMX diff --git a/data/maps/setup_scripts.asm b/data/maps/setup_scripts.asm index 47895b609..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,18 +12,17 @@ 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 - db map_attributes + db map_load_attributes db map_change_callback db map_spawn_coord db map_player_coord @@ -44,9 +43,9 @@ MapSetupScript_Warp: ; 15392 db map_wildmons db map_end -MapSetupScript_BadWarp: ; 153a9 +MapSetupScript_BadWarp: db map_load_spawn - db map_attributes + db map_load_attributes db map_change_callback db map_spawn_coord db map_player_coord @@ -68,10 +67,10 @@ MapSetupScript_BadWarp: ; 153a9 db map_wildmons db map_end -MapSetupScript_Connection: ; 153bf +MapSetupScript_Connection: db map_animations_off db map_load_connection - db map_attributes + db map_load_attributes db map_change_callback db map_player_coord db map_load_blocks @@ -87,13 +86,13 @@ 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_attributes + db map_load_attributes db map_warp_face db map_change_callback db map_player_coord @@ -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,10 +150,10 @@ 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_attributes_2 + db map_load_attributes_2 db map_anchor_screen db map_start_callback db map_load_blocks @@ -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 e0f913fab..9ac3e8d07 100644 --- a/data/maps/spawn_points.asm +++ b/data/maps/spawn_points.asm @@ -1,13 +1,13 @@ spawn: MACRO ; map, x, y - map \1 + map_id \1 db \2, \3 ENDM -SpawnPoints: ; 0x152ab +SpawnPoints: ; entries correspond to SPAWN_* constants - spawn KRISS_HOUSE_2F, 3, 3 + spawn PLAYERS_HOUSE_2F, 3, 3 spawn VIRIDIAN_POKECENTER_1F, 5, 3 spawn PALLET_TOWN, 5, 6 @@ -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 new file mode 100644 index 000000000..b6130a199 --- /dev/null +++ b/data/mon_menu.asm @@ -0,0 +1,46 @@ +; MonMenuOptionStrings indexes + const_def 1 + const MONMENUVALUE_STATS ; 1 + const MONMENUVALUE_SWITCH ; 2 + const MONMENUVALUE_ITEM ; 3 + const MONMENUVALUE_CANCEL ; 4 + const MONMENUVALUE_MOVE ; 5 + const MONMENUVALUE_MAIL ; 6 + const MONMENUVALUE_ERROR ; 7 + +MonMenuOptionStrings: +; entries correspond to MONMENUVALUE_* constants + db "STATS@" + db "SWITCH@" + db "ITEM@" + db "CANCEL@" + db "MOVE@" + db "MAIL@" + db "ERROR!@" + +MonMenuOptions: +; category, item, value; actions are in PokemonActionSubmenu (see engine/start_menu.asm) +; moves + db MONMENU_FIELD_MOVE, MONMENUITEM_CUT, CUT + db MONMENU_FIELD_MOVE, MONMENUITEM_FLY, FLY + db MONMENU_FIELD_MOVE, MONMENUITEM_SURF, SURF + db MONMENU_FIELD_MOVE, MONMENUITEM_STRENGTH, STRENGTH + db MONMENU_FIELD_MOVE, MONMENUITEM_FLASH, FLASH + db MONMENU_FIELD_MOVE, MONMENUITEM_WATERFALL, WATERFALL + db MONMENU_FIELD_MOVE, MONMENUITEM_WHIRLPOOL, WHIRLPOOL + db MONMENU_FIELD_MOVE, MONMENUITEM_DIG, DIG + db MONMENU_FIELD_MOVE, MONMENUITEM_TELEPORT, TELEPORT + db MONMENU_FIELD_MOVE, MONMENUITEM_SOFTBOILED, SOFTBOILED + db MONMENU_FIELD_MOVE, MONMENUITEM_HEADBUTT, HEADBUTT + db MONMENU_FIELD_MOVE, MONMENUITEM_ROCKSMASH, ROCK_SMASH + db MONMENU_FIELD_MOVE, MONMENUITEM_MILKDRINK, MILK_DRINK + db MONMENU_FIELD_MOVE, MONMENUITEM_SWEETSCENT, SWEET_SCENT +; options + db MONMENU_MENUOPTION, MONMENUITEM_STATS, MONMENUVALUE_STATS + db MONMENU_MENUOPTION, MONMENUITEM_SWITCH, MONMENUVALUE_SWITCH + db MONMENU_MENUOPTION, MONMENUITEM_ITEM, MONMENUVALUE_ITEM + db MONMENU_MENUOPTION, MONMENUITEM_CANCEL, MONMENUVALUE_CANCEL + db MONMENU_MENUOPTION, MONMENUITEM_MOVE, MONMENUVALUE_MOVE + db MONMENU_MENUOPTION, MONMENUITEM_MAIL, MONMENUVALUE_MAIL + db MONMENU_MENUOPTION, MONMENUITEM_ERROR, MONMENUVALUE_ERROR + db -1 diff --git a/data/moves/animations.asm b/data/moves/animations.asm index 030aa2fa3..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,9 +299,8 @@ BattleAnim_SweetScent2: ; c929c anim_bgeffect ANIM_BG_06, $0, $2, $0 anim_wait 128 anim_ret -; c92c1 -BattleAnim_ThrowPokeBall +BattleAnim_ThrowPokeBall: anim_if_param_equal NO_ITEM, .TheTrainerBlockedTheBall anim_if_param_equal MASTER_BALL, .MasterBall anim_if_param_equal ULTRA_BALL, .UltraBall @@ -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 c56ff2560..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 @@ -10,9 +12,9 @@ NormalHit: stab damagevariation checkhit - hittarget + moveanim failuretext - checkfaint + applydamage criticaltext supereffectivetext checkdestinybond @@ -40,9 +42,9 @@ PoisonHit: damagevariation checkhit effectchance - hittarget + moveanim failuretext - checkfaint + applydamage criticaltext supereffectivetext checkdestinybond @@ -60,9 +62,9 @@ LeechHit: stab damagevariation checkhit - hittarget + moveanim failuretext - checkfaint + applydamage criticaltext supereffectivetext draintarget @@ -82,9 +84,9 @@ BurnHit: damagevariation checkhit effectchance - hittarget + moveanim failuretext - checkfaint + applydamage criticaltext supereffectivetext checkdestinybond @@ -103,9 +105,9 @@ FreezeHit: damagevariation checkhit effectchance - hittarget + moveanim failuretext - checkfaint + applydamage criticaltext supereffectivetext checkdestinybond @@ -124,9 +126,9 @@ ParalyzeHit: damagevariation checkhit effectchance - hittarget + moveanim failuretext - checkfaint + applydamage criticaltext supereffectivetext checkdestinybond @@ -145,9 +147,9 @@ Selfdestruct: damagevariation checkhit selfdestruct - hittargetnosub + moveanimnosub failuretext - checkfaint + applydamage criticaltext supereffectivetext checkdestinybond @@ -165,9 +167,9 @@ DreamEater: stab damagevariation checkhit - hittarget + moveanim failuretext - checkfaint + applydamage criticaltext supereffectivetext eatdream @@ -544,9 +546,9 @@ AttackDownHit: damagevariation checkhit effectchance - hittarget + moveanim failuretext - checkfaint + applydamage criticaltext supereffectivetext checkdestinybond @@ -566,9 +568,9 @@ DefenseDownHit: damagevariation checkhit effectchance - hittarget + moveanim failuretext - checkfaint + applydamage criticaltext supereffectivetext checkdestinybond @@ -589,9 +591,9 @@ SpeedDownHit: damagevariation checkhit effectchance - hittarget + moveanim failuretext - checkfaint + applydamage criticaltext supereffectivetext checkdestinybond @@ -611,9 +613,9 @@ SpecialAttackDownHit: damagevariation checkhit effectchance - hittarget + moveanim failuretext - checkfaint + applydamage criticaltext supereffectivetext checkdestinybond @@ -633,9 +635,9 @@ SpecialDefenseDownHit: damagevariation checkhit effectchance - hittarget + moveanim failuretext - checkfaint + applydamage criticaltext supereffectivetext checkdestinybond @@ -655,9 +657,9 @@ AccuracyDownHit: damagevariation checkhit effectchance - hittarget + moveanim failuretext - checkfaint + applydamage criticaltext supereffectivetext checkdestinybond @@ -677,9 +679,9 @@ EvasionDownHit: damagevariation checkhit effectchance - hittarget + moveanim failuretext - checkfaint + applydamage criticaltext supereffectivetext checkdestinybond @@ -699,9 +701,9 @@ DefenseUpHit: damagevariation checkhit effectchance - hittarget + moveanim failuretext - checkfaint + applydamage criticaltext supereffectivetext checkdestinybond @@ -721,9 +723,9 @@ AttackUpHit: damagevariation checkhit effectchance - hittarget + moveanim failuretext - checkfaint + applydamage criticaltext supereffectivetext checkdestinybond @@ -743,9 +745,9 @@ AllUpHit: damagevariation checkhit effectchance - hittarget + moveanim failuretext - checkfaint + applydamage criticaltext supereffectivetext checkdestinybond @@ -763,9 +765,9 @@ PayDay: stab damagevariation checkhit - hittarget + moveanim failuretext - checkfaint + applydamage criticaltext supereffectivetext payday @@ -796,9 +798,9 @@ Bide: unleashenergy resettypematchup checkhit - hittarget - effect0xa5 - checkfaint + moveanim + bidefailtext + applydamage checkdestinybond buildopponentrage kingsrock @@ -817,9 +819,9 @@ Rampage: stab damagevariation clearmissdamage - hittarget + moveanim failuretext - checkfaint + applydamage criticaltext supereffectivetext checkdestinybond @@ -848,9 +850,9 @@ MultiHit: stab damagevariation clearmissdamage - hittargetnosub + moveanimnosub failuretext - checkfaint + applydamage criticaltext cleartext supereffectivelooptext @@ -875,9 +877,9 @@ PoisonMultiHit: stab damagevariation clearmissdamage - hittargetnosub + moveanimnosub failuretext - checkfaint + applydamage criticaltext cleartext supereffectivelooptext @@ -900,9 +902,9 @@ FlinchHit: damagevariation checkhit effectchance - hittarget + moveanim failuretext - checkfaint + applydamage criticaltext supereffectivetext checkdestinybond @@ -916,9 +918,9 @@ OHKOHit: doturn stab ohko - hittarget + moveanim failuretext - checkfaint + applydamage criticaltext supereffectivetext checkdestinybond @@ -935,9 +937,9 @@ RecoilHit: stab damagevariation checkhit - hittarget + moveanim failuretext - checkfaint + applydamage criticaltext supereffectivetext recoil @@ -980,9 +982,9 @@ ConfuseHit: damagevariation checkhit effectchance - hittarget + moveanim failuretext - checkfaint + applydamage criticaltext supereffectivetext checkdestinybond @@ -1022,9 +1024,9 @@ TriAttack: stab damagevariation checkhit - hittarget + moveanim failuretext - checkfaint + applydamage criticaltext supereffectivetext checkdestinybond @@ -1066,9 +1068,9 @@ SkyAttack: damagevariation checkhit effectchance - hittarget + moveanim failuretext - checkfaint + applydamage criticaltext supereffectivetext checkdestinybond @@ -1094,9 +1096,9 @@ HyperBeam: stab damagevariation checkhit - hittarget + moveanim failuretext - checkfaint + applydamage criticaltext supereffectivetext rechargenextturn @@ -1115,10 +1117,10 @@ Rage: checkhit ragedamage damagevariation - hittarget + moveanim failuretext rage - checkfaint + applydamage criticaltext supereffectivetext checkdestinybond @@ -1176,9 +1178,9 @@ RazorWind: stab damagevariation checkhit - hittarget + moveanim failuretext - checkfaint + applydamage criticaltext supereffectivetext checkdestinybond @@ -1198,10 +1200,10 @@ Fly: stab damagevariation checkhit - hittargetnosub + moveanimnosub raisesub failuretext - checkfaint + applydamage criticaltext supereffectivetext checkdestinybond @@ -1220,9 +1222,9 @@ TrapTarget: stab damagevariation clearmissdamage - hittarget + moveanim failuretext - checkfaint + applydamage criticaltext supereffectivetext checkdestinybond @@ -1239,9 +1241,9 @@ StaticDamage: constantdamage checkhit resettypematchup - hittarget + moveanim failuretext - checkfaint + applydamage checkdestinybond buildopponentrage kingsrock @@ -1254,9 +1256,9 @@ Reversal: constantdamage stab checkhit - hittarget + moveanim failuretext - checkfaint + applydamage supereffectivetext checkdestinybond buildopponentrage @@ -1268,9 +1270,9 @@ Counter: usedmovetext doturn counter - hittarget + moveanim failuretext - checkfaint + applydamage checkdestinybond buildopponentrage kingsrock @@ -1304,9 +1306,9 @@ Snore: checkhit effectchance snore - hittarget + moveanim failuretext - checkfaint + applydamage criticaltext supereffectivetext checkdestinybond @@ -1378,9 +1380,9 @@ FalseSwipe: damagevariation falseswipe checkhit - hittarget + moveanim failuretext - checkfaint + applydamage criticaltext supereffectivetext checkdestinybond @@ -1409,9 +1411,9 @@ TripleKick: stab damagevariation clearmissdamage - hittargetnosub + moveanimnosub failuretext - checkfaint + applydamage criticaltext cleartext supereffectivelooptext @@ -1434,9 +1436,9 @@ Thief: damagevariation checkhit effectchance - hittarget + moveanim failuretext - checkfaint + applydamage criticaltext supereffectivetext thief @@ -1470,9 +1472,9 @@ FlameWheel: damagevariation checkhit effectchance - hittarget + moveanim failuretext - checkfaint + applydamage criticaltext supereffectivetext defrost @@ -1543,9 +1545,9 @@ Rollout: checkhit rolloutpower damagevariation - hittarget + moveanim failuretext - checkfaint + applydamage criticaltext supereffectivetext checkdestinybond @@ -1582,9 +1584,9 @@ FuryCutter: checkhit furycutter damagevariation - hittarget + moveanim failuretext - checkfaint + applydamage criticaltext supereffectivetext checkdestinybond @@ -1611,9 +1613,9 @@ Return: stab damagevariation checkhit - hittarget + moveanim failuretext - checkfaint + applydamage criticaltext supereffectivetext checkdestinybond @@ -1634,7 +1636,7 @@ Present: damagevariation clearmissdamage failuretext - checkfaint + applydamage criticaltext supereffectivetext checkdestinybond @@ -1653,9 +1655,9 @@ Frustration: stab damagevariation checkhit - hittarget + moveanim failuretext - checkfaint + applydamage criticaltext supereffectivetext checkdestinybond @@ -1681,9 +1683,9 @@ SacredFire: damagevariation checkhit effectchance - hittarget + moveanim failuretext - checkfaint + applydamage criticaltext supereffectivetext defrost @@ -1704,9 +1706,9 @@ Magnitude: damagevariation checkhit doubleundergrounddamage - hittarget + moveanim failuretext - checkfaint + applydamage criticaltext supereffectivetext checkdestinybond @@ -1732,9 +1734,9 @@ Pursuit: damagevariation pursuit checkhit - hittarget + moveanim failuretext - checkfaint + applydamage criticaltext supereffectivetext checkdestinybond @@ -1752,9 +1754,9 @@ RapidSpin: stab damagevariation checkhit - hittarget + moveanim failuretext - checkfaint + applydamage criticaltext supereffectivetext clearhazards @@ -1794,9 +1796,9 @@ HiddenPower: stab damagevariation checkhit - hittarget + moveanim failuretext - checkfaint + applydamage criticaltext supereffectivetext checkdestinybond @@ -1824,7 +1826,7 @@ FakeOut: doturn checkhit fakeout - hittarget + moveanim failuretext endmove @@ -1847,9 +1849,9 @@ MirrorCoat: usedmovetext doturn mirrorcoat - hittarget + moveanim failuretext - checkfaint + applydamage checkdestinybond buildopponentrage kingsrock @@ -1867,9 +1869,9 @@ SkullBash: stab damagevariation checkhit - hittarget + moveanim failuretext - checkfaint + applydamage criticaltext supereffectivetext checkdestinybond @@ -1892,9 +1894,9 @@ Twister: doubleflyingdamage checkhit effectchance - hittarget + moveanim failuretext - checkfaint + applydamage criticaltext supereffectivetext checkdestinybond @@ -1914,9 +1916,9 @@ Earthquake: doubleundergrounddamage checkhit effectchance - hittarget + moveanim failuretext - checkfaint + applydamage criticaltext supereffectivetext checkdestinybond @@ -1933,9 +1935,9 @@ FutureSight: futuresight damagevariation ; skip here if last turn checkhit - hittargetnosub + moveanimnosub failuretext - checkfaint + applydamage checkdestinybond buildopponentrage endmove @@ -1951,9 +1953,9 @@ Gust: damagevariation doubleflyingdamage checkhit - hittarget + moveanim failuretext - checkfaint + applydamage criticaltext supereffectivetext checkdestinybond @@ -1972,9 +1974,9 @@ Stomp: doubleminimizedamage checkhit effectchance - hittarget + moveanim failuretext - checkfaint + applydamage criticaltext supereffectivetext checkdestinybond @@ -1995,9 +1997,9 @@ Solarbeam: stab damagevariation checkhit - hittarget + moveanim failuretext - checkfaint + applydamage criticaltext supereffectivetext checkdestinybond @@ -2017,9 +2019,9 @@ Thunder: effectchance stab damagevariation - hittarget + moveanim failuretext - checkfaint + applydamage criticaltext supereffectivetext checkdestinybond @@ -2047,16 +2049,16 @@ BeatUp: damagecalc damagevariation clearmissdamage - hittargetnosub + moveanimnosub failuretext - checkfaint + applydamage criticaltext cleartext supereffectivetext checkdestinybond buildopponentrage endloop - effect0xa8 + beatupfailtext raisesub kingsrock endmove 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/flail_reversal_power.asm b/data/moves/flail_reversal_power.asm new file mode 100644 index 000000000..fb915905e --- /dev/null +++ b/data/moves/flail_reversal_power.asm @@ -0,0 +1,8 @@ +FlailReversalPower: + ; hp bar pixels, power + db HP_BAR_LENGTH_PX / 48, 200 + db HP_BAR_LENGTH_PX / 12, 150 + db HP_BAR_LENGTH_PX / 5, 100 + db HP_BAR_LENGTH_PX / 3, 80 + db HP_BAR_LENGTH_PX * 2 / 3, 40 + db HP_BAR_LENGTH_PX, 20 diff --git a/data/moves/grammar.asm b/data/moves/grammar.asm index fe637180c..f24748083 100644 --- a/data/moves/grammar.asm +++ b/data/moves/grammar.asm @@ -2,7 +2,7 @@ ; Each move is given an identifier for what usedmovetext to use (0-4). ; Made redundant in English localization, where all are just "[mon]¯used [move]!" -MoveGrammar: ; 105e7a +MoveGrammar: ; 0: originally "[mon]の¯[move]¯つかった!" ("[mon]¯used¯[move]!") db SWORDS_DANCE db GROWTH @@ -99,4 +99,3 @@ MoveGrammar: ; 105e7a ; 4: originally "[mon]の¯[move]!" ("[mon]'s¯[move]!") ; Any move not listed above uses this grammar. db -1 ; end -; 105ed0 diff --git a/data/moves/magnitude_power.asm b/data/moves/magnitude_power.asm new file mode 100644 index 000000000..7359bdb10 --- /dev/null +++ b/data/moves/magnitude_power.asm @@ -0,0 +1,9 @@ +MagnitudePower: + ; chance, power, magnitude # + db 13, 10, 4 + db 38, 30, 5 + db 89, 50, 6 + db 166, 70, 7 + db 217, 90, 8 + db 242, 110, 9 + db 255, 150, 10 diff --git a/data/moves/metronome_exception_moves.asm b/data/moves/metronome_exception_moves.asm new file mode 100644 index 000000000..a5aa44132 --- /dev/null +++ b/data/moves/metronome_exception_moves.asm @@ -0,0 +1,17 @@ +; Metronome cannot turn into these moves. + +MetronomeExcepts: + db NO_MOVE + db METRONOME + db STRUGGLE + db SKETCH + db MIMIC + db COUNTER + db MIRROR_COAT + db PROTECT + db DETECT + db ENDURE + db DESTINY_BOND + db SLEEP_TALK + db THIEF + db -1 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/present_power.asm b/data/moves/present_power.asm new file mode 100644 index 000000000..885e9c692 --- /dev/null +++ b/data/moves/present_power.asm @@ -0,0 +1,6 @@ +PresentPower: + ; chance, power + db 40 percent, 40 ; 40% + db 70 percent + 1, 80 ; 30% + db 80 percent, 120 ; 10% + db -1 ; 20% chance to heal instead diff --git a/data/moves/tmhm_moves.asm b/data/moves/tmhm_moves.asm index fea29780c..339f6a5a6 100644 --- a/data/moves/tmhm_moves.asm +++ b/data/moves/tmhm_moves.asm @@ -1,4 +1,5 @@ -TMHMMoves: ; 1167a +TMHMMoves: +; entries correspond to *_TMNUM enums (see constants/item_constants.asm) ; TMs db DYNAMICPUNCH db HEADBUTT @@ -63,4 +64,3 @@ TMHMMoves: ; 1167a db THUNDERBOLT db ICE_BEAM db 0 ; end -; 116b7 diff --git a/data/npc_trades.asm b/data/npc_trades.asm deleted file mode 100644 index d16670984..000000000 --- a/data/npc_trades.asm +++ /dev/null @@ -1,18 +0,0 @@ -npctrade: MACRO -; dialog set, requested mon, offered mon, nickname, dvs, item, OT ID, OT name, gender requested - db \1, \2, \3, \4, \5, \6, \7 - shift - dw \7 - db \8, \9, 0 -ENDM - -NPCTrades: ; fce58 -; entries correspond to NPCTRADE_* constants - npctrade TRADE_DIALOG_COLLECTOR, ABRA, MACHOP, "MUSCLE@@@@@", $37, $66, GOLD_BERRY, 37460, "MIKE@@@@@@@", TRADE_EITHER_GENDER - npctrade TRADE_DIALOG_COLLECTOR, BELLSPROUT, ONIX, "ROCKY@@@@@@", $96, $66, BITTER_BERRY, 48926, "KYLE@@@@@@@", TRADE_EITHER_GENDER - npctrade TRADE_DIALOG_HAPPY, KRABBY, VOLTORB, "VOLTY@@@@@@", $98, $88, PRZCUREBERRY, 29189, "TIM@@@@@@@@", TRADE_EITHER_GENDER - npctrade TRADE_DIALOG_GIRL, DRAGONAIR, DODRIO, "DORIS@@@@@@", $77, $66, SMOKE_BALL, 00283, "EMY@@@@@@@@", TRADE_FEMALE_ONLY - npctrade TRADE_DIALOG_NEWBIE, HAUNTER, XATU, "PAUL@@@@@@@", $96, $86, MYSTERYBERRY, 15616, "CHRIS@@@@@@", TRADE_EITHER_GENDER - npctrade TRADE_DIALOG_GIRL, CHANSEY, AERODACTYL, "AEROY@@@@@@", $96, $66, GOLD_BERRY, 26491, "KIM@@@@@@@@", TRADE_EITHER_GENDER - npctrade TRADE_DIALOG_COLLECTOR, DUGTRIO, MAGNETON, "MAGGIE@@@@@", $96, $66, METAL_COAT, 50082, "FOREST@@@@@", TRADE_EITHER_GENDER -; fcf38 diff --git a/data/party_menu_qualities.asm b/data/party_menu_qualities.asm index 9ccc9745d..b488f4eb1 100644 --- a/data/party_menu_qualities.asm +++ b/data/party_menu_qualities.asm @@ -13,13 +13,12 @@ partymenuqualities: MACRO rept _NARG db PARTYMENUQUALITY_\1 -shift + shift 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 new file mode 100644 index 000000000..1792c506a --- /dev/null +++ b/data/phone/non_trainer_names.asm @@ -0,0 +1,15 @@ +NonTrainerCallerNames: +; entries correspond to PHONECONTACT_* constants + dw .none + dw .mom + dw .bikeshop + dw .bill + dw .elm + dw .buena + +.none: db "----------@" +.mom: db "MOM:@" +.bill: db "BILL:@" +.elm: db "PROF.ELM:@" +.bikeshop: db "BIKE SHOP:@" +.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 bec40a12a..a7a774507 100644 --- a/data/phone/phone_contacts.asm +++ b/data/phone/phone_contacts.asm @@ -1,51 +1,50 @@ phone: MACRO ; trainer class, trainer id, map, time 1, script 1, time 2, script 2 db \1, \2 - map \3 + map_id \3 db \4 dba \5 db \6 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, KRISS_HOUSE_1F, ANYTIME, MomPhoneScript, 0, UnusedPhoneScript - phone TRAINER_NONE, PHONECONTACT_BIKESHOP, OAKS_LAB, 0, UnusedPhoneScript, 0, UnusedPhoneScript - phone TRAINER_NONE, PHONECONTACT_BILL, N_A, ANYTIME, BillPhoneScript1, 0, BillPhoneScript2 - phone TRAINER_NONE, PHONECONTACT_ELM, ELMS_LAB, ANYTIME, ElmPhoneScript1, 0, ElmPhoneScript2 - phone SCHOOLBOY, JACK1, NATIONAL_PARK, ANYTIME, JackPhoneScript1, ANYTIME, JackPhoneScript2 - phone POKEFANF, BEVERLY1, NATIONAL_PARK, ANYTIME, BeverlyPhoneScript1, ANYTIME, BeverlyPhoneScript2 + phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript + phone TRAINER_NONE, PHONECONTACT_MOM, PLAYERS_HOUSE_1F, ANYTIME, MomPhoneScript, 0, UnusedPhoneScript + phone TRAINER_NONE, PHONECONTACT_BIKESHOP, OAKS_LAB, 0, UnusedPhoneScript, 0, UnusedPhoneScript + phone TRAINER_NONE, PHONECONTACT_BILL, N_A, ANYTIME, BillPhoneScript1, 0, BillPhoneScript2 + phone TRAINER_NONE, PHONECONTACT_ELM, ELMS_LAB, ANYTIME, ElmPhoneScript1, 0, ElmPhoneScript2 + phone SCHOOLBOY, JACK1, NATIONAL_PARK, ANYTIME, JackPhoneScript1, ANYTIME, JackPhoneScript2 + phone POKEFANF, BEVERLY1, NATIONAL_PARK, ANYTIME, BeverlyPhoneScript1, ANYTIME, BeverlyPhoneScript2 phone SAILOR, HUEY1, OLIVINE_LIGHTHOUSE_2F, ANYTIME, HueyPhoneScript1, ANYTIME, HueyPhoneScript2 - phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript - phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript - phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript - phone COOLTRAINERM, GAVEN3, ROUTE_26, ANYTIME, GavenPhoneScript1, ANYTIME, GavenPhoneScript2 - phone COOLTRAINERF, BETH1, ROUTE_26, ANYTIME, BethPhoneScript1, ANYTIME, BethPhoneScript2 - phone BIRD_KEEPER, JOSE2, ROUTE_27, ANYTIME, JosePhoneScript1, ANYTIME, JosePhoneScript2 - phone COOLTRAINERF, REENA1, ROUTE_27, ANYTIME, ReenaPhoneScript1, ANYTIME, ReenaPhoneScript2 - phone YOUNGSTER, JOEY1, ROUTE_30, ANYTIME, JoeyPhoneScript1, ANYTIME, JoeyPhoneScript2 - phone BUG_CATCHER, WADE1, ROUTE_31, ANYTIME, WadePhoneScript1, ANYTIME, WadePhoneScript2 - phone FISHER, RALPH1, ROUTE_32, ANYTIME, RalphPhoneScript1, ANYTIME, RalphPhoneScript2 - phone PICNICKER, LIZ1, ROUTE_32, ANYTIME, LizPhoneScript1, ANYTIME, LizPhoneScript2 - phone HIKER, ANTHONY2, ROUTE_33, ANYTIME, AnthonyPhoneScript1, ANYTIME, AnthonyPhoneScript2 - phone CAMPER, TODD1, ROUTE_34, ANYTIME, ToddPhoneScript1, ANYTIME, ToddPhoneScript2 - phone PICNICKER, GINA1, ROUTE_34, ANYTIME, GinaPhoneScript1, ANYTIME, GinaPhoneScript2 - phone JUGGLER, IRWIN1, ROUTE_35, ANYTIME, IrwinPhoneScript1, ANYTIME, IrwinPhoneScript2 - phone BUG_CATCHER, ARNIE1, ROUTE_35, ANYTIME, ArniePhoneScript1, ANYTIME, ArniePhoneScript2 - phone SCHOOLBOY, ALAN1, ROUTE_36, ANYTIME, AlanPhoneScript1, ANYTIME, AlanPhoneScript2 - phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript - phone LASS, DANA1, ROUTE_38, ANYTIME, DanaPhoneScript1, ANYTIME, DanaPhoneScript2 - phone SCHOOLBOY, CHAD1, ROUTE_38, ANYTIME, ChadPhoneScript1, ANYTIME, ChadPhoneScript2 - phone POKEFANM, DEREK1, ROUTE_39, ANYTIME, DerekPhoneScript1, ANYTIME, DerekPhoneScript2 - phone FISHER, TULLY1, ROUTE_42, ANYTIME, TullyPhoneScript1, ANYTIME, TullyPhoneScript2 - phone POKEMANIAC, BRENT1, ROUTE_43, ANYTIME, BrentPhoneScript1, ANYTIME, BrentPhoneScript2 - phone PICNICKER, TIFFANY3, ROUTE_43, ANYTIME, TiffanyPhoneScript1, ANYTIME, TiffanyPhoneScript2 - phone BIRD_KEEPER, VANCE1, ROUTE_44, ANYTIME, VancePhoneScript1, ANYTIME, VancePhoneScript2 - phone FISHER, WILTON1, ROUTE_44, ANYTIME, WiltonPhoneScript1, ANYTIME, WiltonPhoneScript2 - phone BLACKBELT_T, KENJI3, ROUTE_45, ANYTIME, KenjiPhoneScript1, ANYTIME, KenjiPhoneScript2 - phone HIKER, PARRY1, ROUTE_45, ANYTIME, ParryPhoneScript1, ANYTIME, ParryPhoneScript2 - phone PICNICKER, ERIN1, ROUTE_46, ANYTIME, ErinPhoneScript1, ANYTIME, ErinPhoneScript2 + phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript + phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript + phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript + phone COOLTRAINERM, GAVEN3, ROUTE_26, ANYTIME, GavenPhoneScript1, ANYTIME, GavenPhoneScript2 + phone COOLTRAINERF, BETH1, ROUTE_26, ANYTIME, BethPhoneScript1, ANYTIME, BethPhoneScript2 + phone BIRD_KEEPER, JOSE2, ROUTE_27, ANYTIME, JosePhoneScript1, ANYTIME, JosePhoneScript2 + phone COOLTRAINERF, REENA1, ROUTE_27, ANYTIME, ReenaPhoneScript1, ANYTIME, ReenaPhoneScript2 + phone YOUNGSTER, JOEY1, ROUTE_30, ANYTIME, JoeyPhoneScript1, ANYTIME, JoeyPhoneScript2 + phone BUG_CATCHER, WADE1, ROUTE_31, ANYTIME, WadePhoneScript1, ANYTIME, WadePhoneScript2 + phone FISHER, RALPH1, ROUTE_32, ANYTIME, RalphPhoneScript1, ANYTIME, RalphPhoneScript2 + phone PICNICKER, LIZ1, ROUTE_32, ANYTIME, LizPhoneScript1, ANYTIME, LizPhoneScript2 + phone HIKER, ANTHONY2, ROUTE_33, ANYTIME, AnthonyPhoneScript1, ANYTIME, AnthonyPhoneScript2 + phone CAMPER, TODD1, ROUTE_34, ANYTIME, ToddPhoneScript1, ANYTIME, ToddPhoneScript2 + phone PICNICKER, GINA1, ROUTE_34, ANYTIME, GinaPhoneScript1, ANYTIME, GinaPhoneScript2 + phone JUGGLER, IRWIN1, ROUTE_35, ANYTIME, IrwinPhoneScript1, ANYTIME, IrwinPhoneScript2 + phone BUG_CATCHER, ARNIE1, ROUTE_35, ANYTIME, ArniePhoneScript1, ANYTIME, ArniePhoneScript2 + phone SCHOOLBOY, ALAN1, ROUTE_36, ANYTIME, AlanPhoneScript1, ANYTIME, AlanPhoneScript2 + phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript + phone LASS, DANA1, ROUTE_38, ANYTIME, DanaPhoneScript1, ANYTIME, DanaPhoneScript2 + phone SCHOOLBOY, CHAD1, ROUTE_38, ANYTIME, ChadPhoneScript1, ANYTIME, ChadPhoneScript2 + phone POKEFANM, DEREK1, ROUTE_39, ANYTIME, DerekPhoneScript1, ANYTIME, DerekPhoneScript2 + phone FISHER, TULLY1, ROUTE_42, ANYTIME, TullyPhoneScript1, ANYTIME, TullyPhoneScript2 + phone POKEMANIAC, BRENT1, ROUTE_43, ANYTIME, BrentPhoneScript1, ANYTIME, BrentPhoneScript2 + phone PICNICKER, TIFFANY3, ROUTE_43, ANYTIME, TiffanyPhoneScript1, ANYTIME, TiffanyPhoneScript2 + phone BIRD_KEEPER, VANCE1, ROUTE_44, ANYTIME, VancePhoneScript1, ANYTIME, VancePhoneScript2 + phone FISHER, WILTON1, ROUTE_44, ANYTIME, WiltonPhoneScript1, ANYTIME, WiltonPhoneScript2 + phone BLACKBELT_T, KENJI3, ROUTE_45, ANYTIME, KenjiPhoneScript1, ANYTIME, KenjiPhoneScript2 + 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 03c27743a..224ca2258 100644 --- a/data/phone/special_calls.asm +++ b/data/phone/special_calls.asm @@ -5,14 +5,13 @@ specialcall: MACRO dba \3 ENDM -SpecialPhoneCallList: ; 90627 +SpecialPhoneCallList: ; entries correspond to SPECIALCALL_* constants - specialcall SpecialCallOnlyWhenOutside, PHONE_ELM, ElmPhoneScript2 - specialcall SpecialCallOnlyWhenOutside, PHONE_ELM, ElmPhoneScript2 - specialcall SpecialCallOnlyWhenOutside, PHONE_ELM, ElmPhoneScript2 - specialcall SpecialCallOnlyWhenOutside, PHONE_ELM, ElmPhoneScript2 - specialcall SpecialCallWhereverYouAre, PHONE_ELM, ElmPhoneScript2 - specialcall SpecialCallWhereverYouAre, PHONE_OAK, BikeShopPhoneScript - specialcall SpecialCallWhereverYouAre, PHONE_MOM, MomPhoneLectureScript - specialcall SpecialCallOnlyWhenOutside, PHONE_ELM, ElmPhoneScript2 -; 90657 + specialcall SpecialCallOnlyWhenOutside, PHONECONTACT_ELM, ElmPhoneScript2 + specialcall SpecialCallOnlyWhenOutside, PHONECONTACT_ELM, ElmPhoneScript2 + specialcall SpecialCallOnlyWhenOutside, PHONECONTACT_ELM, ElmPhoneScript2 + specialcall SpecialCallOnlyWhenOutside, PHONECONTACT_ELM, ElmPhoneScript2 + specialcall SpecialCallWhereverYouAre, PHONECONTACT_ELM, ElmPhoneScript2 + specialcall SpecialCallWhereverYouAre, PHONECONTACT_BIKESHOP, BikeShopPhoneScript + specialcall SpecialCallWhereverYouAre, PHONECONTACT_MOM, MomPhoneLectureScript + specialcall SpecialCallOnlyWhenOutside, PHONECONTACT_ELM, ElmPhoneScript2 diff --git a/data/phone/text/bill.asm b/data/phone/text/bill.asm index 2eed7d98c..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 -BillPhoneGeneriText: ; 0x1b44fe +BillPhoneGenericText: text "Who's calling?" para "<PLAY_G>, is it?" @@ -38,7 +38,7 @@ BillPhoneGeneriText: ; 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/trainers1.asm b/data/phone/text/trainers.asm index e5dcccddf..a907f62fe 100644 --- a/data/phone/text/trainers1.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 04eac7508..6263cb828 100644 --- a/data/player_names.asm +++ b/data/player_names.asm @@ -1,15 +1,15 @@ -ChrisNameMenuDataHeader: ; 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 -KrisNameMenuDataHeader: ; 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/base_stats/abra.asm b/data/pokemon/base_stats/abra.asm index d7824f196..890c46f20 100644 --- a/data/pokemon/base_stats/abra.asm +++ b/data/pokemon/base_stats/abra.asm @@ -3,20 +3,19 @@ db 25, 20, 15, 90, 105, 55 ; hp atk def spd sat sdf - db PSYCHIC, PSYCHIC + db PSYCHIC, PSYCHIC ; type db 200 ; catch rate db 73 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F25 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F25 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/abra/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn HUMANSHAPE, HUMANSHAPE ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, PSYCHIC_M, SHADOW_BALL, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, THUNDERPUNCH, DREAM_EATER, REST, ATTRACT, THIEF, FIRE_PUNCH, NIGHTMARE, FLASH ; end diff --git a/data/pokemon/base_stats/aerodactyl.asm b/data/pokemon/base_stats/aerodactyl.asm index 26eac4ded..29e406504 100644 --- a/data/pokemon/base_stats/aerodactyl.asm +++ b/data/pokemon/base_stats/aerodactyl.asm @@ -3,20 +3,19 @@ db 80, 105, 65, 130, 60, 75 ; hp atk def spd sat sdf - db ROCK, FLYING + db ROCK, FLYING ; type db 45 ; catch rate db 202 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 35 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/aerodactyl/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn AVIAN, AVIAN ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_FLYING, EGG_FLYING ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, EARTHQUAKE, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, SWIFT, DETECT, REST, ATTRACT, STEEL_WING, FLY, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/aipom.asm b/data/pokemon/base_stats/aipom.asm index 0bd6954f4..12edacca2 100644 --- a/data/pokemon/base_stats/aipom.asm +++ b/data/pokemon/base_stats/aipom.asm @@ -3,20 +3,19 @@ db 55, 70, 55, 85, 40, 55 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 45 ; catch rate db 94 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/aipom/front.dimensions" db 0, 0, 0, 0 ; padding - db FAST ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_FAST ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, FURY_CUTTER, NIGHTMARE, CUT, STRENGTH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/alakazam.asm b/data/pokemon/base_stats/alakazam.asm index 35ebdf9af..5de640d73 100644 --- a/data/pokemon/base_stats/alakazam.asm +++ b/data/pokemon/base_stats/alakazam.asm @@ -3,20 +3,19 @@ db 55, 50, 45, 120, 135, 85 ; hp atk def spd sat sdf - db PSYCHIC, PSYCHIC + db PSYCHIC, PSYCHIC ; type db 50 ; catch rate db 186 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F25 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F25 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/alakazam/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn HUMANSHAPE, HUMANSHAPE ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DIG, PSYCHIC_M, SHADOW_BALL, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, THUNDERPUNCH, DREAM_EATER, REST, ATTRACT, THIEF, FIRE_PUNCH, NIGHTMARE, FLASH ; end diff --git a/data/pokemon/base_stats/ampharos.asm b/data/pokemon/base_stats/ampharos.asm index b391238d3..e4ef4bd0a 100644 --- a/data/pokemon/base_stats/ampharos.asm +++ b/data/pokemon/base_stats/ampharos.asm @@ -3,20 +3,19 @@ db 90, 75, 75, 55, 115, 90 ; hp atk def spd sat sdf - db ELECTRIC, ELECTRIC + db ELECTRIC, ELECTRIC ; type db 45 ; catch rate db 194 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/ampharos/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn MONSTER, FIELD ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_MONSTER, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, REST, ATTRACT, FIRE_PUNCH, STRENGTH, FLASH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/arbok.asm b/data/pokemon/base_stats/arbok.asm index 52341c37d..b90c83b1c 100644 --- a/data/pokemon/base_stats/arbok.asm +++ b/data/pokemon/base_stats/arbok.asm @@ -3,20 +3,19 @@ db 60, 85, 69, 80, 65, 79 ; hp atk def spd sat sdf - db POISON, POISON + db POISON, POISON ; type db 90 ; catch rate db 147 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/arbok/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, REPTILE ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_GROUND, EGG_DRAGON ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, THIEF, STRENGTH ; end diff --git a/data/pokemon/base_stats/arcanine.asm b/data/pokemon/base_stats/arcanine.asm index 299086c9d..92f9b0233 100644 --- a/data/pokemon/base_stats/arcanine.asm +++ b/data/pokemon/base_stats/arcanine.asm @@ -3,20 +3,19 @@ db 90, 110, 80, 95, 100, 80 ; hp atk def spd sat sdf - db FIRE, FIRE + db FIRE, FIRE ; type db 75 ; catch rate db 213 ; base exp - db BURNT_BERRY ; item 1 - db BURNT_BERRY ; item 2 - db GENDER_F25 ; gender - db 100 ; unknown + db BURNT_BERRY, BURNT_BERRY ; items + db GENDER_F25 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/arcanine/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, RETURN, DIG, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, REST, ATTRACT, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/ariados.asm b/data/pokemon/base_stats/ariados.asm index 78697127c..ca8076a20 100644 --- a/data/pokemon/base_stats/ariados.asm +++ b/data/pokemon/base_stats/ariados.asm @@ -3,20 +3,19 @@ db 70, 90, 70, 40, 60, 60 ; hp atk def spd sat sdf - db BUG, POISON + db BUG, POISON ; type db 90 ; catch rate db 134 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/ariados/front.dimensions" db 0, 0, 0, 0 ; padding - db FAST ; growth rate - dn INSECT, INSECT ; egg groups + db GROWTH_FAST ; growth rate + dn EGG_BUG, EGG_BUG ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DIG, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, THIEF, FLASH ; end diff --git a/data/pokemon/base_stats/articuno.asm b/data/pokemon/base_stats/articuno.asm index e637c47f4..1189afec1 100644 --- a/data/pokemon/base_stats/articuno.asm +++ b/data/pokemon/base_stats/articuno.asm @@ -3,20 +3,19 @@ db 90, 85, 100, 85, 95, 125 ; hp atk def spd sat sdf - db ICE, FLYING + db ICE, FLYING ; type db 3 ; catch rate db 215 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDERLESS ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_UNKNOWN ; gender ratio + db 100 ; unknown 1 db 80 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/articuno/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn NO_EGGS, NO_EGGS ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_NONE, EGG_NONE ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DETECT, REST, STEEL_WING, FLY, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/azumarill.asm b/data/pokemon/base_stats/azumarill.asm index 1681d3be2..d76e1bd72 100644 --- a/data/pokemon/base_stats/azumarill.asm +++ b/data/pokemon/base_stats/azumarill.asm @@ -3,20 +3,19 @@ db 100, 50, 80, 50, 50, 80 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 75 ; catch rate db 153 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/azumarill/front.dimensions" db 0, 0, 0, 0 ; padding - db FAST ; growth rate - dn AMPHIBIAN, FAIRY ; egg groups + db GROWTH_FAST ; growth rate + dn EGG_WATER_1, EGG_FAIRY ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, REST, ATTRACT, SURF, STRENGTH, WHIRLPOOL, WATERFALL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/bayleef.asm b/data/pokemon/base_stats/bayleef.asm index 50ee3044c..1228b4d49 100644 --- a/data/pokemon/base_stats/bayleef.asm +++ b/data/pokemon/base_stats/bayleef.asm @@ -3,20 +3,19 @@ db 60, 62, 80, 60, 63, 80 ; hp atk def spd sat sdf - db GRASS, GRASS + db GRASS, GRASS ; type db 45 ; catch rate db 141 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/bayleef/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn MONSTER, PLANT ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_MONSTER, EGG_PLANT ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DETECT, REST, ATTRACT, FURY_CUTTER, CUT, STRENGTH, FLASH ; end diff --git a/data/pokemon/base_stats/beedrill.asm b/data/pokemon/base_stats/beedrill.asm index 3fa11d8eb..8e371d790 100644 --- a/data/pokemon/base_stats/beedrill.asm +++ b/data/pokemon/base_stats/beedrill.asm @@ -3,20 +3,19 @@ db 65, 80, 40, 75, 45, 80 ; hp atk def spd sat sdf - db BUG, POISON + db BUG, POISON ; type db 45 ; catch rate db 159 ; base exp - db NO_ITEM ; item 1 - db POISON_BARB ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, POISON_BARB ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/beedrill/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn INSECT, INSECT ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_BUG, EGG_BUG ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SWIFT, REST, ATTRACT, FURY_CUTTER, CUT ; end diff --git a/data/pokemon/base_stats/bellossom.asm b/data/pokemon/base_stats/bellossom.asm index 3f3f06870..328959a5f 100644 --- a/data/pokemon/base_stats/bellossom.asm +++ b/data/pokemon/base_stats/bellossom.asm @@ -3,20 +3,19 @@ db 75, 80, 85, 50, 90, 100 ; hp atk def spd sat sdf - db GRASS, GRASS + db GRASS, GRASS ; type db 45 ; catch rate db 184 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/bellossom/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn PLANT, PLANT ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_PLANT, EGG_PLANT ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, REST, ATTRACT, CUT, FLASH ; end diff --git a/data/pokemon/base_stats/bellsprout.asm b/data/pokemon/base_stats/bellsprout.asm index 5e75e6e89..099dc7142 100644 --- a/data/pokemon/base_stats/bellsprout.asm +++ b/data/pokemon/base_stats/bellsprout.asm @@ -3,20 +3,19 @@ db 50, 75, 35, 40, 70, 30 ; hp atk def spd sat sdf - db GRASS, POISON + db GRASS, POISON ; type db 255 ; catch rate db 84 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/bellsprout/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn PLANT, PLANT ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_PLANT, EGG_PLANT ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, CUT, FLASH ; end diff --git a/data/pokemon/base_stats/blastoise.asm b/data/pokemon/base_stats/blastoise.asm index 7e2f1697e..9cb62420a 100644 --- a/data/pokemon/base_stats/blastoise.asm +++ b/data/pokemon/base_stats/blastoise.asm @@ -3,20 +3,19 @@ db 79, 83, 100, 78, 85, 105 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 45 ; catch rate db 210 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/blastoise/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn MONSTER, AMPHIBIAN ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_MONSTER, EGG_WATER_1 ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, SURF, STRENGTH, WHIRLPOOL, WATERFALL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/blissey.asm b/data/pokemon/base_stats/blissey.asm index 789649a40..8e6256843 100644 --- a/data/pokemon/base_stats/blissey.asm +++ b/data/pokemon/base_stats/blissey.asm @@ -3,20 +3,19 @@ db 255, 10, 10, 55, 75, 135 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 30 ; catch rate db 255 ; base exp - db NO_ITEM ; item 1 - db LUCKY_EGG ; item 2 - db GENDER_F100 ; gender - db 100 ; unknown + db NO_ITEM, LUCKY_EGG ; items + db GENDER_F100 ; gender ratio + db 100 ; unknown 1 db 40 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/blissey/front.dimensions" db 0, 0, 0, 0 ; padding - db FAST ; growth rate - dn FAIRY, FAIRY ; egg groups + db GROWTH_FAST ; growth rate + dn EGG_FAIRY, EGG_FAIRY ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DEFENSE_CURL, DREAM_EATER, REST, ATTRACT, STRENGTH, FLASH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/bulbasaur.asm b/data/pokemon/base_stats/bulbasaur.asm index 2795d8035..f4178d8ae 100644 --- a/data/pokemon/base_stats/bulbasaur.asm +++ b/data/pokemon/base_stats/bulbasaur.asm @@ -3,20 +3,19 @@ db 45, 49, 49, 45, 65, 65 ; hp atk def spd sat sdf - db GRASS, POISON + db GRASS, POISON ; type db 45 ; catch rate db 64 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/bulbasaur/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn MONSTER, PLANT ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_MONSTER, EGG_PLANT ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, FURY_CUTTER, CUT, FLASH ; end diff --git a/data/pokemon/base_stats/butterfree.asm b/data/pokemon/base_stats/butterfree.asm index 1feee4f58..f2c125ac4 100644 --- a/data/pokemon/base_stats/butterfree.asm +++ b/data/pokemon/base_stats/butterfree.asm @@ -3,20 +3,19 @@ db 60, 45, 50, 70, 80, 80 ; hp atk def spd sat sdf - db BUG, FLYING + db BUG, FLYING ; type db 45 ; catch rate db 160 ; base exp - db NO_ITEM ; item 1 - db SILVERPOWDER ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, SILVERPOWDER ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/butterfree/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn INSECT, INSECT ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_BUG, EGG_BUG ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, NIGHTMARE, FLASH ; end diff --git a/data/pokemon/base_stats/caterpie.asm b/data/pokemon/base_stats/caterpie.asm index a10790541..d7525ee53 100644 --- a/data/pokemon/base_stats/caterpie.asm +++ b/data/pokemon/base_stats/caterpie.asm @@ -3,20 +3,19 @@ db 45, 30, 35, 45, 20, 20 ; hp atk def spd sat sdf - db BUG, BUG + db BUG, BUG ; type db 255 ; catch rate db 53 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/caterpie/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn INSECT, INSECT ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_BUG, EGG_BUG ; egg groups - ; tmhm + ; tm/hm learnset tmhm ; end diff --git a/data/pokemon/base_stats/celebi.asm b/data/pokemon/base_stats/celebi.asm index aabadba4f..8943dc8bc 100644 --- a/data/pokemon/base_stats/celebi.asm +++ b/data/pokemon/base_stats/celebi.asm @@ -3,20 +3,19 @@ db 100, 100, 100, 100, 100, 100 ; hp atk def spd sat sdf - db PSYCHIC, GRASS + db PSYCHIC, GRASS ; type db 45 ; catch rate db 64 ; base exp - db NO_ITEM ; item 1 - db MIRACLEBERRY ; item 2 - db GENDERLESS ; gender - db 100 ; unknown + db NO_ITEM, MIRACLEBERRY ; items + db GENDER_UNKNOWN ; gender ratio + db 100 ; unknown 1 db 120 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/celebi/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn NO_EGGS, NO_EGGS ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_NONE, EGG_NONE ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DEFENSE_CURL, DREAM_EATER, DETECT, REST, NIGHTMARE, FLASH ; end diff --git a/data/pokemon/base_stats/chansey.asm b/data/pokemon/base_stats/chansey.asm index d51f67d4f..78ec783ae 100644 --- a/data/pokemon/base_stats/chansey.asm +++ b/data/pokemon/base_stats/chansey.asm @@ -3,20 +3,19 @@ db 250, 05, 05, 50, 35, 105 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 30 ; catch rate db 255 ; base exp - db NO_ITEM ; item 1 - db LUCKY_EGG ; item 2 - db GENDER_F100 ; gender - db 100 ; unknown + db NO_ITEM, LUCKY_EGG ; items + db GENDER_F100 ; gender ratio + db 100 ; unknown 1 db 40 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/chansey/front.dimensions" db 0, 0, 0, 0 ; padding - db FAST ; growth rate - dn FAIRY, FAIRY ; egg groups + db GROWTH_FAST ; growth rate + dn EGG_FAIRY, EGG_FAIRY ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DEFENSE_CURL, DREAM_EATER, REST, ATTRACT, STRENGTH, FLASH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/charizard.asm b/data/pokemon/base_stats/charizard.asm index d978c6ad5..237f7d72b 100644 --- a/data/pokemon/base_stats/charizard.asm +++ b/data/pokemon/base_stats/charizard.asm @@ -3,20 +3,19 @@ db 78, 84, 78, 100, 109, 85 ; hp atk def spd sat sdf - db FIRE, FLYING + db FIRE, FLYING ; type db 45 ; catch rate db 209 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/charizard/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn MONSTER, REPTILE ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_MONSTER, EGG_DRAGON ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, SWIFT, DEFENSE_CURL, REST, ATTRACT, STEEL_WING, FIRE_PUNCH, FURY_CUTTER, CUT, FLY, STRENGTH, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/charmander.asm b/data/pokemon/base_stats/charmander.asm index 2fa9b9526..6f60c22a8 100644 --- a/data/pokemon/base_stats/charmander.asm +++ b/data/pokemon/base_stats/charmander.asm @@ -3,20 +3,19 @@ db 39, 52, 43, 65, 60, 50 ; hp atk def spd sat sdf - db FIRE, FIRE + db FIRE, FIRE ; type db 45 ; catch rate db 65 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/charmander/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn MONSTER, REPTILE ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_MONSTER, EGG_DRAGON ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DEFENSE_CURL, REST, ATTRACT, FIRE_PUNCH, FURY_CUTTER, CUT, STRENGTH, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/charmeleon.asm b/data/pokemon/base_stats/charmeleon.asm index 5d86b975b..832757a7e 100644 --- a/data/pokemon/base_stats/charmeleon.asm +++ b/data/pokemon/base_stats/charmeleon.asm @@ -3,20 +3,19 @@ db 58, 64, 58, 80, 80, 65 ; hp atk def spd sat sdf - db FIRE, FIRE + db FIRE, FIRE ; type db 45 ; catch rate db 142 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/charmeleon/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn MONSTER, REPTILE ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_MONSTER, EGG_DRAGON ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DEFENSE_CURL, REST, ATTRACT, FIRE_PUNCH, FURY_CUTTER, CUT, STRENGTH, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/chikorita.asm b/data/pokemon/base_stats/chikorita.asm index 0476ba558..639e51377 100644 --- a/data/pokemon/base_stats/chikorita.asm +++ b/data/pokemon/base_stats/chikorita.asm @@ -3,20 +3,19 @@ db 45, 49, 65, 45, 49, 65 ; hp atk def spd sat sdf - db GRASS, GRASS + db GRASS, GRASS ; type db 45 ; catch rate db 64 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/chikorita/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn MONSTER, PLANT ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_MONSTER, EGG_PLANT ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DETECT, REST, ATTRACT, CUT, FLASH ; end diff --git a/data/pokemon/base_stats/chinchou.asm b/data/pokemon/base_stats/chinchou.asm index a5b3ded3a..3bad12e41 100644 --- a/data/pokemon/base_stats/chinchou.asm +++ b/data/pokemon/base_stats/chinchou.asm @@ -3,20 +3,19 @@ db 75, 38, 38, 67, 56, 56 ; hp atk def spd sat sdf - db WATER, ELECTRIC + db WATER, ELECTRIC ; type db 190 ; catch rate db 90 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/chinchou/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn FISH, FISH ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_WATER_2, EGG_WATER_2 ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, REST, ATTRACT, SURF, FLASH, WHIRLPOOL, WATERFALL, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/clefable.asm b/data/pokemon/base_stats/clefable.asm index 4da3c73df..dc627f02c 100644 --- a/data/pokemon/base_stats/clefable.asm +++ b/data/pokemon/base_stats/clefable.asm @@ -3,20 +3,19 @@ db 95, 70, 73, 60, 85, 90 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 25 ; catch rate db 129 ; base exp - db MYSTERYBERRY ; item 1 - db MOON_STONE ; item 2 - db GENDER_F75 ; gender - db 100 ; unknown + db MYSTERYBERRY, MOON_STONE ; items + db GENDER_F75 ; gender ratio + db 100 ; unknown 1 db 10 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/clefable/front.dimensions" db 0, 0, 0, 0 ; padding - db FAST ; growth rate - dn FAIRY, FAIRY ; egg groups + db GROWTH_FAST ; growth rate + dn EGG_FAIRY, EGG_FAIRY ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, FIRE_BLAST, DEFENSE_CURL, THUNDERPUNCH, DREAM_EATER, DETECT, REST, ATTRACT, FIRE_PUNCH, NIGHTMARE, STRENGTH, FLASH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/clefairy.asm b/data/pokemon/base_stats/clefairy.asm index 5e4def0ca..71c8ac9a7 100644 --- a/data/pokemon/base_stats/clefairy.asm +++ b/data/pokemon/base_stats/clefairy.asm @@ -3,20 +3,19 @@ db 70, 45, 48, 35, 60, 65 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 150 ; catch rate db 68 ; base exp - db MYSTERYBERRY ; item 1 - db MOON_STONE ; item 2 - db GENDER_F75 ; gender - db 100 ; unknown + db MYSTERYBERRY, MOON_STONE ; items + db GENDER_F75 ; gender ratio + db 100 ; unknown 1 db 10 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/clefairy/front.dimensions" db 0, 0, 0, 0 ; padding - db FAST ; growth rate - dn FAIRY, FAIRY ; egg groups + db GROWTH_FAST ; growth rate + dn EGG_FAIRY, EGG_FAIRY ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, FIRE_BLAST, DEFENSE_CURL, THUNDERPUNCH, DREAM_EATER, DETECT, REST, ATTRACT, FIRE_PUNCH, NIGHTMARE, STRENGTH, FLASH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/cleffa.asm b/data/pokemon/base_stats/cleffa.asm index 89fa91a45..923b339b9 100644 --- a/data/pokemon/base_stats/cleffa.asm +++ b/data/pokemon/base_stats/cleffa.asm @@ -3,20 +3,19 @@ db 50, 25, 28, 15, 45, 55 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 150 ; catch rate db 37 ; base exp - db MYSTERYBERRY ; item 1 - db MOON_STONE ; item 2 - db GENDER_F75 ; gender - db 100 ; unknown + db MYSTERYBERRY, MOON_STONE ; items + db GENDER_F75 ; gender ratio + db 100 ; unknown 1 db 10 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/cleffa/front.dimensions" db 0, 0, 0, 0 ; padding - db FAST ; growth rate - dn NO_EGGS, NO_EGGS ; egg groups + db GROWTH_FAST ; growth rate + dn EGG_NONE, EGG_NONE ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, DEFENSE_CURL, DREAM_EATER, DETECT, REST, ATTRACT, NIGHTMARE, FLASH, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/cloyster.asm b/data/pokemon/base_stats/cloyster.asm index 3f3c13b6a..7dfc72ff9 100644 --- a/data/pokemon/base_stats/cloyster.asm +++ b/data/pokemon/base_stats/cloyster.asm @@ -3,20 +3,19 @@ db 50, 95, 180, 70, 85, 45 ; hp atk def spd sat sdf - db WATER, ICE + db WATER, ICE ; type db 60 ; catch rate db 203 ; base exp - db PEARL ; item 1 - db BIG_PEARL ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db PEARL, BIG_PEARL ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/cloyster/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn INVERTEBRATE, INVERTEBRATE ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_WATER_3, EGG_WATER_3 ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, SURF, WHIRLPOOL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/corsola.asm b/data/pokemon/base_stats/corsola.asm index 8f1e836ff..e5f2536f8 100644 --- a/data/pokemon/base_stats/corsola.asm +++ b/data/pokemon/base_stats/corsola.asm @@ -3,20 +3,19 @@ db 55, 55, 85, 35, 65, 85 ; hp atk def spd sat sdf - db WATER, ROCK + db WATER, ROCK ; type db 60 ; catch rate db 113 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F75 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F75 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/corsola/front.dimensions" db 0, 0, 0, 0 ; padding - db FAST ; growth rate - dn AMPHIBIAN, INVERTEBRATE ; egg groups + db GROWTH_FAST ; growth rate + dn EGG_WATER_1, EGG_WATER_3 ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, PSYCHIC_M, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, DEFENSE_CURL, REST, ATTRACT, SURF, STRENGTH, WHIRLPOOL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/crobat.asm b/data/pokemon/base_stats/crobat.asm index 34d7d10c5..11b39ab2d 100644 --- a/data/pokemon/base_stats/crobat.asm +++ b/data/pokemon/base_stats/crobat.asm @@ -3,20 +3,19 @@ db 85, 90, 80, 130, 70, 80 ; hp atk def spd sat sdf - db POISON, FLYING + db POISON, FLYING ; type db 90 ; catch rate db 204 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/crobat/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AVIAN, AVIAN ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_FLYING, EGG_FLYING ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING, FLY ; end diff --git a/data/pokemon/base_stats/croconaw.asm b/data/pokemon/base_stats/croconaw.asm index 6c76b19b1..8b0fa482f 100644 --- a/data/pokemon/base_stats/croconaw.asm +++ b/data/pokemon/base_stats/croconaw.asm @@ -3,20 +3,19 @@ db 65, 80, 80, 58, 59, 63 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 45 ; catch rate db 143 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/croconaw/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn MONSTER, AMPHIBIAN ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_MONSTER, EGG_WATER_1 ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DETECT, REST, ATTRACT, FURY_CUTTER, CUT, SURF, STRENGTH, WHIRLPOOL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/cubone.asm b/data/pokemon/base_stats/cubone.asm index 451f52133..a44eea42e 100644 --- a/data/pokemon/base_stats/cubone.asm +++ b/data/pokemon/base_stats/cubone.asm @@ -3,20 +3,19 @@ db 50, 50, 95, 35, 40, 50 ; hp atk def spd sat sdf - db GROUND, GROUND + db GROUND, GROUND ; type db 190 ; catch rate db 87 ; base exp - db NO_ITEM ; item 1 - db THICK_CLUB ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, THICK_CLUB ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/cubone/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn MONSTER, MONSTER ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_MONSTER, EGG_MONSTER ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, ICY_WIND, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, FLAMETHROWER, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/cyndaquil.asm b/data/pokemon/base_stats/cyndaquil.asm index a1b07cb91..8170baa48 100644 --- a/data/pokemon/base_stats/cyndaquil.asm +++ b/data/pokemon/base_stats/cyndaquil.asm @@ -3,20 +3,19 @@ db 39, 52, 43, 65, 60, 50 ; hp atk def spd sat sdf - db FIRE, FIRE + db FIRE, FIRE ; type db 45 ; catch rate db 65 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/cyndaquil/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DEFENSE_CURL, DETECT, REST, ATTRACT, CUT, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/delibird.asm b/data/pokemon/base_stats/delibird.asm index 0b38e8b97..636541752 100644 --- a/data/pokemon/base_stats/delibird.asm +++ b/data/pokemon/base_stats/delibird.asm @@ -3,20 +3,19 @@ db 45, 55, 45, 75, 65, 45 ; hp atk def spd sat sdf - db ICE, FLYING + db ICE, FLYING ; type db 45 ; catch rate db 183 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/delibird/front.dimensions" db 0, 0, 0, 0 ; padding - db FAST ; growth rate - dn AMPHIBIAN, FIELD ; egg groups + db GROWTH_FAST ; growth rate + dn EGG_WATER_1, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, FLY, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/dewgong.asm b/data/pokemon/base_stats/dewgong.asm index ae6aa1941..7abfad876 100644 --- a/data/pokemon/base_stats/dewgong.asm +++ b/data/pokemon/base_stats/dewgong.asm @@ -3,20 +3,19 @@ db 90, 70, 80, 70, 70, 95 ; hp atk def spd sat sdf - db WATER, ICE + db WATER, ICE ; type db 75 ; catch rate db 176 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/dewgong/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AMPHIBIAN, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_WATER_1, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, REST, ATTRACT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/diglett.asm b/data/pokemon/base_stats/diglett.asm index 1153cbcac..7027030e6 100644 --- a/data/pokemon/base_stats/diglett.asm +++ b/data/pokemon/base_stats/diglett.asm @@ -3,20 +3,19 @@ db 10, 55, 25, 95, 35, 45 ; hp atk def spd sat sdf - db GROUND, GROUND + db GROUND, GROUND ; type db 255 ; catch rate db 81 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/diglett/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, THIEF, CUT ; end diff --git a/data/pokemon/base_stats/ditto.asm b/data/pokemon/base_stats/ditto.asm index 89d92ab7a..4528b5381 100644 --- a/data/pokemon/base_stats/ditto.asm +++ b/data/pokemon/base_stats/ditto.asm @@ -3,20 +3,19 @@ db 48, 48, 48, 48, 48, 48 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 35 ; catch rate db 61 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDERLESS ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_UNKNOWN ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/ditto/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn LADIES_MAN, LADIES_MAN ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_DITTO, EGG_DITTO ; egg groups - ; tmhm + ; tm/hm learnset tmhm ; end diff --git a/data/pokemon/base_stats/dodrio.asm b/data/pokemon/base_stats/dodrio.asm index 9065dcbde..dbdb095e2 100644 --- a/data/pokemon/base_stats/dodrio.asm +++ b/data/pokemon/base_stats/dodrio.asm @@ -3,20 +3,19 @@ db 60, 110, 70, 100, 60, 60 ; hp atk def spd sat sdf - db NORMAL, FLYING + db NORMAL, FLYING ; type db 45 ; catch rate db 158 ; base exp - db NO_ITEM ; item 1 - db SHARP_BEAK ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, SHARP_BEAK ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/dodrio/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AVIAN, AVIAN ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_FLYING, EGG_FLYING ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, THIEF, STEEL_WING, FLY ; end diff --git a/data/pokemon/base_stats/doduo.asm b/data/pokemon/base_stats/doduo.asm index f844ccb07..668740723 100644 --- a/data/pokemon/base_stats/doduo.asm +++ b/data/pokemon/base_stats/doduo.asm @@ -3,20 +3,19 @@ db 35, 85, 45, 75, 35, 35 ; hp atk def spd sat sdf - db NORMAL, FLYING + db NORMAL, FLYING ; type db 190 ; catch rate db 96 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/doduo/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AVIAN, AVIAN ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_FLYING, EGG_FLYING ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, THIEF, STEEL_WING, FLY ; end diff --git a/data/pokemon/base_stats/donphan.asm b/data/pokemon/base_stats/donphan.asm index a5995c3fb..4d1e58f14 100644 --- a/data/pokemon/base_stats/donphan.asm +++ b/data/pokemon/base_stats/donphan.asm @@ -3,20 +3,19 @@ db 90, 120, 120, 50, 60, 60 ; hp atk def spd sat sdf - db GROUND, GROUND + db GROUND, GROUND ; type db 60 ; catch rate db 189 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/donphan/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, DEFENSE_CURL, REST, ATTRACT, STRENGTH ; end diff --git a/data/pokemon/base_stats/dragonair.asm b/data/pokemon/base_stats/dragonair.asm index 0478bd6a1..a876a54de 100644 --- a/data/pokemon/base_stats/dragonair.asm +++ b/data/pokemon/base_stats/dragonair.asm @@ -3,20 +3,19 @@ db 61, 84, 65, 70, 70, 70 ; hp atk def spd sat sdf - db DRAGON, DRAGON + db DRAGON, DRAGON ; type db 45 ; catch rate db 144 ; base exp - db NO_ITEM ; item 1 - db DRAGON_SCALE ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, DRAGON_SCALE ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 40 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/dragonair/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn AMPHIBIAN, REPTILE ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_WATER_1, EGG_DRAGON ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DETECT, REST, ATTRACT, SURF, WATERFALL, FLAMETHROWER, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/dragonite.asm b/data/pokemon/base_stats/dragonite.asm index d8ae9add9..6d088437f 100644 --- a/data/pokemon/base_stats/dragonite.asm +++ b/data/pokemon/base_stats/dragonite.asm @@ -3,20 +3,19 @@ db 91, 134, 95, 80, 100, 100 ; hp atk def spd sat sdf - db DRAGON, FLYING + db DRAGON, FLYING ; type db 45 ; catch rate db 218 ; base exp - db NO_ITEM ; item 1 - db DRAGON_SCALE ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, DRAGON_SCALE ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 40 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/dragonite/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn AMPHIBIAN, REPTILE ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_WATER_1, EGG_DRAGON ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, SWIFT, THUNDERPUNCH, DETECT, REST, ATTRACT, STEEL_WING, FIRE_PUNCH, FURY_CUTTER, FLY, SURF, STRENGTH, WHIRLPOOL, WATERFALL, FLAMETHROWER, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/dratini.asm b/data/pokemon/base_stats/dratini.asm index 0d5ccd5fd..2e8b2a226 100644 --- a/data/pokemon/base_stats/dratini.asm +++ b/data/pokemon/base_stats/dratini.asm @@ -3,20 +3,19 @@ db 41, 64, 45, 50, 50, 50 ; hp atk def spd sat sdf - db DRAGON, DRAGON + db DRAGON, DRAGON ; type db 45 ; catch rate db 67 ; base exp - db NO_ITEM ; item 1 - db DRAGON_SCALE ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, DRAGON_SCALE ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 40 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/dratini/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn AMPHIBIAN, REPTILE ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_WATER_1, EGG_DRAGON ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DETECT, REST, ATTRACT, SURF, WATERFALL, FLAMETHROWER, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/drowzee.asm b/data/pokemon/base_stats/drowzee.asm index 7dd4855a3..d00ea31b3 100644 --- a/data/pokemon/base_stats/drowzee.asm +++ b/data/pokemon/base_stats/drowzee.asm @@ -3,20 +3,19 @@ db 60, 48, 45, 42, 43, 90 ; hp atk def spd sat sdf - db PSYCHIC, PSYCHIC + db PSYCHIC, PSYCHIC ; type db 190 ; catch rate db 102 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/drowzee/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn HUMANSHAPE, HUMANSHAPE ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, PSYCHIC_M, SHADOW_BALL, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, THUNDERPUNCH, DREAM_EATER, REST, ATTRACT, FIRE_PUNCH, NIGHTMARE, FLASH ; end diff --git a/data/pokemon/base_stats/dugtrio.asm b/data/pokemon/base_stats/dugtrio.asm index 9430a6669..ec1fb51f5 100644 --- a/data/pokemon/base_stats/dugtrio.asm +++ b/data/pokemon/base_stats/dugtrio.asm @@ -3,20 +3,19 @@ db 35, 80, 50, 120, 50, 70 ; hp atk def spd sat sdf - db GROUND, GROUND + db GROUND, GROUND ; type db 50 ; catch rate db 153 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/dugtrio/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, THIEF, CUT ; end diff --git a/data/pokemon/base_stats/dunsparce.asm b/data/pokemon/base_stats/dunsparce.asm index 8eef16241..6ebebf36c 100644 --- a/data/pokemon/base_stats/dunsparce.asm +++ b/data/pokemon/base_stats/dunsparce.asm @@ -3,20 +3,19 @@ db 100, 70, 70, 45, 65, 65 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 190 ; catch rate db 75 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/dunsparce/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, THUNDER, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, STRENGTH, FLAMETHROWER, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/eevee.asm b/data/pokemon/base_stats/eevee.asm index 95f67cf2b..9a267c70a 100644 --- a/data/pokemon/base_stats/eevee.asm +++ b/data/pokemon/base_stats/eevee.asm @@ -3,20 +3,19 @@ db 55, 55, 50, 55, 45, 65 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 45 ; catch rate db 92 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 35 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/eevee/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT ; end diff --git a/data/pokemon/base_stats/ekans.asm b/data/pokemon/base_stats/ekans.asm index feed64b34..997125e31 100644 --- a/data/pokemon/base_stats/ekans.asm +++ b/data/pokemon/base_stats/ekans.asm @@ -3,20 +3,19 @@ db 35, 60, 44, 55, 40, 54 ; hp atk def spd sat sdf - db POISON, POISON + db POISON, POISON ; type db 255 ; catch rate db 62 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/ekans/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, REPTILE ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_GROUND, EGG_DRAGON ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, THIEF, STRENGTH ; end diff --git a/data/pokemon/base_stats/electabuzz.asm b/data/pokemon/base_stats/electabuzz.asm index 472e4487c..b9524d571 100644 --- a/data/pokemon/base_stats/electabuzz.asm +++ b/data/pokemon/base_stats/electabuzz.asm @@ -3,20 +3,19 @@ db 65, 83, 57, 105, 95, 85 ; hp atk def spd sat sdf - db ELECTRIC, ELECTRIC + db ELECTRIC, ELECTRIC ; type db 45 ; catch rate db 156 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F25 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F25 ; gender ratio + db 100 ; unknown 1 db 25 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/electabuzz/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn HUMANSHAPE, HUMANSHAPE ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, PSYCHIC_M, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, FLASH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/electrode.asm b/data/pokemon/base_stats/electrode.asm index 72bc666e9..ec4714cd3 100644 --- a/data/pokemon/base_stats/electrode.asm +++ b/data/pokemon/base_stats/electrode.asm @@ -3,20 +3,19 @@ db 60, 50, 70, 140, 80, 80 ; hp atk def spd sat sdf - db ELECTRIC, ELECTRIC + db ELECTRIC, ELECTRIC ; type db 60 ; catch rate db 150 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDERLESS ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_UNKNOWN ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/electrode/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn INANIMATE, INANIMATE ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_MINERAL, EGG_MINERAL ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, FLASH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/elekid.asm b/data/pokemon/base_stats/elekid.asm index e53dcc23c..ba7abf250 100644 --- a/data/pokemon/base_stats/elekid.asm +++ b/data/pokemon/base_stats/elekid.asm @@ -3,20 +3,19 @@ db 45, 63, 37, 95, 65, 55 ; hp atk def spd sat sdf - db ELECTRIC, ELECTRIC + db ELECTRIC, ELECTRIC ; type db 45 ; catch rate db 106 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F25 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F25 ; gender ratio + db 100 ; unknown 1 db 25 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/elekid/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn NO_EGGS, NO_EGGS ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_NONE, EGG_NONE ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, PSYCHIC_M, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, FLASH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/entei.asm b/data/pokemon/base_stats/entei.asm index 4e4b7b3f8..7085e8990 100644 --- a/data/pokemon/base_stats/entei.asm +++ b/data/pokemon/base_stats/entei.asm @@ -3,20 +3,19 @@ db 115, 115, 85, 100, 90, 75 ; hp atk def spd sat sdf - db FIRE, FIRE + db FIRE, FIRE ; type db 3 ; catch rate db 217 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDERLESS ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_UNKNOWN ; gender ratio + db 100 ; unknown 1 db 80 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/entei/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn NO_EGGS, NO_EGGS ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_NONE, EGG_NONE ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, SWIFT, DETECT, REST, CUT, STRENGTH, FLASH, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/espeon.asm b/data/pokemon/base_stats/espeon.asm index 0bc50fb6d..4763ce9e9 100644 --- a/data/pokemon/base_stats/espeon.asm +++ b/data/pokemon/base_stats/espeon.asm @@ -3,20 +3,19 @@ db 65, 65, 60, 110, 130, 95 ; hp atk def spd sat sdf - db PSYCHIC, PSYCHIC + db PSYCHIC, PSYCHIC ; type db 45 ; catch rate db 197 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 35 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/espeon/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, DETECT, REST, ATTRACT, NIGHTMARE, CUT, FLASH ; end diff --git a/data/pokemon/base_stats/exeggcute.asm b/data/pokemon/base_stats/exeggcute.asm index 0547333ad..34c132fde 100644 --- a/data/pokemon/base_stats/exeggcute.asm +++ b/data/pokemon/base_stats/exeggcute.asm @@ -3,20 +3,19 @@ db 60, 40, 80, 40, 60, 45 ; hp atk def spd sat sdf - db GRASS, PSYCHIC + db GRASS, PSYCHIC ; type db 90 ; catch rate db 98 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/exeggcute/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn PLANT, PLANT ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_PLANT, EGG_PLANT ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, ROLLOUT, TOXIC, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, STRENGTH, FLASH ; end diff --git a/data/pokemon/base_stats/exeggutor.asm b/data/pokemon/base_stats/exeggutor.asm index 409eb8a1d..b9df54bad 100644 --- a/data/pokemon/base_stats/exeggutor.asm +++ b/data/pokemon/base_stats/exeggutor.asm @@ -3,20 +3,19 @@ db 95, 95, 85, 55, 125, 65 ; hp atk def spd sat sdf - db GRASS, PSYCHIC + db GRASS, PSYCHIC ; type db 45 ; catch rate db 212 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/exeggutor/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn PLANT, PLANT ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_PLANT, EGG_PLANT ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, STRENGTH, FLASH ; end diff --git a/data/pokemon/base_stats/farfetch_d.asm b/data/pokemon/base_stats/farfetch_d.asm index 35d76b0a9..b08bd8135 100644 --- a/data/pokemon/base_stats/farfetch_d.asm +++ b/data/pokemon/base_stats/farfetch_d.asm @@ -3,20 +3,19 @@ db 52, 65, 55, 60, 58, 62 ; hp atk def spd sat sdf - db NORMAL, FLYING + db NORMAL, FLYING ; type db 45 ; catch rate db 94 ; base exp - db NO_ITEM ; item 1 - db STICK ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, STICK ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/farfetch_d/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AVIAN, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_FLYING, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING, CUT, FLY ; end diff --git a/data/pokemon/base_stats/fearow.asm b/data/pokemon/base_stats/fearow.asm index 7ef9936d8..294aa8b4d 100644 --- a/data/pokemon/base_stats/fearow.asm +++ b/data/pokemon/base_stats/fearow.asm @@ -3,20 +3,19 @@ db 65, 90, 65, 100, 61, 61 ; hp atk def spd sat sdf - db NORMAL, FLYING + db NORMAL, FLYING ; type db 90 ; catch rate db 162 ; base exp - db NO_ITEM ; item 1 - db SHARP_BEAK ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, SHARP_BEAK ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/fearow/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AVIAN, AVIAN ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_FLYING, EGG_FLYING ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING, FLY ; end diff --git a/data/pokemon/base_stats/feraligatr.asm b/data/pokemon/base_stats/feraligatr.asm index 41efb2edd..acdbc4126 100644 --- a/data/pokemon/base_stats/feraligatr.asm +++ b/data/pokemon/base_stats/feraligatr.asm @@ -3,20 +3,19 @@ db 85, 105, 100, 78, 79, 83 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 45 ; catch rate db 210 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/feraligatr/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn MONSTER, AMPHIBIAN ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_MONSTER, EGG_WATER_1 ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DETECT, REST, ATTRACT, FURY_CUTTER, CUT, SURF, STRENGTH, WHIRLPOOL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/flaaffy.asm b/data/pokemon/base_stats/flaaffy.asm index b20dc4774..3ce3116cf 100644 --- a/data/pokemon/base_stats/flaaffy.asm +++ b/data/pokemon/base_stats/flaaffy.asm @@ -3,20 +3,19 @@ db 70, 55, 55, 45, 80, 60 ; hp atk def spd sat sdf - db ELECTRIC, ELECTRIC + db ELECTRIC, ELECTRIC ; type db 120 ; catch rate db 117 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/flaaffy/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn MONSTER, FIELD ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_MONSTER, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, REST, ATTRACT, FIRE_PUNCH, STRENGTH, FLASH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/flareon.asm b/data/pokemon/base_stats/flareon.asm index f1d4c8a69..a57bf46e3 100644 --- a/data/pokemon/base_stats/flareon.asm +++ b/data/pokemon/base_stats/flareon.asm @@ -3,20 +3,19 @@ db 65, 130, 60, 65, 95, 110 ; hp atk def spd sat sdf - db FIRE, FIRE + db FIRE, FIRE ; type db 45 ; catch rate db 198 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 35 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/flareon/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, ZAP_CANNON, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DETECT, REST, ATTRACT, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/forretress.asm b/data/pokemon/base_stats/forretress.asm index 9c5a885aa..24eded41f 100644 --- a/data/pokemon/base_stats/forretress.asm +++ b/data/pokemon/base_stats/forretress.asm @@ -3,20 +3,19 @@ db 75, 90, 140, 40, 60, 60 ; hp atk def spd sat sdf - db BUG, STEEL + db BUG, STEEL ; type db 75 ; catch rate db 118 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/forretress/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn INSECT, INSECT ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_BUG, EGG_BUG ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, DEFENSE_CURL, REST, ATTRACT, STRENGTH ; end diff --git a/data/pokemon/base_stats/furret.asm b/data/pokemon/base_stats/furret.asm index b26a82e2e..c63f0a664 100644 --- a/data/pokemon/base_stats/furret.asm +++ b/data/pokemon/base_stats/furret.asm @@ -3,20 +3,19 @@ db 85, 76, 64, 90, 45, 55 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 90 ; catch rate db 116 ; base exp - db BERRY ; item 1 - db GOLD_BERRY ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db BERRY, GOLD_BERRY ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/furret/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, FURY_CUTTER, CUT, SURF, STRENGTH ; end diff --git a/data/pokemon/base_stats/gastly.asm b/data/pokemon/base_stats/gastly.asm index 7e46be055..3845f1991 100644 --- a/data/pokemon/base_stats/gastly.asm +++ b/data/pokemon/base_stats/gastly.asm @@ -3,20 +3,19 @@ db 30, 35, 30, 80, 100, 35 ; hp atk def spd sat sdf - db GHOST, POISON + db GHOST, POISON ; type db 190 ; catch rate db 95 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/gastly/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn AMORPHOUS, AMORPHOUS ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_INDETERMINATE, EGG_INDETERMINATE ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/gengar.asm b/data/pokemon/base_stats/gengar.asm index 4176aa330..33faaa3f7 100644 --- a/data/pokemon/base_stats/gengar.asm +++ b/data/pokemon/base_stats/gengar.asm @@ -3,20 +3,19 @@ db 60, 65, 60, 110, 130, 75 ; hp atk def spd sat sdf - db GHOST, POISON + db GHOST, POISON ; type db 45 ; catch rate db 190 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/gengar/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn AMORPHOUS, AMORPHOUS ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_INDETERMINATE, EGG_INDETERMINATE ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, THUNDERPUNCH, DREAM_EATER, REST, ATTRACT, THIEF, FIRE_PUNCH, NIGHTMARE, STRENGTH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/geodude.asm b/data/pokemon/base_stats/geodude.asm index 35e5d22a7..f084e0b84 100644 --- a/data/pokemon/base_stats/geodude.asm +++ b/data/pokemon/base_stats/geodude.asm @@ -3,20 +3,19 @@ db 40, 80, 100, 20, 30, 30 ; hp atk def spd sat sdf - db ROCK, GROUND + db ROCK, GROUND ; type db 255 ; catch rate db 86 ; base exp - db NO_ITEM ; item 1 - db EVERSTONE ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, EVERSTONE ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/geodude/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn INANIMATE, INANIMATE ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_MINERAL, EGG_MINERAL ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DEFENSE_CURL, REST, ATTRACT, FIRE_PUNCH, STRENGTH, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/girafarig.asm b/data/pokemon/base_stats/girafarig.asm index 7e67b19a6..2e2c7812a 100644 --- a/data/pokemon/base_stats/girafarig.asm +++ b/data/pokemon/base_stats/girafarig.asm @@ -3,20 +3,19 @@ db 70, 80, 65, 85, 90, 65 ; hp atk def spd sat sdf - db NORMAL, PSYCHIC + db NORMAL, PSYCHIC ; type db 60 ; catch rate db 149 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/girafarig/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, EARTHQUAKE, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, STRENGTH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/gligar.asm b/data/pokemon/base_stats/gligar.asm index e16bf7043..ae609d5d2 100644 --- a/data/pokemon/base_stats/gligar.asm +++ b/data/pokemon/base_stats/gligar.asm @@ -3,20 +3,19 @@ db 65, 75, 105, 85, 35, 65 ; hp atk def spd sat sdf - db GROUND, FLYING + db GROUND, FLYING ; type db 60 ; catch rate db 108 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/gligar/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn INSECT, INSECT ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_BUG, EGG_BUG ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SANDSTORM, SWIFT, DETECT, REST, ATTRACT, THIEF, FURY_CUTTER, CUT, STRENGTH ; end diff --git a/data/pokemon/base_stats/gloom.asm b/data/pokemon/base_stats/gloom.asm index 128b1fe81..87941e18a 100644 --- a/data/pokemon/base_stats/gloom.asm +++ b/data/pokemon/base_stats/gloom.asm @@ -3,20 +3,19 @@ db 60, 65, 70, 40, 85, 75 ; hp atk def spd sat sdf - db GRASS, POISON + db GRASS, POISON ; type db 120 ; catch rate db 132 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/gloom/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn PLANT, PLANT ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_PLANT, EGG_PLANT ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, CUT, FLASH ; end diff --git a/data/pokemon/base_stats/golbat.asm b/data/pokemon/base_stats/golbat.asm index 2de7278ca..071df7e59 100644 --- a/data/pokemon/base_stats/golbat.asm +++ b/data/pokemon/base_stats/golbat.asm @@ -3,20 +3,19 @@ db 75, 80, 70, 90, 65, 75 ; hp atk def spd sat sdf - db POISON, FLYING + db POISON, FLYING ; type db 90 ; catch rate db 171 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/golbat/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AVIAN, AVIAN ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_FLYING, EGG_FLYING ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING ; end diff --git a/data/pokemon/base_stats/goldeen.asm b/data/pokemon/base_stats/goldeen.asm index bc165c7a5..eb432d38b 100644 --- a/data/pokemon/base_stats/goldeen.asm +++ b/data/pokemon/base_stats/goldeen.asm @@ -3,20 +3,19 @@ db 45, 67, 60, 63, 35, 50 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 225 ; catch rate db 111 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/goldeen/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FISH, FISH ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_WATER_2, EGG_WATER_2 ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, SURF, WATERFALL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/golduck.asm b/data/pokemon/base_stats/golduck.asm index e3e5ea1aa..8a0acfebd 100644 --- a/data/pokemon/base_stats/golduck.asm +++ b/data/pokemon/base_stats/golduck.asm @@ -3,20 +3,19 @@ db 80, 82, 78, 85, 95, 80 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 75 ; catch rate db 174 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/golduck/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AMPHIBIAN, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_WATER_1, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, FURY_CUTTER, SURF, STRENGTH, FLASH, WHIRLPOOL, WATERFALL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/golem.asm b/data/pokemon/base_stats/golem.asm index bda102404..bb973d0b9 100644 --- a/data/pokemon/base_stats/golem.asm +++ b/data/pokemon/base_stats/golem.asm @@ -3,20 +3,19 @@ db 80, 110, 130, 45, 55, 65 ; hp atk def spd sat sdf - db ROCK, GROUND + db ROCK, GROUND ; type db 45 ; catch rate db 177 ; base exp - db NO_ITEM ; item 1 - db EVERSTONE ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, EVERSTONE ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/golem/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn INANIMATE, INANIMATE ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_MINERAL, EGG_MINERAL ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DEFENSE_CURL, REST, ATTRACT, FIRE_PUNCH, FURY_CUTTER, STRENGTH, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/granbull.asm b/data/pokemon/base_stats/granbull.asm index 9c572cf7b..05c268003 100644 --- a/data/pokemon/base_stats/granbull.asm +++ b/data/pokemon/base_stats/granbull.asm @@ -3,20 +3,19 @@ db 90, 120, 75, 45, 60, 60 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 75 ; catch rate db 178 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F75 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F75 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/granbull/front.dimensions" db 0, 0, 0, 0 ; padding - db FAST ; growth rate - dn FIELD, FAIRY ; egg groups + db GROWTH_FAST ; growth rate + dn EGG_GROUND, EGG_FAIRY ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, DEFENSE_CURL, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/graveler.asm b/data/pokemon/base_stats/graveler.asm index b6be8cb5c..97c4699c0 100644 --- a/data/pokemon/base_stats/graveler.asm +++ b/data/pokemon/base_stats/graveler.asm @@ -3,20 +3,19 @@ db 55, 95, 115, 35, 45, 45 ; hp atk def spd sat sdf - db ROCK, GROUND + db ROCK, GROUND ; type db 120 ; catch rate db 134 ; base exp - db NO_ITEM ; item 1 - db EVERSTONE ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, EVERSTONE ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/graveler/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn INANIMATE, INANIMATE ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_MINERAL, EGG_MINERAL ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DEFENSE_CURL, REST, ATTRACT, FIRE_PUNCH, STRENGTH, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/grimer.asm b/data/pokemon/base_stats/grimer.asm index b1536bb3c..72eb064e3 100644 --- a/data/pokemon/base_stats/grimer.asm +++ b/data/pokemon/base_stats/grimer.asm @@ -3,20 +3,19 @@ db 80, 80, 50, 25, 40, 50 ; hp atk def spd sat sdf - db POISON, POISON + db POISON, POISON ; type db 190 ; catch rate db 90 ; base exp - db NO_ITEM ; item 1 - db NUGGET ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NUGGET ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/grimer/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AMORPHOUS, AMORPHOUS ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_INDETERMINATE, EGG_INDETERMINATE ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, CURSE, TOXIC, ZAP_CANNON, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, FIRE_BLAST, THUNDERPUNCH, REST, ATTRACT, THIEF, FIRE_PUNCH, FLAMETHROWER, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/growlithe.asm b/data/pokemon/base_stats/growlithe.asm index e3cfa7faa..84113f0fb 100644 --- a/data/pokemon/base_stats/growlithe.asm +++ b/data/pokemon/base_stats/growlithe.asm @@ -3,20 +3,19 @@ db 55, 70, 45, 60, 70, 50 ; hp atk def spd sat sdf - db FIRE, FIRE + db FIRE, FIRE ; type db 190 ; catch rate db 91 ; base exp - db BURNT_BERRY ; item 1 - db BURNT_BERRY ; item 2 - db GENDER_F25 ; gender - db 100 ; unknown + db BURNT_BERRY, BURNT_BERRY ; items + db GENDER_F25 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/growlithe/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, RETURN, DIG, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, REST, ATTRACT, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/gyarados.asm b/data/pokemon/base_stats/gyarados.asm index eb4f51f08..0e4d5ca6e 100644 --- a/data/pokemon/base_stats/gyarados.asm +++ b/data/pokemon/base_stats/gyarados.asm @@ -3,20 +3,19 @@ db 95, 125, 79, 81, 60, 100 ; hp atk def spd sat sdf - db WATER, FLYING + db WATER, FLYING ; type db 45 ; catch rate db 214 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 5 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/gyarados/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn FISH, REPTILE ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_WATER_2, EGG_DRAGON ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, DRAGONBREATH, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, REST, ATTRACT, SURF, STRENGTH, WHIRLPOOL, WATERFALL, FLAMETHROWER, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/haunter.asm b/data/pokemon/base_stats/haunter.asm index 5c31fd2a9..1ce4557bc 100644 --- a/data/pokemon/base_stats/haunter.asm +++ b/data/pokemon/base_stats/haunter.asm @@ -3,20 +3,19 @@ db 45, 50, 45, 95, 115, 55 ; hp atk def spd sat sdf - db GHOST, POISON + db GHOST, POISON ; type db 90 ; catch rate db 126 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/haunter/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn AMORPHOUS, AMORPHOUS ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_INDETERMINATE, EGG_INDETERMINATE ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/heracross.asm b/data/pokemon/base_stats/heracross.asm index f27efbe0d..699fc40a8 100644 --- a/data/pokemon/base_stats/heracross.asm +++ b/data/pokemon/base_stats/heracross.asm @@ -3,20 +3,19 @@ db 80, 125, 75, 85, 40, 95 ; hp atk def spd sat sdf - db BUG, FIGHTING + db BUG, FIGHTING ; type db 45 ; catch rate db 200 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 25 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/heracross/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn INSECT, INSECT ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_BUG, EGG_BUG ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DETECT, REST, ATTRACT, THIEF, FURY_CUTTER, CUT, STRENGTH ; end diff --git a/data/pokemon/base_stats/hitmonchan.asm b/data/pokemon/base_stats/hitmonchan.asm index b8e7da73b..49d92287c 100644 --- a/data/pokemon/base_stats/hitmonchan.asm +++ b/data/pokemon/base_stats/hitmonchan.asm @@ -3,20 +3,19 @@ db 50, 105, 79, 76, 35, 110 ; hp atk def spd sat sdf - db FIGHTING, FIGHTING + db FIGHTING, FIGHTING ; type db 45 ; catch rate db 140 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F0 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F0 ; gender ratio + db 100 ; unknown 1 db 25 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/hitmonchan/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn HUMANSHAPE, HUMANSHAPE ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH ; end diff --git a/data/pokemon/base_stats/hitmonlee.asm b/data/pokemon/base_stats/hitmonlee.asm index a5759f92d..a8b11274a 100644 --- a/data/pokemon/base_stats/hitmonlee.asm +++ b/data/pokemon/base_stats/hitmonlee.asm @@ -3,20 +3,19 @@ db 50, 120, 53, 87, 35, 110 ; hp atk def spd sat sdf - db FIGHTING, FIGHTING + db FIGHTING, FIGHTING ; type db 45 ; catch rate db 139 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F0 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F0 ; gender ratio + db 100 ; unknown 1 db 25 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/hitmonlee/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn HUMANSHAPE, HUMANSHAPE ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STRENGTH ; end diff --git a/data/pokemon/base_stats/hitmontop.asm b/data/pokemon/base_stats/hitmontop.asm index a36b7fc58..6a383b07c 100644 --- a/data/pokemon/base_stats/hitmontop.asm +++ b/data/pokemon/base_stats/hitmontop.asm @@ -3,20 +3,19 @@ db 50, 95, 95, 70, 35, 110 ; hp atk def spd sat sdf - db FIGHTING, FIGHTING + db FIGHTING, FIGHTING ; type db 45 ; catch rate db 138 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F0 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F0 ; gender ratio + db 100 ; unknown 1 db 25 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/hitmontop/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn HUMANSHAPE, HUMANSHAPE ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STRENGTH ; end diff --git a/data/pokemon/base_stats/ho_oh.asm b/data/pokemon/base_stats/ho_oh.asm index 910ea5a9f..d2a7627cb 100644 --- a/data/pokemon/base_stats/ho_oh.asm +++ b/data/pokemon/base_stats/ho_oh.asm @@ -3,20 +3,19 @@ db 106, 130, 90, 90, 110, 154 ; hp atk def spd sat sdf - db FIRE, FLYING + db FIRE, FLYING ; type db 3 ; catch rate db 220 ; base exp - db SACRED_ASH ; item 1 - db SACRED_ASH ; item 2 - db GENDERLESS ; gender - db 100 ; unknown + db SACRED_ASH, SACRED_ASH ; items + db GENDER_UNKNOWN ; gender ratio + db 100 ; unknown 1 db 120 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/ho_oh/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn NO_EGGS, NO_EGGS ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_NONE, EGG_NONE ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, DRAGONBREATH, THUNDER, EARTHQUAKE, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, SWIFT, DREAM_EATER, DETECT, REST, STEEL_WING, NIGHTMARE, FLY, STRENGTH, FLASH, FLAMETHROWER, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/hoothoot.asm b/data/pokemon/base_stats/hoothoot.asm index b52e929e9..29293fc6a 100644 --- a/data/pokemon/base_stats/hoothoot.asm +++ b/data/pokemon/base_stats/hoothoot.asm @@ -3,20 +3,19 @@ db 60, 30, 30, 50, 36, 56 ; hp atk def spd sat sdf - db NORMAL, FLYING + db NORMAL, FLYING ; type db 255 ; catch rate db 58 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/hoothoot/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AVIAN, AVIAN ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_FLYING, EGG_FLYING ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, STEEL_WING, NIGHTMARE, FLY, FLASH ; end diff --git a/data/pokemon/base_stats/hoppip.asm b/data/pokemon/base_stats/hoppip.asm index c6e1a86dc..da08514ef 100644 --- a/data/pokemon/base_stats/hoppip.asm +++ b/data/pokemon/base_stats/hoppip.asm @@ -3,20 +3,19 @@ db 35, 35, 40, 50, 35, 55 ; hp atk def spd sat sdf - db GRASS, FLYING + db GRASS, FLYING ; type db 255 ; catch rate db 74 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/hoppip/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn FAIRY, PLANT ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_FAIRY, EGG_PLANT ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, FLASH ; end diff --git a/data/pokemon/base_stats/horsea.asm b/data/pokemon/base_stats/horsea.asm index c3d75a927..dd3c085a8 100644 --- a/data/pokemon/base_stats/horsea.asm +++ b/data/pokemon/base_stats/horsea.asm @@ -3,20 +3,19 @@ db 30, 40, 70, 60, 70, 25 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 225 ; catch rate db 83 ; base exp - db NO_ITEM ; item 1 - db DRAGON_SCALE ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, DRAGON_SCALE ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/horsea/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AMPHIBIAN, REPTILE ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_WATER_1, EGG_DRAGON ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, DRAGONBREATH, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/houndoom.asm b/data/pokemon/base_stats/houndoom.asm index 1f3b4f903..6bb11aa86 100644 --- a/data/pokemon/base_stats/houndoom.asm +++ b/data/pokemon/base_stats/houndoom.asm @@ -3,20 +3,19 @@ db 75, 90, 50, 95, 110, 80 ; hp atk def spd sat sdf - db DARK, FIRE + db DARK, FIRE ; type db 45 ; catch rate db 204 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/houndoom/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, FIRE_BLAST, SWIFT, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, NIGHTMARE, STRENGTH, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/houndour.asm b/data/pokemon/base_stats/houndour.asm index b064b3e0d..3eac9dafd 100644 --- a/data/pokemon/base_stats/houndour.asm +++ b/data/pokemon/base_stats/houndour.asm @@ -3,20 +3,19 @@ db 45, 60, 30, 65, 80, 50 ; hp atk def spd sat sdf - db DARK, FIRE + db DARK, FIRE ; type db 120 ; catch rate db 114 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/houndour/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, FIRE_BLAST, SWIFT, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, NIGHTMARE, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/hypno.asm b/data/pokemon/base_stats/hypno.asm index 83aab91c8..e9761fe8d 100644 --- a/data/pokemon/base_stats/hypno.asm +++ b/data/pokemon/base_stats/hypno.asm @@ -3,20 +3,19 @@ db 85, 73, 70, 67, 73, 115 ; hp atk def spd sat sdf - db PSYCHIC, PSYCHIC + db PSYCHIC, PSYCHIC ; type db 75 ; catch rate db 165 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/hypno/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn HUMANSHAPE, HUMANSHAPE ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, PSYCHIC_M, SHADOW_BALL, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, THUNDERPUNCH, DREAM_EATER, REST, ATTRACT, FIRE_PUNCH, NIGHTMARE, FLASH ; end diff --git a/data/pokemon/base_stats/igglybuff.asm b/data/pokemon/base_stats/igglybuff.asm index 8745ecafb..687171369 100644 --- a/data/pokemon/base_stats/igglybuff.asm +++ b/data/pokemon/base_stats/igglybuff.asm @@ -3,20 +3,19 @@ db 90, 30, 15, 15, 40, 20 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 170 ; catch rate db 39 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F75 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F75 ; gender ratio + db 100 ; unknown 1 db 10 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/igglybuff/front.dimensions" db 0, 0, 0, 0 ; padding - db FAST ; growth rate - dn NO_EGGS, NO_EGGS ; egg groups + db GROWTH_FAST ; growth rate + dn EGG_NONE, EGG_NONE ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, DEFENSE_CURL, DREAM_EATER, DETECT, REST, ATTRACT, NIGHTMARE, FLASH, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/ivysaur.asm b/data/pokemon/base_stats/ivysaur.asm index 8e7c7c9c4..870a4b675 100644 --- a/data/pokemon/base_stats/ivysaur.asm +++ b/data/pokemon/base_stats/ivysaur.asm @@ -3,20 +3,19 @@ db 60, 62, 63, 60, 80, 80 ; hp atk def spd sat sdf - db GRASS, POISON + db GRASS, POISON ; type db 45 ; catch rate db 141 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/ivysaur/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn MONSTER, PLANT ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_MONSTER, EGG_PLANT ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, FURY_CUTTER, CUT, FLASH ; end diff --git a/data/pokemon/base_stats/jigglypuff.asm b/data/pokemon/base_stats/jigglypuff.asm index f785f0228..5a3066a56 100644 --- a/data/pokemon/base_stats/jigglypuff.asm +++ b/data/pokemon/base_stats/jigglypuff.asm @@ -3,20 +3,19 @@ db 115, 45, 20, 20, 45, 25 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 170 ; catch rate db 76 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F75 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F75 ; gender ratio + db 100 ; unknown 1 db 10 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/jigglypuff/front.dimensions" db 0, 0, 0, 0 ; padding - db FAST ; growth rate - dn FAIRY, FAIRY ; egg groups + db GROWTH_FAST ; growth rate + dn EGG_FAIRY, EGG_FAIRY ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, FIRE_BLAST, DEFENSE_CURL, THUNDERPUNCH, DREAM_EATER, DETECT, REST, ATTRACT, FIRE_PUNCH, NIGHTMARE, STRENGTH, FLASH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/jolteon.asm b/data/pokemon/base_stats/jolteon.asm index a6636ebba..3984d9d93 100644 --- a/data/pokemon/base_stats/jolteon.asm +++ b/data/pokemon/base_stats/jolteon.asm @@ -3,20 +3,19 @@ db 65, 65, 60, 130, 110, 95 ; hp atk def spd sat sdf - db ELECTRIC, ELECTRIC + db ELECTRIC, ELECTRIC ; type db 45 ; catch rate db 197 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 35 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/jolteon/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, ZAP_CANNON, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, FLASH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/jumpluff.asm b/data/pokemon/base_stats/jumpluff.asm index c40d2c559..61a8b7fe2 100644 --- a/data/pokemon/base_stats/jumpluff.asm +++ b/data/pokemon/base_stats/jumpluff.asm @@ -3,20 +3,19 @@ db 75, 55, 70, 110, 55, 85 ; hp atk def spd sat sdf - db GRASS, FLYING + db GRASS, FLYING ; type db 45 ; catch rate db 176 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/jumpluff/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn FAIRY, PLANT ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_FAIRY, EGG_PLANT ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, FLASH ; end diff --git a/data/pokemon/base_stats/jynx.asm b/data/pokemon/base_stats/jynx.asm index 5696b83ee..1a7149d35 100644 --- a/data/pokemon/base_stats/jynx.asm +++ b/data/pokemon/base_stats/jynx.asm @@ -3,20 +3,19 @@ db 65, 50, 35, 95, 115, 95 ; hp atk def spd sat sdf - db ICE, PSYCHIC + db ICE, PSYCHIC ; type db 45 ; catch rate db 137 ; base exp - db ICE_BERRY ; item 1 - db ICE_BERRY ; item 2 - db GENDER_F100 ; gender - db 100 ; unknown + db ICE_BERRY, ICE_BERRY ; items + db GENDER_F100 ; gender ratio + db 100 ; unknown 1 db 25 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/jynx/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn HUMANSHAPE, HUMANSHAPE ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, PSYCH_UP, HIDDEN_POWER, SWEET_SCENT, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/kabuto.asm b/data/pokemon/base_stats/kabuto.asm index 60022586f..f9ac24011 100644 --- a/data/pokemon/base_stats/kabuto.asm +++ b/data/pokemon/base_stats/kabuto.asm @@ -3,20 +3,19 @@ db 30, 80, 90, 55, 55, 45 ; hp atk def spd sat sdf - db ROCK, WATER + db ROCK, WATER ; type db 45 ; catch rate db 119 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 30 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/kabuto/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AMPHIBIAN, INVERTEBRATE ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_WATER_1, EGG_WATER_3 ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, REST, ATTRACT, THIEF, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/kabutops.asm b/data/pokemon/base_stats/kabutops.asm index b56cb1db8..c6d755694 100644 --- a/data/pokemon/base_stats/kabutops.asm +++ b/data/pokemon/base_stats/kabutops.asm @@ -3,20 +3,19 @@ db 60, 115, 105, 80, 65, 70 ; hp atk def spd sat sdf - db ROCK, WATER + db ROCK, WATER ; type db 45 ; catch rate db 201 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 30 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/kabutops/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AMPHIBIAN, INVERTEBRATE ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_WATER_1, EGG_WATER_3 ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, REST, ATTRACT, THIEF, FURY_CUTTER, CUT, SURF, WHIRLPOOL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/kadabra.asm b/data/pokemon/base_stats/kadabra.asm index e3ce05321..9a7f7f841 100644 --- a/data/pokemon/base_stats/kadabra.asm +++ b/data/pokemon/base_stats/kadabra.asm @@ -3,20 +3,19 @@ db 40, 35, 30, 105, 120, 70 ; hp atk def spd sat sdf - db PSYCHIC, PSYCHIC + db PSYCHIC, PSYCHIC ; type db 100 ; catch rate db 145 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F25 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F25 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/kadabra/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn HUMANSHAPE, HUMANSHAPE ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DIG, PSYCHIC_M, SHADOW_BALL, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, THUNDERPUNCH, DREAM_EATER, REST, ATTRACT, THIEF, FIRE_PUNCH, NIGHTMARE, FLASH ; end diff --git a/data/pokemon/base_stats/kakuna.asm b/data/pokemon/base_stats/kakuna.asm index 4c8304dd2..20c0db908 100644 --- a/data/pokemon/base_stats/kakuna.asm +++ b/data/pokemon/base_stats/kakuna.asm @@ -3,20 +3,19 @@ db 45, 25, 50, 35, 25, 25 ; hp atk def spd sat sdf - db BUG, POISON + db BUG, POISON ; type db 120 ; catch rate db 71 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/kakuna/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn INSECT, INSECT ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_BUG, EGG_BUG ; egg groups - ; tmhm + ; tm/hm learnset tmhm ; end diff --git a/data/pokemon/base_stats/kangaskhan.asm b/data/pokemon/base_stats/kangaskhan.asm index 3724e29eb..f56401af5 100644 --- a/data/pokemon/base_stats/kangaskhan.asm +++ b/data/pokemon/base_stats/kangaskhan.asm @@ -3,20 +3,19 @@ db 105, 95, 80, 90, 40, 80 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 45 ; catch rate db 175 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F100 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F100 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/kangaskhan/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn MONSTER, MONSTER ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_MONSTER, EGG_MONSTER ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, EARTHQUAKE, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, THUNDERPUNCH, REST, ATTRACT, FIRE_PUNCH, FURY_CUTTER, SURF, STRENGTH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/kingdra.asm b/data/pokemon/base_stats/kingdra.asm index d217fa612..930f30b7b 100644 --- a/data/pokemon/base_stats/kingdra.asm +++ b/data/pokemon/base_stats/kingdra.asm @@ -3,20 +3,19 @@ db 75, 95, 95, 85, 95, 95 ; hp atk def spd sat sdf - db WATER, DRAGON + db WATER, DRAGON ; type db 45 ; catch rate db 207 ; base exp - db NO_ITEM ; item 1 - db DRAGON_SCALE ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, DRAGON_SCALE ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/kingdra/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AMPHIBIAN, REPTILE ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_WATER_1, EGG_DRAGON ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, DRAGONBREATH, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/kingler.asm b/data/pokemon/base_stats/kingler.asm index 82549ca88..3362dc4f0 100644 --- a/data/pokemon/base_stats/kingler.asm +++ b/data/pokemon/base_stats/kingler.asm @@ -3,20 +3,19 @@ db 55, 130, 115, 75, 50, 50 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 60 ; catch rate db 206 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/kingler/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn INVERTEBRATE, INVERTEBRATE ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_WATER_3, EGG_WATER_3 ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, REST, ATTRACT, THIEF, FURY_CUTTER, CUT, SURF, STRENGTH, WHIRLPOOL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/koffing.asm b/data/pokemon/base_stats/koffing.asm index 8408f4ad8..13f297f0f 100644 --- a/data/pokemon/base_stats/koffing.asm +++ b/data/pokemon/base_stats/koffing.asm @@ -3,20 +3,19 @@ db 40, 65, 95, 35, 60, 45 ; hp atk def spd sat sdf - db POISON, POISON + db POISON, POISON ; type db 190 ; catch rate db 114 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/koffing/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AMORPHOUS, AMORPHOUS ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_INDETERMINATE, EGG_INDETERMINATE ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, ROLLOUT, TOXIC, ZAP_CANNON, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, FIRE_BLAST, REST, ATTRACT, THIEF, FLAMETHROWER, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/krabby.asm b/data/pokemon/base_stats/krabby.asm index f4d78962a..5b8214773 100644 --- a/data/pokemon/base_stats/krabby.asm +++ b/data/pokemon/base_stats/krabby.asm @@ -3,20 +3,19 @@ db 30, 105, 90, 50, 25, 25 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 225 ; catch rate db 115 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/krabby/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn INVERTEBRATE, INVERTEBRATE ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_WATER_3, EGG_WATER_3 ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, REST, ATTRACT, THIEF, FURY_CUTTER, CUT, SURF, STRENGTH, WHIRLPOOL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/lanturn.asm b/data/pokemon/base_stats/lanturn.asm index ea97a9722..140d85dc4 100644 --- a/data/pokemon/base_stats/lanturn.asm +++ b/data/pokemon/base_stats/lanturn.asm @@ -3,20 +3,19 @@ db 125, 58, 58, 67, 76, 76 ; hp atk def spd sat sdf - db WATER, ELECTRIC + db WATER, ELECTRIC ; type db 75 ; catch rate db 156 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/lanturn/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn FISH, FISH ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_WATER_2, EGG_WATER_2 ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, REST, ATTRACT, SURF, FLASH, WHIRLPOOL, WATERFALL, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/lapras.asm b/data/pokemon/base_stats/lapras.asm index 4ba001dfd..dbbaa0203 100644 --- a/data/pokemon/base_stats/lapras.asm +++ b/data/pokemon/base_stats/lapras.asm @@ -3,20 +3,19 @@ db 130, 85, 80, 60, 85, 95 ; hp atk def spd sat sdf - db WATER, ICE + db WATER, ICE ; type db 45 ; catch rate db 219 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 40 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/lapras/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn MONSTER, AMPHIBIAN ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_MONSTER, EGG_WATER_1 ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, THUNDER, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DREAM_EATER, REST, ATTRACT, NIGHTMARE, SURF, STRENGTH, WHIRLPOOL, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/larvitar.asm b/data/pokemon/base_stats/larvitar.asm index d9c18d1bc..fc595d973 100644 --- a/data/pokemon/base_stats/larvitar.asm +++ b/data/pokemon/base_stats/larvitar.asm @@ -3,20 +3,19 @@ db 50, 64, 50, 41, 45, 50 ; hp atk def spd sat sdf - db ROCK, GROUND + db ROCK, GROUND ; type db 45 ; catch rate db 67 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 40 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/larvitar/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn MONSTER, MONSTER ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_MONSTER, EGG_MONSTER ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, DETECT, REST, ATTRACT ; end diff --git a/data/pokemon/base_stats/ledian.asm b/data/pokemon/base_stats/ledian.asm index 1f0cb4fd9..ac8e998b7 100644 --- a/data/pokemon/base_stats/ledian.asm +++ b/data/pokemon/base_stats/ledian.asm @@ -3,20 +3,19 @@ db 55, 35, 50, 85, 55, 110 ; hp atk def spd sat sdf - db BUG, FLYING + db BUG, FLYING ; type db 90 ; catch rate db 134 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/ledian/front.dimensions" db 0, 0, 0, 0 ; padding - db FAST ; growth rate - dn INSECT, INSECT ; egg groups + db GROWTH_FAST ; growth rate + dn EGG_BUG, EGG_BUG ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DIG, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, THUNDERPUNCH, REST, ATTRACT, THIEF, FLASH ; end diff --git a/data/pokemon/base_stats/ledyba.asm b/data/pokemon/base_stats/ledyba.asm index e78d4efe4..7ec0cf21b 100644 --- a/data/pokemon/base_stats/ledyba.asm +++ b/data/pokemon/base_stats/ledyba.asm @@ -3,20 +3,19 @@ db 40, 20, 30, 55, 40, 80 ; hp atk def spd sat sdf - db BUG, FLYING + db BUG, FLYING ; type db 255 ; catch rate db 54 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/ledyba/front.dimensions" db 0, 0, 0, 0 ; padding - db FAST ; growth rate - dn INSECT, INSECT ; egg groups + db GROWTH_FAST ; growth rate + dn EGG_BUG, EGG_BUG ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DIG, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, THUNDERPUNCH, REST, ATTRACT, THIEF, FLASH ; end diff --git a/data/pokemon/base_stats/lickitung.asm b/data/pokemon/base_stats/lickitung.asm index 43d60ec6c..71b61380f 100644 --- a/data/pokemon/base_stats/lickitung.asm +++ b/data/pokemon/base_stats/lickitung.asm @@ -3,20 +3,19 @@ db 90, 55, 75, 30, 60, 75 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 45 ; catch rate db 127 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/lickitung/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn MONSTER, MONSTER ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_MONSTER, EGG_MONSTER ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, EARTHQUAKE, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DEFENSE_CURL, THUNDERPUNCH, DREAM_EATER, REST, ATTRACT, THIEF, FIRE_PUNCH, NIGHTMARE, CUT, SURF, STRENGTH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/lugia.asm b/data/pokemon/base_stats/lugia.asm index 7ad2f23a1..db3c17b29 100644 --- a/data/pokemon/base_stats/lugia.asm +++ b/data/pokemon/base_stats/lugia.asm @@ -3,20 +3,19 @@ db 106, 90, 130, 110, 90, 154 ; hp atk def spd sat sdf - db PSYCHIC, FLYING + db PSYCHIC, FLYING ; type db 3 ; catch rate db 220 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDERLESS ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_UNKNOWN ; gender ratio + db 100 ; unknown 1 db 120 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/lugia/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn NO_EGGS, NO_EGGS ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_NONE, EGG_NONE ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, THUNDER, EARTHQUAKE, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DREAM_EATER, DETECT, REST, STEEL_WING, NIGHTMARE, FLY, SURF, STRENGTH, WHIRLPOOL, WATERFALL, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/machamp.asm b/data/pokemon/base_stats/machamp.asm index 41b168234..5595336c7 100644 --- a/data/pokemon/base_stats/machamp.asm +++ b/data/pokemon/base_stats/machamp.asm @@ -3,20 +3,19 @@ db 90, 130, 80, 55, 65, 85 ; hp atk def spd sat sdf - db FIGHTING, FIGHTING + db FIGHTING, FIGHTING ; type db 45 ; catch rate db 193 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F25 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F25 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/machamp/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn HUMANSHAPE, HUMANSHAPE ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, FIRE_BLAST, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/machoke.asm b/data/pokemon/base_stats/machoke.asm index 8b98ea1de..ebbd9e3a8 100644 --- a/data/pokemon/base_stats/machoke.asm +++ b/data/pokemon/base_stats/machoke.asm @@ -3,20 +3,19 @@ db 80, 100, 70, 45, 50, 60 ; hp atk def spd sat sdf - db FIGHTING, FIGHTING + db FIGHTING, FIGHTING ; type db 90 ; catch rate db 146 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F25 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F25 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/machoke/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn HUMANSHAPE, HUMANSHAPE ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, FIRE_BLAST, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/machop.asm b/data/pokemon/base_stats/machop.asm index cb1b2f7c5..51446b53f 100644 --- a/data/pokemon/base_stats/machop.asm +++ b/data/pokemon/base_stats/machop.asm @@ -3,20 +3,19 @@ db 70, 80, 50, 35, 35, 35 ; hp atk def spd sat sdf - db FIGHTING, FIGHTING + db FIGHTING, FIGHTING ; type db 180 ; catch rate db 88 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F25 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F25 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/machop/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn HUMANSHAPE, HUMANSHAPE ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, FIRE_BLAST, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/magby.asm b/data/pokemon/base_stats/magby.asm index 132387f32..1d029bd65 100644 --- a/data/pokemon/base_stats/magby.asm +++ b/data/pokemon/base_stats/magby.asm @@ -3,20 +3,19 @@ db 45, 75, 37, 83, 70, 55 ; hp atk def spd sat sdf - db FIRE, FIRE + db FIRE, FIRE ; type db 45 ; catch rate db 117 ; base exp - db BURNT_BERRY ; item 1 - db BURNT_BERRY ; item 2 - db GENDER_F25 ; gender - db 100 ; unknown + db BURNT_BERRY, BURNT_BERRY ; items + db GENDER_F25 ; gender ratio + db 100 ; unknown 1 db 25 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/magby/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn NO_EGGS, NO_EGGS ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_NONE, EGG_NONE ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, PSYCHIC_M, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/magcargo.asm b/data/pokemon/base_stats/magcargo.asm index aa2008cd1..472e67895 100644 --- a/data/pokemon/base_stats/magcargo.asm +++ b/data/pokemon/base_stats/magcargo.asm @@ -3,20 +3,19 @@ db 50, 50, 120, 30, 80, 80 ; hp atk def spd sat sdf - db FIRE, ROCK + db FIRE, ROCK ; type db 75 ; catch rate db 154 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/magcargo/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AMORPHOUS, AMORPHOUS ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_INDETERMINATE, EGG_INDETERMINATE ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, DEFENSE_CURL, REST, ATTRACT, STRENGTH, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/magikarp.asm b/data/pokemon/base_stats/magikarp.asm index e5524543f..16e0cebc9 100644 --- a/data/pokemon/base_stats/magikarp.asm +++ b/data/pokemon/base_stats/magikarp.asm @@ -3,20 +3,19 @@ db 20, 10, 55, 80, 15, 20 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 255 ; catch rate db 20 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 5 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/magikarp/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn FISH, REPTILE ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_WATER_2, EGG_DRAGON ; egg groups - ; tmhm + ; tm/hm learnset tmhm ; end diff --git a/data/pokemon/base_stats/magmar.asm b/data/pokemon/base_stats/magmar.asm index 595df7ab7..a01e0387b 100644 --- a/data/pokemon/base_stats/magmar.asm +++ b/data/pokemon/base_stats/magmar.asm @@ -3,20 +3,19 @@ db 65, 95, 57, 93, 100, 85 ; hp atk def spd sat sdf - db FIRE, FIRE + db FIRE, FIRE ; type db 45 ; catch rate db 167 ; base exp - db BURNT_BERRY ; item 1 - db BURNT_BERRY ; item 2 - db GENDER_F25 ; gender - db 100 ; unknown + db BURNT_BERRY, BURNT_BERRY ; items + db GENDER_F25 ; gender ratio + db 100 ; unknown 1 db 25 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/magmar/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn HUMANSHAPE, HUMANSHAPE ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, PSYCHIC_M, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/magnemite.asm b/data/pokemon/base_stats/magnemite.asm index 42bdc18a7..5a34e2bbc 100644 --- a/data/pokemon/base_stats/magnemite.asm +++ b/data/pokemon/base_stats/magnemite.asm @@ -3,20 +3,19 @@ db 25, 35, 70, 45, 95, 55 ; hp atk def spd sat sdf - db ELECTRIC, STEEL + db ELECTRIC, STEEL ; type db 190 ; catch rate db 89 ; base exp - db NO_ITEM ; item 1 - db METAL_COAT ; item 2 - db GENDERLESS ; gender - db 100 ; unknown + db NO_ITEM, METAL_COAT ; items + db GENDER_UNKNOWN ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/magnemite/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn INANIMATE, INANIMATE ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_MINERAL, EGG_MINERAL ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, ROLLOUT, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, FLASH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/magneton.asm b/data/pokemon/base_stats/magneton.asm index 5cac867be..620171c17 100644 --- a/data/pokemon/base_stats/magneton.asm +++ b/data/pokemon/base_stats/magneton.asm @@ -3,20 +3,19 @@ db 50, 60, 95, 70, 120, 70 ; hp atk def spd sat sdf - db ELECTRIC, STEEL + db ELECTRIC, STEEL ; type db 60 ; catch rate db 161 ; base exp - db NO_ITEM ; item 1 - db METAL_COAT ; item 2 - db GENDERLESS ; gender - db 100 ; unknown + db NO_ITEM, METAL_COAT ; items + db GENDER_UNKNOWN ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/magneton/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn INANIMATE, INANIMATE ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_MINERAL, EGG_MINERAL ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, ROLLOUT, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, FLASH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/mankey.asm b/data/pokemon/base_stats/mankey.asm index 41aaac8a9..c56672f7b 100644 --- a/data/pokemon/base_stats/mankey.asm +++ b/data/pokemon/base_stats/mankey.asm @@ -3,20 +3,19 @@ db 40, 80, 35, 70, 35, 45 ; hp atk def spd sat sdf - db FIGHTING, FIGHTING + db FIGHTING, FIGHTING ; type db 190 ; catch rate db 74 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/mankey/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/mantine.asm b/data/pokemon/base_stats/mantine.asm index bec060cb6..7b5cd54a9 100644 --- a/data/pokemon/base_stats/mantine.asm +++ b/data/pokemon/base_stats/mantine.asm @@ -3,20 +3,19 @@ db 65, 40, 70, 70, 80, 140 ; hp atk def spd sat sdf - db WATER, FLYING + db WATER, FLYING ; type db 25 ; catch rate db 168 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 25 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/mantine/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn AMPHIBIAN, AMPHIBIAN ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_WATER_1, EGG_WATER_1 ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/mareep.asm b/data/pokemon/base_stats/mareep.asm index 8388d7f8c..7ed0d477e 100644 --- a/data/pokemon/base_stats/mareep.asm +++ b/data/pokemon/base_stats/mareep.asm @@ -3,20 +3,19 @@ db 55, 40, 40, 35, 65, 45 ; hp atk def spd sat sdf - db ELECTRIC, ELECTRIC + db ELECTRIC, ELECTRIC ; type db 235 ; catch rate db 59 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/mareep/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn MONSTER, FIELD ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_MONSTER, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, REST, ATTRACT, FLASH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/marill.asm b/data/pokemon/base_stats/marill.asm index b6fcc62e5..28f936745 100644 --- a/data/pokemon/base_stats/marill.asm +++ b/data/pokemon/base_stats/marill.asm @@ -3,20 +3,19 @@ db 70, 20, 50, 40, 20, 50 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 190 ; catch rate db 58 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/marill/front.dimensions" db 0, 0, 0, 0 ; padding - db FAST ; growth rate - dn AMPHIBIAN, FAIRY ; egg groups + db GROWTH_FAST ; growth rate + dn EGG_WATER_1, EGG_FAIRY ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, REST, ATTRACT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/marowak.asm b/data/pokemon/base_stats/marowak.asm index cc03dc697..264814f55 100644 --- a/data/pokemon/base_stats/marowak.asm +++ b/data/pokemon/base_stats/marowak.asm @@ -3,20 +3,19 @@ db 60, 80, 110, 45, 50, 80 ; hp atk def spd sat sdf - db GROUND, GROUND + db GROUND, GROUND ; type db 75 ; catch rate db 124 ; base exp - db NO_ITEM ; item 1 - db THICK_CLUB ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, THICK_CLUB ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/marowak/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn MONSTER, MONSTER ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_MONSTER, EGG_MONSTER ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, FLAMETHROWER, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/meganium.asm b/data/pokemon/base_stats/meganium.asm index eaca626d4..b5e67957f 100644 --- a/data/pokemon/base_stats/meganium.asm +++ b/data/pokemon/base_stats/meganium.asm @@ -3,20 +3,19 @@ db 80, 82, 100, 80, 83, 100 ; hp atk def spd sat sdf - db GRASS, GRASS + db GRASS, GRASS ; type db 45 ; catch rate db 208 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/meganium/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn MONSTER, PLANT ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_MONSTER, EGG_PLANT ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, EARTHQUAKE, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DETECT, REST, ATTRACT, FURY_CUTTER, CUT, STRENGTH, FLASH ; end diff --git a/data/pokemon/base_stats/meowth.asm b/data/pokemon/base_stats/meowth.asm index 114f76899..bd51fbc19 100644 --- a/data/pokemon/base_stats/meowth.asm +++ b/data/pokemon/base_stats/meowth.asm @@ -3,20 +3,19 @@ db 40, 45, 35, 90, 40, 40 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 255 ; catch rate db 69 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/meowth/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, ICY_WIND, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, NIGHTMARE, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/metapod.asm b/data/pokemon/base_stats/metapod.asm index f2b33f831..335e894e3 100644 --- a/data/pokemon/base_stats/metapod.asm +++ b/data/pokemon/base_stats/metapod.asm @@ -3,20 +3,19 @@ db 50, 20, 55, 30, 25, 25 ; hp atk def spd sat sdf - db BUG, BUG + db BUG, BUG ; type db 120 ; catch rate db 72 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/metapod/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn INSECT, INSECT ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_BUG, EGG_BUG ; egg groups - ; tmhm + ; tm/hm learnset tmhm ; end diff --git a/data/pokemon/base_stats/mew.asm b/data/pokemon/base_stats/mew.asm index 4d70413d0..aa9ed7012 100644 --- a/data/pokemon/base_stats/mew.asm +++ b/data/pokemon/base_stats/mew.asm @@ -3,20 +3,19 @@ db 100, 100, 100, 100, 100, 100 ; hp atk def spd sat sdf - db PSYCHIC, PSYCHIC + db PSYCHIC, PSYCHIC ; type db 45 ; catch rate db 64 ; base exp - db NO_ITEM ; item 1 - db MIRACLEBERRY ; item 2 - db GENDERLESS ; gender - db 100 ; unknown + db NO_ITEM, MIRACLEBERRY ; items + db GENDER_UNKNOWN ; gender ratio + db 100 ; unknown 1 db 120 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/mew/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn NO_EGGS, NO_EGGS ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_NONE, EGG_NONE ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, DRAGONBREATH, THUNDER, EARTHQUAKE, RETURN, DIG, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SANDSTORM, FIRE_BLAST, SWIFT, DEFENSE_CURL, THUNDERPUNCH, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, STEEL_WING, FIRE_PUNCH, FURY_CUTTER, NIGHTMARE, CUT, FLY, SURF, STRENGTH, FLASH, WHIRLPOOL, WATERFALL, FLAMETHROWER, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/mewtwo.asm b/data/pokemon/base_stats/mewtwo.asm index 0e9636223..348603b84 100644 --- a/data/pokemon/base_stats/mewtwo.asm +++ b/data/pokemon/base_stats/mewtwo.asm @@ -3,20 +3,19 @@ db 106, 110, 90, 130, 154, 90 ; hp atk def spd sat sdf - db PSYCHIC, PSYCHIC + db PSYCHIC, PSYCHIC ; type db 3 ; catch rate db 220 ; base exp - db NO_ITEM ; item 1 - db BERSERK_GENE ; item 2 - db GENDERLESS ; gender - db 100 ; unknown + db NO_ITEM, BERSERK_GENE ; items + db GENDER_UNKNOWN ; gender ratio + db 100 ; unknown 1 db 120 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/mewtwo/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn NO_EGGS, NO_EGGS ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_NONE, EGG_NONE ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, THUNDERPUNCH, DREAM_EATER, DETECT, REST, FIRE_PUNCH, NIGHTMARE, STRENGTH, FLASH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/miltank.asm b/data/pokemon/base_stats/miltank.asm index c751a2f9c..471e45208 100644 --- a/data/pokemon/base_stats/miltank.asm +++ b/data/pokemon/base_stats/miltank.asm @@ -3,20 +3,19 @@ db 95, 80, 105, 100, 40, 70 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 45 ; catch rate db 200 ; base exp - db MOOMOO_MILK ; item 1 - db MOOMOO_MILK ; item 2 - db GENDER_F100 ; gender - db 100 ; unknown + db MOOMOO_MILK, MOOMOO_MILK ; items + db GENDER_F100 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/miltank/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, EARTHQUAKE, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SANDSTORM, DEFENSE_CURL, THUNDERPUNCH, REST, ATTRACT, FIRE_PUNCH, SURF, STRENGTH, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/misdreavus.asm b/data/pokemon/base_stats/misdreavus.asm index d1824eaa2..821cb37ac 100644 --- a/data/pokemon/base_stats/misdreavus.asm +++ b/data/pokemon/base_stats/misdreavus.asm @@ -3,20 +3,19 @@ db 60, 60, 60, 85, 85, 85 ; hp atk def spd sat sdf - db GHOST, GHOST + db GHOST, GHOST ; type db 45 ; catch rate db 147 ; base exp - db NO_ITEM ; item 1 - db SPELL_TAG ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, SPELL_TAG ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 25 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/misdreavus/front.dimensions" db 0, 0, 0, 0 ; padding - db FAST ; growth rate - dn AMORPHOUS, AMORPHOUS ; egg groups + db GROWTH_FAST ; growth rate + dn EGG_INDETERMINATE, EGG_INDETERMINATE ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, FLASH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/moltres.asm b/data/pokemon/base_stats/moltres.asm index 22157c073..2635909d1 100644 --- a/data/pokemon/base_stats/moltres.asm +++ b/data/pokemon/base_stats/moltres.asm @@ -3,20 +3,19 @@ db 90, 100, 90, 90, 125, 85 ; hp atk def spd sat sdf - db FIRE, FLYING + db FIRE, FLYING ; type db 3 ; catch rate db 217 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDERLESS ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_UNKNOWN ; gender ratio + db 100 ; unknown 1 db 80 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/moltres/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn NO_EGGS, NO_EGGS ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_NONE, EGG_NONE ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, SWIFT, DETECT, REST, STEEL_WING, FLY, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/mr__mime.asm b/data/pokemon/base_stats/mr__mime.asm index 1abc9995f..476483d9e 100644 --- a/data/pokemon/base_stats/mr__mime.asm +++ b/data/pokemon/base_stats/mr__mime.asm @@ -3,20 +3,19 @@ db 40, 45, 65, 90, 100, 120 ; hp atk def spd sat sdf - db PSYCHIC, PSYCHIC + db PSYCHIC, PSYCHIC ; type db 45 ; catch rate db 136 ; base exp - db NO_ITEM ; item 1 - db MYSTERYBERRY ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, MYSTERYBERRY ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 25 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/mr__mime/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn HUMANSHAPE, HUMANSHAPE ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_HUMANSHAPE, EGG_HUMANSHAPE ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, SOLARBEAM, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, THUNDERPUNCH, DREAM_EATER, REST, ATTRACT, THIEF, FIRE_PUNCH, NIGHTMARE, FLASH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/muk.asm b/data/pokemon/base_stats/muk.asm index a25d85605..48c4e5cd7 100644 --- a/data/pokemon/base_stats/muk.asm +++ b/data/pokemon/base_stats/muk.asm @@ -3,20 +3,19 @@ db 105, 105, 75, 50, 65, 100 ; hp atk def spd sat sdf - db POISON, POISON + db POISON, POISON ; type db 75 ; catch rate db 157 ; base exp - db NO_ITEM ; item 1 - db NUGGET ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NUGGET ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/muk/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AMORPHOUS, AMORPHOUS ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_INDETERMINATE, EGG_INDETERMINATE ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, CURSE, TOXIC, ZAP_CANNON, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, FIRE_BLAST, THUNDERPUNCH, REST, ATTRACT, THIEF, FIRE_PUNCH, FLAMETHROWER, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/murkrow.asm b/data/pokemon/base_stats/murkrow.asm index 2fada2697..db9c40fa1 100644 --- a/data/pokemon/base_stats/murkrow.asm +++ b/data/pokemon/base_stats/murkrow.asm @@ -3,20 +3,19 @@ db 60, 85, 42, 91, 85, 42 ; hp atk def spd sat sdf - db DARK, FLYING + db DARK, FLYING ; type db 30 ; catch rate db 107 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/murkrow/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn AVIAN, AVIAN ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_FLYING, EGG_FLYING ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, ICY_WIND, PROTECT, ENDURE, FRUSTRATION, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, STEEL_WING, NIGHTMARE, FLY ; end diff --git a/data/pokemon/base_stats/natu.asm b/data/pokemon/base_stats/natu.asm index b9bde658a..6f1076eb7 100644 --- a/data/pokemon/base_stats/natu.asm +++ b/data/pokemon/base_stats/natu.asm @@ -3,20 +3,19 @@ db 40, 50, 45, 70, 70, 45 ; hp atk def spd sat sdf - db PSYCHIC, FLYING + db PSYCHIC, FLYING ; type db 190 ; catch rate db 73 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/natu/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AVIAN, AVIAN ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_FLYING, EGG_FLYING ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, NIGHTMARE, FLASH ; end diff --git a/data/pokemon/base_stats/nidoking.asm b/data/pokemon/base_stats/nidoking.asm index 3d7205af5..af3572a96 100644 --- a/data/pokemon/base_stats/nidoking.asm +++ b/data/pokemon/base_stats/nidoking.asm @@ -3,20 +3,19 @@ db 81, 92, 77, 85, 85, 75 ; hp atk def spd sat sdf - db POISON, GROUND + db POISON, GROUND ; type db 45 ; catch rate db 195 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F0 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F0 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/nidoking/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn MONSTER, FIELD ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_MONSTER, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, EARTHQUAKE, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DEFENSE_CURL, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, FURY_CUTTER, SURF, STRENGTH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/nidoqueen.asm b/data/pokemon/base_stats/nidoqueen.asm index 4c5ca110e..72eb9336c 100644 --- a/data/pokemon/base_stats/nidoqueen.asm +++ b/data/pokemon/base_stats/nidoqueen.asm @@ -3,20 +3,19 @@ db 90, 82, 87, 76, 75, 85 ; hp atk def spd sat sdf - db POISON, GROUND + db POISON, GROUND ; type db 45 ; catch rate db 194 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F100 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F100 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/nidoqueen/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn NO_EGGS, NO_EGGS ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_NONE, EGG_NONE ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, EARTHQUAKE, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DEFENSE_CURL, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, FURY_CUTTER, SURF, STRENGTH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/nidoran_f.asm b/data/pokemon/base_stats/nidoran_f.asm index 77925f1df..e3cb1c9b2 100644 --- a/data/pokemon/base_stats/nidoran_f.asm +++ b/data/pokemon/base_stats/nidoran_f.asm @@ -3,20 +3,19 @@ db 55, 47, 52, 41, 40, 40 ; hp atk def spd sat sdf - db POISON, POISON + db POISON, POISON ; type db 235 ; catch rate db 59 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F100 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F100 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/nidoran_f/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn MONSTER, FIELD ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_MONSTER, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, DETECT, REST, ATTRACT, THIEF, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/nidoran_m.asm b/data/pokemon/base_stats/nidoran_m.asm index 0f25712dd..8b3d28ddc 100644 --- a/data/pokemon/base_stats/nidoran_m.asm +++ b/data/pokemon/base_stats/nidoran_m.asm @@ -3,20 +3,19 @@ db 46, 57, 40, 50, 40, 40 ; hp atk def spd sat sdf - db POISON, POISON + db POISON, POISON ; type db 235 ; catch rate db 60 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F0 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F0 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/nidoran_m/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn MONSTER, FIELD ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_MONSTER, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, DETECT, REST, ATTRACT, THIEF, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/nidorina.asm b/data/pokemon/base_stats/nidorina.asm index 2385f82ec..d446a0d3b 100644 --- a/data/pokemon/base_stats/nidorina.asm +++ b/data/pokemon/base_stats/nidorina.asm @@ -3,20 +3,19 @@ db 70, 62, 67, 56, 55, 55 ; hp atk def spd sat sdf - db POISON, POISON + db POISON, POISON ; type db 120 ; catch rate db 117 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F100 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F100 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/nidorina/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn NO_EGGS, NO_EGGS ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_NONE, EGG_NONE ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, DETECT, REST, ATTRACT, THIEF, STRENGTH, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/nidorino.asm b/data/pokemon/base_stats/nidorino.asm index 9c94ea824..7ece56a58 100644 --- a/data/pokemon/base_stats/nidorino.asm +++ b/data/pokemon/base_stats/nidorino.asm @@ -3,20 +3,19 @@ db 61, 72, 57, 65, 55, 55 ; hp atk def spd sat sdf - db POISON, POISON + db POISON, POISON ; type db 120 ; catch rate db 118 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F0 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F0 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/nidorino/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn MONSTER, FIELD ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_MONSTER, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, DETECT, REST, ATTRACT, THIEF, STRENGTH, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/ninetales.asm b/data/pokemon/base_stats/ninetales.asm index f23d2e384..cb8f538b0 100644 --- a/data/pokemon/base_stats/ninetales.asm +++ b/data/pokemon/base_stats/ninetales.asm @@ -3,20 +3,19 @@ db 73, 76, 75, 100, 81, 100 ; hp atk def spd sat sdf - db FIRE, FIRE + db FIRE, FIRE ; type db 75 ; catch rate db 178 ; base exp - db BURNT_BERRY ; item 1 - db BURNT_BERRY ; item 2 - db GENDER_F75 ; gender - db 100 ; unknown + db BURNT_BERRY, BURNT_BERRY ; items + db GENDER_F75 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/ninetales/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, REST, ATTRACT, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/noctowl.asm b/data/pokemon/base_stats/noctowl.asm index 030dec08e..5ad54adc6 100644 --- a/data/pokemon/base_stats/noctowl.asm +++ b/data/pokemon/base_stats/noctowl.asm @@ -3,20 +3,19 @@ db 100, 50, 50, 70, 76, 96 ; hp atk def spd sat sdf - db NORMAL, FLYING + db NORMAL, FLYING ; type db 90 ; catch rate db 162 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/noctowl/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AVIAN, AVIAN ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_FLYING, EGG_FLYING ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, STEEL_WING, NIGHTMARE, FLY, FLASH ; end diff --git a/data/pokemon/base_stats/octillery.asm b/data/pokemon/base_stats/octillery.asm index 6bc2f7d46..c4a9a9c09 100644 --- a/data/pokemon/base_stats/octillery.asm +++ b/data/pokemon/base_stats/octillery.asm @@ -3,20 +3,19 @@ db 75, 105, 75, 45, 105, 75 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 75 ; catch rate db 164 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/octillery/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AMPHIBIAN, FISH ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_WATER_1, EGG_WATER_2 ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, REST, ATTRACT, THIEF, SURF, WHIRLPOOL, FLAMETHROWER, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/oddish.asm b/data/pokemon/base_stats/oddish.asm index 98f8c96f9..3bb4fb1a3 100644 --- a/data/pokemon/base_stats/oddish.asm +++ b/data/pokemon/base_stats/oddish.asm @@ -3,20 +3,19 @@ db 45, 50, 55, 30, 75, 65 ; hp atk def spd sat sdf - db GRASS, POISON + db GRASS, POISON ; type db 255 ; catch rate db 78 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/oddish/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn PLANT, PLANT ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_PLANT, EGG_PLANT ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, CUT, FLASH ; end diff --git a/data/pokemon/base_stats/omanyte.asm b/data/pokemon/base_stats/omanyte.asm index 70b88df38..d676205de 100644 --- a/data/pokemon/base_stats/omanyte.asm +++ b/data/pokemon/base_stats/omanyte.asm @@ -3,20 +3,19 @@ db 35, 40, 100, 35, 90, 55 ; hp atk def spd sat sdf - db ROCK, WATER + db ROCK, WATER ; type db 45 ; catch rate db 120 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 30 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/omanyte/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AMPHIBIAN, INVERTEBRATE ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_WATER_1, EGG_WATER_3 ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, REST, ATTRACT, THIEF, SURF, WHIRLPOOL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/omastar.asm b/data/pokemon/base_stats/omastar.asm index 659ecc825..33816ae00 100644 --- a/data/pokemon/base_stats/omastar.asm +++ b/data/pokemon/base_stats/omastar.asm @@ -3,20 +3,19 @@ db 70, 60, 125, 55, 115, 70 ; hp atk def spd sat sdf - db ROCK, WATER + db ROCK, WATER ; type db 45 ; catch rate db 199 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 30 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/omastar/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AMPHIBIAN, INVERTEBRATE ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_WATER_1, EGG_WATER_3 ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, REST, ATTRACT, THIEF, SURF, WHIRLPOOL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/onix.asm b/data/pokemon/base_stats/onix.asm index befd53abf..6b3183e97 100644 --- a/data/pokemon/base_stats/onix.asm +++ b/data/pokemon/base_stats/onix.asm @@ -3,20 +3,19 @@ db 35, 45, 160, 70, 30, 45 ; hp atk def spd sat sdf - db ROCK, GROUND + db ROCK, GROUND ; type db 45 ; catch rate db 108 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 25 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/onix/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn INANIMATE, INANIMATE ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_MINERAL, EGG_MINERAL ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, REST, ATTRACT, STRENGTH ; end diff --git a/data/pokemon/base_stats/paras.asm b/data/pokemon/base_stats/paras.asm index 46687f928..1cd8aa500 100644 --- a/data/pokemon/base_stats/paras.asm +++ b/data/pokemon/base_stats/paras.asm @@ -3,20 +3,19 @@ db 35, 70, 55, 25, 45, 55 ; hp atk def spd sat sdf - db BUG, GRASS + db BUG, GRASS ; type db 190 ; catch rate db 70 ; base exp - db TINYMUSHROOM ; item 1 - db BIG_MUSHROOM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db TINYMUSHROOM, BIG_MUSHROOM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/paras/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn INSECT, PLANT ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_BUG, EGG_PLANT ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DIG, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, THIEF, FURY_CUTTER, CUT, FLASH ; end diff --git a/data/pokemon/base_stats/parasect.asm b/data/pokemon/base_stats/parasect.asm index d40dd4fd9..f5b1a4fe5 100644 --- a/data/pokemon/base_stats/parasect.asm +++ b/data/pokemon/base_stats/parasect.asm @@ -3,20 +3,19 @@ db 60, 95, 80, 30, 60, 80 ; hp atk def spd sat sdf - db BUG, GRASS + db BUG, GRASS ; type db 75 ; catch rate db 128 ; base exp - db TINYMUSHROOM ; item 1 - db BIG_MUSHROOM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db TINYMUSHROOM, BIG_MUSHROOM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/parasect/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn INSECT, PLANT ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_BUG, EGG_PLANT ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DIG, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, THIEF, FURY_CUTTER, CUT, FLASH ; end diff --git a/data/pokemon/base_stats/persian.asm b/data/pokemon/base_stats/persian.asm index bbfd9beec..c71837785 100644 --- a/data/pokemon/base_stats/persian.asm +++ b/data/pokemon/base_stats/persian.asm @@ -3,20 +3,19 @@ db 65, 70, 60, 115, 65, 65 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 90 ; catch rate db 148 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/persian/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, ICY_WIND, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, NIGHTMARE, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/phanpy.asm b/data/pokemon/base_stats/phanpy.asm index 27794e0b5..27221d4fb 100644 --- a/data/pokemon/base_stats/phanpy.asm +++ b/data/pokemon/base_stats/phanpy.asm @@ -3,20 +3,19 @@ db 90, 60, 60, 40, 40, 40 ; hp atk def spd sat sdf - db GROUND, GROUND + db GROUND, GROUND ; type db 120 ; catch rate db 124 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/phanpy/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, DEFENSE_CURL, REST, ATTRACT, STRENGTH ; end diff --git a/data/pokemon/base_stats/pichu.asm b/data/pokemon/base_stats/pichu.asm index 35d6a105a..6805a0386 100644 --- a/data/pokemon/base_stats/pichu.asm +++ b/data/pokemon/base_stats/pichu.asm @@ -3,20 +3,19 @@ db 20, 40, 15, 60, 35, 35 ; hp atk def spd sat sdf - db ELECTRIC, ELECTRIC + db ELECTRIC, ELECTRIC ; type db 190 ; catch rate db 42 ; base exp - db NO_ITEM ; item 1 - db BERRY ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, BERRY ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 10 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/pichu/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn NO_EGGS, NO_EGGS ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_NONE, EGG_NONE ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, DETECT, REST, ATTRACT, FLASH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/pidgeot.asm b/data/pokemon/base_stats/pidgeot.asm index 2d117b955..5d935b01d 100644 --- a/data/pokemon/base_stats/pidgeot.asm +++ b/data/pokemon/base_stats/pidgeot.asm @@ -3,20 +3,19 @@ db 83, 80, 75, 91, 70, 70 ; hp atk def spd sat sdf - db NORMAL, FLYING + db NORMAL, FLYING ; type db 45 ; catch rate db 172 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/pidgeot/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn AVIAN, AVIAN ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_FLYING, EGG_FLYING ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING, FLY ; end diff --git a/data/pokemon/base_stats/pidgeotto.asm b/data/pokemon/base_stats/pidgeotto.asm index 8e263c4b3..766a2e5cf 100644 --- a/data/pokemon/base_stats/pidgeotto.asm +++ b/data/pokemon/base_stats/pidgeotto.asm @@ -3,20 +3,19 @@ db 63, 60, 55, 71, 50, 50 ; hp atk def spd sat sdf - db NORMAL, FLYING + db NORMAL, FLYING ; type db 120 ; catch rate db 113 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/pidgeotto/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn AVIAN, AVIAN ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_FLYING, EGG_FLYING ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING, FLY ; end diff --git a/data/pokemon/base_stats/pidgey.asm b/data/pokemon/base_stats/pidgey.asm index 123b95d7d..4d9ccb21a 100644 --- a/data/pokemon/base_stats/pidgey.asm +++ b/data/pokemon/base_stats/pidgey.asm @@ -3,20 +3,19 @@ db 40, 45, 40, 56, 35, 35 ; hp atk def spd sat sdf - db NORMAL, FLYING + db NORMAL, FLYING ; type db 255 ; catch rate db 55 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/pidgey/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn AVIAN, AVIAN ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_FLYING, EGG_FLYING ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING, FLY ; end diff --git a/data/pokemon/base_stats/pikachu.asm b/data/pokemon/base_stats/pikachu.asm index 78204ff78..7beb911ff 100644 --- a/data/pokemon/base_stats/pikachu.asm +++ b/data/pokemon/base_stats/pikachu.asm @@ -3,20 +3,19 @@ db 35, 55, 30, 90, 50, 40 ; hp atk def spd sat sdf - db ELECTRIC, ELECTRIC + db ELECTRIC, ELECTRIC ; type db 190 ; catch rate db 82 ; base exp - db NO_ITEM ; item 1 - db BERRY ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, BERRY ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 10 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/pikachu/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, FAIRY ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_GROUND, EGG_FAIRY ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, DETECT, REST, ATTRACT, STRENGTH, FLASH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/piloswine.asm b/data/pokemon/base_stats/piloswine.asm index 3e48aa4c9..077146eca 100644 --- a/data/pokemon/base_stats/piloswine.asm +++ b/data/pokemon/base_stats/piloswine.asm @@ -3,20 +3,19 @@ db 100, 100, 80, 50, 60, 60 ; hp atk def spd sat sdf - db ICE, GROUND + db ICE, GROUND ; type db 75 ; catch rate db 160 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/piloswine/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, DETECT, REST, ATTRACT, STRENGTH, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/pineco.asm b/data/pokemon/base_stats/pineco.asm index 5754c49a2..fc5e2e591 100644 --- a/data/pokemon/base_stats/pineco.asm +++ b/data/pokemon/base_stats/pineco.asm @@ -3,20 +3,19 @@ db 50, 65, 90, 15, 35, 35 ; hp atk def spd sat sdf - db BUG, BUG + db BUG, BUG ; type db 190 ; catch rate db 60 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/pineco/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn INSECT, INSECT ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_BUG, EGG_BUG ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, STRENGTH ; end diff --git a/data/pokemon/base_stats/pinsir.asm b/data/pokemon/base_stats/pinsir.asm index 55927c918..7d7a46257 100644 --- a/data/pokemon/base_stats/pinsir.asm +++ b/data/pokemon/base_stats/pinsir.asm @@ -3,20 +3,19 @@ db 65, 125, 100, 85, 55, 70 ; hp atk def spd sat sdf - db BUG, BUG + db BUG, BUG ; type db 45 ; catch rate db 200 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 25 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/pinsir/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn INSECT, INSECT ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_BUG, EGG_BUG ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, REST, ATTRACT, THIEF, FURY_CUTTER, CUT, STRENGTH ; end diff --git a/data/pokemon/base_stats/politoed.asm b/data/pokemon/base_stats/politoed.asm index 6ad959406..617dc0c7c 100644 --- a/data/pokemon/base_stats/politoed.asm +++ b/data/pokemon/base_stats/politoed.asm @@ -3,20 +3,19 @@ db 90, 75, 75, 70, 90, 100 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 45 ; catch rate db 185 ; base exp - db NO_ITEM ; item 1 - db KINGS_ROCK ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, KINGS_ROCK ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/politoed/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn AMPHIBIAN, AMPHIBIAN ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_WATER_1, EGG_WATER_1 ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, PSYCHIC_M, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DEFENSE_CURL, DETECT, REST, ATTRACT, THIEF, SURF, STRENGTH, WHIRLPOOL, WATERFALL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/poliwag.asm b/data/pokemon/base_stats/poliwag.asm index 3a4d8c051..d3a2722a5 100644 --- a/data/pokemon/base_stats/poliwag.asm +++ b/data/pokemon/base_stats/poliwag.asm @@ -3,20 +3,19 @@ db 40, 50, 40, 90, 40, 40 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 255 ; catch rate db 77 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/poliwag/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn AMPHIBIAN, AMPHIBIAN ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_WATER_1, EGG_WATER_1 ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, THIEF, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/poliwhirl.asm b/data/pokemon/base_stats/poliwhirl.asm index d28964ebd..2c2e9dba9 100644 --- a/data/pokemon/base_stats/poliwhirl.asm +++ b/data/pokemon/base_stats/poliwhirl.asm @@ -3,20 +3,19 @@ db 65, 65, 65, 90, 50, 50 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 120 ; catch rate db 131 ; base exp - db NO_ITEM ; item 1 - db KINGS_ROCK ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, KINGS_ROCK ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/poliwhirl/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn AMPHIBIAN, AMPHIBIAN ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_WATER_1, EGG_WATER_1 ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, PSYCHIC_M, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DEFENSE_CURL, DETECT, REST, ATTRACT, THIEF, SURF, STRENGTH, WHIRLPOOL, WATERFALL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/poliwrath.asm b/data/pokemon/base_stats/poliwrath.asm index 3b142e061..114cc7c88 100644 --- a/data/pokemon/base_stats/poliwrath.asm +++ b/data/pokemon/base_stats/poliwrath.asm @@ -3,20 +3,19 @@ db 90, 85, 95, 70, 70, 90 ; hp atk def spd sat sdf - db WATER, FIGHTING + db WATER, FIGHTING ; type db 45 ; catch rate db 185 ; base exp - db NO_ITEM ; item 1 - db KINGS_ROCK ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, KINGS_ROCK ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/poliwrath/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn AMPHIBIAN, AMPHIBIAN ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_WATER_1, EGG_WATER_1 ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, PSYCHIC_M, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DEFENSE_CURL, DETECT, REST, ATTRACT, THIEF, SURF, STRENGTH, WHIRLPOOL, WATERFALL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/ponyta.asm b/data/pokemon/base_stats/ponyta.asm index 2c3c3f9cf..0be847fbd 100644 --- a/data/pokemon/base_stats/ponyta.asm +++ b/data/pokemon/base_stats/ponyta.asm @@ -3,20 +3,19 @@ db 50, 85, 55, 90, 65, 65 ; hp atk def spd sat sdf - db FIRE, FIRE + db FIRE, FIRE ; type db 190 ; catch rate db 152 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/ponyta/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, REST, ATTRACT, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/porygon.asm b/data/pokemon/base_stats/porygon.asm index c034acdfb..e8b1f4402 100644 --- a/data/pokemon/base_stats/porygon.asm +++ b/data/pokemon/base_stats/porygon.asm @@ -3,20 +3,19 @@ db 65, 60, 70, 40, 85, 75 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 45 ; catch rate db 130 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDERLESS ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_UNKNOWN ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/porygon/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn INANIMATE, INANIMATE ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_MINERAL, EGG_MINERAL ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, REST, THIEF, NIGHTMARE, FLASH, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/porygon2.asm b/data/pokemon/base_stats/porygon2.asm index 1e9625509..11fd950aa 100644 --- a/data/pokemon/base_stats/porygon2.asm +++ b/data/pokemon/base_stats/porygon2.asm @@ -3,20 +3,19 @@ db 85, 80, 90, 60, 105, 95 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 45 ; catch rate db 180 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDERLESS ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_UNKNOWN ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/porygon2/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn INANIMATE, INANIMATE ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_MINERAL, EGG_MINERAL ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, DREAM_EATER, REST, THIEF, NIGHTMARE, FLASH, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/primeape.asm b/data/pokemon/base_stats/primeape.asm index a7d1ee74a..15da82cb3 100644 --- a/data/pokemon/base_stats/primeape.asm +++ b/data/pokemon/base_stats/primeape.asm @@ -3,20 +3,19 @@ db 65, 105, 60, 95, 60, 70 ; hp atk def spd sat sdf - db FIGHTING, FIGHTING + db FIGHTING, FIGHTING ; type db 75 ; catch rate db 149 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/primeape/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/psyduck.asm b/data/pokemon/base_stats/psyduck.asm index d2901750b..dd964344b 100644 --- a/data/pokemon/base_stats/psyduck.asm +++ b/data/pokemon/base_stats/psyduck.asm @@ -3,20 +3,19 @@ db 50, 52, 48, 55, 65, 50 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 190 ; catch rate db 80 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/psyduck/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AMPHIBIAN, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_WATER_1, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, SURF, STRENGTH, FLASH, WHIRLPOOL, WATERFALL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/pupitar.asm b/data/pokemon/base_stats/pupitar.asm index 7ff381195..b4bc6e5e7 100644 --- a/data/pokemon/base_stats/pupitar.asm +++ b/data/pokemon/base_stats/pupitar.asm @@ -3,20 +3,19 @@ db 70, 84, 70, 51, 65, 70 ; hp atk def spd sat sdf - db ROCK, GROUND + db ROCK, GROUND ; type db 45 ; catch rate db 144 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 40 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/pupitar/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn MONSTER, MONSTER ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_MONSTER, EGG_MONSTER ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, DETECT, REST, ATTRACT ; end diff --git a/data/pokemon/base_stats/quagsire.asm b/data/pokemon/base_stats/quagsire.asm index 75a1d24be..c3599d036 100644 --- a/data/pokemon/base_stats/quagsire.asm +++ b/data/pokemon/base_stats/quagsire.asm @@ -3,20 +3,19 @@ db 95, 85, 85, 35, 65, 65 ; hp atk def spd sat sdf - db WATER, GROUND + db WATER, GROUND ; type db 90 ; catch rate db 137 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/quagsire/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AMPHIBIAN, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_WATER_1, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SANDSTORM, DEFENSE_CURL, REST, ATTRACT, SURF, STRENGTH, FLASH, WHIRLPOOL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/quilava.asm b/data/pokemon/base_stats/quilava.asm index 4cb388301..82cf03a7f 100644 --- a/data/pokemon/base_stats/quilava.asm +++ b/data/pokemon/base_stats/quilava.asm @@ -3,20 +3,19 @@ db 58, 64, 58, 80, 80, 65 ; hp atk def spd sat sdf - db FIRE, FIRE + db FIRE, FIRE ; type db 45 ; catch rate db 142 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/quilava/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DEFENSE_CURL, DETECT, REST, ATTRACT, FURY_CUTTER, CUT, STRENGTH, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/qwilfish.asm b/data/pokemon/base_stats/qwilfish.asm index 0cfe4e2d8..16cf03d07 100644 --- a/data/pokemon/base_stats/qwilfish.asm +++ b/data/pokemon/base_stats/qwilfish.asm @@ -3,20 +3,19 @@ db 65, 95, 75, 85, 55, 55 ; hp atk def spd sat sdf - db WATER, POISON + db WATER, POISON ; type db 45 ; catch rate db 100 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/qwilfish/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FISH, FISH ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_WATER_2, EGG_WATER_2 ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SWIFT, DEFENSE_CURL, REST, ATTRACT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/raichu.asm b/data/pokemon/base_stats/raichu.asm index b6723ac0f..6b7727f6b 100644 --- a/data/pokemon/base_stats/raichu.asm +++ b/data/pokemon/base_stats/raichu.asm @@ -3,20 +3,19 @@ db 60, 90, 55, 100, 90, 80 ; hp atk def spd sat sdf - db ELECTRIC, ELECTRIC + db ELECTRIC, ELECTRIC ; type db 75 ; catch rate db 122 ; base exp - db NO_ITEM ; item 1 - db BERRY ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, BERRY ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 10 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/raichu/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, FAIRY ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_GROUND, EGG_FAIRY ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, STRENGTH, FLASH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/raikou.asm b/data/pokemon/base_stats/raikou.asm index 47f4f9da3..753800d93 100644 --- a/data/pokemon/base_stats/raikou.asm +++ b/data/pokemon/base_stats/raikou.asm @@ -3,20 +3,19 @@ db 90, 85, 75, 115, 115, 100 ; hp atk def spd sat sdf - db ELECTRIC, ELECTRIC + db ELECTRIC, ELECTRIC ; type db 3 ; catch rate db 216 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDERLESS ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_UNKNOWN ; gender ratio + db 100 ; unknown 1 db 80 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/raikou/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn NO_EGGS, NO_EGGS ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_NONE, EGG_NONE ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DETECT, REST, CUT, STRENGTH, FLASH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/rapidash.asm b/data/pokemon/base_stats/rapidash.asm index 291b129f2..9827add2d 100644 --- a/data/pokemon/base_stats/rapidash.asm +++ b/data/pokemon/base_stats/rapidash.asm @@ -3,20 +3,19 @@ db 65, 100, 70, 105, 80, 80 ; hp atk def spd sat sdf - db FIRE, FIRE + db FIRE, FIRE ; type db 60 ; catch rate db 192 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/rapidash/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, REST, ATTRACT, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/raticate.asm b/data/pokemon/base_stats/raticate.asm index 1424f3ffb..8fbcc2e40 100644 --- a/data/pokemon/base_stats/raticate.asm +++ b/data/pokemon/base_stats/raticate.asm @@ -3,20 +3,19 @@ db 55, 81, 60, 97, 50, 70 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 90 ; catch rate db 116 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/raticate/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, DIG, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, REST, ATTRACT, THIEF, CUT, STRENGTH, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/rattata.asm b/data/pokemon/base_stats/rattata.asm index 71498aeac..30c9581ec 100644 --- a/data/pokemon/base_stats/rattata.asm +++ b/data/pokemon/base_stats/rattata.asm @@ -3,20 +3,19 @@ db 30, 56, 35, 72, 25, 35 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 255 ; catch rate db 57 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/rattata/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, ICY_WIND, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, DIG, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, REST, ATTRACT, THIEF ; end diff --git a/data/pokemon/base_stats/remoraid.asm b/data/pokemon/base_stats/remoraid.asm index 8dabbb0a4..a41ce6ce8 100644 --- a/data/pokemon/base_stats/remoraid.asm +++ b/data/pokemon/base_stats/remoraid.asm @@ -3,20 +3,19 @@ db 35, 65, 35, 65, 65, 35 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 190 ; catch rate db 78 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/remoraid/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AMPHIBIAN, FISH ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_WATER_1, EGG_WATER_2 ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, REST, ATTRACT, THIEF, SURF, WHIRLPOOL, FLAMETHROWER, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/rhydon.asm b/data/pokemon/base_stats/rhydon.asm index e885edd75..9b95d9e94 100644 --- a/data/pokemon/base_stats/rhydon.asm +++ b/data/pokemon/base_stats/rhydon.asm @@ -3,20 +3,19 @@ db 105, 130, 120, 40, 45, 45 ; hp atk def spd sat sdf - db GROUND, ROCK + db GROUND, ROCK ; type db 60 ; catch rate db 204 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/rhydon/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn MONSTER, FIELD ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_MONSTER, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, THUNDERPUNCH, REST, ATTRACT, FIRE_PUNCH, FURY_CUTTER, SURF, STRENGTH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/rhyhorn.asm b/data/pokemon/base_stats/rhyhorn.asm index f15f73719..ee691b796 100644 --- a/data/pokemon/base_stats/rhyhorn.asm +++ b/data/pokemon/base_stats/rhyhorn.asm @@ -3,20 +3,19 @@ db 80, 85, 95, 25, 30, 30 ; hp atk def spd sat sdf - db GROUND, ROCK + db GROUND, ROCK ; type db 120 ; catch rate db 135 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/rhyhorn/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn MONSTER, FIELD ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_MONSTER, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, ICY_WIND, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, REST, ATTRACT, STRENGTH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/sandshrew.asm b/data/pokemon/base_stats/sandshrew.asm index 7b172a120..8da9f1a88 100644 --- a/data/pokemon/base_stats/sandshrew.asm +++ b/data/pokemon/base_stats/sandshrew.asm @@ -3,20 +3,19 @@ db 50, 75, 85, 40, 20, 30 ; hp atk def spd sat sdf - db GROUND, GROUND + db GROUND, GROUND ; type db 255 ; catch rate db 93 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/sandshrew/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DEFENSE_CURL, DETECT, REST, ATTRACT, THIEF, FURY_CUTTER, CUT, STRENGTH ; end diff --git a/data/pokemon/base_stats/sandslash.asm b/data/pokemon/base_stats/sandslash.asm index d850c9697..f2936e47b 100644 --- a/data/pokemon/base_stats/sandslash.asm +++ b/data/pokemon/base_stats/sandslash.asm @@ -3,20 +3,19 @@ db 75, 100, 110, 65, 45, 55 ; hp atk def spd sat sdf - db GROUND, GROUND + db GROUND, GROUND ; type db 90 ; catch rate db 163 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/sandslash/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DEFENSE_CURL, DETECT, REST, ATTRACT, THIEF, FURY_CUTTER, CUT, STRENGTH ; end diff --git a/data/pokemon/base_stats/scizor.asm b/data/pokemon/base_stats/scizor.asm index c841c6301..e59a4bd96 100644 --- a/data/pokemon/base_stats/scizor.asm +++ b/data/pokemon/base_stats/scizor.asm @@ -3,20 +3,19 @@ db 70, 130, 100, 65, 55, 80 ; hp atk def spd sat sdf - db BUG, STEEL + db BUG, STEEL ; type db 25 ; catch rate db 200 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 25 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/scizor/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn INSECT, INSECT ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_BUG, EGG_BUG ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING, FURY_CUTTER, CUT, STRENGTH ; end diff --git a/data/pokemon/base_stats/scyther.asm b/data/pokemon/base_stats/scyther.asm index ea7c7cd33..a39f00ec9 100644 --- a/data/pokemon/base_stats/scyther.asm +++ b/data/pokemon/base_stats/scyther.asm @@ -3,20 +3,19 @@ db 70, 110, 80, 105, 55, 80 ; hp atk def spd sat sdf - db BUG, FLYING + db BUG, FLYING ; type db 45 ; catch rate db 187 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 25 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/scyther/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn INSECT, INSECT ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_BUG, EGG_BUG ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING, FURY_CUTTER, CUT ; end diff --git a/data/pokemon/base_stats/seadra.asm b/data/pokemon/base_stats/seadra.asm index 3ba5687ce..9793dbc2a 100644 --- a/data/pokemon/base_stats/seadra.asm +++ b/data/pokemon/base_stats/seadra.asm @@ -3,20 +3,19 @@ db 55, 65, 95, 85, 95, 45 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 75 ; catch rate db 155 ; base exp - db NO_ITEM ; item 1 - db DRAGON_SCALE ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, DRAGON_SCALE ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/seadra/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AMPHIBIAN, REPTILE ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_WATER_1, EGG_DRAGON ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, DRAGONBREATH, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/seaking.asm b/data/pokemon/base_stats/seaking.asm index 70bee646a..16877fbc4 100644 --- a/data/pokemon/base_stats/seaking.asm +++ b/data/pokemon/base_stats/seaking.asm @@ -3,20 +3,19 @@ db 80, 92, 65, 68, 65, 80 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 60 ; catch rate db 170 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/seaking/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FISH, FISH ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_WATER_2, EGG_WATER_2 ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, SURF, WATERFALL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/seel.asm b/data/pokemon/base_stats/seel.asm index 13edf89bc..8635ff507 100644 --- a/data/pokemon/base_stats/seel.asm +++ b/data/pokemon/base_stats/seel.asm @@ -3,20 +3,19 @@ db 65, 45, 55, 45, 45, 70 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 190 ; catch rate db 100 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/seel/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AMPHIBIAN, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_WATER_1, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, REST, ATTRACT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/sentret.asm b/data/pokemon/base_stats/sentret.asm index c3802fa63..bb68d5c50 100644 --- a/data/pokemon/base_stats/sentret.asm +++ b/data/pokemon/base_stats/sentret.asm @@ -3,20 +3,19 @@ db 35, 46, 34, 20, 35, 45 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 255 ; catch rate db 57 ; base exp - db NO_ITEM ; item 1 - db BERRY ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, BERRY ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/sentret/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, FURY_CUTTER, CUT, SURF ; end diff --git a/data/pokemon/base_stats/shellder.asm b/data/pokemon/base_stats/shellder.asm index 9ca88a03d..c7a39fc88 100644 --- a/data/pokemon/base_stats/shellder.asm +++ b/data/pokemon/base_stats/shellder.asm @@ -3,20 +3,19 @@ db 30, 65, 100, 40, 45, 25 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 190 ; catch rate db 97 ; base exp - db PEARL ; item 1 - db BIG_PEARL ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db PEARL, BIG_PEARL ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/shellder/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn INVERTEBRATE, INVERTEBRATE ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_WATER_3, EGG_WATER_3 ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, SURF, WHIRLPOOL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/shuckle.asm b/data/pokemon/base_stats/shuckle.asm index ec3a3b410..ca4cbc9c2 100644 --- a/data/pokemon/base_stats/shuckle.asm +++ b/data/pokemon/base_stats/shuckle.asm @@ -3,20 +3,19 @@ db 20, 10, 230, 05, 10, 230 ; hp atk def spd sat sdf - db BUG, ROCK + db BUG, ROCK ; type db 190 ; catch rate db 80 ; base exp - db BERRY ; item 1 - db BERRY ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db BERRY, BERRY ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/shuckle/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn INSECT, INSECT ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_BUG, EGG_BUG ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SANDSTORM, DEFENSE_CURL, REST, ATTRACT, STRENGTH, FLASH ; end diff --git a/data/pokemon/base_stats/skarmory.asm b/data/pokemon/base_stats/skarmory.asm index 4d0b5f3de..73fc39741 100644 --- a/data/pokemon/base_stats/skarmory.asm +++ b/data/pokemon/base_stats/skarmory.asm @@ -3,20 +3,19 @@ db 65, 80, 140, 70, 40, 70 ; hp atk def spd sat sdf - db STEEL, FLYING + db STEEL, FLYING ; type db 25 ; catch rate db 168 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 25 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/skarmory/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn AVIAN, AVIAN ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_FLYING, EGG_FLYING ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING, CUT, FLY ; end diff --git a/data/pokemon/base_stats/skiploom.asm b/data/pokemon/base_stats/skiploom.asm index 29a7be748..f3ae26958 100644 --- a/data/pokemon/base_stats/skiploom.asm +++ b/data/pokemon/base_stats/skiploom.asm @@ -3,20 +3,19 @@ db 55, 45, 50, 80, 45, 65 ; hp atk def spd sat sdf - db GRASS, FLYING + db GRASS, FLYING ; type db 120 ; catch rate db 136 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/skiploom/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn FAIRY, PLANT ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_FAIRY, EGG_PLANT ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, FLASH ; end diff --git a/data/pokemon/base_stats/slowbro.asm b/data/pokemon/base_stats/slowbro.asm index a9fc61e3a..797dbbf3a 100644 --- a/data/pokemon/base_stats/slowbro.asm +++ b/data/pokemon/base_stats/slowbro.asm @@ -3,20 +3,19 @@ db 95, 75, 110, 30, 100, 80 ; hp atk def spd sat sdf - db WATER, PSYCHIC + db WATER, PSYCHIC ; type db 75 ; catch rate db 164 ; base exp - db NO_ITEM ; item 1 - db KINGS_ROCK ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, KINGS_ROCK ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/slowbro/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn MONSTER, AMPHIBIAN ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_MONSTER, EGG_WATER_1 ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DREAM_EATER, REST, ATTRACT, FURY_CUTTER, NIGHTMARE, SURF, STRENGTH, FLASH, FLAMETHROWER, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/slowking.asm b/data/pokemon/base_stats/slowking.asm index 59d6c83e4..56e565e5c 100644 --- a/data/pokemon/base_stats/slowking.asm +++ b/data/pokemon/base_stats/slowking.asm @@ -3,20 +3,19 @@ db 95, 75, 80, 30, 100, 110 ; hp atk def spd sat sdf - db WATER, PSYCHIC + db WATER, PSYCHIC ; type db 70 ; catch rate db 164 ; base exp - db NO_ITEM ; item 1 - db KINGS_ROCK ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, KINGS_ROCK ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/slowking/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn MONSTER, AMPHIBIAN ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_MONSTER, EGG_WATER_1 ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DREAM_EATER, REST, ATTRACT, FURY_CUTTER, NIGHTMARE, SURF, STRENGTH, FLASH, WHIRLPOOL, FLAMETHROWER, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/slowpoke.asm b/data/pokemon/base_stats/slowpoke.asm index cb9bc813b..99d9a60ba 100644 --- a/data/pokemon/base_stats/slowpoke.asm +++ b/data/pokemon/base_stats/slowpoke.asm @@ -3,20 +3,19 @@ db 90, 65, 65, 15, 40, 40 ; hp atk def spd sat sdf - db WATER, PSYCHIC + db WATER, PSYCHIC ; type db 190 ; catch rate db 99 ; base exp - db NO_ITEM ; item 1 - db KINGS_ROCK ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, KINGS_ROCK ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/slowpoke/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn MONSTER, AMPHIBIAN ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_MONSTER, EGG_WATER_1 ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DREAM_EATER, REST, ATTRACT, NIGHTMARE, SURF, STRENGTH, FLASH, FLAMETHROWER, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/slugma.asm b/data/pokemon/base_stats/slugma.asm index 234e844b9..26e8818c7 100644 --- a/data/pokemon/base_stats/slugma.asm +++ b/data/pokemon/base_stats/slugma.asm @@ -3,20 +3,19 @@ db 40, 40, 40, 20, 70, 40 ; hp atk def spd sat sdf - db FIRE, FIRE + db FIRE, FIRE ; type db 190 ; catch rate db 78 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/slugma/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AMORPHOUS, AMORPHOUS ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_INDETERMINATE, EGG_INDETERMINATE ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, DEFENSE_CURL, REST, ATTRACT, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/smeargle.asm b/data/pokemon/base_stats/smeargle.asm index 2373cb0f0..1a9c891f1 100644 --- a/data/pokemon/base_stats/smeargle.asm +++ b/data/pokemon/base_stats/smeargle.asm @@ -3,20 +3,19 @@ db 55, 20, 35, 75, 20, 45 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 45 ; catch rate db 106 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/smeargle/front.dimensions" db 0, 0, 0, 0 ; padding - db FAST ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_FAST ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm ; end diff --git a/data/pokemon/base_stats/smoochum.asm b/data/pokemon/base_stats/smoochum.asm index f8f5e22f6..7be8e51de 100644 --- a/data/pokemon/base_stats/smoochum.asm +++ b/data/pokemon/base_stats/smoochum.asm @@ -3,20 +3,19 @@ db 45, 30, 15, 65, 85, 65 ; hp atk def spd sat sdf - db ICE, PSYCHIC + db ICE, PSYCHIC ; type db 45 ; catch rate db 87 ; base exp - db ICE_BERRY ; item 1 - db ICE_BERRY ; item 2 - db GENDER_F100 ; gender - db 100 ; unknown + db ICE_BERRY, ICE_BERRY ; items + db GENDER_F100 ; gender ratio + db 100 ; unknown 1 db 25 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/smoochum/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn NO_EGGS, NO_EGGS ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_NONE, EGG_NONE ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, CURSE, TOXIC, PSYCH_UP, HIDDEN_POWER, SWEET_SCENT, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/sneasel.asm b/data/pokemon/base_stats/sneasel.asm index 4e24a8ada..2b58b31eb 100644 --- a/data/pokemon/base_stats/sneasel.asm +++ b/data/pokemon/base_stats/sneasel.asm @@ -3,20 +3,19 @@ db 55, 95, 55, 115, 35, 75 ; hp atk def spd sat sdf - db DARK, ICE + db DARK, ICE ; type db 60 ; catch rate db 132 ; base exp - db NO_ITEM ; item 1 - db QUICK_CLAW ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, QUICK_CLAW ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/sneasel/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, FURY_CUTTER, NIGHTMARE, CUT, SURF, STRENGTH, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/snorlax.asm b/data/pokemon/base_stats/snorlax.asm index 9a9e426e9..68b1be600 100644 --- a/data/pokemon/base_stats/snorlax.asm +++ b/data/pokemon/base_stats/snorlax.asm @@ -3,20 +3,19 @@ db 160, 110, 65, 30, 65, 110 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 25 ; catch rate db 154 ; base exp - db LEFTOVERS ; item 1 - db LEFTOVERS ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db LEFTOVERS, LEFTOVERS ; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 40 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/snorlax/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn MONSTER, MONSTER ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_MONSTER, EGG_MONSTER ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, THUNDER, EARTHQUAKE, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DEFENSE_CURL, THUNDERPUNCH, REST, ATTRACT, FIRE_PUNCH, SURF, STRENGTH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/snubbull.asm b/data/pokemon/base_stats/snubbull.asm index 6dbca375e..bcfac58e7 100644 --- a/data/pokemon/base_stats/snubbull.asm +++ b/data/pokemon/base_stats/snubbull.asm @@ -3,20 +3,19 @@ db 60, 80, 50, 30, 40, 40 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 190 ; catch rate db 63 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F75 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F75 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/snubbull/front.dimensions" db 0, 0, 0, 0 ; padding - db FAST ; growth rate - dn FIELD, FAIRY ; egg groups + db GROWTH_FAST ; growth rate + dn EGG_GROUND, EGG_FAIRY ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, DEFENSE_CURL, THUNDERPUNCH, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/spearow.asm b/data/pokemon/base_stats/spearow.asm index a55e8a17c..98b61b6b7 100644 --- a/data/pokemon/base_stats/spearow.asm +++ b/data/pokemon/base_stats/spearow.asm @@ -3,20 +3,19 @@ db 40, 60, 30, 70, 31, 31 ; hp atk def spd sat sdf - db NORMAL, FLYING + db NORMAL, FLYING ; type db 255 ; catch rate db 58 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/spearow/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AVIAN, AVIAN ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_FLYING, EGG_FLYING ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING, FLY ; end diff --git a/data/pokemon/base_stats/spinarak.asm b/data/pokemon/base_stats/spinarak.asm index fb2fbb7f3..e02fb6ca1 100644 --- a/data/pokemon/base_stats/spinarak.asm +++ b/data/pokemon/base_stats/spinarak.asm @@ -3,20 +3,19 @@ db 40, 60, 40, 30, 40, 40 ; hp atk def spd sat sdf - db BUG, POISON + db BUG, POISON ; type db 255 ; catch rate db 54 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/spinarak/front.dimensions" db 0, 0, 0, 0 ; padding - db FAST ; growth rate - dn INSECT, INSECT ; egg groups + db GROWTH_FAST ; growth rate + dn EGG_BUG, EGG_BUG ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DIG, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, THIEF, FLASH ; end diff --git a/data/pokemon/base_stats/squirtle.asm b/data/pokemon/base_stats/squirtle.asm index 6582f88a8..f09725cb0 100644 --- a/data/pokemon/base_stats/squirtle.asm +++ b/data/pokemon/base_stats/squirtle.asm @@ -3,20 +3,19 @@ db 44, 48, 65, 43, 50, 64 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 45 ; catch rate db 66 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/squirtle/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn MONSTER, AMPHIBIAN ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_MONSTER, EGG_WATER_1 ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, SURF, STRENGTH, WHIRLPOOL, WATERFALL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/stantler.asm b/data/pokemon/base_stats/stantler.asm index a8537a1e0..bc3145cd5 100644 --- a/data/pokemon/base_stats/stantler.asm +++ b/data/pokemon/base_stats/stantler.asm @@ -3,20 +3,19 @@ db 73, 95, 62, 85, 85, 65 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 45 ; catch rate db 165 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/stantler/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, PSYCHIC_M, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, NIGHTMARE, FLASH ; end diff --git a/data/pokemon/base_stats/starmie.asm b/data/pokemon/base_stats/starmie.asm index 55c5fcc99..8823bbbe2 100644 --- a/data/pokemon/base_stats/starmie.asm +++ b/data/pokemon/base_stats/starmie.asm @@ -3,20 +3,19 @@ db 60, 75, 85, 115, 100, 85 ; hp atk def spd sat sdf - db WATER, PSYCHIC + db WATER, PSYCHIC ; type db 60 ; catch rate db 207 ; base exp - db STARDUST ; item 1 - db STAR_PIECE ; item 2 - db GENDERLESS ; gender - db 100 ; unknown + db STARDUST, STAR_PIECE ; items + db GENDER_UNKNOWN ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/starmie/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn INVERTEBRATE, INVERTEBRATE ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_WATER_3, EGG_WATER_3 ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, REST, ATTRACT, NIGHTMARE, SURF, FLASH, WHIRLPOOL, WATERFALL, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/staryu.asm b/data/pokemon/base_stats/staryu.asm index d702faaf2..d999b0d13 100644 --- a/data/pokemon/base_stats/staryu.asm +++ b/data/pokemon/base_stats/staryu.asm @@ -3,20 +3,19 @@ db 30, 45, 55, 85, 70, 55 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 225 ; catch rate db 106 ; base exp - db STARDUST ; item 1 - db STAR_PIECE ; item 2 - db GENDERLESS ; gender - db 100 ; unknown + db STARDUST, STAR_PIECE ; items + db GENDER_UNKNOWN ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/staryu/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn INVERTEBRATE, INVERTEBRATE ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_WATER_3, EGG_WATER_3 ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, ATTRACT, SURF, FLASH, WHIRLPOOL, WATERFALL, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/steelix.asm b/data/pokemon/base_stats/steelix.asm index 6931418c8..e8e620831 100644 --- a/data/pokemon/base_stats/steelix.asm +++ b/data/pokemon/base_stats/steelix.asm @@ -3,20 +3,19 @@ db 75, 85, 200, 30, 55, 65 ; hp atk def spd sat sdf - db STEEL, GROUND + db STEEL, GROUND ; type db 25 ; catch rate db 196 ; base exp - db NO_ITEM ; item 1 - db METAL_COAT ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, METAL_COAT ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 25 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/steelix/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn INANIMATE, INANIMATE ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_MINERAL, EGG_MINERAL ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, DEFENSE_CURL, REST, ATTRACT, CUT, STRENGTH ; end diff --git a/data/pokemon/base_stats/sudowoodo.asm b/data/pokemon/base_stats/sudowoodo.asm index 40726999d..cd95db096 100644 --- a/data/pokemon/base_stats/sudowoodo.asm +++ b/data/pokemon/base_stats/sudowoodo.asm @@ -3,20 +3,19 @@ db 70, 100, 115, 30, 30, 65 ; hp atk def spd sat sdf - db ROCK, ROCK + db ROCK, ROCK ; type db 65 ; catch rate db 135 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/sudowoodo/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn INANIMATE, INANIMATE ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_MINERAL, EGG_MINERAL ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SANDSTORM, DEFENSE_CURL, THUNDERPUNCH, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH ; end diff --git a/data/pokemon/base_stats/suicune.asm b/data/pokemon/base_stats/suicune.asm index b199eddd7..b52e0f5d0 100644 --- a/data/pokemon/base_stats/suicune.asm +++ b/data/pokemon/base_stats/suicune.asm @@ -3,20 +3,19 @@ db 100, 75, 115, 85, 90, 115 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 3 ; catch rate db 215 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDERLESS ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_UNKNOWN ; gender ratio + db 100 ; unknown 1 db 80 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/suicune/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn NO_EGGS, NO_EGGS ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_NONE, EGG_NONE ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DETECT, REST, CUT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/sunflora.asm b/data/pokemon/base_stats/sunflora.asm index ec39d0932..aac7603f6 100644 --- a/data/pokemon/base_stats/sunflora.asm +++ b/data/pokemon/base_stats/sunflora.asm @@ -3,20 +3,19 @@ db 75, 75, 55, 30, 105, 85 ; hp atk def spd sat sdf - db GRASS, GRASS + db GRASS, GRASS ; type db 120 ; catch rate db 146 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/sunflora/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn PLANT, PLANT ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_PLANT, EGG_PLANT ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, CUT, FLASH ; end diff --git a/data/pokemon/base_stats/sunkern.asm b/data/pokemon/base_stats/sunkern.asm index 7e502900c..c646e80db 100644 --- a/data/pokemon/base_stats/sunkern.asm +++ b/data/pokemon/base_stats/sunkern.asm @@ -3,20 +3,19 @@ db 30, 30, 30, 30, 30, 30 ; hp atk def spd sat sdf - db GRASS, GRASS + db GRASS, GRASS ; type db 235 ; catch rate db 52 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/sunkern/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn PLANT, PLANT ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_PLANT, EGG_PLANT ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, CUT, FLASH ; end diff --git a/data/pokemon/base_stats/swinub.asm b/data/pokemon/base_stats/swinub.asm index ee6bd783a..62a330733 100644 --- a/data/pokemon/base_stats/swinub.asm +++ b/data/pokemon/base_stats/swinub.asm @@ -3,20 +3,19 @@ db 50, 50, 40, 50, 30, 30 ; hp atk def spd sat sdf - db ICE, GROUND + db ICE, GROUND ; type db 225 ; catch rate db 78 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/swinub/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, DETECT, REST, ATTRACT, STRENGTH, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/tangela.asm b/data/pokemon/base_stats/tangela.asm index a2b5b06a0..2535b6c82 100644 --- a/data/pokemon/base_stats/tangela.asm +++ b/data/pokemon/base_stats/tangela.asm @@ -3,20 +3,19 @@ db 65, 55, 115, 60, 100, 40 ; hp atk def spd sat sdf - db GRASS, GRASS + db GRASS, GRASS ; type db 45 ; catch rate db 166 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/tangela/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn PLANT, PLANT ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_PLANT, EGG_PLANT ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, THIEF, CUT, FLASH ; end diff --git a/data/pokemon/base_stats/tauros.asm b/data/pokemon/base_stats/tauros.asm index 936d60a4d..307033fd2 100644 --- a/data/pokemon/base_stats/tauros.asm +++ b/data/pokemon/base_stats/tauros.asm @@ -3,20 +3,19 @@ db 75, 100, 95, 110, 40, 70 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 45 ; catch rate db 211 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F0 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F0 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/tauros/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, EARTHQUAKE, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, REST, ATTRACT, SURF, STRENGTH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/teddiursa.asm b/data/pokemon/base_stats/teddiursa.asm index 18c4ede7a..9309d247d 100644 --- a/data/pokemon/base_stats/teddiursa.asm +++ b/data/pokemon/base_stats/teddiursa.asm @@ -3,20 +3,19 @@ db 60, 80, 50, 40, 50, 50 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 120 ; catch rate db 124 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/teddiursa/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, REST, ATTRACT, THIEF, FIRE_PUNCH, FURY_CUTTER, CUT, STRENGTH ; end diff --git a/data/pokemon/base_stats/tentacool.asm b/data/pokemon/base_stats/tentacool.asm index 94dcb42b0..c5ce41e0a 100644 --- a/data/pokemon/base_stats/tentacool.asm +++ b/data/pokemon/base_stats/tentacool.asm @@ -3,20 +3,19 @@ db 40, 40, 35, 70, 50, 100 ; hp atk def spd sat sdf - db WATER, POISON + db WATER, POISON ; type db 190 ; catch rate db 105 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/tentacool/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn INVERTEBRATE, INVERTEBRATE ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_WATER_3, EGG_WATER_3 ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, CUT, SURF, WHIRLPOOL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/tentacruel.asm b/data/pokemon/base_stats/tentacruel.asm index e922c5938..35037c668 100644 --- a/data/pokemon/base_stats/tentacruel.asm +++ b/data/pokemon/base_stats/tentacruel.asm @@ -3,20 +3,19 @@ db 80, 70, 65, 100, 80, 120 ; hp atk def spd sat sdf - db WATER, POISON + db WATER, POISON ; type db 60 ; catch rate db 205 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/tentacruel/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn INVERTEBRATE, INVERTEBRATE ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_WATER_3, EGG_WATER_3 ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, CUT, SURF, WHIRLPOOL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/togepi.asm b/data/pokemon/base_stats/togepi.asm index 0f22863e5..98b5f6bcd 100644 --- a/data/pokemon/base_stats/togepi.asm +++ b/data/pokemon/base_stats/togepi.asm @@ -3,20 +3,19 @@ db 35, 20, 65, 20, 40, 65 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 190 ; catch rate db 74 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 10 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/togepi/front.dimensions" db 0, 0, 0, 0 ; padding - db FAST ; growth rate - dn NO_EGGS, NO_EGGS ; egg groups + db GROWTH_FAST ; growth rate + dn EGG_NONE, EGG_NONE ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DEFENSE_CURL, DREAM_EATER, DETECT, REST, ATTRACT, FLASH, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/togetic.asm b/data/pokemon/base_stats/togetic.asm index ef2f94305..77176266c 100644 --- a/data/pokemon/base_stats/togetic.asm +++ b/data/pokemon/base_stats/togetic.asm @@ -3,20 +3,19 @@ db 55, 40, 85, 40, 80, 105 ; hp atk def spd sat sdf - db NORMAL, FLYING + db NORMAL, FLYING ; type db 75 ; catch rate db 114 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 10 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/togetic/front.dimensions" db 0, 0, 0, 0 ; padding - db FAST ; growth rate - dn AVIAN, FAIRY ; egg groups + db GROWTH_FAST ; growth rate + dn EGG_FLYING, EGG_FAIRY ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DEFENSE_CURL, DREAM_EATER, DETECT, REST, ATTRACT, STEEL_WING, FLY, FLASH, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/totodile.asm b/data/pokemon/base_stats/totodile.asm index 49c7603f6..86830e11e 100644 --- a/data/pokemon/base_stats/totodile.asm +++ b/data/pokemon/base_stats/totodile.asm @@ -3,20 +3,19 @@ db 50, 65, 64, 43, 44, 48 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 45 ; catch rate db 66 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/totodile/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn MONSTER, AMPHIBIAN ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_MONSTER, EGG_WATER_1 ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DETECT, REST, ATTRACT, CUT, SURF, WHIRLPOOL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/typhlosion.asm b/data/pokemon/base_stats/typhlosion.asm index ed6fcf198..181a24661 100644 --- a/data/pokemon/base_stats/typhlosion.asm +++ b/data/pokemon/base_stats/typhlosion.asm @@ -3,20 +3,19 @@ db 78, 84, 78, 100, 109, 85 ; hp atk def spd sat sdf - db FIRE, FIRE + db FIRE, FIRE ; type db 45 ; catch rate db 209 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/typhlosion/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DEFENSE_CURL, THUNDERPUNCH, DETECT, REST, ATTRACT, FIRE_PUNCH, FURY_CUTTER, CUT, STRENGTH, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/tyranitar.asm b/data/pokemon/base_stats/tyranitar.asm index b6ed98dd7..a3bd68aef 100644 --- a/data/pokemon/base_stats/tyranitar.asm +++ b/data/pokemon/base_stats/tyranitar.asm @@ -3,20 +3,19 @@ db 100, 134, 110, 61, 95, 100 ; hp atk def spd sat sdf - db ROCK, DARK + db ROCK, DARK ; type db 45 ; catch rate db 218 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 40 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/tyranitar/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn MONSTER, MONSTER ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_MONSTER, EGG_MONSTER ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DETECT, REST, ATTRACT, FIRE_PUNCH, FURY_CUTTER, NIGHTMARE, CUT, SURF, STRENGTH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/tyrogue.asm b/data/pokemon/base_stats/tyrogue.asm index 026aab404..fb7e75eb5 100644 --- a/data/pokemon/base_stats/tyrogue.asm +++ b/data/pokemon/base_stats/tyrogue.asm @@ -3,20 +3,19 @@ db 35, 35, 35, 35, 35, 35 ; hp atk def spd sat sdf - db FIGHTING, FIGHTING + db FIGHTING, FIGHTING ; type db 75 ; catch rate db 91 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F0 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F0 ; gender ratio + db 100 ; unknown 1 db 25 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/tyrogue/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn NO_EGGS, NO_EGGS ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_NONE, EGG_NONE ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STRENGTH ; end diff --git a/data/pokemon/base_stats/umbreon.asm b/data/pokemon/base_stats/umbreon.asm index 0382e69e2..55dc75902 100644 --- a/data/pokemon/base_stats/umbreon.asm +++ b/data/pokemon/base_stats/umbreon.asm @@ -3,20 +3,19 @@ db 95, 65, 110, 65, 60, 130 ; hp atk def spd sat sdf - db DARK, DARK + db DARK, DARK ; type db 45 ; catch rate db 197 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 35 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/umbreon/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, DETECT, REST, ATTRACT, NIGHTMARE, CUT, FLASH ; end diff --git a/data/pokemon/base_stats/unown.asm b/data/pokemon/base_stats/unown.asm index ef67b1ce1..248aae9d1 100644 --- a/data/pokemon/base_stats/unown.asm +++ b/data/pokemon/base_stats/unown.asm @@ -3,20 +3,19 @@ db 48, 72, 48, 48, 72, 48 ; hp atk def spd sat sdf - db PSYCHIC, PSYCHIC + db PSYCHIC, PSYCHIC ; type db 225 ; catch rate db 61 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDERLESS ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_UNKNOWN ; gender ratio + db 100 ; unknown 1 db 40 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/unown_a/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn NO_EGGS, NO_EGGS ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_NONE, EGG_NONE ; egg groups - ; tmhm + ; tm/hm learnset tmhm ; end diff --git a/data/pokemon/base_stats/ursaring.asm b/data/pokemon/base_stats/ursaring.asm index 8f2031c77..1cc2f21a8 100644 --- a/data/pokemon/base_stats/ursaring.asm +++ b/data/pokemon/base_stats/ursaring.asm @@ -3,20 +3,19 @@ db 90, 130, 75, 55, 75, 75 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 60 ; catch rate db 189 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/ursaring/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, REST, ATTRACT, THIEF, FIRE_PUNCH, FURY_CUTTER, CUT, STRENGTH ; end diff --git a/data/pokemon/base_stats/vaporeon.asm b/data/pokemon/base_stats/vaporeon.asm index 083a67499..8e266396e 100644 --- a/data/pokemon/base_stats/vaporeon.asm +++ b/data/pokemon/base_stats/vaporeon.asm @@ -3,20 +3,19 @@ db 130, 65, 60, 65, 110, 95 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 45 ; catch rate db 196 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 35 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/vaporeon/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, SURF, WHIRLPOOL, WATERFALL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/venomoth.asm b/data/pokemon/base_stats/venomoth.asm index c92c7fbff..43e50bfd4 100644 --- a/data/pokemon/base_stats/venomoth.asm +++ b/data/pokemon/base_stats/venomoth.asm @@ -3,20 +3,19 @@ db 70, 65, 60, 90, 90, 75 ; hp atk def spd sat sdf - db BUG, POISON + db BUG, POISON ; type db 75 ; catch rate db 138 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/venomoth/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn INSECT, INSECT ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_BUG, EGG_BUG ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SWIFT, REST, ATTRACT, THIEF, FLASH ; end diff --git a/data/pokemon/base_stats/venonat.asm b/data/pokemon/base_stats/venonat.asm index 40a9639b8..77f05af31 100644 --- a/data/pokemon/base_stats/venonat.asm +++ b/data/pokemon/base_stats/venonat.asm @@ -3,20 +3,19 @@ db 60, 55, 50, 45, 40, 55 ; hp atk def spd sat sdf - db BUG, POISON + db BUG, POISON ; type db 190 ; catch rate db 75 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/venonat/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn INSECT, INSECT ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_BUG, EGG_BUG ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SWIFT, REST, ATTRACT, THIEF ; end diff --git a/data/pokemon/base_stats/venusaur.asm b/data/pokemon/base_stats/venusaur.asm index 465b3d0fc..bd7664e57 100644 --- a/data/pokemon/base_stats/venusaur.asm +++ b/data/pokemon/base_stats/venusaur.asm @@ -3,20 +3,19 @@ db 80, 82, 83, 80, 100, 100 ; hp atk def spd sat sdf - db GRASS, POISON + db GRASS, POISON ; type db 45 ; catch rate db 208 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/venusaur/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn MONSTER, PLANT ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_MONSTER, EGG_PLANT ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROAR, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, FURY_CUTTER, CUT, FLASH ; end diff --git a/data/pokemon/base_stats/victreebel.asm b/data/pokemon/base_stats/victreebel.asm index e4e1a24e5..43fe562f9 100644 --- a/data/pokemon/base_stats/victreebel.asm +++ b/data/pokemon/base_stats/victreebel.asm @@ -3,20 +3,19 @@ db 80, 105, 65, 70, 100, 60 ; hp atk def spd sat sdf - db GRASS, POISON + db GRASS, POISON ; type db 45 ; catch rate db 191 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/victreebel/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn PLANT, PLANT ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_PLANT, EGG_PLANT ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, CUT, FLASH ; end diff --git a/data/pokemon/base_stats/vileplume.asm b/data/pokemon/base_stats/vileplume.asm index 3f0d0b996..fff689e49 100644 --- a/data/pokemon/base_stats/vileplume.asm +++ b/data/pokemon/base_stats/vileplume.asm @@ -3,20 +3,19 @@ db 75, 80, 85, 50, 100, 90 ; hp atk def spd sat sdf - db GRASS, POISON + db GRASS, POISON ; type db 45 ; catch rate db 184 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/vileplume/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn PLANT, PLANT ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_PLANT, EGG_PLANT ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, CUT, FLASH ; end diff --git a/data/pokemon/base_stats/voltorb.asm b/data/pokemon/base_stats/voltorb.asm index 2767568fa..ad5f16737 100644 --- a/data/pokemon/base_stats/voltorb.asm +++ b/data/pokemon/base_stats/voltorb.asm @@ -3,20 +3,19 @@ db 40, 30, 50, 100, 55, 55 ; hp atk def spd sat sdf - db ELECTRIC, ELECTRIC + db ELECTRIC, ELECTRIC ; type db 190 ; catch rate db 103 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDERLESS ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_UNKNOWN ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/voltorb/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn INANIMATE, INANIMATE ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_MINERAL, EGG_MINERAL ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, FLASH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/vulpix.asm b/data/pokemon/base_stats/vulpix.asm index e012402a0..1f19771ee 100644 --- a/data/pokemon/base_stats/vulpix.asm +++ b/data/pokemon/base_stats/vulpix.asm @@ -3,20 +3,19 @@ db 38, 41, 40, 65, 50, 65 ; hp atk def spd sat sdf - db FIRE, FIRE + db FIRE, FIRE ; type db 190 ; catch rate db 63 ; base exp - db BURNT_BERRY ; item 1 - db BURNT_BERRY ; item 2 - db GENDER_F75 ; gender - db 100 ; unknown + db BURNT_BERRY, BURNT_BERRY ; items + db GENDER_F75 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/vulpix/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn FIELD, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_GROUND, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, REST, ATTRACT, FLAMETHROWER ; end diff --git a/data/pokemon/base_stats/wartortle.asm b/data/pokemon/base_stats/wartortle.asm index 7df729f3f..20db04447 100644 --- a/data/pokemon/base_stats/wartortle.asm +++ b/data/pokemon/base_stats/wartortle.asm @@ -3,20 +3,19 @@ db 59, 63, 80, 58, 65, 80 ; hp atk def spd sat sdf - db WATER, WATER + db WATER, WATER ; type db 45 ; catch rate db 143 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F12_5 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F12_5 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/wartortle/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn MONSTER, AMPHIBIAN ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_MONSTER, EGG_WATER_1 ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, DEFENSE_CURL, REST, ATTRACT, SURF, STRENGTH, WHIRLPOOL, WATERFALL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/weedle.asm b/data/pokemon/base_stats/weedle.asm index 520109245..c2536b316 100644 --- a/data/pokemon/base_stats/weedle.asm +++ b/data/pokemon/base_stats/weedle.asm @@ -3,20 +3,19 @@ db 40, 35, 30, 50, 20, 20 ; hp atk def spd sat sdf - db BUG, POISON + db BUG, POISON ; type db 255 ; catch rate db 52 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/weedle/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn INSECT, INSECT ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_BUG, EGG_BUG ; egg groups - ; tmhm + ; tm/hm learnset tmhm ; end diff --git a/data/pokemon/base_stats/weepinbell.asm b/data/pokemon/base_stats/weepinbell.asm index 3dbd2595e..4a4069abb 100644 --- a/data/pokemon/base_stats/weepinbell.asm +++ b/data/pokemon/base_stats/weepinbell.asm @@ -3,20 +3,19 @@ db 65, 90, 50, 55, 85, 45 ; hp atk def spd sat sdf - db GRASS, POISON + db GRASS, POISON ; type db 120 ; catch rate db 151 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/weepinbell/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_SLOW ; growth rate - dn PLANT, PLANT ; egg groups + db GROWTH_MEDIUM_SLOW ; growth rate + dn EGG_PLANT, EGG_PLANT ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SWEET_SCENT, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, CUT, FLASH ; end diff --git a/data/pokemon/base_stats/weezing.asm b/data/pokemon/base_stats/weezing.asm index 41c1d4f5d..e18c78bb2 100644 --- a/data/pokemon/base_stats/weezing.asm +++ b/data/pokemon/base_stats/weezing.asm @@ -3,20 +3,19 @@ db 65, 90, 120, 60, 85, 70 ; hp atk def spd sat sdf - db POISON, POISON + db POISON, POISON ; type db 60 ; catch rate db 173 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/weezing/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AMORPHOUS, AMORPHOUS ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_INDETERMINATE, EGG_INDETERMINATE ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, ROLLOUT, TOXIC, ZAP_CANNON, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, FIRE_BLAST, REST, ATTRACT, THIEF, FLAMETHROWER, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/wigglytuff.asm b/data/pokemon/base_stats/wigglytuff.asm index e2d3bd7e6..0a3498b8f 100644 --- a/data/pokemon/base_stats/wigglytuff.asm +++ b/data/pokemon/base_stats/wigglytuff.asm @@ -3,20 +3,19 @@ db 140, 70, 45, 45, 75, 50 ; hp atk def spd sat sdf - db NORMAL, NORMAL + db NORMAL, NORMAL ; type db 50 ; catch rate db 109 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F75 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F75 ; gender ratio + db 100 ; unknown 1 db 10 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/wigglytuff/front.dimensions" db 0, 0, 0, 0 ; padding - db FAST ; growth rate - dn FAIRY, FAIRY ; egg groups + db GROWTH_FAST ; growth rate + dn EGG_FAIRY, EGG_FAIRY ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, FIRE_BLAST, DEFENSE_CURL, THUNDERPUNCH, DREAM_EATER, DETECT, REST, ATTRACT, FIRE_PUNCH, NIGHTMARE, STRENGTH, FLASH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/wobbuffet.asm b/data/pokemon/base_stats/wobbuffet.asm index 393655150..39514450e 100644 --- a/data/pokemon/base_stats/wobbuffet.asm +++ b/data/pokemon/base_stats/wobbuffet.asm @@ -3,20 +3,19 @@ db 190, 33, 58, 33, 33, 58 ; hp atk def spd sat sdf - db PSYCHIC, PSYCHIC + db PSYCHIC, PSYCHIC ; type db 45 ; catch rate db 177 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/wobbuffet/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AMORPHOUS, AMORPHOUS ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_INDETERMINATE, EGG_INDETERMINATE ; egg groups - ; tmhm + ; tm/hm learnset tmhm ; end diff --git a/data/pokemon/base_stats/wooper.asm b/data/pokemon/base_stats/wooper.asm index db3f7f90a..5cc4a6666 100644 --- a/data/pokemon/base_stats/wooper.asm +++ b/data/pokemon/base_stats/wooper.asm @@ -3,20 +3,19 @@ db 55, 45, 45, 15, 25, 25 ; hp atk def spd sat sdf - db WATER, GROUND + db WATER, GROUND ; type db 255 ; catch rate db 52 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/wooper/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AMPHIBIAN, FIELD ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_WATER_1, EGG_GROUND ; egg groups - ; tmhm + ; tm/hm learnset tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SANDSTORM, DEFENSE_CURL, REST, ATTRACT, SURF, FLASH, WHIRLPOOL, ICE_BEAM ; end diff --git a/data/pokemon/base_stats/xatu.asm b/data/pokemon/base_stats/xatu.asm index a5941421e..79bf0bc60 100644 --- a/data/pokemon/base_stats/xatu.asm +++ b/data/pokemon/base_stats/xatu.asm @@ -3,20 +3,19 @@ db 65, 75, 70, 95, 95, 70 ; hp atk def spd sat sdf - db PSYCHIC, FLYING + db PSYCHIC, FLYING ; type db 75 ; catch rate db 171 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/xatu/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AVIAN, AVIAN ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_FLYING, EGG_FLYING ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, PSYCHIC_M, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, NIGHTMARE, FLY, FLASH ; end diff --git a/data/pokemon/base_stats/yanma.asm b/data/pokemon/base_stats/yanma.asm index 0bff5157a..01918230c 100644 --- a/data/pokemon/base_stats/yanma.asm +++ b/data/pokemon/base_stats/yanma.asm @@ -3,20 +3,19 @@ db 65, 65, 45, 95, 75, 45 ; hp atk def spd sat sdf - db BUG, FLYING + db BUG, FLYING ; type db 75 ; catch rate db 147 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 20 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/yanma/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn INSECT, INSECT ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_BUG, EGG_BUG ; egg groups - ; tmhm + ; tm/hm learnset tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, FLASH ; end diff --git a/data/pokemon/base_stats/zapdos.asm b/data/pokemon/base_stats/zapdos.asm index 35b557404..a5589ab9a 100644 --- a/data/pokemon/base_stats/zapdos.asm +++ b/data/pokemon/base_stats/zapdos.asm @@ -3,20 +3,19 @@ db 90, 90, 85, 100, 125, 90 ; hp atk def spd sat sdf - db ELECTRIC, FLYING + db ELECTRIC, FLYING ; type db 3 ; catch rate db 216 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDERLESS ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_UNKNOWN ; gender ratio + db 100 ; unknown 1 db 80 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/zapdos/front.dimensions" db 0, 0, 0, 0 ; padding - db SLOW ; growth rate - dn NO_EGGS, NO_EGGS ; egg groups + db GROWTH_SLOW ; growth rate + dn EGG_NONE, EGG_NONE ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, ROAR, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DETECT, REST, STEEL_WING, FLY, FLASH, THUNDERBOLT ; end diff --git a/data/pokemon/base_stats/zubat.asm b/data/pokemon/base_stats/zubat.asm index 5da4ceeba..ee3716844 100644 --- a/data/pokemon/base_stats/zubat.asm +++ b/data/pokemon/base_stats/zubat.asm @@ -3,20 +3,19 @@ db 40, 45, 35, 55, 30, 40 ; hp atk def spd sat sdf - db POISON, FLYING + db POISON, FLYING ; type db 255 ; catch rate db 54 ; base exp - db NO_ITEM ; item 1 - db NO_ITEM ; item 2 - db GENDER_F50 ; gender - db 100 ; unknown + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 db 15 ; step cycles to hatch - db 5 ; unknown + db 5 ; unknown 2 INCBIN "gfx/pokemon/zubat/front.dimensions" db 0, 0, 0, 0 ; padding - db MEDIUM_FAST ; growth rate - dn AVIAN, AVIAN ; egg groups + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_FLYING, EGG_FLYING ; egg groups - ; tmhm + ; tm/hm learnset tmhm CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, GIGA_DRAIN, ENDURE, FRUSTRATION, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING ; end 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_entries/abra.asm b/data/pokemon/dex_entries/abra.asm index be3b263cd..91f55c23f 100644 --- a/data/pokemon/dex_entries/abra.asm +++ b/data/pokemon/dex_entries/abra.asm @@ -1,10 +1,10 @@ -; AbraPokedexEntry: ; 0x1830d5 db "PSI@" ; species name dw 211, 430 ; height, weight db "It hypnotizes" next "itself so that it" next "can teleport away" + page "when it senses" next "danger, even" next "if it is asleep.@" diff --git a/data/pokemon/dex_entries/aerodactyl.asm b/data/pokemon/dex_entries/aerodactyl.asm index d6189500b..48f943c99 100644 --- a/data/pokemon/dex_entries/aerodactyl.asm +++ b/data/pokemon/dex_entries/aerodactyl.asm @@ -1,10 +1,10 @@ -; AerodactylPokedexEntry: ; 0x1cc576 db "FOSSIL@" ; species name dw 511, 1300 ; height, weight db "In prehistoric" next "times, this" next "#MON flew" + page "freely and" next "fearlessly through" next "the skies.@" diff --git a/data/pokemon/dex_entries/aipom.asm b/data/pokemon/dex_entries/aipom.asm index 3fadb9169..4cb0f86ce 100644 --- a/data/pokemon/dex_entries/aipom.asm +++ b/data/pokemon/dex_entries/aipom.asm @@ -1,10 +1,10 @@ -; AipomPokedexEntry: ; 0x1cda11 db "LONG TAIL@" ; species name dw 207, 250 ; height, weight db "It uses its tail" next "to hang on to tree" next "branches. It uses" + page "its momentum to" next "swing from one" next "branch to another.@" diff --git a/data/pokemon/dex_entries/alakazam.asm b/data/pokemon/dex_entries/alakazam.asm index 1d34fa1f7..e13ef835f 100644 --- a/data/pokemon/dex_entries/alakazam.asm +++ b/data/pokemon/dex_entries/alakazam.asm @@ -1,10 +1,10 @@ -; AlakazamPokedexEntry: ; 0x1b8000 db "PSI@" ; species name dw 411, 1060 ; height, weight db "It has an IQ of" next "5000. It calcu-" next "lates many things" + page "in order to gain" next "the edge in every" next "battle.@" diff --git a/data/pokemon/dex_entries/ampharos.asm b/data/pokemon/dex_entries/ampharos.asm index 1f48fe322..dd5c18620 100644 --- a/data/pokemon/dex_entries/ampharos.asm +++ b/data/pokemon/dex_entries/ampharos.asm @@ -1,10 +1,10 @@ -; AmpharosPokedexEntry: ; 0x1cd626 db "LIGHT@" ; species name dw 407, 1360 ; height, weight db "When it gets dark," next "the light from its" next "bright, shiny tail" + page "can be seen from" next "far away on the" next "ocean's surface.@" diff --git a/data/pokemon/dex_entries/arbok.asm b/data/pokemon/dex_entries/arbok.asm index c5d5b7704..0ecab500c 100644 --- a/data/pokemon/dex_entries/arbok.asm +++ b/data/pokemon/dex_entries/arbok.asm @@ -1,10 +1,10 @@ -; ArbokPokedexEntry: ; 0x18203d db "COBRA@" ; species name dw 1106, 1430 ; height, weight db "To intimidate" next "foes, it spreads" next "its chest wide and" + page "makes eerie sounds" next "by expelling air" next "from its mouth.@" diff --git a/data/pokemon/dex_entries/arcanine.asm b/data/pokemon/dex_entries/arcanine.asm index e319bcb6a..2443a1be8 100644 --- a/data/pokemon/dex_entries/arcanine.asm +++ b/data/pokemon/dex_entries/arcanine.asm @@ -1,10 +1,10 @@ -; ArcaninePokedexEntry: ; 0x182f1c db "LEGENDARY@" ; species name dw 603, 3420 ; height, weight db "An ancient picture" next "scroll shows that" next "people were" + page "attracted to its" next "movement as it ran" next "through prairies.@" diff --git a/data/pokemon/dex_entries/ariados.asm b/data/pokemon/dex_entries/ariados.asm index a27d13fef..bdc335f2c 100644 --- a/data/pokemon/dex_entries/ariados.asm +++ b/data/pokemon/dex_entries/ariados.asm @@ -1,10 +1,10 @@ -; AriadosPokedexEntry: ; 0x1cd083 db "LONG LEG@" ; species name dw 307, 740 ; height, weight db "Rather than mak-" next "ing a nest in one" next "specific spot, it" + page "wanders in search" next "of food after" next "darkness falls.@" diff --git a/data/pokemon/dex_entries/articuno.asm b/data/pokemon/dex_entries/articuno.asm index 92b297d28..50439c59b 100644 --- a/data/pokemon/dex_entries/articuno.asm +++ b/data/pokemon/dex_entries/articuno.asm @@ -1,10 +1,10 @@ -; ArticunoPokedexEntry: ; 0x1cc632 db "FREEZE@" ; species name dw 507, 1220 ; height, weight db "Legendary bird" next "#MON. As it" next "flies through the" + page "sky, it cools the" next "air, causing snow" next "to fall.@" diff --git a/data/pokemon/dex_entries/azumarill.asm b/data/pokemon/dex_entries/azumarill.asm index bdbc83d1d..892ac77e3 100644 --- a/data/pokemon/dex_entries/azumarill.asm +++ b/data/pokemon/dex_entries/azumarill.asm @@ -1,10 +1,10 @@ -; AzumarillPokedexEntry: ; 0x1cd771 db "AQUARABBIT@" ; species name dw 207, 630 ; height, weight db "The bubble-like" next "pattern on its" next "stomach helps it" + page "camouflage itself" next "when it's in the" next "water.@" diff --git a/data/pokemon/dex_entries/bayleef.asm b/data/pokemon/dex_entries/bayleef.asm index ac66dccd5..534c4c972 100644 --- a/data/pokemon/dex_entries/bayleef.asm +++ b/data/pokemon/dex_entries/bayleef.asm @@ -1,10 +1,10 @@ -; BayleefPokedexEntry: ; 0x1cc9e9 db "LEAF@" ; species name dw 311, 350 ; height, weight db "The scent that" next "wafts from the" next "leaves on its neck" + page "causes anyone who" next "smells it to" next "become energetic.@" diff --git a/data/pokemon/dex_entries/beedrill.asm b/data/pokemon/dex_entries/beedrill.asm index 505396ca1..7dc8f6262 100644 --- a/data/pokemon/dex_entries/beedrill.asm +++ b/data/pokemon/dex_entries/beedrill.asm @@ -1,10 +1,10 @@ -; BeedrillPokedexEntry: ; 0x181c8a db "POISON BEE@" ; species name dw 303, 650 ; height, weight db "It uses sharp," next "poisonous stings" next "to defeat prey," + page "then takes the" next "victim back to its" next "nest for food.@" diff --git a/data/pokemon/dex_entries/bellossom.asm b/data/pokemon/dex_entries/bellossom.asm index 0d13ed65d..1e90f4b35 100644 --- a/data/pokemon/dex_entries/bellossom.asm +++ b/data/pokemon/dex_entries/bellossom.asm @@ -1,10 +1,10 @@ -; BellossomPokedexEntry: ; 0x1cd69a db "FLOWER@" ; species name dw 104, 130 ; height, weight db "When these dance" next "together, their" next "petals rub against" + page "each other," next "making pretty," next "relaxing sounds.@" diff --git a/data/pokemon/dex_entries/bellsprout.asm b/data/pokemon/dex_entries/bellsprout.asm index fcd42c125..f279bbefb 100644 --- a/data/pokemon/dex_entries/bellsprout.asm +++ b/data/pokemon/dex_entries/bellsprout.asm @@ -1,10 +1,10 @@ -; BellsproutPokedexEntry: ; 0x1b81a1 db "FLOWER@" ; species name dw 204, 90 ; height, weight db "If it notices" next "anything that" next "moves, it" + page "immediately flings" next "its vine at the" next "object.@" diff --git a/data/pokemon/dex_entries/blastoise.asm b/data/pokemon/dex_entries/blastoise.asm index ea2a18d05..eeb7cf202 100644 --- a/data/pokemon/dex_entries/blastoise.asm +++ b/data/pokemon/dex_entries/blastoise.asm @@ -1,10 +1,10 @@ -; BlastoisePokedexEntry: ; 0x1819f9 db "SHELLFISH@" ; species name dw 503, 1890 ; height, weight db "It firmly plants" next "its feet on the" next "ground before" + page "shooting water" next "from the jets on" next "its back.@" diff --git a/data/pokemon/dex_entries/blissey.asm b/data/pokemon/dex_entries/blissey.asm index 10151a398..2496478b5 100644 --- a/data/pokemon/dex_entries/blissey.asm +++ b/data/pokemon/dex_entries/blissey.asm @@ -1,10 +1,10 @@ -; BlisseyPokedexEntry: ; 0x1d14f7 db "HAPPINESS@" ; species name dw 411, 1030 ; height, weight db "Biting into one" next "of the delicious" next "eggs that BLISSEY" + page "provides will make" next "everyone around" next "smile with joy.@" diff --git a/data/pokemon/dex_entries/bulbasaur.asm b/data/pokemon/dex_entries/bulbasaur.asm index fdfe39c8c..88fca15ec 100644 --- a/data/pokemon/dex_entries/bulbasaur.asm +++ b/data/pokemon/dex_entries/bulbasaur.asm @@ -1,10 +1,10 @@ -; BulbasaurPokedexEntry: ; 0x181695 db "SEED@" ; species name dw 204, 150 ; height, weight db "While it is young," next "it uses the" next "nutrients that are" + page "stored in the" next "seeds on its back" next "in order to grow.@" diff --git a/data/pokemon/dex_entries/butterfree.asm b/data/pokemon/dex_entries/butterfree.asm index edf9e2599..9661cce68 100644 --- a/data/pokemon/dex_entries/butterfree.asm +++ b/data/pokemon/dex_entries/butterfree.asm @@ -1,10 +1,10 @@ -; ButterfreePokedexEntry: ; 0x181b45 db "BUTTERFLY@" ; species name dw 307, 710 ; height, weight db "It flits from" next "flower to flower," next "collecting honey." + page "It can even" next "identify distant" next "flowers in bloom.@" diff --git a/data/pokemon/dex_entries/caterpie.asm b/data/pokemon/dex_entries/caterpie.asm index 940aa014f..2c5d74c8d 100644 --- a/data/pokemon/dex_entries/caterpie.asm +++ b/data/pokemon/dex_entries/caterpie.asm @@ -1,10 +1,10 @@ -; CaterpiePokedexEntry: ; 0x181a60 db "WORM@" ; species name dw 100, 60 ; height, weight db "It crawls into" next "foliage where it" next "camouflages itself" + page "among leaves that" next "are the same color" next "as its body.@" diff --git a/data/pokemon/dex_entries/celebi.asm b/data/pokemon/dex_entries/celebi.asm index 3922d1749..ae0bc0fc0 100644 --- a/data/pokemon/dex_entries/celebi.asm +++ b/data/pokemon/dex_entries/celebi.asm @@ -1,10 +1,10 @@ -; CelebiPokedexEntry: ; 0x1d18cc db "TIMETRAVEL@" ; species name dw 200, 110 ; height, weight db "Revered as a" next "guardian of the" next "forest, CELEBI" + page "appears wherever" next "beautiful forests" next "exist.@" diff --git a/data/pokemon/dex_entries/chansey.asm b/data/pokemon/dex_entries/chansey.asm index fd45cf121..2cc0b278b 100644 --- a/data/pokemon/dex_entries/chansey.asm +++ b/data/pokemon/dex_entries/chansey.asm @@ -1,10 +1,10 @@ -; ChanseyPokedexEntry: ; 0x1b942e db "EGG@" ; species name dw 307, 760 ; height, weight db "People try to" next "catch it for its" next "extremely" + page "nutritious eggs," next "but it rarely can" next "be found.@" diff --git a/data/pokemon/dex_entries/charizard.asm b/data/pokemon/dex_entries/charizard.asm index 53a542fb5..2bd55febe 100644 --- a/data/pokemon/dex_entries/charizard.asm +++ b/data/pokemon/dex_entries/charizard.asm @@ -1,10 +1,10 @@ -; CharizardPokedexEntry: ; 0x1818b3 db "FLAME@" ; species name dw 507, 2000 ; height, weight db "It uses its wings" next "to fly high. The" next "temperature of its" + page "fire increases as" next "it gains exper-" next "ience in battle.@" diff --git a/data/pokemon/dex_entries/charmander.asm b/data/pokemon/dex_entries/charmander.asm index a89b138f8..19ed15cbc 100644 --- a/data/pokemon/dex_entries/charmander.asm +++ b/data/pokemon/dex_entries/charmander.asm @@ -1,10 +1,10 @@ -; CharmanderPokedexEntry: ; 0x1817db db "LIZARD@" ; species name dw 200, 190 ; height, weight db "If it's healthy," next "the flame on the" next "tip of its tail" + page "will burn vigor-" next "ously, even if it" next "gets a bit wet.@" diff --git a/data/pokemon/dex_entries/charmeleon.asm b/data/pokemon/dex_entries/charmeleon.asm index 2891764c3..17868516d 100644 --- a/data/pokemon/dex_entries/charmeleon.asm +++ b/data/pokemon/dex_entries/charmeleon.asm @@ -1,10 +1,10 @@ -; CharmeleonPokedexEntry: ; 0x18184a db "FLAME@" ; species name dw 307, 420 ; height, weight db "If it becomes" next "agitated during" next "battle, it spouts" + page "intense flames," next "incinerating its" next "surroundings.@" diff --git a/data/pokemon/dex_entries/chikorita.asm b/data/pokemon/dex_entries/chikorita.asm index 3ba17e1f8..ecf5f8520 100644 --- a/data/pokemon/dex_entries/chikorita.asm +++ b/data/pokemon/dex_entries/chikorita.asm @@ -1,10 +1,10 @@ -; ChikoritaPokedexEntry: ; 0x1cc988 db "LEAF@" ; species name dw 211, 140 ; height, weight db "It loves to bask" next "in the sunlight." next "It uses the leaf" + page "on its head to" next "seek out warm" next "places.@" diff --git a/data/pokemon/dex_entries/chinchou.asm b/data/pokemon/dex_entries/chinchou.asm index 22d887859..6074d4995 100644 --- a/data/pokemon/dex_entries/chinchou.asm +++ b/data/pokemon/dex_entries/chinchou.asm @@ -1,10 +1,10 @@ -; ChinchouPokedexEntry: ; 0x1cd165 db "ANGLER@" ; species name dw 108, 260 ; height, weight db "Its antennae, whi-" next "ch evolved from a" next "fin, have both po-" + page "sitive and neg-" next "ative charges flo-" next "wing through them.@" diff --git a/data/pokemon/dex_entries/clefable.asm b/data/pokemon/dex_entries/clefable.asm index 240d70eb5..3ea166487 100644 --- a/data/pokemon/dex_entries/clefable.asm +++ b/data/pokemon/dex_entries/clefable.asm @@ -1,10 +1,10 @@ -; ClefablePokedexEntry: ; 0x182530 db "FAIRY@" ; species name dw 403, 880 ; height, weight db "Said to live in" next "quiet, remote" next "mountains, this" + page "type of fairy has" next "a strong aversion" next "to being seen.@" diff --git a/data/pokemon/dex_entries/clefairy.asm b/data/pokemon/dex_entries/clefairy.asm index b5973b21a..ff26e3e4a 100644 --- a/data/pokemon/dex_entries/clefairy.asm +++ b/data/pokemon/dex_entries/clefairy.asm @@ -1,10 +1,10 @@ -; ClefairyPokedexEntry: ; 0x1824c8 db "FAIRY@" ; species name dw 200, 170 ; height, weight db "Though rarely" next "seen, it becomes" next "easier to spot," + page "for some reason," next "on the night of a " next "full moon.@" diff --git a/data/pokemon/dex_entries/cleffa.asm b/data/pokemon/dex_entries/cleffa.asm index 897bb2501..9095f990f 100644 --- a/data/pokemon/dex_entries/cleffa.asm +++ b/data/pokemon/dex_entries/cleffa.asm @@ -1,10 +1,10 @@ -; CleffaPokedexEntry: ; 0x1cd2bc db "STARSHAPE@" ; species name dw 100, 70 ; height, weight db "If the impact site" next "of a meteorite is" next "found, this" + page "#MON is certain" next "to be within the" next "immediate area.@" diff --git a/data/pokemon/dex_entries/cloyster.asm b/data/pokemon/dex_entries/cloyster.asm index b1eaf80b9..7a887838d 100644 --- a/data/pokemon/dex_entries/cloyster.asm +++ b/data/pokemon/dex_entries/cloyster.asm @@ -1,10 +1,10 @@ -; CloysterPokedexEntry: ; 0x1b8ad9 db "BIVALVE@" ; species name dw 411, 2920 ; height, weight db "Even a missile" next "can't break the" next "spikes it uses to" + page "stab opponents." next "They're even hard-" next "er than its shell.@" diff --git a/data/pokemon/dex_entries/corsola.asm b/data/pokemon/dex_entries/corsola.asm index 52fbd0c44..fa073f0d0 100644 --- a/data/pokemon/dex_entries/corsola.asm +++ b/data/pokemon/dex_entries/corsola.asm @@ -1,10 +1,10 @@ -; CorsolaPokedexEntry: ; 0x1d0c68 db "CORAL@" ; species name dw 200, 110 ; height, weight db "The points on its" next "head absorb" next "nutrients from" + page "clean water. They" next "cannot survive in" next "polluted water.@" diff --git a/data/pokemon/dex_entries/crobat.asm b/data/pokemon/dex_entries/crobat.asm index 107683110..2b7e28f76 100644 --- a/data/pokemon/dex_entries/crobat.asm +++ b/data/pokemon/dex_entries/crobat.asm @@ -1,10 +1,10 @@ -; CrobatPokedexEntry: ; 0x1cd0f5 db "BAT@" ; species name dw 511, 1650 ; height, weight db "As a result of its" next "pursuit of faster," next "yet more silent" + page "flight, a new set" next "of wings grew on" next "its hind legs.@" diff --git a/data/pokemon/dex_entries/croconaw.asm b/data/pokemon/dex_entries/croconaw.asm index 0edcf80cc..0cde70653 100644 --- a/data/pokemon/dex_entries/croconaw.asm +++ b/data/pokemon/dex_entries/croconaw.asm @@ -1,10 +1,10 @@ -; CroconawPokedexEntry: ; 0x1ccc84 db "BIG JAW@" ; species name dw 307, 550 ; height, weight db "The tips of its" next "fangs are slanted" next "backward. Once" + page "those fangs clamp" next "down, the prey has" next "no hope of escape.@" diff --git a/data/pokemon/dex_entries/cubone.asm b/data/pokemon/dex_entries/cubone.asm index 911377864..6c8bed214 100644 --- a/data/pokemon/dex_entries/cubone.asm +++ b/data/pokemon/dex_entries/cubone.asm @@ -1,10 +1,10 @@ -; CubonePokedexEntry: ; 0x1b9068 db "LONELY@" ; species name dw 104, 140 ; height, weight db "It lost its mother" next "after its birth." next "It wears its" + page "mother's skull," next "never revealing" next "its true face.@" diff --git a/data/pokemon/dex_entries/cyndaquil.asm b/data/pokemon/dex_entries/cyndaquil.asm index 47329d37f..2604f4879 100644 --- a/data/pokemon/dex_entries/cyndaquil.asm +++ b/data/pokemon/dex_entries/cyndaquil.asm @@ -1,10 +1,10 @@ -; CyndaquilPokedexEntry: ; 0x1ccabd db "FIRE MOUSE@" ; species name dw 108, 170 ; height, weight db "The fire that" next "spouts from its" next "back burns hottest" + page "when it is angry." next "The flaring flames" next "intimidate foes.@" diff --git a/data/pokemon/dex_entries/delibird.asm b/data/pokemon/dex_entries/delibird.asm index 2c998d8be..47f8e2c90 100644 --- a/data/pokemon/dex_entries/delibird.asm +++ b/data/pokemon/dex_entries/delibird.asm @@ -1,10 +1,10 @@ -; DelibirdPokedexEntry: ; 0x1d0db1 db "DELIVERY@" ; species name dw 211, 350 ; height, weight db "It always carries" next "its food with it," next "wherever it goes." + page "If attacked, it" next "throws its food at" next "the opponent.@" diff --git a/data/pokemon/dex_entries/dewgong.asm b/data/pokemon/dex_entries/dewgong.asm index a3ff9b6f5..a7a0bf13e 100644 --- a/data/pokemon/dex_entries/dewgong.asm +++ b/data/pokemon/dex_entries/dewgong.asm @@ -1,10 +1,10 @@ -; DewgongPokedexEntry: ; 0x1b8934 db "SEA LION@" ; species name dw 507, 2650 ; height, weight db "It sleeps under" next "shallow ocean" next "waters during the" + page "day, then looks" next "for food at night" next "when it's cold.@" diff --git a/data/pokemon/dex_entries/diglett.asm b/data/pokemon/dex_entries/diglett.asm index 469d9311d..c2b6c4671 100644 --- a/data/pokemon/dex_entries/diglett.asm +++ b/data/pokemon/dex_entries/diglett.asm @@ -1,10 +1,10 @@ -; DiglettPokedexEntry: ; 0x182b30 db "MOLE@" ; species name dw 8, 20 ; height, weight db "It digs under-" next "ground and chews" next "on tree roots," + page "sticking its head" next "out only when the" next "sun isn't bright.@" diff --git a/data/pokemon/dex_entries/ditto.asm b/data/pokemon/dex_entries/ditto.asm index 5a838b5b8..ffe394a1b 100644 --- a/data/pokemon/dex_entries/ditto.asm +++ b/data/pokemon/dex_entries/ditto.asm @@ -1,10 +1,10 @@ -; DittoPokedexEntry: ; 0x1cc13c db "TRANSFORM@" ; species name dw 100, 90 ; height, weight db "When it encount-" next "ers another DITTO," next "it will move" + page "faster than normal" next "to duplicate that" next "opponent exactly.@" diff --git a/data/pokemon/dex_entries/dodrio.asm b/data/pokemon/dex_entries/dodrio.asm index ef495b99b..767fd9abe 100644 --- a/data/pokemon/dex_entries/dodrio.asm +++ b/data/pokemon/dex_entries/dodrio.asm @@ -1,10 +1,10 @@ -; DodrioPokedexEntry: ; 0x1b884a db "TRIPLEBIRD@" ; species name dw 511, 1880 ; height, weight db "An enemy that" next "takes its eyes off" next "any of the three" + page "heads--even for a" next "second--will get" next "pecked severely.@" diff --git a/data/pokemon/dex_entries/doduo.asm b/data/pokemon/dex_entries/doduo.asm index 124469457..eba65000d 100644 --- a/data/pokemon/dex_entries/doduo.asm +++ b/data/pokemon/dex_entries/doduo.asm @@ -1,10 +1,10 @@ -; DoduoPokedexEntry: ; 0x1b87d7 db "TWIN BIRD@" ; species name dw 407, 860 ; height, weight db "It lives on a" next "grassy plain where" next "it can see a long" + page "way. If it sees an" next "enemy, it runs" next "away at 60 mph.@" diff --git a/data/pokemon/dex_entries/donphan.asm b/data/pokemon/dex_entries/donphan.asm index 4dc489938..eac9c5467 100644 --- a/data/pokemon/dex_entries/donphan.asm +++ b/data/pokemon/dex_entries/donphan.asm @@ -1,10 +1,10 @@ -; DonphanPokedexEntry: ; 0x1d10ac db "ARMOR@" ; species name dw 307, 2650 ; height, weight db "Because this" next "#MON's skin is" next "so tough, a normal" + page "attack won't even" next "leave a scratch on" next "it.@" diff --git a/data/pokemon/dex_entries/dragonair.asm b/data/pokemon/dex_entries/dragonair.asm index cef4f8f29..915db2c21 100644 --- a/data/pokemon/dex_entries/dragonair.asm +++ b/data/pokemon/dex_entries/dragonair.asm @@ -1,10 +1,10 @@ -; DragonairPokedexEntry: ; 0x1cc7dc db "DRAGON@" ; species name dw 1301, 360 ; height, weight db "It is called the" next "divine #MON." next "When its entire" + page "body brightens" next "slightly, the" next "weather changes.@" diff --git a/data/pokemon/dex_entries/dragonite.asm b/data/pokemon/dex_entries/dragonite.asm index bbbc6cff0..9db1bf54b 100644 --- a/data/pokemon/dex_entries/dragonite.asm +++ b/data/pokemon/dex_entries/dragonite.asm @@ -1,10 +1,10 @@ -; DragonitePokedexEntry: ; 0x1cc843 db "DRAGON@" ; species name dw 703, 4630 ; height, weight db "It is said that" next "somewhere in the" next "ocean lies an" + page "island where these" next "gather. Only they" next "live there.@" diff --git a/data/pokemon/dex_entries/dratini.asm b/data/pokemon/dex_entries/dratini.asm index ef16aa20c..baa12940e 100644 --- a/data/pokemon/dex_entries/dratini.asm +++ b/data/pokemon/dex_entries/dratini.asm @@ -1,10 +1,10 @@ -; DratiniPokedexEntry: ; 0x1cc761 db "DRAGON@" ; species name dw 511, 70 ; height, weight db "It sheds many lay-" next "ers of skin as it" next "grows larger. Dur-" + page "ing this process," next "it is protected by" next "a rapid waterfall.@" diff --git a/data/pokemon/dex_entries/drowzee.asm b/data/pokemon/dex_entries/drowzee.asm index 34ae54435..fe6f14ba7 100644 --- a/data/pokemon/dex_entries/drowzee.asm +++ b/data/pokemon/dex_entries/drowzee.asm @@ -1,10 +1,10 @@ -; DrowzeePokedexEntry: ; 0x1b8d0a db "HYPNOSIS@" ; species name dw 303, 710 ; height, weight db "When it twitches" next "its nose, it can" next "tell where someone" + page "is sleeping and" next "what that person" next "is dreaming about.@" diff --git a/data/pokemon/dex_entries/dugtrio.asm b/data/pokemon/dex_entries/dugtrio.asm index 829e2aa09..a12c2984d 100644 --- a/data/pokemon/dex_entries/dugtrio.asm +++ b/data/pokemon/dex_entries/dugtrio.asm @@ -1,10 +1,10 @@ -; DugtrioPokedexEntry: ; 0x182b9d db "MOLE@" ; species name dw 204, 730 ; height, weight db "These DIGLETT" next "triplets dig over" next "60 miles below sea" + page "level. No one" next "knows what it's" next "like underground.@" diff --git a/data/pokemon/dex_entries/dunsparce.asm b/data/pokemon/dex_entries/dunsparce.asm index 7a9d812f3..5391438c1 100644 --- a/data/pokemon/dex_entries/dunsparce.asm +++ b/data/pokemon/dex_entries/dunsparce.asm @@ -1,10 +1,10 @@ -; DunsparcePokedexEntry: ; 0x1d0593 db "LAND SNAKE@" ; species name dw 411, 310 ; height, weight db "It hides deep" next "inside caves where" next "no light ever" + page "reaches it and" next "remains virtually" next "motionless there.@" diff --git a/data/pokemon/dex_entries/eevee.asm b/data/pokemon/dex_entries/eevee.asm index 3081a5829..91a3d70bc 100644 --- a/data/pokemon/dex_entries/eevee.asm +++ b/data/pokemon/dex_entries/eevee.asm @@ -1,10 +1,10 @@ -; EeveePokedexEntry: ; 0x1cc1b2 db "EVOLUTION@" ; species name dw 100, 140 ; height, weight db "Its ability to" next "evolve into many" next "forms allows it to" + page "adapt smoothly" next "and perfectly to" next "any environment.@" diff --git a/data/pokemon/dex_entries/ekans.asm b/data/pokemon/dex_entries/ekans.asm index 23faa4854..bb2fe9594 100644 --- a/data/pokemon/dex_entries/ekans.asm +++ b/data/pokemon/dex_entries/ekans.asm @@ -1,10 +1,10 @@ -; EkansPokedexEntry: ; 0x181fd4 db "SNAKE@" ; species name dw 607, 150 ; height, weight db "It flutters the" next "tip of its tongue" next "to seek out the" + page "scent of prey," next "then swallows the" next "prey whole.@" diff --git a/data/pokemon/dex_entries/electabuzz.asm b/data/pokemon/dex_entries/electabuzz.asm index e6bf15587..0eddf3416 100644 --- a/data/pokemon/dex_entries/electabuzz.asm +++ b/data/pokemon/dex_entries/electabuzz.asm @@ -1,10 +1,10 @@ -; ElectabuzzPokedexEntry: ; 0x1b992a db "ELECTRIC@" ; species name dw 307, 660 ; height, weight db "When two" next "ELECTABUZZ touch," next "they control the" + page "electric currents" next "to communicate" next "their feelings.@" diff --git a/data/pokemon/dex_entries/electrode.asm b/data/pokemon/dex_entries/electrode.asm index 48d523c69..2e6378d41 100644 --- a/data/pokemon/dex_entries/electrode.asm +++ b/data/pokemon/dex_entries/electrode.asm @@ -1,10 +1,10 @@ -; ElectrodePokedexEntry: ; 0x1b8f19 db "BALL@" ; species name dw 311, 1470 ; height, weight db "The more energy it" next "charges up, the" next "faster it gets." + page "But this also" next "makes it more" next "likely to explode.@" diff --git a/data/pokemon/dex_entries/elekid.asm b/data/pokemon/dex_entries/elekid.asm index 6a046bda4..a84d24dc0 100644 --- a/data/pokemon/dex_entries/elekid.asm +++ b/data/pokemon/dex_entries/elekid.asm @@ -1,10 +1,10 @@ -; ElekidPokedexEntry: ; 0x1d1398 db "ELECTRIC@" ; species name dw 200, 520 ; height, weight db "It loves violent" next "thunder. The space" next "between its horns" + page "flickers bluish-" next "white when it is" next "charging energy.@" diff --git a/data/pokemon/dex_entries/entei.asm b/data/pokemon/dex_entries/entei.asm index 3784a898c..355bd4ae6 100644 --- a/data/pokemon/dex_entries/entei.asm +++ b/data/pokemon/dex_entries/entei.asm @@ -1,10 +1,10 @@ -; EnteiPokedexEntry: ; 0x1d15dd db "VOLCANO@" ; species name dw 607, 4370 ; height, weight db "This brawny" next "#MON courses" next "around the earth," + page "spouting flames" next "hotter than a" next "volcano's magma.@" diff --git a/data/pokemon/dex_entries/espeon.asm b/data/pokemon/dex_entries/espeon.asm index 059b01fbe..93bde0d8c 100644 --- a/data/pokemon/dex_entries/espeon.asm +++ b/data/pokemon/dex_entries/espeon.asm @@ -1,10 +1,10 @@ -; EspeonPokedexEntry: ; 0x1d0155 db "SUN@" ; species name dw 211, 580 ; height, weight db "The tip of its" next "forked tail" next "quivers when it is" + page "predicting its" next "opponent's next" next "move.@" diff --git a/data/pokemon/dex_entries/exeggcute.asm b/data/pokemon/dex_entries/exeggcute.asm index 01453955e..27360dc05 100644 --- a/data/pokemon/dex_entries/exeggcute.asm +++ b/data/pokemon/dex_entries/exeggcute.asm @@ -1,10 +1,10 @@ -; ExeggcutePokedexEntry: ; 0x1b8f84 db "EGG@" ; species name dw 104, 60 ; height, weight db "If even one is" next "separated from the" next "group, the energy" + page "bond between the" next "six will make them" next "rejoin instantly.@" diff --git a/data/pokemon/dex_entries/exeggutor.asm b/data/pokemon/dex_entries/exeggutor.asm index abefffd69..31ba01ae4 100644 --- a/data/pokemon/dex_entries/exeggutor.asm +++ b/data/pokemon/dex_entries/exeggutor.asm @@ -1,10 +1,10 @@ -; ExeggutorPokedexEntry: ; 0x1b8ff6 db "COCONUT@" ; species name dw 607, 2650 ; height, weight db "Living in a good" next "environment makes" next "it grow lots of" + page "heads. A head that" next "drops off becomes" next "an EXEGGCUTE.@" diff --git a/data/pokemon/dex_entries/farfetch_d.asm b/data/pokemon/dex_entries/farfetch_d.asm index c9e756a6a..b5bd3bc98 100644 --- a/data/pokemon/dex_entries/farfetch_d.asm +++ b/data/pokemon/dex_entries/farfetch_d.asm @@ -1,10 +1,10 @@ -; FarfetchDPokedexEntry: ; 0x1b876c db "WILD DUCK@" ; species name dw 207, 330 ; height, weight db "In order to pre-" next "vent their" next "extinction, more" + page "people have made" next "an effort to breed" next "these #MON.@" diff --git a/data/pokemon/dex_entries/fearow.asm b/data/pokemon/dex_entries/fearow.asm index 90de6a612..b91c66ed1 100644 --- a/data/pokemon/dex_entries/fearow.asm +++ b/data/pokemon/dex_entries/fearow.asm @@ -1,10 +1,10 @@ -; FearowPokedexEntry: ; 0x181f64 db "BEAK@" ; species name dw 311, 840 ; height, weight db "It uses its long" next "beak to attack. It" next "has a surprisingly" + page "long reach, so it" next "must be treated" next "with caution.@" diff --git a/data/pokemon/dex_entries/feraligatr.asm b/data/pokemon/dex_entries/feraligatr.asm index cb3672c92..3c411fe48 100644 --- a/data/pokemon/dex_entries/feraligatr.asm +++ b/data/pokemon/dex_entries/feraligatr.asm @@ -1,10 +1,10 @@ -; FeraligatrPokedexEntry: ; 0x1cccf9 db "BIG JAW@" ; species name dw 707, 1960 ; height, weight db "Although it has a" next "massive body, its" next "powerful hind legs" + page "enable it to move" next "quickly, even on" next "the ground.@" diff --git a/data/pokemon/dex_entries/flaaffy.asm b/data/pokemon/dex_entries/flaaffy.asm index 04bcc0668..d408a4706 100644 --- a/data/pokemon/dex_entries/flaaffy.asm +++ b/data/pokemon/dex_entries/flaaffy.asm @@ -1,10 +1,10 @@ -; FlaaffyPokedexEntry: ; 0x1cd5b8 db "WOOL@" ; species name dw 207, 290 ; height, weight db "Because of its" next "rubbery, electric-" next "ity-resistant" + page "skin, it can store" next "lots of electric-" next "ity in its fur.@" diff --git a/data/pokemon/dex_entries/flareon.asm b/data/pokemon/dex_entries/flareon.asm index ba3e0399d..fbab999c4 100644 --- a/data/pokemon/dex_entries/flareon.asm +++ b/data/pokemon/dex_entries/flareon.asm @@ -1,10 +1,10 @@ -; FlareonPokedexEntry: ; 0x1cc2ec db "FLAME@" ; species name dw 211, 550 ; height, weight db "Once it has stored" next "up enough heat," next "this #MON's" + page "body temperature" next "can reach up to" next "1700 degrees.@" diff --git a/data/pokemon/dex_entries/forretress.asm b/data/pokemon/dex_entries/forretress.asm index 8644b4b39..6815f6d31 100644 --- a/data/pokemon/dex_entries/forretress.asm +++ b/data/pokemon/dex_entries/forretress.asm @@ -1,10 +1,10 @@ -; ForretressPokedexEntry: ; 0x1d0524 db "BAGWORM@" ; species name dw 311, 2770 ; height, weight db "Usually found" next "hanging on to a" next "fat tree trunk. It" + page "shoots out bits of" next "its shell when it" next "sees action.@" diff --git a/data/pokemon/dex_entries/furret.asm b/data/pokemon/dex_entries/furret.asm index 653a3dead..b9ec74d2d 100644 --- a/data/pokemon/dex_entries/furret.asm +++ b/data/pokemon/dex_entries/furret.asm @@ -1,10 +1,10 @@ -; FurretPokedexEntry: ; 0x1ccddd db "LONG BODY@" ; species name dw 511, 720 ; height, weight db "It lives in narrow" next "burrows that fit" next "its slim body. The" + page "deeper the nests" next "go, the more maze-" next "like they become.@" diff --git a/data/pokemon/dex_entries/gastly.asm b/data/pokemon/dex_entries/gastly.asm index db7f6d57d..5f5420e02 100644 --- a/data/pokemon/dex_entries/gastly.asm +++ b/data/pokemon/dex_entries/gastly.asm @@ -1,10 +1,10 @@ -; GastlyPokedexEntry: ; 0x1b8b4a db "GAS@" ; species name dw 403, 2 ; height, weight db "It wraps its op-" next "ponent in its gas-" next "like body, slowly" + page "weakening its prey" next "by poisoning it" next "through the skin.@" diff --git a/data/pokemon/dex_entries/gengar.asm b/data/pokemon/dex_entries/gengar.asm index e9650fb39..ac85e88f4 100644 --- a/data/pokemon/dex_entries/gengar.asm +++ b/data/pokemon/dex_entries/gengar.asm @@ -1,10 +1,10 @@ -; GengarPokedexEntry: ; 0x1b8c25 db "SHADOW@" ; species name dw 411, 890 ; height, weight db "Hiding in people's" next "shadows at night," next "it absorbs their" + page "heat. The chill it" next "causes makes the" next "victims shake.@" diff --git a/data/pokemon/dex_entries/geodude.asm b/data/pokemon/dex_entries/geodude.asm index 389ce042a..ea3c8b79e 100644 --- a/data/pokemon/dex_entries/geodude.asm +++ b/data/pokemon/dex_entries/geodude.asm @@ -1,10 +1,10 @@ -; GeodudePokedexEntry: ; 0x1b83a1 db "ROCK@" ; species name dw 104, 440 ; height, weight db "Proud of their" next "sturdy bodies," next "they bash against" + page "each other in a" next "contest to prove" next "whose is harder.@" diff --git a/data/pokemon/dex_entries/girafarig.asm b/data/pokemon/dex_entries/girafarig.asm index 527aa9807..caeb13dd7 100644 --- a/data/pokemon/dex_entries/girafarig.asm +++ b/data/pokemon/dex_entries/girafarig.asm @@ -1,10 +1,10 @@ -; GirafarigPokedexEntry: ; 0x1d0446 db "LONG NECK@" ; species name dw 411, 910 ; height, weight db "When it is in" next "danger, its tail" next "uses some sort of" + page "mysterious powers" next "to drive away the" next "enemy.@" diff --git a/data/pokemon/dex_entries/gligar.asm b/data/pokemon/dex_entries/gligar.asm index 43c4c95ce..32ac0a5f5 100644 --- a/data/pokemon/dex_entries/gligar.asm +++ b/data/pokemon/dex_entries/gligar.asm @@ -1,10 +1,10 @@ -; GligarPokedexEntry: ; 0x1d0604 db "FLYSCORPIO@" ; species name dw 307, 1430 ; height, weight db "It builds its nest" next "on a steep cliff." next "When it is done" + page "gliding, it hops" next "along the ground" next "back to its nest.@" diff --git a/data/pokemon/dex_entries/gloom.asm b/data/pokemon/dex_entries/gloom.asm index 0552a8d0c..6b2e4e534 100644 --- a/data/pokemon/dex_entries/gloom.asm +++ b/data/pokemon/dex_entries/gloom.asm @@ -1,10 +1,10 @@ -; GloomPokedexEntry: ; 0x1828a6 db "WEED@" ; species name dw 207, 190 ; height, weight db "The smell from its" next "drool-like syrup" next "and the pollen on" + page "its petals is so" next "bad, it may make" next "opponents faint.@" diff --git a/data/pokemon/dex_entries/golbat.asm b/data/pokemon/dex_entries/golbat.asm index 434108bf4..d59b9408c 100644 --- a/data/pokemon/dex_entries/golbat.asm +++ b/data/pokemon/dex_entries/golbat.asm @@ -1,10 +1,10 @@ -; GolbatPokedexEntry: ; 0x1827c4 db "BAT@" ; species name dw 503, 1210 ; height, weight db "When it plunges" next "its fangs into its" next "prey, it instantly" + page "draws and gulps" next "down more than ten" next "ounces of blood.@" diff --git a/data/pokemon/dex_entries/goldeen.asm b/data/pokemon/dex_entries/goldeen.asm index 101edf434..075a9b5a2 100644 --- a/data/pokemon/dex_entries/goldeen.asm +++ b/data/pokemon/dex_entries/goldeen.asm @@ -1,10 +1,10 @@ -; GoldeenPokedexEntry: ; 0x1b9626 db "GOLDFISH@" ; species name dw 200, 330 ; height, weight db "During spawning" next "season, they swim" next "gracefully in the" + page "water, searching" next "for their perfect" next "mate.@" diff --git a/data/pokemon/dex_entries/golduck.asm b/data/pokemon/dex_entries/golduck.asm index b38cfd2dc..921e4ddb0 100644 --- a/data/pokemon/dex_entries/golduck.asm +++ b/data/pokemon/dex_entries/golduck.asm @@ -1,10 +1,10 @@ -; GolduckPokedexEntry: ; 0x182d55 db "DUCK@" ; species name dw 507, 1690 ; height, weight db "It swims grace-" next "fully along on the" next "quiet, slow-moving" + page "rivers and lakes" next "of which it is so" next "fond.@" diff --git a/data/pokemon/dex_entries/golem.asm b/data/pokemon/dex_entries/golem.asm index dbb5a8e3d..7d5e9af49 100644 --- a/data/pokemon/dex_entries/golem.asm +++ b/data/pokemon/dex_entries/golem.asm @@ -1,10 +1,10 @@ -; GolemPokedexEntry: ; 0x1b8481 db "MEGATON@" ; species name dw 407, 6620 ; height, weight db "Its rock-like body" next "is so durable," next "even high-powered" + page "dynamite blasts" next "fail to scratch" next "its rugged hide.@" diff --git a/data/pokemon/dex_entries/granbull.asm b/data/pokemon/dex_entries/granbull.asm index 15f3e194c..de6460d8d 100644 --- a/data/pokemon/dex_entries/granbull.asm +++ b/data/pokemon/dex_entries/granbull.asm @@ -1,10 +1,10 @@ -; GranbullPokedexEntry: ; 0x1d074a db "FAIRY@" ; species name dw 407, 1070 ; height, weight db "It can make most" next "any #MON run" next "away simply by" + page "opening its mouth" next "wide to reveal its" next "big fangs.@" diff --git a/data/pokemon/dex_entries/graveler.asm b/data/pokemon/dex_entries/graveler.asm index 3bf04148c..26b9db795 100644 --- a/data/pokemon/dex_entries/graveler.asm +++ b/data/pokemon/dex_entries/graveler.asm @@ -1,10 +1,10 @@ -; GravelerPokedexEntry: ; 0x1b840c db "ROCK@" ; species name dw 303, 2320 ; height, weight db "It travels by rol-" next "ling on mountain" next "paths. If it gains" + page "too much speed, it" next "stops by running" next "into huge rocks.@" diff --git a/data/pokemon/dex_entries/grimer.asm b/data/pokemon/dex_entries/grimer.asm index bda09cf94..ed76b6249 100644 --- a/data/pokemon/dex_entries/grimer.asm +++ b/data/pokemon/dex_entries/grimer.asm @@ -1,10 +1,10 @@ -; GrimerPokedexEntry: ; 0x1b89a2 db "SLUDGE@" ; species name dw 211, 660 ; height, weight db "When two of these" next "#MON's bodies" next "are combined" + page "together, new" next "poisons are" next "created.@" diff --git a/data/pokemon/dex_entries/growlithe.asm b/data/pokemon/dex_entries/growlithe.asm index cd261d886..af5610cda 100644 --- a/data/pokemon/dex_entries/growlithe.asm +++ b/data/pokemon/dex_entries/growlithe.asm @@ -1,10 +1,10 @@ -; GrowlithePokedexEntry: ; 0x182eaa db "PUPPY@" ; species name dw 204, 420 ; height, weight db "It controls a big" next "territory. If it" next "detects an unknown" + page "smell, it roars" next "loudly to force" next "out the intruder.@" diff --git a/data/pokemon/dex_entries/gyarados.asm b/data/pokemon/dex_entries/gyarados.asm index 767380680..3f3235679 100644 --- a/data/pokemon/dex_entries/gyarados.asm +++ b/data/pokemon/dex_entries/gyarados.asm @@ -1,10 +1,10 @@ -; GyaradosPokedexEntry: ; 0x1cc065 db "ATROCIOUS@" ; species name dw 2104, 5180 ; height, weight db "It appears when-" next "ever there is" next "world conflict," + page "burning down any" next "place it travels" next "through.@" diff --git a/data/pokemon/dex_entries/haunter.asm b/data/pokemon/dex_entries/haunter.asm index 6efe4b15c..b03c0996f 100644 --- a/data/pokemon/dex_entries/haunter.asm +++ b/data/pokemon/dex_entries/haunter.asm @@ -1,10 +1,10 @@ -; HaunterPokedexEntry: ; 0x1b8bbd db "GAS@" ; species name dw 503, 2 ; height, weight db "It hides in the" next "dark, planning to" next "take the life of" + page "the next living" next "thing that wanders" next "close by.@" diff --git a/data/pokemon/dex_entries/heracross.asm b/data/pokemon/dex_entries/heracross.asm index ed709b526..25d1e28a6 100644 --- a/data/pokemon/dex_entries/heracross.asm +++ b/data/pokemon/dex_entries/heracross.asm @@ -1,10 +1,10 @@ -; HeracrossPokedexEntry: ; 0x1d0907 db "SINGLEHORN@" ; species name dw 411, 1190 ; height, weight db "With its Herculean" next "powers, it can" next "easily throw arou-" + page "nd an object that" next "is 100 times its" next "own weight.@" diff --git a/data/pokemon/dex_entries/hitmonchan.asm b/data/pokemon/dex_entries/hitmonchan.asm index e5686b1a5..8b2f97823 100644 --- a/data/pokemon/dex_entries/hitmonchan.asm +++ b/data/pokemon/dex_entries/hitmonchan.asm @@ -1,10 +1,10 @@ -; HitmonchanPokedexEntry: ; 0x1b91a4 db "PUNCHING@" ; species name dw 407, 1110 ; height, weight db "To increase the" next "strength of all" next "its punch moves," + page "it spins its arms" next "just before making" next "contact.@" diff --git a/data/pokemon/dex_entries/hitmonlee.asm b/data/pokemon/dex_entries/hitmonlee.asm index 0215d3bdc..0df1bf2a9 100644 --- a/data/pokemon/dex_entries/hitmonlee.asm +++ b/data/pokemon/dex_entries/hitmonlee.asm @@ -1,10 +1,10 @@ -; HitmonleePokedexEntry: ; 0x1b913f db "KICKING@" ; species name dw 411, 1100 ; height, weight db "It is also called" next "the Kick Master." next "It uses its" + page "elastic legs to" next "execute every" next "known kick.@" diff --git a/data/pokemon/dex_entries/hitmontop.asm b/data/pokemon/dex_entries/hitmontop.asm index 14175ec8a..609ccb48a 100644 --- a/data/pokemon/dex_entries/hitmontop.asm +++ b/data/pokemon/dex_entries/hitmontop.asm @@ -1,10 +1,10 @@ -; HitmontopPokedexEntry: ; 0x1d12c0 db "HANDSTAND@" ; species name dw 407, 1060 ; height, weight db "After doing a" next "handstand to" next "throw off the" + page "opponent's timing," next "it presents its" next "fancy kick moves.@" diff --git a/data/pokemon/dex_entries/ho_oh.asm b/data/pokemon/dex_entries/ho_oh.asm index 1d74cd058..2bc0abcf0 100644 --- a/data/pokemon/dex_entries/ho_oh.asm +++ b/data/pokemon/dex_entries/ho_oh.asm @@ -1,10 +1,10 @@ -; HoOhPokedexEntry: ; 0x1d185d db "RAINBOW@" ; species name dw 1206, 4390 ; height, weight db "It will reveal" next "itself before a" next "pure-hearted" + page "trainer by shining" next "its bright rain-" next "bow-colored wings.@" diff --git a/data/pokemon/dex_entries/hoothoot.asm b/data/pokemon/dex_entries/hoothoot.asm index 88039eea8..1df540fe6 100644 --- a/data/pokemon/dex_entries/hoothoot.asm +++ b/data/pokemon/dex_entries/hoothoot.asm @@ -1,10 +1,10 @@ -; HoothootPokedexEntry: ; 0x1cce58 db "OWL@" ; species name dw 204, 470 ; height, weight db "It begins to hoot" next "at the same time" next "every day. Some" + page "trainers use them" next "in place of" next "clocks.@" diff --git a/data/pokemon/dex_entries/hoppip.asm b/data/pokemon/dex_entries/hoppip.asm index 734ddc766..3e97be0e2 100644 --- a/data/pokemon/dex_entries/hoppip.asm +++ b/data/pokemon/dex_entries/hoppip.asm @@ -1,10 +1,10 @@ -; HoppipPokedexEntry: ; 0x1cd8b5 db "COTTONWEED@" ; species name dw 104, 10 ; height, weight db "It can be carried" next "away on even the" next "gentlest breeze." + page "It may even float" next "all the way to the" next "next town.@" diff --git a/data/pokemon/dex_entries/horsea.asm b/data/pokemon/dex_entries/horsea.asm index dd50057e7..53f6ec71d 100644 --- a/data/pokemon/dex_entries/horsea.asm +++ b/data/pokemon/dex_entries/horsea.asm @@ -1,10 +1,10 @@ -; HorseaPokedexEntry: ; 0x1b9553 db "DRAGON@" ; species name dw 104, 180 ; height, weight db "When they're in a" next "safe location," next "they can be seen" + page "playfully tangling" next "their tails" next "together.@" diff --git a/data/pokemon/dex_entries/houndoom.asm b/data/pokemon/dex_entries/houndoom.asm index 6a21602f3..a3b8f9cb8 100644 --- a/data/pokemon/dex_entries/houndoom.asm +++ b/data/pokemon/dex_entries/houndoom.asm @@ -1,10 +1,10 @@ -; HoundoomPokedexEntry: ; 0x1d0f66 db "DARK@" ; species name dw 407, 770 ; height, weight db "The pungent-" next "smelling flame" next "that shoots from" + page "its mouth results" next "from toxins burn-" next "ing in its body.@" diff --git a/data/pokemon/dex_entries/houndour.asm b/data/pokemon/dex_entries/houndour.asm index 5fa89fe85..ba89b90d2 100644 --- a/data/pokemon/dex_entries/houndour.asm +++ b/data/pokemon/dex_entries/houndour.asm @@ -1,10 +1,10 @@ -; HoundourPokedexEntry: ; 0x1d0eff db "DARK@" ; species name dw 200, 240 ; height, weight db "Around dawn, its" next "ominous howl" next "echoes through the" + page "area to announce" next "that this is its" next "territory.@" diff --git a/data/pokemon/dex_entries/hypno.asm b/data/pokemon/dex_entries/hypno.asm index 2309a6bfa..cfdd29896 100644 --- a/data/pokemon/dex_entries/hypno.asm +++ b/data/pokemon/dex_entries/hypno.asm @@ -1,10 +1,10 @@ -; HypnoPokedexEntry: ; 0x1b8d80 db "HYPNOSIS@" ; species name dw 503, 1670 ; height, weight db "The longer it" next "swings its" next "pendulum, the" + page "longer the effects" next "of its hypnosis" next "last.@" diff --git a/data/pokemon/dex_entries/igglybuff.asm b/data/pokemon/dex_entries/igglybuff.asm index aa1c1cabf..27d5a8040 100644 --- a/data/pokemon/dex_entries/igglybuff.asm +++ b/data/pokemon/dex_entries/igglybuff.asm @@ -1,10 +1,10 @@ -; IgglybuffPokedexEntry: ; 0x1cd32c db "BALLOON@" ; species name dw 100, 20 ; height, weight db "Instead of walking" next "with its short" next "legs, it moves" + page "around by bouncing" next "on its soft," next "tender body.@" diff --git a/data/pokemon/dex_entries/ivysaur.asm b/data/pokemon/dex_entries/ivysaur.asm index 66d16d323..91a672c9e 100644 --- a/data/pokemon/dex_entries/ivysaur.asm +++ b/data/pokemon/dex_entries/ivysaur.asm @@ -1,10 +1,10 @@ -; IvysaurPokedexEntry: ; 0x181702 db "SEED@" ; species name dw 303, 290 ; height, weight db "The bulb on its" next "back grows as it" next "absorbs nutrients." + page "The bulb gives off" next "a pleasant aroma" next "when it blooms.@" diff --git a/data/pokemon/dex_entries/jigglypuff.asm b/data/pokemon/dex_entries/jigglypuff.asm index 01a3b4480..b90ba7316 100644 --- a/data/pokemon/dex_entries/jigglypuff.asm +++ b/data/pokemon/dex_entries/jigglypuff.asm @@ -1,10 +1,10 @@ -; JigglypuffPokedexEntry: ; 0x182673 db "BALLOON@" ; species name dw 108, 120 ; height, weight db "It rolls its cute" next "eyes as it sings a" next "soothing lullaby." + page "Its gentle song" next "puts anyone who" next "hears it to sleep.@" diff --git a/data/pokemon/dex_entries/jolteon.asm b/data/pokemon/dex_entries/jolteon.asm index 9b9149d9a..4d6be5d57 100644 --- a/data/pokemon/dex_entries/jolteon.asm +++ b/data/pokemon/dex_entries/jolteon.asm @@ -1,10 +1,10 @@ -; JolteonPokedexEntry: ; 0x1cc28b db "LIGHTNING@" ; species name dw 207, 540 ; height, weight db "The negatively" next "charged ions" next "generated in its" + page "fur create a" next "constant sparking" next "noise.@" diff --git a/data/pokemon/dex_entries/jumpluff.asm b/data/pokemon/dex_entries/jumpluff.asm index 0aade0b75..8dacd4dff 100644 --- a/data/pokemon/dex_entries/jumpluff.asm +++ b/data/pokemon/dex_entries/jumpluff.asm @@ -1,10 +1,10 @@ -; JumpluffPokedexEntry: ; 0x1cd998 db "COTTONWEED@" ; species name dw 207, 70 ; height, weight db "Even in the fierc-" next "est wind, it can" next "control its fluff" + page "to make its way to" next "any place in the" next "world it wants.@" diff --git a/data/pokemon/dex_entries/jynx.asm b/data/pokemon/dex_entries/jynx.asm index b4b9eac8c..6f6486776 100644 --- a/data/pokemon/dex_entries/jynx.asm +++ b/data/pokemon/dex_entries/jynx.asm @@ -1,10 +1,10 @@ -; JynxPokedexEntry: ; 0x1b98c5 db "HUMANSHAPE@" ; species name dw 407, 900 ; height, weight db "It has several" next "different cry pat-" next "terns, each of" + page "which seems to" next "have its own" next "meaning.@" diff --git a/data/pokemon/dex_entries/kabuto.asm b/data/pokemon/dex_entries/kabuto.asm index 9231fb9be..8a65e4cb6 100644 --- a/data/pokemon/dex_entries/kabuto.asm +++ b/data/pokemon/dex_entries/kabuto.asm @@ -1,10 +1,10 @@ -; KabutoPokedexEntry: ; 0x1cc497 db "SHELLFISH@" ; species name dw 108, 250 ; height, weight db "Three hundred" next "million years ago," next "it hid on the sea" + page "floor. It also has" next "eyes on its back" next "that glow.@" diff --git a/data/pokemon/dex_entries/kabutops.asm b/data/pokemon/dex_entries/kabutops.asm index 8f5e1348b..bca687d39 100644 --- a/data/pokemon/dex_entries/kabutops.asm +++ b/data/pokemon/dex_entries/kabutops.asm @@ -1,10 +1,10 @@ -; KabutopsPokedexEntry: ; 0x1cc507 db "SHELLFISH@" ; species name dw 403, 890 ; height, weight db "It was able to" next "swim quickly thro-" next "ugh the water by" + page "compactly folding" next "up its razor-sharp" next "sickles.@" diff --git a/data/pokemon/dex_entries/kadabra.asm b/data/pokemon/dex_entries/kadabra.asm index 26226724f..01fd96098 100644 --- a/data/pokemon/dex_entries/kadabra.asm +++ b/data/pokemon/dex_entries/kadabra.asm @@ -1,10 +1,10 @@ -; KadabraPokedexEntry: ; 0x18313c db "PSI@" ; species name dw 403, 1250 ; height, weight db "When it closes its" next "eyes, twice as" next "many alpha parti-" + page "cles come out of" next "the surface of its" next "body.@" diff --git a/data/pokemon/dex_entries/kakuna.asm b/data/pokemon/dex_entries/kakuna.asm index 469e14bf6..3f4a1326d 100644 --- a/data/pokemon/dex_entries/kakuna.asm +++ b/data/pokemon/dex_entries/kakuna.asm @@ -1,10 +1,10 @@ -; KakunaPokedexEntry: ; 0x181c23 db "COCOON@" ; species name dw 200, 220 ; height, weight db "Nearly incapable" next "of movement, it" next "leans against" + page "stout trees while" next "waiting for its" next "evolution.@" diff --git a/data/pokemon/dex_entries/kangaskhan.asm b/data/pokemon/dex_entries/kangaskhan.asm index ec2050845..c1c9d8db5 100644 --- a/data/pokemon/dex_entries/kangaskhan.asm +++ b/data/pokemon/dex_entries/kangaskhan.asm @@ -1,10 +1,10 @@ -; KangaskhanPokedexEntry: ; 0x1b94f6 db "PARENT@" ; species name dw 703, 1760 ; height, weight db "To avoid" next "crushing the" next "baby it carries in" + page "its pouch, it" next "always sleeps" next "standing up.@" diff --git a/data/pokemon/dex_entries/kingdra.asm b/data/pokemon/dex_entries/kingdra.asm index 555601b51..05e79a86a 100644 --- a/data/pokemon/dex_entries/kingdra.asm +++ b/data/pokemon/dex_entries/kingdra.asm @@ -1,10 +1,10 @@ -; KingdraPokedexEntry: ; 0x1d0fd1 db "DRAGON@" ; species name dw 511, 3350 ; height, weight db "It stores energy" next "by sleeping at" next "underwater depths" + page "at which no other" next "life forms can" next "survive.@" diff --git a/data/pokemon/dex_entries/kingler.asm b/data/pokemon/dex_entries/kingler.asm index 25685d517..2c4b17a15 100644 --- a/data/pokemon/dex_entries/kingler.asm +++ b/data/pokemon/dex_entries/kingler.asm @@ -1,10 +1,10 @@ -; KinglerPokedexEntry: ; 0x1b8e45 db "PINCER@" ; species name dw 403, 1320 ; height, weight db "Its oversized claw" next "is very powerful," next "but when it's not" + page "in battle, the" next "claw just gets in" next "the way.@" diff --git a/data/pokemon/dex_entries/koffing.asm b/data/pokemon/dex_entries/koffing.asm index 20bde8671..a3fc0da9f 100644 --- a/data/pokemon/dex_entries/koffing.asm +++ b/data/pokemon/dex_entries/koffing.asm @@ -1,10 +1,10 @@ -; KoffingPokedexEntry: ; 0x1b9276 db "POISON GAS@" ; species name dw 200, 20 ; height, weight db "If one gets close" next "enough to it when" next "it expels poison-" + page "ous gas, the gas" next "swirling inside it" next "can be seen.@" diff --git a/data/pokemon/dex_entries/krabby.asm b/data/pokemon/dex_entries/krabby.asm index 2435cd64d..0e0081ae6 100644 --- a/data/pokemon/dex_entries/krabby.asm +++ b/data/pokemon/dex_entries/krabby.asm @@ -1,10 +1,10 @@ -; KrabbyPokedexEntry: ; 0x1b8ddd db "RIVER CRAB@" ; species name dw 104, 140 ; height, weight db "If it is unable" next "to find food, it" next "will absorb" + page "nutrients by" next "swallowing a" next "mouthful of sand.@" diff --git a/data/pokemon/dex_entries/lanturn.asm b/data/pokemon/dex_entries/lanturn.asm index 3aa2b5523..46ea41e89 100644 --- a/data/pokemon/dex_entries/lanturn.asm +++ b/data/pokemon/dex_entries/lanturn.asm @@ -1,10 +1,10 @@ -; LanturnPokedexEntry: ; 0x1cd1de db "LIGHT@" ; species name dw 311, 500 ; height, weight db "This #MON uses" next "the bright part of" next "its body, which" + page "changed from a" next "dorsal fin, to" next "lure prey.@" diff --git a/data/pokemon/dex_entries/lapras.asm b/data/pokemon/dex_entries/lapras.asm index 550d6e12c..e074cfe02 100644 --- a/data/pokemon/dex_entries/lapras.asm +++ b/data/pokemon/dex_entries/lapras.asm @@ -1,10 +1,10 @@ -; LaprasPokedexEntry: ; 0x1cc0cd db "TRANSPORT@" ; species name dw 802, 4850 ; height, weight db "This gentle" next "#MON loves to" next "give people rides" + page "and provides a ve-" next "ry comfortable way" next "to get around.@" diff --git a/data/pokemon/dex_entries/larvitar.asm b/data/pokemon/dex_entries/larvitar.asm index 14ec08c7b..fa8145626 100644 --- a/data/pokemon/dex_entries/larvitar.asm +++ b/data/pokemon/dex_entries/larvitar.asm @@ -1,10 +1,10 @@ -; LarvitarPokedexEntry: ; 0x1d169c db "ROCK SKIN@" ; species name dw 200, 1590 ; height, weight db "Born deep under-" next "ground, this" next "#MON becomes a" + page "pupa after eating" next "enough dirt to" next "make a mountain.@" diff --git a/data/pokemon/dex_entries/ledian.asm b/data/pokemon/dex_entries/ledian.asm index a112aa722..90a21d427 100644 --- a/data/pokemon/dex_entries/ledian.asm +++ b/data/pokemon/dex_entries/ledian.asm @@ -1,10 +1,10 @@ -; LedianPokedexEntry: ; 0x1ccfa0 db "FIVE STAR@" ; species name dw 407, 780 ; height, weight db "In the daytime" next "when it gets warm," next "it curls up inside" + page "a big leaf and" next "drifts off into" next "a deep slumber.@" diff --git a/data/pokemon/dex_entries/ledyba.asm b/data/pokemon/dex_entries/ledyba.asm index 1e62ab4b1..71ed42a8d 100644 --- a/data/pokemon/dex_entries/ledyba.asm +++ b/data/pokemon/dex_entries/ledyba.asm @@ -1,10 +1,10 @@ -; LedybaPokedexEntry: ; 0x1ccf2c db "FIVE STAR@" ; species name dw 303, 240 ; height, weight db "It is timid and" next "clusters together" next "with others. The" + page "fluid secreted by" next "its feet indicates" next "its location.@" diff --git a/data/pokemon/dex_entries/lickitung.asm b/data/pokemon/dex_entries/lickitung.asm index 0003f14dc..b5aa73af5 100644 --- a/data/pokemon/dex_entries/lickitung.asm +++ b/data/pokemon/dex_entries/lickitung.asm @@ -1,10 +1,10 @@ -; LickitungPokedexEntry: ; 0x1b9210 db "LICKING@" ; species name dw 311, 1440 ; height, weight db "It has a tongue" next "that is over 6'6''" next "long. It uses this" + page "long tongue to" next "lick its body" next "clean.@" diff --git a/data/pokemon/dex_entries/lugia.asm b/data/pokemon/dex_entries/lugia.asm index c15345300..8fa0dcf1f 100644 --- a/data/pokemon/dex_entries/lugia.asm +++ b/data/pokemon/dex_entries/lugia.asm @@ -1,10 +1,10 @@ -; LugiaPokedexEntry: ; 0x1d17e9 db "DIVING@" ; species name dw 1701, 4760 ; height, weight db "It has an incred-" next "ible ability to" next "calm raging sto-" + page "rms. It is said" next "that LUGIA appears" next "when storms start.@" diff --git a/data/pokemon/dex_entries/machamp.asm b/data/pokemon/dex_entries/machamp.asm index 0ff42bf5f..2a84a6815 100644 --- a/data/pokemon/dex_entries/machamp.asm +++ b/data/pokemon/dex_entries/machamp.asm @@ -1,10 +1,10 @@ -; MachampPokedexEntry: ; 0x1b8133 db "SUPERPOWER@" ; species name dw 503, 2870 ; height, weight db "With four arms" next "that react more" next "quickly than it" + page "can think, it can" next "execute many" next "punches at once.@" diff --git a/data/pokemon/dex_entries/machoke.asm b/data/pokemon/dex_entries/machoke.asm index 53523a832..fa7642ee7 100644 --- a/data/pokemon/dex_entries/machoke.asm +++ b/data/pokemon/dex_entries/machoke.asm @@ -1,10 +1,10 @@ -; MachokePokedexEntry: ; 0x1b80cb db "SUPERPOWER@" ; species name dw 411, 1550 ; height, weight db "This tough #MON" next "always stays in" next "the zone. Its" + page "muscles become" next "thicker after" next "every battle.@" diff --git a/data/pokemon/dex_entries/machop.asm b/data/pokemon/dex_entries/machop.asm index aba71bc04..d50eb0aa7 100644 --- a/data/pokemon/dex_entries/machop.asm +++ b/data/pokemon/dex_entries/machop.asm @@ -1,10 +1,10 @@ -; MachopPokedexEntry: ; 0x1b8065 db "SUPERPOWER@" ; species name dw 207, 430 ; height, weight db "It trains by" next "lifting rocks in" next "the mountains. It" + page "can even pick up a" next "GRAVELER with" next "ease.@" diff --git a/data/pokemon/dex_entries/magby.asm b/data/pokemon/dex_entries/magby.asm index 53f9e1129..013d96670 100644 --- a/data/pokemon/dex_entries/magby.asm +++ b/data/pokemon/dex_entries/magby.asm @@ -1,10 +1,10 @@ -; MagbyPokedexEntry: ; 0x1d140e db "LIVE COAL@" ; species name dw 204, 470 ; height, weight db "It naturally spits" next "an 1100-degree" next "flame. It is said" + page "when many appear," next "it heralds a" next "volcanic eruption.@" diff --git a/data/pokemon/dex_entries/magcargo.asm b/data/pokemon/dex_entries/magcargo.asm index 5f1122906..8bbb84593 100644 --- a/data/pokemon/dex_entries/magcargo.asm +++ b/data/pokemon/dex_entries/magcargo.asm @@ -1,10 +1,10 @@ -; MagcargoPokedexEntry: ; 0x1d0b21 db "LAVA@" ; species name dw 207, 1210 ; height, weight db "Its body is as hot" next "as lava and is" next "always billowing." + page "Flames will" next "occasionally burst" next "from its shell.@" diff --git a/data/pokemon/dex_entries/magikarp.asm b/data/pokemon/dex_entries/magikarp.asm index 765840899..2be156fcc 100644 --- a/data/pokemon/dex_entries/magikarp.asm +++ b/data/pokemon/dex_entries/magikarp.asm @@ -1,10 +1,10 @@ -; MagikarpPokedexEntry: ; 0x1cc000 db "FISH@" ; species name dw 211, 220 ; height, weight db "This weak and" next "pathetic #MON" next "gets easily pushed" + page "along rivers when" next "there are strong" next "currents.@" diff --git a/data/pokemon/dex_entries/magmar.asm b/data/pokemon/dex_entries/magmar.asm index 1bfa961f9..f62544b50 100644 --- a/data/pokemon/dex_entries/magmar.asm +++ b/data/pokemon/dex_entries/magmar.asm @@ -1,10 +1,10 @@ -; MagmarPokedexEntry: ; 0x1b9994 db "SPITFIRE@" ; species name dw 403, 980 ; height, weight db "It moves more" next "frequently in hot" next "areas. It can heal" + page "itself by dipping" next "its wound into" next "lava.@" diff --git a/data/pokemon/dex_entries/magnemite.asm b/data/pokemon/dex_entries/magnemite.asm index e7703e050..646bd80f4 100644 --- a/data/pokemon/dex_entries/magnemite.asm +++ b/data/pokemon/dex_entries/magnemite.asm @@ -1,10 +1,10 @@ -; MagnemitePokedexEntry: ; 0x1b869d db "MAGNET@" ; species name dw 100, 130 ; height, weight db "The electricity" next "emitted by the" next "units on each side" + page "of its body cause" next "it to become a" next "strong magnet.@" diff --git a/data/pokemon/dex_entries/magneton.asm b/data/pokemon/dex_entries/magneton.asm index 115506ad6..fff66dec7 100644 --- a/data/pokemon/dex_entries/magneton.asm +++ b/data/pokemon/dex_entries/magneton.asm @@ -1,10 +1,10 @@ -; MagnetonPokedexEntry: ; 0x1b870a db "MAGNET@" ; species name dw 303, 1320 ; height, weight db "When many" next "MAGNETON gather" next "together, the" + page "resulting magnetic" next "storm disrupts" next "radio waves.@" diff --git a/data/pokemon/dex_entries/mankey.asm b/data/pokemon/dex_entries/mankey.asm index 59dfc4919..344e6ca0f 100644 --- a/data/pokemon/dex_entries/mankey.asm +++ b/data/pokemon/dex_entries/mankey.asm @@ -1,10 +1,10 @@ -; MankeyPokedexEntry: ; 0x182dbd db "PIG MONKEY@" ; species name dw 108, 620 ; height, weight db "It lives in groups" next "in the treetops." next "If it loses sight" + page "of its group, it" next "becomes infuriated" next "by its loneliness.@" diff --git a/data/pokemon/dex_entries/mantine.asm b/data/pokemon/dex_entries/mantine.asm index 880c4f179..02d4c445a 100644 --- a/data/pokemon/dex_entries/mantine.asm +++ b/data/pokemon/dex_entries/mantine.asm @@ -1,10 +1,10 @@ -; MantinePokedexEntry: ; 0x1d0e25 db "KITE@" ; species name dw 611, 4850 ; height, weight db "It swims along" next "freely, eating" next "things that swim" + page "into its mouth." next "Its whole body is" next "very coarse.@" diff --git a/data/pokemon/dex_entries/mareep.asm b/data/pokemon/dex_entries/mareep.asm index 94f78ee31..3f0492ade 100644 --- a/data/pokemon/dex_entries/mareep.asm +++ b/data/pokemon/dex_entries/mareep.asm @@ -1,10 +1,10 @@ -; MareepPokedexEntry: ; 0x1cd551 db "WOOL@" ; species name dw 200, 170 ; height, weight db "It stores lots of" next "air in its soft" next "fur, allowing it" + page "to stay cool in" next "summer and warm" next "in winter.@" diff --git a/data/pokemon/dex_entries/marill.asm b/data/pokemon/dex_entries/marill.asm index 6afbc2902..1b87ba23c 100644 --- a/data/pokemon/dex_entries/marill.asm +++ b/data/pokemon/dex_entries/marill.asm @@ -1,10 +1,10 @@ -; MarillPokedexEntry: ; 0x1cd705 db "AQUAMOUSE@" ; species name dw 104, 190 ; height, weight db "The fur on its" next "body naturally" next "repels water. It" + page "can stay dry, even" next "when it plays in" next "the water.@" diff --git a/data/pokemon/dex_entries/marowak.asm b/data/pokemon/dex_entries/marowak.asm index 01baf04e3..18b3f2e5d 100644 --- a/data/pokemon/dex_entries/marowak.asm +++ b/data/pokemon/dex_entries/marowak.asm @@ -1,10 +1,10 @@ -; MarowakPokedexEntry: ; 0x1b90d2 db "BONEKEEPER@" ; species name dw 303, 990 ; height, weight db "Somewhere in the" next "world is a ceme-" next "tery just for" + page "MAROWAK. It gets" next "its bones from" next "those graves.@" diff --git a/data/pokemon/dex_entries/meganium.asm b/data/pokemon/dex_entries/meganium.asm index dead64ff5..711c12b57 100644 --- a/data/pokemon/dex_entries/meganium.asm +++ b/data/pokemon/dex_entries/meganium.asm @@ -1,10 +1,10 @@ -; MeganiumPokedexEntry: ; 0x1cca54 db "HERB@" ; species name dw 511, 2220 ; height, weight db "Anyone who stands" next "beside it becomes" next "refreshed, just as" + page "if they were" next "relaxing in a" next "sunny forest.@" diff --git a/data/pokemon/dex_entries/meowth.asm b/data/pokemon/dex_entries/meowth.asm index 9fe66977b..9897a3b60 100644 --- a/data/pokemon/dex_entries/meowth.asm +++ b/data/pokemon/dex_entries/meowth.asm @@ -1,10 +1,10 @@ -; MeowthPokedexEntry: ; 0x182c08 db "SCRATCHCAT@" ; species name dw 104, 90 ; height, weight db "It loves things" next "that sparkle. When" next "it sees a shiny" + page "object, the gold" next "coin on its head" next "shines too.@" diff --git a/data/pokemon/dex_entries/metapod.asm b/data/pokemon/dex_entries/metapod.asm index b2c6b78b7..9ee9b8a71 100644 --- a/data/pokemon/dex_entries/metapod.asm +++ b/data/pokemon/dex_entries/metapod.asm @@ -1,10 +1,10 @@ -; MetapodPokedexEntry: ; 0x181ace db "COCOON@" ; species name dw 204, 220 ; height, weight db "This is its pre-" next "evolved form. At" next "this stage, it can" + page "only harden, so it" next "remains motionless" next "to avoid attack.@" diff --git a/data/pokemon/dex_entries/mew.asm b/data/pokemon/dex_entries/mew.asm index 9da7f6a17..66682b14c 100644 --- a/data/pokemon/dex_entries/mew.asm +++ b/data/pokemon/dex_entries/mew.asm @@ -1,10 +1,10 @@ -; MewPokedexEntry: ; 0x1cc915 db "NEW SPECIE@" ; species name dw 104, 90 ; height, weight db "Because it can" next "learn any move," next "some people began" + page "research to see if" next "it is the ancestor" next "of all #MON.@" diff --git a/data/pokemon/dex_entries/mewtwo.asm b/data/pokemon/dex_entries/mewtwo.asm index eb41ebb90..c49e553d5 100644 --- a/data/pokemon/dex_entries/mewtwo.asm +++ b/data/pokemon/dex_entries/mewtwo.asm @@ -1,10 +1,10 @@ -; MewtwoPokedexEntry: ; 0x1cc8ae db "GENETIC@" ; species name dw 607, 2690 ; height, weight db "Said to rest qui-" next "etly in an" next "undiscovered cave," + page "this #MON was" next "created solely for" next "battling.@" diff --git a/data/pokemon/dex_entries/miltank.asm b/data/pokemon/dex_entries/miltank.asm index 1f85ef668..660f652bc 100644 --- a/data/pokemon/dex_entries/miltank.asm +++ b/data/pokemon/dex_entries/miltank.asm @@ -1,10 +1,10 @@ -; MiltankPokedexEntry: ; 0x1d1482 db "MILK COW@" ; species name dw 311, 1660 ; height, weight db "In order to milk a" next "MILTANK, one must" next "have a knack for" + page "rhythmically pull-" next "ing up and down" next "on its udders.@" diff --git a/data/pokemon/dex_entries/misdreavus.asm b/data/pokemon/dex_entries/misdreavus.asm index c3f1b002a..6e7e510a7 100644 --- a/data/pokemon/dex_entries/misdreavus.asm +++ b/data/pokemon/dex_entries/misdreavus.asm @@ -1,10 +1,10 @@ -; MisdreavusPokedexEntry: ; 0x1d0301 db "SCREECH@" ; species name dw 204, 20 ; height, weight db "It loves to watch" next "people it's scar-" next "ed. It frightens" + page "them by screaming" next "loudly or appear-" next "ing suddenly.@" diff --git a/data/pokemon/dex_entries/moltres.asm b/data/pokemon/dex_entries/moltres.asm index f459d622e..d4ec793d5 100644 --- a/data/pokemon/dex_entries/moltres.asm +++ b/data/pokemon/dex_entries/moltres.asm @@ -1,10 +1,10 @@ -; MoltresPokedexEntry: ; 0x1cc706 db "FLAME@" ; species name dw 607, 1320 ; height, weight db "Legendary bird" next "#MON. It is" next "said to migrate" + page "from the south" next "along with the" next "spring.@" diff --git a/data/pokemon/dex_entries/mr__mime.asm b/data/pokemon/dex_entries/mr__mime.asm index dce25be67..d96b9b37b 100644 --- a/data/pokemon/dex_entries/mr__mime.asm +++ b/data/pokemon/dex_entries/mr__mime.asm @@ -1,10 +1,10 @@ -; MrMimePokedexEntry: ; 0x1b97ea db "BARRIER@" ; species name dw 403, 1200 ; height, weight db "It uses the" next "mysterious" next "power it has in" + page "its fingers to" next "solidify air into" next "an invisible wall.@" diff --git a/data/pokemon/dex_entries/muk.asm b/data/pokemon/dex_entries/muk.asm index 49512c99f..6db1f1867 100644 --- a/data/pokemon/dex_entries/muk.asm +++ b/data/pokemon/dex_entries/muk.asm @@ -1,10 +1,10 @@ -; MukPokedexEntry: ; 0x1b89fc db "SLUDGE@" ; species name dw 311, 660 ; height, weight db "As it moves, a" next "very strong poison" next "leaks from it," + page "making the ground" next "there barren for" next "three years.@" diff --git a/data/pokemon/dex_entries/murkrow.asm b/data/pokemon/dex_entries/murkrow.asm index 6a0f42145..90d90bfbf 100644 --- a/data/pokemon/dex_entries/murkrow.asm +++ b/data/pokemon/dex_entries/murkrow.asm @@ -1,10 +1,10 @@ -; MurkrowPokedexEntry: ; 0x1d021e db "DARKNESS@" ; species name dw 108, 50 ; height, weight db "It hides any shiny" next "object it finds in" next "a secret location." + page "MURKROW and" next "MEOWTH loot one" next "another's stashes.@" diff --git a/data/pokemon/dex_entries/natu.asm b/data/pokemon/dex_entries/natu.asm index 20958dbff..04c47970c 100644 --- a/data/pokemon/dex_entries/natu.asm +++ b/data/pokemon/dex_entries/natu.asm @@ -1,10 +1,10 @@ -; NatuPokedexEntry: ; 0x1cd47d db "LITTLE BIRD@" ; species name dw 8, 40 ; height, weight db "It is extremely" next "good at climbing" next "tree trunks and" + page "likes to eat the" next "new sprouts on" next "the trees.@" diff --git a/data/pokemon/dex_entries/nidoking.asm b/data/pokemon/dex_entries/nidoking.asm index 97c203064..a260ceadb 100644 --- a/data/pokemon/dex_entries/nidoking.asm +++ b/data/pokemon/dex_entries/nidoking.asm @@ -1,10 +1,10 @@ -; NidokingPokedexEntry: ; 0x182463 db "DRILL@" ; species name dw 407, 1370 ; height, weight db "It uses its thick" next "arms, legs and" next "tail to attack" + page "forcefully. Melee" next "combat is its" next "specialty.@" diff --git a/data/pokemon/dex_entries/nidoqueen.asm b/data/pokemon/dex_entries/nidoqueen.asm index c0f711eb4..534546721 100644 --- a/data/pokemon/dex_entries/nidoqueen.asm +++ b/data/pokemon/dex_entries/nidoqueen.asm @@ -1,10 +1,10 @@ -; NidoqueenPokedexEntry: ; 0x18232e db "DRILL@" ; species name dw 403, 1320 ; height, weight db "The hard scales" next "that cover its" next "strong body serve" + page "as excellent" next "protection from" next "any attack.@" diff --git a/data/pokemon/dex_entries/nidoran_f.asm b/data/pokemon/dex_entries/nidoran_f.asm index 4e7299b0d..9181edc20 100644 --- a/data/pokemon/dex_entries/nidoran_f.asm +++ b/data/pokemon/dex_entries/nidoran_f.asm @@ -1,10 +1,10 @@ -; NidoranFPokedexEntry: ; 0x18224b db "POISON PIN@" ; species name dw 104, 150 ; height, weight db "Small and very" next "docile, it pro-" next "tects itself with" + page "its small, poison-" next "ous horn when" next "attacked.@" diff --git a/data/pokemon/dex_entries/nidoran_m.asm b/data/pokemon/dex_entries/nidoran_m.asm index 8970afc36..51ec0a530 100644 --- a/data/pokemon/dex_entries/nidoran_m.asm +++ b/data/pokemon/dex_entries/nidoran_m.asm @@ -1,10 +1,10 @@ -; NidoranMPokedexEntry: ; 0x182392 db "POISON PIN@" ; species name dw 108, 200 ; height, weight db "It constantly" next "moves its large" next "ears in many" + page "directions in" next "order to detect" next "danger right away.@" diff --git a/data/pokemon/dex_entries/nidorina.asm b/data/pokemon/dex_entries/nidorina.asm index 93c1e164d..e1670a187 100644 --- a/data/pokemon/dex_entries/nidorina.asm +++ b/data/pokemon/dex_entries/nidorina.asm @@ -1,10 +1,10 @@ -; NidorinaPokedexEntry: ; 0x1822b6 db "POISON PIN@" ; species name dw 207, 440 ; height, weight db "It has a docile" next "nature. If it is" next "threatened with" + page "attack, it raises" next "the barbs that are" next "all over its body.@" diff --git a/data/pokemon/dex_entries/nidorino.asm b/data/pokemon/dex_entries/nidorino.asm index 6b1403ad2..3f00ac0a5 100644 --- a/data/pokemon/dex_entries/nidorino.asm +++ b/data/pokemon/dex_entries/nidorino.asm @@ -1,10 +1,10 @@ -; NidorinoPokedexEntry: ; 0x1823fd db "POISON PIN@" ; species name dw 211, 430 ; height, weight db "It is easily" next "agitated and uses" next "its horn for" + page "offense as soon as" next "it notices an" next "attacker.@" diff --git a/data/pokemon/dex_entries/ninetales.asm b/data/pokemon/dex_entries/ninetales.asm index fd3a66ffb..c0295e0f7 100644 --- a/data/pokemon/dex_entries/ninetales.asm +++ b/data/pokemon/dex_entries/ninetales.asm @@ -1,10 +1,10 @@ -; NinetalesPokedexEntry: ; 0x18260c db "FOX@" ; species name dw 307, 440 ; height, weight db "It is said to live" next "a thousand years," next "and each of its" + page "tails is loaded" next "with supernatural" next "powers.@" diff --git a/data/pokemon/dex_entries/noctowl.asm b/data/pokemon/dex_entries/noctowl.asm index b939cfe05..ed04cb200 100644 --- a/data/pokemon/dex_entries/noctowl.asm +++ b/data/pokemon/dex_entries/noctowl.asm @@ -1,10 +1,10 @@ -; NoctowlPokedexEntry: ; 0x1cceb9 db "OWL@" ; species name dw 503, 900 ; height, weight db "Its extremely soft" next "feathers make no" next "sound in flight." + page "It silently sneaks" next "up on prey without" next "being detected.@" diff --git a/data/pokemon/dex_entries/octillery.asm b/data/pokemon/dex_entries/octillery.asm index 902c1bf9a..66c539155 100644 --- a/data/pokemon/dex_entries/octillery.asm +++ b/data/pokemon/dex_entries/octillery.asm @@ -1,10 +1,10 @@ -; OctilleryPokedexEntry: ; 0x1d0d42 db "JET@" ; species name dw 211, 630 ; height, weight db "Its instinct is to" next "bury itself in" next "holes. It often" + page "steals the nesting" next "holes of others to" next "sleep in them.@" diff --git a/data/pokemon/dex_entries/oddish.asm b/data/pokemon/dex_entries/oddish.asm index 84560c113..e8a63d81f 100644 --- a/data/pokemon/dex_entries/oddish.asm +++ b/data/pokemon/dex_entries/oddish.asm @@ -1,10 +1,10 @@ -; OddishPokedexEntry: ; 0x182836 db "WEED@" ; species name dw 108, 120 ; height, weight db "During the day, it" next "stays in the cold" next "underground to" + page "avoid the sun." next "It grows by bath-" next "ing in moonlight.@" diff --git a/data/pokemon/dex_entries/omanyte.asm b/data/pokemon/dex_entries/omanyte.asm index 9f7948fe0..70c556910 100644 --- a/data/pokemon/dex_entries/omanyte.asm +++ b/data/pokemon/dex_entries/omanyte.asm @@ -1,10 +1,10 @@ -; OmanytePokedexEntry: ; 0x1cc3c1 db "SPIRAL@" ; species name dw 104, 170 ; height, weight db "In prehistoric" next "times, it swam on" next "the sea floor," + page "eating plankton." next "Its fossils are" next "sometimes found.@" diff --git a/data/pokemon/dex_entries/omastar.asm b/data/pokemon/dex_entries/omastar.asm index 65ba92356..f2cc0caba 100644 --- a/data/pokemon/dex_entries/omastar.asm +++ b/data/pokemon/dex_entries/omastar.asm @@ -1,10 +1,10 @@ -; OmastarPokedexEntry: ; 0x1cc42e db "SPIRAL@" ; species name dw 303, 770 ; height, weight db "Its heavy shell" next "allowed it to" next "reach only nearby" + page "food. This could" next "be the reason it" next "is extinct.@" diff --git a/data/pokemon/dex_entries/onix.asm b/data/pokemon/dex_entries/onix.asm index f0f88fcff..12164c5fb 100644 --- a/data/pokemon/dex_entries/onix.asm +++ b/data/pokemon/dex_entries/onix.asm @@ -1,10 +1,10 @@ -; OnixPokedexEntry: ; 0x1b8c98 db "ROCK SNAKE@" ; species name dw 2810, 4630 ; height, weight db "As it digs through" next "the ground, it" next "absorbs many hard" + page "objects. This is" next "what makes its" next "body so solid.@" diff --git a/data/pokemon/dex_entries/paras.asm b/data/pokemon/dex_entries/paras.asm index 152e1fcc0..62d473c53 100644 --- a/data/pokemon/dex_entries/paras.asm +++ b/data/pokemon/dex_entries/paras.asm @@ -1,10 +1,10 @@ -; ParasPokedexEntry: ; 0x18297f db "MUSHROOM@" ; species name dw 100, 120 ; height, weight db "The tochukaso" next "growing on this" next "#MON's back" + page "orders it to" next "extract juice from" next "tree trunks.@" diff --git a/data/pokemon/dex_entries/parasect.asm b/data/pokemon/dex_entries/parasect.asm index bd912212e..6fbf4f7f9 100644 --- a/data/pokemon/dex_entries/parasect.asm +++ b/data/pokemon/dex_entries/parasect.asm @@ -1,10 +1,10 @@ -; ParasectPokedexEntry: ; 0x1829e2 db "MUSHROOM@" ; species name dw 303, 650 ; height, weight db "When nothing's" next "left to extract" next "from the bug, the" + page "mushrooms on its" next "back leave spores" next "on the bug's egg.@" diff --git a/data/pokemon/dex_entries/persian.asm b/data/pokemon/dex_entries/persian.asm index 7ce74f6f8..9264eeca2 100644 --- a/data/pokemon/dex_entries/persian.asm +++ b/data/pokemon/dex_entries/persian.asm @@ -1,10 +1,10 @@ -; PersianPokedexEntry: ; 0x182c78 db "CLASSY CAT@" ; species name dw 303, 710 ; height, weight db "Behind its lithe," next "elegant appearance" next "lies a barbaric" + page "side. It will tear" next "apart its prey on" next "a mere whim.@" diff --git a/data/pokemon/dex_entries/phanpy.asm b/data/pokemon/dex_entries/phanpy.asm index a7393e546..c32a6889e 100644 --- a/data/pokemon/dex_entries/phanpy.asm +++ b/data/pokemon/dex_entries/phanpy.asm @@ -1,10 +1,10 @@ -; PhanpyPokedexEntry: ; 0x1d1038 db "LONG NOSE@" ; species name dw 108, 740 ; height, weight db "During the desert-" next "ed morning hours," next "it comes ashore" + page "where it deftly" next "uses its trunk to" next "take a shower.@" diff --git a/data/pokemon/dex_entries/pichu.asm b/data/pokemon/dex_entries/pichu.asm index b31976aaf..2d82c6fb1 100644 --- a/data/pokemon/dex_entries/pichu.asm +++ b/data/pokemon/dex_entries/pichu.asm @@ -1,10 +1,10 @@ -; PichuPokedexEntry: ; 0x1cd243 db "TINY MOUSE@" ; species name dw 100, 40 ; height, weight db "It is unskilled at" next "storing electric" next "power. Any kind of" + page "shock causes it to" next "discharge energy" next "spontaneously.@" diff --git a/data/pokemon/dex_entries/pidgeot.asm b/data/pokemon/dex_entries/pidgeot.asm index 16a877427..07df086f2 100644 --- a/data/pokemon/dex_entries/pidgeot.asm +++ b/data/pokemon/dex_entries/pidgeot.asm @@ -1,10 +1,10 @@ -; PidgeotPokedexEntry: ; 0x181dd7 db "BIRD@" ; species name dw 411, 870 ; height, weight db "Its outstanding" next "vision allows it" next "to spot splashing" + page "MAGIKARP, even" next "while flying at" next "3300 feet.@" diff --git a/data/pokemon/dex_entries/pidgeotto.asm b/data/pokemon/dex_entries/pidgeotto.asm index 1ab6fde5c..30a1ccebd 100644 --- a/data/pokemon/dex_entries/pidgeotto.asm +++ b/data/pokemon/dex_entries/pidgeotto.asm @@ -1,10 +1,10 @@ -; PidgeottoPokedexEntry: ; 0x181d75 db "BIRD@" ; species name dw 307, 660 ; height, weight db "It slowly flies in" next "a circular pat-" next "tern, all the" + page "while keeping a" next "sharp lookout for" next "prey.@" diff --git a/data/pokemon/dex_entries/pidgey.asm b/data/pokemon/dex_entries/pidgey.asm index 491dfb9b9..cde05eb61 100644 --- a/data/pokemon/dex_entries/pidgey.asm +++ b/data/pokemon/dex_entries/pidgey.asm @@ -1,10 +1,10 @@ -; PidgeyPokedexEntry: ; 0x181cfa db "TINY BIRD@" ; species name dw 100, 40 ; height, weight db "It rapidly flaps" next "its wings in the" next "grass, stirring up" + page "a dust cloud that" next "drives insect prey" next "out into the open.@" diff --git a/data/pokemon/dex_entries/pikachu.asm b/data/pokemon/dex_entries/pikachu.asm index 680e24673..699900f18 100644 --- a/data/pokemon/dex_entries/pikachu.asm +++ b/data/pokemon/dex_entries/pikachu.asm @@ -1,10 +1,10 @@ -; PikachuPokedexEntry: ; 0x1820ad db "MOUSE@" ; species name dw 104, 130 ; height, weight db "When it is anger-" next "ed, it immediately" next "discharges the" + page "energy stored in" next "the pouches in its" next "cheeks.@" diff --git a/data/pokemon/dex_entries/piloswine.asm b/data/pokemon/dex_entries/piloswine.asm index 326ea4503..1c5aa36c0 100644 --- a/data/pokemon/dex_entries/piloswine.asm +++ b/data/pokemon/dex_entries/piloswine.asm @@ -1,10 +1,10 @@ -; PiloswinePokedexEntry: ; 0x1d0c01 db "SWINE@" ; species name dw 307, 1230 ; height, weight db "Although its legs" next "are short, its" next "rugged hooves" + page "prevent it from" next "slipping, even on" next "icy ground.@" diff --git a/data/pokemon/dex_entries/pineco.asm b/data/pokemon/dex_entries/pineco.asm index 9781b094e..7d8d990b9 100644 --- a/data/pokemon/dex_entries/pineco.asm +++ b/data/pokemon/dex_entries/pineco.asm @@ -1,10 +1,10 @@ -; PinecoPokedexEntry: ; 0x1d04b0 db "BAGWORM@" ; species name dw 200, 160 ; height, weight db "It spits out a" next "fluid that it uses" next "to glue tree bark" + page "to its body. The" next "fluid hardens when" next "it touches air.@" diff --git a/data/pokemon/dex_entries/pinsir.asm b/data/pokemon/dex_entries/pinsir.asm index c236b3594..331a8d4f5 100644 --- a/data/pokemon/dex_entries/pinsir.asm +++ b/data/pokemon/dex_entries/pinsir.asm @@ -1,10 +1,10 @@ -; PinsirPokedexEntry: ; 0x1b99fb db "STAGBEETLE@" ; species name dw 411, 1210 ; height, weight db "When the tempera-" next "ture drops at" next "night, it sleeps" + page "on treetops or" next "among roots where" next "it is well hidden.@" diff --git a/data/pokemon/dex_entries/politoed.asm b/data/pokemon/dex_entries/politoed.asm index 0dea3d572..a085ad58a 100644 --- a/data/pokemon/dex_entries/politoed.asm +++ b/data/pokemon/dex_entries/politoed.asm @@ -1,10 +1,10 @@ -; PolitoedPokedexEntry: ; 0x1cd84b db "FROG@" ; species name dw 307, 750 ; height, weight db "When it expands" next "its throat to" next "croak out a tune," + page "nearby POLIWAG and" next "POLIWHIRL gather" next "immediately.@" diff --git a/data/pokemon/dex_entries/poliwag.asm b/data/pokemon/dex_entries/poliwag.asm index d21677cc4..9183a15da 100644 --- a/data/pokemon/dex_entries/poliwag.asm +++ b/data/pokemon/dex_entries/poliwag.asm @@ -1,10 +1,10 @@ -; PoliwagPokedexEntry: ; 0x182f91 db "TADPOLE@" ; species name dw 200, 270 ; height, weight db "The swirl on its" next "belly is its" next "insides showing" + page "through the skin." next "It looks clearer" next "after it eats.@" diff --git a/data/pokemon/dex_entries/poliwhirl.asm b/data/pokemon/dex_entries/poliwhirl.asm index 69a6ee206..df4e0e6fd 100644 --- a/data/pokemon/dex_entries/poliwhirl.asm +++ b/data/pokemon/dex_entries/poliwhirl.asm @@ -1,10 +1,10 @@ -; PoliwhirlPokedexEntry: ; 0x182ffd db "TADPOLE@" ; species name dw 303, 440 ; height, weight db "Though it is" next "skilled at walk-" next "ing, it prefers to" + page "live underwater" next "where there is" next "less danger.@" diff --git a/data/pokemon/dex_entries/poliwrath.asm b/data/pokemon/dex_entries/poliwrath.asm index bb3e7dda5..4b4f23389 100644 --- a/data/pokemon/dex_entries/poliwrath.asm +++ b/data/pokemon/dex_entries/poliwrath.asm @@ -1,10 +1,10 @@ -; PoliwrathPokedexEntry: ; 0x183066 db "TADPOLE@" ; species name dw 403, 1190 ; height, weight db "It can use its" next "well-developed" next "arms and legs to" + page "run on the surface" next "of the water for a" next "split second.@" diff --git a/data/pokemon/dex_entries/ponyta.asm b/data/pokemon/dex_entries/ponyta.asm index fa123cde1..0d82b7702 100644 --- a/data/pokemon/dex_entries/ponyta.asm +++ b/data/pokemon/dex_entries/ponyta.asm @@ -1,10 +1,10 @@ -; PonytaPokedexEntry: ; 0x1b84f2 db "FIRE HORSE@" ; species name dw 303, 660 ; height, weight db "Training by" next "jumping over grass" next "that grows longer" + page "every day has made" next "it a world-class" next "jumper.@" diff --git a/data/pokemon/dex_entries/porygon.asm b/data/pokemon/dex_entries/porygon.asm index 9a73c9623..098a96d25 100644 --- a/data/pokemon/dex_entries/porygon.asm +++ b/data/pokemon/dex_entries/porygon.asm @@ -1,10 +1,10 @@ -; PorygonPokedexEntry: ; 0x1cc353 db "VIRTUAL@" ; species name dw 207, 800 ; height, weight db "An artificial" next "#MON created" next "due to extensive" + page "research, it can" next "perform only what" next "is in its program.@" diff --git a/data/pokemon/dex_entries/porygon2.asm b/data/pokemon/dex_entries/porygon2.asm index 8591e0039..e4f5a2358 100644 --- a/data/pokemon/dex_entries/porygon2.asm +++ b/data/pokemon/dex_entries/porygon2.asm @@ -1,10 +1,10 @@ -; Porygon2PokedexEntry: ; 0x1d110c db "VIRTUAL@" ; species name dw 200, 720 ; height, weight db "This manmade" next "#MON evolved" next "from the latest" + page "technology. It" next "may have unprog-" next "rammed reactions.@" diff --git a/data/pokemon/dex_entries/primeape.asm b/data/pokemon/dex_entries/primeape.asm index 7d7f211cc..3a96c936c 100644 --- a/data/pokemon/dex_entries/primeape.asm +++ b/data/pokemon/dex_entries/primeape.asm @@ -1,10 +1,10 @@ -; PrimeapePokedexEntry: ; 0x182e39 db "PIG MONKEY@" ; species name dw 303, 710 ; height, weight db "It will beat up" next "anyone who makes" next "it mad, even if it" + page "has to chase them" next "until the end of" next "the world.@" diff --git a/data/pokemon/dex_entries/psyduck.asm b/data/pokemon/dex_entries/psyduck.asm index 088b4ff76..6a58bc9f8 100644 --- a/data/pokemon/dex_entries/psyduck.asm +++ b/data/pokemon/dex_entries/psyduck.asm @@ -1,10 +1,10 @@ -; PsyduckPokedexEntry: ; 0x182cee db "DUCK@" ; species name dw 207, 430 ; height, weight db "The only time it" next "can use its psy-" next "chic power is when" + page "its sleeping brain" next "cells happen to" next "wake.@" diff --git a/data/pokemon/dex_entries/pupitar.asm b/data/pokemon/dex_entries/pupitar.asm index d35e457ad..ae8b5b3a4 100644 --- a/data/pokemon/dex_entries/pupitar.asm +++ b/data/pokemon/dex_entries/pupitar.asm @@ -1,10 +1,10 @@ -; PupitarPokedexEntry: ; 0x1d1709 db "HARD SHELL@" ; species name dw 311, 3350 ; height, weight db "It will not stay" next "still, even while" next "it's a pupa. It" + page "already has arms" next "and legs under its" next "solid shell.@" diff --git a/data/pokemon/dex_entries/quagsire.asm b/data/pokemon/dex_entries/quagsire.asm index 053058d54..25bb2ab66 100644 --- a/data/pokemon/dex_entries/quagsire.asm +++ b/data/pokemon/dex_entries/quagsire.asm @@ -1,10 +1,10 @@ -; QuagsirePokedexEntry: ; 0x1d00dd db "WATER FISH@" ; species name dw 407, 1650 ; height, weight db "Its body is always" next "slimy. It often" next "bangs its head on" + page "the river bottom" next "as it swims but" next "seems not to care.@" diff --git a/data/pokemon/dex_entries/quilava.asm b/data/pokemon/dex_entries/quilava.asm index aaf8069af..97363c158 100644 --- a/data/pokemon/dex_entries/quilava.asm +++ b/data/pokemon/dex_entries/quilava.asm @@ -1,10 +1,10 @@ -; QuilavaPokedexEntry: ; 0x1ccb33 db "VOLCANO@" ; species name dw 211, 420 ; height, weight db "Before battle, it" next "turns its back on" next "its opponent to" + page "demonstrate how" next "ferociously its" next "fire blazes.@" diff --git a/data/pokemon/dex_entries/qwilfish.asm b/data/pokemon/dex_entries/qwilfish.asm index d9529146f..c7405b980 100644 --- a/data/pokemon/dex_entries/qwilfish.asm +++ b/data/pokemon/dex_entries/qwilfish.asm @@ -1,10 +1,10 @@ -; QwilfishPokedexEntry: ; 0x1d07b1 db "BALLOON@" ; species name dw 108, 90 ; height, weight db "When faced with a" next "larger opponent," next "it swallows as" + page "much water as it" next "can to match the" next "opponent's size.@" diff --git a/data/pokemon/dex_entries/raichu.asm b/data/pokemon/dex_entries/raichu.asm index 886aef283..a17a5e9c2 100644 --- a/data/pokemon/dex_entries/raichu.asm +++ b/data/pokemon/dex_entries/raichu.asm @@ -1,10 +1,10 @@ -; RaichuPokedexEntry: ; 0x182117 db "MOUSE@" ; species name dw 207, 660 ; height, weight db "If its electric" next "pouches run empty," next "it raises its tail" + page "to gather electri-" next "city from the" next "atmosphere.@" diff --git a/data/pokemon/dex_entries/raikou.asm b/data/pokemon/dex_entries/raikou.asm index 315eb84ae..4f300635f 100644 --- a/data/pokemon/dex_entries/raikou.asm +++ b/data/pokemon/dex_entries/raikou.asm @@ -1,10 +1,10 @@ -; RaikouPokedexEntry: ; 0x1d156b db "THUNDER@" ; species name dw 603, 3920 ; height, weight db "This rough #MON" next "stores energy" next "inside its body," + page "then sweeps across" next "the land, shooting" next "off electricity.@" diff --git a/data/pokemon/dex_entries/rapidash.asm b/data/pokemon/dex_entries/rapidash.asm index ae98e2cb8..051e557ef 100644 --- a/data/pokemon/dex_entries/rapidash.asm +++ b/data/pokemon/dex_entries/rapidash.asm @@ -1,10 +1,10 @@ -; RapidashPokedexEntry: ; 0x1b855e db "FIRE HORSE@" ; species name dw 507, 2090 ; height, weight db "It just loves to" next "gallop. The faster" next "it goes, the long-" + page "er the swaying" next "flames of its mane" next "will become.@" diff --git a/data/pokemon/dex_entries/raticate.asm b/data/pokemon/dex_entries/raticate.asm index f009c29aa..50898dda3 100644 --- a/data/pokemon/dex_entries/raticate.asm +++ b/data/pokemon/dex_entries/raticate.asm @@ -1,10 +1,10 @@ -; RaticatePokedexEntry: ; 0x181ea3 db "RAT@" ; species name dw 204, 410 ; height, weight db "The webs on its" next "hind legs enable" next "it to cross" + page "rivers. It search-" next "es wide areas for" next "food.@" diff --git a/data/pokemon/dex_entries/rattata.asm b/data/pokemon/dex_entries/rattata.asm index 0a066eb74..f9e801b52 100644 --- a/data/pokemon/dex_entries/rattata.asm +++ b/data/pokemon/dex_entries/rattata.asm @@ -1,10 +1,10 @@ -; RattataPokedexEntry: ; 0x181e3d db "RAT@" ; species name dw 100, 80 ; height, weight db "This #MON's" next "impressive vital-" next "ity allows it to" + page "live anywhere. It" next "also multiplies" next "very quickly.@" diff --git a/data/pokemon/dex_entries/remoraid.asm b/data/pokemon/dex_entries/remoraid.asm index aaa6f1a49..1b9b0e562 100644 --- a/data/pokemon/dex_entries/remoraid.asm +++ b/data/pokemon/dex_entries/remoraid.asm @@ -1,10 +1,10 @@ -; RemoraidPokedexEntry: ; 0x1d0cd3 db "JET@" ; species name dw 200, 260 ; height, weight db "To escape from an" next "attacker, it may" next "shoot water out of" + page "its mouth, then" next "use that force to" next "swim backward.@" diff --git a/data/pokemon/dex_entries/rhydon.asm b/data/pokemon/dex_entries/rhydon.asm index c820666b3..c81141343 100644 --- a/data/pokemon/dex_entries/rhydon.asm +++ b/data/pokemon/dex_entries/rhydon.asm @@ -1,10 +1,10 @@ -; RhydonPokedexEntry: ; 0x1b93c5 db "DRILL@" ; species name dw 603, 2650 ; height, weight db "By lightly spin-" next "ning its drill-" next "like horn, it can" + page "easily shatter" next "even a diamond in" next "the rough.@" diff --git a/data/pokemon/dex_entries/rhyhorn.asm b/data/pokemon/dex_entries/rhyhorn.asm index b2f26e204..d7dd8d7e1 100644 --- a/data/pokemon/dex_entries/rhyhorn.asm +++ b/data/pokemon/dex_entries/rhyhorn.asm @@ -1,10 +1,10 @@ -; RhyhornPokedexEntry: ; 0x1b935d db "SPIKES@" ; species name dw 303, 2540 ; height, weight db "It can remember" next "only one thing at" next "a time. Once it" + page "starts rushing, it" next "forgets why it" next "started.@" diff --git a/data/pokemon/dex_entries/sandshrew.asm b/data/pokemon/dex_entries/sandshrew.asm index 2ef83f9c3..570907b31 100644 --- a/data/pokemon/dex_entries/sandshrew.asm +++ b/data/pokemon/dex_entries/sandshrew.asm @@ -1,10 +1,10 @@ -; SandshrewPokedexEntry: ; 0x182184 db "MOUSE@" ; species name dw 200, 260 ; height, weight db "It prefers dry," next "sandy places" next "because it uses" + page "the sand to" next "protect itself" next "when threatened.@" diff --git a/data/pokemon/dex_entries/sandslash.asm b/data/pokemon/dex_entries/sandslash.asm index fd2492f91..9e7fc454b 100644 --- a/data/pokemon/dex_entries/sandslash.asm +++ b/data/pokemon/dex_entries/sandslash.asm @@ -1,10 +1,10 @@ -; SandslashPokedexEntry: ; 0x1821e7 db "MOUSE@" ; species name dw 303, 650 ; height, weight db "Adept at climbing" next "trees, it rolls" next "into a spiny ball," + page "then attacks its" next "enemies from" next "above.@" diff --git a/data/pokemon/dex_entries/scizor.asm b/data/pokemon/dex_entries/scizor.asm index a000a6586..fa184c6ca 100644 --- a/data/pokemon/dex_entries/scizor.asm +++ b/data/pokemon/dex_entries/scizor.asm @@ -1,10 +1,10 @@ -; ScizorPokedexEntry: ; 0x1d0821 db "SCISSORS@" ; species name dw 511, 2600 ; height, weight db "This #MON's" next "pincers, which" next "contain steel, can" + page "crush any hard" next "object it gets a" next "hold of into bits.@" diff --git a/data/pokemon/dex_entries/scyther.asm b/data/pokemon/dex_entries/scyther.asm index ca47c46b6..f2231dd6d 100644 --- a/data/pokemon/dex_entries/scyther.asm +++ b/data/pokemon/dex_entries/scyther.asm @@ -1,10 +1,10 @@ -; ScytherPokedexEntry: ; 0x1b9851 db "MANTIS@" ; species name dw 411, 1230 ; height, weight db "It's very proud of" next "its speed. It" next "moves so fast that" + page "its opponent does" next "not even know what" next "knocked it down.@" diff --git a/data/pokemon/dex_entries/seadra.asm b/data/pokemon/dex_entries/seadra.asm index 91731c64a..482302ad6 100644 --- a/data/pokemon/dex_entries/seadra.asm +++ b/data/pokemon/dex_entries/seadra.asm @@ -1,10 +1,10 @@ -; SeadraPokedexEntry: ; 0x1b95b8 db "DRAGON@" ; species name dw 311, 550 ; height, weight db "The male raises" next "the young. If it" next "is approached, it" + page "uses its toxic" next "spikes to fend off" next "the intruder.@" diff --git a/data/pokemon/dex_entries/seaking.asm b/data/pokemon/dex_entries/seaking.asm index 0d7d1fe48..1225d0bf8 100644 --- a/data/pokemon/dex_entries/seaking.asm +++ b/data/pokemon/dex_entries/seaking.asm @@ -1,10 +1,10 @@ -; SeakingPokedexEntry: ; 0x1b9690 db "GOLDFISH@" ; species name dw 403, 860 ; height, weight db "When autumn comes," next "the males patrol" next "the area around" + page "their nests in" next "order to protect" next "their offspring.@" diff --git a/data/pokemon/dex_entries/seel.asm b/data/pokemon/dex_entries/seel.asm index 53d179097..ac5bdbc8a 100644 --- a/data/pokemon/dex_entries/seel.asm +++ b/data/pokemon/dex_entries/seel.asm @@ -1,10 +1,10 @@ -; SeelPokedexEntry: ; 0x1b88bf db "SEA LION@" ; species name dw 307, 1980 ; height, weight db "The light blue fur" next "that covers it" next "keeps it protected" + page "against the cold." next "It loves iceberg-" next "filled oceans.@" diff --git a/data/pokemon/dex_entries/sentret.asm b/data/pokemon/dex_entries/sentret.asm index 9e70418c8..70f1af39e 100644 --- a/data/pokemon/dex_entries/sentret.asm +++ b/data/pokemon/dex_entries/sentret.asm @@ -1,10 +1,10 @@ -; SentretPokedexEntry: ; 0x1ccd6b db "SCOUT@" ; species name dw 207, 130 ; height, weight db "When acting as a" next "lookout, it warns" next "others of danger" + page "by screeching and" next "hitting the ground" next "with its tail.@" diff --git a/data/pokemon/dex_entries/shellder.asm b/data/pokemon/dex_entries/shellder.asm index 0c7553c43..43d3c05a8 100644 --- a/data/pokemon/dex_entries/shellder.asm +++ b/data/pokemon/dex_entries/shellder.asm @@ -1,10 +1,10 @@ -; ShellderPokedexEntry: ; 0x1b8a68 db "BIVALVE@" ; species name dw 100, 90 ; height, weight db "Clamping on to an" next "opponent reveals" next "its vulnerable" + page "parts, so it uses" next "this move only as" next "a last resort.@" diff --git a/data/pokemon/dex_entries/shuckle.asm b/data/pokemon/dex_entries/shuckle.asm index 3795942e3..4eaa349eb 100644 --- a/data/pokemon/dex_entries/shuckle.asm +++ b/data/pokemon/dex_entries/shuckle.asm @@ -1,10 +1,10 @@ -; ShucklePokedexEntry: ; 0x1d088e db "MOLD@" ; species name dw 200, 450 ; height, weight db "The fluid secreted" next "by its toes carves" next "holes in rocks for" + page "nesting and can be" next "mixed with BERRIES" next "to make a drink.@" diff --git a/data/pokemon/dex_entries/skarmory.asm b/data/pokemon/dex_entries/skarmory.asm index 2558065af..46f0a12fc 100644 --- a/data/pokemon/dex_entries/skarmory.asm +++ b/data/pokemon/dex_entries/skarmory.asm @@ -1,10 +1,10 @@ -; SkarmoryPokedexEntry: ; 0x1d0e8c db "ARMOR BIRD@" ; species name dw 507, 1110 ; height, weight db "The feathers that" next "it sheds are very" next "sharp. It is said" + page "that people once" next "used the feathers" next "as swords.@" diff --git a/data/pokemon/dex_entries/skiploom.asm b/data/pokemon/dex_entries/skiploom.asm index f6e62266c..2980679e8 100644 --- a/data/pokemon/dex_entries/skiploom.asm +++ b/data/pokemon/dex_entries/skiploom.asm @@ -1,10 +1,10 @@ -; SkiploomPokedexEntry: ; 0x1cd928 db "COTTONWEED@" ; species name dw 200, 20 ; height, weight db "As soon as it" next "rains, it closes" next "its flower and" + page "hides in the shade" next "of a tree to avoid" next "getting wet.@" diff --git a/data/pokemon/dex_entries/slowbro.asm b/data/pokemon/dex_entries/slowbro.asm index fdfb36e98..f48be6761 100644 --- a/data/pokemon/dex_entries/slowbro.asm +++ b/data/pokemon/dex_entries/slowbro.asm @@ -1,10 +1,10 @@ -; SlowbroPokedexEntry: ; 0x1b8635 db "HERMITCRAB@" ; species name dw 503, 1730 ; height, weight db "An attached" next "SHELLDER won't let" next "go because of the" + page "tasty flavor that" next "oozes out of its" next "tail.@" diff --git a/data/pokemon/dex_entries/slowking.asm b/data/pokemon/dex_entries/slowking.asm index f52bdb1b7..07a5c4a15 100644 --- a/data/pokemon/dex_entries/slowking.asm +++ b/data/pokemon/dex_entries/slowking.asm @@ -1,10 +1,10 @@ -; SlowkingPokedexEntry: ; 0x1d0292 db "ROYAL@" ; species name dw 607, 1750 ; height, weight db "Every time it ya-" next "wns, SHELLDER" next "injects more poi-" + page "son into it. The" next "poison makes it" next "more intelligent.@" diff --git a/data/pokemon/dex_entries/slowpoke.asm b/data/pokemon/dex_entries/slowpoke.asm index 2341758f8..0c35e438f 100644 --- a/data/pokemon/dex_entries/slowpoke.asm +++ b/data/pokemon/dex_entries/slowpoke.asm @@ -1,10 +1,10 @@ -; SlowpokePokedexEntry: ; 0x1b85d3 db "DOPEY@" ; species name dw 311, 790 ; height, weight db "It is always so" next "absent-minded that" next "it won't react," + page "even if its" next "flavorful tail is" next "bitten.@" diff --git a/data/pokemon/dex_entries/slugma.asm b/data/pokemon/dex_entries/slugma.asm index ea1fc01f2..d56958540 100644 --- a/data/pokemon/dex_entries/slugma.asm +++ b/data/pokemon/dex_entries/slugma.asm @@ -1,10 +1,10 @@ -; SlugmaPokedexEntry: ; 0x1d0ab8 db "LAVA@" ; species name dw 204, 770 ; height, weight db "These group to-" next "gether in areas" next "that are hotter" + page "than normal. If it" next "cools off, its" next "skin hardens.@" diff --git a/data/pokemon/dex_entries/smeargle.asm b/data/pokemon/dex_entries/smeargle.asm index 8b265c1ea..98b9f69f3 100644 --- a/data/pokemon/dex_entries/smeargle.asm +++ b/data/pokemon/dex_entries/smeargle.asm @@ -1,10 +1,10 @@ -; SmearglePokedexEntry: ; 0x1d11e0 db "PAINTER@" ; species name dw 311, 1280 ; height, weight db "The color of the" next "mysterious fluid" next "secreted from its" + page "tail is predeter-" next "mined for each" next "SMEARGLE.@" diff --git a/data/pokemon/dex_entries/smoochum.asm b/data/pokemon/dex_entries/smoochum.asm index b619b1720..74dbc77b8 100644 --- a/data/pokemon/dex_entries/smoochum.asm +++ b/data/pokemon/dex_entries/smoochum.asm @@ -1,10 +1,10 @@ -; SmoochumPokedexEntry: ; 0x1d132b db "KISS@" ; species name dw 104, 130 ; height, weight db "The sensitivity of" next "its lips develops" next "most quickly." + page "It uses them to" next "try to identify" next "unknown objects.@" diff --git a/data/pokemon/dex_entries/sneasel.asm b/data/pokemon/dex_entries/sneasel.asm index 5c1e70f09..b2cba47fa 100644 --- a/data/pokemon/dex_entries/sneasel.asm +++ b/data/pokemon/dex_entries/sneasel.asm @@ -1,10 +1,10 @@ -; SneaselPokedexEntry: ; 0x1d097a db "SHARP CLAW@" ; species name dw 211, 620 ; height, weight db "This cunning" next "#MON hides" next "under the cover" + page "of darkness," next "waiting to attack" next "its prey.@" diff --git a/data/pokemon/dex_entries/snorlax.asm b/data/pokemon/dex_entries/snorlax.asm index e56651fb8..b006777dd 100644 --- a/data/pokemon/dex_entries/snorlax.asm +++ b/data/pokemon/dex_entries/snorlax.asm @@ -1,10 +1,10 @@ -; SnorlaxPokedexEntry: ; 0x1cc5cf db "SLEEPING@" ; species name dw 611, 10140 ; height, weight db "This #MON's" next "stomach is so" next "strong, even" + page "eating moldy or" next "rotten food will" next "not affect it.@" diff --git a/data/pokemon/dex_entries/snubbull.asm b/data/pokemon/dex_entries/snubbull.asm index 97b27ed8f..ca8b9bb2d 100644 --- a/data/pokemon/dex_entries/snubbull.asm +++ b/data/pokemon/dex_entries/snubbull.asm @@ -1,10 +1,10 @@ -; SnubbullPokedexEntry: ; 0x1d06e0 db "FAIRY@" ; species name dw 200, 170 ; height, weight db "In truth, it is a" next "cowardly #MON." next "It growls eagerly" + page "in order to hide" next "its fear from its" next "opponent.@" diff --git a/data/pokemon/dex_entries/spearow.asm b/data/pokemon/dex_entries/spearow.asm index 16b89d22f..290e721b1 100644 --- a/data/pokemon/dex_entries/spearow.asm +++ b/data/pokemon/dex_entries/spearow.asm @@ -1,10 +1,10 @@ -; SpearowPokedexEntry: ; 0x181f03 db "TINY BIRD@" ; species name dw 100, 40 ; height, weight db "To protect its" next "territory, it" next "flies around" + page "ceaselessly," next "making high-" next "pitched cries.@" diff --git a/data/pokemon/dex_entries/spinarak.asm b/data/pokemon/dex_entries/spinarak.asm index e6e4c7203..8adbd74ef 100644 --- a/data/pokemon/dex_entries/spinarak.asm +++ b/data/pokemon/dex_entries/spinarak.asm @@ -1,10 +1,10 @@ -; SpinarakPokedexEntry: ; 0x1cd012 db "STRINGSPIT@" ; species name dw 108, 190 ; height, weight db "If prey becomes" next "ensnared in its" next "nest of spun" + page "string, it waits" next "motionlessly until" next "it becomes dark.@" diff --git a/data/pokemon/dex_entries/squirtle.asm b/data/pokemon/dex_entries/squirtle.asm index 6fd442a13..e82e6bd6b 100644 --- a/data/pokemon/dex_entries/squirtle.asm +++ b/data/pokemon/dex_entries/squirtle.asm @@ -1,10 +1,10 @@ -; SquirtlePokedexEntry: ; 0x181926 db "TINYTURTLE@" ; species name dw 108, 200 ; height, weight db "When it feels" next "threatened, it" next "draws its legs" + page "inside its shell" next "and sprays water" next "from its mouth.@" diff --git a/data/pokemon/dex_entries/stantler.asm b/data/pokemon/dex_entries/stantler.asm index 0fce8f2b5..cabe544ff 100644 --- a/data/pokemon/dex_entries/stantler.asm +++ b/data/pokemon/dex_entries/stantler.asm @@ -1,10 +1,10 @@ -; StantlerPokedexEntry: ; 0x1d1174 db "BIG HORN@" ; species name dw 407, 1570 ; height, weight db "The round balls" next "found on the" next "fallen antlers can" + page "be ground into a" next "powder that aids" next "in sleeping.@" diff --git a/data/pokemon/dex_entries/starmie.asm b/data/pokemon/dex_entries/starmie.asm index 83393b9c2..c7aa7838a 100644 --- a/data/pokemon/dex_entries/starmie.asm +++ b/data/pokemon/dex_entries/starmie.asm @@ -1,10 +1,10 @@ -; StarmiePokedexEntry: ; 0x1b9776 db "MYSTERIOUS@" ; species name dw 307, 1760 ; height, weight db "It is said that it" next "uses the seven-" next "colored core of" + page "its body to send" next "electric waves" next "into outer space.@" diff --git a/data/pokemon/dex_entries/staryu.asm b/data/pokemon/dex_entries/staryu.asm index 9f1fadc9c..f18678d98 100644 --- a/data/pokemon/dex_entries/staryu.asm +++ b/data/pokemon/dex_entries/staryu.asm @@ -1,10 +1,10 @@ -; StaryuPokedexEntry: ; 0x1b9702 db "STARSHAPE@" ; species name dw 207, 760 ; height, weight db "When the stars" next "twinkle at night," next "it floats up from" + page "the sea floor, and" next "its body's center" next "core flickers.@" diff --git a/data/pokemon/dex_entries/steelix.asm b/data/pokemon/dex_entries/steelix.asm index 6bbfe6c28..7d9fcc219 100644 --- a/data/pokemon/dex_entries/steelix.asm +++ b/data/pokemon/dex_entries/steelix.asm @@ -1,10 +1,10 @@ -; SteelixPokedexEntry: ; 0x1d067c db "IRON SNAKE@" ; species name dw 3002, 8820 ; height, weight db "The many small" next "metal particles" next "that cover this" + page "#MON's body" next "reflect bright" next "light well.@" diff --git a/data/pokemon/dex_entries/sudowoodo.asm b/data/pokemon/dex_entries/sudowoodo.asm index 060db1d8d..f8250f5f0 100644 --- a/data/pokemon/dex_entries/sudowoodo.asm +++ b/data/pokemon/dex_entries/sudowoodo.asm @@ -1,10 +1,10 @@ -; SudowoodoPokedexEntry: ; 0x1cd7d9 db "IMITATION@" ; species name dw 311, 840 ; height, weight db "If a tree branch" next "shakes when there" next "is no wind, it's a" + page "SUDOWOODO, not a" next "tree. It hides" next "from the rain.@" diff --git a/data/pokemon/dex_entries/suicune.asm b/data/pokemon/dex_entries/suicune.asm index c60c002f7..5b4aa9e27 100644 --- a/data/pokemon/dex_entries/suicune.asm +++ b/data/pokemon/dex_entries/suicune.asm @@ -1,10 +1,10 @@ -; SuicunePokedexEntry: ; 0x1d1642 db "AURORA@" ; species name dw 607, 4120 ; height, weight db "This divine" next "#MON blows" next "around the world," + page "always in search" next "of a pure" next "reservoir.@" diff --git a/data/pokemon/dex_entries/sunflora.asm b/data/pokemon/dex_entries/sunflora.asm index 2d0e78111..2b162a526 100644 --- a/data/pokemon/dex_entries/sunflora.asm +++ b/data/pokemon/dex_entries/sunflora.asm @@ -1,10 +1,10 @@ -; SunfloraPokedexEntry: ; 0x1cdaef db "SUN@" ; species name dw 207, 190 ; height, weight db "As the hot season" next "approaches, the" next "petals on this" + page "#MON's face" next "become more vivid" next "and lively.@" diff --git a/data/pokemon/dex_entries/sunkern.asm b/data/pokemon/dex_entries/sunkern.asm index 680e1799e..8264891e4 100644 --- a/data/pokemon/dex_entries/sunkern.asm +++ b/data/pokemon/dex_entries/sunkern.asm @@ -1,10 +1,10 @@ -; SunkernPokedexEntry: ; 0x1cda87 db "SEED@" ; species name dw 100, 40 ; height, weight db "It is very weak." next "Its only means of" next "defense is to" + page "shake its leaves" next "desperately at its" next "attacker.@" diff --git a/data/pokemon/dex_entries/swinub.asm b/data/pokemon/dex_entries/swinub.asm index 3e6d61dc8..44f78aaaa 100644 --- a/data/pokemon/dex_entries/swinub.asm +++ b/data/pokemon/dex_entries/swinub.asm @@ -1,10 +1,10 @@ -; SwinubPokedexEntry: ; 0x1d0b8d db "PIG@" ; species name dw 104, 140 ; height, weight db "It uses the tip of" next "its nose to dig" next "for food. Its nose" + page "is so tough that" next "even frozen ground" next "poses no problem.@" diff --git a/data/pokemon/dex_entries/tangela.asm b/data/pokemon/dex_entries/tangela.asm index 4e011b082..6c84cbfd1 100644 --- a/data/pokemon/dex_entries/tangela.asm +++ b/data/pokemon/dex_entries/tangela.asm @@ -1,10 +1,10 @@ -; TangelaPokedexEntry: ; 0x1b948c db "VINE@" ; species name dw 303, 770 ; height, weight db "During battle, it" next "constantly moves" next "the vines that" + page "cover its body in" next "order to annoy its" next "opponent.@" diff --git a/data/pokemon/dex_entries/tauros.asm b/data/pokemon/dex_entries/tauros.asm index bd7851165..04a4b5ce1 100644 --- a/data/pokemon/dex_entries/tauros.asm +++ b/data/pokemon/dex_entries/tauros.asm @@ -1,10 +1,10 @@ -; TaurosPokedexEntry: ; 0x1b9a6f db "WILD BULL@" ; species name dw 407, 1950 ; height, weight db "These violent" next "#MON fight" next "with other mem-" + page "bers of their herd" next "in order to prove" next "their strength.@" diff --git a/data/pokemon/dex_entries/teddiursa.asm b/data/pokemon/dex_entries/teddiursa.asm index 35b32c322..1d75c8299 100644 --- a/data/pokemon/dex_entries/teddiursa.asm +++ b/data/pokemon/dex_entries/teddiursa.asm @@ -1,10 +1,10 @@ -; TeddiursaPokedexEntry: ; 0x1d09da db "LITTLE BEAR@" ; species name dw 200, 190 ; height, weight db "It always licks" next "honey. Its palm" next "tastes sweet" + page "because of all the" next "honey it has" next "absorbed.@" diff --git a/data/pokemon/dex_entries/tentacool.asm b/data/pokemon/dex_entries/tentacool.asm index 5ed4b4fa0..f16523c9d 100644 --- a/data/pokemon/dex_entries/tentacool.asm +++ b/data/pokemon/dex_entries/tentacool.asm @@ -1,10 +1,10 @@ -; TentacoolPokedexEntry: ; 0x1b82d1 db "JELLYFISH@" ; species name dw 211, 1000 ; height, weight db "As it floats along" next "on the waves, it" next "uses its toxic" + page "feelers to stab" next "anything it" next "touches.@" diff --git a/data/pokemon/dex_entries/tentacruel.asm b/data/pokemon/dex_entries/tentacruel.asm index 27dad758f..c09f892e4 100644 --- a/data/pokemon/dex_entries/tentacruel.asm +++ b/data/pokemon/dex_entries/tentacruel.asm @@ -1,10 +1,10 @@ -; TentacruelPokedexEntry: ; 0x1b8337 db "JELLYFISH@" ; species name dw 503, 1210 ; height, weight db "When its 80 feel-" next "ers absorb water," next "it stretches to" + page "become like a net" next "to entangle its" next "prey.@" diff --git a/data/pokemon/dex_entries/togepi.asm b/data/pokemon/dex_entries/togepi.asm index eb185b1f1..a295acf54 100644 --- a/data/pokemon/dex_entries/togepi.asm +++ b/data/pokemon/dex_entries/togepi.asm @@ -1,10 +1,10 @@ -; TogepiPokedexEntry: ; 0x1cd396 db "SPIKE BALL@" ; species name dw 100, 30 ; height, weight db "It is considered" next "to be a symbol of" next "good luck. Its" + page "shell is said to" next "be filled with" next "happiness.@" diff --git a/data/pokemon/dex_entries/togetic.asm b/data/pokemon/dex_entries/togetic.asm index 7d1519d73..b638aceb3 100644 --- a/data/pokemon/dex_entries/togetic.asm +++ b/data/pokemon/dex_entries/togetic.asm @@ -1,10 +1,10 @@ -; TogeticPokedexEntry: ; 0x1cd402 db "HAPPINESS@" ; species name dw 200, 70 ; height, weight db "Although it does" next "not flap its wings" next "very much, it can" + page "stay up in the air" next "as it tags along" next "after its trainer.@" diff --git a/data/pokemon/dex_entries/totodile.asm b/data/pokemon/dex_entries/totodile.asm index 78a1b761e..8be3ad28c 100644 --- a/data/pokemon/dex_entries/totodile.asm +++ b/data/pokemon/dex_entries/totodile.asm @@ -1,10 +1,10 @@ -; TotodilePokedexEntry: ; 0x1ccc14 db "BIG JAW@" ; species name dw 200, 210 ; height, weight db "This rough critter" next "chomps at any" next "moving object it" + page "sees. Turning your" next "back on it is not" next "recommended.@" diff --git a/data/pokemon/dex_entries/typhlosion.asm b/data/pokemon/dex_entries/typhlosion.asm index e11823cf5..52961be46 100644 --- a/data/pokemon/dex_entries/typhlosion.asm +++ b/data/pokemon/dex_entries/typhlosion.asm @@ -1,10 +1,10 @@ -; TyphlosionPokedexEntry: ; 0x1ccba0 db "VOLCANO@" ; species name dw 507, 1750 ; height, weight db "When heat from its" next "body causes the" next "air around it to" + page "shimmer, this is a" next "sign that it is" next "ready to battle.@" diff --git a/data/pokemon/dex_entries/tyranitar.asm b/data/pokemon/dex_entries/tyranitar.asm index 9786a6430..4d5a16672 100644 --- a/data/pokemon/dex_entries/tyranitar.asm +++ b/data/pokemon/dex_entries/tyranitar.asm @@ -1,10 +1,10 @@ -; TyranitarPokedexEntry: ; 0x1d177b db "ARMOR@" ; species name dw 607, 4450 ; height, weight db "In just one of its" next "mighty hands, it" next "has the power to" + page "make the ground" next "shake and moun-" next "tains crumble.@" diff --git a/data/pokemon/dex_entries/tyrogue.asm b/data/pokemon/dex_entries/tyrogue.asm index d8900c160..6571e9f62 100644 --- a/data/pokemon/dex_entries/tyrogue.asm +++ b/data/pokemon/dex_entries/tyrogue.asm @@ -1,10 +1,10 @@ -; TyroguePokedexEntry: ; 0x1d124b db "SCUFFLE@" ; species name dw 204, 460 ; height, weight db "To brush up on its" next "fighting skills," next "it will challenge" + page "anyone. It has a" next "very strong com-" next "petitive spirit.@" diff --git a/data/pokemon/dex_entries/umbreon.asm b/data/pokemon/dex_entries/umbreon.asm index 483322f18..206ea4070 100644 --- a/data/pokemon/dex_entries/umbreon.asm +++ b/data/pokemon/dex_entries/umbreon.asm @@ -1,10 +1,10 @@ -; UmbreonPokedexEntry: ; 0x1d01af db "MOONLIGHT@" ; species name dw 303, 600 ; height, weight db "On the night of a" next "full moon, or when" next "it gets excited," + page "the ring patterns" next "on its body glow" next "yellow.@" diff --git a/data/pokemon/dex_entries/unown.asm b/data/pokemon/dex_entries/unown.asm index 5be078b8a..60ee3b3de 100644 --- a/data/pokemon/dex_entries/unown.asm +++ b/data/pokemon/dex_entries/unown.asm @@ -1,10 +1,10 @@ -; UnownPokedexEntry: ; 0x1d0373 db "SYMBOL@" ; species name dw 108, 110 ; height, weight db "Because different" next "types of UNOWN" next "exist, it is said" + page "that they must" next "have a variety of" next "abilities.@" diff --git a/data/pokemon/dex_entries/ursaring.asm b/data/pokemon/dex_entries/ursaring.asm index acf7626f9..c2f070603 100644 --- a/data/pokemon/dex_entries/ursaring.asm +++ b/data/pokemon/dex_entries/ursaring.asm @@ -1,10 +1,10 @@ -; UrsaringPokedexEntry: ; 0x1d0a41 db "HIBERNANT@" ; species name dw 511, 2770 ; height, weight db "Although it has a" next "large body, it is" next "quite skilled at" + page "climbing trees. It" next "eats and sleeps in" next "the treetops.@" diff --git a/data/pokemon/dex_entries/vaporeon.asm b/data/pokemon/dex_entries/vaporeon.asm index 36617899f..dbbce1177 100644 --- a/data/pokemon/dex_entries/vaporeon.asm +++ b/data/pokemon/dex_entries/vaporeon.asm @@ -1,10 +1,10 @@ -; VaporeonPokedexEntry: ; 0x1cc224 db "BUBBLE JET@" ; species name dw 303, 640 ; height, weight db "As it uses the" next "fins on the tip" next "of its tail to" + page "swim, it blends" next "with the water" next "perfectly.@" diff --git a/data/pokemon/dex_entries/venomoth.asm b/data/pokemon/dex_entries/venomoth.asm index 4ff583940..338f0ed8e 100644 --- a/data/pokemon/dex_entries/venomoth.asm +++ b/data/pokemon/dex_entries/venomoth.asm @@ -1,10 +1,10 @@ -; VenomothPokedexEntry: ; 0x182abf db "POISONMOTH@" ; species name dw 411, 280 ; height, weight db "The scales it" next "scatters will" next "paralyze anyone" + page "who touches them," next "making that person" next "unable to stand.@" diff --git a/data/pokemon/dex_entries/venonat.asm b/data/pokemon/dex_entries/venonat.asm index 8e52b4c82..01e4df353 100644 --- a/data/pokemon/dex_entries/venonat.asm +++ b/data/pokemon/dex_entries/venonat.asm @@ -1,10 +1,10 @@ -; VenonatPokedexEntry: ; 0x182a53 db "INSECT@" ; species name dw 303, 660 ; height, weight db "The small bugs it" next "eats appear only" next "at night, so it" + page "sleeps in a hole" next "in a tree until" next "night falls.@" diff --git a/data/pokemon/dex_entries/venusaur.asm b/data/pokemon/dex_entries/venusaur.asm index 1b9cc6e43..b5c843c15 100644 --- a/data/pokemon/dex_entries/venusaur.asm +++ b/data/pokemon/dex_entries/venusaur.asm @@ -1,10 +1,10 @@ -; VenusaurPokedexEntry: ; 0x181773 db "SEED@" ; species name dw 607, 2210 ; height, weight db "As it warms it-" next "self and absorbs" next "the sunlight, its" + page "flower petals" next "release a pleasant" next "fragrance.@" diff --git a/data/pokemon/dex_entries/victreebel.asm b/data/pokemon/dex_entries/victreebel.asm index 552051572..b960cf81c 100644 --- a/data/pokemon/dex_entries/victreebel.asm +++ b/data/pokemon/dex_entries/victreebel.asm @@ -1,10 +1,10 @@ -; VictreebelPokedexEntry: ; 0x1b826e db "FLYCATCHER@" ; species name dw 507, 340 ; height, weight db "Once ingested into" next "this #MON's" next "body, even the" + page "hardest object" next "will melt into" next "nothing.@" diff --git a/data/pokemon/dex_entries/vileplume.asm b/data/pokemon/dex_entries/vileplume.asm index cf2ea191d..541fd4da5 100644 --- a/data/pokemon/dex_entries/vileplume.asm +++ b/data/pokemon/dex_entries/vileplume.asm @@ -1,10 +1,10 @@ -; VileplumePokedexEntry: ; 0x182918 db "FLOWER@" ; species name dw 311, 410 ; height, weight db "By shaking its big" next "petals, it scat-" next "ters toxic pollen" + page "into the air," next "turning the air" next "yellow.@" diff --git a/data/pokemon/dex_entries/voltorb.asm b/data/pokemon/dex_entries/voltorb.asm index 5a532e2d0..ddc0ffa29 100644 --- a/data/pokemon/dex_entries/voltorb.asm +++ b/data/pokemon/dex_entries/voltorb.asm @@ -1,10 +1,10 @@ -; VoltorbPokedexEntry: ; 0x1b8eb0 db "BALL@" ; species name dw 108, 230 ; height, weight db "During the study" next "of this #MON," next "it was discovered" + page "that its compo-" next "nents are not" next "found in nature.@" diff --git a/data/pokemon/dex_entries/vulpix.asm b/data/pokemon/dex_entries/vulpix.asm index f5bbd03a1..0409bb91e 100644 --- a/data/pokemon/dex_entries/vulpix.asm +++ b/data/pokemon/dex_entries/vulpix.asm @@ -1,10 +1,10 @@ -; VulpixPokedexEntry: ; 0x18259b db "FOX@" ; species name dw 200, 220 ; height, weight db "As its body grows" next "larger, its six" next "warm tails become" + page "more beautiful," next "with a more luxur-" next "ious coat of fur.@" diff --git a/data/pokemon/dex_entries/wartortle.asm b/data/pokemon/dex_entries/wartortle.asm index 927af5fd2..f96c6e40d 100644 --- a/data/pokemon/dex_entries/wartortle.asm +++ b/data/pokemon/dex_entries/wartortle.asm @@ -1,10 +1,10 @@ -; WartortlePokedexEntry: ; 0x181993 db "TURTLE@" ; species name dw 303, 500 ; height, weight db "Its long, furry" next "tail is a symbol" next "of longevity," + page "making it quite" next "popular among" next "older people.@" diff --git a/data/pokemon/dex_entries/weedle.asm b/data/pokemon/dex_entries/weedle.asm index 9b81fa11d..c7e9deb00 100644 --- a/data/pokemon/dex_entries/weedle.asm +++ b/data/pokemon/dex_entries/weedle.asm @@ -1,10 +1,10 @@ -; WeedlePokedexEntry: ; 0x181bb4 db "HAIRY BUG@" ; species name dw 100, 70 ; height, weight db "The barb on top of" next "its head secretes" next "a strong poison." + page "It uses this toxic" next "barb to protect" next "itself.@" diff --git a/data/pokemon/dex_entries/weepinbell.asm b/data/pokemon/dex_entries/weepinbell.asm index 81eb7c215..d53be6604 100644 --- a/data/pokemon/dex_entries/weepinbell.asm +++ b/data/pokemon/dex_entries/weepinbell.asm @@ -1,10 +1,10 @@ -; WeepinbellPokedexEntry: ; 0x1b81fd db "FLYCATCHER@" ; species name dw 303, 140 ; height, weight db "When it's hungry," next "it swings its" next "razor-sharp" + page "leaves, slicing up" next "any unlucky object" next "nearby for food.@" diff --git a/data/pokemon/dex_entries/weezing.asm b/data/pokemon/dex_entries/weezing.asm index 1a7b268fd..8e02970d0 100644 --- a/data/pokemon/dex_entries/weezing.asm +++ b/data/pokemon/dex_entries/weezing.asm @@ -1,10 +1,10 @@ -; WeezingPokedexEntry: ; 0x1b92ec db "POISON GAS@" ; species name dw 311, 210 ; height, weight db "When it inhales" next "poisonous gases" next "from garbage, its" + page "body expands, and" next "its insides smell" next "much worse.@" diff --git a/data/pokemon/dex_entries/wigglytuff.asm b/data/pokemon/dex_entries/wigglytuff.asm index 8ba563cce..65e9f49bb 100644 --- a/data/pokemon/dex_entries/wigglytuff.asm +++ b/data/pokemon/dex_entries/wigglytuff.asm @@ -1,10 +1,10 @@ -; WigglytuffPokedexEntry: ; 0x1826e9 db "BALLOON@" ; species name dw 303, 260 ; height, weight db "The rich, fluffy" next "fur that covers" next "its body feels so" + page "good that anyone" next "who feels it can't" next "stop touching it.@" diff --git a/data/pokemon/dex_entries/wobbuffet.asm b/data/pokemon/dex_entries/wobbuffet.asm index 95aae69ab..6dcde2df9 100644 --- a/data/pokemon/dex_entries/wobbuffet.asm +++ b/data/pokemon/dex_entries/wobbuffet.asm @@ -1,10 +1,10 @@ -; WobbuffetPokedexEntry: ; 0x1d03dd db "PATIENT@" ; species name dw 403, 630 ; height, weight db "In order to con-" next "ceal its black" next "tail, it lives in" + page "a dark cave and" next "only moves about" next "at night.@" diff --git a/data/pokemon/dex_entries/wooper.asm b/data/pokemon/dex_entries/wooper.asm index d612f2070..00f97d0d7 100644 --- a/data/pokemon/dex_entries/wooper.asm +++ b/data/pokemon/dex_entries/wooper.asm @@ -1,10 +1,10 @@ -; WooperPokedexEntry: ; 0x1d0078 db "WATER FISH@" ; species name dw 104, 190 ; height, weight db "A mucous" next "membrane covers" next "its body. Touching" + page "it barehanded will" next "cause a shooting" next "pain.@" diff --git a/data/pokemon/dex_entries/xatu.asm b/data/pokemon/dex_entries/xatu.asm index 21a53d8fc..c285b8cb3 100644 --- a/data/pokemon/dex_entries/xatu.asm +++ b/data/pokemon/dex_entries/xatu.asm @@ -1,10 +1,10 @@ -; XatuPokedexEntry: ; 0x1cd4e9 db "MYSTIC@" ; species name dw 411, 330 ; height, weight db "Once it begins to" next "meditate at sun-" next "rise, the entire" + page "day will pass" next "before it will" next "move again.@" diff --git a/data/pokemon/dex_entries/yanma.asm b/data/pokemon/dex_entries/yanma.asm index 9843ad289..4acf0e290 100644 --- a/data/pokemon/dex_entries/yanma.asm +++ b/data/pokemon/dex_entries/yanma.asm @@ -1,10 +1,10 @@ -; YanmaPokedexEntry: ; 0x1d0000 db "CLEAR WING@" ; species name dw 311, 840 ; height, weight db "It can see in all" next "directions without" next "moving its big" + page "eyes, helping it" next "spot attackers and" next "food right away.@" diff --git a/data/pokemon/dex_entries/zapdos.asm b/data/pokemon/dex_entries/zapdos.asm index ea61198a0..3dfa33530 100644 --- a/data/pokemon/dex_entries/zapdos.asm +++ b/data/pokemon/dex_entries/zapdos.asm @@ -1,10 +1,10 @@ -; ZapdosPokedexEntry: ; 0x1cc697 db "ELECTRIC@" ; species name dw 503, 1160 ; height, weight db "Legendary bird" next "#MON. They say" next "lightning caused" + page "by the flapping of" next "its wings causes" next "summer storms.@" diff --git a/data/pokemon/dex_entries/zubat.asm b/data/pokemon/dex_entries/zubat.asm index 8232f8bd6..0f54d51b1 100644 --- a/data/pokemon/dex_entries/zubat.asm +++ b/data/pokemon/dex_entries/zubat.asm @@ -1,10 +1,10 @@ -; ZubatPokedexEntry: ; 0x18275d db "BAT@" ; species name dw 207, 170 ; height, weight db "During the day, it" next "gathers with" next "others and hangs" + page "from the ceilings" next "of old buildings" next "and caves.@" 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 2649bb7a1..1ec2f2886 100644 --- a/data/pokemon/evos_attacks.asm +++ b/data/pokemon/evos_attacks.asm @@ -3,12 +3,20 @@ INCLUDE "constants.asm" SECTION "Evolutions and Attacks", ROMX +; Evos+attacks data structure: +; - Evolution methods: +; * db EVOLVE_LEVEL, level, species +; * db EVOLVE_ITEM, used item, species +; * db EVOLVE_TRADE, held item (or -1 for none), species +; * db EVOLVE_HAPPINESS, TR_* constant (ANYTIME, MORNDAY, NITE), species +; * db EVOLVE_STAT, level, ATK_*_DEF constant (LT, GT, EQ), species +; - db 0 ; no more evolutions +; - Learnset (in increasing level order): +; * db level, move +; - db 0 ; no more level-up moves INCLUDE "data/pokemon/evos_attacks_pointers.asm" - -EvosAttacks:: - BulbasaurEvosAttacks: db EVOLVE_LEVEL, 16, IVYSAUR db 0 ; no more evolutions @@ -831,7 +839,7 @@ AbraEvosAttacks: db 0 ; no more level-up moves KadabraEvosAttacks: - db EVOLVE_TRADE, $ff, ALAKAZAM + db EVOLVE_TRADE, -1, ALAKAZAM db 0 ; no more evolutions db 1, TELEPORT db 1, KINESIS @@ -875,7 +883,7 @@ MachopEvosAttacks: db 0 ; no more level-up moves MachokeEvosAttacks: - db EVOLVE_TRADE, $ff, MACHAMP + db EVOLVE_TRADE, -1, MACHAMP db 0 ; no more evolutions db 1, LOW_KICK db 1, LEER @@ -989,7 +997,7 @@ GeodudeEvosAttacks: db 0 ; no more level-up moves GravelerEvosAttacks: - db EVOLVE_TRADE, $ff, GOLEM + db EVOLVE_TRADE, -1, GOLEM db 0 ; no more evolutions db 1, TACKLE db 1, DEFENSE_CURL @@ -1248,7 +1256,7 @@ GastlyEvosAttacks: db 0 ; no more level-up moves HaunterEvosAttacks: - db EVOLVE_TRADE, $ff, GENGAR + db EVOLVE_TRADE, -1, GENGAR db 0 ; no more evolutions db 1, HYPNOSIS db 1, LICK 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/rby_base_special.asm b/data/pokemon/gen1_base_special.asm index 9998692ab..306ce31d9 100644 --- a/data/pokemon/rby_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/rby_order.asm b/data/pokemon/gen1_order.asm index e40ba0273..45efcafa0 100644 --- a/data/pokemon/rby_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 new file mode 100644 index 000000000..5b54b84ed --- /dev/null +++ b/data/pokemon/unown_words.asm @@ -0,0 +1,65 @@ +unownword: MACRO +x = 1 +rept STRLEN(\1) + db STRSUB(\1, x, 1) - $40 +x = x + 1 +endr + db -1 +ENDM + +UnownWords: +; entries correspond to UNOWN_* form constants + dw UnownWordA + dw UnownWordA + dw UnownWordB + dw UnownWordC + dw UnownWordD + dw UnownWordE + dw UnownWordF + dw UnownWordG + dw UnownWordH + dw UnownWordI + dw UnownWordJ + dw UnownWordK + dw UnownWordL + dw UnownWordM + dw UnownWordN + dw UnownWordO + dw UnownWordP + dw UnownWordQ + dw UnownWordR + dw UnownWordS + dw UnownWordT + dw UnownWordU + dw UnownWordV + dw UnownWordW + dw UnownWordX + dw UnownWordY + dw UnownWordZ + +UnownWordA: unownword "ANGRY" +UnownWordB: unownword "BEAR" +UnownWordC: unownword "CHASE" +UnownWordD: unownword "DIRECT" +UnownWordE: unownword "ENGAGE" +UnownWordF: unownword "FIND" +UnownWordG: unownword "GIVE" +UnownWordH: unownword "HELP" +UnownWordI: unownword "INCREASE" +UnownWordJ: unownword "JOIN" +UnownWordK: unownword "KEEP" +UnownWordL: unownword "LAUGH" +UnownWordM: unownword "MAKE" +UnownWordN: unownword "NUZZLE" +UnownWordO: unownword "OBSERVE" +UnownWordP: unownword "PERFORM" +UnownWordQ: unownword "QUICKEN" +UnownWordR: unownword "REASSURE" +UnownWordS: unownword "SEARCH" +UnownWordT: unownword "TELL" +UnownWordU: unownword "UNDO" +UnownWordV: unownword "VANISH" +UnownWordW: unownword "WANT" +UnownWordX: unownword "XXXXX" +UnownWordY: unownword "YIELD" +UnownWordZ: unownword "ZOOM" 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 16281d035..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 @@ -15,19 +15,19 @@ PredefPointers:: ; 856b add_predef FillPP add_predef TryAddMonToParty add_predef AddTempmonToParty - add_predef SendGetPkmnIntoFromBox - add_predef SendPkmnIntoBox + add_predef SendGetMonIntoFromBox + add_predef SendMonIntoBox add_predef GiveEgg add_predef AnimateHPBar - add_predef CalcPkmnStats - add_predef CalcPkmnStatC + add_predef CalcMonStats + add_predef CalcMonStatC add_predef CanLearnTMHMMove add_predef GetTMHMMove add_predef LinkTextboxAtHL ; $ 10 add_predef PrintMoveDesc add_predef UpdatePlayerHUD add_predef PlaceGraphic - add_predef CheckPlayerPartyForFitPkmn + add_predef CheckPlayerPartyForFitMon add_predef UpdateEnemyHUD add_predef StartBattle add_predef FillInExpBar @@ -38,7 +38,7 @@ PredefPointers:: ; 856b add_predef EvolveAfterBattle add_predef TradeAnimationPlayer2 add_predef TradeAnimation - add_predef CopyPkmnToTempMon + add_predef CopyMonToTempMon add_predef ListMoves ; $20 add_predef PlaceNonFaintStatus add_predef Unused_PlaceEnemyHPLevel @@ -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/radio/oaks_pkmn_talk_routes.asm b/data/radio/oaks_pkmn_talk_routes.asm index ad7b6529d..acef4bdd3 100644 --- a/data/radio/oaks_pkmn_talk_routes.asm +++ b/data/radio/oaks_pkmn_talk_routes.asm @@ -1,19 +1,19 @@ ; Oak's Pokémon Talk will list wild Pokémon on these maps. -OaksPkmnTalkRoutes: - map ROUTE_29 - map ROUTE_46 - map ROUTE_30 - map ROUTE_32 - map ROUTE_34 - map ROUTE_35 - map ROUTE_37 - map ROUTE_38 - map ROUTE_39 - map ROUTE_42 - map ROUTE_43 - map ROUTE_44 - map ROUTE_45 - map ROUTE_36 - map ROUTE_31 -OaksPkmnTalkRoutesEnd +OaksPKMNTalkRoutes: + map_id ROUTE_29 + map_id ROUTE_46 + map_id ROUTE_30 + map_id ROUTE_32 + map_id ROUTE_34 + map_id ROUTE_35 + map_id ROUTE_37 + map_id ROUTE_38 + map_id ROUTE_39 + map_id ROUTE_42 + map_id ROUTE_43 + map_id ROUTE_44 + map_id ROUTE_45 + map_id ROUTE_36 + map_id ROUTE_31 +.End diff --git a/data/radio/pnp_hidden_places.asm b/data/radio/pnp_hidden_places.asm index 4cf1987d3..a43dfd252 100644 --- a/data/radio/pnp_hidden_places.asm +++ b/data/radio/pnp_hidden_places.asm @@ -1,13 +1,13 @@ ; Places and People will not describe these maps. PnP_HiddenPlaces: - map PALLET_TOWN - map ROUTE_22 - map PEWTER_CITY - map CERULEAN_POLICE_STATION - map ROUTE_12 - map ROUTE_11 - map ROUTE_16 - map ROUTE_14 - map CINNABAR_POKECENTER_2F_BETA -PnP_HiddenPlacesEnd + map_id PALLET_TOWN + map_id ROUTE_22 + map_id PEWTER_CITY + map_id CERULEAN_POLICE_STATION + map_id ROUTE_12 + map_id ROUTE_11 + map_id ROUTE_16 + map_id ROUTE_14 + map_id CINNABAR_POKECENTER_2F_BETA +.End 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 f788583a2..2b62dc6a3 100644 --- a/data/special_pointers.asm +++ b/data/special_pointers.asm @@ -6,180 +6,179 @@ add_special: MACRO dba \1 ENDM -SpecialsPointers:: ; c029 - add_special Special_WarpToSpawnPoint +SpecialsPointers:: + add_special WarpToSpawnPoint ; $0 ; Communications - add_special Special_SetBitsForLinkTradeRequest - add_special Special_WaitForLinkedFriend - add_special Special_CheckLinkTimeout - add_special Special_TryQuickSave - add_special Special_CheckBothSelectedSameRoom - add_special Special_FailedLinkToPast - add_special Special_CloseLink - add_special Special_WaitForOtherPlayerToExit - add_special Special_SetBitsForBattleRequest - add_special Special_SetBitsForTimeCapsuleRequest - add_special Special_CheckTimeCapsuleCompatibility - add_special Special_EnterTimeCapsule - add_special Special_TradeCenter - add_special Special_Colosseum - add_special Special_TimeCapsule - add_special Special_CableClubCheckWhichChris - add_special Special_CheckMysteryGift - add_special Special_GetMysteryGiftItem - add_special Special_UnlockMysteryGift + add_special SetBitsForLinkTradeRequest + add_special WaitForLinkedFriend + add_special CheckLinkTimeout + add_special TryQuickSave + add_special CheckBothSelectedSameRoom + add_special FailedLinkToPast + add_special CloseLink + add_special WaitForOtherPlayerToExit ; $8 + add_special SetBitsForBattleRequest + add_special SetBitsForTimeCapsuleRequest + add_special CheckTimeCapsuleCompatibility + add_special EnterTimeCapsule + add_special TradeCenter + add_special Colosseum + add_special TimeCapsule + add_special CableClubCheckWhichChris ; $10 + add_special CheckMysteryGift + add_special GetMysteryGiftItem + add_special UnlockMysteryGift -; Map Events - add_special Special_BugContestJudging - add_special Special_CheckPartyFullAfterContest - add_special Special_ContestDropOffMons - add_special Special_ContestReturnMons - add_special Special_GiveParkBalls - add_special Special_CheckMagikarpLength - add_special Special_MagikarpHouseSign +; Map events + add_special BugContestJudging + add_special CheckPartyFullAfterContest + add_special ContestDropOffMons + add_special ContestReturnMons + add_special GiveParkBalls ; $18 + add_special CheckMagikarpLength + add_special MagikarpHouseSign add_special HealParty ; this is both a special and a predef - add_special Special_PokemonCenterPC - add_special Special_KrissHousePC - add_special Special_DayCareMan - add_special Special_DayCareLady - add_special Special_DayCareManOutside - add_special Special_MoveDeletion - add_special Special_BankOfMom - add_special Special_MagnetTrain - add_special Special_NameRival - add_special Special_SetDayOfWeek - add_special Special_TownMap - add_special Special_UnownPrinter - add_special Special_MapRadio - add_special Special_UnownPuzzle - add_special Special_SlotMachine - add_special Special_CardFlip - add_special Special_DummyNonfunctionalGameCornerGame - add_special Special_ClearBGPalettesBufferScreen - add_special Special_FadeOutPalettes - add_special Special_BattleTowerFade - add_special Special_FadeBlackQuickly - add_special Special_FadeInPalettes - add_special Special_FadeInQuickly + add_special PokemonCenterPC + add_special PlayersHousePC + add_special DayCareMan + add_special DayCareLady + add_special DayCareManOutside ; $20 + add_special MoveDeletion + add_special BankOfMom + add_special MagnetTrain + add_special NameRival + add_special SetDayOfWeek + add_special OverworldTownMap + add_special UnownPrinter + add_special MapRadio ; $28 + add_special UnownPuzzle + add_special SlotMachine + add_special CardFlip + add_special DummyNonfunctionalGameCornerGame + add_special ClearBGPalettesBufferScreen + add_special FadeOutPalettes + add_special BattleTowerFade + add_special FadeBlackQuickly ; $30 + add_special FadeInPalettes + add_special FadeInQuickly add_special ReloadSpritesNoPalettes ; bank 0 add_special ClearBGPalettes ; bank 0 add_special UpdateTimePals ; bank 0 add_special ClearTileMap ; bank 0 add_special UpdateSprites ; bank 0 - add_special ReplaceKrisSprite ; bank 0 - add_special Special_GameCornerPrizeMonCheckDex - add_special UnusedSpecial_SeenMon + add_special ReplaceKrisSprite ; $38 ; bank 0 + add_special GameCornerPrizeMonCheckDex + add_special UnusedSetSeenMon add_special WaitSFX ; bank 0 add_special PlayMapMusic ; bank 0 add_special RestartMapMusic ; bank 0 - add_special Special_HealMachineAnim - add_special Special_SurfStartStep - add_special Special_FindGreaterThanThatLevel - add_special Special_FindAtLeastThatHappy - add_special Special_FindThatSpecies - add_special Special_FindThatSpeciesYourTrainerID - add_special UnusedSpecial_CheckUnusedTwoDayTimer - add_special Special_DayCareMon1 - add_special Special_DayCareMon2 - add_special Special_SelectRandomBugContestContestants - add_special Special_ActivateFishingSwarm - add_special Special_ToggleMaptileDecorations - add_special Special_ToggleDecorationsVisibility - add_special Special_GiveShuckle - add_special Special_ReturnShuckle - add_special Special_BillsGrandfather - add_special Special_CheckPokerus - add_special Special_DisplayCoinCaseBalance - add_special Special_DisplayMoneyAndCoinBalance - add_special Special_PlaceMoneyTopRight - add_special Special_CheckForLuckyNumberWinners - add_special Special_CheckLuckyNumberShowFlag - add_special Special_ResetLuckyNumberShowFlag - add_special Special_PrintTodaysLuckyNumber - add_special Special_SelectApricornForKurt - add_special Special_NameRater - add_special Special_DisplayLinkRecord - add_special Special_GetFirstPokemonHappiness - add_special Special_CheckFirstMonIsEgg - add_special Special_RandomUnseenWildMon - add_special Special_RandomPhoneWildMon - add_special Special_RandomPhoneMon - add_special Special_LoadUsedSpritesGFX - add_special Special_PlaySlowCry - add_special Special_SnorlaxAwake - add_special Special_YoungerHaircutBrother - add_special Special_OlderHaircutBrother - add_special Special_DaisyMassage - add_special Special_PlayCurMonCry - add_special Special_ProfOaksPCBoot - add_special Special_GameboyCheck - add_special Special_TrainerHouse - add_special Special_PhotoStudio - add_special Special_InitRoamMons - add_special Special_FadeOutMusic - add_special Special_Diploma - add_special Special_PrintDiploma + add_special HealMachineAnim + add_special SurfStartStep + add_special FindPartyMonAboveLevel ; $40 + add_special FindPartyMonAtLeastThatHappy + add_special FindPartyMonThatSpecies + add_special FindPartyMonThatSpeciesYourTrainerID + add_special UnusedCheckUnusedTwoDayTimer + add_special DayCareMon1 + add_special DayCareMon2 + add_special SelectRandomBugContestContestants + add_special ActivateFishingSwarm ; $48 + add_special ToggleMaptileDecorations + add_special ToggleDecorationsVisibility + add_special GiveShuckle + add_special ReturnShuckle + add_special BillsGrandfather + add_special CheckPokerus + add_special DisplayCoinCaseBalance + add_special DisplayMoneyAndCoinBalance ; $50 + add_special PlaceMoneyTopRight + add_special CheckForLuckyNumberWinners + add_special CheckLuckyNumberShowFlag + add_special ResetLuckyNumberShowFlag + add_special PrintTodaysLuckyNumber + add_special SelectApricornForKurt + add_special NameRater + add_special DisplayLinkRecord ; $58 + add_special GetFirstPokemonHappiness + add_special CheckFirstMonIsEgg + add_special RandomUnseenWildMon + add_special RandomPhoneWildMon + add_special RandomPhoneMon + add_special LoadUsedSpritesGFX + add_special PlaySlowCry + add_special SnorlaxAwake ; $60 + add_special YoungerHaircutBrother + add_special OlderHaircutBrother + add_special DaisysGrooming + add_special PlayCurMonCry + add_special ProfOaksPCBoot + add_special GameboyCheck + add_special TrainerHouse + add_special PhotoStudio ; $68 + add_special InitRoamMons + add_special FadeOutMusic + add_special Diploma + add_special PrintDiploma - ; Crystal - add_special Special_Function11ac3e - add_special Special_Function11b444 - add_special Special_Function11b5e8 - add_special Special_Function11b7e5 - add_special Special_Function11b879 - add_special Special_Function11b920 - add_special Special_Function11b93b - add_special Special_BattleTowerRoomMenu - add_special Special_Function1700ba - add_special Special_Function170114 - add_special Special_BattleTowerBattle - add_special UnusedSpecial_Function1704e1 +; Crystal only + add_special Function11ac3e + add_special Function11b444 + add_special Function11b5e8 + add_special Function11b7e5 ; $70 + add_special Function11b879 + add_special Function11b920 + add_special Function11b93b + add_special BattleTowerRoomMenu + add_special Function1700ba + add_special Function170114 + add_special BattleTowerBattle + add_special Function1704e1 ; $78 add_special DummySpecial_17021d - add_special Special_LoadOpponentTrainerAndPokemonWithOTSprite - add_special Special_Function11ba38 - add_special Special_CheckForBattleTowerRules - add_special Special_GiveOddEgg + add_special LoadOpponentTrainerAndPokemonWithOTSprite + add_special Function11ba38 + add_special CheckForBattleTowerRules + add_special GiveOddEgg add_special Reset ; bank 0 - add_special Special_Function1011f1 - add_special Special_Function101220 - add_special Special_Function101225 - add_special Special_Function101231 - add_special Special_MoveTutor - add_special Special_OmanyteChamber - add_special Special_Function11c1ab - add_special Special_BattleTowerAction - add_special Special_DisplayUnownWords - add_special Special_Menu_ChallengeExplanationCancel - add_special Special_Function17d2b6 - add_special Special_Function17d2ce - add_special Special_BattleTowerMobileError - add_special Special_AskMobileOrCable - add_special Special_HoOhChamber - add_special Special_Function102142 - add_special Special_CelebiShrineEvent - add_special Special_CheckCaughtCelebi - add_special Special_PokeSeer - add_special Special_BuenasPassword - add_special Special_BuenaPrize - add_special Special_Dratini - add_special Special_SampleKenjiBreakCountdown - add_special Special_BeastsCheck - add_special Special_MonCheck - add_special Special_SetPlayerPalette + add_special Function1011f1 + add_special Function101220 ; $80 + add_special Function101225 + add_special Function101231 + add_special MoveTutor + add_special OmanyteChamber + add_special Function11c1ab + add_special BattleTowerAction + add_special DisplayUnownWords + add_special Menu_ChallengeExplanationCancel ; $88 + add_special Function17d2b6 + add_special Function17d2ce + add_special BattleTowerMobileError + add_special AskMobileOrCable + add_special HoOhChamber + add_special Function102142 + add_special CelebiShrineEvent + add_special CheckCaughtCelebi ; $90 + add_special PokeSeer + add_special BuenasPassword + add_special BuenaPrize + add_special GiveDratini + add_special SampleKenjiBreakCountdown + add_special BeastsCheck + add_special MonCheck + add_special SetPlayerPalette ; $98 add_special DummySpecial_170bd2 - add_special Special_Mobile_SelectThreeMons - add_special Special_Function1037eb - add_special Special_Function10383c - add_special Special_StubbedTrainerRankings_Healings - add_special Special_RefreshSprites - add_special Special_Function1037c2 - add_special Special_Mobile_DummyReturnFalse - add_special Special_Function103780 - add_special Special_Function10387b - add_special Special_AskRememberPassword - add_special Special_LoadMapPalettes - add_special UnusedSpecial_FindItemInPCOrBag - add_special Special_InitialSetDSTFlag - add_special Special_InitialClearDSTFlag - add_special DummySpecial_c224 -; c224 + add_special Mobile_SelectThreeMons + add_special Function1037eb + add_special Function10383c + add_special StubbedTrainerRankings_Healings + add_special RefreshSprites + add_special Function1037c2 + add_special Mobile_DummyReturnFalse ; $a0 + add_special Function103780 + add_special Function10387b + add_special AskRememberPassword + add_special LoadMapPalettes + add_special UnusedFindItemInPCOrBag + add_special InitialSetDSTFlag + add_special InitialClearDSTFlag + add_special DummySpecial_c224 ; $a8 diff --git a/data/sprite_anims/framesets.asm b/data/sprite_anims/framesets.asm index d768ec21a..666f2b2e2 100755..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 4d2a55364..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 @@ -32,11 +32,10 @@ Facings: ; 4049 dw FacingBoulderDust2 dw FacingGrass1 dw FacingGrass2 -FacingsEnd: +.End dw 0 -NUM_FACINGS EQU (FacingsEnd - Facings) / 2 - +NUM_FACINGS EQU (Facings.End - Facings) / 2 ; Tables used as a reference to transform OAM data. @@ -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 19a7c8d27..10afaf57b 100755..100644 --- a/data/sprites/map_objects.asm +++ b/data/sprites/map_objects.asm @@ -1,47 +1,306 @@ -sprite_movement_data: MACRO - db \1, \2, \3, \4, \5 - dn \6, 0 -ENDM - -SpriteMovementData:: ; 4273 +SpriteMovementData:: ; entries correspond to SPRITEMOVEDATA_* constants - ; function, facing, action, flags1, flags2, palette flags - sprite_movement_data SPRITEMOVEFN_00, DOWN, OBJECT_ACTION_STAND, $02, $00, %0000 ; SPRITEMOVEDATA_00 - sprite_movement_data SPRITEMOVEFN_STANDING, DOWN, OBJECT_ACTION_STAND, $0c, $00, %0000 ; SPRITEMOVEDATA_ITEM_TREE - sprite_movement_data SPRITEMOVEFN_RANDOM_WALK_XY, DOWN, OBJECT_ACTION_STAND, $00, $00, %0000 ; SPRITEMOVEDATA_WANDER - sprite_movement_data SPRITEMOVEFN_SLOW_RANDOM_SPIN, DOWN, OBJECT_ACTION_STAND, $00, $00, %0000 ; SPRITEMOVEDATA_SPINRANDOM_SLOW - sprite_movement_data SPRITEMOVEFN_RANDOM_WALK_Y, DOWN, OBJECT_ACTION_STAND, $00, $00, %0000 ; SPRITEMOVEDATA_WALK_UP_DOWN - sprite_movement_data SPRITEMOVEFN_RANDOM_WALK_X, DOWN, OBJECT_ACTION_STAND, $00, $00, %0000 ; SPRITEMOVEDATA_WALK_LEFT_RIGHT - sprite_movement_data SPRITEMOVEFN_STANDING, DOWN, OBJECT_ACTION_STAND, $00, $00, %0000 ; SPRITEMOVEDATA_STANDING_DOWN - sprite_movement_data SPRITEMOVEFN_STANDING, UP, OBJECT_ACTION_STAND, $00, $00, %0000 ; SPRITEMOVEDATA_STANDING_UP - sprite_movement_data SPRITEMOVEFN_STANDING, LEFT, OBJECT_ACTION_STAND, $00, $00, %0000 ; SPRITEMOVEDATA_STANDING_LEFT - sprite_movement_data SPRITEMOVEFN_STANDING, RIGHT, OBJECT_ACTION_STAND, $00, $00, %0000 ; SPRITEMOVEDATA_STANDING_RIGHT - sprite_movement_data SPRITEMOVEFN_FAST_RANDOM_SPIN, DOWN, OBJECT_ACTION_STAND, $00, $00, %0000 ; SPRITEMOVEDATA_SPINRANDOM_FAST - sprite_movement_data SPRITEMOVEFN_OBEY_DPAD, DOWN, OBJECT_ACTION_STAND, $02, $00, %0000 ; SPRITEMOVEDATA_PLAYER - sprite_movement_data SPRITEMOVEFN_08, DOWN, OBJECT_ACTION_STAND, $00, $00, %0000 ; SPRITEMOVEDATA_0C - sprite_movement_data SPRITEMOVEFN_09, DOWN, OBJECT_ACTION_STAND, $00, $00, %0000 ; SPRITEMOVEDATA_0D - sprite_movement_data SPRITEMOVEFN_0A, DOWN, OBJECT_ACTION_STAND, $00, $00, %0000 ; SPRITEMOVEDATA_0E - sprite_movement_data SPRITEMOVEFN_0B, DOWN, OBJECT_ACTION_STAND, $00, $00, %0000 ; SPRITEMOVEDATA_0F - sprite_movement_data SPRITEMOVEFN_0C, DOWN, OBJECT_ACTION_STAND, $00, $00, %0000 ; SPRITEMOVEDATA_10 - sprite_movement_data SPRITEMOVEFN_0D, DOWN, OBJECT_ACTION_STAND, $00, $00, %0000 ; SPRITEMOVEDATA_11 - sprite_movement_data SPRITEMOVEFN_0E, DOWN, OBJECT_ACTION_STAND, $00, $00, %0000 ; SPRITEMOVEDATA_12 - sprite_movement_data SPRITEMOVEFN_FOLLOW, DOWN, OBJECT_ACTION_STAND, $02, $00, %0000 ; SPRITEMOVEDATA_FOLLOWING - sprite_movement_data SPRITEMOVEFN_SCRIPTED, DOWN, OBJECT_ACTION_STAND, $02, $00, %0000 ; SPRITEMOVEDATA_SCRIPTED - sprite_movement_data SPRITEMOVEFN_BIG_SNORLAX, DOWN, OBJECT_ACTION_BIG_SNORLAX, $2e, $01, %1100 ; SPRITEMOVEDATA_SNORLAX - sprite_movement_data SPRITEMOVEFN_BOUNCE, DOWN, OBJECT_ACTION_BOUNCE, $2e, $00, %0000 ; SPRITEMOVEDATA_POKEMON - sprite_movement_data SPRITEMOVEFN_STANDING, DOWN, OBJECT_ACTION_STAND, $0c, $00, %0000 ; SPRITEMOVEDATA_SUDOWOODO - sprite_movement_data SPRITEMOVEFN_STANDING, DOWN, OBJECT_ACTION_STAND, $2e, $10, %0000 ; SPRITEMOVEDATA_SMASHABLE_ROCK - sprite_movement_data SPRITEMOVEFN_STRENGTH, DOWN, OBJECT_ACTION_STAND, $2e, $00, %0100 ; SPRITEMOVEDATA_STRENGTH_BOULDER - sprite_movement_data SPRITEMOVEFN_FOLLOWNOTEXACT, DOWN, OBJECT_ACTION_STAND, $02, $00, %0000 ; SPRITEMOVEDATA_FOLLOWNOTEXACT - sprite_movement_data SPRITEMOVEFN_SHADOW, DOWN, OBJECT_ACTION_00, $8e, $01, %0000 ; SPRITEMOVEDATA_SHADOW - sprite_movement_data SPRITEMOVEFN_EMOTE, DOWN, OBJECT_ACTION_EMOTE, $8e, $02, %0000 ; SPRITEMOVEDATA_EMOTE - sprite_movement_data SPRITEMOVEFN_SCREENSHAKE, DOWN, OBJECT_ACTION_00, $82, $00, %0000 ; SPRITEMOVEDATA_SCREENSHAKE - sprite_movement_data SPRITEMOVEFN_SPIN_COUNTERCLOCKWISE, LEFT, OBJECT_ACTION_STAND, $00, $00, %0000 ; SPRITEMOVEDATA_SPINCOUNTERCLOCKWISE - sprite_movement_data SPRITEMOVEFN_SPIN_CLOCKWISE, RIGHT, OBJECT_ACTION_STAND, $00, $00, %0000 ; SPRITEMOVEDATA_SPINCLOCKWISE - sprite_movement_data SPRITEMOVEFN_STRENGTH, DOWN, OBJECT_ACTION_BIG_LAPRAS, $2e, $01, %1100 ; SPRITEMOVEDATA_20 - sprite_movement_data SPRITEMOVEFN_STRENGTH, DOWN, OBJECT_ACTION_BIG_DOLL, $2e, $01, %1100 ; SPRITEMOVEDATA_BIGDOLL - sprite_movement_data SPRITEMOVEFN_BOULDERDUST, DOWN, OBJECT_ACTION_BOULDER_DUST, $8e, $01, %0000 ; SPRITEMOVEDATA_BOULDERDUST - sprite_movement_data SPRITEMOVEFN_GRASS, DOWN, OBJECT_ACTION_GRASS_SHAKE, $8e, $02, %0000 ; SPRITEMOVEDATA_GRASS - sprite_movement_data SPRITEMOVEFN_RANDOM_WALK_XY, DOWN, OBJECT_ACTION_STAND, $00, $00, %0010 ; SPRITEMOVEDATA_LAPRAS - sprite_movement_data SPRITEMOVEFN_00, DOWN, OBJECT_ACTION_STAND, $00, $00, %0000 ; 25 -; 4357 + +; SPRITEMOVEDATA_00 + db SPRITEMOVEFN_00 ; movement function + db DOWN ; facing + db OBJECT_ACTION_STAND ; action + 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 0 ; flags1 + db 0 ; flags2 + db SWIMMING ; palette flags + +; 25 + db SPRITEMOVEFN_00 ; movement function + db DOWN ; facing + db OBJECT_ACTION_STAND ; action + db 0 ; flags1 + db 0 ; flags2 + db 0 ; palette flags diff --git a/data/sprites/player_sprites.asm b/data/sprites/player_sprites.asm new file mode 100644 index 000000000..89eb6e831 --- /dev/null +++ b/data/sprites/player_sprites.asm @@ -0,0 +1,13 @@ +ChrisStateSprites: + db PLAYER_NORMAL, SPRITE_CHRIS + db PLAYER_BIKE, SPRITE_CHRIS_BIKE + db PLAYER_SURF, SPRITE_SURF + db PLAYER_SURF_PIKA, SPRITE_SURFING_PIKACHU + db -1 ; end + +KrisStateSprites: + db PLAYER_NORMAL, SPRITE_KRIS + db PLAYER_BIKE, SPRITE_KRIS_BIKE + db PLAYER_SURF, SPRITE_SURF + db PLAYER_SURF_PIKA, SPRITE_SURFING_PIKACHU + db -1 ; end 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 214b14757..b55593c97 100644 --- a/data/sprites/sprites.asm +++ b/data/sprites/sprites.asm @@ -1,111 +1,110 @@ overworld_sprite: MACRO ; pointer, length, type, palette dw \1 - db \2 * 4 tiles, BANK(\1) - db \3, \4 + db \2 tiles, BANK(\1), \3, \4 ENDM -OverworldSprites: ; 14736 +OverworldSprites: ; entries correspond to SPRITE_* constants - overworld_sprite ChrisSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED - overworld_sprite ChrisBikeSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED - overworld_sprite GameboyKidSpriteGFX, 3, STANDING_SPRITE, PAL_OW_GREEN - overworld_sprite SilverSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED - overworld_sprite OakSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN - overworld_sprite RedSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED - overworld_sprite BlueSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED - overworld_sprite BillSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED - overworld_sprite ElderSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN - overworld_sprite JanineSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED - overworld_sprite KurtSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN - overworld_sprite MomSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED - overworld_sprite BlaineSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN - overworld_sprite RedsMomSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED - overworld_sprite DaisySpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE - overworld_sprite ElmSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN - overworld_sprite WillSpriteGFX, 3, STANDING_SPRITE, PAL_OW_RED - overworld_sprite FalknerSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE - overworld_sprite WhitneySpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED - overworld_sprite BugsySpriteGFX, 3, WALKING_SPRITE, PAL_OW_GREEN - overworld_sprite MortySpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN - overworld_sprite ChuckSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED - overworld_sprite JasmineSpriteGFX, 3, WALKING_SPRITE, PAL_OW_GREEN - overworld_sprite PryceSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN - overworld_sprite ClairSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED - overworld_sprite BrockSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN - overworld_sprite KarenSpriteGFX, 3, STANDING_SPRITE, PAL_OW_BLUE - overworld_sprite BrunoSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED - overworld_sprite MistySpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE - overworld_sprite LanceSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED - overworld_sprite SurgeSpriteGFX, 3, WALKING_SPRITE, PAL_OW_GREEN - overworld_sprite ErikaSpriteGFX, 3, WALKING_SPRITE, PAL_OW_GREEN - overworld_sprite KogaSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN - overworld_sprite SabrinaSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED - overworld_sprite CooltrainerMSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE - overworld_sprite CooltrainerFSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE - overworld_sprite BugCatcherSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE - overworld_sprite TwinSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED - overworld_sprite YoungsterSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE - overworld_sprite LassSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED - overworld_sprite TeacherSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED - overworld_sprite BuenaSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE - overworld_sprite SuperNerdSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE - overworld_sprite RockerSpriteGFX, 3, WALKING_SPRITE, PAL_OW_GREEN - overworld_sprite PokefanMSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN - overworld_sprite PokefanFSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN - overworld_sprite GrampsSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN - overworld_sprite GrannySpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN - overworld_sprite SwimmerGuySpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE - overworld_sprite SwimmerGirlSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE - overworld_sprite BigSnorlaxSpriteGFX, 3, STANDING_SPRITE, PAL_OW_BLUE - overworld_sprite SurfingPikachuSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED - overworld_sprite RocketSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN - overworld_sprite RocketGirlSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN - overworld_sprite NurseSpriteGFX, 3, STANDING_SPRITE, PAL_OW_RED - overworld_sprite LinkReceptionistSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED - overworld_sprite ClerkSpriteGFX, 3, WALKING_SPRITE, PAL_OW_GREEN - overworld_sprite FisherSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE - overworld_sprite FishingGuruSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE - overworld_sprite ScientistSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE - overworld_sprite KimonoGirlSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED - overworld_sprite SageSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN - overworld_sprite UnusedGuySpriteGFX, 3, STANDING_SPRITE, PAL_OW_RED - overworld_sprite GentlemanSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE - overworld_sprite BlackBeltSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN - overworld_sprite ReceptionistSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE - overworld_sprite OfficerSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE - overworld_sprite CalSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN - overworld_sprite SlowpokeSpriteGFX, 1, STILL_SPRITE, PAL_OW_RED - overworld_sprite CaptainSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN - overworld_sprite BigLaprasSpriteGFX, 3, STANDING_SPRITE, PAL_OW_BLUE - overworld_sprite GymGuySpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE - overworld_sprite SailorSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE - overworld_sprite BikerSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN - overworld_sprite PharmacistSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE - overworld_sprite MonsterSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED - overworld_sprite FairySpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED - overworld_sprite BirdSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED - overworld_sprite DragonSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED - overworld_sprite BigOnixSpriteGFX, 3, STANDING_SPRITE, PAL_OW_BROWN - overworld_sprite N64SpriteGFX, 1, STILL_SPRITE, PAL_OW_BROWN - overworld_sprite SudowoodoSpriteGFX, 3, STANDING_SPRITE, PAL_OW_GREEN - overworld_sprite SurfSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE - overworld_sprite PokeBallSpriteGFX, 1, STILL_SPRITE, PAL_OW_RED - overworld_sprite PokedexSpriteGFX, 1, STILL_SPRITE, PAL_OW_BROWN - overworld_sprite PaperSpriteGFX, 1, STILL_SPRITE, PAL_OW_BLUE - overworld_sprite VirtualBoySpriteGFX, 1, STILL_SPRITE, PAL_OW_RED - overworld_sprite OldLinkReceptionistSpriteGFX, 3, STANDING_SPRITE, PAL_OW_RED - overworld_sprite RockSpriteGFX, 1, STILL_SPRITE, PAL_OW_ROCK - overworld_sprite BoulderSpriteGFX, 1, STILL_SPRITE, PAL_OW_ROCK - overworld_sprite SnesSpriteGFX, 1, STILL_SPRITE, PAL_OW_BLUE - overworld_sprite FamicomSpriteGFX, 1, STILL_SPRITE, PAL_OW_RED - overworld_sprite FruitTreeSpriteGFX, 1, STILL_SPRITE, PAL_OW_TREE - overworld_sprite GoldTrophySpriteGFX, 1, STILL_SPRITE, PAL_OW_BROWN - overworld_sprite SilverTrophySpriteGFX, 1, STILL_SPRITE, PAL_OW_SILVER - overworld_sprite KrisSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE - overworld_sprite KrisBikeSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE - overworld_sprite KurtOutsideSpriteGFX, 3, STANDING_SPRITE, PAL_OW_BROWN - overworld_sprite SuicuneSpriteGFX, 1, STILL_SPRITE, PAL_OW_BLUE - overworld_sprite EnteiSpriteGFX, 1, STILL_SPRITE, PAL_OW_RED - overworld_sprite RaikouSpriteGFX, 1, STILL_SPRITE, PAL_OW_RED - overworld_sprite StandingYoungsterSpriteGFX, 3, STANDING_SPRITE, PAL_OW_BLUE + overworld_sprite ChrisSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED + overworld_sprite ChrisBikeSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED + overworld_sprite GameboyKidSpriteGFX, 12, STANDING_SPRITE, PAL_OW_GREEN + overworld_sprite SilverSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED + overworld_sprite OakSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN + overworld_sprite RedSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED + overworld_sprite BlueSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED + overworld_sprite BillSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED + overworld_sprite ElderSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN + overworld_sprite JanineSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED + overworld_sprite KurtSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN + overworld_sprite MomSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED + overworld_sprite BlaineSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN + overworld_sprite RedsMomSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED + overworld_sprite DaisySpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE + overworld_sprite ElmSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN + overworld_sprite WillSpriteGFX, 12, STANDING_SPRITE, PAL_OW_RED + overworld_sprite FalknerSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE + overworld_sprite WhitneySpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED + overworld_sprite BugsySpriteGFX, 12, WALKING_SPRITE, PAL_OW_GREEN + overworld_sprite MortySpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN + overworld_sprite ChuckSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED + overworld_sprite JasmineSpriteGFX, 12, WALKING_SPRITE, PAL_OW_GREEN + overworld_sprite PryceSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN + overworld_sprite ClairSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED + overworld_sprite BrockSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN + overworld_sprite KarenSpriteGFX, 12, STANDING_SPRITE, PAL_OW_BLUE + overworld_sprite BrunoSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED + overworld_sprite MistySpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE + overworld_sprite LanceSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED + overworld_sprite SurgeSpriteGFX, 12, WALKING_SPRITE, PAL_OW_GREEN + overworld_sprite ErikaSpriteGFX, 12, WALKING_SPRITE, PAL_OW_GREEN + overworld_sprite KogaSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN + overworld_sprite SabrinaSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED + overworld_sprite CooltrainerMSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE + overworld_sprite CooltrainerFSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE + overworld_sprite BugCatcherSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE + overworld_sprite TwinSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED + overworld_sprite YoungsterSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE + overworld_sprite LassSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED + overworld_sprite TeacherSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED + overworld_sprite BuenaSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE + overworld_sprite SuperNerdSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE + overworld_sprite RockerSpriteGFX, 12, WALKING_SPRITE, PAL_OW_GREEN + overworld_sprite PokefanMSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN + overworld_sprite PokefanFSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN + overworld_sprite GrampsSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN + overworld_sprite GrannySpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN + overworld_sprite SwimmerGuySpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE + overworld_sprite SwimmerGirlSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE + overworld_sprite BigSnorlaxSpriteGFX, 12, STANDING_SPRITE, PAL_OW_BLUE + overworld_sprite SurfingPikachuSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED + overworld_sprite RocketSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN + overworld_sprite RocketGirlSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN + overworld_sprite NurseSpriteGFX, 12, STANDING_SPRITE, PAL_OW_RED + overworld_sprite LinkReceptionistSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED + overworld_sprite ClerkSpriteGFX, 12, WALKING_SPRITE, PAL_OW_GREEN + overworld_sprite FisherSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE + overworld_sprite FishingGuruSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE + overworld_sprite ScientistSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE + overworld_sprite KimonoGirlSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED + overworld_sprite SageSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN + overworld_sprite UnusedGuySpriteGFX, 12, STANDING_SPRITE, PAL_OW_RED + overworld_sprite GentlemanSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE + overworld_sprite BlackBeltSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN + overworld_sprite ReceptionistSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE + overworld_sprite OfficerSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE + overworld_sprite CalSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN + overworld_sprite SlowpokeSpriteGFX, 4, STILL_SPRITE, PAL_OW_RED + overworld_sprite CaptainSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN + overworld_sprite BigLaprasSpriteGFX, 12, STANDING_SPRITE, PAL_OW_BLUE + overworld_sprite GymGuySpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE + overworld_sprite SailorSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE + overworld_sprite BikerSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN + overworld_sprite PharmacistSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE + overworld_sprite MonsterSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED + overworld_sprite FairySpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED + overworld_sprite BirdSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED + overworld_sprite DragonSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED + overworld_sprite BigOnixSpriteGFX, 12, STANDING_SPRITE, PAL_OW_BROWN + overworld_sprite N64SpriteGFX, 4, STILL_SPRITE, PAL_OW_BROWN + overworld_sprite SudowoodoSpriteGFX, 12, STANDING_SPRITE, PAL_OW_GREEN + overworld_sprite SurfSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE + overworld_sprite PokeBallSpriteGFX, 4, STILL_SPRITE, PAL_OW_RED + overworld_sprite PokedexSpriteGFX, 4, STILL_SPRITE, PAL_OW_BROWN + overworld_sprite PaperSpriteGFX, 4, STILL_SPRITE, PAL_OW_BLUE + overworld_sprite VirtualBoySpriteGFX, 4, STILL_SPRITE, PAL_OW_RED + overworld_sprite OldLinkReceptionistSpriteGFX, 12, STANDING_SPRITE, PAL_OW_RED + overworld_sprite RockSpriteGFX, 4, STILL_SPRITE, PAL_OW_ROCK + overworld_sprite BoulderSpriteGFX, 4, STILL_SPRITE, PAL_OW_ROCK + overworld_sprite SnesSpriteGFX, 4, STILL_SPRITE, PAL_OW_BLUE + overworld_sprite FamicomSpriteGFX, 4, STILL_SPRITE, PAL_OW_RED + overworld_sprite FruitTreeSpriteGFX, 4, STILL_SPRITE, PAL_OW_TREE + overworld_sprite GoldTrophySpriteGFX, 4, STILL_SPRITE, PAL_OW_BROWN + overworld_sprite SilverTrophySpriteGFX, 4, STILL_SPRITE, PAL_OW_SILVER + overworld_sprite KrisSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE + overworld_sprite KrisBikeSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE + overworld_sprite KurtOutsideSpriteGFX, 12, STANDING_SPRITE, PAL_OW_BROWN + overworld_sprite SuicuneSpriteGFX, 4, STILL_SPRITE, PAL_OW_BLUE + overworld_sprite EnteiSpriteGFX, 4, STILL_SPRITE, PAL_OW_RED + overworld_sprite RaikouSpriteGFX, 4, STILL_SPRITE, PAL_OW_RED + overworld_sprite StandingYoungsterSpriteGFX, 12, STANDING_SPRITE, PAL_OW_BLUE diff --git a/data/battle/battle_text.asm b/data/text/battle.asm index 1a609b476..97152ebbb 100644 --- a/data/battle/battle_text.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_PkmnLightScreenFell: ; 0x808e7 +BattleText_MonsLightScreenFell: text_from_ram wStringBuffer1 text " #MON's" line "LIGHT SCREEN fell!" prompt -; 0x80905 -BattleText_PkmnReflectFaded: ; 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_EnemyPkmnFainted: ; 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_PkmnFainted: ; 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_EnemyIsAboutToUseWillPlayerChangePkmn: ; 0x80aca +BattleText_EnemyIsAboutToUseWillPlayerChangeMon: text "<ENEMY>" line "is about to use" cont "@" @@ -271,128 +236,111 @@ BattleText_EnemyIsAboutToUseWillPlayerChangePkmn: ; 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_PkmnIsAlreadyOut: ; 0x80c0d +BattleText_MonIsAlreadyOut: text_from_ram wBattleMonNick text_start line "is already out." prompt -; 0x80c22 -BattleText_PkmnCantBeRecalled: ; 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_PkmnHasNoMovesLeft: ; 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_WildPkmnIsEating: ; 0x80cba +BattleText_WildMonIsEating: text "Wild @" text_from_ram wEnemyMonNick text_start line "is eating!" prompt -; 0x80cd1 -BattleText_WildPkmnIsAngry: ; 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.asm b/data/text/common.asm new file mode 100644 index 000000000..d1fbb8b1a --- /dev/null +++ b/data/text/common.asm @@ -0,0 +1,16 @@ +INCLUDE "constants.asm" + + +SECTION "Text 1", ROMX + +INCLUDE "data/text/common_1.asm" + + +SECTION "Text 2", ROMX + +INCLUDE "data/text/common_2.asm" + + +SECTION "Text 3", ROMX + +INCLUDE "data/text/common_3.asm" diff --git a/data/common_text/common_text_1.asm b/data/text/common_1.asm index 80b47013d..c99f7eb29 100644 --- a/data/common_text/common_text_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 "@@" @@ -1121,7 +1121,7 @@ Text_RemainingTime:: text "Remaining Time" done -Text_YourPkmnsHPWasHealed:: +Text_YourMonsHPWasHealed:: text "Your #MON's HP" line "was healed." prompt diff --git a/data/common_text/common_text_2.asm b/data/text/common_2.asm index 183d254fc..582d3b16f 100644 --- a/data/common_text/common_text_2.asm +++ b/data/text/common_2.asm @@ -113,17 +113,17 @@ Text_StringBuffer2ExpPoints:: text " EXP. Points!" prompt -Text_GoPkmn:: +Text_GoMon:: text "Go! @@" -Text_DoItPkmn:: +Text_DoItMon:: text "Do it! @@" -Text_GoForItPkmn:: +Text_GoForItMon:: text "Go for it," line "@@" -Text_YourFoesWeakGetmPkmn:: +Text_YourFoesWeakGetmMon:: text "Your foe's weak!" line "Get'm, @@" @@ -618,7 +618,7 @@ UnknownText_0x1c0bee:: cont "time to use that!" prompt -Text_YouDontHaveAPkmn:: +Text_YouDontHaveAMon:: text "You don't have a" line "#MON!" prompt @@ -1071,12 +1071,12 @@ UnknownText_0x1c1368:: line "to do?" done -_KrissPCHowManyWithdrawText:: +_PlayersPCHowManyWithdrawText:: text "How many do you" line "want to withdraw?" done -_KrissPCWithdrewItemsText:: +_PlayersPCWithdrewItemsText:: text "Withdrew @" deciram wItemQuantityChangeBuffer, 1, 2 text_start @@ -1085,7 +1085,7 @@ _KrissPCWithdrewItemsText:: text "(S)." prompt -_KrissPCNoRoomWithdrawText:: +_PlayersPCNoRoomWithdrawText:: text "There's no room" line "for more items." prompt @@ -1094,12 +1094,12 @@ UnknownText_0x1c13df:: text "No items here!" prompt -_KrissPCHowManyDepositText:: +_PlayersPCHowManyDepositText:: text "How many do you" line "want to deposit?" done -_KrissPCDepositItemsText:: +_PlayersPCDepositItemsText:: text "Deposited @" deciram wItemQuantityChangeBuffer, 1, 2 text_start @@ -1108,7 +1108,7 @@ _KrissPCDepositItemsText:: text "(S)." prompt -_KrissPCNoRoomDepositText:: +_PlayersPCNoRoomDepositText:: text "There's no room to" line "store items." prompt diff --git a/data/common_text/common_text_3.asm b/data/text/common_3.asm index 7724775a4..4ed12258b 100644 --- a/data/common_text/common_text_3.asm +++ b/data/text/common_3.asm @@ -1139,14 +1139,14 @@ UnknownText_0x1c59a3:: para "" done -Text_OnlyThreePkmnMayBeEntered:: +Text_OnlyThreeMonMayBeEntered:: text "Only three #MON" line "may be entered." para "" done -Text_ThePkmnMustAllBeDifferentKinds:: +Text_TheMonMustAllBeDifferentKinds:: text "The @" text_from_ram wStringBuffer2 text " #MON" @@ -1156,7 +1156,7 @@ Text_ThePkmnMustAllBeDifferentKinds:: para "" done -Text_ThePkmnMustNotHoldTheSameItems:: +Text_TheMonMustNotHoldTheSameItems:: text "The @" text_from_ram wStringBuffer2 text " #MON" diff --git a/data/mail_input_chars.asm b/data/text/mail_input_chars.asm index ca3833529..ac76e71eb 100644 --- a/data/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/name_input_chars.asm b/data/text/name_input_chars.asm index d89289142..d89289142 100644 --- a/data/name_input_chars.asm +++ b/data/text/name_input_chars.asm diff --git a/data/std_text.asm b/data/text/std_text.asm index 238f0ac5d..238f0ac5d 100644 --- a/data/std_text.asm +++ b/data/text/std_text.asm diff --git a/data/unused/dakutens.asm b/data/text/unused_dakutens.asm index 756018d79..756018d79 100644 --- a/data/unused/dakutens.asm +++ b/data/text/unused_dakutens.asm diff --git a/data/unused/gen_1_trainer_names.asm b/data/text/unused_gen1_trainer_names.asm index b3d60569d..fa839f366 100644 --- a/data/unused/gen_1_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/unused/sweet_honey_text.asm b/data/text/unused_sweet_honey.asm index 9bfa4f6b1..04ceae2e6 100644 --- a/data/unused/sweet_honey_text.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 c44a218fc..b95c20f40 100644 --- a/data/tilesets.asm +++ b/data/tilesets.asm @@ -7,10 +7,10 @@ ENDM ; Associated data: ; - The *GFX, *Meta, and *Coll are defined in gfx/tilesets.asm -; - The *Anim are defined in engine/tileset_anims.asm -; - The *PalMap are defined in gfx/tilesets/palette_maps.asm +; - The *PalMap are defined in gfx/tileset_palette_maps.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/tilesets/aerodactyl_word_room_collision.asm b/data/tilesets/aerodactyl_word_room_collision.asm index 138f07143..58bdacc53 100644 --- a/data/tilesets/aerodactyl_word_room_collision.asm +++ b/data/tilesets/aerodactyl_word_room_collision.asm @@ -1,4 +1,5 @@ - tilecoll WALL, WALL, WALL, WALL ; 01 + tilecoll WALL, WALL, WALL, WALL ; 00 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04 @@ -17,20 +18,20 @@ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 11 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 12 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 13 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 14 - tilecoll WALL, WALL, WALL, FLOOR ; 15 + tilecoll WALL, WALL, WALL, FLOOR ; 14 + tilecoll WALL, WALL, FLOOR, FLOOR ; 15 tilecoll WALL, WALL, FLOOR, FLOOR ; 16 - tilecoll WALL, WALL, FLOOR, FLOOR ; 17 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 18 - tilecoll WALL, WALL, FLOOR, FLOOR ; 19 - tilecoll WALL, WALL, FLOOR, WALL ; 1a - tilecoll WALL, FLOOR, WALL, FLOOR ; 1b - tilecoll FLOOR, WALL, FLOOR, WALL ; 1c - tilecoll FLOOR, FLOOR, FLOOR, PIT ; 1d + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 17 + tilecoll WALL, WALL, FLOOR, FLOOR ; 18 + tilecoll WALL, WALL, FLOOR, WALL ; 19 + tilecoll WALL, FLOOR, WALL, FLOOR ; 1a + tilecoll FLOOR, WALL, FLOOR, WALL ; 1b + tilecoll FLOOR, FLOOR, FLOOR, PIT ; 1c + tilecoll WALL, WALL, WALL, WALL ; 1d tilecoll WALL, WALL, WALL, WALL ; 1e tilecoll WALL, WALL, WALL, WALL ; 1f tilecoll WALL, WALL, WALL, WALL ; 20 - tilecoll WALL, WALL, WALL, WALL ; 21 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 21 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 22 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 23 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 24 @@ -61,4 +62,3 @@ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40 diff --git a/data/tilesets/battle_tower_collision.asm b/data/tilesets/battle_tower_collision.asm index 908fee326..97e09bf5d 100644 --- a/data/tilesets/battle_tower_collision.asm +++ b/data/tilesets/battle_tower_collision.asm @@ -1,64 +1,64 @@ - tilecoll WALL, WALL, WALL, WALL ; 01 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 + tilecoll WALL, WALL, WALL, WALL ; 00 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01 + tilecoll WALL, WALL, FLOOR, FLOOR ; 02 tilecoll WALL, WALL, FLOOR, FLOOR ; 03 - tilecoll WALL, WALL, FLOOR, FLOOR ; 04 - tilecoll WALL, DOOR, FLOOR, FLOOR ; 05 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 06 - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 07 - tilecoll WALL, WALL, FLOOR, FLOOR ; 08 - tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 09 - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 0a - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0b - tilecoll WALL, WALL, FLOOR, FLOOR ; 0c + tilecoll WALL, DOOR, FLOOR, FLOOR ; 04 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 05 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 06 + tilecoll WALL, WALL, FLOOR, FLOOR ; 07 + tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 08 + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 09 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a + tilecoll WALL, WALL, FLOOR, FLOOR ; 0b + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0c tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0d tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0e tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0f - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 10 - tilecoll DOOR, WALL, FLOOR, FLOOR ; 11 - tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 12 - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 13 - tilecoll WALL, WALL, WALL, WALL ; 14 - tilecoll WALL, FLOOR, WALL, FLOOR ; 15 + tilecoll DOOR, WALL, FLOOR, FLOOR ; 10 + tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 11 + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 12 + tilecoll WALL, WALL, WALL, WALL ; 13 + tilecoll WALL, FLOOR, WALL, FLOOR ; 14 + tilecoll FLOOR, WALL, FLOOR, WALL ; 15 tilecoll FLOOR, WALL, FLOOR, WALL ; 16 - tilecoll FLOOR, WALL, FLOOR, WALL ; 17 - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 18 - tilecoll WALL, FLOOR, WALL, FLOOR ; 19 - tilecoll FLOOR, WALL, FLOOR, WALL ; 1a - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 1b - tilecoll WALL, WALL, FLOOR, FLOOR ; 1c - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1d + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 17 + tilecoll WALL, FLOOR, WALL, FLOOR ; 18 + tilecoll FLOOR, WALL, FLOOR, WALL ; 19 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 1a + tilecoll WALL, WALL, FLOOR, FLOOR ; 1b + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1c + tilecoll WALL, WALL, FLOOR, FLOOR ; 1d tilecoll WALL, WALL, FLOOR, FLOOR ; 1e - tilecoll WALL, WALL, FLOOR, FLOOR ; 1f - tilecoll WALL, WALL, FLOOR, WALL ; 20 - tilecoll WALL, WALL, WALL, FLOOR ; 21 - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 22 - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 23 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 24 - tilecoll FLOOR, FLOOR, WALL, WALL ; 25 - tilecoll WALL, FLOOR, FLOOR, DOOR ; 26 + tilecoll WALL, WALL, FLOOR, WALL ; 1f + tilecoll WALL, WALL, WALL, FLOOR ; 20 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 21 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 22 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 23 + tilecoll FLOOR, FLOOR, WALL, WALL ; 24 + tilecoll WALL, FLOOR, FLOOR, DOOR ; 25 + tilecoll WALL, WALL, FLOOR, FLOOR ; 26 tilecoll WALL, WALL, FLOOR, FLOOR ; 27 - tilecoll WALL, WALL, FLOOR, FLOOR ; 28 - tilecoll WALL, PC, FLOOR, FLOOR ; 29 - tilecoll WALL, WALL, FLOOR, FLOOR ; 2a - tilecoll WALL, WALL, WALL, FLOOR ; 2b - tilecoll WALL, WALL, FLOOR, WALL ; 2c - tilecoll FLOOR, FLOOR, FLOOR, DOOR ; 2d - tilecoll FLOOR, FLOOR, DOOR, FLOOR ; 2e + tilecoll WALL, PC, FLOOR, FLOOR ; 28 + tilecoll WALL, WALL, FLOOR, FLOOR ; 29 + tilecoll WALL, WALL, WALL, FLOOR ; 2a + tilecoll WALL, WALL, FLOOR, WALL ; 2b + tilecoll FLOOR, FLOOR, FLOOR, DOOR ; 2c + tilecoll FLOOR, FLOOR, DOOR, FLOOR ; 2d + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2e tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2f tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 30 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 31 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 32 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 33 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 34 - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 35 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 36 - tilecoll WALL, WALL, FLOOR, WALL ; 37 - tilecoll WALL, WALL, WALL, FLOOR ; 38 - tilecoll WALL, WALL, FLOOR, WALL ; 39 - tilecoll WALL, WALL, WALL, WALL ; 3a - tilecoll WALL, WALL, WALL, FLOOR ; 3b - tilecoll WALL, WALL, WALL, WALL ; 3c + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 34 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 35 + tilecoll WALL, WALL, FLOOR, WALL ; 36 + tilecoll WALL, WALL, WALL, FLOOR ; 37 + tilecoll WALL, WALL, FLOOR, WALL ; 38 + tilecoll WALL, WALL, WALL, WALL ; 39 + tilecoll WALL, WALL, WALL, FLOOR ; 3a + tilecoll WALL, WALL, WALL, WALL ; 3b + tilecoll WALL, WALL, FLOOR, WALL ; 3c tilecoll WALL, WALL, FLOOR, WALL ; 3d - tilecoll WALL, WALL, FLOOR, WALL ; 3e - tilecoll WALL, WALL, WALL, FLOOR ; 3f - tilecoll WALL, WALL, FLOOR, WALL ; 40 + tilecoll WALL, WALL, WALL, FLOOR ; 3e + tilecoll WALL, WALL, FLOOR, WALL ; 3f diff --git a/data/tilesets/battle_tower_outside_collision.asm b/data/tilesets/battle_tower_outside_collision.asm index 3aaa60113..03dec85bf 100644 --- a/data/tilesets/battle_tower_outside_collision.asm +++ b/data/tilesets/battle_tower_outside_collision.asm @@ -1,37 +1,38 @@ - tilecoll 01, 01, 01, 01 ; 01 + tilecoll 01, 01, 01, 01 ; 00 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03 - tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 04 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05 - tilecoll WALL, WALL, WALL, WALL ; 06 + tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 03 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04 + tilecoll WALL, WALL, WALL, WALL ; 05 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 06 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 07 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 08 + tilecoll WALL, WALL, WALL, WALL ; 08 tilecoll WALL, WALL, WALL, WALL ; 09 tilecoll WALL, WALL, WALL, WALL ; 0a tilecoll WALL, WALL, WALL, WALL ; 0b - tilecoll WALL, WALL, WALL, WALL ; 0c - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0d - tilecoll FLOOR, WALL, WALL, WALL ; 0e + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0c + tilecoll FLOOR, WALL, WALL, WALL ; 0d + tilecoll WALL, WALL, WALL, WALL ; 0e tilecoll WALL, WALL, WALL, WALL ; 0f - tilecoll WALL, WALL, WALL, WALL ; 10 - tilecoll WALL, WALL, FLOOR, FLOOR ; 11 - tilecoll WALL, WALL, FLOOR, WALL ; 12 - tilecoll WALL, WALL, DOOR, DOOR ; 13 - tilecoll WALL, WALL, WALL, FLOOR ; 14 - tilecoll WALL, WALL, FLOOR, FLOOR ; 15 - tilecoll WALL, WALL, WALL, WALL ; 16 - tilecoll WALL, WALL, DOOR, WALL ; 17 + tilecoll WALL, WALL, FLOOR, FLOOR ; 10 + tilecoll WALL, WALL, FLOOR, WALL ; 11 + tilecoll WALL, WALL, DOOR, DOOR ; 12 + tilecoll WALL, WALL, WALL, FLOOR ; 13 + tilecoll WALL, WALL, FLOOR, FLOOR ; 14 + tilecoll WALL, WALL, WALL, WALL ; 15 + tilecoll WALL, WALL, DOOR, WALL ; 16 + tilecoll WALL, WALL, WALL, WALL ; 17 tilecoll WALL, WALL, WALL, WALL ; 18 tilecoll WALL, WALL, WALL, WALL ; 19 tilecoll WALL, WALL, WALL, WALL ; 1a tilecoll WALL, WALL, WALL, WALL ; 1b - tilecoll WALL, WALL, WALL, WALL ; 1c - tilecoll HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, FLOOR ; 1d - tilecoll FLOOR, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 1e - tilecoll WALL, WALL, WALL, WALL ; 1f - tilecoll HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 20 - tilecoll FLOOR, FLOOR, WALL, WALL ; 21 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 22 + tilecoll HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, FLOOR ; 1c + tilecoll FLOOR, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 1d + tilecoll WALL, WALL, WALL, WALL ; 1e + tilecoll HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 1f + tilecoll FLOOR, FLOOR, WALL, WALL ; 20 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 21 + tilecoll WALL, WALL, WALL, WALL ; 22 tilecoll WALL, WALL, WALL, WALL ; 23 tilecoll WALL, WALL, WALL, WALL ; 24 tilecoll WALL, WALL, WALL, WALL ; 25 @@ -42,18 +43,18 @@ tilecoll WALL, WALL, WALL, WALL ; 2a tilecoll WALL, WALL, WALL, WALL ; 2b tilecoll WALL, WALL, WALL, WALL ; 2c - tilecoll WALL, WALL, WALL, WALL ; 2d - tilecoll WALL, FLOOR, WALL, WALL ; 2e - tilecoll WALL, WALL, WALL, WALL ; 2f - tilecoll WALL, FLOOR, WALL, WALL ; 30 - tilecoll WALL, WALL, WALL, WALL ; 31 - tilecoll WALL, FLOOR, WALL, FLOOR ; 32 - tilecoll WALL, HEADBUTT_TREE, WALL, HEADBUTT_TREE ; 33 - tilecoll WALL, WALL, WALL, WALL ; 34 - tilecoll WHIRLPOOL, FLOOR, WHIRLPOOL, FLOOR ; 35 - tilecoll WHIRLPOOL, FLOOR, FLOOR, FLOOR ; 36 - tilecoll 5B, FLOOR, FLOOR, FLOOR ; 37 - tilecoll 5B, 01, FLOOR, FLOOR ; 38 + tilecoll WALL, FLOOR, WALL, WALL ; 2d + tilecoll WALL, WALL, WALL, WALL ; 2e + tilecoll WALL, FLOOR, WALL, WALL ; 2f + tilecoll WALL, WALL, WALL, WALL ; 30 + tilecoll WALL, FLOOR, WALL, FLOOR ; 31 + tilecoll WALL, HEADBUTT_TREE, WALL, HEADBUTT_TREE ; 32 + tilecoll WALL, WALL, WALL, WALL ; 33 + tilecoll WHIRLPOOL, FLOOR, WHIRLPOOL, FLOOR ; 34 + tilecoll WHIRLPOOL, FLOOR, FLOOR, FLOOR ; 35 + tilecoll 5B, FLOOR, FLOOR, FLOOR ; 36 + tilecoll 5B, 01, FLOOR, FLOOR ; 37 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 38 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 39 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3a tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3b @@ -65,11 +66,11 @@ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 41 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 42 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 43 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 44 + tilecoll FLOOR, FLOOR, BRAKE_45, FLOOR ; 44 tilecoll FLOOR, FLOOR, BRAKE_45, FLOOR ; 45 tilecoll FLOOR, FLOOR, BRAKE_45, FLOOR ; 46 tilecoll FLOOR, FLOOR, BRAKE_45, FLOOR ; 47 - tilecoll FLOOR, FLOOR, BRAKE_45, FLOOR ; 48 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 48 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 49 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 4a tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 4b @@ -125,4 +126,3 @@ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 7d tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 7e tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 7f - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 80 diff --git a/data/tilesets/beta_word_room_collision.asm b/data/tilesets/beta_word_room_collision.asm index 138f07143..58bdacc53 100644 --- a/data/tilesets/beta_word_room_collision.asm +++ b/data/tilesets/beta_word_room_collision.asm @@ -1,4 +1,5 @@ - tilecoll WALL, WALL, WALL, WALL ; 01 + tilecoll WALL, WALL, WALL, WALL ; 00 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04 @@ -17,20 +18,20 @@ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 11 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 12 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 13 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 14 - tilecoll WALL, WALL, WALL, FLOOR ; 15 + tilecoll WALL, WALL, WALL, FLOOR ; 14 + tilecoll WALL, WALL, FLOOR, FLOOR ; 15 tilecoll WALL, WALL, FLOOR, FLOOR ; 16 - tilecoll WALL, WALL, FLOOR, FLOOR ; 17 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 18 - tilecoll WALL, WALL, FLOOR, FLOOR ; 19 - tilecoll WALL, WALL, FLOOR, WALL ; 1a - tilecoll WALL, FLOOR, WALL, FLOOR ; 1b - tilecoll FLOOR, WALL, FLOOR, WALL ; 1c - tilecoll FLOOR, FLOOR, FLOOR, PIT ; 1d + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 17 + tilecoll WALL, WALL, FLOOR, FLOOR ; 18 + tilecoll WALL, WALL, FLOOR, WALL ; 19 + tilecoll WALL, FLOOR, WALL, FLOOR ; 1a + tilecoll FLOOR, WALL, FLOOR, WALL ; 1b + tilecoll FLOOR, FLOOR, FLOOR, PIT ; 1c + tilecoll WALL, WALL, WALL, WALL ; 1d tilecoll WALL, WALL, WALL, WALL ; 1e tilecoll WALL, WALL, WALL, WALL ; 1f tilecoll WALL, WALL, WALL, WALL ; 20 - tilecoll WALL, WALL, WALL, WALL ; 21 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 21 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 22 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 23 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 24 @@ -61,4 +62,3 @@ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40 diff --git a/data/tilesets/cave_collision.asm b/data/tilesets/cave_collision.asm index 3d5e0ae05..18f9b805a 100644 --- a/data/tilesets/cave_collision.asm +++ b/data/tilesets/cave_collision.asm @@ -1,64 +1,64 @@ + tilecoll WALL, WALL, WALL, WALL ; 00 tilecoll WALL, WALL, WALL, WALL ; 01 - tilecoll WALL, WALL, WALL, WALL ; 02 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03 - tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 04 - tilecoll WALL, UP_WALL, WALL, FLOOR ; 05 - tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 06 - tilecoll UP_WALL, WALL, FLOOR, WALL ; 07 - tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 08 - tilecoll WALL, FLOOR, WALL, FLOOR ; 09 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a - tilecoll FLOOR, WALL, FLOOR, WALL ; 0b - tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 0c - tilecoll WALL, FLOOR, WALL, WALL ; 0d - tilecoll FLOOR, FLOOR, WALL, WALL ; 0e - tilecoll FLOOR, WALL, WALL, WALL ; 0f - tilecoll WATER, WATER, WATER, WATER ; 10 - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 11 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 + tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 03 + tilecoll WALL, UP_WALL, WALL, FLOOR ; 04 + tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 05 + tilecoll UP_WALL, WALL, FLOOR, WALL ; 06 + tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 07 + tilecoll WALL, FLOOR, WALL, FLOOR ; 08 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 09 + tilecoll FLOOR, WALL, FLOOR, WALL ; 0a + tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 0b + tilecoll WALL, FLOOR, WALL, WALL ; 0c + tilecoll FLOOR, FLOOR, WALL, WALL ; 0d + tilecoll FLOOR, WALL, WALL, WALL ; 0e + tilecoll WATER, WATER, WATER, WATER ; 0f + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 10 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 11 tilecoll FLOOR, FLOOR, WALL, FLOOR ; 12 - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 13 - tilecoll FLOOR, FLOOR, WALL, CAVE ; 14 + tilecoll FLOOR, FLOOR, WALL, CAVE ; 13 + tilecoll UP_WALL, UP_WALL, FLOOR, LADDER ; 14 tilecoll UP_WALL, UP_WALL, FLOOR, LADDER ; 15 - tilecoll UP_WALL, UP_WALL, FLOOR, LADDER ; 16 - tilecoll WALL, FLOOR, WALL, WARP_CARPET_DOWN ; 17 - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 18 - tilecoll WALL, WALL, WALL, FLOOR ; 19 - tilecoll WALL, WALL, FLOOR, FLOOR ; 1a - tilecoll WALL, WALL, FLOOR, WALL ; 1b - tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 1c - tilecoll WALL, FLOOR, WALL, FLOOR ; 1d - tilecoll WALL, WALL, WALL, WALL ; 1e - tilecoll FLOOR, WALL, FLOOR, WALL ; 1f - tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 20 - tilecoll WALL, FLOOR, WALL, WALL ; 21 - tilecoll FLOOR, FLOOR, WALL, WALL ; 22 - tilecoll FLOOR, WALL, WALL, WALL ; 23 - tilecoll UP_WALL, WALL, FLOOR, FLOOR ; 24 - tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 25 + tilecoll WALL, FLOOR, WALL, WARP_CARPET_DOWN ; 16 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 17 + tilecoll WALL, WALL, WALL, FLOOR ; 18 + tilecoll WALL, WALL, FLOOR, FLOOR ; 19 + tilecoll WALL, WALL, FLOOR, WALL ; 1a + tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 1b + tilecoll WALL, FLOOR, WALL, FLOOR ; 1c + tilecoll WALL, WALL, WALL, WALL ; 1d + tilecoll FLOOR, WALL, FLOOR, WALL ; 1e + tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 1f + tilecoll WALL, FLOOR, WALL, WALL ; 20 + tilecoll FLOOR, FLOOR, WALL, WALL ; 21 + tilecoll FLOOR, WALL, WALL, WALL ; 22 + tilecoll UP_WALL, WALL, FLOOR, FLOOR ; 23 + tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 24 + tilecoll WATER, WATER, WATER, WATER ; 25 tilecoll WATER, WATER, WATER, WATER ; 26 tilecoll WATER, WATER, WATER, WATER ; 27 - tilecoll WATER, WATER, WATER, WATER ; 28 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 29 - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 2a - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 2b - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 2c - tilecoll WATERFALL, WATERFALL, WATERFALL, WATERFALL ; 2d + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 28 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 29 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 2a + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 2b + tilecoll WATERFALL, WATERFALL, WATERFALL, WATERFALL ; 2c + tilecoll WALL, WALL, WALL, WALL ; 2d tilecoll WALL, WALL, WALL, WALL ; 2e tilecoll WALL, WALL, WALL, WALL ; 2f - tilecoll WALL, WALL, WALL, WALL ; 30 - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 31 - tilecoll WALL, WALL, WALL, WALL ; 32 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 30 + tilecoll WALL, WALL, WALL, WALL ; 31 + tilecoll WATER, WATER, WATER, WATER ; 32 tilecoll WATER, WATER, WATER, WATER ; 33 - tilecoll WATER, WATER, WATER, WATER ; 34 - tilecoll WALL, WALL, WALL, WALL ; 35 + tilecoll WALL, WALL, WALL, WALL ; 34 + tilecoll FLOOR, WALL, FLOOR, WALL ; 35 tilecoll FLOOR, WALL, FLOOR, WALL ; 36 - tilecoll FLOOR, WALL, FLOOR, WALL ; 37 - tilecoll WALL, WALL, WALL, CAVE ; 38 - tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 39 - tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 3a - tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 3b - tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 3c - tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 3d + tilecoll WALL, WALL, WALL, CAVE ; 37 + tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 38 + tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 39 + tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 3a + tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 3b + tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 3c + tilecoll WATER, WATER, WATER, WATER ; 3d tilecoll WATER, WATER, WATER, WATER ; 3e - tilecoll WATER, WATER, WATER, WATER ; 3f - tilecoll FLOOR, FLOOR, PIT, FLOOR ; 40 + tilecoll FLOOR, FLOOR, PIT, FLOOR ; 3f diff --git a/data/tilesets/champions_room_collision.asm b/data/tilesets/champions_room_collision.asm index 351f76f61..bb3201d0d 100644 --- a/data/tilesets/champions_room_collision.asm +++ b/data/tilesets/champions_room_collision.asm @@ -1,64 +1,64 @@ - tilecoll WALL, WALL, WALL, WALL ; 01 - tilecoll WALL, WALL, FLOOR, WALL ; 02 - tilecoll WALL, WALL, WALL, FLOOR ; 03 - tilecoll FLOOR, FLOOR, WALL, WALL ; 04 - tilecoll WALL, WALL, WALL, WALL ; 05 - tilecoll WALL, WALL, COUNTER, FLOOR ; 06 - tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 07 - tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 08 - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 09 - tilecoll WALL, FLOOR, FLOOR, WALL ; 0a - tilecoll WALL, WALL, WALL, WALL ; 0b - tilecoll WALL, WALL, LADDER, LADDER ; 0c - tilecoll WALL, WALL, FLOOR, FLOOR ; 0d - tilecoll WALL, WALL, WALL, WALL ; 0e - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 0f - tilecoll WALL, WALL, WALL, WALL ; 10 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 11 - tilecoll WALL, WALL, WALL, FLOOR ; 12 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 13 - tilecoll WALL, WALL, FLOOR, WALL ; 14 - tilecoll WALL, FLOOR, WALL, WALL ; 15 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 16 - tilecoll FLOOR, FLOOR, WALL, WALL ; 17 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 18 - tilecoll WALL, FLOOR, WALL, FLOOR ; 19 - tilecoll FLOOR, WALL, FLOOR, WALL ; 1a - tilecoll WALL, FLOOR, WALL, FLOOR ; 1b - tilecoll FLOOR, WALL, FLOOR, WALL ; 1c - tilecoll WALL, UP_WALL, WALL, FLOOR ; 1d - tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 1e - tilecoll UP_WALL, WALL, FLOOR, WALL ; 1f - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 20 - tilecoll WALL, FLOOR, WALL, WALL ; 21 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 22 - tilecoll FLOOR, WALL, WALL, WALL ; 23 - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 24 - tilecoll WALL, FLOOR, WALL, FLOOR ; 25 + tilecoll WALL, WALL, WALL, WALL ; 00 + tilecoll WALL, WALL, FLOOR, WALL ; 01 + tilecoll WALL, WALL, WALL, FLOOR ; 02 + tilecoll FLOOR, FLOOR, WALL, WALL ; 03 + tilecoll WALL, WALL, WALL, WALL ; 04 + tilecoll WALL, WALL, COUNTER, FLOOR ; 05 + tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 06 + tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 07 + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 08 + tilecoll WALL, FLOOR, FLOOR, WALL ; 09 + tilecoll WALL, WALL, WALL, WALL ; 0a + tilecoll WALL, WALL, LADDER, LADDER ; 0b + tilecoll WALL, WALL, FLOOR, FLOOR ; 0c + tilecoll WALL, WALL, WALL, WALL ; 0d + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 0e + tilecoll WALL, WALL, WALL, WALL ; 0f + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 10 + tilecoll WALL, WALL, WALL, FLOOR ; 11 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 12 + tilecoll WALL, WALL, FLOOR, WALL ; 13 + tilecoll WALL, FLOOR, WALL, WALL ; 14 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 15 + tilecoll FLOOR, FLOOR, WALL, WALL ; 16 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 17 + tilecoll WALL, FLOOR, WALL, FLOOR ; 18 + tilecoll FLOOR, WALL, FLOOR, WALL ; 19 + tilecoll WALL, FLOOR, WALL, FLOOR ; 1a + tilecoll FLOOR, WALL, FLOOR, WALL ; 1b + tilecoll WALL, UP_WALL, WALL, FLOOR ; 1c + tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 1d + tilecoll UP_WALL, WALL, FLOOR, WALL ; 1e + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1f + tilecoll WALL, FLOOR, WALL, WALL ; 20 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 21 + tilecoll FLOOR, WALL, WALL, WALL ; 22 + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 23 + tilecoll WALL, FLOOR, WALL, FLOOR ; 24 + tilecoll WALL, WALL, WALL, WALL ; 25 tilecoll WALL, WALL, WALL, WALL ; 26 - tilecoll WALL, WALL, WALL, WALL ; 27 - tilecoll FLOOR, WALL, FLOOR, WALL ; 28 + tilecoll FLOOR, WALL, FLOOR, WALL ; 27 + tilecoll WALL, WALL, WALL, WALL ; 28 tilecoll WALL, WALL, WALL, WALL ; 29 tilecoll WALL, WALL, WALL, WALL ; 2a - tilecoll WALL, WALL, WALL, WALL ; 2b - tilecoll FLOOR, FLOOR, WALL, WALL ; 2c + tilecoll FLOOR, FLOOR, WALL, WALL ; 2b + tilecoll WALL, WALL, WALL, WALL ; 2c tilecoll WALL, WALL, WALL, WALL ; 2d tilecoll WALL, WALL, WALL, WALL ; 2e - tilecoll WALL, WALL, WALL, WALL ; 2f - tilecoll WALL, FLOOR, WALL, FLOOR ; 30 - tilecoll FLOOR, WALL, FLOOR, WALL ; 31 + tilecoll WALL, FLOOR, WALL, FLOOR ; 2f + tilecoll FLOOR, WALL, FLOOR, WALL ; 30 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 31 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 32 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 33 - tilecoll WALL, WALL, FLOOR, FLOOR ; 34 - tilecoll FLOOR, FLOOR, WALL, WALL ; 35 - tilecoll WALL, FLOOR, WALL, FLOOR ; 36 - tilecoll FLOOR, WALL, FLOOR, WALL ; 37 - tilecoll FLOOR, WALL, WALL, WALL ; 38 - tilecoll WALL, FLOOR, WALL, FLOOR ; 39 - tilecoll FLOOR, WALL, FLOOR, WALL ; 3a + tilecoll WALL, WALL, FLOOR, FLOOR ; 33 + tilecoll FLOOR, FLOOR, WALL, WALL ; 34 + tilecoll WALL, FLOOR, WALL, FLOOR ; 35 + tilecoll FLOOR, WALL, FLOOR, WALL ; 36 + tilecoll FLOOR, WALL, WALL, WALL ; 37 + tilecoll WALL, FLOOR, WALL, FLOOR ; 38 + tilecoll FLOOR, WALL, FLOOR, WALL ; 39 + tilecoll WALL, WALL, WALL, WALL ; 3a tilecoll WALL, WALL, WALL, WALL ; 3b - tilecoll WALL, WALL, WALL, WALL ; 3c + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3c tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e - tilecoll WALL, FLOOR, WALL, WALL ; 3f - tilecoll FLOOR, WALL, WALL, WALL ; 40 + tilecoll WALL, FLOOR, WALL, WALL ; 3e + tilecoll FLOOR, WALL, WALL, WALL ; 3f diff --git a/data/tilesets/dark_cave_collision.asm b/data/tilesets/dark_cave_collision.asm index 3d5e0ae05..18f9b805a 100644 --- a/data/tilesets/dark_cave_collision.asm +++ b/data/tilesets/dark_cave_collision.asm @@ -1,64 +1,64 @@ + tilecoll WALL, WALL, WALL, WALL ; 00 tilecoll WALL, WALL, WALL, WALL ; 01 - tilecoll WALL, WALL, WALL, WALL ; 02 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03 - tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 04 - tilecoll WALL, UP_WALL, WALL, FLOOR ; 05 - tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 06 - tilecoll UP_WALL, WALL, FLOOR, WALL ; 07 - tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 08 - tilecoll WALL, FLOOR, WALL, FLOOR ; 09 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a - tilecoll FLOOR, WALL, FLOOR, WALL ; 0b - tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 0c - tilecoll WALL, FLOOR, WALL, WALL ; 0d - tilecoll FLOOR, FLOOR, WALL, WALL ; 0e - tilecoll FLOOR, WALL, WALL, WALL ; 0f - tilecoll WATER, WATER, WATER, WATER ; 10 - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 11 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 + tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 03 + tilecoll WALL, UP_WALL, WALL, FLOOR ; 04 + tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 05 + tilecoll UP_WALL, WALL, FLOOR, WALL ; 06 + tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 07 + tilecoll WALL, FLOOR, WALL, FLOOR ; 08 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 09 + tilecoll FLOOR, WALL, FLOOR, WALL ; 0a + tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 0b + tilecoll WALL, FLOOR, WALL, WALL ; 0c + tilecoll FLOOR, FLOOR, WALL, WALL ; 0d + tilecoll FLOOR, WALL, WALL, WALL ; 0e + tilecoll WATER, WATER, WATER, WATER ; 0f + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 10 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 11 tilecoll FLOOR, FLOOR, WALL, FLOOR ; 12 - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 13 - tilecoll FLOOR, FLOOR, WALL, CAVE ; 14 + tilecoll FLOOR, FLOOR, WALL, CAVE ; 13 + tilecoll UP_WALL, UP_WALL, FLOOR, LADDER ; 14 tilecoll UP_WALL, UP_WALL, FLOOR, LADDER ; 15 - tilecoll UP_WALL, UP_WALL, FLOOR, LADDER ; 16 - tilecoll WALL, FLOOR, WALL, WARP_CARPET_DOWN ; 17 - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 18 - tilecoll WALL, WALL, WALL, FLOOR ; 19 - tilecoll WALL, WALL, FLOOR, FLOOR ; 1a - tilecoll WALL, WALL, FLOOR, WALL ; 1b - tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 1c - tilecoll WALL, FLOOR, WALL, FLOOR ; 1d - tilecoll WALL, WALL, WALL, WALL ; 1e - tilecoll FLOOR, WALL, FLOOR, WALL ; 1f - tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 20 - tilecoll WALL, FLOOR, WALL, WALL ; 21 - tilecoll FLOOR, FLOOR, WALL, WALL ; 22 - tilecoll FLOOR, WALL, WALL, WALL ; 23 - tilecoll UP_WALL, WALL, FLOOR, FLOOR ; 24 - tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 25 + tilecoll WALL, FLOOR, WALL, WARP_CARPET_DOWN ; 16 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 17 + tilecoll WALL, WALL, WALL, FLOOR ; 18 + tilecoll WALL, WALL, FLOOR, FLOOR ; 19 + tilecoll WALL, WALL, FLOOR, WALL ; 1a + tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 1b + tilecoll WALL, FLOOR, WALL, FLOOR ; 1c + tilecoll WALL, WALL, WALL, WALL ; 1d + tilecoll FLOOR, WALL, FLOOR, WALL ; 1e + tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 1f + tilecoll WALL, FLOOR, WALL, WALL ; 20 + tilecoll FLOOR, FLOOR, WALL, WALL ; 21 + tilecoll FLOOR, WALL, WALL, WALL ; 22 + tilecoll UP_WALL, WALL, FLOOR, FLOOR ; 23 + tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 24 + tilecoll WATER, WATER, WATER, WATER ; 25 tilecoll WATER, WATER, WATER, WATER ; 26 tilecoll WATER, WATER, WATER, WATER ; 27 - tilecoll WATER, WATER, WATER, WATER ; 28 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 29 - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 2a - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 2b - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 2c - tilecoll WATERFALL, WATERFALL, WATERFALL, WATERFALL ; 2d + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 28 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 29 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 2a + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 2b + tilecoll WATERFALL, WATERFALL, WATERFALL, WATERFALL ; 2c + tilecoll WALL, WALL, WALL, WALL ; 2d tilecoll WALL, WALL, WALL, WALL ; 2e tilecoll WALL, WALL, WALL, WALL ; 2f - tilecoll WALL, WALL, WALL, WALL ; 30 - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 31 - tilecoll WALL, WALL, WALL, WALL ; 32 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 30 + tilecoll WALL, WALL, WALL, WALL ; 31 + tilecoll WATER, WATER, WATER, WATER ; 32 tilecoll WATER, WATER, WATER, WATER ; 33 - tilecoll WATER, WATER, WATER, WATER ; 34 - tilecoll WALL, WALL, WALL, WALL ; 35 + tilecoll WALL, WALL, WALL, WALL ; 34 + tilecoll FLOOR, WALL, FLOOR, WALL ; 35 tilecoll FLOOR, WALL, FLOOR, WALL ; 36 - tilecoll FLOOR, WALL, FLOOR, WALL ; 37 - tilecoll WALL, WALL, WALL, CAVE ; 38 - tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 39 - tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 3a - tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 3b - tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 3c - tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 3d + tilecoll WALL, WALL, WALL, CAVE ; 37 + tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 38 + tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 39 + tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 3a + tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 3b + tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 3c + tilecoll WATER, WATER, WATER, WATER ; 3d tilecoll WATER, WATER, WATER, WATER ; 3e - tilecoll WATER, WATER, WATER, WATER ; 3f - tilecoll FLOOR, FLOOR, PIT, FLOOR ; 40 + tilecoll FLOOR, FLOOR, PIT, FLOOR ; 3f diff --git a/data/tilesets/elite_four_room_collision.asm b/data/tilesets/elite_four_room_collision.asm index cc0b705f3..59b5d223e 100644 --- a/data/tilesets/elite_four_room_collision.asm +++ b/data/tilesets/elite_four_room_collision.asm @@ -1,64 +1,64 @@ - tilecoll WALL, WALL, WALL, WALL ; 01 + tilecoll WALL, WALL, WALL, WALL ; 00 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03 - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 04 - tilecoll WALL, WALL, WALL, FLOOR ; 05 - tilecoll WALL, WALL, FLOOR, FLOOR ; 06 - tilecoll WALL, WALL, FLOOR, WALL ; 07 - tilecoll WALL, WALL, WALL, WALL ; 08 - tilecoll WALL, FLOOR, WALL, FLOOR ; 09 - tilecoll FLOOR, FLOOR, PIT, FLOOR ; 0a - tilecoll FLOOR, WALL, FLOOR, WALL ; 0b - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 0c - tilecoll WALL, FLOOR, WALL, WALL ; 0d - tilecoll FLOOR, FLOOR, WALL, WALL ; 0e - tilecoll FLOOR, WALL, WALL, WALL ; 0f - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 10 - tilecoll WALL, FLOOR, WALL, FLOOR ; 11 - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 12 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 13 - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 14 - tilecoll WALL, WALL, WALL, WALL ; 15 - tilecoll WALL, WALL, FLOOR, FLOOR ; 16 - tilecoll LADDER, LADDER, FLOOR, FLOOR ; 17 - tilecoll WALL, WALL, WALL, WALL ; 18 + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 03 + tilecoll WALL, WALL, WALL, FLOOR ; 04 + tilecoll WALL, WALL, FLOOR, FLOOR ; 05 + tilecoll WALL, WALL, FLOOR, WALL ; 06 + tilecoll WALL, WALL, WALL, WALL ; 07 + tilecoll WALL, FLOOR, WALL, FLOOR ; 08 + tilecoll FLOOR, FLOOR, PIT, FLOOR ; 09 + tilecoll FLOOR, WALL, FLOOR, WALL ; 0a + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 0b + tilecoll WALL, FLOOR, WALL, WALL ; 0c + tilecoll FLOOR, FLOOR, WALL, WALL ; 0d + tilecoll FLOOR, WALL, WALL, WALL ; 0e + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 0f + tilecoll WALL, FLOOR, WALL, FLOOR ; 10 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 11 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 12 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 13 + tilecoll WALL, WALL, WALL, WALL ; 14 + tilecoll WALL, WALL, FLOOR, FLOOR ; 15 + tilecoll LADDER, LADDER, FLOOR, FLOOR ; 16 + tilecoll WALL, WALL, WALL, WALL ; 17 + tilecoll FLOOR, FLOOR, WALL, WALL ; 18 tilecoll FLOOR, FLOOR, WALL, WALL ; 19 - tilecoll FLOOR, FLOOR, WALL, WALL ; 1a - tilecoll FLOOR, WALL, FLOOR, WALL ; 1b - tilecoll WALL, FLOOR, WALL, WALL ; 1c - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 1d - tilecoll WALL, FLOOR, WALL, FLOOR ; 1e - tilecoll FLOOR, WALL, FLOOR, WALL ; 1f - tilecoll WALL, WALL, WALL, WALL ; 20 - tilecoll WALL, FLOOR, WALL, FLOOR ; 21 + tilecoll FLOOR, WALL, FLOOR, WALL ; 1a + tilecoll WALL, FLOOR, WALL, WALL ; 1b + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 1c + tilecoll WALL, FLOOR, WALL, FLOOR ; 1d + tilecoll FLOOR, WALL, FLOOR, WALL ; 1e + tilecoll WALL, WALL, WALL, WALL ; 1f + tilecoll WALL, FLOOR, WALL, FLOOR ; 20 + tilecoll WALL, WALL, FLOOR, FLOOR ; 21 tilecoll WALL, WALL, FLOOR, FLOOR ; 22 tilecoll WALL, WALL, FLOOR, FLOOR ; 23 - tilecoll WALL, WALL, FLOOR, FLOOR ; 24 - tilecoll WALL, WALL, WALL, WALL ; 25 - tilecoll FLOOR, WALL, FLOOR, WALL ; 26 - tilecoll WALL, FLOOR, WALL, FLOOR ; 27 - tilecoll WALL, WALL, WALL, WALL ; 28 + tilecoll WALL, WALL, WALL, WALL ; 24 + tilecoll FLOOR, WALL, FLOOR, WALL ; 25 + tilecoll WALL, FLOOR, WALL, FLOOR ; 26 + tilecoll WALL, WALL, WALL, WALL ; 27 + tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 28 tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 29 - tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 2a + tilecoll WALL, WALL, WALL, WALL ; 2a tilecoll WALL, WALL, WALL, WALL ; 2b tilecoll WALL, WALL, WALL, WALL ; 2c - tilecoll WALL, WALL, WALL, WALL ; 2d - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2e - tilecoll ICE, ICE, ICE, FLOOR ; 2f - tilecoll ICE, ICE, FLOOR, ICE ; 30 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 31 - tilecoll FLOOR, ICE, ICE, ICE ; 32 - tilecoll ICE, FLOOR, ICE, ICE ; 33 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2d + tilecoll ICE, ICE, ICE, FLOOR ; 2e + tilecoll ICE, ICE, FLOOR, ICE ; 2f + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 30 + tilecoll FLOOR, ICE, ICE, ICE ; 31 + tilecoll ICE, FLOOR, ICE, ICE ; 32 + tilecoll WALL, WALL, FLOOR, FLOOR ; 33 tilecoll WALL, WALL, FLOOR, FLOOR ; 34 - tilecoll WALL, WALL, FLOOR, FLOOR ; 35 - tilecoll ICE, WALL, ICE, WALL ; 36 - tilecoll WALL, ICE, WALL, ICE ; 37 - tilecoll WALL, WALL, WALL, WALL ; 38 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 39 - tilecoll ICE, ICE, ICE, ICE ; 3a - tilecoll WALL, FLOOR, FLOOR, WALL ; 3b - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 3c - tilecoll DOOR, DOOR, FLOOR, FLOOR ; 3d - tilecoll WALL, FLOOR, WALL, FLOOR ; 3e + tilecoll ICE, WALL, ICE, WALL ; 35 + tilecoll WALL, ICE, WALL, ICE ; 36 + tilecoll WALL, WALL, WALL, WALL ; 37 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 38 + tilecoll ICE, ICE, ICE, ICE ; 39 + tilecoll WALL, FLOOR, FLOOR, WALL ; 3a + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 3b + tilecoll DOOR, DOOR, FLOOR, FLOOR ; 3c + tilecoll WALL, FLOOR, WALL, FLOOR ; 3d + tilecoll WALL, WALL, WALL, WALL ; 3e tilecoll WALL, WALL, WALL, WALL ; 3f - tilecoll WALL, WALL, WALL, WALL ; 40 diff --git a/data/tilesets/facility_collision.asm b/data/tilesets/facility_collision.asm index eb5cd8f33..781618c25 100644 --- a/data/tilesets/facility_collision.asm +++ b/data/tilesets/facility_collision.asm @@ -1,64 +1,64 @@ - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01 - tilecoll WALL, WALL, FLOOR, FLOOR ; 02 - tilecoll WALL, WALL, WALL, WALL ; 03 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 00 + tilecoll WALL, WALL, FLOOR, FLOOR ; 01 + tilecoll WALL, WALL, WALL, WALL ; 02 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03 + tilecoll FLOOR, LADDER, FLOOR, FLOOR ; 04 tilecoll FLOOR, LADDER, FLOOR, FLOOR ; 05 - tilecoll FLOOR, LADDER, FLOOR, FLOOR ; 06 - tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 07 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 08 - tilecoll WALL, WALL, FLOOR, FLOOR ; 09 - tilecoll WALL, WALL, WALL, FLOOR ; 0a - tilecoll WALL, WALL, FLOOR, WALL ; 0b - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0c - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0d - tilecoll WALL, FLOOR, WALL, FLOOR ; 0e - tilecoll FLOOR, WALL, FLOOR, WALL ; 0f - tilecoll WALL, WALL, WALL, WALL ; 10 - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 11 - tilecoll FLOOR, FLOOR, WALL, WALL ; 12 + tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 06 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 07 + tilecoll WALL, WALL, FLOOR, FLOOR ; 08 + tilecoll WALL, WALL, WALL, FLOOR ; 09 + tilecoll WALL, WALL, FLOOR, WALL ; 0a + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0b + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0c + tilecoll WALL, FLOOR, WALL, FLOOR ; 0d + tilecoll FLOOR, WALL, FLOOR, WALL ; 0e + tilecoll WALL, WALL, WALL, WALL ; 0f + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 10 + tilecoll FLOOR, FLOOR, WALL, WALL ; 11 + tilecoll WALL, WALL, WALL, WALL ; 12 tilecoll WALL, WALL, WALL, WALL ; 13 - tilecoll WALL, WALL, WALL, WALL ; 14 - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 15 - tilecoll WALL, WALL, FLOOR, FLOOR ; 16 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 14 + tilecoll WALL, WALL, FLOOR, FLOOR ; 15 + tilecoll WALL, WALL, WALL, WALL ; 16 tilecoll WALL, WALL, WALL, WALL ; 17 - tilecoll WALL, WALL, WALL, WALL ; 18 - tilecoll WALL, WALL, FLOOR, FLOOR ; 19 - tilecoll WALL, WALL, WALL, WALL ; 1a - tilecoll WALL, WALL, WALL, FLOOR ; 1b - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1c - tilecoll WALL, FLOOR, WALL, FLOOR ; 1d - tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 1e - tilecoll WALL, WALL, FLOOR, COUNTER ; 1f - tilecoll WALL, WALL, FLOOR, FLOOR ; 20 - tilecoll FLOOR, FLOOR, WALL, WALL ; 21 - tilecoll WALL, WALL, WALL, FLOOR ; 22 - tilecoll WALL, FLOOR, WALL, FLOOR ; 23 - tilecoll WALL, FLOOR, WALL, WALL ; 24 - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 25 - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 26 - tilecoll FLOOR, FLOOR, WALL, WALL ; 27 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 28 + tilecoll WALL, WALL, FLOOR, FLOOR ; 18 + tilecoll WALL, WALL, WALL, WALL ; 19 + tilecoll WALL, WALL, WALL, FLOOR ; 1a + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1b + tilecoll WALL, FLOOR, WALL, FLOOR ; 1c + tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 1d + tilecoll WALL, WALL, FLOOR, COUNTER ; 1e + tilecoll WALL, WALL, FLOOR, FLOOR ; 1f + tilecoll FLOOR, FLOOR, WALL, WALL ; 20 + tilecoll WALL, WALL, WALL, FLOOR ; 21 + tilecoll WALL, FLOOR, WALL, FLOOR ; 22 + tilecoll WALL, FLOOR, WALL, WALL ; 23 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 24 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 25 + tilecoll FLOOR, FLOOR, WALL, WALL ; 26 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 27 + tilecoll WALL, WALL, FLOOR, FLOOR ; 28 tilecoll WALL, WALL, FLOOR, FLOOR ; 29 - tilecoll WALL, WALL, FLOOR, FLOOR ; 2a - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 2b - tilecoll WALL, FLOOR, WALL, FLOOR ; 2c - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 2d - tilecoll WALL, WALL, FLOOR, FLOOR ; 2e + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 2a + tilecoll WALL, FLOOR, WALL, FLOOR ; 2b + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 2c + tilecoll WALL, WALL, FLOOR, FLOOR ; 2d + tilecoll WALL, FLOOR, WALL, FLOOR ; 2e tilecoll WALL, FLOOR, WALL, FLOOR ; 2f - tilecoll WALL, FLOOR, WALL, FLOOR ; 30 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 31 - tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 32 - tilecoll WALL, WALL, FLOOR, FLOOR ; 33 - tilecoll FLOOR, WALL, FLOOR, WALL ; 34 - tilecoll FLOOR, FLOOR, WALL, WALL ; 35 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 30 + tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 31 + tilecoll WALL, WALL, FLOOR, FLOOR ; 32 + tilecoll FLOOR, WALL, FLOOR, WALL ; 33 + tilecoll FLOOR, FLOOR, WALL, WALL ; 34 + tilecoll WALL, WALL, FLOOR, FLOOR ; 35 tilecoll WALL, WALL, FLOOR, FLOOR ; 36 - tilecoll WALL, WALL, FLOOR, FLOOR ; 37 + tilecoll FLOOR, WALL, FLOOR, WALL ; 37 tilecoll FLOOR, WALL, FLOOR, WALL ; 38 - tilecoll FLOOR, WALL, FLOOR, WALL ; 39 - tilecoll WALL, WALL, FLOOR, FLOOR ; 3a - tilecoll FLOOR, WALL, WALL, WALL ; 3b - tilecoll WALL, WALL, FLOOR, WALL ; 3c - tilecoll WALL, WALL, WALL, FLOOR ; 3d - tilecoll WALL, WALL, FLOOR, WALL ; 3e - tilecoll WALL, FLOOR, WALL, WALL ; 3f - tilecoll FLOOR, COUNTER, COUNTER, COUNTER ; 40 + tilecoll WALL, WALL, FLOOR, FLOOR ; 39 + tilecoll FLOOR, WALL, WALL, WALL ; 3a + tilecoll WALL, WALL, FLOOR, WALL ; 3b + tilecoll WALL, WALL, WALL, FLOOR ; 3c + tilecoll WALL, WALL, FLOOR, WALL ; 3d + tilecoll WALL, FLOOR, WALL, WALL ; 3e + tilecoll FLOOR, COUNTER, COUNTER, COUNTER ; 3f diff --git a/data/tilesets/forest_collision.asm b/data/tilesets/forest_collision.asm index 70cc72ff1..0b9aa78bb 100644 --- a/data/tilesets/forest_collision.asm +++ b/data/tilesets/forest_collision.asm @@ -1,43 +1,44 @@ - tilecoll WALL, WALL, WALL, WALL ; 01 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 + tilecoll WALL, WALL, WALL, WALL ; 00 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01 + tilecoll WATER, WATER, WATER, WATER ; 02 tilecoll WATER, WATER, WATER, WATER ; 03 - tilecoll WATER, WATER, WATER, WATER ; 04 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05 - tilecoll WALL, WALL, WALL, WALL ; 06 - tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 07 - tilecoll WATER, WATER, WATER, WATER ; 08 - tilecoll HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE, FLOOR ; 09 - tilecoll HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, FLOOR ; 0a + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04 + tilecoll WALL, WALL, WALL, WALL ; 05 + tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 06 + tilecoll WATER, WATER, WATER, WATER ; 07 + tilecoll HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE, FLOOR ; 08 + tilecoll HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, FLOOR ; 09 + tilecoll WATER, WATER, WATER, WATER ; 0a tilecoll WATER, WATER, WATER, WATER ; 0b - tilecoll WATER, WATER, WATER, WATER ; 0c - tilecoll HEADBUTT_TREE, FLOOR, HEADBUTT_TREE, FLOOR ; 0d - tilecoll WATER, WATER, WATER, WATER ; 0e - tilecoll FLOOR, HEADBUTT_TREE, FLOOR, HEADBUTT_TREE ; 0f - tilecoll FLOOR, FLOOR, CUT_TREE, HEADBUTT_TREE ; 10 - tilecoll HEADBUTT_TREE, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 11 - tilecoll FLOOR, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 12 - tilecoll FLOOR, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 13 - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 14 - tilecoll HEADBUTT_TREE, FLOOR, FLOOR, FLOOR ; 15 - tilecoll FLOOR, HEADBUTT_TREE, FLOOR, FLOOR ; 16 - tilecoll FLOOR, FLOOR, HEADBUTT_TREE, FLOOR ; 17 - tilecoll FLOOR, FLOOR, FLOOR, HEADBUTT_TREE ; 18 - tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 19 - tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 1a - tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 1b - tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 1c - tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 1d + tilecoll HEADBUTT_TREE, FLOOR, HEADBUTT_TREE, FLOOR ; 0c + tilecoll WATER, WATER, WATER, WATER ; 0d + tilecoll FLOOR, HEADBUTT_TREE, FLOOR, HEADBUTT_TREE ; 0e + tilecoll FLOOR, FLOOR, CUT_TREE, HEADBUTT_TREE ; 0f + tilecoll HEADBUTT_TREE, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 10 + tilecoll FLOOR, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 11 + tilecoll FLOOR, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 12 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 13 + tilecoll HEADBUTT_TREE, FLOOR, FLOOR, FLOOR ; 14 + tilecoll FLOOR, HEADBUTT_TREE, FLOOR, FLOOR ; 15 + tilecoll FLOOR, FLOOR, HEADBUTT_TREE, FLOOR ; 16 + tilecoll FLOOR, FLOOR, FLOOR, HEADBUTT_TREE ; 17 + tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 18 + tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 19 + tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 1a + tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 1b + tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 1c + tilecoll WALL, WALL, WALL, WALL ; 1d tilecoll WALL, WALL, WALL, WALL ; 1e tilecoll WALL, WALL, WALL, WALL ; 1f - tilecoll WALL, WALL, WALL, WALL ; 20 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 21 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 20 + tilecoll WALL, WALL, WALL, WALL ; 21 tilecoll WALL, WALL, WALL, WALL ; 22 tilecoll WALL, WALL, WALL, WALL ; 23 - tilecoll WALL, WALL, WALL, WALL ; 24 - tilecoll WALL, WALL, WALL, DOOR ; 25 + tilecoll WALL, WALL, WALL, DOOR ; 24 + tilecoll WALL, WALL, WALL, WALL ; 25 tilecoll WALL, WALL, WALL, WALL ; 26 tilecoll WALL, WALL, WALL, WALL ; 27 - tilecoll WALL, WALL, WALL, WALL ; 28 + tilecoll WALL, FLOOR, WALL, FLOOR ; 28 tilecoll WALL, FLOOR, WALL, FLOOR ; 29 tilecoll WALL, FLOOR, WALL, FLOOR ; 2a tilecoll WALL, FLOOR, WALL, FLOOR ; 2b @@ -61,4 +62,3 @@ tilecoll WALL, FLOOR, WALL, FLOOR ; 3d tilecoll WALL, FLOOR, WALL, FLOOR ; 3e tilecoll WALL, FLOOR, WALL, FLOOR ; 3f - tilecoll WALL, FLOOR, WALL, FLOOR ; 40 diff --git a/data/tilesets/game_corner_collision.asm b/data/tilesets/game_corner_collision.asm index 65b99cf54..9bcc3feb4 100644 --- a/data/tilesets/game_corner_collision.asm +++ b/data/tilesets/game_corner_collision.asm @@ -1,52 +1,53 @@ - tilecoll WALL, WALL, WALL, WALL ; 01 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 - tilecoll WALL, WALL, FLOOR, FLOOR ; 03 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04 - tilecoll WALL, WALL, FLOOR, FLOOR ; 05 + tilecoll WALL, WALL, WALL, WALL ; 00 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01 + tilecoll WALL, WALL, FLOOR, FLOOR ; 02 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03 + tilecoll WALL, WALL, FLOOR, FLOOR ; 04 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 06 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 07 - tilecoll COUNTER, COUNTER, COUNTER, COUNTER ; 08 + tilecoll COUNTER, COUNTER, COUNTER, COUNTER ; 07 + tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 08 tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 09 tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 0a - tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 0b - tilecoll WALL, WALL, WALL, WALL ; 0c - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0d - tilecoll WALL, WALL, FLOOR, FLOOR ; 0e + tilecoll WALL, WALL, WALL, WALL ; 0b + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0c + tilecoll WALL, WALL, FLOOR, FLOOR ; 0d + tilecoll WALL, WALL, WALL, WALL ; 0e tilecoll WALL, WALL, WALL, WALL ; 0f - tilecoll WALL, WALL, WALL, WALL ; 10 + tilecoll WALL, WALL, COUNTER, COUNTER ; 10 tilecoll WALL, WALL, COUNTER, COUNTER ; 11 - tilecoll WALL, WALL, COUNTER, COUNTER ; 12 - tilecoll WALL, WALL, WALL, WALL ; 13 - tilecoll WALL, WALL, COUNTER, FLOOR ; 14 - tilecoll COUNTER, FLOOR, COUNTER, COUNTER ; 15 - tilecoll WALL, WALL, WALL, WALL ; 16 - tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 17 - tilecoll COUNTER, FLOOR, COUNTER, COUNTER ; 18 - tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 19 + tilecoll WALL, WALL, WALL, WALL ; 12 + tilecoll WALL, WALL, COUNTER, FLOOR ; 13 + tilecoll COUNTER, FLOOR, COUNTER, COUNTER ; 14 + tilecoll WALL, WALL, WALL, WALL ; 15 + tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 16 + tilecoll COUNTER, FLOOR, COUNTER, COUNTER ; 17 + tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 18 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 19 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1a - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1b - tilecoll FLOOR, COUNTER, COUNTER, COUNTER ; 1c - tilecoll WALL, WALL, FLOOR, COUNTER ; 1d - tilecoll FLOOR, WALL, FLOOR, WALL ; 1e - tilecoll WALL, FLOOR, WALL, FLOOR ; 1f - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 20 + tilecoll FLOOR, COUNTER, COUNTER, COUNTER ; 1b + tilecoll WALL, WALL, FLOOR, COUNTER ; 1c + tilecoll FLOOR, WALL, FLOOR, WALL ; 1d + tilecoll WALL, FLOOR, WALL, FLOOR ; 1e + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 1f + tilecoll WALL, WALL, WALL, WALL ; 20 tilecoll WALL, WALL, WALL, WALL ; 21 tilecoll WALL, WALL, WALL, WALL ; 22 tilecoll WALL, WALL, WALL, WALL ; 23 tilecoll WALL, WALL, WALL, WALL ; 24 tilecoll WALL, WALL, WALL, WALL ; 25 - tilecoll WALL, WALL, WALL, WALL ; 26 - tilecoll WALL, WALL, FLOOR, FLOOR ; 27 - tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 28 - tilecoll WALL, WALL, FLOOR, FLOOR ; 29 - tilecoll WALL, WALL, FLOOR, WALL ; 2a - tilecoll WALL, FLOOR, WALL, FLOOR ; 2b - tilecoll WALL, WALL, FLOOR, WALL ; 2c - tilecoll FLOOR, FLOOR, WALL, WALL ; 2d + tilecoll WALL, WALL, FLOOR, FLOOR ; 26 + tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 27 + tilecoll WALL, WALL, FLOOR, FLOOR ; 28 + tilecoll WALL, WALL, FLOOR, WALL ; 29 + tilecoll WALL, FLOOR, WALL, FLOOR ; 2a + tilecoll WALL, WALL, FLOOR, WALL ; 2b + tilecoll FLOOR, FLOOR, WALL, WALL ; 2c + tilecoll WALL, WALL, WALL, WALL ; 2d tilecoll WALL, WALL, WALL, WALL ; 2e - tilecoll WALL, WALL, WALL, WALL ; 2f - tilecoll WALL, WALL, FLOOR, WALL ; 30 - tilecoll WALL, WALL, WALL, FLOOR ; 31 + tilecoll WALL, WALL, FLOOR, WALL ; 2f + tilecoll WALL, WALL, WALL, FLOOR ; 30 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 31 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 32 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 33 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 34 @@ -61,4 +62,3 @@ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40 diff --git a/data/tilesets/gate_collision.asm b/data/tilesets/gate_collision.asm index 54cd95d34..1a7501f4c 100644 --- a/data/tilesets/gate_collision.asm +++ b/data/tilesets/gate_collision.asm @@ -1,64 +1,64 @@ + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 00 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 - tilecoll WALL, WALL, FLOOR, FLOOR ; 03 - tilecoll WALL, WALL, WALL, WALL ; 04 - tilecoll DOOR, DOOR, FLOOR, FLOOR ; 05 - tilecoll WALL, WALL, WALL, WALL ; 06 + tilecoll WALL, WALL, FLOOR, FLOOR ; 02 + tilecoll WALL, WALL, WALL, WALL ; 03 + tilecoll DOOR, DOOR, FLOOR, FLOOR ; 04 + tilecoll WALL, WALL, WALL, WALL ; 05 + tilecoll WALL, WALL, FLOOR, FLOOR ; 06 tilecoll WALL, WALL, FLOOR, FLOOR ; 07 - tilecoll WALL, WALL, FLOOR, FLOOR ; 08 - tilecoll COUNTER, COUNTER, COUNTER, FLOOR ; 09 - tilecoll COUNTER, COUNTER, FLOOR, COUNTER ; 0a - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0b - tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 0c - tilecoll COUNTER, FLOOR, COUNTER, COUNTER ; 0d - tilecoll FLOOR, COUNTER, COUNTER, COUNTER ; 0e - tilecoll WALL, WALL, COUNTER, FLOOR ; 0f - tilecoll WALL, WALL, FLOOR, COUNTER ; 10 - tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 11 + tilecoll COUNTER, COUNTER, COUNTER, FLOOR ; 08 + tilecoll COUNTER, COUNTER, FLOOR, COUNTER ; 09 + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0a + tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 0b + tilecoll COUNTER, FLOOR, COUNTER, COUNTER ; 0c + tilecoll FLOOR, COUNTER, COUNTER, COUNTER ; 0d + tilecoll WALL, WALL, COUNTER, FLOOR ; 0e + tilecoll WALL, WALL, FLOOR, COUNTER ; 0f + tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 10 + tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 11 tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 12 - tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 13 - tilecoll WALL, WALL, FLOOR, COUNTER ; 14 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 15 - tilecoll WALL, WALL, WALL, WALL ; 16 - tilecoll WALL, WALL, FLOOR, FLOOR ; 17 + tilecoll WALL, WALL, FLOOR, COUNTER ; 13 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 14 + tilecoll WALL, WALL, WALL, WALL ; 15 + tilecoll WALL, WALL, FLOOR, FLOOR ; 16 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 17 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 18 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 19 - tilecoll FLOOR, FLOOR, WALL, WALL ; 1a - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1b - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 1c - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1d - tilecoll WALL, WALL, FLOOR, FLOOR ; 1e + tilecoll FLOOR, FLOOR, WALL, WALL ; 19 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1a + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 1b + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1c + tilecoll WALL, WALL, FLOOR, FLOOR ; 1d + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1e tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1f tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 20 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 21 - tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 22 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 23 - tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 24 - tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 25 - tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 26 - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 27 - tilecoll WALL, WALL, WALL, WALL ; 28 - tilecoll FLOOR, COUNTER, FLOOR, COUNTER ; 29 - tilecoll WALL, DOOR, FLOOR, FLOOR ; 2a - tilecoll DOOR, WALL, FLOOR, FLOOR ; 2b - tilecoll FLOOR, COUNTER, FLOOR, COUNTER ; 2c - tilecoll WALL, WALL, FLOOR, PC ; 2d - tilecoll WALL, WALL, FLOOR, FLOOR ; 2e - tilecoll DOOR, WALL, FLOOR, FLOOR ; 2f - tilecoll WALL, WALL, FLOOR, FLOOR ; 30 - tilecoll FLOOR, FLOOR, FLOOR, COUNTER ; 31 - tilecoll FLOOR, LADDER, FLOOR, FLOOR ; 32 - tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 33 - tilecoll COUNTER, FLOOR, FLOOR, WALL ; 34 - tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 35 + tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 21 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 22 + tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 23 + tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 24 + tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 25 + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 26 + tilecoll WALL, WALL, WALL, WALL ; 27 + tilecoll FLOOR, COUNTER, FLOOR, COUNTER ; 28 + tilecoll WALL, DOOR, FLOOR, FLOOR ; 29 + tilecoll DOOR, WALL, FLOOR, FLOOR ; 2a + tilecoll FLOOR, COUNTER, FLOOR, COUNTER ; 2b + tilecoll WALL, WALL, FLOOR, PC ; 2c + tilecoll WALL, WALL, FLOOR, FLOOR ; 2d + tilecoll DOOR, WALL, FLOOR, FLOOR ; 2e + tilecoll WALL, WALL, FLOOR, FLOOR ; 2f + tilecoll FLOOR, FLOOR, FLOOR, COUNTER ; 30 + tilecoll FLOOR, LADDER, FLOOR, FLOOR ; 31 + tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 32 + tilecoll COUNTER, FLOOR, FLOOR, WALL ; 33 + tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 34 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 35 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 36 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 37 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 38 - tilecoll WALL, FLOOR, WALL, FLOOR ; 39 - tilecoll WALL, WALL, WALL, WALL ; 3a - tilecoll FLOOR, WALL, FLOOR, WALL ; 3b - tilecoll FLOOR, FLOOR, LADDER, FLOOR ; 3c - tilecoll FLOOR, FLOOR, COUNTER, FLOOR ; 3d - tilecoll WALL, WALL, FLOOR, FLOOR ; 3e - tilecoll COUNTER, COUNTER, FLOOR, COUNTER ; 3f - tilecoll FLOOR, COUNTER, COUNTER, COUNTER ; 40 + tilecoll WALL, FLOOR, WALL, FLOOR ; 38 + tilecoll WALL, WALL, WALL, WALL ; 39 + tilecoll FLOOR, WALL, FLOOR, WALL ; 3a + tilecoll FLOOR, FLOOR, LADDER, FLOOR ; 3b + tilecoll FLOOR, FLOOR, COUNTER, FLOOR ; 3c + tilecoll WALL, WALL, FLOOR, FLOOR ; 3d + tilecoll COUNTER, COUNTER, FLOOR, COUNTER ; 3e + tilecoll FLOOR, COUNTER, COUNTER, COUNTER ; 3f diff --git a/data/tilesets/ho_oh_word_room_collision.asm b/data/tilesets/ho_oh_word_room_collision.asm index 138f07143..58bdacc53 100644 --- a/data/tilesets/ho_oh_word_room_collision.asm +++ b/data/tilesets/ho_oh_word_room_collision.asm @@ -1,4 +1,5 @@ - tilecoll WALL, WALL, WALL, WALL ; 01 + tilecoll WALL, WALL, WALL, WALL ; 00 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04 @@ -17,20 +18,20 @@ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 11 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 12 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 13 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 14 - tilecoll WALL, WALL, WALL, FLOOR ; 15 + tilecoll WALL, WALL, WALL, FLOOR ; 14 + tilecoll WALL, WALL, FLOOR, FLOOR ; 15 tilecoll WALL, WALL, FLOOR, FLOOR ; 16 - tilecoll WALL, WALL, FLOOR, FLOOR ; 17 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 18 - tilecoll WALL, WALL, FLOOR, FLOOR ; 19 - tilecoll WALL, WALL, FLOOR, WALL ; 1a - tilecoll WALL, FLOOR, WALL, FLOOR ; 1b - tilecoll FLOOR, WALL, FLOOR, WALL ; 1c - tilecoll FLOOR, FLOOR, FLOOR, PIT ; 1d + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 17 + tilecoll WALL, WALL, FLOOR, FLOOR ; 18 + tilecoll WALL, WALL, FLOOR, WALL ; 19 + tilecoll WALL, FLOOR, WALL, FLOOR ; 1a + tilecoll FLOOR, WALL, FLOOR, WALL ; 1b + tilecoll FLOOR, FLOOR, FLOOR, PIT ; 1c + tilecoll WALL, WALL, WALL, WALL ; 1d tilecoll WALL, WALL, WALL, WALL ; 1e tilecoll WALL, WALL, WALL, WALL ; 1f tilecoll WALL, WALL, WALL, WALL ; 20 - tilecoll WALL, WALL, WALL, WALL ; 21 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 21 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 22 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 23 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 24 @@ -61,4 +62,3 @@ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40 diff --git a/data/tilesets/house_collision.asm b/data/tilesets/house_collision.asm index ae5580782..7c7f3fca5 100644 --- a/data/tilesets/house_collision.asm +++ b/data/tilesets/house_collision.asm @@ -1,54 +1,55 @@ - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01 - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 02 - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 03 - tilecoll WALL, WALL, FLOOR, FLOOR ; 04 - tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 05 - tilecoll WALL, WINDOW, FLOOR, FLOOR ; 06 - tilecoll WALL, FLOOR, WALL, FLOOR ; 07 - tilecoll FLOOR, WALL, FLOOR, WALL ; 08 - tilecoll WALL, WINDOW, FLOOR, FLOOR ; 09 - tilecoll WALL, WALL, FLOOR, BOOKSHELF ; 0a - tilecoll WALL, WALL, WALL, WALL ; 0b - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0c - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 0d - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 0e - tilecoll WALL, TOWN_MAP, FLOOR, FLOOR ; 0f - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 10 - tilecoll WALL, WALL, PC, WALL ; 11 - tilecoll WALL, WALL, WALL, FLOOR ; 12 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 00 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 01 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 02 + tilecoll WALL, WALL, FLOOR, FLOOR ; 03 + tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 04 + tilecoll WALL, WINDOW, FLOOR, FLOOR ; 05 + tilecoll WALL, FLOOR, WALL, FLOOR ; 06 + tilecoll FLOOR, WALL, FLOOR, WALL ; 07 + tilecoll WALL, WINDOW, FLOOR, FLOOR ; 08 + tilecoll WALL, WALL, FLOOR, BOOKSHELF ; 09 + tilecoll WALL, WALL, WALL, WALL ; 0a + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0b + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 0c + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 0d + tilecoll WALL, TOWN_MAP, FLOOR, FLOOR ; 0e + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0f + tilecoll WALL, WALL, PC, WALL ; 10 + tilecoll WALL, WALL, WALL, FLOOR ; 11 + tilecoll WALL, WALL, FLOOR, FLOOR ; 12 tilecoll WALL, WALL, FLOOR, FLOOR ; 13 - tilecoll WALL, WALL, FLOOR, FLOOR ; 14 - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 15 - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 16 - tilecoll WINDOW, WALL, FLOOR, FLOOR ; 17 - tilecoll FLOOR, FLOOR, WARP_CARPET_LEFT, FLOOR ; 18 - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 19 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 1a - tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 1b - tilecoll WARP_CARPET_LEFT, FLOOR, FLOOR, FLOOR ; 1c - tilecoll WALL, WALL, FLOOR, PC ; 1d - tilecoll WALL, WALL, FLOOR, RADIO ; 1e - tilecoll WALL, TOWN_MAP, TV, FLOOR ; 1f + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 14 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 15 + tilecoll WINDOW, WALL, FLOOR, FLOOR ; 16 + tilecoll FLOOR, FLOOR, WARP_CARPET_LEFT, FLOOR ; 17 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 18 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 19 + tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 1a + tilecoll WARP_CARPET_LEFT, FLOOR, FLOOR, FLOOR ; 1b + tilecoll WALL, WALL, FLOOR, PC ; 1c + tilecoll WALL, WALL, FLOOR, RADIO ; 1d + tilecoll WALL, TOWN_MAP, TV, FLOOR ; 1e + tilecoll WALL, WALL, WALL, WALL ; 1f tilecoll WALL, WALL, WALL, WALL ; 20 - tilecoll WALL, WALL, WALL, WALL ; 21 - tilecoll FLOOR, WALL, FLOOR, WALL ; 22 - tilecoll WALL, FLOOR, WALL, FLOOR ; 23 - tilecoll FLOOR, WALL, FLOOR, WALL ; 24 - tilecoll WALL, FLOOR, WALL, FLOOR ; 25 - tilecoll LADDER, FLOOR, FLOOR, FLOOR ; 26 - tilecoll COUNTER, COUNTER, FLOOR, COUNTER ; 27 - tilecoll FLOOR, COUNTER, FLOOR, COUNTER ; 28 + tilecoll FLOOR, WALL, FLOOR, WALL ; 21 + tilecoll WALL, FLOOR, WALL, FLOOR ; 22 + tilecoll FLOOR, WALL, FLOOR, WALL ; 23 + tilecoll WALL, FLOOR, WALL, FLOOR ; 24 + tilecoll LADDER, FLOOR, FLOOR, FLOOR ; 25 + tilecoll COUNTER, COUNTER, FLOOR, COUNTER ; 26 + tilecoll FLOOR, COUNTER, FLOOR, COUNTER ; 27 + tilecoll WALL, WALL, FLOOR, FLOOR ; 28 tilecoll WALL, WALL, FLOOR, FLOOR ; 29 tilecoll WALL, WALL, FLOOR, FLOOR ; 2a tilecoll WALL, WALL, FLOOR, FLOOR ; 2b - tilecoll WALL, WALL, FLOOR, FLOOR ; 2c - tilecoll WALL, WALL, WALL, WALL ; 2d - tilecoll WALL, WALL, FLOOR, FLOOR ; 2e - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2f - tilecoll WALL, WALL, FLOOR, WALL ; 30 - tilecoll WALL, FLOOR, WALL, FLOOR ; 31 - tilecoll FLOOR, WALL, FLOOR, WALL ; 32 - tilecoll WALL, WINDOW, WALL, WALL ; 33 + tilecoll WALL, WALL, WALL, WALL ; 2c + tilecoll WALL, WALL, FLOOR, FLOOR ; 2d + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2e + tilecoll WALL, WALL, FLOOR, WALL ; 2f + tilecoll WALL, FLOOR, WALL, FLOOR ; 30 + tilecoll FLOOR, WALL, FLOOR, WALL ; 31 + tilecoll WALL, WINDOW, WALL, WALL ; 32 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 33 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 34 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 35 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 36 @@ -61,4 +62,3 @@ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40 diff --git a/data/tilesets/ice_path_collision.asm b/data/tilesets/ice_path_collision.asm index 4fd9376ad..362126969 100644 --- a/data/tilesets/ice_path_collision.asm +++ b/data/tilesets/ice_path_collision.asm @@ -1,64 +1,64 @@ - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01 - tilecoll WALL, WALL, WALL, WALL ; 02 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03 - tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 04 - tilecoll WALL, UP_WALL, WALL, FLOOR ; 05 - tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 06 - tilecoll UP_WALL, WALL, FLOOR, WALL ; 07 - tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 08 - tilecoll WALL, FLOOR, WALL, FLOOR ; 09 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a - tilecoll FLOOR, WALL, FLOOR, WALL ; 0b - tilecoll WALL, WALL, WALL, WALL ; 0c - tilecoll WALL, FLOOR, WALL, WALL ; 0d - tilecoll FLOOR, FLOOR, WALL, WALL ; 0e - tilecoll FLOOR, WALL, WALL, WALL ; 0f - tilecoll WALL, WALL, WALL, WALL ; 10 - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 11 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 00 + tilecoll WALL, WALL, WALL, WALL ; 01 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 + tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 03 + tilecoll WALL, UP_WALL, WALL, FLOOR ; 04 + tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 05 + tilecoll UP_WALL, WALL, FLOOR, WALL ; 06 + tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 07 + tilecoll WALL, FLOOR, WALL, FLOOR ; 08 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 09 + tilecoll FLOOR, WALL, FLOOR, WALL ; 0a + tilecoll WALL, WALL, WALL, WALL ; 0b + tilecoll WALL, FLOOR, WALL, WALL ; 0c + tilecoll FLOOR, FLOOR, WALL, WALL ; 0d + tilecoll FLOOR, WALL, WALL, WALL ; 0e + tilecoll WALL, WALL, WALL, WALL ; 0f + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 10 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 11 tilecoll FLOOR, FLOOR, WALL, FLOOR ; 12 - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 13 - tilecoll FLOOR, FLOOR, WALL, CAVE ; 14 - tilecoll WALL, WALL, WALL, FLOOR ; 15 - tilecoll WALL, WALL, FLOOR, FLOOR ; 16 - tilecoll WALL, WALL, FLOOR, WALL ; 17 - tilecoll FLOOR, FLOOR, PIT, FLOOR ; 18 - tilecoll WALL, FLOOR, WALL, FLOOR ; 19 - tilecoll WALL, WALL, WALL, WALL ; 1a - tilecoll FLOOR, WALL, FLOOR, WALL ; 1b - tilecoll FLOOR, PIT, FLOOR, FLOOR ; 1c - tilecoll WALL, FLOOR, WALL, WALL ; 1d - tilecoll FLOOR, FLOOR, WALL, WALL ; 1e - tilecoll FLOOR, WALL, WALL, WALL ; 1f - tilecoll ICE, ICE, ICE, ICE ; 20 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 21 - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 22 - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 23 - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 24 - tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 25 - tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 26 - tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 27 - tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 28 - tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 29 - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 2a - tilecoll WALL, WALL, WALL, WALL ; 2b - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c - tilecoll WALL, ICE, ICE, ICE ; 2d - tilecoll ICE, ICE, WALL, ICE ; 2e - tilecoll ICE, WALL, ICE, ICE ; 2f - tilecoll ICE, ICE, ICE, WALL ; 30 - tilecoll WALL, WALL, FLOOR, WALL ; 31 - tilecoll WALL, WALL, WALL, WALL ; 32 - tilecoll WALL, WALL, WALL, FLOOR ; 33 - tilecoll WALL, WALL, FLOOR, FLOOR ; 34 - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 35 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 36 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 37 + tilecoll FLOOR, FLOOR, WALL, CAVE ; 13 + tilecoll WALL, WALL, WALL, FLOOR ; 14 + tilecoll WALL, WALL, FLOOR, FLOOR ; 15 + tilecoll WALL, WALL, FLOOR, WALL ; 16 + tilecoll FLOOR, FLOOR, PIT, FLOOR ; 17 + tilecoll WALL, FLOOR, WALL, FLOOR ; 18 + tilecoll WALL, WALL, WALL, WALL ; 19 + tilecoll FLOOR, WALL, FLOOR, WALL ; 1a + tilecoll FLOOR, PIT, FLOOR, FLOOR ; 1b + tilecoll WALL, FLOOR, WALL, WALL ; 1c + tilecoll FLOOR, FLOOR, WALL, WALL ; 1d + tilecoll FLOOR, WALL, WALL, WALL ; 1e + tilecoll ICE, ICE, ICE, ICE ; 1f + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 20 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 21 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 22 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 23 + tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 24 + tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 25 + tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 26 + tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 27 + tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 28 + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 29 + tilecoll WALL, WALL, WALL, WALL ; 2a + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2b + tilecoll WALL, ICE, ICE, ICE ; 2c + tilecoll ICE, ICE, WALL, ICE ; 2d + tilecoll ICE, WALL, ICE, ICE ; 2e + tilecoll ICE, ICE, ICE, WALL ; 2f + tilecoll WALL, WALL, FLOOR, WALL ; 30 + tilecoll WALL, WALL, WALL, WALL ; 31 + tilecoll WALL, WALL, WALL, FLOOR ; 32 + tilecoll WALL, WALL, FLOOR, FLOOR ; 33 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 34 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 35 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 36 + tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 37 tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 38 - tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 39 - tilecoll WALL, FLOOR, WALL, FLOOR ; 3a - tilecoll FLOOR, WALL, FLOOR, WALL ; 3b - tilecoll WALL, WALL, WALL, WALL ; 3c - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 3d - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 3e - tilecoll FLOOR, FLOOR, WALL, WALL ; 3f - tilecoll ICE, ICE, ICE, LADDER ; 40 + tilecoll WALL, FLOOR, WALL, FLOOR ; 39 + tilecoll FLOOR, WALL, FLOOR, WALL ; 3a + tilecoll WALL, WALL, WALL, WALL ; 3b + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 3c + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 3d + tilecoll FLOOR, FLOOR, WALL, WALL ; 3e + tilecoll ICE, ICE, ICE, LADDER ; 3f diff --git a/data/tilesets/johto_collision.asm b/data/tilesets/johto_collision.asm index 4d6d2c072..8da65db43 100644 --- a/data/tilesets/johto_collision.asm +++ b/data/tilesets/johto_collision.asm @@ -1,33 +1,34 @@ - tilecoll 01, 01, 01, 01 ; 01 + tilecoll 01, 01, 01, 01 ; 00 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03 - tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 04 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05 - tilecoll WALL, WALL, WALL, WALL ; 06 - tilecoll LADDER, LADDER, LADDER, LADDER ; 07 - tilecoll WHIRLPOOL, BUOY, WATER, BUOY ; 08 + tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 03 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04 + tilecoll WALL, WALL, WALL, WALL ; 05 + tilecoll LADDER, LADDER, LADDER, LADDER ; 06 + tilecoll WHIRLPOOL, BUOY, WATER, BUOY ; 07 + tilecoll WALL, WALL, WALL, WALL ; 08 tilecoll WALL, WALL, WALL, WALL ; 09 tilecoll WALL, WALL, WALL, WALL ; 0a - tilecoll WALL, WALL, WALL, WALL ; 0b - tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 0c - tilecoll FLOOR, FLOOR, WALL, WARP_CARPET_DOWN ; 0d - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WALL ; 0e - tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 0f + tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 0b + tilecoll FLOOR, FLOOR, WALL, WARP_CARPET_DOWN ; 0c + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WALL ; 0d + tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 0e + tilecoll WALL, WALL, WALL, WALL ; 0f tilecoll WALL, WALL, WALL, WALL ; 10 tilecoll WALL, WALL, WALL, WALL ; 11 tilecoll WALL, WALL, WALL, WALL ; 12 tilecoll WALL, WALL, WALL, WALL ; 13 - tilecoll WALL, WALL, WALL, WALL ; 14 - tilecoll WALL, WALL, WALL, DOOR ; 15 - tilecoll WALL, WALL, WALL, WALL ; 16 - tilecoll WALL, WALL, WALL, DOOR ; 17 + tilecoll WALL, WALL, WALL, DOOR ; 14 + tilecoll WALL, WALL, WALL, WALL ; 15 + tilecoll WALL, WALL, WALL, DOOR ; 16 + tilecoll WALL, WALL, WALL, WALL ; 17 tilecoll WALL, WALL, WALL, WALL ; 18 tilecoll WALL, WALL, WALL, WALL ; 19 - tilecoll WALL, WALL, WALL, WALL ; 1a - tilecoll WALL, WALL, WALL, DOOR ; 1b + tilecoll WALL, WALL, WALL, DOOR ; 1a + tilecoll WALL, WALL, WALL, WALL ; 1b tilecoll WALL, WALL, WALL, WALL ; 1c - tilecoll WALL, WALL, WALL, WALL ; 1d - tilecoll WALL, WALL, DOOR, WALL ; 1e + tilecoll WALL, WALL, DOOR, WALL ; 1d + tilecoll WALL, WALL, WALL, WALL ; 1e tilecoll WALL, WALL, WALL, WALL ; 1f tilecoll WALL, WALL, WALL, WALL ; 20 tilecoll WALL, WALL, WALL, WALL ; 21 @@ -36,93 +37,92 @@ tilecoll WALL, WALL, WALL, WALL ; 24 tilecoll WALL, WALL, WALL, WALL ; 25 tilecoll WALL, WALL, WALL, WALL ; 26 - tilecoll WALL, WALL, WALL, WALL ; 27 - tilecoll WALL, WALL, DOOR, WALL ; 28 - tilecoll WALL, WALL, WALL, DOOR ; 29 - tilecoll WALL, WALL, WALL, WALL ; 2a - tilecoll HEADBUTT_TREE, HEADBUTT_TREE, WALL, WALL ; 2b - tilecoll WALL, WALL, WALL, WALL ; 2c + tilecoll WALL, WALL, DOOR, WALL ; 27 + tilecoll WALL, WALL, WALL, DOOR ; 28 + tilecoll WALL, WALL, WALL, WALL ; 29 + tilecoll HEADBUTT_TREE, HEADBUTT_TREE, WALL, WALL ; 2a + tilecoll WALL, WALL, WALL, WALL ; 2b + tilecoll HEADBUTT_TREE, HEADBUTT_TREE, WALL, WALL ; 2c tilecoll HEADBUTT_TREE, HEADBUTT_TREE, WALL, WALL ; 2d - tilecoll HEADBUTT_TREE, HEADBUTT_TREE, WALL, WALL ; 2e - tilecoll WALL, WALL, WALL, DOOR ; 2f - tilecoll WALL, WALL, WALL, WALL ; 30 - tilecoll BUOY, BUOY, BUOY, WATER ; 31 - tilecoll BUOY, BUOY, WATER, WATER ; 32 - tilecoll BUOY, BUOY, WATER, BUOY ; 33 - tilecoll FLOOR, FLOOR, WALL, WALL ; 34 - tilecoll BUOY, WATER, BUOY, WATER ; 35 - tilecoll WATER, WATER, WATER, WATER ; 36 - tilecoll WATER, BUOY, WATER, BUOY ; 37 - tilecoll WALL, WALL, WALL, DOOR ; 38 - tilecoll BUOY, WATER, BUOY, BUOY ; 39 - tilecoll WATER, WATER, BUOY, BUOY ; 3a - tilecoll WATER, BUOY, BUOY, BUOY ; 3b - tilecoll WALL, WALL, WALL, WALL ; 3c - tilecoll HEADBUTT_TREE, FLOOR, FLOOR, FLOOR ; 3d - tilecoll FLOOR, HEADBUTT_TREE, FLOOR, FLOOR ; 3e - tilecoll FLOOR, FLOOR, HEADBUTT_TREE, FLOOR ; 3f - tilecoll FLOOR, FLOOR, FLOOR, HEADBUTT_TREE ; 40 - tilecoll WALL, WALL, WALL, FLOOR ; 41 - tilecoll WALL, WALL, FLOOR, FLOOR ; 42 - tilecoll WALL, WALL, FLOOR, WALL ; 43 - tilecoll WATER, WATER, WATER, WATER ; 44 - tilecoll WALL, FLOOR, WALL, FLOOR ; 45 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 46 - tilecoll FLOOR, WALL, FLOOR, WALL ; 47 - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 48 - tilecoll WALL, FLOOR, WALL, WALL ; 49 - tilecoll FLOOR, FLOOR, WALL, WALL ; 4a - tilecoll FLOOR, WALL, WALL, WALL ; 4b - tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 4c - tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4d - tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 4e - tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4f - tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 50 - tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 51 - tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 52 - tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 53 - tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 54 + tilecoll WALL, WALL, WALL, DOOR ; 2e + tilecoll WALL, WALL, WALL, WALL ; 2f + tilecoll BUOY, BUOY, BUOY, WATER ; 30 + tilecoll BUOY, BUOY, WATER, WATER ; 31 + tilecoll BUOY, BUOY, WATER, BUOY ; 32 + tilecoll FLOOR, FLOOR, WALL, WALL ; 33 + tilecoll BUOY, WATER, BUOY, WATER ; 34 + tilecoll WATER, WATER, WATER, WATER ; 35 + tilecoll WATER, BUOY, WATER, BUOY ; 36 + tilecoll WALL, WALL, WALL, DOOR ; 37 + tilecoll BUOY, WATER, BUOY, BUOY ; 38 + tilecoll WATER, WATER, BUOY, BUOY ; 39 + tilecoll WATER, BUOY, BUOY, BUOY ; 3a + tilecoll WALL, WALL, WALL, WALL ; 3b + tilecoll HEADBUTT_TREE, FLOOR, FLOOR, FLOOR ; 3c + tilecoll FLOOR, HEADBUTT_TREE, FLOOR, FLOOR ; 3d + tilecoll FLOOR, FLOOR, HEADBUTT_TREE, FLOOR ; 3e + tilecoll FLOOR, FLOOR, FLOOR, HEADBUTT_TREE ; 3f + tilecoll WALL, WALL, WALL, FLOOR ; 40 + tilecoll WALL, WALL, FLOOR, FLOOR ; 41 + tilecoll WALL, WALL, FLOOR, WALL ; 42 + tilecoll WATER, WATER, WATER, WATER ; 43 + tilecoll WALL, FLOOR, WALL, FLOOR ; 44 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 45 + tilecoll FLOOR, WALL, FLOOR, WALL ; 46 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 47 + tilecoll WALL, FLOOR, WALL, WALL ; 48 + tilecoll FLOOR, FLOOR, WALL, WALL ; 49 + tilecoll FLOOR, WALL, WALL, WALL ; 4a + tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 4b + tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4c + tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 4d + tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4e + tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 4f + tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 50 + tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 51 + tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 52 + tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 53 + tilecoll WATER, WATER, WATER, WATER ; 54 tilecoll WATER, WATER, WATER, WATER ; 55 - tilecoll WATER, WATER, WATER, WATER ; 56 + tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 56 tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 57 - tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 58 + tilecoll WATER, WATER, WATER, WATER ; 58 tilecoll WATER, WATER, WATER, WATER ; 59 - tilecoll WATER, WATER, WATER, WATER ; 5a - tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 5b - tilecoll HEADBUTT_TREE, CUT_TREE, FLOOR, FLOOR ; 5c - tilecoll HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE, FLOOR ; 5d - tilecoll HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, FLOOR ; 5e - tilecoll HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, HEADBUTT_TREE ; 5f - tilecoll FLOOR, HEADBUTT_TREE, FLOOR, CUT_TREE ; 60 - tilecoll HEADBUTT_TREE, FLOOR, HEADBUTT_TREE, FLOOR ; 61 - tilecoll HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 62 - tilecoll FLOOR, HEADBUTT_TREE, FLOOR, HEADBUTT_TREE ; 63 - tilecoll FLOOR, FLOOR, CUT_TREE, HEADBUTT_TREE ; 64 - tilecoll HEADBUTT_TREE, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 65 - tilecoll FLOOR, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 66 - tilecoll FLOOR, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 67 - tilecoll CUT_TREE, FLOOR, HEADBUTT_TREE, FLOOR ; 68 - tilecoll WALL, FLOOR, WALL, FLOOR ; 69 - tilecoll FLOOR, WALL, FLOOR, WALL ; 6a - tilecoll WALL, UP_WALL, WALL, FLOOR ; 6b - tilecoll UP_WALL, WALL, FLOOR, WALL ; 6c - tilecoll WALL, FLOOR, WALL, WALL ; 6d - tilecoll FLOOR, WALL, WALL, WALL ; 6e - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 6f - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 70 - tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 71 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 72 - tilecoll FLOOR, FLOOR, WALL, WALL ; 73 - tilecoll FLOOR, FLOOR, CAVE, WALL ; 74 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 75 - tilecoll WALL, WALL, FLOOR, FLOOR ; 76 - tilecoll WATER, WATER, WATER, WATER ; 77 - tilecoll WALL, WALL, DOOR, WALL ; 78 - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 79 + tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 5a + tilecoll HEADBUTT_TREE, CUT_TREE, FLOOR, FLOOR ; 5b + tilecoll HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE, FLOOR ; 5c + tilecoll HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, FLOOR ; 5d + tilecoll HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, HEADBUTT_TREE ; 5e + tilecoll FLOOR, HEADBUTT_TREE, FLOOR, CUT_TREE ; 5f + tilecoll HEADBUTT_TREE, FLOOR, HEADBUTT_TREE, FLOOR ; 60 + tilecoll HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 61 + tilecoll FLOOR, HEADBUTT_TREE, FLOOR, HEADBUTT_TREE ; 62 + tilecoll FLOOR, FLOOR, CUT_TREE, HEADBUTT_TREE ; 63 + tilecoll HEADBUTT_TREE, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 64 + tilecoll FLOOR, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 65 + tilecoll FLOOR, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 66 + tilecoll CUT_TREE, FLOOR, HEADBUTT_TREE, FLOOR ; 67 + tilecoll WALL, FLOOR, WALL, FLOOR ; 68 + tilecoll FLOOR, WALL, FLOOR, WALL ; 69 + tilecoll WALL, UP_WALL, WALL, FLOOR ; 6a + tilecoll UP_WALL, WALL, FLOOR, WALL ; 6b + tilecoll WALL, FLOOR, WALL, WALL ; 6c + tilecoll FLOOR, WALL, WALL, WALL ; 6d + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 6e + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 6f + tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 70 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 71 + tilecoll FLOOR, FLOOR, WALL, WALL ; 72 + tilecoll FLOOR, FLOOR, CAVE, WALL ; 73 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 74 + tilecoll WALL, WALL, FLOOR, FLOOR ; 75 + tilecoll WATER, WATER, WATER, WATER ; 76 + tilecoll WALL, WALL, DOOR, WALL ; 77 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 78 + tilecoll WATER, WATER, WATER, WATER ; 79 tilecoll WATER, WATER, WATER, WATER ; 7a - tilecoll WATER, WATER, WATER, WATER ; 7b + tilecoll WALL, WALL, WALL, WALL ; 7b tilecoll WALL, WALL, WALL, WALL ; 7c tilecoll WALL, WALL, WALL, WALL ; 7d tilecoll WALL, WALL, WALL, WALL ; 7e tilecoll WALL, WALL, WALL, WALL ; 7f - tilecoll WALL, WALL, WALL, WALL ; 80 diff --git a/data/tilesets/johto_modern_collision.asm b/data/tilesets/johto_modern_collision.asm index 40255d744..67ba03575 100644 --- a/data/tilesets/johto_modern_collision.asm +++ b/data/tilesets/johto_modern_collision.asm @@ -1,40 +1,41 @@ + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 00 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03 - tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 04 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05 - tilecoll WALL, WALL, WALL, WALL ; 06 + tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 03 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04 + tilecoll WALL, WALL, WALL, WALL ; 05 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 06 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 07 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 08 + tilecoll WALL, WALL, WALL, WALL ; 08 tilecoll WALL, WALL, WALL, WALL ; 09 tilecoll WALL, WALL, WALL, WALL ; 0a - tilecoll WALL, WALL, WALL, WALL ; 0b - tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 0c - tilecoll FLOOR, FLOOR, WALL, WARP_CARPET_DOWN ; 0d - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WALL ; 0e - tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 0f + tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 0b + tilecoll FLOOR, FLOOR, WALL, WARP_CARPET_DOWN ; 0c + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WALL ; 0d + tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 0e + tilecoll WALL, WALL, WALL, WALL ; 0f tilecoll WALL, WALL, WALL, WALL ; 10 tilecoll WALL, WALL, WALL, WALL ; 11 tilecoll WALL, WALL, WALL, WALL ; 12 tilecoll WALL, WALL, WALL, WALL ; 13 - tilecoll WALL, WALL, WALL, WALL ; 14 - tilecoll WALL, WALL, WALL, DOOR ; 15 - tilecoll WALL, WALL, WALL, WALL ; 16 - tilecoll WALL, WALL, WALL, DOOR ; 17 - tilecoll WALL, WALL, DOOR, WALL ; 18 + tilecoll WALL, WALL, WALL, DOOR ; 14 + tilecoll WALL, WALL, WALL, WALL ; 15 + tilecoll WALL, WALL, WALL, DOOR ; 16 + tilecoll WALL, WALL, DOOR, WALL ; 17 + tilecoll WALL, WALL, WALL, WALL ; 18 tilecoll WALL, WALL, WALL, WALL ; 19 - tilecoll WALL, WALL, WALL, WALL ; 1a - tilecoll WALL, WALL, WALL, DOOR ; 1b + tilecoll WALL, WALL, WALL, DOOR ; 1a + tilecoll WALL, WALL, WALL, WALL ; 1b tilecoll WALL, WALL, WALL, WALL ; 1c - tilecoll WALL, WALL, WALL, WALL ; 1d - tilecoll WALL, WALL, DOOR, WALL ; 1e + tilecoll WALL, WALL, DOOR, WALL ; 1d + tilecoll WALL, WALL, WALL, WALL ; 1e tilecoll WALL, WALL, WALL, WALL ; 1f tilecoll WALL, WALL, WALL, WALL ; 20 tilecoll WALL, WALL, WALL, WALL ; 21 tilecoll WALL, WALL, WALL, WALL ; 22 tilecoll WALL, WALL, WALL, WALL ; 23 - tilecoll WALL, WALL, WALL, WALL ; 24 - tilecoll WALL, WALL, DOOR, WALL ; 25 + tilecoll WALL, WALL, DOOR, WALL ; 24 + tilecoll WALL, WALL, WALL, WALL ; 25 tilecoll WALL, WALL, WALL, WALL ; 26 tilecoll WALL, WALL, WALL, WALL ; 27 tilecoll WALL, WALL, WALL, WALL ; 28 @@ -42,87 +43,86 @@ tilecoll WALL, WALL, WALL, WALL ; 2a tilecoll WALL, WALL, WALL, WALL ; 2b tilecoll WALL, WALL, WALL, WALL ; 2c - tilecoll WALL, WALL, WALL, WALL ; 2d - tilecoll WALL, WALL, WALL, DOOR ; 2e - tilecoll WALL, WALL, WALL, WALL ; 2f - tilecoll HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, FLOOR ; 30 - tilecoll BUOY, BUOY, BUOY, WATER ; 31 - tilecoll BUOY, BUOY, WATER, WATER ; 32 - tilecoll BUOY, BUOY, WATER, BUOY ; 33 - tilecoll WALL, WALL, WALL, WALL ; 34 - tilecoll BUOY, WATER, BUOY, WATER ; 35 - tilecoll WATER, WATER, WATER, WATER ; 36 - tilecoll WATER, BUOY, WATER, BUOY ; 37 - tilecoll HEADBUTT_TREE, FLOOR, FLOOR, FLOOR ; 38 - tilecoll BUOY, WATER, BUOY, BUOY ; 39 - tilecoll WATER, WATER, BUOY, BUOY ; 3a - tilecoll WATER, BUOY, BUOY, BUOY ; 3b - tilecoll FLOOR, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 3c - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 3d - tilecoll HEADBUTT_TREE, HEADBUTT_TREE, WALL, WALL ; 3e - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 3f - tilecoll HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 40 - tilecoll WALL, WALL, WALL, FLOOR ; 41 - tilecoll WALL, WALL, FLOOR, FLOOR ; 42 - tilecoll WALL, WALL, FLOOR, WALL ; 43 - tilecoll WATER, WATER, WATER, WATER ; 44 - tilecoll WALL, FLOOR, WALL, FLOOR ; 45 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 46 - tilecoll FLOOR, WALL, FLOOR, WALL ; 47 - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 48 - tilecoll WALL, FLOOR, WALL, WALL ; 49 - tilecoll FLOOR, FLOOR, WALL, WALL ; 4a - tilecoll FLOOR, WALL, WALL, WALL ; 4b - tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 4c - tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4d - tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 4e - tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4f - tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 50 - tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 51 - tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 52 - tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 53 - tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 54 + tilecoll WALL, WALL, WALL, DOOR ; 2d + tilecoll WALL, WALL, WALL, WALL ; 2e + tilecoll HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, FLOOR ; 2f + tilecoll BUOY, BUOY, BUOY, WATER ; 30 + tilecoll BUOY, BUOY, WATER, WATER ; 31 + tilecoll BUOY, BUOY, WATER, BUOY ; 32 + tilecoll WALL, WALL, WALL, WALL ; 33 + tilecoll BUOY, WATER, BUOY, WATER ; 34 + tilecoll WATER, WATER, WATER, WATER ; 35 + tilecoll WATER, BUOY, WATER, BUOY ; 36 + tilecoll HEADBUTT_TREE, FLOOR, FLOOR, FLOOR ; 37 + tilecoll BUOY, WATER, BUOY, BUOY ; 38 + tilecoll WATER, WATER, BUOY, BUOY ; 39 + tilecoll WATER, BUOY, BUOY, BUOY ; 3a + tilecoll FLOOR, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 3b + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 3c + tilecoll HEADBUTT_TREE, HEADBUTT_TREE, WALL, WALL ; 3d + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 3e + tilecoll HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 3f + tilecoll WALL, WALL, WALL, FLOOR ; 40 + tilecoll WALL, WALL, FLOOR, FLOOR ; 41 + tilecoll WALL, WALL, FLOOR, WALL ; 42 + tilecoll WATER, WATER, WATER, WATER ; 43 + tilecoll WALL, FLOOR, WALL, FLOOR ; 44 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 45 + tilecoll FLOOR, WALL, FLOOR, WALL ; 46 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 47 + tilecoll WALL, FLOOR, WALL, WALL ; 48 + tilecoll FLOOR, FLOOR, WALL, WALL ; 49 + tilecoll FLOOR, WALL, WALL, WALL ; 4a + tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 4b + tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4c + tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 4d + tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4e + tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 4f + tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 50 + tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 51 + tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 52 + tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 53 + tilecoll WATER, WATER, WATER, WATER ; 54 tilecoll WATER, WATER, WATER, WATER ; 55 - tilecoll WATER, WATER, WATER, WATER ; 56 + tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 56 tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 57 - tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 58 + tilecoll WATER, WATER, WATER, WATER ; 58 tilecoll WATER, WATER, WATER, WATER ; 59 - tilecoll WATER, WATER, WATER, WATER ; 5a - tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 5b - tilecoll WALL, WALL, WALL, CAVE ; 5c - tilecoll WALL, FLOOR, WALL, FLOOR ; 5d + tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 5a + tilecoll WALL, WALL, WALL, CAVE ; 5b + tilecoll WALL, FLOOR, WALL, FLOOR ; 5c + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 5d tilecoll WALL, FLOOR, FLOOR, FLOOR ; 5e - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 5f - tilecoll WALL, WALL, WALL, WALL ; 60 + tilecoll WALL, WALL, WALL, WALL ; 5f + tilecoll WATER, WATER, WALL, WALL ; 60 tilecoll WATER, WATER, WALL, WALL ; 61 tilecoll WATER, WATER, WALL, WALL ; 62 - tilecoll WATER, WATER, WALL, WALL ; 63 - tilecoll WATER, WATER, WATER, WATER ; 64 - tilecoll FLOOR, WALL, FLOOR, WALL ; 65 - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 66 - tilecoll WALL, FLOOR, WALL, FLOOR ; 67 - tilecoll WALL, WALL, WALL, WALL ; 68 - tilecoll WALL, FLOOR, WALL, FLOOR ; 69 - tilecoll FLOOR, WALL, FLOOR, WALL ; 6a - tilecoll WALL, UP_WALL, WALL, FLOOR ; 6b - tilecoll UP_WALL, WALL, FLOOR, WALL ; 6c - tilecoll WALL, FLOOR, WALL, WALL ; 6d - tilecoll FLOOR, WALL, WALL, WALL ; 6e - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 6f - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 70 - tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 71 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 72 - tilecoll FLOOR, FLOOR, WALL, WALL ; 73 - tilecoll FLOOR, FLOOR, WALL, CAVE ; 74 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 75 - tilecoll WALL, WALL, FLOOR, FLOOR ; 76 - tilecoll WATER, WATER, WATER, WATER ; 77 - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 78 - tilecoll FLOOR, FLOOR, WALL, WALL ; 79 + tilecoll WATER, WATER, WATER, WATER ; 63 + tilecoll FLOOR, WALL, FLOOR, WALL ; 64 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 65 + tilecoll WALL, FLOOR, WALL, FLOOR ; 66 + tilecoll WALL, WALL, WALL, WALL ; 67 + tilecoll WALL, FLOOR, WALL, FLOOR ; 68 + tilecoll FLOOR, WALL, FLOOR, WALL ; 69 + tilecoll WALL, UP_WALL, WALL, FLOOR ; 6a + tilecoll UP_WALL, WALL, FLOOR, WALL ; 6b + tilecoll WALL, FLOOR, WALL, WALL ; 6c + tilecoll FLOOR, WALL, WALL, WALL ; 6d + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 6e + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 6f + tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 70 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 71 + tilecoll FLOOR, FLOOR, WALL, WALL ; 72 + tilecoll FLOOR, FLOOR, WALL, CAVE ; 73 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 74 + tilecoll WALL, WALL, FLOOR, FLOOR ; 75 + tilecoll WATER, WATER, WATER, WATER ; 76 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 77 + tilecoll FLOOR, FLOOR, WALL, WALL ; 78 + tilecoll WATER, WATER, WATER, WATER ; 79 tilecoll WATER, WATER, WATER, WATER ; 7a - tilecoll WATER, WATER, WATER, WATER ; 7b + tilecoll WALL, WALL, WALL, WALL ; 7b tilecoll WALL, WALL, WALL, WALL ; 7c tilecoll WALL, WALL, WALL, WALL ; 7d tilecoll WALL, WALL, WALL, WALL ; 7e - tilecoll WALL, WALL, WALL, WALL ; 7f - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 80 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 7f diff --git a/data/tilesets/kabuto_word_room_collision.asm b/data/tilesets/kabuto_word_room_collision.asm index 138f07143..58bdacc53 100644 --- a/data/tilesets/kabuto_word_room_collision.asm +++ b/data/tilesets/kabuto_word_room_collision.asm @@ -1,4 +1,5 @@ - tilecoll WALL, WALL, WALL, WALL ; 01 + tilecoll WALL, WALL, WALL, WALL ; 00 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04 @@ -17,20 +18,20 @@ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 11 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 12 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 13 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 14 - tilecoll WALL, WALL, WALL, FLOOR ; 15 + tilecoll WALL, WALL, WALL, FLOOR ; 14 + tilecoll WALL, WALL, FLOOR, FLOOR ; 15 tilecoll WALL, WALL, FLOOR, FLOOR ; 16 - tilecoll WALL, WALL, FLOOR, FLOOR ; 17 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 18 - tilecoll WALL, WALL, FLOOR, FLOOR ; 19 - tilecoll WALL, WALL, FLOOR, WALL ; 1a - tilecoll WALL, FLOOR, WALL, FLOOR ; 1b - tilecoll FLOOR, WALL, FLOOR, WALL ; 1c - tilecoll FLOOR, FLOOR, FLOOR, PIT ; 1d + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 17 + tilecoll WALL, WALL, FLOOR, FLOOR ; 18 + tilecoll WALL, WALL, FLOOR, WALL ; 19 + tilecoll WALL, FLOOR, WALL, FLOOR ; 1a + tilecoll FLOOR, WALL, FLOOR, WALL ; 1b + tilecoll FLOOR, FLOOR, FLOOR, PIT ; 1c + tilecoll WALL, WALL, WALL, WALL ; 1d tilecoll WALL, WALL, WALL, WALL ; 1e tilecoll WALL, WALL, WALL, WALL ; 1f tilecoll WALL, WALL, WALL, WALL ; 20 - tilecoll WALL, WALL, WALL, WALL ; 21 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 21 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 22 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 23 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 24 @@ -61,4 +62,3 @@ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40 diff --git a/data/tilesets/kanto_collision.asm b/data/tilesets/kanto_collision.asm index 9b0f0c275..275c2b0b1 100644 --- a/data/tilesets/kanto_collision.asm +++ b/data/tilesets/kanto_collision.asm @@ -1,128 +1,128 @@ - tilecoll CUT_TREE, CUT_TREE, CUT_TREE, CUT_TREE ; 01 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 - tilecoll WALL, WALL, WALL, DOOR ; 03 - tilecoll WALL, WALL, WALL, WALL ; 04 - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 05 - tilecoll LADDER, LADDER, LADDER, LADDER ; 06 - tilecoll FLOOR, FLOOR, CAVE, WALL ; 07 - tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 08 - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 09 - tilecoll WALL, WALL, WALL, WALL ; 0a - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0b - tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 0c + tilecoll CUT_TREE, CUT_TREE, CUT_TREE, CUT_TREE ; 00 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01 + tilecoll WALL, WALL, WALL, DOOR ; 02 + tilecoll WALL, WALL, WALL, WALL ; 03 + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 04 + tilecoll LADDER, LADDER, LADDER, LADDER ; 05 + tilecoll FLOOR, FLOOR, CAVE, WALL ; 06 + tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 07 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 08 + tilecoll WALL, WALL, WALL, WALL ; 09 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a + tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 0b + tilecoll WALL, WALL, WALL, WALL ; 0c tilecoll WALL, WALL, WALL, WALL ; 0d tilecoll WALL, WALL, WALL, WALL ; 0e tilecoll WALL, WALL, WALL, WALL ; 0f tilecoll WALL, WALL, WALL, WALL ; 10 tilecoll WALL, WALL, WALL, WALL ; 11 - tilecoll WALL, WALL, WALL, WALL ; 12 - tilecoll WALL, WALL, DOOR, WALL ; 13 - tilecoll WALL, WALL, WALL, WALL ; 14 - tilecoll WALL, WATER, WALL, WALL ; 15 - tilecoll WATER, WALL, WALL, WALL ; 16 - tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 17 - tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 18 - tilecoll WALL, WATER, WALL, WATER ; 19 - tilecoll WATER, WALL, WATER, WALL ; 1a - tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 1b - tilecoll WALL, FLOOR, WALL, FLOOR ; 1c - tilecoll FLOOR, FLOOR, WALL, WALL ; 1d + tilecoll WALL, WALL, DOOR, WALL ; 12 + tilecoll WALL, WALL, WALL, WALL ; 13 + tilecoll WALL, WATER, WALL, WALL ; 14 + tilecoll WATER, WALL, WALL, WALL ; 15 + tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 16 + tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 17 + tilecoll WALL, WATER, WALL, WATER ; 18 + tilecoll WATER, WALL, WATER, WALL ; 19 + tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 1a + tilecoll WALL, FLOOR, WALL, FLOOR ; 1b + tilecoll FLOOR, FLOOR, WALL, WALL ; 1c + tilecoll WATER, WATER, WATER, WATER ; 1d tilecoll WATER, WATER, WATER, WATER ; 1e tilecoll WATER, WATER, WATER, WATER ; 1f - tilecoll WATER, WATER, WATER, WATER ; 20 + tilecoll WALL, WALL, WALL, WALL ; 20 tilecoll WALL, WALL, WALL, WALL ; 21 - tilecoll WALL, WALL, WALL, WALL ; 22 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 22 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 23 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 24 - tilecoll WALL, FLOOR, WALL, WALL ; 25 - tilecoll FLOOR, WALL, WALL, WALL ; 26 + tilecoll WALL, FLOOR, WALL, WALL ; 24 + tilecoll FLOOR, WALL, WALL, WALL ; 25 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 26 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 27 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 28 - tilecoll WALL, FLOOR, WALL, FLOOR ; 29 - tilecoll FLOOR, WALL, FLOOR, WALL ; 2a - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 2b - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 2c - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2d + tilecoll WALL, FLOOR, WALL, FLOOR ; 28 + tilecoll FLOOR, WALL, FLOOR, WALL ; 29 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 2a + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 2b + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c + tilecoll WATER, WATER, WATER, WATER ; 2d tilecoll WATER, WATER, WATER, WATER ; 2e - tilecoll WATER, WATER, WATER, WATER ; 2f - tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 30 - tilecoll WALL, WALL, WALL, WALL ; 31 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 32 - tilecoll WALL, CUT_TREE, WALL, FLOOR ; 33 - tilecoll WALL, WALL, FLOOR, CUT_TREE ; 34 - tilecoll CUT_TREE, FLOOR, WALL, WALL ; 35 - tilecoll FLOOR, CUT_TREE, WALL, FLOOR ; 36 - tilecoll WALL, WALL, FLOOR, WALL ; 37 - tilecoll WALL, WALL, WALL, WALL ; 38 + tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 2f + tilecoll WALL, WALL, WALL, WALL ; 30 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 31 + tilecoll WALL, CUT_TREE, WALL, FLOOR ; 32 + tilecoll WALL, WALL, FLOOR, CUT_TREE ; 33 + tilecoll CUT_TREE, FLOOR, WALL, WALL ; 34 + tilecoll FLOOR, CUT_TREE, WALL, FLOOR ; 35 + tilecoll WALL, WALL, FLOOR, WALL ; 36 + tilecoll WALL, WALL, WALL, WALL ; 37 + tilecoll FLOOR, FLOOR, WALL, WALL ; 38 tilecoll FLOOR, FLOOR, WALL, WALL ; 39 - tilecoll FLOOR, FLOOR, WALL, WALL ; 3a - tilecoll WALL, WALL, DOOR, WALL ; 3b - tilecoll UP_WALL, WALL, FLOOR, WALL ; 3c - tilecoll WALL, WALL, WALL, DOOR ; 3d - tilecoll WALL, WALL, WALL, WALL ; 3e - tilecoll WALL, UP_WALL, WALL, FLOOR ; 3f - tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 40 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 41 - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 42 - tilecoll HOP_DOWN, WALL, WALL, WALL ; 43 - tilecoll WATER, WATER, WATER, WATER ; 44 + tilecoll WALL, WALL, DOOR, WALL ; 3a + tilecoll UP_WALL, WALL, FLOOR, WALL ; 3b + tilecoll WALL, WALL, WALL, DOOR ; 3c + tilecoll WALL, WALL, WALL, WALL ; 3d + tilecoll WALL, UP_WALL, WALL, FLOOR ; 3e + tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 3f + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 40 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 41 + tilecoll HOP_DOWN, WALL, WALL, WALL ; 42 + tilecoll WATER, WATER, WATER, WATER ; 43 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 44 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 45 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 46 - tilecoll FLOOR, FLOOR, WALL, WARP_CARPET_DOWN ; 47 - tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 48 + tilecoll FLOOR, FLOOR, WALL, WARP_CARPET_DOWN ; 46 + tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 47 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 48 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 49 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 4a - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WALL ; 4b - tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 4c - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 4d - tilecoll FLOOR, WALL, FLOOR, WALL ; 4e - tilecoll WALL, FLOOR, WALL, FLOOR ; 4f - tilecoll FLOOR, WALL, WALL, WALL ; 50 - tilecoll WALL, FLOOR, WALL, WALL ; 51 - tilecoll WALL, WALL, FLOOR, FLOOR ; 52 - tilecoll FLOOR, FLOOR, WALL, WALL ; 53 - tilecoll WALL, WALL, WALL, DOOR ; 54 - tilecoll WALL, WALL, WALL, WALL ; 55 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 56 + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WALL ; 4a + tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 4b + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 4c + tilecoll FLOOR, WALL, FLOOR, WALL ; 4d + tilecoll WALL, FLOOR, WALL, FLOOR ; 4e + tilecoll FLOOR, WALL, WALL, WALL ; 4f + tilecoll WALL, FLOOR, WALL, WALL ; 50 + tilecoll WALL, WALL, FLOOR, FLOOR ; 51 + tilecoll FLOOR, FLOOR, WALL, WALL ; 52 + tilecoll WALL, WALL, WALL, DOOR ; 53 + tilecoll WALL, WALL, WALL, WALL ; 54 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 55 + tilecoll FLOOR, FLOOR, WALL, WALL ; 56 tilecoll FLOOR, FLOOR, WALL, WALL ; 57 - tilecoll FLOOR, FLOOR, WALL, WALL ; 58 - tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 59 - tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 5a - tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 5b - tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 5c - tilecoll FLOOR, HOP_DOWN, FLOOR, WALL ; 5d + tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 58 + tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 59 + tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 5a + tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 5b + tilecoll FLOOR, HOP_DOWN, FLOOR, WALL ; 5c + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 5d tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 5e - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 5f - tilecoll FLOOR, WALL, FLOOR, WALL ; 60 - tilecoll FLOOR, WALL, CUT_TREE, WALL ; 61 - tilecoll FLOOR, FLOOR, WALL, WALL ; 62 - tilecoll WALL, WALL, WALL, FLOOR ; 63 - tilecoll WALL, WALL, FLOOR, WALL ; 64 + tilecoll FLOOR, WALL, FLOOR, WALL ; 5f + tilecoll FLOOR, WALL, CUT_TREE, WALL ; 60 + tilecoll FLOOR, FLOOR, WALL, WALL ; 61 + tilecoll WALL, WALL, WALL, FLOOR ; 62 + tilecoll WALL, WALL, FLOOR, WALL ; 63 + tilecoll WATER, WATER, WATER, WATER ; 64 tilecoll WATER, WATER, WATER, WATER ; 65 - tilecoll WATER, WATER, WATER, WATER ; 66 - tilecoll WALL, WALL, WALL, WALL ; 67 - tilecoll WALL, WATER, WALL, WATER ; 68 + tilecoll WALL, WALL, WALL, WALL ; 66 + tilecoll WALL, WATER, WALL, WATER ; 67 + tilecoll WALL, WALL, WALL, WALL ; 68 tilecoll WALL, WALL, WALL, WALL ; 69 - tilecoll WALL, WALL, WALL, WALL ; 6a - tilecoll WATER, WALL, WATER, WALL ; 6b - tilecoll WATER, WATER, WALL, WALL ; 6c - tilecoll WALL, WALL, FLOOR, FLOOR ; 6d - tilecoll WALL, FLOOR, WALL, FLOOR ; 6e - tilecoll FLOOR, WALL, FLOOR, WALL ; 6f - tilecoll FLOOR, FLOOR, WALL, WALL ; 70 - tilecoll FLOOR, WALL, CAVE, WALL ; 71 + tilecoll WATER, WALL, WATER, WALL ; 6a + tilecoll WATER, WATER, WALL, WALL ; 6b + tilecoll WALL, WALL, FLOOR, FLOOR ; 6c + tilecoll WALL, FLOOR, WALL, FLOOR ; 6d + tilecoll FLOOR, WALL, FLOOR, WALL ; 6e + tilecoll FLOOR, FLOOR, WALL, WALL ; 6f + tilecoll FLOOR, WALL, CAVE, WALL ; 70 + tilecoll WALL, WALL, WALL, WALL ; 71 tilecoll WALL, WALL, WALL, WALL ; 72 tilecoll WALL, WALL, WALL, WALL ; 73 - tilecoll WALL, WALL, WALL, WALL ; 74 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 75 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 74 + tilecoll WALL, WALL, WALL, WALL ; 75 tilecoll WALL, WALL, WALL, WALL ; 76 - tilecoll WALL, WALL, WALL, WALL ; 77 - tilecoll FLOOR, FLOOR, WALL, WALL ; 78 - tilecoll WATER, WATER, WATER, WATER ; 79 - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 7a - tilecoll WALL, WALL, WALL, WALL ; 7b - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 7c - tilecoll WALL, WALL, WALL, DOOR ; 7d + tilecoll FLOOR, FLOOR, WALL, WALL ; 77 + tilecoll WATER, WATER, WATER, WATER ; 78 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 79 + tilecoll WALL, WALL, WALL, WALL ; 7a + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 7b + tilecoll WALL, WALL, WALL, DOOR ; 7c + tilecoll WALL, WALL, WALL, WALL ; 7d tilecoll WALL, WALL, WALL, WALL ; 7e tilecoll WALL, WALL, WALL, WALL ; 7f - tilecoll WALL, WALL, WALL, WALL ; 80 diff --git a/data/tilesets/lab_collision.asm b/data/tilesets/lab_collision.asm index 436c8e0a7..b3aa6ef1b 100644 --- a/data/tilesets/lab_collision.asm +++ b/data/tilesets/lab_collision.asm @@ -1,50 +1,51 @@ - tilecoll WALL, WALL, WALL, WALL ; 01 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 03 - tilecoll WALL, WALL, WALL, WALL ; 04 - tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 05 - tilecoll WALL, WALL, FLOOR, FLOOR ; 06 + tilecoll WALL, WALL, WALL, WALL ; 00 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01 + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 02 + tilecoll WALL, WALL, WALL, WALL ; 03 + tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 04 + tilecoll WALL, WALL, FLOOR, FLOOR ; 05 + tilecoll FLOOR, FLOOR, WALL, WALL ; 06 tilecoll FLOOR, FLOOR, WALL, WALL ; 07 - tilecoll FLOOR, FLOOR, WALL, WALL ; 08 - tilecoll WALL, WALL, WALL, WALL ; 09 - tilecoll WINDOW, WALL, FLOOR, FLOOR ; 0a + tilecoll WALL, WALL, WALL, WALL ; 08 + tilecoll WINDOW, WALL, FLOOR, FLOOR ; 09 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0b tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0c - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0d - tilecoll WALL, WALL, FLOOR, FLOOR ; 0e - tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 0f - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 10 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 11 + tilecoll WALL, WALL, FLOOR, FLOOR ; 0d + tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 0e + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 0f + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 10 + tilecoll WALL, WALL, FLOOR, FLOOR ; 11 tilecoll WALL, WALL, FLOOR, FLOOR ; 12 tilecoll WALL, WALL, FLOOR, FLOOR ; 13 - tilecoll WALL, WALL, FLOOR, FLOOR ; 14 - tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 15 - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 16 - tilecoll WALL, WALL, FLOOR, FLOOR ; 17 - tilecoll WALL, WALL, WALL, WALL ; 18 - tilecoll WALL, WALL, FLOOR, FLOOR ; 19 - tilecoll FLOOR, LADDER, FLOOR, FLOOR ; 1a - tilecoll FLOOR, WALL, FLOOR, WALL ; 1b - tilecoll WALL, FLOOR, WALL, FLOOR ; 1c - tilecoll WALL, WALL, FLOOR, FLOOR ; 1d - tilecoll WALL, FLOOR, WALL, FLOOR ; 1e - tilecoll FLOOR, WALL, FLOOR, WALL ; 1f - tilecoll FLOOR, FLOOR, WALL, WALL ; 20 - tilecoll WINDOW, WINDOW, FLOOR, FLOOR ; 21 - tilecoll FLOOR, FLOOR, WALL, WALL ; 22 + tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 14 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 15 + tilecoll WALL, WALL, FLOOR, FLOOR ; 16 + tilecoll WALL, WALL, WALL, WALL ; 17 + tilecoll WALL, WALL, FLOOR, FLOOR ; 18 + tilecoll FLOOR, LADDER, FLOOR, FLOOR ; 19 + tilecoll FLOOR, WALL, FLOOR, WALL ; 1a + tilecoll WALL, FLOOR, WALL, FLOOR ; 1b + tilecoll WALL, WALL, FLOOR, FLOOR ; 1c + tilecoll WALL, FLOOR, WALL, FLOOR ; 1d + tilecoll FLOOR, WALL, FLOOR, WALL ; 1e + tilecoll FLOOR, FLOOR, WALL, WALL ; 1f + tilecoll WINDOW, WINDOW, FLOOR, FLOOR ; 20 + tilecoll FLOOR, FLOOR, WALL, WALL ; 21 + tilecoll WALL, WALL, WALL, WALL ; 22 tilecoll WALL, WALL, WALL, WALL ; 23 tilecoll WALL, WALL, WALL, WALL ; 24 - tilecoll WALL, WALL, WALL, WALL ; 25 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 26 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 25 + tilecoll WALL, WALL, WALL, WALL ; 26 tilecoll WALL, WALL, WALL, WALL ; 27 tilecoll WALL, WALL, WALL, WALL ; 28 - tilecoll WALL, WALL, WALL, WALL ; 29 + tilecoll WALL, WALL, FLOOR, FLOOR ; 29 tilecoll WALL, WALL, FLOOR, FLOOR ; 2a tilecoll WALL, WALL, FLOOR, FLOOR ; 2b - tilecoll WALL, WALL, FLOOR, FLOOR ; 2c + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2d - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2e - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 2f + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 2e + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2f tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 30 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 31 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 32 @@ -61,4 +62,3 @@ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40 diff --git a/data/tilesets/lighthouse_collision.asm b/data/tilesets/lighthouse_collision.asm index 05b6cd614..81781fafa 100644 --- a/data/tilesets/lighthouse_collision.asm +++ b/data/tilesets/lighthouse_collision.asm @@ -1,64 +1,64 @@ + tilecoll WALL, WALL, WALL, WALL ; 00 tilecoll WALL, WALL, WALL, WALL ; 01 tilecoll WALL, WALL, WALL, WALL ; 02 tilecoll WALL, WALL, WALL, WALL ; 03 - tilecoll WALL, WALL, WALL, WALL ; 04 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05 - tilecoll WALL, WALL, WALL, WALL ; 06 - tilecoll FLOOR, FLOOR, WALL, WALL ; 07 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04 + tilecoll WALL, WALL, WALL, WALL ; 05 + tilecoll FLOOR, FLOOR, WALL, WALL ; 06 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 07 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 08 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 09 - tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 0a - tilecoll WALL, WALL, FLOOR, FLOOR ; 0b - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0c + tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 09 + tilecoll WALL, WALL, FLOOR, FLOOR ; 0a + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0b + tilecoll WALL, WALL, WALL, WALL ; 0c tilecoll WALL, WALL, WALL, WALL ; 0d tilecoll WALL, WALL, WALL, WALL ; 0e tilecoll WALL, WALL, WALL, WALL ; 0f - tilecoll WALL, WALL, WALL, WALL ; 10 - tilecoll 9C, FLOOR, COUNTER, FLOOR ; 11 + tilecoll 9C, FLOOR, COUNTER, FLOOR ; 10 + tilecoll WALL, WALL, WALL, WALL ; 11 tilecoll WALL, WALL, WALL, WALL ; 12 tilecoll WALL, WALL, WALL, WALL ; 13 - tilecoll WALL, WALL, WALL, WALL ; 14 - tilecoll WALL, WARP_CARPET_DOWN, WALL, WALL ; 15 - tilecoll WALL, WALL, WALL, WALL ; 16 - tilecoll 9C, FLOOR, COUNTER, FLOOR ; 17 - tilecoll WALL, WALL, WALL, WALL ; 18 - tilecoll FLOOR, WALL, FLOOR, WALL ; 19 - tilecoll WALL, WALL, WALL, STAIRCASE ; 1a - tilecoll LADDER, FLOOR, FLOOR, FLOOR ; 1b - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 1c - tilecoll WALL, WALL, WALL, WALL ; 1d - tilecoll WALL, WALL, FLOOR, FLOOR ; 1e + tilecoll WALL, WARP_CARPET_DOWN, WALL, WALL ; 14 + tilecoll WALL, WALL, WALL, WALL ; 15 + tilecoll 9C, FLOOR, COUNTER, FLOOR ; 16 + tilecoll WALL, WALL, WALL, WALL ; 17 + tilecoll FLOOR, WALL, FLOOR, WALL ; 18 + tilecoll WALL, WALL, WALL, STAIRCASE ; 19 + tilecoll LADDER, FLOOR, FLOOR, FLOOR ; 1a + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 1b + tilecoll WALL, WALL, WALL, WALL ; 1c + tilecoll WALL, WALL, FLOOR, FLOOR ; 1d + tilecoll WALL, WALL, WALL, WALL ; 1e tilecoll WALL, WALL, WALL, WALL ; 1f - tilecoll WALL, WALL, WALL, WALL ; 20 - tilecoll WALL, FLOOR, WALL, FLOOR ; 21 - tilecoll FLOOR, WALL, FLOOR, WALL ; 22 - tilecoll WALL, FLOOR, WALL, WALL ; 23 - tilecoll FLOOR, WALL, WALL, WALL ; 24 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 25 - tilecoll FLOOR, FLOOR, WALL, WALL ; 26 - tilecoll WALL, WALL, WALL, WALL ; 27 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 28 - tilecoll FLOOR, FLOOR, PIT, PIT ; 29 - tilecoll WALL, WALL, WINDOW, WINDOW ; 2a - tilecoll WALL, WALL, WALL, WALL ; 2b - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c - tilecoll WALL, WALL, FLOOR, FLOOR ; 2d - tilecoll WALL, WALL, WALL, WALL ; 2e - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 2f - tilecoll WALL, WALL, WALL, BOOKSHELF ; 30 - tilecoll WALL, WALL, FLOOR, WALL ; 31 - tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 32 - tilecoll WALL, WALL, WALL, WALL ; 33 - tilecoll WALL, FLOOR, WALL, FLOOR ; 34 - tilecoll WALL, WALL, PC, FLOOR ; 35 - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 36 - tilecoll FLOOR, WALL, FLOOR, WALL ; 37 - tilecoll WALL, WALL, WALL, WALL ; 38 - tilecoll WALL, WALL, FLOOR, WALL ; 39 - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 3a - tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 3b + tilecoll WALL, FLOOR, WALL, FLOOR ; 20 + tilecoll FLOOR, WALL, FLOOR, WALL ; 21 + tilecoll WALL, FLOOR, WALL, WALL ; 22 + tilecoll FLOOR, WALL, WALL, WALL ; 23 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 24 + tilecoll FLOOR, FLOOR, WALL, WALL ; 25 + tilecoll WALL, WALL, WALL, WALL ; 26 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 27 + tilecoll FLOOR, FLOOR, PIT, PIT ; 28 + tilecoll WALL, WALL, WINDOW, WINDOW ; 29 + tilecoll WALL, WALL, WALL, WALL ; 2a + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2b + tilecoll WALL, WALL, FLOOR, FLOOR ; 2c + tilecoll WALL, WALL, WALL, WALL ; 2d + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 2e + tilecoll WALL, WALL, WALL, BOOKSHELF ; 2f + tilecoll WALL, WALL, FLOOR, WALL ; 30 + tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 31 + tilecoll WALL, WALL, WALL, WALL ; 32 + tilecoll WALL, FLOOR, WALL, FLOOR ; 33 + tilecoll WALL, WALL, PC, FLOOR ; 34 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 35 + tilecoll FLOOR, WALL, FLOOR, WALL ; 36 + tilecoll WALL, WALL, WALL, WALL ; 37 + tilecoll WALL, WALL, FLOOR, WALL ; 38 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 39 + tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 3a + tilecoll WALL, WALL, WALL, WALL ; 3b tilecoll WALL, WALL, WALL, WALL ; 3c - tilecoll WALL, WALL, WALL, WALL ; 3d - tilecoll WALL, WALL, WINDOW, WALL ; 3e + tilecoll WALL, WALL, WINDOW, WALL ; 3d + tilecoll WALL, WALL, WALL, WALL ; 3e tilecoll WALL, WALL, WALL, WALL ; 3f - tilecoll WALL, WALL, WALL, WALL ; 40 diff --git a/data/tilesets/mansion_collision.asm b/data/tilesets/mansion_collision.asm index 5db409be7..2c8edd747 100644 --- a/data/tilesets/mansion_collision.asm +++ b/data/tilesets/mansion_collision.asm @@ -1,64 +1,64 @@ + tilecoll WALL, WALL, WALL, WALL ; 00 tilecoll WALL, WALL, WALL, WALL ; 01 - tilecoll WALL, WALL, WALL, WALL ; 02 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04 - tilecoll WALL, WALL, FLOOR, FLOOR ; 05 - tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 06 - tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 07 + tilecoll WALL, WALL, FLOOR, FLOOR ; 04 + tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 05 + tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 06 + tilecoll WALL, WALL, FLOOR, FLOOR ; 07 tilecoll WALL, WALL, FLOOR, FLOOR ; 08 tilecoll WALL, WALL, FLOOR, FLOOR ; 09 - tilecoll WALL, WALL, FLOOR, FLOOR ; 0a - tilecoll WALL, WALL, FLOOR, WALL ; 0b - tilecoll FLOOR, WALL, FLOOR, WALL ; 0c - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 0d - tilecoll WALL, WALL, FLOOR, WALL ; 0e - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0f - tilecoll WALL, WALL, BOOKSHELF, INCENSE_BURNER ; 10 - tilecoll WALL, WALL, WALL, WALL ; 11 - tilecoll WALL, WALL, BOOKSHELF, WALL ; 12 - tilecoll WALL, WALL, WALL, WALL ; 13 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 14 - tilecoll WALL, FLOOR, WALL, FLOOR ; 15 + tilecoll WALL, WALL, FLOOR, WALL ; 0a + tilecoll FLOOR, WALL, FLOOR, WALL ; 0b + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 0c + tilecoll WALL, WALL, FLOOR, WALL ; 0d + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0e + tilecoll WALL, WALL, BOOKSHELF, INCENSE_BURNER ; 0f + tilecoll WALL, WALL, WALL, WALL ; 10 + tilecoll WALL, WALL, BOOKSHELF, WALL ; 11 + tilecoll WALL, WALL, WALL, WALL ; 12 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 13 + tilecoll WALL, FLOOR, WALL, FLOOR ; 14 + tilecoll STAIRCASE, STAIRCASE, FLOOR, FLOOR ; 15 tilecoll STAIRCASE, STAIRCASE, FLOOR, FLOOR ; 16 - tilecoll STAIRCASE, STAIRCASE, FLOOR, FLOOR ; 17 - tilecoll WALL, DOOR, FLOOR, FLOOR ; 18 - tilecoll WALL, WALL, BOOKSHELF, WALL ; 19 - tilecoll WALL, WALL, WALL, WALL ; 1a - tilecoll FLOOR, WALL, FLOOR, WALL ; 1b - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1c - tilecoll WALL, WALL, FLOOR, FLOOR ; 1d + tilecoll WALL, DOOR, FLOOR, FLOOR ; 17 + tilecoll WALL, WALL, BOOKSHELF, WALL ; 18 + tilecoll WALL, WALL, WALL, WALL ; 19 + tilecoll FLOOR, WALL, FLOOR, WALL ; 1a + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1b + tilecoll WALL, WALL, FLOOR, FLOOR ; 1c + tilecoll FLOOR, FLOOR, WALL, WALL ; 1d tilecoll FLOOR, FLOOR, WALL, WALL ; 1e tilecoll FLOOR, FLOOR, WALL, WALL ; 1f - tilecoll FLOOR, FLOOR, WALL, WALL ; 20 - tilecoll FLOOR, WALL, FLOOR, WALL ; 21 - tilecoll RIGHT_WALL, LEFT_WALL, WALL, FLOOR ; 22 - tilecoll WALL, WALL, FLOOR, WALL ; 23 - tilecoll WALL, WALL, STAIRCASE, LEFT_WALL ; 24 - tilecoll WALL, WALL, WALL, STAIRCASE ; 25 - tilecoll WALL, WALL, LEFT_WALL, FLOOR ; 26 - tilecoll FLOOR, WALL, FLOOR, WALL ; 27 - tilecoll WALL, WALL, DOOR, WALL ; 28 - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 29 + tilecoll FLOOR, WALL, FLOOR, WALL ; 20 + tilecoll RIGHT_WALL, LEFT_WALL, WALL, FLOOR ; 21 + tilecoll WALL, WALL, FLOOR, WALL ; 22 + tilecoll WALL, WALL, STAIRCASE, LEFT_WALL ; 23 + tilecoll WALL, WALL, WALL, STAIRCASE ; 24 + tilecoll WALL, WALL, LEFT_WALL, FLOOR ; 25 + tilecoll FLOOR, WALL, FLOOR, WALL ; 26 + tilecoll WALL, WALL, DOOR, WALL ; 27 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 28 + tilecoll FLOOR, FLOOR, WALL, WALL ; 29 tilecoll FLOOR, FLOOR, WALL, WALL ; 2a - tilecoll FLOOR, FLOOR, WALL, WALL ; 2b - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c - tilecoll RIGHT_WALL, LEFT_WALL, RIGHT_WALL, LEFT_WALL ; 2d - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 2e - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2f - tilecoll WALL, WALL, WALL, FLOOR ; 30 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2b + tilecoll RIGHT_WALL, LEFT_WALL, RIGHT_WALL, LEFT_WALL ; 2c + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 2d + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2e + tilecoll WALL, WALL, WALL, FLOOR ; 2f + tilecoll WALL, WALL, FLOOR, WALL ; 30 tilecoll WALL, WALL, FLOOR, WALL ; 31 - tilecoll WALL, WALL, FLOOR, WALL ; 32 - tilecoll WALL, WALL, WALL, WALL ; 33 - tilecoll WALL, WALL, WALL, FLOOR ; 34 - tilecoll WALL, WALL, WALL, WALL ; 35 - tilecoll FLOOR, WALL, WALL, WALL ; 36 - tilecoll WALL, WALL, FLOOR, WALL ; 37 - tilecoll WALL, FLOOR, WALL, WALL ; 38 - tilecoll WALL, WALL, FLOOR, WALL ; 39 - tilecoll WALL, FLOOR, WALL, FLOOR ; 3a - tilecoll FLOOR, WALL, FLOOR, WALL ; 3b + tilecoll WALL, WALL, WALL, WALL ; 32 + tilecoll WALL, WALL, WALL, FLOOR ; 33 + tilecoll WALL, WALL, WALL, WALL ; 34 + tilecoll FLOOR, WALL, WALL, WALL ; 35 + tilecoll WALL, WALL, FLOOR, WALL ; 36 + tilecoll WALL, FLOOR, WALL, WALL ; 37 + tilecoll WALL, WALL, FLOOR, WALL ; 38 + tilecoll WALL, FLOOR, WALL, FLOOR ; 39 + tilecoll FLOOR, WALL, FLOOR, WALL ; 3a + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3b tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3c - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d - tilecoll WALL, FLOOR, WALL, WALL ; 3e - tilecoll FLOOR, WALL, WALL, WALL ; 3f - tilecoll FLOOR, FLOOR, WALL, WALL ; 40 + tilecoll WALL, FLOOR, WALL, WALL ; 3d + tilecoll FLOOR, WALL, WALL, WALL ; 3e + tilecoll FLOOR, FLOOR, WALL, WALL ; 3f diff --git a/data/tilesets/mart_collision.asm b/data/tilesets/mart_collision.asm index 80076ac3f..ee4f1e4c1 100644 --- a/data/tilesets/mart_collision.asm +++ b/data/tilesets/mart_collision.asm @@ -1,64 +1,64 @@ - tilecoll WALL, WALL, WALL, WALL ; 01 - tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 02 - tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 03 - tilecoll WALL, WALL, FLOOR, FLOOR ; 04 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05 - tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 06 - tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 07 - tilecoll WALL, FLOOR, WALL, FLOOR ; 08 - tilecoll WALL, WALL, FLOOR, COUNTER ; 09 - tilecoll WALL, WALL, FLOOR, FLOOR ; 0a - tilecoll WALL, WALL, COUNTER, FLOOR ; 0b - tilecoll WALL, FLOOR, WALL, FLOOR ; 0c - tilecoll FLOOR, COUNTER, FLOOR, FLOOR ; 0d - tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 0e - tilecoll COUNTER, FLOOR, FLOOR, FLOOR ; 0f - tilecoll FLOOR, WALL, WALL, WALL ; 10 - tilecoll COUNTER, COUNTER, COUNTER, FLOOR ; 11 - tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 12 - tilecoll FLOOR, MART_SHELF, FLOOR, MART_SHELF ; 13 + tilecoll WALL, WALL, WALL, WALL ; 00 + tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 01 + tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 02 + tilecoll WALL, WALL, FLOOR, FLOOR ; 03 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04 + tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 05 + tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 06 + tilecoll WALL, FLOOR, WALL, FLOOR ; 07 + tilecoll WALL, WALL, FLOOR, COUNTER ; 08 + tilecoll WALL, WALL, FLOOR, FLOOR ; 09 + tilecoll WALL, WALL, COUNTER, FLOOR ; 0a + tilecoll WALL, FLOOR, WALL, FLOOR ; 0b + tilecoll FLOOR, COUNTER, FLOOR, FLOOR ; 0c + tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 0d + tilecoll COUNTER, FLOOR, FLOOR, FLOOR ; 0e + tilecoll FLOOR, WALL, WALL, WALL ; 0f + tilecoll COUNTER, COUNTER, COUNTER, FLOOR ; 10 + tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 11 + tilecoll FLOOR, MART_SHELF, FLOOR, MART_SHELF ; 12 + tilecoll WALL, WALL, MART_SHELF, MART_SHELF ; 13 tilecoll WALL, WALL, MART_SHELF, MART_SHELF ; 14 tilecoll WALL, WALL, MART_SHELF, MART_SHELF ; 15 - tilecoll WALL, WALL, MART_SHELF, MART_SHELF ; 16 - tilecoll WALL, WALL, FLOOR, FLOOR ; 17 - tilecoll WALL, WALL, FLOOR, COUNTER ; 18 - tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 19 - tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 1a - tilecoll COUNTER, COUNTER, COUNTER, FLOOR ; 1b - tilecoll COUNTER, COUNTER, FLOOR, COUNTER ; 1c + tilecoll WALL, WALL, FLOOR, FLOOR ; 16 + tilecoll WALL, WALL, FLOOR, COUNTER ; 17 + tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 18 + tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 19 + tilecoll COUNTER, COUNTER, COUNTER, FLOOR ; 1a + tilecoll COUNTER, COUNTER, FLOOR, COUNTER ; 1b + tilecoll WALL, WALL, WALL, WALL ; 1c tilecoll WALL, WALL, WALL, WALL ; 1d - tilecoll WALL, WALL, WALL, WALL ; 1e - tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 1f - tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 20 - tilecoll FLOOR, WALL, FLOOR, WALL ; 21 - tilecoll WALL, WALL, WALL, WALL ; 22 - tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 23 - tilecoll FLOOR, MART_SHELF, FLOOR, MART_SHELF ; 24 - tilecoll WALL, WALL, WALL, WALL ; 25 - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 26 - tilecoll WALL, WALL, FLOOR, FLOOR ; 27 - tilecoll WALL, WALL, COUNTER, MART_SHELF ; 28 - tilecoll FLOOR, MART_SHELF, FLOOR, MART_SHELF ; 29 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 2a - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 2b - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c - tilecoll COUNTER, COUNTER, FLOOR, MART_SHELF ; 2d - tilecoll FLOOR, MART_SHELF, COUNTER, COUNTER ; 2e - tilecoll COUNTER, FLOOR, COUNTER, COUNTER ; 2f - tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 30 - tilecoll WALL, WALL, WALL, WALL ; 31 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 32 - tilecoll WALL, WALL, WALL, WALL ; 33 - tilecoll WALL, FLOOR, WALL, WALL ; 34 - tilecoll FLOOR, FLOOR, WALL, WALL ; 35 - tilecoll FLOOR, WALL, WALL, WALL ; 36 + tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 1e + tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 1f + tilecoll FLOOR, WALL, FLOOR, WALL ; 20 + tilecoll WALL, WALL, WALL, WALL ; 21 + tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 22 + tilecoll FLOOR, MART_SHELF, FLOOR, MART_SHELF ; 23 + tilecoll WALL, WALL, WALL, WALL ; 24 + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 25 + tilecoll WALL, WALL, FLOOR, FLOOR ; 26 + tilecoll WALL, WALL, COUNTER, MART_SHELF ; 27 + tilecoll FLOOR, MART_SHELF, FLOOR, MART_SHELF ; 28 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 29 + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 2a + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2b + tilecoll COUNTER, COUNTER, FLOOR, MART_SHELF ; 2c + tilecoll FLOOR, MART_SHELF, COUNTER, COUNTER ; 2d + tilecoll COUNTER, FLOOR, COUNTER, COUNTER ; 2e + tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 2f + tilecoll WALL, WALL, WALL, WALL ; 30 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 31 + tilecoll WALL, WALL, WALL, WALL ; 32 + tilecoll WALL, FLOOR, WALL, WALL ; 33 + tilecoll FLOOR, FLOOR, WALL, WALL ; 34 + tilecoll FLOOR, WALL, WALL, WALL ; 35 + tilecoll FLOOR, WALL, FLOOR, WALL ; 36 tilecoll FLOOR, WALL, FLOOR, WALL ; 37 - tilecoll FLOOR, WALL, FLOOR, WALL ; 38 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 39 - tilecoll FLOOR, FLOOR, FLOOR, STAIRCASE ; 3a - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3b + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 38 + tilecoll FLOOR, FLOOR, FLOOR, STAIRCASE ; 39 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3a + tilecoll WALL, WALL, WALL, WALL ; 3b tilecoll WALL, WALL, WALL, WALL ; 3c tilecoll WALL, WALL, WALL, WALL ; 3d - tilecoll WALL, WALL, WALL, WALL ; 3e - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f - tilecoll WALL, WALL, WALL, WALL ; 40 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e + tilecoll WALL, WALL, WALL, WALL ; 3f diff --git a/data/tilesets/omanyte_word_room_collision.asm b/data/tilesets/omanyte_word_room_collision.asm index 138f07143..58bdacc53 100644 --- a/data/tilesets/omanyte_word_room_collision.asm +++ b/data/tilesets/omanyte_word_room_collision.asm @@ -1,4 +1,5 @@ - tilecoll WALL, WALL, WALL, WALL ; 01 + tilecoll WALL, WALL, WALL, WALL ; 00 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04 @@ -17,20 +18,20 @@ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 11 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 12 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 13 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 14 - tilecoll WALL, WALL, WALL, FLOOR ; 15 + tilecoll WALL, WALL, WALL, FLOOR ; 14 + tilecoll WALL, WALL, FLOOR, FLOOR ; 15 tilecoll WALL, WALL, FLOOR, FLOOR ; 16 - tilecoll WALL, WALL, FLOOR, FLOOR ; 17 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 18 - tilecoll WALL, WALL, FLOOR, FLOOR ; 19 - tilecoll WALL, WALL, FLOOR, WALL ; 1a - tilecoll WALL, FLOOR, WALL, FLOOR ; 1b - tilecoll FLOOR, WALL, FLOOR, WALL ; 1c - tilecoll FLOOR, FLOOR, FLOOR, PIT ; 1d + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 17 + tilecoll WALL, WALL, FLOOR, FLOOR ; 18 + tilecoll WALL, WALL, FLOOR, WALL ; 19 + tilecoll WALL, FLOOR, WALL, FLOOR ; 1a + tilecoll FLOOR, WALL, FLOOR, WALL ; 1b + tilecoll FLOOR, FLOOR, FLOOR, PIT ; 1c + tilecoll WALL, WALL, WALL, WALL ; 1d tilecoll WALL, WALL, WALL, WALL ; 1e tilecoll WALL, WALL, WALL, WALL ; 1f tilecoll WALL, WALL, WALL, WALL ; 20 - tilecoll WALL, WALL, WALL, WALL ; 21 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 21 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 22 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 23 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 24 @@ -61,4 +62,3 @@ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40 diff --git a/data/tilesets/park_collision.asm b/data/tilesets/park_collision.asm index c5965e0c9..d24de1ec1 100644 --- a/data/tilesets/park_collision.asm +++ b/data/tilesets/park_collision.asm @@ -1,55 +1,56 @@ - tilecoll WALL, WALL, WALL, WALL ; 01 + tilecoll WALL, WALL, WALL, WALL ; 00 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03 - tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 04 + tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 03 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 06 - tilecoll WALL, WALL, WALL, WALL ; 07 - tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 08 + tilecoll WALL, WALL, WALL, WALL ; 06 + tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 07 + tilecoll WALL, WALL, WALL, WALL ; 08 tilecoll WALL, WALL, WALL, WALL ; 09 - tilecoll WALL, WALL, WALL, WALL ; 0a - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0b - tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 0c + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0a + tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 0b + tilecoll WALL, WALL, WALL, WALL ; 0c tilecoll WALL, WALL, WALL, WALL ; 0d - tilecoll WALL, WALL, WALL, WALL ; 0e - tilecoll WALL, WALL, FLOOR, FLOOR ; 0f - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 10 - tilecoll WALL, WALL, WALL, FLOOR ; 11 - tilecoll WALL, WALL, FLOOR, FLOOR ; 12 - tilecoll WALL, WALL, FLOOR, WALL ; 13 - tilecoll LONG_GRASS, LONG_GRASS, LONG_GRASS, LONG_GRASS ; 14 - tilecoll WALL, FLOOR, WALL, FLOOR ; 15 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 16 - tilecoll FLOOR, WALL, FLOOR, WALL ; 17 - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 18 - tilecoll WALL, FLOOR, WALL, WALL ; 19 - tilecoll FLOOR, FLOOR, WALL, WALL ; 1a - tilecoll FLOOR, WALL, WALL, WALL ; 1b - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 1c - tilecoll WALL, WALL, WALL, FLOOR ; 1d - tilecoll WALL, WALL, FLOOR, FLOOR ; 1e - tilecoll WALL, WALL, FLOOR, WALL ; 1f - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 20 - tilecoll WALL, FLOOR, WALL, FLOOR ; 21 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 22 - tilecoll FLOOR, WALL, FLOOR, WALL ; 23 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 24 - tilecoll WALL, FLOOR, WALL, WALL ; 25 - tilecoll FLOOR, FLOOR, WALL, WALL ; 26 - tilecoll FLOOR, WALL, WALL, WALL ; 27 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 28 + tilecoll WALL, WALL, FLOOR, FLOOR ; 0e + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 0f + tilecoll WALL, WALL, WALL, FLOOR ; 10 + tilecoll WALL, WALL, FLOOR, FLOOR ; 11 + tilecoll WALL, WALL, FLOOR, WALL ; 12 + tilecoll LONG_GRASS, LONG_GRASS, LONG_GRASS, LONG_GRASS ; 13 + tilecoll WALL, FLOOR, WALL, FLOOR ; 14 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 15 + tilecoll FLOOR, WALL, FLOOR, WALL ; 16 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 17 + tilecoll WALL, FLOOR, WALL, WALL ; 18 + tilecoll FLOOR, FLOOR, WALL, WALL ; 19 + tilecoll FLOOR, WALL, WALL, WALL ; 1a + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 1b + tilecoll WALL, WALL, WALL, FLOOR ; 1c + tilecoll WALL, WALL, FLOOR, FLOOR ; 1d + tilecoll WALL, WALL, FLOOR, WALL ; 1e + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1f + tilecoll WALL, FLOOR, WALL, FLOOR ; 20 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 21 + tilecoll FLOOR, WALL, FLOOR, WALL ; 22 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 23 + tilecoll WALL, FLOOR, WALL, WALL ; 24 + tilecoll FLOOR, FLOOR, WALL, WALL ; 25 + tilecoll FLOOR, WALL, WALL, WALL ; 26 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 27 + tilecoll WALL, WALL, WALL, WALL ; 28 tilecoll WALL, WALL, WALL, WALL ; 29 tilecoll WALL, WALL, WALL, WALL ; 2a - tilecoll WALL, WALL, WALL, WALL ; 2b - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2b + tilecoll WALL, WALL, WALL, WALL ; 2c tilecoll WALL, WALL, WALL, WALL ; 2d tilecoll WALL, WALL, WALL, WALL ; 2e - tilecoll WALL, WALL, WALL, WALL ; 2f - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 30 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 2f + tilecoll WALL, WALL, WALL, WALL ; 30 tilecoll WALL, WALL, WALL, WALL ; 31 tilecoll WALL, WALL, WALL, WALL ; 32 - tilecoll WALL, WALL, WALL, WALL ; 33 - tilecoll LONG_GRASS, LONG_GRASS, LONG_GRASS, LONG_GRASS ; 34 + tilecoll LONG_GRASS, LONG_GRASS, LONG_GRASS, LONG_GRASS ; 33 + tilecoll WALL, WALL, WALL, WALL ; 34 tilecoll WALL, WALL, WALL, WALL ; 35 tilecoll WALL, WALL, WALL, WALL ; 36 tilecoll WALL, WALL, WALL, WALL ; 37 @@ -60,5 +61,4 @@ tilecoll WALL, WALL, WALL, WALL ; 3c tilecoll WALL, WALL, WALL, WALL ; 3d tilecoll WALL, WALL, WALL, WALL ; 3e - tilecoll WALL, WALL, WALL, WALL ; 3f - tilecoll LONG_GRASS, LONG_GRASS, LONG_GRASS, LONG_GRASS ; 40 + tilecoll LONG_GRASS, LONG_GRASS, LONG_GRASS, LONG_GRASS ; 3f diff --git a/data/tilesets/players_house_collision.asm b/data/tilesets/players_house_collision.asm index ed6b70a29..34c8c237b 100644 --- a/data/tilesets/players_house_collision.asm +++ b/data/tilesets/players_house_collision.asm @@ -1,43 +1,44 @@ - tilecoll WALL, WALL, WALL, WALL ; 01 - tilecoll WINDOW, WALL, FLOOR, FLOOR ; 02 - tilecoll WALL, WALL, FLOOR, TV ; 03 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04 - tilecoll WALL, WALL, WALL, WALL ; 05 - tilecoll WALL, WALL, FLOOR, FLOOR ; 06 - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 07 - tilecoll WALL, WALL, WALL, WALL ; 08 - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 09 - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 0a + tilecoll WALL, WALL, WALL, WALL ; 00 + tilecoll WINDOW, WALL, FLOOR, FLOOR ; 01 + tilecoll WALL, WALL, FLOOR, TV ; 02 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03 + tilecoll WALL, WALL, WALL, WALL ; 04 + tilecoll WALL, WALL, FLOOR, FLOOR ; 05 + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 06 + tilecoll WALL, WALL, WALL, WALL ; 07 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 08 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 09 + tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 0a tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 0b - tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 0c - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 0d - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 0e - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0f - tilecoll WALL, WALL, WALL, WALL ; 10 - tilecoll WALL, WALL, PC, FLOOR ; 11 - tilecoll WALL, WALL, TV, WALL ; 12 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 13 - tilecoll FLOOR, TV, FLOOR, WALL ; 14 - tilecoll FLOOR, WALL, FLOOR, WALL ; 15 - tilecoll WALL, WALL, FLOOR, WALL ; 16 - tilecoll FLOOR, WALL, FLOOR, WALL ; 17 - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 18 - tilecoll WALL, WALL, RADIO, PC ; 19 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1a - tilecoll WALL, WALL, RADIO, FLOOR ; 1b - tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 1c - tilecoll WALL, FLOOR, WALL, FLOOR ; 1d - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1e - tilecoll WALL, WALL, VIRTUAL_BOY, FLOOR ; 1f - tilecoll WALL, WALL, PC, RADIO ; 20 - tilecoll WALL, WALL, WALL, WALL ; 21 - tilecoll WALL, WALL, TV, BOOKSHELF ; 22 - tilecoll WALL, FLOOR, WALL, FLOOR ; 23 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 0c + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 0d + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0e + tilecoll WALL, WALL, WALL, WALL ; 0f + tilecoll WALL, WALL, PC, FLOOR ; 10 + tilecoll WALL, WALL, TV, WALL ; 11 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 12 + tilecoll FLOOR, TV, FLOOR, WALL ; 13 + tilecoll FLOOR, WALL, FLOOR, WALL ; 14 + tilecoll WALL, WALL, FLOOR, WALL ; 15 + tilecoll FLOOR, WALL, FLOOR, WALL ; 16 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 17 + tilecoll WALL, WALL, RADIO, PC ; 18 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 19 + tilecoll WALL, WALL, RADIO, FLOOR ; 1a + tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 1b + tilecoll WALL, FLOOR, WALL, FLOOR ; 1c + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1d + tilecoll WALL, WALL, VIRTUAL_BOY, FLOOR ; 1e + tilecoll WALL, WALL, PC, RADIO ; 1f + tilecoll WALL, WALL, WALL, WALL ; 20 + tilecoll WALL, WALL, TV, BOOKSHELF ; 21 + tilecoll WALL, FLOOR, WALL, FLOOR ; 22 + tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 23 tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 24 - tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 25 - tilecoll FLOOR, FLOOR, WALL, WALL ; 26 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 27 - tilecoll WALL, WALL, FLOOR, FLOOR ; 28 + tilecoll FLOOR, FLOOR, WALL, WALL ; 25 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 26 + tilecoll WALL, WALL, FLOOR, FLOOR ; 27 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 28 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 29 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2a tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2b @@ -61,4 +62,3 @@ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40 diff --git a/data/tilesets/players_room_collision.asm b/data/tilesets/players_room_collision.asm index 464d80b83..713f06c9c 100644 --- a/data/tilesets/players_room_collision.asm +++ b/data/tilesets/players_room_collision.asm @@ -1,41 +1,42 @@ + tilecoll WALL, WALL, WALL, WALL ; 00 tilecoll WALL, WALL, WALL, WALL ; 01 - tilecoll WALL, WALL, WALL, WALL ; 02 - tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 03 - tilecoll WALL, WALL, TV, BOOKSHELF ; 04 - tilecoll WALL, WALL, FLOOR, FLOOR ; 05 + tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 02 + tilecoll WALL, WALL, TV, BOOKSHELF ; 03 + tilecoll WALL, WALL, FLOOR, FLOOR ; 04 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 06 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 07 + tilecoll WALL, WALL, FLOOR, FLOOR ; 07 tilecoll WALL, WALL, FLOOR, FLOOR ; 08 - tilecoll WALL, WALL, FLOOR, FLOOR ; 09 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 09 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0b - tilecoll WALL, WALL, FLOOR, FLOOR ; 0c + tilecoll WALL, WALL, FLOOR, FLOOR ; 0b + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0c tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0d - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0e - tilecoll WALL, WALL, FLOOR, FLOOR ; 0f + tilecoll WALL, WALL, FLOOR, FLOOR ; 0e + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0f tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 10 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 11 - tilecoll WALL, WALL, FLOOR, FLOOR ; 12 + tilecoll WALL, WALL, FLOOR, FLOOR ; 11 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 12 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 13 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 14 - tilecoll WALL, WALL, FLOOR, FLOOR ; 15 + tilecoll WALL, WALL, FLOOR, FLOOR ; 14 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 15 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 16 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 17 - tilecoll WALL, WALL, FLOOR, FLOOR ; 18 + tilecoll WALL, WALL, FLOOR, FLOOR ; 17 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 18 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 19 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1a - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1b + tilecoll WALL, FLOOR, WALL, FLOOR ; 1b tilecoll WALL, FLOOR, WALL, FLOOR ; 1c tilecoll WALL, FLOOR, WALL, FLOOR ; 1d tilecoll WALL, FLOOR, WALL, FLOOR ; 1e - tilecoll WALL, FLOOR, WALL, FLOOR ; 1f - tilecoll TOWN_MAP, STAIRCASE, FLOOR, FLOOR ; 20 + tilecoll TOWN_MAP, STAIRCASE, FLOOR, FLOOR ; 1f + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 20 tilecoll FLOOR, WALL, FLOOR, FLOOR ; 21 - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 22 - tilecoll FLOOR, WALL, FLOOR, WALL ; 23 + tilecoll FLOOR, WALL, FLOOR, WALL ; 22 + tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 23 tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 24 tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 25 - tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 26 + tilecoll FF, FF, FF, FF ; 26 tilecoll FF, FF, FF, FF ; 27 tilecoll FF, FF, FF, FF ; 28 tilecoll FF, FF, FF, FF ; 29 @@ -61,4 +62,3 @@ tilecoll FF, FF, FF, FF ; 3d tilecoll FF, FF, FF, FF ; 3e tilecoll FF, FF, FF, FF ; 3f - tilecoll FF, FF, FF, FF ; 40 diff --git a/data/tilesets/pokecenter_collision.asm b/data/tilesets/pokecenter_collision.asm index 5b776330e..d76860917 100644 --- a/data/tilesets/pokecenter_collision.asm +++ b/data/tilesets/pokecenter_collision.asm @@ -1,64 +1,64 @@ + tilecoll WALL, WALL, WALL, WALL ; 00 tilecoll WALL, WALL, WALL, WALL ; 01 - tilecoll WALL, WALL, WALL, WALL ; 02 - tilecoll WALL, WALL, WALL, FLOOR ; 03 - tilecoll WALL, WALL, FLOOR, WALL ; 04 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05 - tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 06 - tilecoll WALL, COUNTER, FLOOR, FLOOR ; 07 - tilecoll COUNTER, WALL, FLOOR, FLOOR ; 08 - tilecoll WALL, WALL, FLOOR, PC ; 09 - tilecoll WALL, WALL, FLOOR, WALL ; 0a - tilecoll WALL, DOOR, FLOOR, FLOOR ; 0b - tilecoll WALL, WALL, WALL, WALL ; 0c - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0d - tilecoll FLOOR, WALL, FLOOR, WALL ; 0e - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 0f - tilecoll WALL, WALL, FLOOR, WALL ; 10 - tilecoll FLOOR, FLOOR, LADDER, FLOOR ; 11 - tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 12 - tilecoll FLOOR, FLOOR, LADDER, FLOOR ; 13 - tilecoll WALL, WALL, FLOOR, FLOOR ; 14 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 15 - tilecoll WALL, DOOR, FLOOR, FLOOR ; 16 - tilecoll WALL, WALL, FLOOR, WALL ; 17 + tilecoll WALL, WALL, WALL, FLOOR ; 02 + tilecoll WALL, WALL, FLOOR, WALL ; 03 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04 + tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 05 + tilecoll WALL, COUNTER, FLOOR, FLOOR ; 06 + tilecoll COUNTER, WALL, FLOOR, FLOOR ; 07 + tilecoll WALL, WALL, FLOOR, PC ; 08 + tilecoll WALL, WALL, FLOOR, WALL ; 09 + tilecoll WALL, DOOR, FLOOR, FLOOR ; 0a + tilecoll WALL, WALL, WALL, WALL ; 0b + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0c + tilecoll FLOOR, WALL, FLOOR, WALL ; 0d + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 0e + tilecoll WALL, WALL, FLOOR, WALL ; 0f + tilecoll FLOOR, FLOOR, LADDER, FLOOR ; 10 + tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 11 + tilecoll FLOOR, FLOOR, LADDER, FLOOR ; 12 + tilecoll WALL, WALL, FLOOR, FLOOR ; 13 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 14 + tilecoll WALL, DOOR, FLOOR, FLOOR ; 15 + tilecoll WALL, WALL, FLOOR, WALL ; 16 + tilecoll WALL, WALL, WALL, WALL ; 17 tilecoll WALL, WALL, WALL, WALL ; 18 tilecoll WALL, WALL, WALL, WALL ; 19 tilecoll WALL, WALL, WALL, WALL ; 1a tilecoll WALL, WALL, WALL, WALL ; 1b tilecoll WALL, WALL, WALL, WALL ; 1c - tilecoll WALL, WALL, WALL, WALL ; 1d + tilecoll WALL, WALL, FLOOR, FLOOR ; 1d tilecoll WALL, WALL, FLOOR, FLOOR ; 1e tilecoll WALL, WALL, FLOOR, FLOOR ; 1f - tilecoll WALL, WALL, FLOOR, FLOOR ; 20 - tilecoll WALL, WALL, WALL, WALL ; 21 - tilecoll WALL, WALL, FLOOR, PC ; 22 - tilecoll WALL, WALL, WALL, FLOOR ; 23 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 24 - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 25 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 26 - tilecoll WALL, WALL, FLOOR, FLOOR ; 27 - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 28 - tilecoll WALL, WALL, FLOOR, WALL ; 29 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 2a - tilecoll WALL, WALL, WALL, FLOOR ; 2b - tilecoll WALL, DOOR, FLOOR, FLOOR ; 2c - tilecoll WALL, WALL, WALL, WALL ; 2d - tilecoll WALL, WALL, FLOOR, FLOOR ; 2e - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 2f - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 30 - tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 31 - tilecoll WALL, WALL, FLOOR, WALL ; 32 - tilecoll PC, WALL, FLOOR, WALL ; 33 - tilecoll FLOOR, WARP_PANEL, FLOOR, FLOOR ; 34 - tilecoll DOOR, WALL, FLOOR, FLOOR ; 35 - tilecoll DOOR, WALL, FLOOR, WALL ; 36 - tilecoll DOOR, WALL, FLOOR, FLOOR ; 37 - tilecoll DOOR, WALL, FLOOR, WALL ; 38 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 39 - tilecoll WALL, WALL, FLOOR, WALL ; 3a - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 3b - tilecoll WALL, WALL, FLOOR, WALL ; 3c + tilecoll WALL, WALL, WALL, WALL ; 20 + tilecoll WALL, WALL, FLOOR, PC ; 21 + tilecoll WALL, WALL, WALL, FLOOR ; 22 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 23 + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 24 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 25 + tilecoll WALL, WALL, FLOOR, FLOOR ; 26 + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 27 + tilecoll WALL, WALL, FLOOR, WALL ; 28 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 29 + tilecoll WALL, WALL, WALL, FLOOR ; 2a + tilecoll WALL, DOOR, FLOOR, FLOOR ; 2b + tilecoll WALL, WALL, WALL, WALL ; 2c + tilecoll WALL, WALL, FLOOR, FLOOR ; 2d + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 2e + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 2f + tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 30 + tilecoll WALL, WALL, FLOOR, WALL ; 31 + tilecoll PC, WALL, FLOOR, WALL ; 32 + tilecoll FLOOR, WARP_PANEL, FLOOR, FLOOR ; 33 + tilecoll DOOR, WALL, FLOOR, FLOOR ; 34 + tilecoll DOOR, WALL, FLOOR, WALL ; 35 + tilecoll DOOR, WALL, FLOOR, FLOOR ; 36 + tilecoll DOOR, WALL, FLOOR, WALL ; 37 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 38 + tilecoll WALL, WALL, FLOOR, WALL ; 39 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 3a + tilecoll WALL, WALL, FLOOR, WALL ; 3b + tilecoll WARP_PANEL, FLOOR, FLOOR, FLOOR ; 3c tilecoll WARP_PANEL, FLOOR, FLOOR, FLOOR ; 3d - tilecoll WARP_PANEL, FLOOR, FLOOR, FLOOR ; 3e - tilecoll WARP_PANEL, WARP_PANEL, FLOOR, FLOOR ; 3f - tilecoll FLOOR, WARP_PANEL, FLOOR, FLOOR ; 40 + tilecoll WARP_PANEL, WARP_PANEL, FLOOR, FLOOR ; 3e + tilecoll FLOOR, WARP_PANEL, FLOOR, FLOOR ; 3f diff --git a/data/tilesets/pokecom_center_collision.asm b/data/tilesets/pokecom_center_collision.asm index 1ecef84de..2272acfd4 100644 --- a/data/tilesets/pokecom_center_collision.asm +++ b/data/tilesets/pokecom_center_collision.asm @@ -1,38 +1,39 @@ - tilecoll WALL, WALL, WALL, WALL ; 01 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 - tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 03 - tilecoll WALL, WALL, FLOOR, FLOOR ; 04 - tilecoll WALL, WALL, WALL, FLOOR ; 05 - tilecoll WALL, WALL, WALL, WALL ; 06 - tilecoll WALL, WALL, WALL, FLOOR ; 07 - tilecoll WALL, WALL, FLOOR, PC ; 08 - tilecoll WALL, WALL, WALL, FLOOR ; 09 + tilecoll WALL, WALL, WALL, WALL ; 00 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01 + tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 02 + tilecoll WALL, WALL, FLOOR, FLOOR ; 03 + tilecoll WALL, WALL, WALL, FLOOR ; 04 + tilecoll WALL, WALL, WALL, WALL ; 05 + tilecoll WALL, WALL, WALL, FLOOR ; 06 + tilecoll WALL, WALL, FLOOR, PC ; 07 + tilecoll WALL, WALL, WALL, FLOOR ; 08 + tilecoll WALL, COUNTER, FLOOR, FLOOR ; 09 tilecoll WALL, COUNTER, FLOOR, FLOOR ; 0a - tilecoll WALL, COUNTER, FLOOR, FLOOR ; 0b - tilecoll WALL, WALL, WALL, WALL ; 0c - tilecoll WALL, WALL, FLOOR, WALL ; 0d + tilecoll WALL, WALL, WALL, WALL ; 0b + tilecoll WALL, WALL, FLOOR, WALL ; 0c + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 0d tilecoll FLOOR, WALL, FLOOR, FLOOR ; 0e - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 0f - tilecoll WALL, WALL, FLOOR, WALL ; 10 - tilecoll WALL, WALL, FLOOR, FLOOR ; 11 - tilecoll WALL, WALL, WALL, FLOOR ; 12 + tilecoll WALL, WALL, FLOOR, WALL ; 0f + tilecoll WALL, WALL, FLOOR, FLOOR ; 10 + tilecoll WALL, WALL, WALL, FLOOR ; 11 + tilecoll WALL, WALL, WALL, WALL ; 12 tilecoll WALL, WALL, WALL, WALL ; 13 tilecoll WALL, WALL, WALL, WALL ; 14 - tilecoll WALL, WALL, WALL, WALL ; 15 - tilecoll WALL, WALL, FLOOR, FLOOR ; 16 + tilecoll WALL, WALL, FLOOR, FLOOR ; 15 + tilecoll WALL, WALL, WALL, WALL ; 16 tilecoll WALL, WALL, WALL, WALL ; 17 tilecoll WALL, WALL, WALL, WALL ; 18 tilecoll WALL, WALL, WALL, WALL ; 19 - tilecoll WALL, WALL, WALL, WALL ; 1a - tilecoll WALL, WALL, FLOOR, WALL ; 1b + tilecoll WALL, WALL, FLOOR, WALL ; 1a + tilecoll WALL, WALL, WALL, WALL ; 1b tilecoll WALL, WALL, WALL, WALL ; 1c tilecoll WALL, WALL, WALL, WALL ; 1d tilecoll WALL, WALL, WALL, WALL ; 1e tilecoll WALL, WALL, WALL, WALL ; 1f - tilecoll WALL, WALL, WALL, WALL ; 20 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 20 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 21 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 22 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 23 + tilecoll WALL, WALL, WALL, WALL ; 23 tilecoll WALL, WALL, WALL, WALL ; 24 tilecoll WALL, WALL, WALL, WALL ; 25 tilecoll WALL, WALL, WALL, WALL ; 26 @@ -40,25 +41,24 @@ tilecoll WALL, WALL, WALL, WALL ; 28 tilecoll WALL, WALL, WALL, WALL ; 29 tilecoll WALL, WALL, WALL, WALL ; 2a - tilecoll WALL, WALL, WALL, WALL ; 2b - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c - tilecoll FLOOR, FLOOR, LADDER, FLOOR ; 2d - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 2e - tilecoll WALL, WALL, FLOOR, FLOOR ; 2f + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2b + tilecoll FLOOR, FLOOR, LADDER, FLOOR ; 2c + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 2d + tilecoll WALL, WALL, FLOOR, FLOOR ; 2e + tilecoll WALL, WALL, WALL, WALL ; 2f tilecoll WALL, WALL, WALL, WALL ; 30 tilecoll WALL, WALL, WALL, WALL ; 31 tilecoll WALL, WALL, WALL, WALL ; 32 - tilecoll WALL, WALL, WALL, WALL ; 33 - tilecoll FLOOR, FLOOR, WALL, WALL ; 34 - tilecoll WALL, WALL, WALL, WALL ; 35 - tilecoll WALL, WALL, FLOOR, FLOOR ; 36 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 37 - tilecoll WALL, WALL, FLOOR, FLOOR ; 38 + tilecoll FLOOR, FLOOR, WALL, WALL ; 33 + tilecoll WALL, WALL, WALL, WALL ; 34 + tilecoll WALL, WALL, FLOOR, FLOOR ; 35 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 36 + tilecoll WALL, WALL, FLOOR, FLOOR ; 37 + tilecoll WALL, WALL, WALL, WALL ; 38 tilecoll WALL, WALL, WALL, WALL ; 39 - tilecoll WALL, WALL, WALL, WALL ; 3a - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3b - tilecoll WALL, WALL, FLOOR, FLOOR ; 3c - tilecoll WALL, WALL, WALL, WALL ; 3d - tilecoll FLOOR, FLOOR, WALL, WALL ; 3e + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3a + tilecoll WALL, WALL, FLOOR, FLOOR ; 3b + tilecoll WALL, WALL, WALL, WALL ; 3c + tilecoll FLOOR, FLOOR, WALL, WALL ; 3d + tilecoll WALL, WALL, WALL, WALL ; 3e tilecoll WALL, WALL, WALL, WALL ; 3f - tilecoll WALL, WALL, WALL, WALL ; 40 diff --git a/data/tilesets/port_collision.asm b/data/tilesets/port_collision.asm index fb37ee11e..8abc712c9 100644 --- a/data/tilesets/port_collision.asm +++ b/data/tilesets/port_collision.asm @@ -1,64 +1,64 @@ - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01 - tilecoll WALL, WALL, WALL, WALL ; 02 - tilecoll BUOY, WATER, BUOY, WATER ; 03 - tilecoll WATER, BUOY, WATER, BUOY ; 04 - tilecoll LADDER, LADDER, LADDER, LADDER ; 05 - tilecoll WALL, WALL, WALL, WATER ; 06 - tilecoll WALL, WALL, WATER, WATER ; 07 - tilecoll WALL, WALL, WATER, WALL ; 08 - tilecoll WATER, WATER, WATER, WATER ; 09 - tilecoll WALL, WATER, WALL, WATER ; 0a - tilecoll WATER, WATER, WATER, WATER ; 0b - tilecoll WATER, WALL, WATER, WALL ; 0c - tilecoll WATER, WATER, FLOOR, FLOOR ; 0d - tilecoll WALL, WATER, WALL, WALL ; 0e - tilecoll WATER, WATER, WALL, WALL ; 0f - tilecoll WATER, WALL, WALL, WALL ; 10 - tilecoll WATER, WATER, WATER, WATER ; 11 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 12 - tilecoll WATER, WATER, WATER, WATER ; 13 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 00 + tilecoll WALL, WALL, WALL, WALL ; 01 + tilecoll BUOY, WATER, BUOY, WATER ; 02 + tilecoll WATER, BUOY, WATER, BUOY ; 03 + tilecoll LADDER, LADDER, LADDER, LADDER ; 04 + tilecoll WALL, WALL, WALL, WATER ; 05 + tilecoll WALL, WALL, WATER, WATER ; 06 + tilecoll WALL, WALL, WATER, WALL ; 07 + tilecoll WATER, WATER, WATER, WATER ; 08 + tilecoll WALL, WATER, WALL, WATER ; 09 + tilecoll WATER, WATER, WATER, WATER ; 0a + tilecoll WATER, WALL, WATER, WALL ; 0b + tilecoll WATER, WATER, FLOOR, FLOOR ; 0c + tilecoll WALL, WATER, WALL, WALL ; 0d + tilecoll WATER, WATER, WALL, WALL ; 0e + tilecoll WATER, WALL, WALL, WALL ; 0f + tilecoll WATER, WATER, WATER, WATER ; 10 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 11 + tilecoll WATER, WATER, WATER, WATER ; 12 + tilecoll WATER, FLOOR, WATER, FLOOR ; 13 tilecoll WATER, FLOOR, WATER, FLOOR ; 14 - tilecoll WATER, FLOOR, WATER, FLOOR ; 15 + tilecoll WATER, WATER, WATER, WATER ; 15 tilecoll WATER, WATER, WATER, WATER ; 16 - tilecoll WATER, WATER, WATER, WATER ; 17 - tilecoll WATER, FLOOR, WALL, WARP_CARPET_DOWN ; 18 - tilecoll WATER, WATER, WALL, WALL ; 19 - tilecoll WATER, FLOOR, WALL, WALL ; 1a - tilecoll WALL, WALL, WALL, WALL ; 1b - tilecoll WALL, WATER, WALL, WALL ; 1c + tilecoll WATER, FLOOR, WALL, WARP_CARPET_DOWN ; 17 + tilecoll WATER, WATER, WALL, WALL ; 18 + tilecoll WATER, FLOOR, WALL, WALL ; 19 + tilecoll WALL, WALL, WALL, WALL ; 1a + tilecoll WALL, WATER, WALL, WALL ; 1b + tilecoll WATER_21, WATER_21, WALL, WALL ; 1c tilecoll WATER_21, WATER_21, WALL, WALL ; 1d tilecoll WATER_21, WATER_21, WALL, WALL ; 1e - tilecoll WATER_21, WATER_21, WALL, WALL ; 1f - tilecoll WALL, WALL, WALL, WATER ; 20 - tilecoll WALL, FLOOR, WATER, WARP_CARPET_DOWN ; 21 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 22 - tilecoll BUOY, BUOY, BUOY, WATER ; 23 - tilecoll BUOY, BUOY, WATER, BUOY ; 24 + tilecoll WALL, WALL, WALL, WATER ; 1f + tilecoll WALL, FLOOR, WATER, WARP_CARPET_DOWN ; 20 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 21 + tilecoll BUOY, BUOY, BUOY, WATER ; 22 + tilecoll BUOY, BUOY, WATER, BUOY ; 23 + tilecoll BUOY, BUOY, WATER, WATER ; 24 tilecoll BUOY, BUOY, WATER, WATER ; 25 - tilecoll BUOY, BUOY, WATER, WATER ; 26 - tilecoll LADDER, LADDER, LADDER, LADDER ; 27 - tilecoll FLOOR, FLOOR, WATER, WATER ; 28 - tilecoll FLOOR, FLOOR, FLOOR, WATER ; 29 - tilecoll FLOOR, FLOOR, WATER, FLOOR ; 2a - tilecoll WALL, WALL, WALL, WALL ; 2b - tilecoll WALL, WALL, FLOOR, FLOOR ; 2c - tilecoll FLOOR, WATER, FLOOR, FLOOR ; 2d - tilecoll WATER, FLOOR, FLOOR, FLOOR ; 2e - tilecoll FLOOR, WATER, FLOOR, WATER ; 2f - tilecoll WATER, FLOOR, WATER, FLOOR ; 30 - tilecoll FLOOR, FLOOR, WATER, WATER ; 31 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 32 - tilecoll WALL, FLOOR, WALL, FLOOR ; 33 - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 34 - tilecoll FLOOR, WATER, FLOOR, WATER ; 35 - tilecoll WALL, WALL, FLOOR, LADDER ; 36 - tilecoll WATER, WATER, WATER, WATER ; 37 - tilecoll FLOOR, WATER, FLOOR, WATER ; 38 - tilecoll WATER, FLOOR, WATER, FLOOR ; 39 - tilecoll WATER, WATER, FLOOR, FLOOR ; 3a + tilecoll LADDER, LADDER, LADDER, LADDER ; 26 + tilecoll FLOOR, FLOOR, WATER, WATER ; 27 + tilecoll FLOOR, FLOOR, FLOOR, WATER ; 28 + tilecoll FLOOR, FLOOR, WATER, FLOOR ; 29 + tilecoll WALL, WALL, WALL, WALL ; 2a + tilecoll WALL, WALL, FLOOR, FLOOR ; 2b + tilecoll FLOOR, WATER, FLOOR, FLOOR ; 2c + tilecoll WATER, FLOOR, FLOOR, FLOOR ; 2d + tilecoll FLOOR, WATER, FLOOR, WATER ; 2e + tilecoll WATER, FLOOR, WATER, FLOOR ; 2f + tilecoll FLOOR, FLOOR, WATER, WATER ; 30 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 31 + tilecoll WALL, FLOOR, WALL, FLOOR ; 32 + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 33 + tilecoll FLOOR, WATER, FLOOR, WATER ; 34 + tilecoll WALL, WALL, FLOOR, LADDER ; 35 + tilecoll WATER, WATER, WATER, WATER ; 36 + tilecoll FLOOR, WATER, FLOOR, WATER ; 37 + tilecoll WATER, FLOOR, WATER, FLOOR ; 38 + tilecoll WATER, WATER, FLOOR, FLOOR ; 39 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 3a tilecoll FLOOR, FLOOR, FLOOR, WALL ; 3b tilecoll FLOOR, FLOOR, FLOOR, WALL ; 3c tilecoll FLOOR, FLOOR, FLOOR, WALL ; 3d tilecoll FLOOR, FLOOR, FLOOR, WALL ; 3e tilecoll FLOOR, FLOOR, FLOOR, WALL ; 3f - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 40 diff --git a/data/tilesets/radio_tower_collision.asm b/data/tilesets/radio_tower_collision.asm index 1713eb438..2c2813047 100644 --- a/data/tilesets/radio_tower_collision.asm +++ b/data/tilesets/radio_tower_collision.asm @@ -1,64 +1,64 @@ + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 00 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 - tilecoll WALL, WALL, FLOOR, FLOOR ; 03 - tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 04 - tilecoll WALL, WALL, FLOOR, FLOOR ; 05 - tilecoll FLOOR, FLOOR, WALL, COUNTER ; 06 - tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 07 - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 08 - tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 09 - tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 0a - tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 0b - tilecoll WALL, WALL, WALL, WALL ; 0c - tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 0d - tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 0e - tilecoll FLOOR, FLOOR, FLOOR, COUNTER ; 0f - tilecoll FLOOR, FLOOR, COUNTER, FLOOR ; 10 - tilecoll FLOOR, COUNTER, FLOOR, FLOOR ; 11 - tilecoll WALL, WALL, FLOOR, FLOOR ; 12 - tilecoll WALL, WALL, PC, FLOOR ; 13 + tilecoll WALL, WALL, FLOOR, FLOOR ; 02 + tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 03 + tilecoll WALL, WALL, FLOOR, FLOOR ; 04 + tilecoll FLOOR, FLOOR, WALL, COUNTER ; 05 + tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 06 + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 07 + tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 08 + tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 09 + tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 0a + tilecoll WALL, WALL, WALL, WALL ; 0b + tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 0c + tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 0d + tilecoll FLOOR, FLOOR, FLOOR, COUNTER ; 0e + tilecoll FLOOR, FLOOR, COUNTER, FLOOR ; 0f + tilecoll FLOOR, COUNTER, FLOOR, FLOOR ; 10 + tilecoll WALL, WALL, FLOOR, FLOOR ; 11 + tilecoll WALL, WALL, PC, FLOOR ; 12 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 13 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 14 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 15 - tilecoll FLOOR, FLOOR, WALL, WALL ; 16 - tilecoll WALL, WALL, WALL, WALL ; 17 - tilecoll FLOOR, FLOOR, COUNTER, FLOOR ; 18 - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 19 - tilecoll WALL, WALL, FLOOR, COUNTER ; 1a - tilecoll WALL, COUNTER, FLOOR, COUNTER ; 1b - tilecoll COUNTER, FLOOR, FLOOR, FLOOR ; 1c - tilecoll FLOOR, WALL, FLOOR, WALL ; 1d - tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 1e - tilecoll WALL, WALL, FLOOR, FLOOR ; 1f - tilecoll WALL, FLOOR, WALL, FLOOR ; 20 - tilecoll FLOOR, WALL, FLOOR, WALL ; 21 - tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 22 - tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 23 - tilecoll WALL, WALL, WALL, WALL ; 24 - tilecoll WALL, WALL, FLOOR, BOOKSHELF ; 25 - tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 26 - tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 27 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 28 - tilecoll WALL, WALL, FLOOR, WALL ; 29 - tilecoll FLOOR, WALL, FLOOR, WALL ; 2a - tilecoll WALL, WALL, FLOOR, FLOOR ; 2b - tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 2c - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2d - tilecoll FLOOR, COUNTER, FLOOR, COUNTER ; 2e - tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 2f - tilecoll WALL, WALL, WALL, WALL ; 30 - tilecoll WALL, FLOOR, WALL, FLOOR ; 31 - tilecoll WALL, WALL, FLOOR, WALL ; 32 - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 33 - tilecoll WALL, WALL, WALL, FLOOR ; 34 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 35 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 36 - tilecoll WALL, WALL, FLOOR, FLOOR ; 37 - tilecoll FLOOR, WALL, FLOOR, WALL ; 38 - tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 39 - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 3a - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3b - tilecoll WALL, WALL, WALL, WALL ; 3c - tilecoll WALL, FLOOR, WALL, FLOOR ; 3d - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 3e - tilecoll FLOOR, WALL, FLOOR, WALL ; 3f - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40 + tilecoll FLOOR, FLOOR, WALL, WALL ; 15 + tilecoll WALL, WALL, WALL, WALL ; 16 + tilecoll FLOOR, FLOOR, COUNTER, FLOOR ; 17 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 18 + tilecoll WALL, WALL, FLOOR, COUNTER ; 19 + tilecoll WALL, COUNTER, FLOOR, COUNTER ; 1a + tilecoll COUNTER, FLOOR, FLOOR, FLOOR ; 1b + tilecoll FLOOR, WALL, FLOOR, WALL ; 1c + tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 1d + tilecoll WALL, WALL, FLOOR, FLOOR ; 1e + tilecoll WALL, FLOOR, WALL, FLOOR ; 1f + tilecoll FLOOR, WALL, FLOOR, WALL ; 20 + tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 21 + tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 22 + tilecoll WALL, WALL, WALL, WALL ; 23 + tilecoll WALL, WALL, FLOOR, BOOKSHELF ; 24 + tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 25 + tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 26 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 27 + tilecoll WALL, WALL, FLOOR, WALL ; 28 + tilecoll FLOOR, WALL, FLOOR, WALL ; 29 + tilecoll WALL, WALL, FLOOR, FLOOR ; 2a + tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 2b + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c + tilecoll FLOOR, COUNTER, FLOOR, COUNTER ; 2d + tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 2e + tilecoll WALL, WALL, WALL, WALL ; 2f + tilecoll WALL, FLOOR, WALL, FLOOR ; 30 + tilecoll WALL, WALL, FLOOR, WALL ; 31 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 32 + tilecoll WALL, WALL, WALL, FLOOR ; 33 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 34 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 35 + tilecoll WALL, WALL, FLOOR, FLOOR ; 36 + tilecoll FLOOR, WALL, FLOOR, WALL ; 37 + tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 38 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 39 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3a + tilecoll WALL, WALL, WALL, WALL ; 3b + tilecoll WALL, FLOOR, WALL, FLOOR ; 3c + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 3d + tilecoll FLOOR, WALL, FLOOR, WALL ; 3e + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f diff --git a/data/tilesets/ruins_of_alph_collision.asm b/data/tilesets/ruins_of_alph_collision.asm index 8c65340ab..fd7447583 100644 --- a/data/tilesets/ruins_of_alph_collision.asm +++ b/data/tilesets/ruins_of_alph_collision.asm @@ -1,64 +1,64 @@ - tilecoll WALL, WALL, WALL, WALL ; 01 - tilecoll WALL, WALL, WALL, FLOOR ; 02 - tilecoll WALL, WALL, FLOOR, WALL ; 03 + tilecoll WALL, WALL, WALL, WALL ; 00 + tilecoll WALL, WALL, WALL, FLOOR ; 01 + tilecoll WALL, WALL, FLOOR, WALL ; 02 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05 - tilecoll WALL, WALL, WALL, FLOOR ; 06 + tilecoll WALL, WALL, WALL, FLOOR ; 05 + tilecoll WALL, WALL, FLOOR, FLOOR ; 06 tilecoll WALL, WALL, FLOOR, FLOOR ; 07 - tilecoll WALL, WALL, FLOOR, FLOOR ; 08 - tilecoll WALL, WALL, FLOOR, WALL ; 09 - tilecoll WALL, FLOOR, WALL, WALL ; 0a + tilecoll WALL, WALL, FLOOR, WALL ; 08 + tilecoll WALL, FLOOR, WALL, WALL ; 09 + tilecoll FLOOR, FLOOR, WALL, WALL ; 0a tilecoll FLOOR, FLOOR, WALL, WALL ; 0b - tilecoll FLOOR, FLOOR, WALL, WALL ; 0c - tilecoll FLOOR, WALL, WALL, WALL ; 0d - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0e - tilecoll WALL, FLOOR, WALL, FLOOR ; 0f - tilecoll FLOOR, WALL, FLOOR, WALL ; 10 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 11 - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 12 - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 13 - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 14 - tilecoll WALL, FLOOR, WALL, WALL ; 15 - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 16 - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 17 - tilecoll FLOOR, WALL, WALL, WALL ; 18 - tilecoll WALL, WALL, WALL, PIT ; 19 - tilecoll WALL, WALL, PIT, WALL ; 1a - tilecoll FLOOR, FLOOR, LADDER, FLOOR ; 1b - tilecoll WALL, FLOOR, WALL, FLOOR ; 1c - tilecoll FLOOR, WALL, FLOOR, WALL ; 1d - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 1e - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 1f - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 20 - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 21 - tilecoll WALL, FLOOR, WALL, FLOOR ; 22 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 23 - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 24 + tilecoll FLOOR, WALL, WALL, WALL ; 0c + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0d + tilecoll WALL, FLOOR, WALL, FLOOR ; 0e + tilecoll FLOOR, WALL, FLOOR, WALL ; 0f + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 10 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 11 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 12 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 13 + tilecoll WALL, FLOOR, WALL, WALL ; 14 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 15 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 16 + tilecoll FLOOR, WALL, WALL, WALL ; 17 + tilecoll WALL, WALL, WALL, PIT ; 18 + tilecoll WALL, WALL, PIT, WALL ; 19 + tilecoll FLOOR, FLOOR, LADDER, FLOOR ; 1a + tilecoll WALL, FLOOR, WALL, FLOOR ; 1b + tilecoll FLOOR, WALL, FLOOR, WALL ; 1c + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 1d + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 1e + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 1f + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 20 + tilecoll WALL, FLOOR, WALL, FLOOR ; 21 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 22 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 23 + tilecoll WALL, WALL, WALL, WALL ; 24 tilecoll WALL, WALL, WALL, WALL ; 25 tilecoll WALL, WALL, WALL, WALL ; 26 tilecoll WALL, WALL, WALL, WALL ; 27 tilecoll WALL, WALL, WALL, WALL ; 28 tilecoll WALL, WALL, WALL, WALL ; 29 tilecoll WALL, WALL, WALL, WALL ; 2a - tilecoll WALL, WALL, WALL, WALL ; 2b - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WALL ; 2c - tilecoll FLOOR, FLOOR, WALL, WARP_CARPET_DOWN ; 2d + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WALL ; 2b + tilecoll FLOOR, FLOOR, WALL, WARP_CARPET_DOWN ; 2c + tilecoll WALL, WALL, FLOOR, FLOOR ; 2d tilecoll WALL, WALL, FLOOR, FLOOR ; 2e - tilecoll WALL, WALL, FLOOR, FLOOR ; 2f - tilecoll FLOOR, FLOOR, FLOOR, PIT ; 30 - tilecoll CAVE, WALL, FLOOR, FLOOR ; 31 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 32 - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 33 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 34 - tilecoll WALL, WALL, WALL, PIT ; 35 - tilecoll WALL, WALL, PIT, WALL ; 36 + tilecoll FLOOR, FLOOR, FLOOR, PIT ; 2f + tilecoll CAVE, WALL, FLOOR, FLOOR ; 30 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 31 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 32 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 33 + tilecoll WALL, WALL, WALL, PIT ; 34 + tilecoll WALL, WALL, PIT, WALL ; 35 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 36 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 37 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 38 - tilecoll FLOOR, FLOOR, GRASS_4A, FLOOR ; 39 - tilecoll FLOOR, FLOOR, GRASS_4B, FLOOR ; 3a - tilecoll FLOOR, FLOOR, CUT_28, FLOOR ; 3b - tilecoll FLOOR, FLOOR, WATER, FLOOR ; 3c - tilecoll 64, FLOOR, WATERFALL_UP, FLOOR ; 3d - tilecoll 65, FLOOR, WATERFALL, FLOOR ; 3e - tilecoll WATERFALL_UP, FLOOR, WARP_CARPET_DOWN, FLOOR ; 3f - tilecoll WATERFALL, FLOOR, DOOR, FLOOR ; 40 + tilecoll FLOOR, FLOOR, GRASS_4A, FLOOR ; 38 + tilecoll FLOOR, FLOOR, GRASS_4B, FLOOR ; 39 + tilecoll FLOOR, FLOOR, CUT_28, FLOOR ; 3a + tilecoll FLOOR, FLOOR, WATER, FLOOR ; 3b + tilecoll 64, FLOOR, WATERFALL_UP, FLOOR ; 3c + tilecoll 65, FLOOR, WATERFALL, FLOOR ; 3d + tilecoll WATERFALL_UP, FLOOR, WARP_CARPET_DOWN, FLOOR ; 3e + tilecoll WATERFALL, FLOOR, DOOR, FLOOR ; 3f diff --git a/data/tilesets/tower_collision.asm b/data/tilesets/tower_collision.asm index 9d02e9640..30e74a56f 100644 --- a/data/tilesets/tower_collision.asm +++ b/data/tilesets/tower_collision.asm @@ -1,64 +1,64 @@ + tilecoll WALL, WALL, WALL, WALL ; 00 tilecoll WALL, WALL, WALL, WALL ; 01 - tilecoll WALL, WALL, WALL, WALL ; 02 + tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 02 tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 03 - tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 04 - tilecoll WALL, WALL, WALL, FLOOR ; 05 - tilecoll WALL, WALL, FLOOR, FLOOR ; 06 - tilecoll WALL, WALL, FLOOR, WALL ; 07 - tilecoll WALL, WALL, WALL, WALL ; 08 - tilecoll WALL, FLOOR, WALL, FLOOR ; 09 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a - tilecoll FLOOR, WALL, FLOOR, WALL ; 0b - tilecoll WALL, WALL, WALL, WALL ; 0c - tilecoll WALL, FLOOR, WALL, WALL ; 0d - tilecoll FLOOR, FLOOR, WALL, WALL ; 0e - tilecoll FLOOR, WALL, WALL, WALL ; 0f - tilecoll WALL, WALL, WALL, WALL ; 10 - tilecoll FLOOR, WALL, FLOOR, WALL ; 11 + tilecoll WALL, WALL, WALL, FLOOR ; 04 + tilecoll WALL, WALL, FLOOR, FLOOR ; 05 + tilecoll WALL, WALL, FLOOR, WALL ; 06 + tilecoll WALL, WALL, WALL, WALL ; 07 + tilecoll WALL, FLOOR, WALL, FLOOR ; 08 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 09 + tilecoll FLOOR, WALL, FLOOR, WALL ; 0a + tilecoll WALL, WALL, WALL, WALL ; 0b + tilecoll WALL, FLOOR, WALL, WALL ; 0c + tilecoll FLOOR, FLOOR, WALL, WALL ; 0d + tilecoll FLOOR, WALL, WALL, WALL ; 0e + tilecoll WALL, WALL, WALL, WALL ; 0f + tilecoll FLOOR, WALL, FLOOR, WALL ; 10 + tilecoll WALL, FLOOR, WALL, FLOOR ; 11 tilecoll WALL, FLOOR, WALL, FLOOR ; 12 - tilecoll WALL, FLOOR, WALL, FLOOR ; 13 - tilecoll FLOOR, WALL, FLOOR, WALL ; 14 - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 15 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 16 - tilecoll WALL, FLOOR, WALL, WALL ; 17 - tilecoll FLOOR, WALL, WALL, WALL ; 18 - tilecoll WALL, WALL, WALL, WALL ; 19 - tilecoll WALL, FLOOR, WALL, FLOOR ; 1a - tilecoll FLOOR, WALL, FLOOR, WALL ; 1b + tilecoll FLOOR, WALL, FLOOR, WALL ; 13 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 14 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 15 + tilecoll WALL, FLOOR, WALL, WALL ; 16 + tilecoll FLOOR, WALL, WALL, WALL ; 17 + tilecoll WALL, WALL, WALL, WALL ; 18 + tilecoll WALL, FLOOR, WALL, FLOOR ; 19 + tilecoll FLOOR, WALL, FLOOR, WALL ; 1a + tilecoll WALL, WALL, WALL, WALL ; 1b tilecoll WALL, WALL, WALL, WALL ; 1c - tilecoll WALL, WALL, WALL, WALL ; 1d - tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 1e - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 1f + tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 1d + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 1e + tilecoll LADDER, FLOOR, FLOOR, FLOOR ; 1f tilecoll LADDER, FLOOR, FLOOR, FLOOR ; 20 - tilecoll LADDER, FLOOR, FLOOR, FLOOR ; 21 - tilecoll WALL, WALL, WALL, FLOOR ; 22 - tilecoll WALL, WALL, FLOOR, WALL ; 23 - tilecoll WALL, WALL, WALL, WALL ; 24 - tilecoll FLOOR, FLOOR, WARP_PANEL, FLOOR ; 25 - tilecoll WALL, WALL, PIT, FLOOR ; 26 - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 27 - tilecoll WARP_CARPET_UP, WARP_CARPET_UP, FLOOR, FLOOR ; 28 + tilecoll WALL, WALL, WALL, FLOOR ; 21 + tilecoll WALL, WALL, FLOOR, WALL ; 22 + tilecoll WALL, WALL, WALL, WALL ; 23 + tilecoll FLOOR, FLOOR, WARP_PANEL, FLOOR ; 24 + tilecoll WALL, WALL, PIT, FLOOR ; 25 + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 26 + tilecoll WARP_CARPET_UP, WARP_CARPET_UP, FLOOR, FLOOR ; 27 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 28 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 29 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2a - tilecoll WALL, WALL, WALL, WALL ; 2b - tilecoll WALL, HOP_LEFT, WALL, WALL ; 2c - tilecoll HOP_RIGHT, WALL, WALL, WALL ; 2d - tilecoll WALL, WALL, FLOOR, FLOOR ; 2e - tilecoll WALL, WALL, WALL, FLOOR ; 2f - tilecoll WALL, WALL, FLOOR, WALL ; 30 - tilecoll WALL, FLOOR, WALL, FLOOR ; 31 - tilecoll FLOOR, WALL, FLOOR, WALL ; 32 - tilecoll WALL, WALL, FLOOR, FLOOR ; 33 - tilecoll WALL, WALL, WALL, FLOOR ; 34 - tilecoll WALL, WALL, FLOOR, WALL ; 35 - tilecoll WALL, FLOOR, WALL, FLOOR ; 36 - tilecoll FLOOR, WALL, FLOOR, WALL ; 37 - tilecoll PIT, PIT, FLOOR, FLOOR ; 38 - tilecoll FLOOR, PIT, FLOOR, PIT ; 39 - tilecoll PIT, FLOOR, PIT, FLOOR ; 3a - tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 3b - tilecoll WALL, WALL, FLOOR, FLOOR ; 3c - tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 3d - tilecoll WALL, HOP_DOWN, WALL, WALL ; 3e - tilecoll HOP_DOWN, WALL, WALL, WALL ; 3f - tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 40 + tilecoll WALL, WALL, WALL, WALL ; 2a + tilecoll WALL, HOP_LEFT, WALL, WALL ; 2b + tilecoll HOP_RIGHT, WALL, WALL, WALL ; 2c + tilecoll WALL, WALL, FLOOR, FLOOR ; 2d + tilecoll WALL, WALL, WALL, FLOOR ; 2e + tilecoll WALL, WALL, FLOOR, WALL ; 2f + tilecoll WALL, FLOOR, WALL, FLOOR ; 30 + tilecoll FLOOR, WALL, FLOOR, WALL ; 31 + tilecoll WALL, WALL, FLOOR, FLOOR ; 32 + tilecoll WALL, WALL, WALL, FLOOR ; 33 + tilecoll WALL, WALL, FLOOR, WALL ; 34 + tilecoll WALL, FLOOR, WALL, FLOOR ; 35 + tilecoll FLOOR, WALL, FLOOR, WALL ; 36 + tilecoll PIT, PIT, FLOOR, FLOOR ; 37 + tilecoll FLOOR, PIT, FLOOR, PIT ; 38 + tilecoll PIT, FLOOR, PIT, FLOOR ; 39 + tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 3a + tilecoll WALL, WALL, FLOOR, FLOOR ; 3b + tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 3c + tilecoll WALL, HOP_DOWN, WALL, WALL ; 3d + tilecoll HOP_DOWN, WALL, WALL, WALL ; 3e + tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 3f diff --git a/data/tilesets/traditional_house_collision.asm b/data/tilesets/traditional_house_collision.asm index 95cb1c21d..72db9bd42 100644 --- a/data/tilesets/traditional_house_collision.asm +++ b/data/tilesets/traditional_house_collision.asm @@ -1,64 +1,64 @@ - tilecoll WALL, WALL, WALL, WALL ; 01 - tilecoll WALL, WALL, RADIO, FLOOR ; 02 - tilecoll WALL, WALL, MART_SHELF, MART_SHELF ; 03 - tilecoll WALL, WALL, FLOOR, FLOOR ; 04 + tilecoll WALL, WALL, WALL, WALL ; 00 + tilecoll WALL, WALL, RADIO, FLOOR ; 01 + tilecoll WALL, WALL, MART_SHELF, MART_SHELF ; 02 + tilecoll WALL, WALL, FLOOR, FLOOR ; 03 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 06 - tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 07 - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 08 - tilecoll WALL, WALL, FLOOR, FLOOR ; 09 - tilecoll WALL, WALL, WALL, WALL ; 0a - tilecoll FLOOR, WALL, FLOOR, WALL ; 0b - tilecoll WALL, FLOOR, WALL, FLOOR ; 0c - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 0d + tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 06 + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 07 + tilecoll WALL, WALL, FLOOR, FLOOR ; 08 + tilecoll WALL, WALL, WALL, WALL ; 09 + tilecoll FLOOR, WALL, FLOOR, WALL ; 0a + tilecoll WALL, FLOOR, WALL, FLOOR ; 0b + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 0c + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0d tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0e - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0f - tilecoll WALL, WALL, WALL, WALL ; 10 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 11 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 12 - tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 13 - tilecoll WALL, WALL, INCENSE_BURNER, BOOKSHELF ; 14 - tilecoll WALL, WALL, FLOOR, FLOOR ; 15 + tilecoll WALL, WALL, WALL, WALL ; 0f + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 10 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 11 + tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 12 + tilecoll WALL, WALL, INCENSE_BURNER, BOOKSHELF ; 13 + tilecoll WALL, WALL, FLOOR, FLOOR ; 14 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 15 tilecoll FLOOR, WALL, FLOOR, FLOOR ; 16 - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 17 - tilecoll WALL, WALL, WALL, WALL ; 18 - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 19 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 1a - tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 1b - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 1c - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 1d - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1e - tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 1f + tilecoll WALL, WALL, WALL, WALL ; 17 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 18 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 19 + tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 1a + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 1b + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 1c + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1d + tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 1e + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1f tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 20 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 21 - tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 22 - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 23 - tilecoll WALL, WALL, RADIO, FLOOR ; 24 - tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 25 - tilecoll WALL, WALL, FLOOR, FLOOR ; 26 - tilecoll FLOOR, FLOOR, WALL, WALL ; 27 - tilecoll LADDER, FLOOR, FLOOR, FLOOR ; 28 - tilecoll WALL, WALL, FLOOR, FLOOR ; 29 - tilecoll WALL, WALL, WALL, WALL ; 2a + tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 21 + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 22 + tilecoll WALL, WALL, RADIO, FLOOR ; 23 + tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 24 + tilecoll WALL, WALL, FLOOR, FLOOR ; 25 + tilecoll FLOOR, FLOOR, WALL, WALL ; 26 + tilecoll LADDER, FLOOR, FLOOR, FLOOR ; 27 + tilecoll WALL, WALL, FLOOR, FLOOR ; 28 + tilecoll WALL, WALL, WALL, WALL ; 29 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2a tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2b - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c - tilecoll FLOOR, FLOOR, HOP_DOWN, HOP_DOWN ; 2d - tilecoll WALL, WALL, FLOOR, FLOOR ; 2e - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 2f - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 30 - tilecoll WALL, WALL, FLOOR, FLOOR ; 31 + tilecoll FLOOR, FLOOR, HOP_DOWN, HOP_DOWN ; 2c + tilecoll WALL, WALL, FLOOR, FLOOR ; 2d + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 2e + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 2f + tilecoll WALL, WALL, FLOOR, FLOOR ; 30 + tilecoll WALL, WALL, WALL, WALL ; 31 tilecoll WALL, WALL, WALL, WALL ; 32 - tilecoll WALL, WALL, WALL, WALL ; 33 + tilecoll WALL, WALL, WALL, FLOOR ; 33 tilecoll WALL, WALL, WALL, FLOOR ; 34 - tilecoll WALL, WALL, WALL, FLOOR ; 35 - tilecoll WALL, WALL, FLOOR, FLOOR ; 36 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 37 - tilecoll WALL, WALL, FLOOR, WALL ; 38 - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 39 - tilecoll FLOOR, LADDER, FLOOR, FLOOR ; 3a - tilecoll 04, 03, 03, 03 ; 3b - tilecoll 03, 03, 03, 03 ; 3c - tilecoll 03, 03, 04, 04 ; 3d - tilecoll 04, 04, 04, 04 ; 3e - tilecoll 03, 03, 03, 03 ; 3f - tilecoll WARP_CARPET_DOWN, 04, 03, 03 ; 40 + tilecoll WALL, WALL, FLOOR, FLOOR ; 35 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 36 + tilecoll WALL, WALL, FLOOR, WALL ; 37 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 38 + tilecoll FLOOR, LADDER, FLOOR, FLOOR ; 39 + tilecoll 04, 03, 03, 03 ; 3a + tilecoll 03, 03, 03, 03 ; 3b + tilecoll 03, 03, 04, 04 ; 3c + tilecoll 04, 04, 04, 04 ; 3d + tilecoll 03, 03, 03, 03 ; 3e + tilecoll WARP_CARPET_DOWN, 04, 03, 03 ; 3f diff --git a/data/tilesets/train_station_collision.asm b/data/tilesets/train_station_collision.asm index 55b147237..a6a4b1ace 100644 --- a/data/tilesets/train_station_collision.asm +++ b/data/tilesets/train_station_collision.asm @@ -1,64 +1,64 @@ - tilecoll FF, FF, FF, FF ; 01 - tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 02 - tilecoll UP_WALL, FLOOR, UP_WALL, FLOOR ; 03 + tilecoll FF, FF, FF, FF ; 00 + tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 01 + tilecoll UP_WALL, FLOOR, UP_WALL, FLOOR ; 02 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 06 - tilecoll FLOOR, FLOOR, WALL, WALL ; 07 - tilecoll WALL, FLOOR, WALL, FLOOR ; 08 - tilecoll WALL, FLOOR, WALL, WALL ; 09 - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0a - tilecoll WALL, WALL, WALL, WALL ; 0b - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0c - tilecoll WALL, FLOOR, WALL, FLOOR ; 0d - tilecoll WALL, WALL, WALL, WALL ; 0e - tilecoll FLOOR, WALL, FLOOR, WALL ; 0f + tilecoll FLOOR, FLOOR, WALL, WALL ; 06 + tilecoll WALL, FLOOR, WALL, FLOOR ; 07 + tilecoll WALL, FLOOR, WALL, WALL ; 08 + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 09 + tilecoll WALL, WALL, WALL, WALL ; 0a + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0b + tilecoll WALL, FLOOR, WALL, FLOOR ; 0c + tilecoll WALL, WALL, WALL, WALL ; 0d + tilecoll FLOOR, WALL, FLOOR, WALL ; 0e + tilecoll WALL, WALL, WALL, WALL ; 0f tilecoll WALL, WALL, WALL, WALL ; 10 - tilecoll WALL, WALL, WALL, WALL ; 11 - tilecoll WALL, WALL, DOOR, WALL ; 12 - tilecoll WALL, WALL, WALL, DOOR ; 13 + tilecoll WALL, WALL, DOOR, WALL ; 11 + tilecoll WALL, WALL, WALL, DOOR ; 12 + tilecoll WALL, WALL, WALL, WALL ; 13 tilecoll WALL, WALL, WALL, WALL ; 14 tilecoll WALL, WALL, WALL, WALL ; 15 tilecoll WALL, WALL, WALL, WALL ; 16 tilecoll WALL, WALL, WALL, WALL ; 17 - tilecoll WALL, WALL, WALL, WALL ; 18 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 18 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 19 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1a + tilecoll WALL, WALL, WALL, WALL ; 1a tilecoll WALL, WALL, WALL, WALL ; 1b - tilecoll WALL, WALL, WALL, WALL ; 1c - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1d - tilecoll WALL, FLOOR, WALL, FLOOR ; 1e - tilecoll FLOOR, WALL, FLOOR, WALL ; 1f - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 20 - tilecoll WALL, WALL, WALL, WALL ; 21 - tilecoll WALL, FLOOR, WALL, FLOOR ; 22 - tilecoll FLOOR, WALL, FLOOR, WALL ; 23 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1c + tilecoll WALL, FLOOR, WALL, FLOOR ; 1d + tilecoll FLOOR, WALL, FLOOR, WALL ; 1e + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 1f + tilecoll WALL, WALL, WALL, WALL ; 20 + tilecoll WALL, FLOOR, WALL, FLOOR ; 21 + tilecoll FLOOR, WALL, FLOOR, WALL ; 22 + tilecoll WALL, WALL, FLOOR, FLOOR ; 23 tilecoll WALL, WALL, FLOOR, FLOOR ; 24 tilecoll WALL, WALL, FLOOR, FLOOR ; 25 - tilecoll WALL, WALL, FLOOR, FLOOR ; 26 - tilecoll WALL, FLOOR, WALL, FLOOR ; 27 - tilecoll FLOOR, WALL, FLOOR, WALL ; 28 - tilecoll WALL, WALL, WALL, FLOOR ; 29 - tilecoll WALL, WALL, FLOOR, WALL ; 2a - tilecoll WALL, FLOOR, WALL, FLOOR ; 2b + tilecoll WALL, FLOOR, WALL, FLOOR ; 26 + tilecoll FLOOR, WALL, FLOOR, WALL ; 27 + tilecoll WALL, WALL, WALL, FLOOR ; 28 + tilecoll WALL, WALL, FLOOR, WALL ; 29 + tilecoll WALL, FLOOR, WALL, FLOOR ; 2a + tilecoll FLOOR, WALL, FLOOR, WALL ; 2b tilecoll FLOOR, WALL, FLOOR, WALL ; 2c tilecoll FLOOR, WALL, FLOOR, WALL ; 2d - tilecoll FLOOR, WALL, FLOOR, WALL ; 2e - tilecoll WALL, WALL, WALL, WALL ; 2f + tilecoll WALL, WALL, WALL, WALL ; 2e + tilecoll WALL, WALL, FLOOR, FLOOR ; 2f tilecoll WALL, WALL, FLOOR, FLOOR ; 30 - tilecoll WALL, WALL, FLOOR, FLOOR ; 31 - tilecoll WALL, FLOOR, WALL, FLOOR ; 32 - tilecoll FLOOR, WALL, FLOOR, WALL ; 33 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 34 - tilecoll WALL, FLOOR, WALL, FLOOR ; 35 - tilecoll FLOOR, WALL, FLOOR, WALL ; 36 - tilecoll WALL, WALL, WALL, FLOOR ; 37 - tilecoll WALL, WALL, FLOOR, FLOOR ; 38 - tilecoll WALL, WALL, FLOOR, WALL ; 39 - tilecoll WALL, FLOOR, WALL, WALL ; 3a - tilecoll WALL, WALL, WALL, WALL ; 3b - tilecoll FLOOR, WALL, WALL, WALL ; 3c + tilecoll WALL, FLOOR, WALL, FLOOR ; 31 + tilecoll FLOOR, WALL, FLOOR, WALL ; 32 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 33 + tilecoll WALL, FLOOR, WALL, FLOOR ; 34 + tilecoll FLOOR, WALL, FLOOR, WALL ; 35 + tilecoll WALL, WALL, WALL, FLOOR ; 36 + tilecoll WALL, WALL, FLOOR, FLOOR ; 37 + tilecoll WALL, WALL, FLOOR, WALL ; 38 + tilecoll WALL, FLOOR, WALL, WALL ; 39 + tilecoll WALL, WALL, WALL, WALL ; 3a + tilecoll FLOOR, WALL, WALL, WALL ; 3b + tilecoll WALL, WALL, WALL, WALL ; 3c tilecoll WALL, WALL, WALL, WALL ; 3d tilecoll WALL, WALL, WALL, WALL ; 3e tilecoll WALL, WALL, WALL, WALL ; 3f - tilecoll WALL, WALL, WALL, WALL ; 40 diff --git a/data/tilesets/underground_collision.asm b/data/tilesets/underground_collision.asm index 0c3120451..e4cee7495 100644 --- a/data/tilesets/underground_collision.asm +++ b/data/tilesets/underground_collision.asm @@ -1,64 +1,64 @@ + tilecoll WALL, WALL, WALL, WALL ; 00 tilecoll WALL, WALL, WALL, WALL ; 01 - tilecoll WALL, WALL, WALL, WALL ; 02 + tilecoll FLOOR, LADDER, FLOOR, FLOOR ; 02 tilecoll FLOOR, LADDER, FLOOR, FLOOR ; 03 - tilecoll FLOOR, LADDER, FLOOR, FLOOR ; 04 - tilecoll WALL, WALL, WALL, FLOOR ; 05 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 06 - tilecoll WALL, FLOOR, WALL, FLOOR ; 07 - tilecoll FLOOR, FLOOR, PIT, PIT ; 08 - tilecoll WALL, WALL, WALL, FLOOR ; 09 - tilecoll WALL, WALL, FLOOR, FLOOR ; 0a - tilecoll WALL, WALL, FLOOR, WALL ; 0b - tilecoll WALL, WALL, WALL, WALL ; 0c - tilecoll WALL, FLOOR, WALL, FLOOR ; 0d - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0e - tilecoll FLOOR, WALL, FLOOR, WALL ; 0f - tilecoll FLOOR, FLOOR, FLOOR, WARP_PANEL ; 10 - tilecoll WALL, FLOOR, WALL, WALL ; 11 - tilecoll FLOOR, FLOOR, WALL, WALL ; 12 - tilecoll FLOOR, WALL, WALL, WALL ; 13 - tilecoll WALL, WALL, FLOOR, FLOOR ; 14 + tilecoll WALL, WALL, WALL, FLOOR ; 04 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05 + tilecoll WALL, FLOOR, WALL, FLOOR ; 06 + tilecoll FLOOR, FLOOR, PIT, PIT ; 07 + tilecoll WALL, WALL, WALL, FLOOR ; 08 + tilecoll WALL, WALL, FLOOR, FLOOR ; 09 + tilecoll WALL, WALL, FLOOR, WALL ; 0a + tilecoll WALL, WALL, WALL, WALL ; 0b + tilecoll WALL, FLOOR, WALL, FLOOR ; 0c + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0d + tilecoll FLOOR, WALL, FLOOR, WALL ; 0e + tilecoll FLOOR, FLOOR, FLOOR, WARP_PANEL ; 0f + tilecoll WALL, FLOOR, WALL, WALL ; 10 + tilecoll FLOOR, FLOOR, WALL, WALL ; 11 + tilecoll FLOOR, WALL, WALL, WALL ; 12 + tilecoll WALL, WALL, FLOOR, FLOOR ; 13 + tilecoll FLOOR, FLOOR, WALL, WALL ; 14 tilecoll FLOOR, FLOOR, WALL, WALL ; 15 - tilecoll FLOOR, FLOOR, WALL, WALL ; 16 - tilecoll WALL, FLOOR, WALL, WALL ; 17 - tilecoll FLOOR, WALL, WALL, WALL ; 18 - tilecoll FLOOR, WALL, FLOOR, WALL ; 19 - tilecoll WALL, FLOOR, WALL, FLOOR ; 1a - tilecoll FLOOR, WALL, FLOOR, WALL ; 1b - tilecoll WALL, FLOOR, WALL, FLOOR ; 1c - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 1d - tilecoll WALL, WALL, FLOOR, FLOOR ; 1e - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 1f + tilecoll WALL, FLOOR, WALL, WALL ; 16 + tilecoll FLOOR, WALL, WALL, WALL ; 17 + tilecoll FLOOR, WALL, FLOOR, WALL ; 18 + tilecoll WALL, FLOOR, WALL, FLOOR ; 19 + tilecoll FLOOR, WALL, FLOOR, WALL ; 1a + tilecoll WALL, FLOOR, WALL, FLOOR ; 1b + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 1c + tilecoll WALL, WALL, FLOOR, FLOOR ; 1d + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 1e + tilecoll WALL, WALL, FLOOR, FLOOR ; 1f tilecoll WALL, WALL, FLOOR, FLOOR ; 20 - tilecoll WALL, WALL, FLOOR, FLOOR ; 21 - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 22 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 21 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 22 tilecoll FLOOR, FLOOR, WALL, FLOOR ; 23 - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 24 - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 25 - tilecoll WALL, WARP_CARPET_UP, FLOOR, FLOOR ; 26 - tilecoll WARP_CARPET_UP, WALL, FLOOR, FLOOR ; 27 - tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 28 - tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 29 - tilecoll FLOOR, WALL, FLOOR, WALL ; 2a - tilecoll WALL, FLOOR, WALL, FLOOR ; 2b + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 24 + tilecoll WALL, WARP_CARPET_UP, FLOOR, FLOOR ; 25 + tilecoll WARP_CARPET_UP, WALL, FLOOR, FLOOR ; 26 + tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 27 + tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 28 + tilecoll FLOOR, WALL, FLOOR, WALL ; 29 + tilecoll WALL, FLOOR, WALL, FLOOR ; 2a + tilecoll WALL, WALL, WALL, WALL ; 2b tilecoll WALL, WALL, WALL, WALL ; 2c tilecoll WALL, WALL, WALL, WALL ; 2d - tilecoll WALL, WALL, WALL, WALL ; 2e - tilecoll WARP_CARPET_DOWN, WARP_CARPET_DOWN, WALL, WALL ; 2f + tilecoll WARP_CARPET_DOWN, WARP_CARPET_DOWN, WALL, WALL ; 2e + tilecoll WALL, WALL, WALL, WALL ; 2f tilecoll WALL, WALL, WALL, WALL ; 30 tilecoll WALL, WALL, WALL, WALL ; 31 tilecoll WALL, WALL, WALL, WALL ; 32 tilecoll WALL, WALL, WALL, WALL ; 33 tilecoll WALL, WALL, WALL, WALL ; 34 tilecoll WALL, WALL, WALL, WALL ; 35 - tilecoll WALL, WALL, WALL, WALL ; 36 - tilecoll WALL, FLOOR, WALL, FLOOR ; 37 - tilecoll FLOOR, WALL, FLOOR, WALL ; 38 + tilecoll WALL, FLOOR, WALL, FLOOR ; 36 + tilecoll FLOOR, WALL, FLOOR, WALL ; 37 + tilecoll WALL, WALL, WALL, WALL ; 38 tilecoll WALL, WALL, WALL, WALL ; 39 tilecoll WALL, WALL, WALL, WALL ; 3a tilecoll WALL, WALL, WALL, WALL ; 3b tilecoll WALL, WALL, WALL, WALL ; 3c - tilecoll WALL, WALL, WALL, WALL ; 3d - tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 3e + tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 3d + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40 diff --git a/data/tilesets/unused_dark_cave_collision.asm b/data/tilesets/unused_dark_cave_collision.asm index 0022d3881..8bbc11f2a 100644 --- a/data/tilesets/unused_dark_cave_collision.asm +++ b/data/tilesets/unused_dark_cave_collision.asm @@ -1,33 +1,34 @@ + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 00 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03 - tilecoll TALL_GRASS_10, TALL_GRASS_10, TALL_GRASS_10, TALL_GRASS_10 ; 04 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05 - tilecoll WALL, WALL, WALL, WALL ; 06 + tilecoll TALL_GRASS_10, TALL_GRASS_10, TALL_GRASS_10, TALL_GRASS_10 ; 03 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04 + tilecoll WALL, WALL, WALL, WALL ; 05 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 06 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 07 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 08 - tilecoll WALL, WALL, WALL, WALL ; 09 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a - tilecoll WALL, WALL, WALL, WALL ; 0b - tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 0c - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 0d - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0e - tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 0f + tilecoll WALL, WALL, WALL, WALL ; 08 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 09 + tilecoll WALL, WALL, WALL, WALL ; 0a + tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 0b + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 0c + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0d + tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 0e + tilecoll WALL, WALL, WALL, WALL ; 0f tilecoll WALL, WALL, WALL, WALL ; 10 tilecoll WALL, WALL, WALL, WALL ; 11 tilecoll WALL, WALL, WALL, WALL ; 12 tilecoll WALL, WALL, WALL, WALL ; 13 - tilecoll WALL, WALL, WALL, WALL ; 14 - tilecoll WALL, WALL, WALL, DOOR ; 15 - tilecoll WALL, WALL, WALL, WALL ; 16 - tilecoll WALL, WALL, WALL, DOOR ; 17 - tilecoll WALL, WALL, TOWN_MAP, WALL ; 18 + tilecoll WALL, WALL, WALL, DOOR ; 14 + tilecoll WALL, WALL, WALL, WALL ; 15 + tilecoll WALL, WALL, WALL, DOOR ; 16 + tilecoll WALL, WALL, TOWN_MAP, WALL ; 17 + tilecoll WALL, WALL, WALL, WALL ; 18 tilecoll WALL, WALL, WALL, WALL ; 19 - tilecoll WALL, WALL, WALL, WALL ; 1a - tilecoll WALL, WALL, WALL, DOOR ; 1b - tilecoll WALL, WALL, TOWN_MAP, WALL ; 1c - tilecoll WALL, WALL, WALL, WALL ; 1d - tilecoll WALL, WALL, DOOR, WALL ; 1e + tilecoll WALL, WALL, WALL, DOOR ; 1a + tilecoll WALL, WALL, TOWN_MAP, WALL ; 1b + tilecoll WALL, WALL, WALL, WALL ; 1c + tilecoll WALL, WALL, DOOR, WALL ; 1d + tilecoll WALL, WALL, WALL, WALL ; 1e tilecoll WALL, WALL, WALL, WALL ; 1f tilecoll WALL, WALL, WALL, WALL ; 20 tilecoll WALL, WALL, WALL, WALL ; 21 @@ -37,92 +38,91 @@ tilecoll WALL, WALL, WALL, WALL ; 25 tilecoll WALL, WALL, WALL, WALL ; 26 tilecoll WALL, WALL, WALL, WALL ; 27 - tilecoll WALL, WALL, WALL, WALL ; 28 - tilecoll WALL, WALL, WALL, DOOR ; 29 - tilecoll WALL, WALL, WALL, WALL ; 2a - tilecoll WALL, WALL, WALL, DOOR ; 2b - tilecoll WALL, WALL, WALL, WALL ; 2c + tilecoll WALL, WALL, WALL, DOOR ; 28 + tilecoll WALL, WALL, WALL, WALL ; 29 + tilecoll WALL, WALL, WALL, DOOR ; 2a + tilecoll WALL, WALL, WALL, WALL ; 2b + tilecoll FLOOR, FLOOR, WALL, WALL ; 2c tilecoll FLOOR, FLOOR, WALL, WALL ; 2d - tilecoll FLOOR, FLOOR, WALL, WALL ; 2e - tilecoll WALL, WALL, WALL, DOOR ; 2f - tilecoll WALL, WALL, WALL, WALL ; 30 - tilecoll BUOY, BUOY, BUOY, WATER_21 ; 31 - tilecoll BUOY, BUOY, WATER_21, WATER_21 ; 32 - tilecoll BUOY, BUOY, WATER_21, BUOY ; 33 - tilecoll FLOOR, FLOOR, WALL, WALL ; 34 - tilecoll BUOY, WATER_21, BUOY, WATER_21 ; 35 - tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 36 - tilecoll WATER_21, BUOY, WATER_21, BUOY ; 37 - tilecoll WALL, WALL, WALL, WALL ; 38 - tilecoll BUOY, WATER_21, BUOY, BUOY ; 39 - tilecoll WATER_21, WATER_21, BUOY, BUOY ; 3a - tilecoll WATER_21, BUOY, BUOY, BUOY ; 3b - tilecoll WALL, WALL, WALL, WALL ; 3c - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 3d - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 3e - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 3f - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 40 - tilecoll WALL, WALL, WALL, FLOOR ; 41 - tilecoll WALL, WALL, FLOOR, FLOOR ; 42 - tilecoll WALL, WALL, FLOOR, WALL ; 43 - tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 44 - tilecoll WALL, FLOOR, WALL, FLOOR ; 45 - tilecoll TOWN_MAP, FLOOR, FLOOR, FLOOR ; 46 - tilecoll FLOOR, WALL, FLOOR, WALL ; 47 - tilecoll FLOOR, FLOOR, FLOOR, TOWN_MAP ; 48 - tilecoll WALL, FLOOR, WALL, WALL ; 49 - tilecoll FLOOR, FLOOR, WALL, WALL ; 4a - tilecoll FLOOR, WALL, WALL, WALL ; 4b - tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 4c - tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4d - tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 4e - tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4f - tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 50 - tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 51 - tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 52 - tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 53 - tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 54 + tilecoll WALL, WALL, WALL, DOOR ; 2e + tilecoll WALL, WALL, WALL, WALL ; 2f + tilecoll BUOY, BUOY, BUOY, WATER_21 ; 30 + tilecoll BUOY, BUOY, WATER_21, WATER_21 ; 31 + tilecoll BUOY, BUOY, WATER_21, BUOY ; 32 + tilecoll FLOOR, FLOOR, WALL, WALL ; 33 + tilecoll BUOY, WATER_21, BUOY, WATER_21 ; 34 + tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 35 + tilecoll WATER_21, BUOY, WATER_21, BUOY ; 36 + tilecoll WALL, WALL, WALL, WALL ; 37 + tilecoll BUOY, WATER_21, BUOY, BUOY ; 38 + tilecoll WATER_21, WATER_21, BUOY, BUOY ; 39 + tilecoll WATER_21, BUOY, BUOY, BUOY ; 3a + tilecoll WALL, WALL, WALL, WALL ; 3b + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 3c + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 3d + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 3e + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 3f + tilecoll WALL, WALL, WALL, FLOOR ; 40 + tilecoll WALL, WALL, FLOOR, FLOOR ; 41 + tilecoll WALL, WALL, FLOOR, WALL ; 42 + tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 43 + tilecoll WALL, FLOOR, WALL, FLOOR ; 44 + tilecoll TOWN_MAP, FLOOR, FLOOR, FLOOR ; 45 + tilecoll FLOOR, WALL, FLOOR, WALL ; 46 + tilecoll FLOOR, FLOOR, FLOOR, TOWN_MAP ; 47 + tilecoll WALL, FLOOR, WALL, WALL ; 48 + tilecoll FLOOR, FLOOR, WALL, WALL ; 49 + tilecoll FLOOR, WALL, WALL, WALL ; 4a + tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 4b + tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4c + tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 4d + tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4e + tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 4f + tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 50 + tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 51 + tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 52 + tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 53 + tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 54 tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 55 - tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 56 + tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 56 tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 57 - tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 58 + tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 58 tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 59 - tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 5a - tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 5b - tilecoll WALL, CUT_TREE, FLOOR, FLOOR ; 5c - tilecoll WALL, WALL, WALL, FLOOR ; 5d - tilecoll WALL, WALL, FLOOR, FLOOR ; 5e - tilecoll WALL, WALL, FLOOR, WALL ; 5f - tilecoll FLOOR, WALL, FLOOR, CUT_TREE ; 60 - tilecoll WALL, FLOOR, WALL, FLOOR ; 61 - tilecoll WALL, WALL, WALL, WALL ; 62 - tilecoll FLOOR, WALL, FLOOR, WALL ; 63 - tilecoll FLOOR, FLOOR, CUT_TREE, WALL ; 64 - tilecoll WALL, FLOOR, WALL, WALL ; 65 - tilecoll FLOOR, FLOOR, WALL, WALL ; 66 - tilecoll FLOOR, WALL, WALL, WALL ; 67 - tilecoll CUT_TREE, FLOOR, WALL, FLOOR ; 68 - tilecoll WALL, FLOOR, WALL, FLOOR ; 69 - tilecoll FLOOR, WALL, FLOOR, WALL ; 6a - tilecoll WALL, UP_WALL, WALL, FLOOR ; 6b - tilecoll UP_WALL, WALL, FLOOR, WALL ; 6c - tilecoll WALL, FLOOR, WALL, WALL ; 6d - tilecoll FLOOR, WALL, WALL, WALL ; 6e - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 6f - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 70 - tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 71 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 72 - tilecoll FLOOR, FLOOR, WALL, WALL ; 73 - tilecoll FLOOR, FLOOR, DOOR, WALL ; 74 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 75 - tilecoll WALL, WALL, FLOOR, FLOOR ; 76 - tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 77 + tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 5a + tilecoll WALL, CUT_TREE, FLOOR, FLOOR ; 5b + tilecoll WALL, WALL, WALL, FLOOR ; 5c + tilecoll WALL, WALL, FLOOR, FLOOR ; 5d + tilecoll WALL, WALL, FLOOR, WALL ; 5e + tilecoll FLOOR, WALL, FLOOR, CUT_TREE ; 5f + tilecoll WALL, FLOOR, WALL, FLOOR ; 60 + tilecoll WALL, WALL, WALL, WALL ; 61 + tilecoll FLOOR, WALL, FLOOR, WALL ; 62 + tilecoll FLOOR, FLOOR, CUT_TREE, WALL ; 63 + tilecoll WALL, FLOOR, WALL, WALL ; 64 + tilecoll FLOOR, FLOOR, WALL, WALL ; 65 + tilecoll FLOOR, WALL, WALL, WALL ; 66 + tilecoll CUT_TREE, FLOOR, WALL, FLOOR ; 67 + tilecoll WALL, FLOOR, WALL, FLOOR ; 68 + tilecoll FLOOR, WALL, FLOOR, WALL ; 69 + tilecoll WALL, UP_WALL, WALL, FLOOR ; 6a + tilecoll UP_WALL, WALL, FLOOR, WALL ; 6b + tilecoll WALL, FLOOR, WALL, WALL ; 6c + tilecoll FLOOR, WALL, WALL, WALL ; 6d + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 6e + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 6f + tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 70 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 71 + tilecoll FLOOR, FLOOR, WALL, WALL ; 72 + tilecoll FLOOR, FLOOR, DOOR, WALL ; 73 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 74 + tilecoll WALL, WALL, FLOOR, FLOOR ; 75 + tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 76 + tilecoll WALL, WALL, WALL, WALL ; 77 tilecoll WALL, WALL, WALL, WALL ; 78 - tilecoll WALL, WALL, WALL, WALL ; 79 + tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 79 tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 7a - tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 7b + tilecoll WALL, WALL, WALL, WALL ; 7b tilecoll WALL, WALL, WALL, WALL ; 7c tilecoll WALL, WALL, WALL, WALL ; 7d tilecoll WALL, WALL, WALL, WALL ; 7e tilecoll WALL, WALL, WALL, WALL ; 7f - tilecoll WALL, WALL, WALL, WALL ; 80 diff --git a/data/trainers/attributes.asm b/data/trainers/attributes.asm index 224e460c9..67d852d83 100644 --- a/data/trainers/attributes.asm +++ b/data/trainers/attributes.asm @@ -1,406 +1,404 @@ -TrainerClassAttributes: ; 3959c +TrainerClassAttributes: ; entries correspond to trainer classes (see constants/trainer_constants.asm) ; Falkner - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 25 ; base reward - dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY - dw CONTEXT_USE + SWITCH_SOMETIMES + dw AI_BASIC | AI_SETUP | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS | AI_RISKY + dw CONTEXT_USE | SWITCH_SOMETIMES ; Whitney - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 25 ; base reward - dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY - dw CONTEXT_USE + SWITCH_SOMETIMES + dw AI_BASIC | AI_SETUP | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS | AI_RISKY + dw CONTEXT_USE | SWITCH_SOMETIMES ; Bugsy - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 25 ; base reward - dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY - dw CONTEXT_USE + SWITCH_SOMETIMES + dw AI_BASIC | AI_SETUP | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS | AI_RISKY + dw CONTEXT_USE | SWITCH_SOMETIMES ; Morty - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 25 ; base reward - dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY - dw CONTEXT_USE + SWITCH_SOMETIMES + dw AI_BASIC | AI_SETUP | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS | AI_RISKY + dw CONTEXT_USE | SWITCH_SOMETIMES ; Pryce - db HYPER_POTION, 0 ; items + db HYPER_POTION, NO_ITEM ; items db 25 ; base reward - dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY - dw CONTEXT_USE + SWITCH_SOMETIMES + dw AI_BASIC | AI_SETUP | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS | AI_RISKY + dw CONTEXT_USE | SWITCH_SOMETIMES ; Jasmine - db HYPER_POTION, 0 ; items + db HYPER_POTION, NO_ITEM ; items db 25 ; base reward - dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY - dw CONTEXT_USE + SWITCH_SOMETIMES + dw AI_BASIC | AI_SETUP | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS | AI_RISKY + dw CONTEXT_USE | SWITCH_SOMETIMES ; Chuck - db FULL_HEAL, 0 ; items + db FULL_HEAL, NO_ITEM ; items db 25 ; base reward - dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY - dw CONTEXT_USE + SWITCH_SOMETIMES + dw AI_BASIC | AI_SETUP | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS | AI_RISKY + dw CONTEXT_USE | SWITCH_SOMETIMES ; Clair db FULL_HEAL, HYPER_POTION ; items db 25 ; base reward - dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY - dw CONTEXT_USE + SWITCH_SOMETIMES + dw AI_BASIC | AI_SETUP | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS | AI_RISKY + dw CONTEXT_USE | SWITCH_SOMETIMES ; Rival1 - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 15 ; base reward - dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY - dw CONTEXT_USE + SWITCH_SOMETIMES + dw AI_BASIC | AI_SETUP | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS | AI_RISKY + dw CONTEXT_USE | SWITCH_SOMETIMES ; Pokemon Prof - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 25 ; base reward - dw AI_BASIC + AI_AGGRESSIVE + AI_STATUS - dw CONTEXT_USE + SWITCH_SOMETIMES + dw AI_BASIC | AI_AGGRESSIVE | AI_STATUS + dw CONTEXT_USE | SWITCH_SOMETIMES ; Will - db MAX_POTION, 0 ; items + db MAX_POTION, NO_ITEM ; items db 25 ; base reward - dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY - dw CONTEXT_USE + SWITCH_SOMETIMES + dw AI_BASIC | AI_SETUP | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS | AI_RISKY + dw CONTEXT_USE | SWITCH_SOMETIMES ; Cal - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 25 ; base reward - dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY - dw CONTEXT_USE + SWITCH_SOMETIMES + dw AI_BASIC | AI_SETUP | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS | AI_RISKY + dw CONTEXT_USE | SWITCH_SOMETIMES ; Bruno - db MAX_POTION, 0 ; items + db MAX_POTION, NO_ITEM ; items db 25 ; base reward - dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY - dw CONTEXT_USE + SWITCH_SOMETIMES + dw AI_BASIC | AI_SETUP | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS | AI_RISKY + dw CONTEXT_USE | SWITCH_SOMETIMES ; Karen db FULL_HEAL, MAX_POTION ; items db 25 ; base reward - dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY - dw CONTEXT_USE + SWITCH_SOMETIMES + dw AI_BASIC | AI_SETUP | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS | AI_RISKY + dw CONTEXT_USE | SWITCH_SOMETIMES ; Koga db FULL_HEAL, FULL_RESTORE ; items db 25 ; base reward - dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY - dw CONTEXT_USE + SWITCH_SOMETIMES + dw AI_BASIC | AI_SETUP | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS | AI_RISKY + dw CONTEXT_USE | SWITCH_SOMETIMES ; Champion db FULL_HEAL, FULL_RESTORE ; items db 25 ; base reward - dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY - dw CONTEXT_USE + SWITCH_SOMETIMES + dw AI_BASIC | AI_SETUP | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS | AI_RISKY + dw CONTEXT_USE | SWITCH_SOMETIMES ; Brock - db HYPER_POTION, 0 ; items + db HYPER_POTION, NO_ITEM ; items db 25 ; base reward - dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY - dw CONTEXT_USE + SWITCH_SOMETIMES + dw AI_BASIC | AI_SETUP | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS | AI_RISKY + dw CONTEXT_USE | SWITCH_SOMETIMES ; Misty - db FULL_HEAL, 0 ; items + db FULL_HEAL, NO_ITEM ; items db 25 ; base reward - dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY - dw CONTEXT_USE + SWITCH_SOMETIMES + dw AI_BASIC | AI_SETUP | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS | AI_RISKY + dw CONTEXT_USE | SWITCH_SOMETIMES ; Lt Surge - db HYPER_POTION, 0 ; items + db HYPER_POTION, NO_ITEM ; items db 25 ; base reward - dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY - dw CONTEXT_USE + SWITCH_SOMETIMES + dw AI_BASIC | AI_SETUP | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS | AI_RISKY + dw CONTEXT_USE | SWITCH_SOMETIMES ; Scientist - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 25 ; base reward - dw AI_BASIC + AI_SETUP + AI_TYPES + AI_STATUS + AI_RISKY - dw CONTEXT_USE + SWITCH_SOMETIMES + dw AI_BASIC | AI_SETUP | AI_TYPES | AI_STATUS | AI_RISKY + dw CONTEXT_USE | SWITCH_SOMETIMES ; Erika - db HYPER_POTION, 0 ; items + db HYPER_POTION, NO_ITEM ; items db 25 ; base reward - dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY - dw CONTEXT_USE + SWITCH_SOMETIMES + dw AI_BASIC | AI_SETUP | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS | AI_RISKY + dw CONTEXT_USE | SWITCH_SOMETIMES ; Youngster - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 4 ; base reward - dw AI_BASIC + AI_STATUS - dw CONTEXT_USE + SWITCH_SOMETIMES + dw AI_BASIC | AI_STATUS + dw CONTEXT_USE | SWITCH_SOMETIMES ; Schoolboy - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 8 ; base reward - dw AI_BASIC + AI_SETUP + AI_TYPES + AI_OPPORTUNIST + AI_CAUTIOUS + AI_STATUS - dw CONTEXT_USE + SWITCH_OFTEN + dw AI_BASIC | AI_SETUP | AI_TYPES | AI_OPPORTUNIST | AI_CAUTIOUS | AI_STATUS + dw CONTEXT_USE | SWITCH_OFTEN ; Bird Keeper - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 6 ; base reward - dw AI_BASIC + AI_TYPES + AI_OFFENSIVE + AI_OPPORTUNIST + AI_STATUS - dw CONTEXT_USE + SWITCH_SOMETIMES + dw AI_BASIC | AI_TYPES | AI_OFFENSIVE | AI_OPPORTUNIST | AI_STATUS + dw CONTEXT_USE | SWITCH_SOMETIMES ; Lass - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 6 ; base reward - dw AI_BASIC + AI_CAUTIOUS + AI_STATUS - dw CONTEXT_USE + SWITCH_OFTEN + dw AI_BASIC | AI_CAUTIOUS | AI_STATUS + dw CONTEXT_USE | SWITCH_OFTEN ; Janine - db DIRE_HIT, 0 ; items + db DIRE_HIT, NO_ITEM ; items db 25 ; base reward - dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY - dw CONTEXT_USE + SWITCH_SOMETIMES + dw AI_BASIC | AI_SETUP | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS | AI_RISKY + dw CONTEXT_USE | SWITCH_SOMETIMES ; Cooltrainerm - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 12 ; base reward - dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY - dw CONTEXT_USE + SWITCH_SOMETIMES + dw AI_BASIC | AI_SETUP | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS | AI_RISKY + dw CONTEXT_USE | SWITCH_SOMETIMES ; Cooltrainerf - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 12 ; base reward - dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY - dw CONTEXT_USE + SWITCH_SOMETIMES + dw AI_BASIC | AI_SETUP | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS | AI_RISKY + dw CONTEXT_USE | SWITCH_SOMETIMES ; Beauty - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 22 ; base reward - dw AI_BASIC + AI_TYPES + AI_OPPORTUNIST + AI_CAUTIOUS + AI_STATUS - dw CONTEXT_USE + SWITCH_SOMETIMES + dw AI_BASIC | AI_TYPES | AI_OPPORTUNIST | AI_CAUTIOUS | AI_STATUS + dw CONTEXT_USE | SWITCH_SOMETIMES ; Pokemaniac - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 15 ; base reward - dw AI_BASIC + AI_SETUP + AI_OFFENSIVE + AI_AGGRESSIVE + AI_STATUS - dw CONTEXT_USE + SWITCH_SOMETIMES + dw AI_BASIC | AI_SETUP | AI_OFFENSIVE | AI_AGGRESSIVE | AI_STATUS + dw CONTEXT_USE | SWITCH_SOMETIMES ; Gruntm - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 10 ; base reward - dw AI_BASIC + AI_SETUP + AI_TYPES + AI_OPPORTUNIST + AI_CAUTIOUS + AI_STATUS + AI_RISKY - dw CONTEXT_USE + SWITCH_SOMETIMES + dw AI_BASIC | AI_SETUP | AI_TYPES | AI_OPPORTUNIST | AI_CAUTIOUS | AI_STATUS | AI_RISKY + dw CONTEXT_USE | SWITCH_SOMETIMES ; Gentleman - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 18 ; base reward - dw AI_BASIC + AI_SETUP + AI_AGGRESSIVE + AI_STATUS - dw CONTEXT_USE + SWITCH_SOMETIMES + dw AI_BASIC | AI_SETUP | AI_AGGRESSIVE | AI_STATUS + dw CONTEXT_USE | SWITCH_SOMETIMES ; Skier - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 18 ; base reward - dw AI_BASIC + AI_SETUP + AI_TYPES + AI_STATUS + AI_RISKY - dw CONTEXT_USE + SWITCH_SOMETIMES + dw AI_BASIC | AI_SETUP | AI_TYPES | AI_STATUS | AI_RISKY + dw CONTEXT_USE | SWITCH_SOMETIMES ; Teacher - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 18 ; base reward - dw AI_BASIC + AI_OPPORTUNIST + AI_AGGRESSIVE + AI_STATUS - dw CONTEXT_USE + SWITCH_SOMETIMES + dw AI_BASIC | AI_OPPORTUNIST | AI_AGGRESSIVE | AI_STATUS + dw CONTEXT_USE | SWITCH_SOMETIMES ; Sabrina - db HYPER_POTION, 0 ; items + db HYPER_POTION, NO_ITEM ; items db 25 ; base reward - dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY - dw CONTEXT_USE + SWITCH_SOMETIMES + dw AI_BASIC | AI_SETUP | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS | AI_RISKY + dw CONTEXT_USE | SWITCH_SOMETIMES ; Bug Catcher - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 4 ; base reward - dw AI_BASIC + AI_SETUP + AI_STATUS - dw CONTEXT_USE + SWITCH_SOMETIMES + dw AI_BASIC | AI_SETUP | AI_STATUS + dw CONTEXT_USE | SWITCH_SOMETIMES ; Fisher - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 10 ; base reward - dw AI_BASIC + AI_TYPES + AI_OPPORTUNIST + AI_CAUTIOUS + AI_STATUS - dw CONTEXT_USE + SWITCH_OFTEN + dw AI_BASIC | AI_TYPES | AI_OPPORTUNIST | AI_CAUTIOUS | AI_STATUS + dw CONTEXT_USE | SWITCH_OFTEN ; Swimmerm - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 2 ; base reward - dw AI_BASIC + AI_SETUP + AI_TYPES + AI_OFFENSIVE + AI_STATUS - dw CONTEXT_USE + SWITCH_SOMETIMES + dw AI_BASIC | AI_SETUP | AI_TYPES | AI_OFFENSIVE | AI_STATUS + dw CONTEXT_USE | SWITCH_SOMETIMES ; Swimmerf - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 5 ; base reward - dw AI_BASIC + AI_SETUP + AI_TYPES + AI_CAUTIOUS + AI_STATUS - dw CONTEXT_USE + SWITCH_SOMETIMES + dw AI_BASIC | AI_SETUP | AI_TYPES | AI_CAUTIOUS | AI_STATUS + dw CONTEXT_USE | SWITCH_SOMETIMES ; Sailor - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 10 ; base reward - dw AI_BASIC + AI_OFFENSIVE + AI_OPPORTUNIST + AI_STATUS - dw CONTEXT_USE + SWITCH_SOMETIMES + dw AI_BASIC | AI_OFFENSIVE | AI_OPPORTUNIST | AI_STATUS + dw CONTEXT_USE | SWITCH_SOMETIMES ; Super Nerd - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 8 ; base reward - dw AI_BASIC + AI_TYPES + AI_SMART + AI_STATUS - dw CONTEXT_USE + SWITCH_SOMETIMES + dw AI_BASIC | AI_TYPES | AI_SMART | AI_STATUS + dw CONTEXT_USE | SWITCH_SOMETIMES ; Rival2 - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 25 ; base reward - dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY - dw CONTEXT_USE + SWITCH_SOMETIMES + dw AI_BASIC | AI_SETUP | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS | AI_RISKY + dw CONTEXT_USE | SWITCH_SOMETIMES ; Guitarist - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 8 ; base reward - dw AI_BASIC + AI_SETUP + AI_TYPES + AI_CAUTIOUS + AI_STATUS - dw CONTEXT_USE + SWITCH_SOMETIMES + dw AI_BASIC | AI_SETUP | AI_TYPES | AI_CAUTIOUS | AI_STATUS + dw CONTEXT_USE | SWITCH_SOMETIMES ; Hiker - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 8 ; base reward - dw AI_BASIC + AI_OFFENSIVE + AI_STATUS - dw CONTEXT_USE + SWITCH_SOMETIMES + dw AI_BASIC | AI_OFFENSIVE | AI_STATUS + dw CONTEXT_USE | SWITCH_SOMETIMES ; Biker - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 8 ; base reward - dw AI_BASIC + AI_TYPES + AI_STATUS + AI_RISKY - dw CONTEXT_USE + SWITCH_SOMETIMES + dw AI_BASIC | AI_TYPES | AI_STATUS | AI_RISKY + dw CONTEXT_USE | SWITCH_SOMETIMES ; Blaine db MAX_POTION, FULL_HEAL ; items db 25 ; base reward - dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY - dw CONTEXT_USE + SWITCH_SOMETIMES + dw AI_BASIC | AI_SETUP | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS | AI_RISKY + dw CONTEXT_USE | SWITCH_SOMETIMES ; Burglar - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 22 ; base reward - dw AI_BASIC + AI_OFFENSIVE + AI_CAUTIOUS + AI_STATUS - dw CONTEXT_USE + SWITCH_SOMETIMES + dw AI_BASIC | AI_OFFENSIVE | AI_CAUTIOUS | AI_STATUS + dw CONTEXT_USE | SWITCH_SOMETIMES ; Firebreather - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 12 ; base reward - dw AI_BASIC + AI_SETUP + AI_OFFENSIVE + AI_OPPORTUNIST + AI_STATUS - dw CONTEXT_USE + SWITCH_SOMETIMES + dw AI_BASIC | AI_SETUP | AI_OFFENSIVE | AI_OPPORTUNIST | AI_STATUS + dw CONTEXT_USE | SWITCH_SOMETIMES ; Juggler - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 10 ; base reward - dw AI_BASIC + AI_TYPES + AI_SMART + AI_STATUS - dw CONTEXT_USE + SWITCH_SOMETIMES + dw AI_BASIC | AI_TYPES | AI_SMART | AI_STATUS + dw CONTEXT_USE | SWITCH_SOMETIMES ; Blackbelt T - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 6 ; base reward - dw AI_BASIC + AI_OFFENSIVE + AI_STATUS + AI_RISKY - dw CONTEXT_USE + SWITCH_SOMETIMES + dw AI_BASIC | AI_OFFENSIVE | AI_STATUS | AI_RISKY + dw CONTEXT_USE | SWITCH_SOMETIMES ; Executivem - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 18 ; base reward - dw AI_BASIC + AI_SETUP + AI_TYPES + AI_SMART + AI_OPPORTUNIST + AI_CAUTIOUS + AI_STATUS + AI_RISKY - dw CONTEXT_USE + SWITCH_SOMETIMES + dw AI_BASIC | AI_SETUP | AI_TYPES | AI_SMART | AI_OPPORTUNIST | AI_CAUTIOUS | AI_STATUS | AI_RISKY + dw CONTEXT_USE | SWITCH_SOMETIMES ; Psychic T - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 8 ; base reward - dw AI_BASIC + AI_TYPES + AI_OPPORTUNIST + AI_CAUTIOUS + AI_STATUS - dw CONTEXT_USE + SWITCH_SOMETIMES + dw AI_BASIC | AI_TYPES | AI_OPPORTUNIST | AI_CAUTIOUS | AI_STATUS + dw CONTEXT_USE | SWITCH_SOMETIMES ; Picnicker - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 5 ; base reward - dw AI_BASIC + AI_CAUTIOUS + AI_STATUS - dw CONTEXT_USE + SWITCH_SOMETIMES + dw AI_BASIC | AI_CAUTIOUS | AI_STATUS + dw CONTEXT_USE | SWITCH_SOMETIMES ; Camper - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 5 ; base reward - dw AI_BASIC + AI_CAUTIOUS + AI_STATUS - dw CONTEXT_USE + SWITCH_SOMETIMES + dw AI_BASIC | AI_CAUTIOUS | AI_STATUS + dw CONTEXT_USE | SWITCH_SOMETIMES ; Executivef - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 18 ; base reward - dw AI_BASIC + AI_SETUP + AI_TYPES + AI_SMART + AI_OPPORTUNIST + AI_CAUTIOUS + AI_STATUS + AI_RISKY - dw CONTEXT_USE + SWITCH_SOMETIMES + dw AI_BASIC | AI_SETUP | AI_TYPES | AI_SMART | AI_OPPORTUNIST | AI_CAUTIOUS | AI_STATUS | AI_RISKY + dw CONTEXT_USE | SWITCH_SOMETIMES ; Sage - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 8 ; base reward - dw AI_BASIC + AI_SETUP + AI_TYPES + AI_CAUTIOUS + AI_STATUS + AI_RISKY - dw CONTEXT_USE + SWITCH_SOMETIMES + dw AI_BASIC | AI_SETUP | AI_TYPES | AI_CAUTIOUS | AI_STATUS | AI_RISKY + dw CONTEXT_USE | SWITCH_SOMETIMES ; Medium - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 10 ; base reward - dw AI_BASIC + AI_SETUP + AI_TYPES + AI_CAUTIOUS + AI_STATUS + AI_RISKY - dw CONTEXT_USE + SWITCH_SOMETIMES + dw AI_BASIC | AI_SETUP | AI_TYPES | AI_CAUTIOUS | AI_STATUS | AI_RISKY + dw CONTEXT_USE | SWITCH_SOMETIMES ; Boarder - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 18 ; base reward - dw AI_BASIC + AI_TYPES + AI_OPPORTUNIST + AI_STATUS - dw CONTEXT_USE + SWITCH_SOMETIMES + dw AI_BASIC | AI_TYPES | AI_OPPORTUNIST | AI_STATUS + dw CONTEXT_USE | SWITCH_SOMETIMES ; Pokefanm - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 20 ; base reward - dw AI_BASIC + AI_TYPES + AI_SMART + AI_STATUS - dw CONTEXT_USE + SWITCH_SOMETIMES + dw AI_BASIC | AI_TYPES | AI_SMART | AI_STATUS + dw CONTEXT_USE | SWITCH_SOMETIMES ; Kimono Girl - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 18 ; base reward - dw AI_BASIC + AI_TYPES + AI_OPPORTUNIST + AI_CAUTIOUS + AI_STATUS - dw CONTEXT_USE + SWITCH_SOMETIMES + dw AI_BASIC | AI_TYPES | AI_OPPORTUNIST | AI_CAUTIOUS | AI_STATUS + dw CONTEXT_USE | SWITCH_SOMETIMES ; Twins - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 5 ; base reward dw NO_AI - dw CONTEXT_USE + SWITCH_OFTEN + dw CONTEXT_USE | SWITCH_OFTEN ; Pokefanf - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 20 ; base reward - dw AI_BASIC + AI_TYPES + AI_SMART + AI_STATUS - dw CONTEXT_USE + SWITCH_SOMETIMES + dw AI_BASIC | AI_TYPES | AI_SMART | AI_STATUS + dw CONTEXT_USE | SWITCH_SOMETIMES ; Red db FULL_RESTORE, FULL_RESTORE ; items db 25 ; base reward - dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY - dw CONTEXT_USE + SWITCH_SOMETIMES + dw AI_BASIC | AI_SETUP | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS | AI_RISKY + dw CONTEXT_USE | SWITCH_SOMETIMES ; Blue db FULL_RESTORE, FULL_RESTORE ; items db 25 ; base reward - dw AI_BASIC + AI_SETUP + AI_SMART + AI_AGGRESSIVE + AI_CAUTIOUS + AI_STATUS + AI_RISKY - dw CONTEXT_USE + SWITCH_SOMETIMES + dw AI_BASIC | AI_SETUP | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS | AI_RISKY + dw CONTEXT_USE | SWITCH_SOMETIMES ; Officer - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 10 ; base reward - dw AI_BASIC + AI_TYPES + AI_OPPORTUNIST + AI_STATUS - dw CONTEXT_USE + SWITCH_SOMETIMES + dw AI_BASIC | AI_TYPES | AI_OPPORTUNIST | AI_STATUS + dw CONTEXT_USE | SWITCH_SOMETIMES ; Gruntf - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items db 10 ; base reward - dw AI_BASIC + AI_TYPES + AI_OPPORTUNIST + AI_CAUTIOUS + AI_STATUS + AI_RISKY - dw CONTEXT_USE + SWITCH_SOMETIMES + dw AI_BASIC | AI_TYPES | AI_OPPORTUNIST | AI_CAUTIOUS | AI_STATUS | AI_RISKY + dw CONTEXT_USE | SWITCH_SOMETIMES ; Mysticalman - db 0, 0 ; items + db NO_ITEM, NO_ITEM ; items 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 + dw AI_BASIC | AI_SETUP | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS | AI_RISKY + dw CONTEXT_USE | SWITCH_SOMETIMES diff --git a/data/trainers/class_names.asm b/data/trainers/class_names.asm index 48d81f910..66c953492 100755..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 758e3f0a4..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 @@ -26,9 +26,9 @@ MaleTrainers: ; 4e95d db SAGE db BIKER db SCIENTIST -MaleTrainersEnd +.End -FemaleTrainers: ; 4e976 +FemaleTrainers: db MEDIUM db LASS db BEAUTY @@ -39,4 +39,4 @@ FemaleTrainers: ; 4e976 db KIMONO_GIRL db POKEFANF db COOLTRAINERF -FemaleTrainersEnd +.End 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 1bf5cb859..35de91e85 100644 --- a/data/trainers/parties.asm +++ b/data/trainers/parties.asm @@ -1,8829 +1,3497 @@ -Trainers: - -; All trainers follow a basic structure: - ; Name - ; String in format "TEXT@" - ; Type - ; TRAINERTYPE_NORMAL: level, species - ; TRAINERTYPE_MOVES: level, species, moves - ; TRAINERTYPE_ITEM: level, species, item - ; TRAINERTYPE_ITEM_MOVES: level, species, item, moves - ; Party - ; Up to six monsters following the data type - ; $ff +INCLUDE "data/trainers/party_pointers.asm" +Trainers: +; Trainer data structure: +; - db "NAME@", TRAINERTYPE_* constant +; - 1 to 6 Pokémon: +; * for TRAINERTYPE_NORMAL: db level, species +; * for TRAINERTYPE_ITEM: db level, species, item +; * for TRAINERTYPE_MOVES: db level, species, 4 moves +; * for TRAINERTYPE_ITEM_MOVES: db level, species, item, 4 moves +; - db -1 ; end FalknerGroup: -; ================================ -; ================ - ; FALKNER (1) - db "FALKNER@" - db TRAINERTYPE_MOVES - - ; party - - db 7, PIDGEY - db TACKLE - db MUD_SLAP - db 0 - db 0 - - db 9, PIDGEOTTO - db TACKLE - db MUD_SLAP - db GUST - db 0 - + db "FALKNER@", TRAINERTYPE_MOVES + db 7, PIDGEY, TACKLE, MUD_SLAP, NO_MOVE, NO_MOVE + db 9, PIDGEOTTO, TACKLE, MUD_SLAP, GUST, NO_MOVE db -1 ; end -; ================ -; ================================ - - WhitneyGroup: -; ================================ -; ================ - ; WHITNEY (1) - db "WHITNEY@" - db TRAINERTYPE_MOVES - - ; party - - db 18, CLEFAIRY - db DOUBLESLAP - db MIMIC - db ENCORE - db METRONOME - - db 20, MILTANK - db ROLLOUT - db ATTRACT - db STOMP - db MILK_DRINK - + db "WHITNEY@", TRAINERTYPE_MOVES + db 18, CLEFAIRY, DOUBLESLAP, MIMIC, ENCORE, METRONOME + db 20, MILTANK, ROLLOUT, ATTRACT, STOMP, MILK_DRINK db -1 ; end -; ================ -; ================================ - - BugsyGroup: -; ================================ -; ================ - ; BUGSY (1) - db "BUGSY@" - db TRAINERTYPE_MOVES - - ; party - - db 14, METAPOD - db TACKLE - db STRING_SHOT - db HARDEN - db 0 - - db 14, KAKUNA - db POISON_STING - db STRING_SHOT - db HARDEN - db 0 - - db 16, SCYTHER - db QUICK_ATTACK - db LEER - db FURY_CUTTER - db 0 - + db "BUGSY@", TRAINERTYPE_MOVES + db 14, METAPOD, TACKLE, STRING_SHOT, HARDEN, NO_MOVE + db 14, KAKUNA, POISON_STING, STRING_SHOT, HARDEN, NO_MOVE + db 16, SCYTHER, QUICK_ATTACK, LEER, FURY_CUTTER, NO_MOVE db -1 ; end -; ================ -; ================================ - - MortyGroup: -; ================================ -; ================ - ; MORTY (1) - db "MORTY@" - db TRAINERTYPE_MOVES - - ; party - - db 21, GASTLY - db LICK - db SPITE - db MEAN_LOOK - db CURSE - - db 21, HAUNTER - db HYPNOSIS - db MIMIC - db CURSE - db NIGHT_SHADE - - db 25, GENGAR - db HYPNOSIS - db SHADOW_BALL - db MEAN_LOOK - db DREAM_EATER - - db 23, HAUNTER - db SPITE - db MEAN_LOOK - db MIMIC - db NIGHT_SHADE - + db "MORTY@", TRAINERTYPE_MOVES + db 21, GASTLY, LICK, SPITE, MEAN_LOOK, CURSE + db 21, HAUNTER, HYPNOSIS, MIMIC, CURSE, NIGHT_SHADE + db 25, GENGAR, HYPNOSIS, SHADOW_BALL, MEAN_LOOK, DREAM_EATER + db 23, HAUNTER, SPITE, MEAN_LOOK, MIMIC, NIGHT_SHADE db -1 ; end -; ================ -; ================================ - - PryceGroup: -; ================================ -; ================ - ; PRYCE (1) - db "PRYCE@" - db TRAINERTYPE_MOVES - - ; party - - db 27, SEEL - db HEADBUTT - db ICY_WIND - db AURORA_BEAM - db REST - - db 29, DEWGONG - db HEADBUTT - db ICY_WIND - db AURORA_BEAM - db REST - - db 31, PILOSWINE - db ICY_WIND - db FURY_ATTACK - db MIST - db BLIZZARD - + db "PRYCE@", TRAINERTYPE_MOVES + db 27, SEEL, HEADBUTT, ICY_WIND, AURORA_BEAM, REST + db 29, DEWGONG, HEADBUTT, ICY_WIND, AURORA_BEAM, REST + db 31, PILOSWINE, ICY_WIND, FURY_ATTACK, MIST, BLIZZARD db -1 ; end -; ================ -; ================================ - - JasmineGroup: -; ================================ -; ================ - ; JASMINE (1) - db "JASMINE@" - db TRAINERTYPE_MOVES - - ; party - - db 30, MAGNEMITE - db THUNDERBOLT - db SUPERSONIC - db SONICBOOM - db THUNDER_WAVE - - db 30, MAGNEMITE - db THUNDERBOLT - db SUPERSONIC - db SONICBOOM - db THUNDER_WAVE - - db 35, STEELIX - db SCREECH - db SUNNY_DAY - db ROCK_THROW - db IRON_TAIL - + db "JASMINE@", TRAINERTYPE_MOVES + db 30, MAGNEMITE, THUNDERBOLT, SUPERSONIC, SONICBOOM, THUNDER_WAVE + db 30, MAGNEMITE, THUNDERBOLT, SUPERSONIC, SONICBOOM, THUNDER_WAVE + db 35, STEELIX, SCREECH, SUNNY_DAY, ROCK_THROW, IRON_TAIL db -1 ; end -; ================ -; ================================ - - ChuckGroup: -; ================================ -; ================ - ; CHUCK (1) - db "CHUCK@" - db TRAINERTYPE_MOVES - - ; party - - db 27, PRIMEAPE - db LEER - db RAGE - db KARATE_CHOP - db FURY_SWIPES - - db 30, POLIWRATH - db HYPNOSIS - db MIND_READER - db SURF - db DYNAMICPUNCH - + db "CHUCK@", TRAINERTYPE_MOVES + db 27, PRIMEAPE, LEER, RAGE, KARATE_CHOP, FURY_SWIPES + db 30, POLIWRATH, HYPNOSIS, MIND_READER, SURF, DYNAMICPUNCH db -1 ; end -; ================ -; ================================ - - ClairGroup: -; ================================ -; ================ - ; CLAIR (1) - db "CLAIR@" - db TRAINERTYPE_MOVES - - ; party - - db 37, DRAGONAIR - db THUNDER_WAVE - db SURF - db SLAM - db DRAGONBREATH - - db 37, DRAGONAIR - db THUNDER_WAVE - db THUNDERBOLT - db SLAM - db DRAGONBREATH - - db 37, DRAGONAIR - db THUNDER_WAVE - db ICE_BEAM - db SLAM - db DRAGONBREATH - - db 40, KINGDRA - db SMOKESCREEN - db SURF - db HYPER_BEAM - db DRAGONBREATH - + db "CLAIR@", TRAINERTYPE_MOVES + db 37, DRAGONAIR, THUNDER_WAVE, SURF, SLAM, DRAGONBREATH + db 37, DRAGONAIR, THUNDER_WAVE, THUNDERBOLT, SLAM, DRAGONBREATH + db 37, DRAGONAIR, THUNDER_WAVE, ICE_BEAM, SLAM, DRAGONBREATH + db 40, KINGDRA, SMOKESCREEN, SURF, HYPER_BEAM, DRAGONBREATH db -1 ; end -; ================ -; ================================ - - Rival1Group: -; ================================ -; ================ - ; RIVAL1 (1) - db "?@" - db TRAINERTYPE_NORMAL - - ; party - db 5, CHIKORITA - + db "?@", TRAINERTYPE_NORMAL + db 5, CHIKORITA db -1 ; end -; ================ - ; RIVAL1 (2) - db "?@" - db TRAINERTYPE_NORMAL - - ; party - db 5, CYNDAQUIL - + db "?@", TRAINERTYPE_NORMAL + db 5, CYNDAQUIL db -1 ; end -; ================ - ; RIVAL1 (3) - db "?@" - db TRAINERTYPE_NORMAL - - ; party - db 5, TOTODILE - + db "?@", TRAINERTYPE_NORMAL + db 5, TOTODILE db -1 ; end -; ================ - ; RIVAL1 (4) - db "?@" - db TRAINERTYPE_NORMAL - - ; party + db "?@", TRAINERTYPE_NORMAL db 12, GASTLY db 14, ZUBAT db 16, BAYLEEF - db -1 ; end -; ================ - ; RIVAL1 (5) - db "?@" - db TRAINERTYPE_NORMAL - - ; party + db "?@", TRAINERTYPE_NORMAL db 12, GASTLY db 14, ZUBAT db 16, QUILAVA - db -1 ; end -; ================ - ; RIVAL1 (6) - db "?@" - db TRAINERTYPE_NORMAL - - ; party + db "?@", TRAINERTYPE_NORMAL db 12, GASTLY db 14, ZUBAT db 16, CROCONAW - db -1 ; end -; ================ - ; RIVAL1 (7) - db "?@" - db TRAINERTYPE_MOVES - - ; party - - db 20, HAUNTER - db LICK - db SPITE - db MEAN_LOOK - db CURSE - - db 18, MAGNEMITE - db TACKLE - db THUNDERSHOCK - db SUPERSONIC - db SONICBOOM - - db 20, ZUBAT - db LEECH_LIFE - db SUPERSONIC - db BITE - db CONFUSE_RAY - - db 22, BAYLEEF - db GROWL - db REFLECT - db RAZOR_LEAF - db POISONPOWDER - + db "?@", TRAINERTYPE_MOVES + db 20, HAUNTER, LICK, SPITE, MEAN_LOOK, CURSE + db 18, MAGNEMITE, TACKLE, THUNDERSHOCK, SUPERSONIC, SONICBOOM + db 20, ZUBAT, LEECH_LIFE, SUPERSONIC, BITE, CONFUSE_RAY + db 22, BAYLEEF, GROWL, REFLECT, RAZOR_LEAF, POISONPOWDER db -1 ; end -; ================ - ; RIVAL1 (8) - db "?@" - db TRAINERTYPE_MOVES - - ; party - - db 20, HAUNTER - db LICK - db SPITE - db MEAN_LOOK - db CURSE - - db 18, MAGNEMITE - db TACKLE - db THUNDERSHOCK - db SUPERSONIC - db SONICBOOM - - db 20, ZUBAT - db LEECH_LIFE - db SUPERSONIC - db BITE - db CONFUSE_RAY - - db 22, QUILAVA - db LEER - db SMOKESCREEN - db EMBER - db QUICK_ATTACK - + db "?@", TRAINERTYPE_MOVES + db 20, HAUNTER, LICK, SPITE, MEAN_LOOK, CURSE + db 18, MAGNEMITE, TACKLE, THUNDERSHOCK, SUPERSONIC, SONICBOOM + db 20, ZUBAT, LEECH_LIFE, SUPERSONIC, BITE, CONFUSE_RAY + db 22, QUILAVA, LEER, SMOKESCREEN, EMBER, QUICK_ATTACK db -1 ; end -; ================ - ; RIVAL1 (9) - db "?@" - db TRAINERTYPE_MOVES - - ; party - - db 20, HAUNTER - db LICK - db SPITE - db MEAN_LOOK - db CURSE - - db 18, MAGNEMITE - db TACKLE - db THUNDERSHOCK - db SUPERSONIC - db SONICBOOM - - db 20, ZUBAT - db LEECH_LIFE - db SUPERSONIC - db BITE - db CONFUSE_RAY - - db 22, CROCONAW - db LEER - db RAGE - db WATER_GUN - db BITE - + db "?@", TRAINERTYPE_MOVES + db 20, HAUNTER, LICK, SPITE, MEAN_LOOK, CURSE + db 18, MAGNEMITE, TACKLE, THUNDERSHOCK, SUPERSONIC, SONICBOOM + db 20, ZUBAT, LEECH_LIFE, SUPERSONIC, BITE, CONFUSE_RAY + db 22, CROCONAW, LEER, RAGE, WATER_GUN, BITE db -1 ; end -; ================ - ; RIVAL1 (10) - db "?@" - db TRAINERTYPE_MOVES - - ; party - - db 30, GOLBAT - db LEECH_LIFE - db BITE - db CONFUSE_RAY - db WING_ATTACK - - db 28, MAGNEMITE - db TACKLE - db THUNDERSHOCK - db SONICBOOM - db THUNDER_WAVE - - db 30, HAUNTER - db LICK - db MEAN_LOOK - db CURSE - db SHADOW_BALL - - db 32, SNEASEL - db LEER - db QUICK_ATTACK - db SCREECH - db FAINT_ATTACK - - db 32, MEGANIUM - db REFLECT - db RAZOR_LEAF - db POISONPOWDER - db BODY_SLAM - + db "?@", TRAINERTYPE_MOVES + db 30, GOLBAT, LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK + db 28, MAGNEMITE, TACKLE, THUNDERSHOCK, SONICBOOM, THUNDER_WAVE + db 30, HAUNTER, LICK, MEAN_LOOK, CURSE, SHADOW_BALL + db 32, SNEASEL, LEER, QUICK_ATTACK, SCREECH, FAINT_ATTACK + db 32, MEGANIUM, REFLECT, RAZOR_LEAF, POISONPOWDER, BODY_SLAM db -1 ; end -; ================ - ; RIVAL1 (11) - db "?@" - db TRAINERTYPE_MOVES - - ; party - - db 30, GOLBAT - db LEECH_LIFE - db BITE - db CONFUSE_RAY - db WING_ATTACK - - db 28, MAGNEMITE - db TACKLE - db THUNDERSHOCK - db SONICBOOM - db THUNDER_WAVE - - db 30, HAUNTER - db LICK - db MEAN_LOOK - db CURSE - db SHADOW_BALL - - db 32, SNEASEL - db LEER - db QUICK_ATTACK - db SCREECH - db FAINT_ATTACK - - db 32, QUILAVA - db SMOKESCREEN - db EMBER - db QUICK_ATTACK - db FLAME_WHEEL - + db "?@", TRAINERTYPE_MOVES + db 30, GOLBAT, LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK + db 28, MAGNEMITE, TACKLE, THUNDERSHOCK, SONICBOOM, THUNDER_WAVE + db 30, HAUNTER, LICK, MEAN_LOOK, CURSE, SHADOW_BALL + db 32, SNEASEL, LEER, QUICK_ATTACK, SCREECH, FAINT_ATTACK + db 32, QUILAVA, SMOKESCREEN, EMBER, QUICK_ATTACK, FLAME_WHEEL db -1 ; end -; ================ - ; RIVAL1 (12) - db "?@" - db TRAINERTYPE_MOVES - - ; party - - db 30, GOLBAT - db LEECH_LIFE - db BITE - db CONFUSE_RAY - db WING_ATTACK - - db 28, MAGNEMITE - db TACKLE - db THUNDERSHOCK - db SONICBOOM - db THUNDER_WAVE - - db 30, HAUNTER - db LICK - db MEAN_LOOK - db CURSE - db SHADOW_BALL - - db 32, SNEASEL - db LEER - db QUICK_ATTACK - db SCREECH - db FAINT_ATTACK - - db 32, FERALIGATR - db RAGE - db WATER_GUN - db BITE - db SCARY_FACE - + db "?@", TRAINERTYPE_MOVES + db 30, GOLBAT, LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK + db 28, MAGNEMITE, TACKLE, THUNDERSHOCK, SONICBOOM, THUNDER_WAVE + db 30, HAUNTER, LICK, MEAN_LOOK, CURSE, SHADOW_BALL + db 32, SNEASEL, LEER, QUICK_ATTACK, SCREECH, FAINT_ATTACK + db 32, FERALIGATR, RAGE, WATER_GUN, BITE, SCARY_FACE db -1 ; end -; ================ - ; RIVAL1 (13) - db "?@" - db TRAINERTYPE_MOVES - - ; party - - db 34, SNEASEL - db QUICK_ATTACK - db SCREECH - db FAINT_ATTACK - db FURY_CUTTER - - db 36, GOLBAT - db LEECH_LIFE - db BITE - db CONFUSE_RAY - db WING_ATTACK - - db 35, MAGNETON - db THUNDERSHOCK - db SONICBOOM - db THUNDER_WAVE - db SWIFT - - db 35, HAUNTER - db MEAN_LOOK - db CURSE - db SHADOW_BALL - db CONFUSE_RAY - - db 35, KADABRA - db DISABLE - db PSYBEAM - db RECOVER - db FUTURE_SIGHT - - db 38, MEGANIUM - db REFLECT - db RAZOR_LEAF - db POISONPOWDER - db BODY_SLAM - + db "?@", TRAINERTYPE_MOVES + db 34, SNEASEL, QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER + db 36, GOLBAT, LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK + db 35, MAGNETON, THUNDERSHOCK, SONICBOOM, THUNDER_WAVE, SWIFT + db 35, HAUNTER, MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY + db 35, KADABRA, DISABLE, PSYBEAM, RECOVER, FUTURE_SIGHT + db 38, MEGANIUM, REFLECT, RAZOR_LEAF, POISONPOWDER, BODY_SLAM db -1 ; end -; ================ - ; RIVAL1 (14) - db "?@" - db TRAINERTYPE_MOVES - - ; party - - db 34, SNEASEL - db QUICK_ATTACK - db SCREECH - db FAINT_ATTACK - db FURY_CUTTER - - db 36, GOLBAT - db LEECH_LIFE - db BITE - db CONFUSE_RAY - db WING_ATTACK - - db 35, MAGNETON - db THUNDERSHOCK - db SONICBOOM - db THUNDER_WAVE - db SWIFT - - db 35, HAUNTER - db MEAN_LOOK - db CURSE - db SHADOW_BALL - db CONFUSE_RAY - - db 35, KADABRA - db DISABLE - db PSYBEAM - db RECOVER - db FUTURE_SIGHT - - db 38, TYPHLOSION - db SMOKESCREEN - db EMBER - db QUICK_ATTACK - db FLAME_WHEEL - + db "?@", TRAINERTYPE_MOVES + db 34, SNEASEL, QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER + db 36, GOLBAT, LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK + db 35, MAGNETON, THUNDERSHOCK, SONICBOOM, THUNDER_WAVE, SWIFT + db 35, HAUNTER, MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY + db 35, KADABRA, DISABLE, PSYBEAM, RECOVER, FUTURE_SIGHT + db 38, TYPHLOSION, SMOKESCREEN, EMBER, QUICK_ATTACK, FLAME_WHEEL db -1 ; end -; ================ - ; RIVAL1 (15) - db "?@" - db TRAINERTYPE_MOVES - - ; party - - db 34, SNEASEL - db QUICK_ATTACK - db SCREECH - db FAINT_ATTACK - db FURY_CUTTER - - db 36, GOLBAT - db LEECH_LIFE - db BITE - db CONFUSE_RAY - db WING_ATTACK - - db 34, MAGNETON - db THUNDERSHOCK - db SONICBOOM - db THUNDER_WAVE - db SWIFT - - db 35, HAUNTER - db MEAN_LOOK - db CURSE - db SHADOW_BALL - db CONFUSE_RAY - - db 35, KADABRA - db DISABLE - db PSYBEAM - db RECOVER - db FUTURE_SIGHT - - db 38, FERALIGATR - db RAGE - db WATER_GUN - db SCARY_FACE - db SLASH - + db "?@", TRAINERTYPE_MOVES + db 34, SNEASEL, QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER + db 36, GOLBAT, LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK + db 34, MAGNETON, THUNDERSHOCK, SONICBOOM, THUNDER_WAVE, SWIFT + db 35, HAUNTER, MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY + db 35, KADABRA, DISABLE, PSYBEAM, RECOVER, FUTURE_SIGHT + db 38, FERALIGATR, RAGE, WATER_GUN, SCARY_FACE, SLASH db -1 ; end -; ================ -; ================================ - - PokemonProfGroup: -; ================================ -; ================ -; ================================ - WillGroup: -; ================================ -; ================ - ; WILL (1) - db "WILL@" - db TRAINERTYPE_MOVES - - ; party - - db 40, XATU - db QUICK_ATTACK - db FUTURE_SIGHT - db CONFUSE_RAY - db PSYCHIC_M - - db 41, JYNX - db DOUBLESLAP - db LOVELY_KISS - db ICE_PUNCH - db PSYCHIC_M - - db 41, EXEGGUTOR - db REFLECT - db LEECH_SEED - db EGG_BOMB - db PSYCHIC_M - - db 41, SLOWBRO - db CURSE - db AMNESIA - db BODY_SLAM - db PSYCHIC_M - - db 42, XATU - db QUICK_ATTACK - db FUTURE_SIGHT - db CONFUSE_RAY - db PSYCHIC_M - + db "WILL@", TRAINERTYPE_MOVES + db 40, XATU, QUICK_ATTACK, FUTURE_SIGHT, CONFUSE_RAY, PSYCHIC_M + db 41, JYNX, DOUBLESLAP, LOVELY_KISS, ICE_PUNCH, PSYCHIC_M + db 41, EXEGGUTOR, REFLECT, LEECH_SEED, EGG_BOMB, PSYCHIC_M + db 41, SLOWBRO, CURSE, AMNESIA, BODY_SLAM, PSYCHIC_M + db 42, XATU, QUICK_ATTACK, FUTURE_SIGHT, CONFUSE_RAY, PSYCHIC_M db -1 ; end -; ================ -; ================================ - - PKMNTrainerGroup: -; ================================ -; ================ - ; CAL (1) - db "CAL@" - db TRAINERTYPE_NORMAL - - ; party + db "CAL@", TRAINERTYPE_NORMAL db 10, CHIKORITA db 10, CYNDAQUIL db 10, TOTODILE - db -1 ; end -; ================ - ; CAL (2) - db "CAL@" - db TRAINERTYPE_NORMAL - - ; party + db "CAL@", TRAINERTYPE_NORMAL db 30, BAYLEEF db 30, QUILAVA db 30, CROCONAW - db -1 ; end -; ================ - ; CAL (3) - db "CAL@" - db TRAINERTYPE_NORMAL - - ; party + db "CAL@", TRAINERTYPE_NORMAL db 50, MEGANIUM db 50, TYPHLOSION db 50, FERALIGATR - db -1 ; end -; ================ -; ================================ - - BrunoGroup: -; ================================ -; ================ - ; BRUNO (1) - db "BRUNO@" - db TRAINERTYPE_MOVES - - ; party - - db 42, HITMONTOP - db PURSUIT - db QUICK_ATTACK - db DIG - db DETECT - - db 42, HITMONLEE - db SWAGGER - db DOUBLE_KICK - db HI_JUMP_KICK - db FORESIGHT - - db 42, HITMONCHAN - db THUNDERPUNCH - db ICE_PUNCH - db FIRE_PUNCH - db MACH_PUNCH - - db 43, ONIX - db BIND - db EARTHQUAKE - db SANDSTORM - db ROCK_SLIDE - - db 46, MACHAMP - db ROCK_SLIDE - db FORESIGHT - db VITAL_THROW - db CROSS_CHOP - + db "BRUNO@", TRAINERTYPE_MOVES + db 42, HITMONTOP, PURSUIT, QUICK_ATTACK, DIG, DETECT + db 42, HITMONLEE, SWAGGER, DOUBLE_KICK, HI_JUMP_KICK, FORESIGHT + db 42, HITMONCHAN, THUNDERPUNCH, ICE_PUNCH, FIRE_PUNCH, MACH_PUNCH + db 43, ONIX, BIND, EARTHQUAKE, SANDSTORM, ROCK_SLIDE + db 46, MACHAMP, ROCK_SLIDE, FORESIGHT, VITAL_THROW, CROSS_CHOP db -1 ; end -; ================ -; ================================ - - KarenGroup: -; ================================ -; ================ - ; KAREN (1) - db "KAREN@" - db TRAINERTYPE_MOVES - - ; party - - db 42, UMBREON - db SAND_ATTACK - db CONFUSE_RAY - db FAINT_ATTACK - db MEAN_LOOK - - db 42, VILEPLUME - db STUN_SPORE - db ACID - db MOONLIGHT - db PETAL_DANCE - - db 45, GENGAR - db LICK - db SPITE - db CURSE - db DESTINY_BOND - - db 44, MURKROW - db QUICK_ATTACK - db WHIRLWIND - db PURSUIT - db FAINT_ATTACK - - db 47, HOUNDOOM - db ROAR - db PURSUIT - db FLAMETHROWER - db CRUNCH - + db "KAREN@", TRAINERTYPE_MOVES + db 42, UMBREON, SAND_ATTACK, CONFUSE_RAY, FAINT_ATTACK, MEAN_LOOK + db 42, VILEPLUME, STUN_SPORE, ACID, MOONLIGHT, PETAL_DANCE + db 45, GENGAR, LICK, SPITE, CURSE, DESTINY_BOND + db 44, MURKROW, QUICK_ATTACK, WHIRLWIND, PURSUIT, FAINT_ATTACK + db 47, HOUNDOOM, ROAR, PURSUIT, FLAMETHROWER, CRUNCH db -1 ; end -; ================ -; ================================ - - KogaGroup: -; ================================ -; ================ - ; KOGA (1) - db "KOGA@" - db TRAINERTYPE_MOVES - - ; party - - db 40, ARIADOS - db DOUBLE_TEAM - db SPIDER_WEB - db BATON_PASS - db GIGA_DRAIN - - db 41, VENOMOTH - db SUPERSONIC - db GUST - db PSYCHIC_M - db TOXIC - - db 43, FORRETRESS - db PROTECT - db SWIFT - db EXPLOSION - db SPIKES - - db 42, MUK - db MINIMIZE - db ACID_ARMOR - db SLUDGE_BOMB - db TOXIC - - db 44, CROBAT - db DOUBLE_TEAM - db QUICK_ATTACK - db WING_ATTACK - db TOXIC - + db "KOGA@", TRAINERTYPE_MOVES + db 40, ARIADOS, DOUBLE_TEAM, SPIDER_WEB, BATON_PASS, GIGA_DRAIN + db 41, VENOMOTH, SUPERSONIC, GUST, PSYCHIC_M, TOXIC + db 43, FORRETRESS, PROTECT, SWIFT, EXPLOSION, SPIKES + db 42, MUK, MINIMIZE, ACID_ARMOR, SLUDGE_BOMB, TOXIC + db 44, CROBAT, DOUBLE_TEAM, QUICK_ATTACK, WING_ATTACK, TOXIC db -1 ; end -; ================ -; ================================ - - ChampionGroup: -; ================================ -; ================ - ; CHAMPION (1) - db "LANCE@" - db TRAINERTYPE_MOVES - - ; party - - db 44, GYARADOS - db FLAIL - db RAIN_DANCE - db SURF - db HYPER_BEAM - - db 47, DRAGONITE - db THUNDER_WAVE - db TWISTER - db THUNDER - db HYPER_BEAM - - db 47, DRAGONITE - db THUNDER_WAVE - db TWISTER - db BLIZZARD - db HYPER_BEAM - - db 46, AERODACTYL - db WING_ATTACK - db ANCIENTPOWER - db ROCK_SLIDE - db HYPER_BEAM - - db 46, CHARIZARD - db FLAMETHROWER - db WING_ATTACK - db SLASH - db HYPER_BEAM - - db 50, DRAGONITE - db FIRE_BLAST - db SAFEGUARD - db OUTRAGE - db HYPER_BEAM - + db "LANCE@", TRAINERTYPE_MOVES + db 44, GYARADOS, FLAIL, RAIN_DANCE, SURF, HYPER_BEAM + db 47, DRAGONITE, THUNDER_WAVE, TWISTER, THUNDER, HYPER_BEAM + db 47, DRAGONITE, THUNDER_WAVE, TWISTER, BLIZZARD, HYPER_BEAM + db 46, AERODACTYL, WING_ATTACK, ANCIENTPOWER, ROCK_SLIDE, HYPER_BEAM + db 46, CHARIZARD, FLAMETHROWER, WING_ATTACK, SLASH, HYPER_BEAM + db 50, DRAGONITE, FIRE_BLAST, SAFEGUARD, OUTRAGE, HYPER_BEAM db -1 ; end -; ================ -; ================================ - - BrockGroup: -; ================================ -; ================ - ; BROCK (1) - db "BROCK@" - db TRAINERTYPE_MOVES - - ; party - - db 41, GRAVELER - db DEFENSE_CURL - db ROCK_SLIDE - db ROLLOUT - db EARTHQUAKE - - db 41, RHYHORN - db FURY_ATTACK - db SCARY_FACE - db EARTHQUAKE - db HORN_DRILL - - db 42, OMASTAR - db BITE - db SURF - db PROTECT - db SPIKE_CANNON - - db 44, ONIX - db BIND - db ROCK_SLIDE - db BIDE - db SANDSTORM - - db 42, KABUTOPS - db SLASH - db SURF - db ENDURE - db GIGA_DRAIN - + db "BROCK@", TRAINERTYPE_MOVES + db 41, GRAVELER, DEFENSE_CURL, ROCK_SLIDE, ROLLOUT, EARTHQUAKE + db 41, RHYHORN, FURY_ATTACK, SCARY_FACE, EARTHQUAKE, HORN_DRILL + db 42, OMASTAR, BITE, SURF, PROTECT, SPIKE_CANNON + db 44, ONIX, BIND, ROCK_SLIDE, BIDE, SANDSTORM + db 42, KABUTOPS, SLASH, SURF, ENDURE, GIGA_DRAIN db -1 ; end -; ================ -; ================================ - - MistyGroup: -; ================================ -; ================ - ; MISTY (1) - db "MISTY@" - db TRAINERTYPE_MOVES - - ; party - - db 42, GOLDUCK - db SURF - db DISABLE - db PSYCH_UP - db PSYCHIC_M - - db 42, QUAGSIRE - db SURF - db AMNESIA - db EARTHQUAKE - db RAIN_DANCE - - db 44, LAPRAS - db SURF - db PERISH_SONG - db BLIZZARD - db RAIN_DANCE - - db 47, STARMIE - db SURF - db CONFUSE_RAY - db RECOVER - db ICE_BEAM - + db "MISTY@", TRAINERTYPE_MOVES + db 42, GOLDUCK, SURF, DISABLE, PSYCH_UP, PSYCHIC_M + db 42, QUAGSIRE, SURF, AMNESIA, EARTHQUAKE, RAIN_DANCE + db 44, LAPRAS, SURF, PERISH_SONG, BLIZZARD, RAIN_DANCE + db 47, STARMIE, SURF, CONFUSE_RAY, RECOVER, ICE_BEAM db -1 ; end -; ================ -; ================================ - - LtSurgeGroup: -; ================================ -; ================ - ; LT_SURGE (1) - db "LT.SURGE@" - db TRAINERTYPE_MOVES - - ; party - - db 44, RAICHU - db THUNDER_WAVE - db QUICK_ATTACK - db THUNDERBOLT - db THUNDER - - db 40, ELECTRODE - db SCREECH - db DOUBLE_TEAM - db SWIFT - db EXPLOSION - - db 40, MAGNETON - db LOCK_ON - db DOUBLE_TEAM - db SWIFT - db ZAP_CANNON - - db 40, ELECTRODE - db SCREECH - db DOUBLE_TEAM - db SWIFT - db EXPLOSION - - db 46, ELECTABUZZ - db QUICK_ATTACK - db THUNDERPUNCH - db LIGHT_SCREEN - db THUNDER - + db "LT.SURGE@", TRAINERTYPE_MOVES + db 44, RAICHU, THUNDER_WAVE, QUICK_ATTACK, THUNDERBOLT, THUNDER + db 40, ELECTRODE, SCREECH, DOUBLE_TEAM, SWIFT, EXPLOSION + db 40, MAGNETON, LOCK_ON, DOUBLE_TEAM, SWIFT, ZAP_CANNON + db 40, ELECTRODE, SCREECH, DOUBLE_TEAM, SWIFT, EXPLOSION + db 46, ELECTABUZZ, QUICK_ATTACK, THUNDERPUNCH, LIGHT_SCREEN, THUNDER db -1 ; end -; ================ -; ================================ - - ScientistGroup: -; ================================ -; ================ - ; SCIENTIST (1) - db "ROSS@" - db TRAINERTYPE_NORMAL - - ; party + db "ROSS@", TRAINERTYPE_NORMAL db 22, KOFFING db 22, KOFFING - db -1 ; end -; ================ - ; SCIENTIST (2) - db "MITCH@" - db TRAINERTYPE_NORMAL - - ; party + db "MITCH@", TRAINERTYPE_NORMAL db 24, DITTO - db -1 ; end -; ================ - ; SCIENTIST (3) - db "JED@" - db TRAINERTYPE_NORMAL - - ; party + db "JED@", TRAINERTYPE_NORMAL db 20, MAGNEMITE db 20, MAGNEMITE db 20, MAGNEMITE - db -1 ; end -; ================ - ; SCIENTIST (4) - db "MARC@" - db TRAINERTYPE_NORMAL - - ; party + db "MARC@", TRAINERTYPE_NORMAL db 27, MAGNEMITE db 27, MAGNEMITE db 27, MAGNEMITE - db -1 ; end -; ================ - ; SCIENTIST (5) - db "RICH@" - db TRAINERTYPE_MOVES - - ; party - - db 30, PORYGON - db CONVERSION - db CONVERSION2 - db RECOVER - db TRI_ATTACK - + db "RICH@", TRAINERTYPE_MOVES + db 30, PORYGON, CONVERSION, CONVERSION2, RECOVER, TRI_ATTACK db -1 ; end -; ================ -; ================================ - - ErikaGroup: -; ================================ -; ================ - ; ERIKA (1) - db "ERIKA@" - db TRAINERTYPE_MOVES - - ; party - - db 42, TANGELA - db VINE_WHIP - db BIND - db GIGA_DRAIN - db SLEEP_POWDER - - db 41, JUMPLUFF - db MEGA_DRAIN - db LEECH_SEED - db COTTON_SPORE - db GIGA_DRAIN - - db 46, VICTREEBEL - db SUNNY_DAY - db SYNTHESIS - db ACID - db RAZOR_LEAF - - db 46, BELLOSSOM - db SUNNY_DAY - db SYNTHESIS - db PETAL_DANCE - db SOLARBEAM - + db "ERIKA@", TRAINERTYPE_MOVES + db 42, TANGELA, VINE_WHIP, BIND, GIGA_DRAIN, SLEEP_POWDER + db 41, JUMPLUFF, MEGA_DRAIN, LEECH_SEED, COTTON_SPORE, GIGA_DRAIN + db 46, VICTREEBEL, SUNNY_DAY, SYNTHESIS, ACID, RAZOR_LEAF + db 46, BELLOSSOM, SUNNY_DAY, SYNTHESIS, PETAL_DANCE, SOLARBEAM db -1 ; end -; ================ -; ================================ - - YoungsterGroup: -; ================================ -; ================ - ; YOUNGSTER (1) - db "JOEY@" - db TRAINERTYPE_NORMAL - - ; party - db 4, RATTATA - + db "JOEY@", TRAINERTYPE_NORMAL + db 4, RATTATA db -1 ; end -; ================ - ; YOUNGSTER (2) - db "MIKEY@" - db TRAINERTYPE_NORMAL - - ; party - db 2, PIDGEY - db 4, RATTATA - + db "MIKEY@", TRAINERTYPE_NORMAL + db 2, PIDGEY + db 4, RATTATA db -1 ; end -; ================ - ; YOUNGSTER (3) - db "ALBERT@" - db TRAINERTYPE_NORMAL - - ; party - db 6, RATTATA - db 8, ZUBAT - + db "ALBERT@", TRAINERTYPE_NORMAL + db 6, RATTATA + db 8, ZUBAT db -1 ; end -; ================ - ; YOUNGSTER (4) - db "GORDON@" - db TRAINERTYPE_NORMAL - - ; party + db "GORDON@", TRAINERTYPE_NORMAL db 10, WOOPER - db -1 ; end -; ================ - ; YOUNGSTER (5) - db "SAMUEL@" - db TRAINERTYPE_NORMAL - - ; party - db 7, RATTATA + db "SAMUEL@", TRAINERTYPE_NORMAL + db 7, RATTATA db 10, SANDSHREW - db 8, SPEAROW - db 8, SPEAROW - + db 8, SPEAROW + db 8, SPEAROW db -1 ; end -; ================ - ; YOUNGSTER (6) - db "IAN@" - db TRAINERTYPE_NORMAL - - ; party + db "IAN@", TRAINERTYPE_NORMAL db 10, MANKEY db 12, DIGLETT - db -1 ; end -; ================ - ; YOUNGSTER (7) - db "JOEY@" - db TRAINERTYPE_NORMAL - - ; party + db "JOEY@", TRAINERTYPE_NORMAL db 15, RATTATA - db -1 ; end -; ================ - ; YOUNGSTER (8) - db "JOEY@" - db TRAINERTYPE_MOVES - - ; party - - db 21, RATICATE - db TAIL_WHIP - db QUICK_ATTACK - db HYPER_FANG - db SCARY_FACE - + db "JOEY@", TRAINERTYPE_MOVES + db 21, RATICATE, TAIL_WHIP, QUICK_ATTACK, HYPER_FANG, SCARY_FACE db -1 ; end -; ================ - ; YOUNGSTER (9) - db "WARREN@" - db TRAINERTYPE_NORMAL - - ; party + db "WARREN@", TRAINERTYPE_NORMAL db 35, FEAROW - db -1 ; end -; ================ - ; YOUNGSTER (10) - db "JIMMY@" - db TRAINERTYPE_NORMAL - - ; party + db "JIMMY@", TRAINERTYPE_NORMAL db 33, RATICATE db 33, ARBOK - db -1 ; end -; ================ - ; YOUNGSTER (11) - db "OWEN@" - db TRAINERTYPE_NORMAL - - ; party + db "OWEN@", TRAINERTYPE_NORMAL db 35, GROWLITHE - db -1 ; end -; ================ - ; YOUNGSTER (12) - db "JASON@" - db TRAINERTYPE_NORMAL - - ; party + db "JASON@", TRAINERTYPE_NORMAL db 33, SANDSLASH db 33, CROBAT - db -1 ; end -; ================ - ; YOUNGSTER (13) - db "JOEY@" - db TRAINERTYPE_MOVES - - ; party - - db 30, RATICATE - db TAIL_WHIP - db QUICK_ATTACK - db HYPER_FANG - db PURSUIT - + db "JOEY@", TRAINERTYPE_MOVES + db 30, RATICATE, TAIL_WHIP, QUICK_ATTACK, HYPER_FANG, PURSUIT db -1 ; end -; ================ - ; YOUNGSTER (14) - db "JOEY@" - db TRAINERTYPE_MOVES - - ; party - - db 37, RATICATE - db HYPER_BEAM - db QUICK_ATTACK - db HYPER_FANG - db PURSUIT - + db "JOEY@", TRAINERTYPE_MOVES + db 37, RATICATE, HYPER_BEAM, QUICK_ATTACK, HYPER_FANG, PURSUIT db -1 ; end -; ================ -; ================================ - - SchoolboyGroup: -; ================================ -; ================ - ; SCHOOLBOY (1) - db "JACK@" - db TRAINERTYPE_NORMAL - - ; party + db "JACK@", TRAINERTYPE_NORMAL db 12, ODDISH db 15, VOLTORB - db -1 ; end -; ================ - ; SCHOOLBOY (2) - db "KIPP@" - db TRAINERTYPE_NORMAL - - ; party + db "KIPP@", TRAINERTYPE_NORMAL db 27, VOLTORB db 27, MAGNEMITE db 31, VOLTORB db 31, MAGNETON - db -1 ; end -; ================ - ; SCHOOLBOY (3) - db "ALAN@" - db TRAINERTYPE_NORMAL - - ; party + db "ALAN@", TRAINERTYPE_NORMAL db 16, TANGELA - db -1 ; end -; ================ - ; SCHOOLBOY (4) - db "JOHNNY@" - db TRAINERTYPE_NORMAL - - ; party + db "JOHNNY@", TRAINERTYPE_NORMAL db 29, BELLSPROUT db 31, WEEPINBELL db 33, VICTREEBEL - db -1 ; end -; ================ - ; SCHOOLBOY (5) - db "DANNY@" - db TRAINERTYPE_NORMAL - - ; party + db "DANNY@", TRAINERTYPE_NORMAL db 31, JYNX db 31, ELECTABUZZ db 31, MAGMAR - db -1 ; end -; ================ - ; SCHOOLBOY (6) - db "TOMMY@" - db TRAINERTYPE_NORMAL - - ; party + db "TOMMY@", TRAINERTYPE_NORMAL db 32, XATU db 34, ALAKAZAM - db -1 ; end -; ================ - ; SCHOOLBOY (7) - db "DUDLEY@" - db TRAINERTYPE_NORMAL - - ; party + db "DUDLEY@", TRAINERTYPE_NORMAL db 35, ODDISH - db -1 ; end -; ================ - ; SCHOOLBOY (8) - db "JOE@" - db TRAINERTYPE_NORMAL - - ; party + db "JOE@", TRAINERTYPE_NORMAL db 33, TANGELA db 33, VAPOREON - db -1 ; end -; ================ - ; SCHOOLBOY (9) - db "BILLY@" - db TRAINERTYPE_NORMAL - - ; party + db "BILLY@", TRAINERTYPE_NORMAL db 27, PARAS db 27, PARAS db 27, POLIWHIRL db 35, DITTO - db -1 ; end -; ================ - ; SCHOOLBOY (10) - db "CHAD@" - db TRAINERTYPE_NORMAL - - ; party + db "CHAD@", TRAINERTYPE_NORMAL db 19, MR__MIME - db -1 ; end -; ================ - ; SCHOOLBOY (11) - db "NATE@" - db TRAINERTYPE_NORMAL - - ; party + db "NATE@", TRAINERTYPE_NORMAL db 32, LEDIAN db 32, EXEGGUTOR - db -1 ; end -; ================ - ; SCHOOLBOY (12) - db "RICKY@" - db TRAINERTYPE_NORMAL - - ; party + db "RICKY@", TRAINERTYPE_NORMAL db 32, AIPOM db 32, DITTO - db -1 ; end -; ================ - ; SCHOOLBOY (13) - db "JACK@" - db TRAINERTYPE_NORMAL - - ; party + db "JACK@", TRAINERTYPE_NORMAL db 14, ODDISH db 17, VOLTORB - db -1 ; end -; ================ - ; SCHOOLBOY (14) - db "JACK@" - db TRAINERTYPE_NORMAL - - ; party + db "JACK@", TRAINERTYPE_NORMAL db 28, GLOOM db 31, ELECTRODE - db -1 ; end -; ================ - ; SCHOOLBOY (15) - db "ALAN@" - db TRAINERTYPE_NORMAL - - ; party + db "ALAN@", TRAINERTYPE_NORMAL db 17, TANGELA db 17, YANMA - db -1 ; end -; ================ - ; SCHOOLBOY (16) - db "ALAN@" - db TRAINERTYPE_NORMAL - - ; party + db "ALAN@", TRAINERTYPE_NORMAL db 20, NATU db 22, TANGELA db 20, QUAGSIRE db 25, YANMA - db -1 ; end -; ================ - ; SCHOOLBOY (17) - db "CHAD@" - db TRAINERTYPE_NORMAL - - ; party + db "CHAD@", TRAINERTYPE_NORMAL db 19, MR__MIME db 19, MAGNEMITE - db -1 ; end -; ================ - ; SCHOOLBOY (18) - db "CHAD@" - db TRAINERTYPE_NORMAL - - ; party + db "CHAD@", TRAINERTYPE_NORMAL db 27, MR__MIME db 31, MAGNETON - db -1 ; end -; ================ - ; SCHOOLBOY (19) - db "JACK@" - db TRAINERTYPE_NORMAL - - ; party + db "JACK@", TRAINERTYPE_NORMAL db 30, GLOOM db 33, GROWLITHE db 33, ELECTRODE - db -1 ; end -; ================ - ; SCHOOLBOY (20) - db "JACK@" - db TRAINERTYPE_MOVES - - ; party - - db 35, ELECTRODE - db SCREECH - db SONICBOOM - db ROLLOUT - db LIGHT_SCREEN - - db 35, GROWLITHE - db SUNNY_DAY - db LEER - db TAKE_DOWN - db FLAME_WHEEL - - db 37, VILEPLUME - db SOLARBEAM - db SLEEP_POWDER - db ACID - db MOONLIGHT - + db "JACK@", TRAINERTYPE_MOVES + db 35, ELECTRODE, SCREECH, SONICBOOM, ROLLOUT, LIGHT_SCREEN + db 35, GROWLITHE, SUNNY_DAY, LEER, TAKE_DOWN, FLAME_WHEEL + db 37, VILEPLUME, SOLARBEAM, SLEEP_POWDER, ACID, MOONLIGHT db -1 ; end -; ================ - ; SCHOOLBOY (21) - db "ALAN@" - db TRAINERTYPE_NORMAL - - ; party + db "ALAN@", TRAINERTYPE_NORMAL db 27, NATU db 27, TANGELA db 30, QUAGSIRE db 30, YANMA - db -1 ; end -; ================ - ; SCHOOLBOY (22) - db "ALAN@" - db TRAINERTYPE_MOVES - - ; party - - db 35, XATU - db PECK - db NIGHT_SHADE - db SWIFT - db FUTURE_SIGHT - - db 32, TANGELA - db POISONPOWDER - db VINE_WHIP - db BIND - db MEGA_DRAIN - - db 32, YANMA - db QUICK_ATTACK - db DOUBLE_TEAM - db SONICBOOM - db SUPERSONIC - - db 35, QUAGSIRE - db TAIL_WHIP - db SLAM - db AMNESIA - db EARTHQUAKE - + db "ALAN@", TRAINERTYPE_MOVES + db 35, XATU, PECK, NIGHT_SHADE, SWIFT, FUTURE_SIGHT + db 32, TANGELA, POISONPOWDER, VINE_WHIP, BIND, MEGA_DRAIN + db 32, YANMA, QUICK_ATTACK, DOUBLE_TEAM, SONICBOOM, SUPERSONIC + db 35, QUAGSIRE, TAIL_WHIP, SLAM, AMNESIA, EARTHQUAKE db -1 ; end -; ================ - ; SCHOOLBOY (23) - db "CHAD@" - db TRAINERTYPE_NORMAL - - ; party + db "CHAD@", TRAINERTYPE_NORMAL db 30, MR__MIME db 34, MAGNETON - db -1 ; end -; ================ - ; SCHOOLBOY (24) - db "CHAD@" - db TRAINERTYPE_MOVES - - ; party - - db 34, MR__MIME - db PSYCHIC_M - db LIGHT_SCREEN - db REFLECT - db ENCORE - - db 38, MAGNETON - db ZAP_CANNON - db THUNDER_WAVE - db LOCK_ON - db SWIFT - + db "CHAD@", TRAINERTYPE_MOVES + db 34, MR__MIME, PSYCHIC_M, LIGHT_SCREEN, REFLECT, ENCORE + db 38, MAGNETON, ZAP_CANNON, THUNDER_WAVE, LOCK_ON, SWIFT db -1 ; end -; ================ -; ================================ - - BirdKeeperGroup: -; ================================ -; ================ - ; BIRD_KEEPER (1) - db "ROD@" - db TRAINERTYPE_NORMAL - - ; party - db 7, PIDGEY - db 7, PIDGEY - + db "ROD@", TRAINERTYPE_NORMAL + db 7, PIDGEY + db 7, PIDGEY db -1 ; end -; ================ - ; BIRD_KEEPER (2) - db "ABE@" - db TRAINERTYPE_NORMAL - - ; party - db 9, SPEAROW - + db "ABE@", TRAINERTYPE_NORMAL + db 9, SPEAROW db -1 ; end -; ================ - ; BIRD_KEEPER (3) - db "BRYAN@" - db TRAINERTYPE_NORMAL - - ; party + db "BRYAN@", TRAINERTYPE_NORMAL db 12, PIDGEY db 14, PIDGEOTTO - db -1 ; end -; ================ - ; BIRD_KEEPER (4) - db "THEO@" - db TRAINERTYPE_NORMAL - - ; party + db "THEO@", TRAINERTYPE_NORMAL db 17, PIDGEY db 15, PIDGEY db 19, PIDGEY db 15, PIDGEY db 15, PIDGEY - db -1 ; end -; ================ - ; BIRD_KEEPER (5) - db "TOBY@" - db TRAINERTYPE_NORMAL - - ; party + db "TOBY@", TRAINERTYPE_NORMAL db 15, DODUO db 16, DODUO db 17, DODUO - db -1 ; end -; ================ - ; BIRD_KEEPER (6) - db "DENIS@" - db TRAINERTYPE_NORMAL - - ; party + db "DENIS@", TRAINERTYPE_NORMAL db 18, SPEAROW db 20, FEAROW db 18, SPEAROW - db -1 ; end -; ================ - ; BIRD_KEEPER (7) - db "VANCE@" - db TRAINERTYPE_NORMAL - - ; party + db "VANCE@", TRAINERTYPE_NORMAL db 25, PIDGEOTTO db 25, PIDGEOTTO - db -1 ; end -; ================ - ; BIRD_KEEPER (8) - db "HANK@" - db TRAINERTYPE_NORMAL - - ; party + db "HANK@", TRAINERTYPE_NORMAL db 12, PIDGEY db 34, PIDGEOT - db -1 ; end -; ================ - ; BIRD_KEEPER (9) - db "ROY@" - db TRAINERTYPE_NORMAL - - ; party + db "ROY@", TRAINERTYPE_NORMAL db 29, FEAROW db 35, FEAROW - db -1 ; end -; ================ - ; BIRD_KEEPER (10) - db "BORIS@" - db TRAINERTYPE_NORMAL - - ; party + db "BORIS@", TRAINERTYPE_NORMAL db 30, DODUO db 28, DODUO db 32, DODRIO - db -1 ; end -; ================ - ; BIRD_KEEPER (11) - db "BOB@" - db TRAINERTYPE_NORMAL - - ; party + db "BOB@", TRAINERTYPE_NORMAL db 34, NOCTOWL - db -1 ; end -; ================ - ; BIRD_KEEPER (12) - db "JOSE@" - db TRAINERTYPE_NORMAL - - ; party + db "JOSE@", TRAINERTYPE_NORMAL db 36, FARFETCH_D - db -1 ; end -; ================ - ; BIRD_KEEPER (13) - db "PETER@" - db TRAINERTYPE_NORMAL - - ; party - db 6, PIDGEY - db 6, PIDGEY - db 8, SPEAROW - + db "PETER@", TRAINERTYPE_NORMAL + db 6, PIDGEY + db 6, PIDGEY + db 8, SPEAROW db -1 ; end -; ================ - ; BIRD_KEEPER (14) - db "JOSE@" - db TRAINERTYPE_NORMAL - - ; party + db "JOSE@", TRAINERTYPE_NORMAL db 34, FARFETCH_D - db -1 ; end -; ================ - ; BIRD_KEEPER (15) - db "PERRY@" - db TRAINERTYPE_NORMAL - - ; party + db "PERRY@", TRAINERTYPE_NORMAL db 34, FARFETCH_D - db -1 ; end -; ================ - ; BIRD_KEEPER (16) - db "BRET@" - db TRAINERTYPE_NORMAL - - ; party + db "BRET@", TRAINERTYPE_NORMAL db 32, PIDGEOTTO db 32, FEAROW - db -1 ; end -; ================ - ; BIRD_KEEPER (17) - db "JOSE@" - db TRAINERTYPE_MOVES - - ; party - - db 40, FARFETCH_D - db FURY_ATTACK - db DETECT - db FLY - db SLASH - + db "JOSE@", TRAINERTYPE_MOVES + db 40, FARFETCH_D, FURY_ATTACK, DETECT, FLY, SLASH db -1 ; end -; ================ - ; BIRD_KEEPER (18) - db "VANCE@" - db TRAINERTYPE_NORMAL - - ; party + db "VANCE@", TRAINERTYPE_NORMAL db 32, PIDGEOTTO db 32, PIDGEOTTO - db -1 ; end -; ================ - ; BIRD_KEEPER (19) - db "VANCE@" - db TRAINERTYPE_MOVES - - ; party - - db 38, PIDGEOT - db TOXIC - db QUICK_ATTACK - db WHIRLWIND - db FLY - - db 38, PIDGEOT - db SWIFT - db DETECT - db STEEL_WING - db FLY - + db "VANCE@", TRAINERTYPE_MOVES + db 38, PIDGEOT, TOXIC, QUICK_ATTACK, WHIRLWIND, FLY + db 38, PIDGEOT, SWIFT, DETECT, STEEL_WING, FLY db -1 ; end -; ================ -; ================================ - - LassGroup: -; ================================ -; ================ - ; LASS (1) - db "CARRIE@" - db TRAINERTYPE_MOVES - - ; party - - db 18, SNUBBULL - db SCARY_FACE - db CHARM - db BITE - db LICK - + db "CARRIE@", TRAINERTYPE_MOVES + db 18, SNUBBULL, SCARY_FACE, CHARM, BITE, LICK db -1 ; end -; ================ - ; LASS (2) - db "BRIDGET@" - db TRAINERTYPE_NORMAL - - ; party + db "BRIDGET@", TRAINERTYPE_NORMAL db 15, JIGGLYPUFF db 15, JIGGLYPUFF db 15, JIGGLYPUFF - db -1 ; end -; ================ - ; LASS (3) - db "ALICE@" - db TRAINERTYPE_NORMAL - - ; party + db "ALICE@", TRAINERTYPE_NORMAL db 30, GLOOM db 34, ARBOK db 30, GLOOM - db -1 ; end -; ================ - ; LASS (4) - db "KRISE@" - db TRAINERTYPE_NORMAL - - ; party + db "KRISE@", TRAINERTYPE_NORMAL db 12, ODDISH db 15, CUBONE - db -1 ; end -; ================ - ; LASS (5) - db "CONNIE@" - db TRAINERTYPE_NORMAL - - ; party + db "CONNIE@", TRAINERTYPE_NORMAL db 21, MARILL - db -1 ; end -; ================ - ; LASS (6) - db "LINDA@" - db TRAINERTYPE_NORMAL - - ; party + db "LINDA@", TRAINERTYPE_NORMAL db 30, BULBASAUR db 32, IVYSAUR db 34, VENUSAUR - db -1 ; end -; ================ - ; LASS (7) - db "LAURA@" - db TRAINERTYPE_NORMAL - - ; party + db "LAURA@", TRAINERTYPE_NORMAL db 28, GLOOM db 31, PIDGEOTTO db 31, BELLOSSOM - db -1 ; end -; ================ - ; LASS (8) - db "SHANNON@" - db TRAINERTYPE_NORMAL - - ; party + db "SHANNON@", TRAINERTYPE_NORMAL db 29, PARAS db 29, PARAS db 32, PARASECT - db -1 ; end -; ================ - ; LASS (9) - db "MICHELLE@" - db TRAINERTYPE_NORMAL - - ; party + db "MICHELLE@", TRAINERTYPE_NORMAL db 32, SKIPLOOM db 33, HOPPIP db 34, JUMPLUFF - db -1 ; end -; ================ - ; LASS (10) - db "DANA@" - db TRAINERTYPE_MOVES - - ; party - - db 18, FLAAFFY - db TACKLE - db GROWL - db THUNDERSHOCK - db THUNDER_WAVE - - db 18, PSYDUCK - db SCRATCH - db TAIL_WHIP - db DISABLE - db CONFUSION - + db "DANA@", TRAINERTYPE_MOVES + db 18, FLAAFFY, TACKLE, GROWL, THUNDERSHOCK, THUNDER_WAVE + db 18, PSYDUCK, SCRATCH, TAIL_WHIP, DISABLE, CONFUSION db -1 ; end -; ================ - ; LASS (11) - db "ELLEN@" - db TRAINERTYPE_NORMAL - - ; party + db "ELLEN@", TRAINERTYPE_NORMAL db 30, WIGGLYTUFF db 34, GRANBULL - db -1 ; end -; ================ - ; LASS (12) - db "CONNIE@" - db TRAINERTYPE_NORMAL - - ; party + db "CONNIE@", TRAINERTYPE_NORMAL db 21, MARILL - db -1 ; end -; ================ - ; LASS (13) - db "CONNIE@" - db TRAINERTYPE_NORMAL - - ; party + db "CONNIE@", TRAINERTYPE_NORMAL db 21, MARILL - db -1 ; end -; ================ - ; LASS (14) - db "DANA@" - db TRAINERTYPE_MOVES - - ; party - - db 21, FLAAFFY - db TACKLE - db GROWL - db THUNDERSHOCK - db THUNDER_WAVE - - db 21, PSYDUCK - db SCRATCH - db TAIL_WHIP - db DISABLE - db CONFUSION - + db "DANA@", TRAINERTYPE_MOVES + db 21, FLAAFFY, TACKLE, GROWL, THUNDERSHOCK, THUNDER_WAVE + db 21, PSYDUCK, SCRATCH, TAIL_WHIP, DISABLE, CONFUSION db -1 ; end -; ================ - ; LASS (15) - db "DANA@" - db TRAINERTYPE_MOVES - - ; party - - db 29, PSYDUCK - db SCRATCH - db DISABLE - db CONFUSION - db SCREECH - - db 29, AMPHAROS - db TACKLE - db THUNDERSHOCK - db THUNDER_WAVE - db COTTON_SPORE - + db "DANA@", TRAINERTYPE_MOVES + db 29, PSYDUCK, SCRATCH, DISABLE, CONFUSION, SCREECH + db 29, AMPHAROS, TACKLE, THUNDERSHOCK, THUNDER_WAVE, COTTON_SPORE db -1 ; end -; ================ - ; LASS (16) - db "DANA@" - db TRAINERTYPE_MOVES - - ; party - - db 32, PSYDUCK - db SCRATCH - db DISABLE - db CONFUSION - db SCREECH - - db 32, AMPHAROS - db TACKLE - db THUNDERPUNCH - db THUNDER_WAVE - db COTTON_SPORE - + db "DANA@", TRAINERTYPE_MOVES + db 32, PSYDUCK, SCRATCH, DISABLE, CONFUSION, SCREECH + db 32, AMPHAROS, TACKLE, THUNDERPUNCH, THUNDER_WAVE, COTTON_SPORE db -1 ; end -; ================ - ; LASS (17) - db "DANA@" - db TRAINERTYPE_MOVES - - ; party - - db 36, AMPHAROS - db SWIFT - db THUNDERPUNCH - db THUNDER_WAVE - db COTTON_SPORE - - db 36, GOLDUCK - db DISABLE - db SURF - db PSYCHIC_M - db SCREECH - + db "DANA@", TRAINERTYPE_MOVES + db 36, AMPHAROS, SWIFT, THUNDERPUNCH, THUNDER_WAVE, COTTON_SPORE + db 36, GOLDUCK, DISABLE, SURF, PSYCHIC_M, SCREECH db -1 ; end -; ================ -; ================================ - - JanineGroup: -; ================================ -; ================ - ; JANINE (1) - db "JANINE@" - db TRAINERTYPE_MOVES - - ; party - - db 36, CROBAT - db SCREECH - db SUPERSONIC - db CONFUSE_RAY - db WING_ATTACK - - db 36, WEEZING - db SMOG - db SLUDGE_BOMB - db TOXIC - db EXPLOSION - - db 36, WEEZING - db SMOG - db SLUDGE_BOMB - db TOXIC - db EXPLOSION - - db 33, ARIADOS - db SCARY_FACE - db GIGA_DRAIN - db STRING_SHOT - db NIGHT_SHADE - - db 39, VENOMOTH - db FORESIGHT - db DOUBLE_TEAM - db GUST - db PSYCHIC_M - + db "JANINE@", TRAINERTYPE_MOVES + db 36, CROBAT, SCREECH, SUPERSONIC, CONFUSE_RAY, WING_ATTACK + db 36, WEEZING, SMOG, SLUDGE_BOMB, TOXIC, EXPLOSION + db 36, WEEZING, SMOG, SLUDGE_BOMB, TOXIC, EXPLOSION + db 33, ARIADOS, SCARY_FACE, GIGA_DRAIN, STRING_SHOT, NIGHT_SHADE + db 39, VENOMOTH, FORESIGHT, DOUBLE_TEAM, GUST, PSYCHIC_M db -1 ; end -; ================ -; ================================ - - CooltrainerMGroup: -; ================================ -; ================ - ; COOLTRAINERM (1) - db "NICK@" - db TRAINERTYPE_MOVES - - ; party - - db 26, CHARMANDER - db EMBER - db SMOKESCREEN - db RAGE - db SCARY_FACE - - db 26, SQUIRTLE - db WITHDRAW - db WATER_GUN - db BITE - db CURSE - - db 26, BULBASAUR - db LEECH_SEED - db POISONPOWDER - db SLEEP_POWDER - db RAZOR_LEAF - + db "NICK@", TRAINERTYPE_MOVES + db 26, CHARMANDER, EMBER, SMOKESCREEN, RAGE, SCARY_FACE + db 26, SQUIRTLE, WITHDRAW, WATER_GUN, BITE, CURSE + db 26, BULBASAUR, LEECH_SEED, POISONPOWDER, SLEEP_POWDER, RAZOR_LEAF db -1 ; end -; ================ - ; COOLTRAINERM (2) - db "AARON@" - db TRAINERTYPE_NORMAL - - ; party + db "AARON@", TRAINERTYPE_NORMAL db 24, IVYSAUR db 24, CHARMELEON db 24, WARTORTLE - db -1 ; end -; ================ - ; COOLTRAINERM (3) - db "PAUL@" - db TRAINERTYPE_NORMAL - - ; party + db "PAUL@", TRAINERTYPE_NORMAL db 34, DRATINI db 34, DRATINI db 34, DRATINI - db -1 ; end -; ================ - ; COOLTRAINERM (4) - db "CODY@" - db TRAINERTYPE_NORMAL - - ; party + db "CODY@", TRAINERTYPE_NORMAL db 34, HORSEA db 36, SEADRA - db -1 ; end -; ================ - ; COOLTRAINERM (5) - db "MIKE@" - db TRAINERTYPE_NORMAL - - ; party + db "MIKE@", TRAINERTYPE_NORMAL db 37, DRAGONAIR - db -1 ; end -; ================ - ; COOLTRAINERM (6) - db "GAVEN@" - db TRAINERTYPE_MOVES - - ; party - - db 35, VICTREEBEL - db WRAP - db TOXIC - db ACID - db RAZOR_LEAF - - db 35, KINGLER - db BUBBLEBEAM - db STOMP - db GUILLOTINE - db PROTECT - - db 35, FLAREON - db SAND_ATTACK - db QUICK_ATTACK - db BITE - db FIRE_SPIN - + db "GAVEN@", TRAINERTYPE_MOVES + db 35, VICTREEBEL, WRAP, TOXIC, ACID, RAZOR_LEAF + db 35, KINGLER, BUBBLEBEAM, STOMP, GUILLOTINE, PROTECT + db 35, FLAREON, SAND_ATTACK, QUICK_ATTACK, BITE, FIRE_SPIN db -1 ; end -; ================ - ; COOLTRAINERM (7) - db "GAVEN@" - db TRAINERTYPE_ITEM_MOVES - - ; party - - db 39, VICTREEBEL, NO_ITEM - db GIGA_DRAIN - db TOXIC - db SLUDGE_BOMB - db RAZOR_LEAF - - db 39, KINGLER, KINGS_ROCK - db SURF - db STOMP - db GUILLOTINE - db BLIZZARD - - db 39, FLAREON, NO_ITEM - db FLAMETHROWER - db QUICK_ATTACK - db BITE - db FIRE_SPIN - + db "GAVEN@", TRAINERTYPE_ITEM_MOVES + db 39, VICTREEBEL, NO_ITEM, GIGA_DRAIN, TOXIC, SLUDGE_BOMB, RAZOR_LEAF + db 39, KINGLER, KINGS_ROCK, SURF, STOMP, GUILLOTINE, BLIZZARD + db 39, FLAREON, NO_ITEM, FLAMETHROWER, QUICK_ATTACK, BITE, FIRE_SPIN db -1 ; end -; ================ - ; COOLTRAINERM (8) - db "RYAN@" - db TRAINERTYPE_MOVES - - ; party - - db 25, PIDGEOT - db SAND_ATTACK - db QUICK_ATTACK - db WHIRLWIND - db WING_ATTACK - - db 27, ELECTABUZZ - db THUNDERPUNCH - db LIGHT_SCREEN - db SWIFT - db SCREECH - + db "RYAN@", TRAINERTYPE_MOVES + db 25, PIDGEOT, SAND_ATTACK, QUICK_ATTACK, WHIRLWIND, WING_ATTACK + db 27, ELECTABUZZ, THUNDERPUNCH, LIGHT_SCREEN, SWIFT, SCREECH db -1 ; end -; ================ - ; COOLTRAINERM (9) - db "JAKE@" - db TRAINERTYPE_MOVES - - ; party - - db 33, PARASECT - db LEECH_LIFE - db SPORE - db SLASH - db SWORDS_DANCE - - db 35, GOLDUCK - db CONFUSION - db SCREECH - db PSYCH_UP - db FURY_SWIPES - + db "JAKE@", TRAINERTYPE_MOVES + db 33, PARASECT, LEECH_LIFE, SPORE, SLASH, SWORDS_DANCE + db 35, GOLDUCK, CONFUSION, SCREECH, PSYCH_UP, FURY_SWIPES db -1 ; end -; ================ - ; COOLTRAINERM (10) - db "GAVEN@" - db TRAINERTYPE_MOVES - - ; party - - db 32, VICTREEBEL - db WRAP - db TOXIC - db ACID - db RAZOR_LEAF - - db 32, KINGLER - db BUBBLEBEAM - db STOMP - db GUILLOTINE - db PROTECT - - db 32, FLAREON - db SAND_ATTACK - db QUICK_ATTACK - db BITE - db FIRE_SPIN - + db "GAVEN@", TRAINERTYPE_MOVES + db 32, VICTREEBEL, WRAP, TOXIC, ACID, RAZOR_LEAF + db 32, KINGLER, BUBBLEBEAM, STOMP, GUILLOTINE, PROTECT + db 32, FLAREON, SAND_ATTACK, QUICK_ATTACK, BITE, FIRE_SPIN db -1 ; end -; ================ - ; COOLTRAINERM (11) - db "BLAKE@" - db TRAINERTYPE_MOVES - - ; party - - db 33, MAGNETON - db THUNDERBOLT - db SUPERSONIC - db SWIFT - db SCREECH - - db 31, QUAGSIRE - db WATER_GUN - db SLAM - db AMNESIA - db EARTHQUAKE - - db 31, EXEGGCUTE - db LEECH_SEED - db CONFUSION - db SLEEP_POWDER - db SOLARBEAM - + db "BLAKE@", TRAINERTYPE_MOVES + db 33, MAGNETON, THUNDERBOLT, SUPERSONIC, SWIFT, SCREECH + db 31, QUAGSIRE, WATER_GUN, SLAM, AMNESIA, EARTHQUAKE + db 31, EXEGGCUTE, LEECH_SEED, CONFUSION, SLEEP_POWDER, SOLARBEAM db -1 ; end -; ================ - ; COOLTRAINERM (12) - db "BRIAN@" - db TRAINERTYPE_MOVES - - ; party - - db 35, SANDSLASH - db SAND_ATTACK - db POISON_STING - db SLASH - db SWIFT - + db "BRIAN@", TRAINERTYPE_MOVES + db 35, SANDSLASH, SAND_ATTACK, POISON_STING, SLASH, SWIFT db -1 ; end -; ================ - ; COOLTRAINERM (13) - db "ERICK@" - db TRAINERTYPE_NORMAL - - ; party + db "ERICK@", TRAINERTYPE_NORMAL db 10, BULBASAUR db 10, CHARMANDER db 10, SQUIRTLE - db -1 ; end -; ================ - ; COOLTRAINERM (14) - db "ANDY@" - db TRAINERTYPE_NORMAL - - ; party + db "ANDY@", TRAINERTYPE_NORMAL db 10, BULBASAUR db 10, CHARMANDER db 10, SQUIRTLE - db -1 ; end -; ================ - ; COOLTRAINERM (15) - db "TYLER@" - db TRAINERTYPE_NORMAL - - ; party + db "TYLER@", TRAINERTYPE_NORMAL db 10, BULBASAUR db 10, CHARMANDER db 10, SQUIRTLE - db -1 ; end -; ================ - ; COOLTRAINERM (16) - db "SEAN@" - db TRAINERTYPE_NORMAL - - ; party + db "SEAN@", TRAINERTYPE_NORMAL db 35, FLAREON db 35, TANGELA db 35, TAUROS - db -1 ; end -; ================ - ; COOLTRAINERM (17) - db "KEVIN@" - db TRAINERTYPE_NORMAL - - ; party + db "KEVIN@", TRAINERTYPE_NORMAL db 38, RHYHORN db 35, CHARMELEON db 35, WARTORTLE - db -1 ; end -; ================ - ; COOLTRAINERM (18) - db "STEVE@" - db TRAINERTYPE_NORMAL - - ; party + db "STEVE@", TRAINERTYPE_NORMAL db 14, BULBASAUR db 14, CHARMANDER db 14, SQUIRTLE - db -1 ; end -; ================ - ; COOLTRAINERM (19) - db "ALLEN@" - db TRAINERTYPE_MOVES - - ; party - - db 27, CHARMELEON - db EMBER - db SMOKESCREEN - db RAGE - db SCARY_FACE - + db "ALLEN@", TRAINERTYPE_MOVES + db 27, CHARMELEON, EMBER, SMOKESCREEN, RAGE, SCARY_FACE db -1 ; end -; ================ - ; COOLTRAINERM (20) - db "DARIN@" - db TRAINERTYPE_MOVES - - ; party - - db 37, DRAGONAIR - db WRAP - db SURF - db DRAGON_RAGE - db SLAM - + db "DARIN@", TRAINERTYPE_MOVES + db 37, DRAGONAIR, WRAP, SURF, DRAGON_RAGE, SLAM db -1 ; end -; ================ -; ================================ - - CooltrainerFGroup: -; ================================ -; ================ - ; COOLTRAINERF (1) - db "GWEN@" - db TRAINERTYPE_NORMAL - - ; party + db "GWEN@", TRAINERTYPE_NORMAL db 26, EEVEE db 22, FLAREON db 22, VAPOREON db 22, JOLTEON - db -1 ; end -; ================ - ; COOLTRAINERF (2) - db "LOIS@" - db TRAINERTYPE_MOVES - - ; party - - db 25, SKIPLOOM - db SYNTHESIS - db POISONPOWDER - db MEGA_DRAIN - db LEECH_SEED - - db 25, NINETALES - db EMBER - db QUICK_ATTACK - db CONFUSE_RAY - db SAFEGUARD - + db "LOIS@", TRAINERTYPE_MOVES + db 25, SKIPLOOM, SYNTHESIS, POISONPOWDER, MEGA_DRAIN, LEECH_SEED + db 25, NINETALES, EMBER, QUICK_ATTACK, CONFUSE_RAY, SAFEGUARD db -1 ; end -; ================ - ; COOLTRAINERF (3) - db "FRAN@" - db TRAINERTYPE_NORMAL - - ; party + db "FRAN@", TRAINERTYPE_NORMAL db 37, SEADRA - db -1 ; end -; ================ - ; COOLTRAINERF (4) - db "LOLA@" - db TRAINERTYPE_NORMAL - - ; party + db "LOLA@", TRAINERTYPE_NORMAL db 34, DRATINI db 36, DRAGONAIR - db -1 ; end -; ================ - ; COOLTRAINERF (5) - db "KATE@" - db TRAINERTYPE_NORMAL - - ; party + db "KATE@", TRAINERTYPE_NORMAL db 26, SHELLDER db 28, CLOYSTER - db -1 ; end -; ================ - ; COOLTRAINERF (6) - db "IRENE@" - db TRAINERTYPE_NORMAL - - ; party + db "IRENE@", TRAINERTYPE_NORMAL db 22, GOLDEEN db 24, SEAKING - db -1 ; end -; ================ - ; COOLTRAINERF (7) - db "KELLY@" - db TRAINERTYPE_NORMAL - - ; party + db "KELLY@", TRAINERTYPE_NORMAL db 27, MARILL db 24, WARTORTLE db 24, WARTORTLE - db -1 ; end -; ================ - ; COOLTRAINERF (8) - db "JOYCE@" - db TRAINERTYPE_MOVES - - ; party - - db 36, PIKACHU - db QUICK_ATTACK - db DOUBLE_TEAM - db THUNDERBOLT - db THUNDER - - db 32, BLASTOISE - db BITE - db CURSE - db SURF - db RAIN_DANCE - + db "JOYCE@", TRAINERTYPE_MOVES + db 36, PIKACHU, QUICK_ATTACK, DOUBLE_TEAM, THUNDERBOLT, THUNDER + db 32, BLASTOISE, BITE, CURSE, SURF, RAIN_DANCE db -1 ; end -; ================ - ; COOLTRAINERF (9) - db "BETH@" - db TRAINERTYPE_MOVES - - ; party - - db 36, RAPIDASH - db STOMP - db FIRE_SPIN - db FURY_ATTACK - db AGILITY - + db "BETH@", TRAINERTYPE_MOVES + db 36, RAPIDASH, STOMP, FIRE_SPIN, FURY_ATTACK, AGILITY db -1 ; end -; ================ - ; COOLTRAINERF (10) - db "REENA@" - db TRAINERTYPE_NORMAL - - ; party + db "REENA@", TRAINERTYPE_NORMAL db 31, STARMIE db 33, NIDOQUEEN db 31, STARMIE - db -1 ; end -; ================ - ; COOLTRAINERF (11) - db "MEGAN@" - db TRAINERTYPE_MOVES - - ; party - - db 32, BULBASAUR - db GROWL - db LEECH_SEED - db POISONPOWDER - db RAZOR_LEAF - - db 32, IVYSAUR - db GROWL - db LEECH_SEED - db POISONPOWDER - db RAZOR_LEAF - - db 32, VENUSAUR - db BODY_SLAM - db SLEEP_POWDER - db RAZOR_LEAF - db SWEET_SCENT - + db "MEGAN@", TRAINERTYPE_MOVES + db 32, BULBASAUR, GROWL, LEECH_SEED, POISONPOWDER, RAZOR_LEAF + db 32, IVYSAUR, GROWL, LEECH_SEED, POISONPOWDER, RAZOR_LEAF + db 32, VENUSAUR, BODY_SLAM, SLEEP_POWDER, RAZOR_LEAF, SWEET_SCENT db -1 ; end -; ================ - ; COOLTRAINERF (12) - db "BETH@" - db TRAINERTYPE_MOVES - - ; party - - db 39, RAPIDASH - db STOMP - db FIRE_SPIN - db FURY_ATTACK - db AGILITY - + db "BETH@", TRAINERTYPE_MOVES + db 39, RAPIDASH, STOMP, FIRE_SPIN, FURY_ATTACK, AGILITY db -1 ; end -; ================ - ; COOLTRAINERF (13) - db "CAROL@" - db TRAINERTYPE_NORMAL - - ; party + db "CAROL@", TRAINERTYPE_NORMAL db 35, ELECTRODE db 35, STARMIE db 35, NINETALES - db -1 ; end -; ================ - ; COOLTRAINERF (14) - db "QUINN@" - db TRAINERTYPE_NORMAL - - ; party + db "QUINN@", TRAINERTYPE_NORMAL db 38, IVYSAUR db 38, STARMIE - db -1 ; end -; ================ - ; COOLTRAINERF (15) - db "EMMA@" - db TRAINERTYPE_NORMAL - - ; party + db "EMMA@", TRAINERTYPE_NORMAL db 28, POLIWHIRL - db -1 ; end -; ================ - ; COOLTRAINERF (16) - db "CYBIL@" - db TRAINERTYPE_MOVES - - ; party - - db 25, BUTTERFREE - db CONFUSION - db SLEEP_POWDER - db WHIRLWIND - db GUST - - db 25, BELLOSSOM - db ABSORB - db STUN_SPORE - db ACID - db SOLARBEAM - + db "CYBIL@", TRAINERTYPE_MOVES + db 25, BUTTERFREE, CONFUSION, SLEEP_POWDER, WHIRLWIND, GUST + db 25, BELLOSSOM, ABSORB, STUN_SPORE, ACID, SOLARBEAM db -1 ; end -; ================ - ; COOLTRAINERF (17) - db "JENN@" - db TRAINERTYPE_NORMAL - - ; party + db "JENN@", TRAINERTYPE_NORMAL db 24, STARYU db 26, STARMIE - db -1 ; end -; ================ - ; COOLTRAINERF (18) - db "BETH@" - db TRAINERTYPE_ITEM_MOVES - - ; party - - db 43, RAPIDASH, FOCUS_BAND - db STOMP - db FIRE_SPIN - db FURY_ATTACK - db FIRE_BLAST - + db "BETH@", TRAINERTYPE_ITEM_MOVES + db 43, RAPIDASH, FOCUS_BAND, STOMP, FIRE_SPIN, FURY_ATTACK, FIRE_BLAST db -1 ; end -; ================ - ; COOLTRAINERF (19) - db "REENA@" - db TRAINERTYPE_NORMAL - - ; party + db "REENA@", TRAINERTYPE_NORMAL db 34, STARMIE db 36, NIDOQUEEN db 34, STARMIE - db -1 ; end -; ================ - ; COOLTRAINERF (20) - db "REENA@" - db TRAINERTYPE_ITEM_MOVES - - ; party - - db 38, STARMIE, NO_ITEM - db DOUBLE_TEAM - db PSYCHIC_M - db WATERFALL - db CONFUSE_RAY - - db 40, NIDOQUEEN, PINK_BOW - db EARTHQUAKE - db DOUBLE_KICK - db TOXIC - db BODY_SLAM - - db 38, STARMIE, NO_ITEM - db BLIZZARD - db PSYCHIC_M - db WATERFALL - db RECOVER - + db "REENA@", TRAINERTYPE_ITEM_MOVES + db 38, STARMIE, NO_ITEM, DOUBLE_TEAM, PSYCHIC_M, WATERFALL, CONFUSE_RAY + db 40, NIDOQUEEN, PINK_BOW, EARTHQUAKE, DOUBLE_KICK, TOXIC, BODY_SLAM + db 38, STARMIE, NO_ITEM, BLIZZARD, PSYCHIC_M, WATERFALL, RECOVER db -1 ; end -; ================ - ; COOLTRAINERF (21) - db "CARA@" - db TRAINERTYPE_MOVES - - ; party - - db 33, HORSEA - db SMOKESCREEN - db LEER - db WHIRLPOOL - db TWISTER - - db 33, HORSEA - db SMOKESCREEN - db LEER - db WHIRLPOOL - db TWISTER - - db 35, SEADRA - db SWIFT - db LEER - db WATERFALL - db TWISTER - + db "CARA@", TRAINERTYPE_MOVES + db 33, HORSEA, SMOKESCREEN, LEER, WHIRLPOOL, TWISTER + db 33, HORSEA, SMOKESCREEN, LEER, WHIRLPOOL, TWISTER + db 35, SEADRA, SWIFT, LEER, WATERFALL, TWISTER db -1 ; end -; ================ -; ================================ - - BeautyGroup: -; ================================ -; ================ - ; BEAUTY (1) - db "VICTORIA@" - db TRAINERTYPE_NORMAL - - ; party - db 9, SENTRET + db "VICTORIA@", TRAINERTYPE_NORMAL + db 9, SENTRET db 13, SENTRET db 17, SENTRET - db -1 ; end -; ================ - ; BEAUTY (2) - db "SAMANTHA@" - db TRAINERTYPE_MOVES - - ; party - - db 16, MEOWTH - db SCRATCH - db GROWL - db BITE - db PAY_DAY - - db 16, MEOWTH - db SCRATCH - db GROWL - db BITE - db SLASH - + db "SAMANTHA@", TRAINERTYPE_MOVES + db 16, MEOWTH, SCRATCH, GROWL, BITE, PAY_DAY + db 16, MEOWTH, SCRATCH, GROWL, BITE, SLASH db -1 ; end -; ================ - ; BEAUTY (3) - db "JULIE@" - db TRAINERTYPE_NORMAL - - ; party + db "JULIE@", TRAINERTYPE_NORMAL db 15, SENTRET - db -1 ; end -; ================ - ; BEAUTY (4) - db "JACLYN@" - db TRAINERTYPE_NORMAL - - ; party + db "JACLYN@", TRAINERTYPE_NORMAL db 15, SENTRET - db -1 ; end -; ================ - ; BEAUTY (5) - db "BRENDA@" - db TRAINERTYPE_NORMAL - - ; party + db "BRENDA@", TRAINERTYPE_NORMAL db 16, FURRET - db -1 ; end -; ================ - ; BEAUTY (6) - db "CASSIE@" - db TRAINERTYPE_NORMAL - - ; party + db "CASSIE@", TRAINERTYPE_NORMAL db 28, VILEPLUME db 34, BUTTERFREE - db -1 ; end -; ================ - ; BEAUTY (7) - db "CAROLINE@" - db TRAINERTYPE_NORMAL - - ; party + db "CAROLINE@", TRAINERTYPE_NORMAL db 30, MARILL db 32, SEEL db 30, MARILL - db -1 ; end -; ================ - ; BEAUTY (8) - db "CARLENE@" - db TRAINERTYPE_NORMAL - - ; party + db "CARLENE@", TRAINERTYPE_NORMAL db 15, SENTRET - db -1 ; end -; ================ - ; BEAUTY (9) - db "JESSICA@" - db TRAINERTYPE_NORMAL - - ; party + db "JESSICA@", TRAINERTYPE_NORMAL db 15, SENTRET - db -1 ; end -; ================ - ; BEAUTY (10) - db "RACHAEL@" - db TRAINERTYPE_NORMAL - - ; party + db "RACHAEL@", TRAINERTYPE_NORMAL db 15, SENTRET - db -1 ; end -; ================ - ; BEAUTY (11) - db "ANGELICA@" - db TRAINERTYPE_NORMAL - - ; party + db "ANGELICA@", TRAINERTYPE_NORMAL db 15, SENTRET - db -1 ; end -; ================ - ; BEAUTY (12) - db "KENDRA@" - db TRAINERTYPE_NORMAL - - ; party + db "KENDRA@", TRAINERTYPE_NORMAL db 15, SENTRET - db -1 ; end -; ================ - ; BEAUTY (13) - db "VERONICA@" - db TRAINERTYPE_NORMAL - - ; party + db "VERONICA@", TRAINERTYPE_NORMAL db 15, SENTRET - db -1 ; end -; ================ - ; BEAUTY (14) - db "JULIA@" - db TRAINERTYPE_NORMAL - - ; party + db "JULIA@", TRAINERTYPE_NORMAL db 32, PARAS db 32, EXEGGCUTE db 35, PARASECT - db -1 ; end -; ================ - ; BEAUTY (15) - db "THERESA@" - db TRAINERTYPE_NORMAL - - ; party + db "THERESA@", TRAINERTYPE_NORMAL db 15, SENTRET - db -1 ; end -; ================ - ; BEAUTY (16) - db "VALERIE@" - db TRAINERTYPE_MOVES - - ; party - - db 17, HOPPIP - db SYNTHESIS - db TAIL_WHIP - db TACKLE - db POISONPOWDER - - db 17, SKIPLOOM - db SYNTHESIS - db TAIL_WHIP - db TACKLE - db STUN_SPORE - + db "VALERIE@", TRAINERTYPE_MOVES + db 17, HOPPIP, SYNTHESIS, TAIL_WHIP, TACKLE, POISONPOWDER + db 17, SKIPLOOM, SYNTHESIS, TAIL_WHIP, TACKLE, STUN_SPORE db -1 ; end -; ================ - ; BEAUTY (17) - db "OLIVIA@" - db TRAINERTYPE_NORMAL - - ; party + db "OLIVIA@", TRAINERTYPE_NORMAL db 19, CORSOLA - db -1 ; end -; ================ -; ================================ - - PokemaniacGroup: -; ================================ -; ================ - ; POKEMANIAC (1) - db "LARRY@" - db TRAINERTYPE_NORMAL - - ; party + db "LARRY@", TRAINERTYPE_NORMAL db 10, SLOWPOKE - db -1 ; end -; ================ - ; POKEMANIAC (2) - db "ANDREW@" - db TRAINERTYPE_NORMAL - - ; party + db "ANDREW@", TRAINERTYPE_NORMAL db 24, MAROWAK db 24, MAROWAK - db -1 ; end -; ================ - ; POKEMANIAC (3) - db "CALVIN@" - db TRAINERTYPE_NORMAL - - ; party + db "CALVIN@", TRAINERTYPE_NORMAL db 26, KANGASKHAN - db -1 ; end -; ================ - ; POKEMANIAC (4) - db "SHANE@" - db TRAINERTYPE_NORMAL - - ; party + db "SHANE@", TRAINERTYPE_NORMAL db 16, NIDORINA db 16, NIDORINO - db -1 ; end -; ================ - ; POKEMANIAC (5) - db "BEN@" - db TRAINERTYPE_NORMAL - - ; party + db "BEN@", TRAINERTYPE_NORMAL db 19, SLOWBRO - db -1 ; end -; ================ - ; POKEMANIAC (6) - db "BRENT@" - db TRAINERTYPE_NORMAL - - ; party + db "BRENT@", TRAINERTYPE_NORMAL db 19, LICKITUNG - db -1 ; end -; ================ - ; POKEMANIAC (7) - db "RON@" - db TRAINERTYPE_NORMAL - - ; party + db "RON@", TRAINERTYPE_NORMAL db 19, NIDOKING - db -1 ; end -; ================ - ; POKEMANIAC (8) - db "ETHAN@" - db TRAINERTYPE_NORMAL - - ; party + db "ETHAN@", TRAINERTYPE_NORMAL db 31, RHYHORN db 31, RHYDON - db -1 ; end -; ================ - ; POKEMANIAC (9) - db "BRENT@" - db TRAINERTYPE_NORMAL - - ; party + db "BRENT@", TRAINERTYPE_NORMAL db 25, KANGASKHAN - db -1 ; end -; ================ - ; POKEMANIAC (10) - db "BRENT@" - db TRAINERTYPE_MOVES - - ; party - - db 36, PORYGON - db RECOVER - db PSYCHIC_M - db CONVERSION2 - db TRI_ATTACK - + db "BRENT@", TRAINERTYPE_MOVES + db 36, PORYGON, RECOVER, PSYCHIC_M, CONVERSION2, TRI_ATTACK db -1 ; end -; ================ - ; POKEMANIAC (11) - db "ISSAC@" - db TRAINERTYPE_MOVES - - ; party - - db 12, LICKITUNG - db LICK - db SUPERSONIC - db CUT - db 0 - + db "ISSAC@", TRAINERTYPE_MOVES + db 12, LICKITUNG, LICK, SUPERSONIC, CUT, NO_MOVE db -1 ; end -; ================ - ; POKEMANIAC (12) - db "DONALD@" - db TRAINERTYPE_NORMAL - - ; party + db "DONALD@", TRAINERTYPE_NORMAL db 10, SLOWPOKE db 10, SLOWPOKE - db -1 ; end -; ================ - ; POKEMANIAC (13) - db "ZACH@" - db TRAINERTYPE_NORMAL - - ; party + db "ZACH@", TRAINERTYPE_NORMAL db 27, RHYHORN - db -1 ; end -; ================ - ; POKEMANIAC (14) - db "BRENT@" - db TRAINERTYPE_MOVES - - ; party - - db 41, CHANSEY - db ROLLOUT - db ATTRACT - db EGG_BOMB - db SOFTBOILED - + db "BRENT@", TRAINERTYPE_MOVES + db 41, CHANSEY, ROLLOUT, ATTRACT, EGG_BOMB, SOFTBOILED db -1 ; end -; ================ - ; POKEMANIAC (15) - db "MILLER@" - db TRAINERTYPE_NORMAL - - ; party + db "MILLER@", TRAINERTYPE_NORMAL db 17, NIDOKING db 17, NIDOQUEEN - db -1 ; end -; ================ -; ================================ - - GruntMGroup: -; ================================ -; ================ - ; GRUNTM (1) - db "GRUNT@" - db TRAINERTYPE_NORMAL - - ; party + db "GRUNT@", TRAINERTYPE_NORMAL db 14, KOFFING - db -1 ; end -; ================ - ; GRUNTM (2) - db "GRUNT@" - db TRAINERTYPE_NORMAL - - ; party - db 7, RATTATA - db 9, ZUBAT - db 9, ZUBAT - + db "GRUNT@", TRAINERTYPE_NORMAL + db 7, RATTATA + db 9, ZUBAT + db 9, ZUBAT db -1 ; end -; ================ - ; GRUNTM (3) - db "GRUNT@" - db TRAINERTYPE_NORMAL - - ; party + db "GRUNT@", TRAINERTYPE_NORMAL db 24, RATICATE db 24, RATICATE - db -1 ; end -; ================ - ; GRUNTM (4) - db "GRUNT@" - db TRAINERTYPE_NORMAL - - ; party + db "GRUNT@", TRAINERTYPE_NORMAL db 23, GRIMER db 23, GRIMER db 25, MUK - db -1 ; end -; ================ - ; GRUNTM (5) - db "GRUNT@" - db TRAINERTYPE_NORMAL - - ; party + db "GRUNT@", TRAINERTYPE_NORMAL db 21, RATTATA db 21, RATTATA db 23, RATTATA db 23, RATTATA db 23, RATTATA - db -1 ; end -; ================ - ; GRUNTM (6) - db "GRUNT@" - db TRAINERTYPE_NORMAL - - ; party + db "GRUNT@", TRAINERTYPE_NORMAL db 26, ZUBAT db 26, ZUBAT - db -1 ; end -; ================ - ; GRUNTM (7) - db "GRUNT@" - db TRAINERTYPE_NORMAL - - ; party + db "GRUNT@", TRAINERTYPE_NORMAL db 23, KOFFING db 23, GRIMER db 23, ZUBAT db 23, RATTATA - db -1 ; end -; ================ - ; GRUNTM (8) - db "GRUNT@" - db TRAINERTYPE_NORMAL - - ; party + db "GRUNT@", TRAINERTYPE_NORMAL db 26, WEEZING - db -1 ; end -; ================ - ; GRUNTM (9) - db "GRUNT@" - db TRAINERTYPE_NORMAL - - ; party + db "GRUNT@", TRAINERTYPE_NORMAL db 24, RATICATE db 26, KOFFING - db -1 ; end -; ================ - ; GRUNTM (10) - db "GRUNT@" - db TRAINERTYPE_NORMAL - - ; party + db "GRUNT@", TRAINERTYPE_NORMAL db 22, ZUBAT db 24, GOLBAT db 22, GRIMER - db -1 ; end -; ================ - ; GRUNTM (11) - db "GRUNT@" - db TRAINERTYPE_NORMAL - - ; party + db "GRUNT@", TRAINERTYPE_NORMAL db 23, MUK db 23, KOFFING db 25, RATTATA - db -1 ; end -; ================ - ; GRUNTM (12) - db "EXECUTIVE@" - db TRAINERTYPE_NORMAL - - ; party + db "EXECUTIVE@", TRAINERTYPE_NORMAL db 33, HOUNDOUR - db -1 ; end -; ================ - ; GRUNTM (13) - db "GRUNT@" - db TRAINERTYPE_NORMAL - - ; party + db "GRUNT@", TRAINERTYPE_NORMAL db 27, RATTATA - db -1 ; end -; ================ - ; GRUNTM (14) - db "GRUNT@" - db TRAINERTYPE_NORMAL - - ; party + db "GRUNT@", TRAINERTYPE_NORMAL db 24, RATICATE db 24, GOLBAT - db -1 ; end -; ================ - ; GRUNTM (15) - db "GRUNT@" - db TRAINERTYPE_NORMAL - - ; party + db "GRUNT@", TRAINERTYPE_NORMAL db 26, GRIMER db 23, WEEZING - db -1 ; end -; ================ - ; GRUNTM (16) - db "GRUNT@" - db TRAINERTYPE_NORMAL - - ; party + db "GRUNT@", TRAINERTYPE_NORMAL db 16, RATTATA db 16, RATTATA db 16, RATTATA db 16, RATTATA - db -1 ; end -; ================ - ; GRUNTM (17) - db "GRUNT@" - db TRAINERTYPE_NORMAL - - ; party + db "GRUNT@", TRAINERTYPE_NORMAL db 18, GOLBAT - db -1 ; end -; ================ - ; GRUNTM (18) - db "GRUNT@" - db TRAINERTYPE_NORMAL - - ; party + db "GRUNT@", TRAINERTYPE_NORMAL db 17, RATTATA db 17, ZUBAT db 17, RATTATA - db -1 ; end -; ================ - ; GRUNTM (19) - db "GRUNT@" - db TRAINERTYPE_NORMAL - - ; party + db "GRUNT@", TRAINERTYPE_NORMAL db 18, VENONAT db 18, VENONAT - db -1 ; end -; ================ - ; GRUNTM (20) - db "GRUNT@" - db TRAINERTYPE_NORMAL - - ; party + db "GRUNT@", TRAINERTYPE_NORMAL db 17, DROWZEE db 19, ZUBAT - db -1 ; end -; ================ - ; GRUNTM (21) - db "GRUNT@" - db TRAINERTYPE_NORMAL - - ; party + db "GRUNT@", TRAINERTYPE_NORMAL db 16, ZUBAT db 17, GRIMER db 18, RATTATA - db -1 ; end -; ================ - ; GRUNTM (22) - db "EXECUTIVE@" - db TRAINERTYPE_NORMAL - - ; party + db "EXECUTIVE@", TRAINERTYPE_NORMAL db 36, GOLBAT - db -1 ; end -; ================ - ; GRUNTM (23) - db "EXECUTIVE@" - db TRAINERTYPE_NORMAL - - ; party + db "EXECUTIVE@", TRAINERTYPE_NORMAL db 30, KOFFING - db -1 ; end -; ================ - ; GRUNTM (24) - db "GRUNT@" - db TRAINERTYPE_NORMAL - - ; party + db "GRUNT@", TRAINERTYPE_NORMAL db 25, KOFFING db 25, KOFFING - db -1 ; end -; ================ - ; GRUNTM (25) - db "GRUNT@" - db TRAINERTYPE_NORMAL - - ; party + db "GRUNT@", TRAINERTYPE_NORMAL db 24, KOFFING db 24, MUK - db -1 ; end -; ================ - ; GRUNTM (26) - db "GRUNT@" - db TRAINERTYPE_NORMAL - - ; party + db "GRUNT@", TRAINERTYPE_NORMAL db 15, RATTATA db 15, RATTATA - db -1 ; end -; ================ - ; GRUNTM (27) - db "EXECUTIVE@" - db TRAINERTYPE_NORMAL - - ; party + db "EXECUTIVE@", TRAINERTYPE_NORMAL db 22, ZUBAT - db -1 ; end -; ================ - ; GRUNTM (28) - db "GRUNT@" - db TRAINERTYPE_NORMAL - - ; party + db "GRUNT@", TRAINERTYPE_NORMAL db 19, RATICATE - db -1 ; end -; ================ - ; GRUNTM (29) - db "GRUNT@" - db TRAINERTYPE_NORMAL - - ; party - db 9, RATTATA - db 9, RATTATA - + db "GRUNT@", TRAINERTYPE_NORMAL + db 9, RATTATA + db 9, RATTATA db -1 ; end -; ================ - ; GRUNTM (30) - db "GRUNT@" - db TRAINERTYPE_NORMAL - - ; party + db "GRUNT@", TRAINERTYPE_NORMAL db 25, GOLBAT db 25, GOLBAT db 30, ARBOK - db -1 ; end -; ================ - ; GRUNTM (31) - db "GRUNT@" - db TRAINERTYPE_NORMAL - - ; party + db "GRUNT@", TRAINERTYPE_NORMAL db 30, GOLBAT - db -1 ; end -; ================ -; ================================ - - GentlemanGroup: -; ================================ -; ================ - ; GENTLEMAN (1) - db "PRESTON@" - db TRAINERTYPE_NORMAL - - ; party + db "PRESTON@", TRAINERTYPE_NORMAL db 18, GROWLITHE db 18, GROWLITHE - db -1 ; end -; ================ - ; GENTLEMAN (2) - db "EDWARD@" - db TRAINERTYPE_NORMAL - - ; party + db "EDWARD@", TRAINERTYPE_NORMAL db 33, PERSIAN - db -1 ; end -; ================ - ; GENTLEMAN (3) - db "GREGORY@" - db TRAINERTYPE_NORMAL - - ; party + db "GREGORY@", TRAINERTYPE_NORMAL db 37, PIKACHU db 33, FLAAFFY - db -1 ; end -; ================ - ; GENTLEMAN (4) - db "VIRGIL@" - db TRAINERTYPE_NORMAL - - ; party + db "VIRGIL@", TRAINERTYPE_NORMAL db 20, PONYTA - db -1 ; end -; ================ - ; GENTLEMAN (5) - db "ALFRED@" - db TRAINERTYPE_NORMAL - - ; party + db "ALFRED@", TRAINERTYPE_NORMAL db 20, NOCTOWL - db -1 ; end -; ================ -; ================================ - - SkierGroup: -; ================================ -; ================ - ; SKIER (1) - db "ROXANNE@" - db TRAINERTYPE_NORMAL - - ; party + db "ROXANNE@", TRAINERTYPE_NORMAL db 28, JYNX - db -1 ; end -; ================ - ; SKIER (2) - db "CLARISSA@" - db TRAINERTYPE_NORMAL - - ; party + db "CLARISSA@", TRAINERTYPE_NORMAL db 28, DEWGONG - db -1 ; end -; ================ -; ================================ - - TeacherGroup: -; ================================ -; ================ - ; TEACHER (1) - db "COLETTE@" - db TRAINERTYPE_NORMAL - - ; party + db "COLETTE@", TRAINERTYPE_NORMAL db 36, CLEFAIRY - db -1 ; end -; ================ - ; TEACHER (2) - db "HILLARY@" - db TRAINERTYPE_NORMAL - - ; party + db "HILLARY@", TRAINERTYPE_NORMAL db 32, AIPOM db 36, CUBONE - db -1 ; end -; ================ - ; TEACHER (3) - db "SHIRLEY@" - db TRAINERTYPE_NORMAL - - ; party + db "SHIRLEY@", TRAINERTYPE_NORMAL db 35, JIGGLYPUFF - db -1 ; end -; ================ -; ================================ - - SabrinaGroup: -; ================================ -; ================ - ; SABRINA (1) - db "SABRINA@" - db TRAINERTYPE_MOVES - - ; party - - db 46, ESPEON - db SAND_ATTACK - db QUICK_ATTACK - db SWIFT - db PSYCHIC_M - - db 46, MR__MIME - db BARRIER - db REFLECT - db BATON_PASS - db PSYCHIC_M - - db 48, ALAKAZAM - db RECOVER - db FUTURE_SIGHT - db PSYCHIC_M - db REFLECT - + db "SABRINA@", TRAINERTYPE_MOVES + db 46, ESPEON, SAND_ATTACK, QUICK_ATTACK, SWIFT, PSYCHIC_M + db 46, MR__MIME, BARRIER, REFLECT, BATON_PASS, PSYCHIC_M + db 48, ALAKAZAM, RECOVER, FUTURE_SIGHT, PSYCHIC_M, REFLECT db -1 ; end -; ================ -; ================================ - - BugCatcherGroup: -; ================================ -; ================ - ; BUG_CATCHER (1) - db "DON@" - db TRAINERTYPE_NORMAL - - ; party - db 3, CATERPIE - db 3, CATERPIE - + db "DON@", TRAINERTYPE_NORMAL + db 3, CATERPIE + db 3, CATERPIE db -1 ; end -; ================ - ; BUG_CATCHER (2) - db "ROB@" - db TRAINERTYPE_NORMAL - - ; party + db "ROB@", TRAINERTYPE_NORMAL db 32, BEEDRILL db 32, BUTTERFREE - db -1 ; end -; ================ - ; BUG_CATCHER (3) - db "ED@" - db TRAINERTYPE_NORMAL - - ; party + db "ED@", TRAINERTYPE_NORMAL db 30, BEEDRILL db 30, BEEDRILL db 30, BEEDRILL - db -1 ; end -; ================ - ; BUG_CATCHER (4) - db "WADE@" - db TRAINERTYPE_NORMAL - - ; party - db 2, CATERPIE - db 2, CATERPIE - db 3, WEEDLE - db 2, CATERPIE - + db "WADE@", TRAINERTYPE_NORMAL + db 2, CATERPIE + db 2, CATERPIE + db 3, WEEDLE + db 2, CATERPIE db -1 ; end -; ================ - ; BUG_CATCHER (5) - db "BENNY@" - db TRAINERTYPE_NORMAL - - ; party - db 7, WEEDLE - db 9, KAKUNA + db "BENNY@", TRAINERTYPE_NORMAL + db 7, WEEDLE + db 9, KAKUNA db 12, BEEDRILL - db -1 ; end -; ================ - ; BUG_CATCHER (6) - db "AL@" - db TRAINERTYPE_NORMAL - - ; party + db "AL@", TRAINERTYPE_NORMAL db 12, CATERPIE db 12, WEEDLE - db -1 ; end -; ================ - ; BUG_CATCHER (7) - db "JOSH@" - db TRAINERTYPE_NORMAL - - ; party + db "JOSH@", TRAINERTYPE_NORMAL db 13, PARAS - db -1 ; end -; ================ - ; BUG_CATCHER (8) - db "ARNIE@" - db TRAINERTYPE_NORMAL - - ; party + db "ARNIE@", TRAINERTYPE_NORMAL db 15, VENONAT - db -1 ; end -; ================ - ; BUG_CATCHER (9) - db "KEN@" - db TRAINERTYPE_NORMAL - - ; party + db "KEN@", TRAINERTYPE_NORMAL db 30, ARIADOS db 32, PINSIR - db -1 ; end -; ================ - ; BUG_CATCHER (10) - db "WADE@" - db TRAINERTYPE_NORMAL - - ; party - db 9, METAPOD - db 9, METAPOD + db "WADE@", TRAINERTYPE_NORMAL + db 9, METAPOD + db 9, METAPOD db 10, KAKUNA - db 9, METAPOD - + db 9, METAPOD db -1 ; end -; ================ - ; BUG_CATCHER (11) - db "WADE@" - db TRAINERTYPE_NORMAL - - ; party + db "WADE@", TRAINERTYPE_NORMAL db 14, BUTTERFREE db 14, BUTTERFREE db 15, BEEDRILL db 14, BUTTERFREE - db -1 ; end -; ================ - ; BUG_CATCHER (12) - db "DOUG@" - db TRAINERTYPE_NORMAL - - ; party + db "DOUG@", TRAINERTYPE_NORMAL db 34, ARIADOS - db -1 ; end -; ================ - ; BUG_CATCHER (13) - db "ARNIE@" - db TRAINERTYPE_NORMAL - - ; party + db "ARNIE@", TRAINERTYPE_NORMAL db 19, VENONAT - db -1 ; end -; ================ - ; BUG_CATCHER (14) - db "ARNIE@" - db TRAINERTYPE_MOVES - - ; party - - db 28, VENOMOTH - db DISABLE - db SUPERSONIC - db CONFUSION - db LEECH_LIFE - + db "ARNIE@", TRAINERTYPE_MOVES + db 28, VENOMOTH, DISABLE, SUPERSONIC, CONFUSION, LEECH_LIFE db -1 ; end -; ================ - ; BUG_CATCHER (15) - db "WADE@" - db TRAINERTYPE_MOVES - - ; party - - db 24, BUTTERFREE - db CONFUSION - db POISONPOWDER - db SUPERSONIC - db WHIRLWIND - - db 24, BUTTERFREE - db CONFUSION - db STUN_SPORE - db SUPERSONIC - db WHIRLWIND - - db 25, BEEDRILL - db FURY_ATTACK - db FOCUS_ENERGY - db TWINEEDLE - db RAGE - - db 24, BUTTERFREE - db CONFUSION - db SLEEP_POWDER - db SUPERSONIC - db WHIRLWIND - + db "WADE@", TRAINERTYPE_MOVES + db 24, BUTTERFREE, CONFUSION, POISONPOWDER, SUPERSONIC, WHIRLWIND + db 24, BUTTERFREE, CONFUSION, STUN_SPORE, SUPERSONIC, WHIRLWIND + db 25, BEEDRILL, FURY_ATTACK, FOCUS_ENERGY, TWINEEDLE, RAGE + db 24, BUTTERFREE, CONFUSION, SLEEP_POWDER, SUPERSONIC, WHIRLWIND db -1 ; end -; ================ - ; BUG_CATCHER (16) - db "WADE@" - db TRAINERTYPE_MOVES - - ; party - - db 30, BUTTERFREE - db CONFUSION - db POISONPOWDER - db SUPERSONIC - db GUST - - db 30, BUTTERFREE - db CONFUSION - db STUN_SPORE - db SUPERSONIC - db GUST - - db 32, BEEDRILL - db FURY_ATTACK - db PURSUIT - db TWINEEDLE - db DOUBLE_TEAM - - db 34, BUTTERFREE - db PSYBEAM - db SLEEP_POWDER - db GUST - db WHIRLWIND - + db "WADE@", TRAINERTYPE_MOVES + db 30, BUTTERFREE, CONFUSION, POISONPOWDER, SUPERSONIC, GUST + db 30, BUTTERFREE, CONFUSION, STUN_SPORE, SUPERSONIC, GUST + db 32, BEEDRILL, FURY_ATTACK, PURSUIT, TWINEEDLE, DOUBLE_TEAM + db 34, BUTTERFREE, PSYBEAM, SLEEP_POWDER, GUST, WHIRLWIND db -1 ; end -; ================ - ; BUG_CATCHER (17) - db "ARNIE@" - db TRAINERTYPE_MOVES - - ; party - - db 36, VENOMOTH - db GUST - db SUPERSONIC - db PSYBEAM - db LEECH_LIFE - + db "ARNIE@", TRAINERTYPE_MOVES + db 36, VENOMOTH, GUST, SUPERSONIC, PSYBEAM, LEECH_LIFE db -1 ; end -; ================ - ; BUG_CATCHER (18) - db "ARNIE@" - db TRAINERTYPE_MOVES - - ; party - - db 40, VENOMOTH - db GUST - db SUPERSONIC - db PSYCHIC_M - db TOXIC - + db "ARNIE@", TRAINERTYPE_MOVES + db 40, VENOMOTH, GUST, SUPERSONIC, PSYCHIC_M, TOXIC db -1 ; end -; ================ - ; BUG_CATCHER (19) - db "WAYNE@" - db TRAINERTYPE_NORMAL - - ; party - db 8, LEDYBA + db "WAYNE@", TRAINERTYPE_NORMAL + db 8, LEDYBA db 10, PARAS - db -1 ; end -; ================ -; ================================ - - FisherGroup: -; ================================ -; ================ - ; FISHER (1) - db "JUSTIN@" - db TRAINERTYPE_NORMAL - - ; party - db 5, MAGIKARP - db 5, MAGIKARP + db "JUSTIN@", TRAINERTYPE_NORMAL + db 5, MAGIKARP + db 5, MAGIKARP db 15, MAGIKARP - db 5, MAGIKARP - + db 5, MAGIKARP db -1 ; end -; ================ - ; FISHER (2) - db "RALPH@" - db TRAINERTYPE_NORMAL - - ; party + db "RALPH@", TRAINERTYPE_NORMAL db 10, GOLDEEN - db -1 ; end -; ================ - ; FISHER (3) - db "ARNOLD@" - db TRAINERTYPE_NORMAL - - ; party + db "ARNOLD@", TRAINERTYPE_NORMAL db 34, TENTACRUEL - db -1 ; end -; ================ - ; FISHER (4) - db "KYLE@" - db TRAINERTYPE_NORMAL - - ; party + db "KYLE@", TRAINERTYPE_NORMAL db 28, SEAKING db 31, POLIWHIRL db 31, SEAKING - db -1 ; end -; ================ - ; FISHER (5) - db "HENRY@" - db TRAINERTYPE_NORMAL - - ; party - db 8, POLIWAG - db 8, POLIWAG - + db "HENRY@", TRAINERTYPE_NORMAL + db 8, POLIWAG + db 8, POLIWAG db -1 ; end -; ================ - ; FISHER (6) - db "MARVIN@" - db TRAINERTYPE_NORMAL - - ; party + db "MARVIN@", TRAINERTYPE_NORMAL db 10, MAGIKARP db 10, GYARADOS db 15, MAGIKARP db 15, GYARADOS - db -1 ; end -; ================ - ; FISHER (7) - db "TULLY@" - db TRAINERTYPE_NORMAL - - ; party + db "TULLY@", TRAINERTYPE_NORMAL db 18, QWILFISH - db -1 ; end -; ================ - ; FISHER (8) - db "ANDRE@" - db TRAINERTYPE_NORMAL - - ; party + db "ANDRE@", TRAINERTYPE_NORMAL db 27, GYARADOS - db -1 ; end -; ================ - ; FISHER (9) - db "RAYMOND@" - db TRAINERTYPE_NORMAL - - ; party + db "RAYMOND@", TRAINERTYPE_NORMAL db 22, MAGIKARP db 22, MAGIKARP db 22, MAGIKARP db 22, MAGIKARP - db -1 ; end -; ================ - ; FISHER (10) - db "WILTON@" - db TRAINERTYPE_NORMAL - - ; party + db "WILTON@", TRAINERTYPE_NORMAL db 23, GOLDEEN db 23, GOLDEEN db 25, SEAKING - db -1 ; end -; ================ - ; FISHER (11) - db "EDGAR@" - db TRAINERTYPE_MOVES - - ; party - - db 25, REMORAID - db LOCK_ON - db PSYBEAM - db AURORA_BEAM - db BUBBLEBEAM - - db 25, REMORAID - db LOCK_ON - db PSYBEAM - db AURORA_BEAM - db BUBBLEBEAM - + db "EDGAR@", TRAINERTYPE_MOVES + db 25, REMORAID, LOCK_ON, PSYBEAM, AURORA_BEAM, BUBBLEBEAM + db 25, REMORAID, LOCK_ON, PSYBEAM, AURORA_BEAM, BUBBLEBEAM db -1 ; end -; ================ - ; FISHER (12) - db "JONAH@" - db TRAINERTYPE_NORMAL - - ; party + db "JONAH@", TRAINERTYPE_NORMAL db 25, SHELLDER db 29, OCTILLERY db 25, REMORAID db 29, CLOYSTER - db -1 ; end -; ================ - ; FISHER (13) - db "MARTIN@" - db TRAINERTYPE_NORMAL - - ; party + db "MARTIN@", TRAINERTYPE_NORMAL db 32, REMORAID db 32, REMORAID - db -1 ; end -; ================ - ; FISHER (14) - db "STEPHEN@" - db TRAINERTYPE_NORMAL - - ; party + db "STEPHEN@", TRAINERTYPE_NORMAL db 25, MAGIKARP db 25, MAGIKARP db 31, QWILFISH db 31, TENTACRUEL - db -1 ; end -; ================ - ; FISHER (15) - db "BARNEY@" - db TRAINERTYPE_NORMAL - - ; party + db "BARNEY@", TRAINERTYPE_NORMAL db 30, GYARADOS db 30, GYARADOS db 30, GYARADOS - db -1 ; end -; ================ - ; FISHER (16) - db "RALPH@" - db TRAINERTYPE_NORMAL - - ; party + db "RALPH@", TRAINERTYPE_NORMAL db 17, GOLDEEN - db -1 ; end -; ================ - ; FISHER (17) - db "RALPH@" - db TRAINERTYPE_NORMAL - - ; party + db "RALPH@", TRAINERTYPE_NORMAL db 17, QWILFISH db 19, GOLDEEN - db -1 ; end -; ================ - ; FISHER (18) - db "TULLY@" - db TRAINERTYPE_NORMAL - - ; party + db "TULLY@", TRAINERTYPE_NORMAL db 23, QWILFISH - db -1 ; end -; ================ - ; FISHER (19) - db "TULLY@" - db TRAINERTYPE_NORMAL - - ; party + db "TULLY@", TRAINERTYPE_NORMAL db 32, GOLDEEN db 32, GOLDEEN db 32, QWILFISH - db -1 ; end -; ================ - ; FISHER (20) - db "WILTON@" - db TRAINERTYPE_NORMAL - - ; party + db "WILTON@", TRAINERTYPE_NORMAL db 29, GOLDEEN db 29, GOLDEEN db 32, SEAKING - db -1 ; end -; ================ - ; FISHER (21) - db "SCOTT@" - db TRAINERTYPE_NORMAL - - ; party + db "SCOTT@", TRAINERTYPE_NORMAL db 30, QWILFISH db 30, QWILFISH db 34, SEAKING - db -1 ; end -; ================ - ; FISHER (22) - db "WILTON@" - db TRAINERTYPE_MOVES - - ; party - - db 34, SEAKING - db SUPERSONIC - db WATERFALL - db FLAIL - db FURY_ATTACK - - db 34, SEAKING - db SUPERSONIC - db WATERFALL - db FLAIL - db FURY_ATTACK - - db 38, REMORAID - db PSYBEAM - db AURORA_BEAM - db BUBBLEBEAM - db HYPER_BEAM - + db "WILTON@", TRAINERTYPE_MOVES + db 34, SEAKING, SUPERSONIC, WATERFALL, FLAIL, FURY_ATTACK + db 34, SEAKING, SUPERSONIC, WATERFALL, FLAIL, FURY_ATTACK + db 38, REMORAID, PSYBEAM, AURORA_BEAM, BUBBLEBEAM, HYPER_BEAM db -1 ; end -; ================ - ; FISHER (23) - db "RALPH@" - db TRAINERTYPE_NORMAL - - ; party + db "RALPH@", TRAINERTYPE_NORMAL db 30, QWILFISH db 32, GOLDEEN - db -1 ; end -; ================ - ; FISHER (24) - db "RALPH@" - db TRAINERTYPE_MOVES - - ; party - - db 35, QWILFISH - db TOXIC - db MINIMIZE - db SURF - db PIN_MISSILE - - db 39, SEAKING - db ENDURE - db FLAIL - db FURY_ATTACK - db WATERFALL - + db "RALPH@", TRAINERTYPE_MOVES + db 35, QWILFISH, TOXIC, MINIMIZE, SURF, PIN_MISSILE + db 39, SEAKING, ENDURE, FLAIL, FURY_ATTACK, WATERFALL db -1 ; end -; ================ - ; FISHER (25) - db "TULLY@" - db TRAINERTYPE_MOVES - - ; party - - db 34, SEAKING - db SUPERSONIC - db RAIN_DANCE - db WATERFALL - db FURY_ATTACK - - db 34, SEAKING - db SUPERSONIC - db RAIN_DANCE - db WATERFALL - db FURY_ATTACK - - db 37, QWILFISH - db ROLLOUT - db SURF - db PIN_MISSILE - db TAKE_DOWN - + db "TULLY@", TRAINERTYPE_MOVES + db 34, SEAKING, SUPERSONIC, RAIN_DANCE, WATERFALL, FURY_ATTACK + db 34, SEAKING, SUPERSONIC, RAIN_DANCE, WATERFALL, FURY_ATTACK + db 37, QWILFISH, ROLLOUT, SURF, PIN_MISSILE, TAKE_DOWN db -1 ; end -; ================ -; ================================ - - SwimmerMGroup: -; ================================ -; ================ - ; SWIMMERM (1) - db "HAROLD@" - db TRAINERTYPE_NORMAL - - ; party + db "HAROLD@", TRAINERTYPE_NORMAL db 32, REMORAID db 30, SEADRA - db -1 ; end -; ================ - ; SWIMMERM (2) - db "SIMON@" - db TRAINERTYPE_NORMAL - - ; party + db "SIMON@", TRAINERTYPE_NORMAL db 20, TENTACOOL db 20, TENTACOOL - db -1 ; end -; ================ - ; SWIMMERM (3) - db "RANDALL@" - db TRAINERTYPE_NORMAL - - ; party + db "RANDALL@", TRAINERTYPE_NORMAL db 18, SHELLDER db 20, WARTORTLE db 18, SHELLDER - db -1 ; end -; ================ - ; SWIMMERM (4) - db "CHARLIE@" - db TRAINERTYPE_NORMAL - - ; party + db "CHARLIE@", TRAINERTYPE_NORMAL db 21, SHELLDER db 19, TENTACOOL db 19, TENTACRUEL - db -1 ; end -; ================ - ; SWIMMERM (5) - db "GEORGE@" - db TRAINERTYPE_NORMAL - - ; party + db "GEORGE@", TRAINERTYPE_NORMAL db 16, TENTACOOL db 17, TENTACOOL db 16, TENTACOOL db 19, STARYU db 17, TENTACOOL db 19, REMORAID - db -1 ; end -; ================ - ; SWIMMERM (6) - db "BERKE@" - db TRAINERTYPE_NORMAL - - ; party + db "BERKE@", TRAINERTYPE_NORMAL db 23, QWILFISH - db -1 ; end -; ================ - ; SWIMMERM (7) - db "KIRK@" - db TRAINERTYPE_NORMAL - - ; party + db "KIRK@", TRAINERTYPE_NORMAL db 20, GYARADOS db 20, GYARADOS - db -1 ; end -; ================ - ; SWIMMERM (8) - db "MATHEW@" - db TRAINERTYPE_NORMAL - - ; party + db "MATHEW@", TRAINERTYPE_NORMAL db 23, KRABBY - db -1 ; end -; ================ - ; SWIMMERM (9) - db "HAL@" - db TRAINERTYPE_NORMAL - - ; party + db "HAL@", TRAINERTYPE_NORMAL db 24, SEEL db 25, DEWGONG db 24, SEEL - db -1 ; end -; ================ - ; SWIMMERM (10) - db "PATON@" - db TRAINERTYPE_NORMAL - - ; party + db "PATON@", TRAINERTYPE_NORMAL db 26, PILOSWINE db 26, PILOSWINE - db -1 ; end -; ================ - ; SWIMMERM (11) - db "DARYL@" - db TRAINERTYPE_NORMAL - - ; party + db "DARYL@", TRAINERTYPE_NORMAL db 24, SHELLDER db 25, CLOYSTER db 24, SHELLDER - db -1 ; end -; ================ - ; SWIMMERM (12) - db "WALTER@" - db TRAINERTYPE_NORMAL - - ; party + db "WALTER@", TRAINERTYPE_NORMAL db 15, HORSEA db 15, HORSEA db 20, SEADRA - db -1 ; end -; ================ - ; SWIMMERM (13) - db "TONY@" - db TRAINERTYPE_NORMAL - - ; party + db "TONY@", TRAINERTYPE_NORMAL db 13, STARYU db 18, STARMIE db 16, HORSEA - db -1 ; end -; ================ - ; SWIMMERM (14) - db "JEROME@" - db TRAINERTYPE_NORMAL - - ; party + db "JEROME@", TRAINERTYPE_NORMAL db 26, SEADRA db 28, TENTACOOL db 30, TENTACRUEL db 28, GOLDEEN - db -1 ; end -; ================ - ; SWIMMERM (15) - db "TUCKER@" - db TRAINERTYPE_NORMAL - - ; party + db "TUCKER@", TRAINERTYPE_NORMAL db 30, SHELLDER db 34, CLOYSTER - db -1 ; end -; ================ - ; SWIMMERM (16) - db "RICK@" - db TRAINERTYPE_NORMAL - - ; party + db "RICK@", TRAINERTYPE_NORMAL db 13, STARYU db 18, STARMIE db 16, HORSEA - db -1 ; end -; ================ - ; SWIMMERM (17) - db "CAMERON@" - db TRAINERTYPE_NORMAL - - ; party + db "CAMERON@", TRAINERTYPE_NORMAL db 34, MARILL - db -1 ; end -; ================ - ; SWIMMERM (18) - db "SETH@" - db TRAINERTYPE_NORMAL - - ; party + db "SETH@", TRAINERTYPE_NORMAL db 29, QUAGSIRE db 29, OCTILLERY db 32, QUAGSIRE - db -1 ; end -; ================ - ; SWIMMERM (19) - db "JAMES@" - db TRAINERTYPE_NORMAL - - ; party + db "JAMES@", TRAINERTYPE_NORMAL db 13, STARYU db 18, STARMIE db 16, HORSEA - db -1 ; end -; ================ - ; SWIMMERM (20) - db "LEWIS@" - db TRAINERTYPE_NORMAL - - ; party + db "LEWIS@", TRAINERTYPE_NORMAL db 13, STARYU db 18, STARMIE db 16, HORSEA - db -1 ; end -; ================ - ; SWIMMERM (21) - db "PARKER@" - db TRAINERTYPE_NORMAL - - ; party + db "PARKER@", TRAINERTYPE_NORMAL db 32, HORSEA db 32, HORSEA db 35, SEADRA - db -1 ; end -; ================ -; ================================ - - SwimmerFGroup: -; ================================ -; ================ - ; SWIMMERF (1) - db "ELAINE@" - db TRAINERTYPE_NORMAL - - ; party + db "ELAINE@", TRAINERTYPE_NORMAL db 21, STARYU - db -1 ; end -; ================ - ; SWIMMERF (2) - db "PAULA@" - db TRAINERTYPE_NORMAL - - ; party + db "PAULA@", TRAINERTYPE_NORMAL db 19, STARYU db 19, SHELLDER - db -1 ; end -; ================ - ; SWIMMERF (3) - db "KAYLEE@" - db TRAINERTYPE_NORMAL - - ; party + db "KAYLEE@", TRAINERTYPE_NORMAL db 18, GOLDEEN db 20, GOLDEEN db 20, SEAKING - db -1 ; end -; ================ - ; SWIMMERF (4) - db "SUSIE@" - db TRAINERTYPE_MOVES - - ; party - - db 20, PSYDUCK - db SCRATCH - db TAIL_WHIP - db DISABLE - db CONFUSION - - db 22, GOLDEEN - db PECK - db TAIL_WHIP - db SUPERSONIC - db HORN_ATTACK - + db "SUSIE@", TRAINERTYPE_MOVES + db 20, PSYDUCK, SCRATCH, TAIL_WHIP, DISABLE, CONFUSION + db 22, GOLDEEN, PECK, TAIL_WHIP, SUPERSONIC, HORN_ATTACK db -1 ; end -; ================ - ; SWIMMERF (5) - db "DENISE@" - db TRAINERTYPE_NORMAL - - ; party + db "DENISE@", TRAINERTYPE_NORMAL db 22, SEEL - db -1 ; end -; ================ - ; SWIMMERF (6) - db "KARA@" - db TRAINERTYPE_NORMAL - - ; party + db "KARA@", TRAINERTYPE_NORMAL db 20, STARYU db 20, STARMIE - db -1 ; end -; ================ - ; SWIMMERF (7) - db "WENDY@" - db TRAINERTYPE_MOVES - - ; party - - db 21, HORSEA - db BUBBLE - db SMOKESCREEN - db LEER - db WATER_GUN - - db 21, HORSEA - db DRAGON_RAGE - db SMOKESCREEN - db LEER - db WATER_GUN - + db "WENDY@", TRAINERTYPE_MOVES + db 21, HORSEA, BUBBLE, SMOKESCREEN, LEER, WATER_GUN + db 21, HORSEA, DRAGON_RAGE, SMOKESCREEN, LEER, WATER_GUN db -1 ; end -; ================ - ; SWIMMERF (8) - db "LISA@" - db TRAINERTYPE_NORMAL - - ; party + db "LISA@", TRAINERTYPE_NORMAL db 28, JYNX - db -1 ; end -; ================ - ; SWIMMERF (9) - db "JILL@" - db TRAINERTYPE_NORMAL - - ; party + db "JILL@", TRAINERTYPE_NORMAL db 28, DEWGONG - db -1 ; end -; ================ - ; SWIMMERF (10) - db "MARY@" - db TRAINERTYPE_NORMAL - - ; party + db "MARY@", TRAINERTYPE_NORMAL db 20, SEAKING - db -1 ; end -; ================ - ; SWIMMERF (11) - db "KATIE@" - db TRAINERTYPE_NORMAL - - ; party + db "KATIE@", TRAINERTYPE_NORMAL db 33, DEWGONG - db -1 ; end -; ================ - ; SWIMMERF (12) - db "DAWN@" - db TRAINERTYPE_NORMAL - - ; party + db "DAWN@", TRAINERTYPE_NORMAL db 34, SEAKING - db -1 ; end -; ================ - ; SWIMMERF (13) - db "TARA@" - db TRAINERTYPE_NORMAL - - ; party + db "TARA@", TRAINERTYPE_NORMAL db 20, SEAKING - db -1 ; end -; ================ - ; SWIMMERF (14) - db "NICOLE@" - db TRAINERTYPE_NORMAL - - ; party + db "NICOLE@", TRAINERTYPE_NORMAL db 29, MARILL db 29, MARILL db 32, LAPRAS - db -1 ; end -; ================ - ; SWIMMERF (15) - db "LORI@" - db TRAINERTYPE_NORMAL - - ; party + db "LORI@", TRAINERTYPE_NORMAL db 32, STARMIE db 32, STARMIE - db -1 ; end -; ================ - ; SWIMMERF (16) - db "JODY@" - db TRAINERTYPE_NORMAL - - ; party + db "JODY@", TRAINERTYPE_NORMAL db 20, SEAKING - db -1 ; end -; ================ - ; SWIMMERF (17) - db "NIKKI@" - db TRAINERTYPE_NORMAL - - ; party + db "NIKKI@", TRAINERTYPE_NORMAL db 28, SEEL db 28, SEEL db 28, SEEL db 28, DEWGONG - db -1 ; end -; ================ - ; SWIMMERF (18) - db "DIANA@" - db TRAINERTYPE_NORMAL - - ; party + db "DIANA@", TRAINERTYPE_NORMAL db 37, GOLDUCK - db -1 ; end -; ================ - ; SWIMMERF (19) - db "BRIANA@" - db TRAINERTYPE_NORMAL - - ; party + db "BRIANA@", TRAINERTYPE_NORMAL db 35, SEAKING db 35, SEAKING - db -1 ; end -; ================ -; ================================ - - SailorGroup: -; ================================ -; ================ - ; SAILOR (1) - db "EUGENE@" - db TRAINERTYPE_NORMAL - - ; party + db "EUGENE@", TRAINERTYPE_NORMAL db 17, POLIWHIRL db 17, RATICATE db 19, KRABBY - db -1 ; end -; ================ - ; SAILOR (2) - db "HUEY@" - db TRAINERTYPE_NORMAL - - ; party + db "HUEY@", TRAINERTYPE_NORMAL db 18, POLIWAG db 18, POLIWHIRL - db -1 ; end -; ================ - ; SAILOR (3) - db "TERRELL@" - db TRAINERTYPE_NORMAL - - ; party + db "TERRELL@", TRAINERTYPE_NORMAL db 20, POLIWHIRL - db -1 ; end -; ================ - ; SAILOR (4) - db "KENT@" - db TRAINERTYPE_MOVES - - ; party - - db 18, KRABBY - db BUBBLE - db LEER - db VICEGRIP - db HARDEN - - db 20, KRABBY - db BUBBLEBEAM - db LEER - db VICEGRIP - db HARDEN - + db "KENT@", TRAINERTYPE_MOVES + db 18, KRABBY, BUBBLE, LEER, VICEGRIP, HARDEN + db 20, KRABBY, BUBBLEBEAM, LEER, VICEGRIP, HARDEN db -1 ; end -; ================ - ; SAILOR (5) - db "ERNEST@" - db TRAINERTYPE_NORMAL - - ; party + db "ERNEST@", TRAINERTYPE_NORMAL db 18, MACHOP db 18, MACHOP db 18, POLIWHIRL - db -1 ; end -; ================ - ; SAILOR (6) - db "JEFF@" - db TRAINERTYPE_NORMAL - - ; party + db "JEFF@", TRAINERTYPE_NORMAL db 32, RATICATE db 32, RATICATE - db -1 ; end -; ================ - ; SAILOR (7) - db "GARRETT@" - db TRAINERTYPE_NORMAL - - ; party + db "GARRETT@", TRAINERTYPE_NORMAL db 34, KINGLER - db -1 ; end -; ================ - ; SAILOR (8) - db "KENNETH@" - db TRAINERTYPE_NORMAL - - ; party + db "KENNETH@", TRAINERTYPE_NORMAL db 28, MACHOP db 28, MACHOP db 28, POLIWRATH db 28, MACHOP - db -1 ; end -; ================ - ; SAILOR (9) - db "STANLY@" - db TRAINERTYPE_NORMAL - - ; party + db "STANLY@", TRAINERTYPE_NORMAL db 31, MACHOP db 33, MACHOKE db 26, PSYDUCK - db -1 ; end -; ================ - ; SAILOR (10) - db "HARRY@" - db TRAINERTYPE_NORMAL - - ; party + db "HARRY@", TRAINERTYPE_NORMAL db 19, WOOPER - db -1 ; end -; ================ - ; SAILOR (11) - db "HUEY@" - db TRAINERTYPE_NORMAL - - ; party + db "HUEY@", TRAINERTYPE_NORMAL db 28, POLIWHIRL db 28, POLIWHIRL - db -1 ; end -; ================ - ; SAILOR (12) - db "HUEY@" - db TRAINERTYPE_NORMAL - - ; party + db "HUEY@", TRAINERTYPE_NORMAL db 34, POLIWHIRL db 34, POLIWRATH - db -1 ; end -; ================ - ; SAILOR (13) - db "HUEY@" - db TRAINERTYPE_MOVES - - ; party - - db 38, POLITOED - db WHIRLPOOL - db RAIN_DANCE - db BODY_SLAM - db PERISH_SONG - - db 38, POLIWRATH - db SURF - db STRENGTH - db ICE_PUNCH - db SUBMISSION - + db "HUEY@", TRAINERTYPE_MOVES + db 38, POLITOED, WHIRLPOOL, RAIN_DANCE, BODY_SLAM, PERISH_SONG + db 38, POLIWRATH, SURF, STRENGTH, ICE_PUNCH, SUBMISSION db -1 ; end -; ================ -; ================================ - - SuperNerdGroup: -; ================================ -; ================ - ; SUPER_NERD (1) - db "STAN@" - db TRAINERTYPE_NORMAL - - ; party + db "STAN@", TRAINERTYPE_NORMAL db 20, GRIMER - db -1 ; end -; ================ - ; SUPER_NERD (2) - db "ERIC@" - db TRAINERTYPE_NORMAL - - ; party + db "ERIC@", TRAINERTYPE_NORMAL db 11, GRIMER db 11, GRIMER - db -1 ; end -; ================ - ; SUPER_NERD (3) - db "GREGG@" - db TRAINERTYPE_NORMAL - - ; party + db "GREGG@", TRAINERTYPE_NORMAL db 20, MAGNEMITE db 20, MAGNEMITE db 20, MAGNEMITE - db -1 ; end -; ================ - ; SUPER_NERD (4) - db "JAY@" - db TRAINERTYPE_NORMAL - - ; party + db "JAY@", TRAINERTYPE_NORMAL db 22, KOFFING db 22, KOFFING - db -1 ; end -; ================ - ; SUPER_NERD (5) - db "DAVE@" - db TRAINERTYPE_NORMAL - - ; party + db "DAVE@", TRAINERTYPE_NORMAL db 24, DITTO - db -1 ; end -; ================ - ; SUPER_NERD (6) - db "SAM@" - db TRAINERTYPE_NORMAL - - ; party + db "SAM@", TRAINERTYPE_NORMAL db 34, GRIMER db 34, MUK - db -1 ; end -; ================ - ; SUPER_NERD (7) - db "TOM@" - db TRAINERTYPE_NORMAL - - ; party + db "TOM@", TRAINERTYPE_NORMAL db 32, MAGNEMITE db 32, MAGNEMITE db 32, MAGNEMITE - db -1 ; end -; ================ - ; SUPER_NERD (8) - db "PAT@" - db TRAINERTYPE_NORMAL - - ; party + db "PAT@", TRAINERTYPE_NORMAL db 36, PORYGON - db -1 ; end -; ================ - ; SUPER_NERD (9) - db "SHAWN@" - db TRAINERTYPE_NORMAL - - ; party + db "SHAWN@", TRAINERTYPE_NORMAL db 31, MAGNEMITE db 33, MUK db 31, MAGNEMITE - db -1 ; end -; ================ - ; SUPER_NERD (10) - db "TERU@" - db TRAINERTYPE_NORMAL - - ; party - db 7, MAGNEMITE + db "TERU@", TRAINERTYPE_NORMAL + db 7, MAGNEMITE db 11, VOLTORB - db 7, MAGNEMITE - db 9, MAGNEMITE - + db 7, MAGNEMITE + db 9, MAGNEMITE db -1 ; end -; ================ - ; SUPER_NERD (11) - db "RUSS@" - db TRAINERTYPE_NORMAL - - ; party + db "RUSS@", TRAINERTYPE_NORMAL db 27, MAGNEMITE db 27, MAGNEMITE db 27, MAGNEMITE - db -1 ; end -; ================ - ; SUPER_NERD (12) - db "NORTON@" - db TRAINERTYPE_MOVES - - ; party - - db 30, PORYGON - db CONVERSION - db CONVERSION2 - db RECOVER - db TRI_ATTACK - + db "NORTON@", TRAINERTYPE_MOVES + db 30, PORYGON, CONVERSION, CONVERSION2, RECOVER, TRI_ATTACK db -1 ; end -; ================ - ; SUPER_NERD (13) - db "HUGH@" - db TRAINERTYPE_MOVES - - ; party - - db 39, SEADRA - db SMOKESCREEN - db TWISTER - db SURF - db WATERFALL - + db "HUGH@", TRAINERTYPE_MOVES + db 39, SEADRA, SMOKESCREEN, TWISTER, SURF, WATERFALL db -1 ; end -; ================ - ; SUPER_NERD (14) - db "MARKUS@" - db TRAINERTYPE_MOVES - - ; party - - db 19, SLOWPOKE - db CURSE - db WATER_GUN - db GROWL - db STRENGTH - + db "MARKUS@", TRAINERTYPE_MOVES + db 19, SLOWPOKE, CURSE, WATER_GUN, GROWL, STRENGTH db -1 ; end -; ================ -; ================================ - - Rival2Group: -; ================================ -; ================ - ; RIVAL2 (1) - db "?@" - db TRAINERTYPE_MOVES - - ; party - - db 41, SNEASEL - db QUICK_ATTACK - db SCREECH - db FAINT_ATTACK - db FURY_CUTTER - - db 42, GOLBAT - db LEECH_LIFE - db BITE - db CONFUSE_RAY - db WING_ATTACK - - db 41, MAGNETON - db THUNDERSHOCK - db SONICBOOM - db THUNDER_WAVE - db SWIFT - - db 43, GENGAR - db MEAN_LOOK - db CURSE - db SHADOW_BALL - db CONFUSE_RAY - - db 43, ALAKAZAM - db DISABLE - db RECOVER - db FUTURE_SIGHT - db PSYCHIC_M - - db 45, MEGANIUM - db RAZOR_LEAF - db POISONPOWDER - db BODY_SLAM - db LIGHT_SCREEN - + db "?@", TRAINERTYPE_MOVES + db 41, SNEASEL, QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER + db 42, GOLBAT, LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK + db 41, MAGNETON, THUNDERSHOCK, SONICBOOM, THUNDER_WAVE, SWIFT + db 43, GENGAR, MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY + db 43, ALAKAZAM, DISABLE, RECOVER, FUTURE_SIGHT, PSYCHIC_M + db 45, MEGANIUM, RAZOR_LEAF, POISONPOWDER, BODY_SLAM, LIGHT_SCREEN db -1 ; end -; ================ - ; RIVAL2 (2) - db "?@" - db TRAINERTYPE_MOVES - - ; party - - db 41, SNEASEL - db QUICK_ATTACK - db SCREECH - db FAINT_ATTACK - db FURY_CUTTER - - db 42, GOLBAT - db LEECH_LIFE - db BITE - db CONFUSE_RAY - db WING_ATTACK - - db 41, MAGNETON - db THUNDERSHOCK - db SONICBOOM - db THUNDER_WAVE - db SWIFT - - db 43, GENGAR - db MEAN_LOOK - db CURSE - db SHADOW_BALL - db CONFUSE_RAY - - db 43, ALAKAZAM - db DISABLE - db RECOVER - db FUTURE_SIGHT - db PSYCHIC_M - - db 45, TYPHLOSION - db SMOKESCREEN - db QUICK_ATTACK - db FLAME_WHEEL - db SWIFT - + db "?@", TRAINERTYPE_MOVES + db 41, SNEASEL, QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER + db 42, GOLBAT, LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK + db 41, MAGNETON, THUNDERSHOCK, SONICBOOM, THUNDER_WAVE, SWIFT + db 43, GENGAR, MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY + db 43, ALAKAZAM, DISABLE, RECOVER, FUTURE_SIGHT, PSYCHIC_M + db 45, TYPHLOSION, SMOKESCREEN, QUICK_ATTACK, FLAME_WHEEL, SWIFT db -1 ; end -; ================ - ; RIVAL2 (3) - db "?@" - db TRAINERTYPE_MOVES - - ; party - - db 41, SNEASEL - db QUICK_ATTACK - db SCREECH - db FAINT_ATTACK - db FURY_CUTTER - - db 42, GOLBAT - db LEECH_LIFE - db BITE - db CONFUSE_RAY - db WING_ATTACK - - db 41, MAGNETON - db THUNDERSHOCK - db SONICBOOM - db THUNDER_WAVE - db SWIFT - - db 43, GENGAR - db MEAN_LOOK - db CURSE - db SHADOW_BALL - db CONFUSE_RAY - - db 43, ALAKAZAM - db DISABLE - db RECOVER - db FUTURE_SIGHT - db PSYCHIC_M - - db 45, FERALIGATR - db RAGE - db WATER_GUN - db SCARY_FACE - db SLASH - + db "?@", TRAINERTYPE_MOVES + db 41, SNEASEL, QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER + db 42, GOLBAT, LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK + db 41, MAGNETON, THUNDERSHOCK, SONICBOOM, THUNDER_WAVE, SWIFT + db 43, GENGAR, MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY + db 43, ALAKAZAM, DISABLE, RECOVER, FUTURE_SIGHT, PSYCHIC_M + db 45, FERALIGATR, RAGE, WATER_GUN, SCARY_FACE, SLASH db -1 ; end -; ================ - ; RIVAL2 (4) - db "?@" - db TRAINERTYPE_MOVES - - ; party - - db 45, SNEASEL - db QUICK_ATTACK - db SCREECH - db FAINT_ATTACK - db FURY_CUTTER - - db 48, CROBAT - db TOXIC - db BITE - db CONFUSE_RAY - db WING_ATTACK - - db 45, MAGNETON - db THUNDER - db SONICBOOM - db THUNDER_WAVE - db SWIFT - - db 46, GENGAR - db MEAN_LOOK - db CURSE - db SHADOW_BALL - db CONFUSE_RAY - - db 46, ALAKAZAM - db RECOVER - db FUTURE_SIGHT - db PSYCHIC_M - db REFLECT - - db 50, MEGANIUM - db GIGA_DRAIN - db BODY_SLAM - db LIGHT_SCREEN - db SAFEGUARD - + db "?@", TRAINERTYPE_MOVES + db 45, SNEASEL, QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER + db 48, CROBAT, TOXIC, BITE, CONFUSE_RAY, WING_ATTACK + db 45, MAGNETON, THUNDER, SONICBOOM, THUNDER_WAVE, SWIFT + db 46, GENGAR, MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY + db 46, ALAKAZAM, RECOVER, FUTURE_SIGHT, PSYCHIC_M, REFLECT + db 50, MEGANIUM, GIGA_DRAIN, BODY_SLAM, LIGHT_SCREEN, SAFEGUARD db -1 ; end -; ================ - ; RIVAL2 (5) - db "?@" - db TRAINERTYPE_MOVES - - ; party - - db 45, SNEASEL - db QUICK_ATTACK - db SCREECH - db FAINT_ATTACK - db FURY_CUTTER - - db 48, CROBAT - db TOXIC - db BITE - db CONFUSE_RAY - db WING_ATTACK - - db 45, MAGNETON - db THUNDER - db SONICBOOM - db THUNDER_WAVE - db SWIFT - - db 46, GENGAR - db MEAN_LOOK - db CURSE - db SHADOW_BALL - db CONFUSE_RAY - - db 46, ALAKAZAM - db RECOVER - db FUTURE_SIGHT - db PSYCHIC_M - db REFLECT - - db 50, TYPHLOSION - db SMOKESCREEN - db QUICK_ATTACK - db FIRE_BLAST - db SWIFT - + db "?@", TRAINERTYPE_MOVES + db 45, SNEASEL, QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER + db 48, CROBAT, TOXIC, BITE, CONFUSE_RAY, WING_ATTACK + db 45, MAGNETON, THUNDER, SONICBOOM, THUNDER_WAVE, SWIFT + db 46, GENGAR, MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY + db 46, ALAKAZAM, RECOVER, FUTURE_SIGHT, PSYCHIC_M, REFLECT + db 50, TYPHLOSION, SMOKESCREEN, QUICK_ATTACK, FIRE_BLAST, SWIFT db -1 ; end -; ================ - ; RIVAL2 (6) - db "?@" - db TRAINERTYPE_MOVES - - ; party - - db 45, SNEASEL - db QUICK_ATTACK - db SCREECH - db FAINT_ATTACK - db FURY_CUTTER - - db 48, CROBAT - db TOXIC - db BITE - db CONFUSE_RAY - db WING_ATTACK - - db 45, MAGNETON - db THUNDER - db SONICBOOM - db THUNDER_WAVE - db SWIFT - - db 46, GENGAR - db MEAN_LOOK - db CURSE - db SHADOW_BALL - db CONFUSE_RAY - - db 46, ALAKAZAM - db RECOVER - db FUTURE_SIGHT - db PSYCHIC_M - db REFLECT - - db 50, FERALIGATR - db SURF - db RAIN_DANCE - db SLASH - db SCREECH - + db "?@", TRAINERTYPE_MOVES + db 45, SNEASEL, QUICK_ATTACK, SCREECH, FAINT_ATTACK, FURY_CUTTER + db 48, CROBAT, TOXIC, BITE, CONFUSE_RAY, WING_ATTACK + db 45, MAGNETON, THUNDER, SONICBOOM, THUNDER_WAVE, SWIFT + db 46, GENGAR, MEAN_LOOK, CURSE, SHADOW_BALL, CONFUSE_RAY + db 46, ALAKAZAM, RECOVER, FUTURE_SIGHT, PSYCHIC_M, REFLECT + db 50, FERALIGATR, SURF, RAIN_DANCE, SLASH, SCREECH db -1 ; end -; ================ -; ================================ - - GuitaristGroup: -; ================================ -; ================ - ; GUITARIST (1) - db "CLYDE@" - db TRAINERTYPE_NORMAL - - ; party + db "CLYDE@", TRAINERTYPE_NORMAL db 34, ELECTABUZZ - db -1 ; end -; ================ - ; GUITARIST (2) - db "VINCENT@" - db TRAINERTYPE_NORMAL - - ; party + db "VINCENT@", TRAINERTYPE_NORMAL db 27, MAGNEMITE db 33, VOLTORB db 32, MAGNEMITE db 32, MAGNEMITE - db -1 ; end -; ================ -; ================================ - - HikerGroup: -; ================================ -; ================ - ; HIKER (1) - db "ANTHONY@" - db TRAINERTYPE_NORMAL - - ; party + db "ANTHONY@", TRAINERTYPE_NORMAL db 16, GEODUDE db 18, MACHAMP - db -1 ; end -; ================ - ; HIKER (2) - db "RUSSELL@" - db TRAINERTYPE_NORMAL - - ; party - db 4, GEODUDE - db 6, GEODUDE - db 8, GEODUDE - + db "RUSSELL@", TRAINERTYPE_NORMAL + db 4, GEODUDE + db 6, GEODUDE + db 8, GEODUDE db -1 ; end -; ================ - ; HIKER (3) - db "PHILLIP@" - db TRAINERTYPE_NORMAL - - ; party + db "PHILLIP@", TRAINERTYPE_NORMAL db 23, GEODUDE db 23, GEODUDE db 23, GRAVELER - db -1 ; end -; ================ - ; HIKER (4) - db "LEONARD@" - db TRAINERTYPE_NORMAL - - ; party + db "LEONARD@", TRAINERTYPE_NORMAL db 23, GEODUDE db 25, MACHOP - db -1 ; end -; ================ - ; HIKER (5) - db "ANTHONY@" - db TRAINERTYPE_NORMAL - - ; party + db "ANTHONY@", TRAINERTYPE_NORMAL db 11, GEODUDE db 11, MACHOP - db -1 ; end -; ================ - ; HIKER (6) - db "BENJAMIN@" - db TRAINERTYPE_NORMAL - - ; party + db "BENJAMIN@", TRAINERTYPE_NORMAL db 14, DIGLETT db 14, GEODUDE db 16, DUGTRIO - db -1 ; end -; ================ - ; HIKER (7) - db "ERIK@" - db TRAINERTYPE_NORMAL - - ; party + db "ERIK@", TRAINERTYPE_NORMAL db 24, MACHOP db 27, GRAVELER db 27, MACHOP - db -1 ; end -; ================ - ; HIKER (8) - db "MICHAEL@" - db TRAINERTYPE_NORMAL - - ; party + db "MICHAEL@", TRAINERTYPE_NORMAL db 25, GEODUDE db 25, GRAVELER db 25, GOLEM - db -1 ; end -; ================ - ; HIKER (9) - db "PARRY@" - db TRAINERTYPE_NORMAL - - ; party + db "PARRY@", TRAINERTYPE_NORMAL db 35, ONIX db 33, SWINUB - db -1 ; end -; ================ - ; HIKER (10) - db "TIMOTHY@" - db TRAINERTYPE_MOVES - - ; party - - db 27, DIGLETT - db MAGNITUDE - db DIG - db SAND_ATTACK - db SLASH - - db 27, DUGTRIO - db MAGNITUDE - db DIG - db SAND_ATTACK - db SLASH - + db "TIMOTHY@", TRAINERTYPE_MOVES + db 27, DIGLETT, MAGNITUDE, DIG, SAND_ATTACK, SLASH + db 27, DUGTRIO, MAGNITUDE, DIG, SAND_ATTACK, SLASH db -1 ; end -; ================ - ; HIKER (11) - db "BAILEY@" - db TRAINERTYPE_NORMAL - - ; party + db "BAILEY@", TRAINERTYPE_NORMAL db 13, GEODUDE db 13, GEODUDE db 13, GEODUDE db 13, GEODUDE db 13, GEODUDE - db -1 ; end -; ================ - ; HIKER (12) - db "ANTHONY@" - db TRAINERTYPE_NORMAL - - ; party + db "ANTHONY@", TRAINERTYPE_NORMAL db 25, GRAVELER db 27, GRAVELER db 29, MACHOKE - db -1 ; end -; ================ - ; HIKER (13) - db "TIM@" - db TRAINERTYPE_NORMAL - - ; party + db "TIM@", TRAINERTYPE_NORMAL db 31, GRAVELER db 31, GRAVELER db 31, GRAVELER - db -1 ; end -; ================ - ; HIKER (14) - db "NOLAND@" - db TRAINERTYPE_NORMAL - - ; party + db "NOLAND@", TRAINERTYPE_NORMAL db 31, SANDSLASH db 33, GOLEM - db -1 ; end -; ================ - ; HIKER (15) - db "SIDNEY@" - db TRAINERTYPE_NORMAL - - ; party + db "SIDNEY@", TRAINERTYPE_NORMAL db 34, DUGTRIO db 32, ONIX - db -1 ; end -; ================ - ; HIKER (16) - db "KENNY@" - db TRAINERTYPE_NORMAL - - ; party + db "KENNY@", TRAINERTYPE_NORMAL db 27, SANDSLASH db 29, GRAVELER db 31, GOLEM db 29, GRAVELER - db -1 ; end -; ================ - ; HIKER (17) - db "JIM@" - db TRAINERTYPE_NORMAL - - ; party + db "JIM@", TRAINERTYPE_NORMAL db 35, MACHAMP - db -1 ; end -; ================ - ; HIKER (18) - db "DANIEL@" - db TRAINERTYPE_NORMAL - - ; party + db "DANIEL@", TRAINERTYPE_NORMAL db 11, ONIX - db -1 ; end -; ================ - ; HIKER (19) - db "PARRY@" - db TRAINERTYPE_MOVES - - ; party - - db 35, PILOSWINE - db EARTHQUAKE - db BLIZZARD - db REST - db TAKE_DOWN - - db 35, DUGTRIO - db MAGNITUDE - db DIG - db MUD_SLAP - db SLASH - - db 38, STEELIX - db DIG - db IRON_TAIL - db SANDSTORM - db SLAM - + db "PARRY@", TRAINERTYPE_MOVES + db 35, PILOSWINE, EARTHQUAKE, BLIZZARD, REST, TAKE_DOWN + db 35, DUGTRIO, MAGNITUDE, DIG, MUD_SLAP, SLASH + db 38, STEELIX, DIG, IRON_TAIL, SANDSTORM, SLAM db -1 ; end -; ================ - ; HIKER (20) - db "PARRY@" - db TRAINERTYPE_NORMAL - - ; party + db "PARRY@", TRAINERTYPE_NORMAL db 29, ONIX - db -1 ; end -; ================ - ; HIKER (21) - db "ANTHONY@" - db TRAINERTYPE_NORMAL - - ; party + db "ANTHONY@", TRAINERTYPE_NORMAL db 30, GRAVELER db 30, GRAVELER db 32, MACHOKE - db -1 ; end -; ================ - ; HIKER (22) - db "ANTHONY@" - db TRAINERTYPE_MOVES - - ; party - - db 34, GRAVELER - db MAGNITUDE - db SELFDESTRUCT - db DEFENSE_CURL - db ROLLOUT - - db 36, GOLEM - db MAGNITUDE - db SELFDESTRUCT - db DEFENSE_CURL - db ROLLOUT - - db 34, MACHOKE - db KARATE_CHOP - db VITAL_THROW - db HEADBUTT - db DIG - + db "ANTHONY@", TRAINERTYPE_MOVES + db 34, GRAVELER, MAGNITUDE, SELFDESTRUCT, DEFENSE_CURL, ROLLOUT + db 36, GOLEM, MAGNITUDE, SELFDESTRUCT, DEFENSE_CURL, ROLLOUT + db 34, MACHOKE, KARATE_CHOP, VITAL_THROW, HEADBUTT, DIG db -1 ; end -; ================ -; ================================ - - BikerGroup: -; ================================ -; ================ - ; BIKER (1) - db "BENNY@" - db TRAINERTYPE_NORMAL - - ; party + db "BENNY@", TRAINERTYPE_NORMAL db 20, KOFFING db 20, KOFFING db 20, KOFFING - db -1 ; end -; ================ - ; BIKER (2) - db "KAZU@" - db TRAINERTYPE_NORMAL - - ; party + db "KAZU@", TRAINERTYPE_NORMAL db 20, KOFFING db 20, KOFFING db 20, KOFFING - db -1 ; end -; ================ - ; BIKER (3) - db "DWAYNE@" - db TRAINERTYPE_NORMAL - - ; party + db "DWAYNE@", TRAINERTYPE_NORMAL db 27, KOFFING db 28, KOFFING db 29, KOFFING db 30, KOFFING - db -1 ; end -; ================ - ; BIKER (4) - db "HARRIS@" - db TRAINERTYPE_NORMAL - - ; party + db "HARRIS@", TRAINERTYPE_NORMAL db 34, FLAREON - db -1 ; end -; ================ - ; BIKER (5) - db "ZEKE@" - db TRAINERTYPE_NORMAL - - ; party + db "ZEKE@", TRAINERTYPE_NORMAL db 32, KOFFING db 32, KOFFING - db -1 ; end -; ================ - ; BIKER (6) - db "CHARLES@" - db TRAINERTYPE_NORMAL - - ; party + db "CHARLES@", TRAINERTYPE_NORMAL db 30, KOFFING db 30, CHARMELEON db 30, WEEZING - db -1 ; end -; ================ - ; BIKER (7) - db "RILEY@" - db TRAINERTYPE_NORMAL - - ; party + db "RILEY@", TRAINERTYPE_NORMAL db 34, WEEZING - db -1 ; end -; ================ - ; BIKER (8) - db "JOEL@" - db TRAINERTYPE_NORMAL - - ; party + db "JOEL@", TRAINERTYPE_NORMAL db 32, MAGMAR db 32, MAGMAR - db -1 ; end -; ================ - ; BIKER (9) - db "GLENN@" - db TRAINERTYPE_NORMAL - - ; party + db "GLENN@", TRAINERTYPE_NORMAL db 28, KOFFING db 30, MAGMAR db 32, WEEZING - db -1 ; end -; ================ -; ================================ - - BlaineGroup: -; ================================ -; ================ - ; BLAINE (1) - db "BLAINE@" - db TRAINERTYPE_MOVES - - ; party - - db 45, MAGCARGO - db CURSE - db SMOG - db FLAMETHROWER - db ROCK_SLIDE - - db 45, MAGMAR - db THUNDERPUNCH - db FIRE_PUNCH - db SUNNY_DAY - db CONFUSE_RAY - - db 50, RAPIDASH - db QUICK_ATTACK - db FIRE_SPIN - db FURY_ATTACK - db FIRE_BLAST - + db "BLAINE@", TRAINERTYPE_MOVES + db 45, MAGCARGO, CURSE, SMOG, FLAMETHROWER, ROCK_SLIDE + db 45, MAGMAR, THUNDERPUNCH, FIRE_PUNCH, SUNNY_DAY, CONFUSE_RAY + db 50, RAPIDASH, QUICK_ATTACK, FIRE_SPIN, FURY_ATTACK, FIRE_BLAST db -1 ; end -; ================ -; ================================ - - BurglarGroup: -; ================================ -; ================ - ; BURGLAR (1) - db "DUNCAN@" - db TRAINERTYPE_NORMAL - - ; party + db "DUNCAN@", TRAINERTYPE_NORMAL db 23, KOFFING db 25, MAGMAR db 23, KOFFING - db -1 ; end -; ================ - ; BURGLAR (2) - db "EDDIE@" - db TRAINERTYPE_MOVES - - ; party - - db 26, GROWLITHE - db ROAR - db EMBER - db LEER - db TAKE_DOWN - - db 24, KOFFING - db TACKLE - db SMOG - db SLUDGE - db SMOKESCREEN - + db "EDDIE@", TRAINERTYPE_MOVES + db 26, GROWLITHE, ROAR, EMBER, LEER, TAKE_DOWN + db 24, KOFFING, TACKLE, SMOG, SLUDGE, SMOKESCREEN db -1 ; end -; ================ - ; BURGLAR (3) - db "COREY@" - db TRAINERTYPE_NORMAL - - ; party + db "COREY@", TRAINERTYPE_NORMAL db 25, KOFFING db 28, MAGMAR db 25, KOFFING db 30, KOFFING - db -1 ; end -; ================ -; ================================ - - FirebreatherGroup: -; ================================ -; ================ - ; FIREBREATHER (1) - db "OTIS@" - db TRAINERTYPE_NORMAL - - ; party + db "OTIS@", TRAINERTYPE_NORMAL db 29, MAGMAR db 32, WEEZING db 29, MAGMAR - db -1 ; end -; ================ - ; FIREBREATHER (2) - db "DICK@" - db TRAINERTYPE_NORMAL - - ; party + db "DICK@", TRAINERTYPE_NORMAL db 17, CHARMELEON - db -1 ; end -; ================ - ; FIREBREATHER (3) - db "NED@" - db TRAINERTYPE_NORMAL - - ; party + db "NED@", TRAINERTYPE_NORMAL db 15, KOFFING db 16, GROWLITHE db 15, KOFFING - db -1 ; end -; ================ - ; FIREBREATHER (4) - db "BURT@" - db TRAINERTYPE_NORMAL - - ; party + db "BURT@", TRAINERTYPE_NORMAL db 32, KOFFING db 32, SLUGMA - db -1 ; end -; ================ - ; FIREBREATHER (5) - db "BILL@" - db TRAINERTYPE_NORMAL - - ; party - db 6, KOFFING - db 6, KOFFING - + db "BILL@", TRAINERTYPE_NORMAL + db 6, KOFFING + db 6, KOFFING db -1 ; end -; ================ - ; FIREBREATHER (6) - db "WALT@" - db TRAINERTYPE_NORMAL - - ; party + db "WALT@", TRAINERTYPE_NORMAL db 11, MAGMAR db 13, MAGMAR - db -1 ; end -; ================ - ; FIREBREATHER (7) - db "RAY@" - db TRAINERTYPE_NORMAL - - ; party - db 9, VULPIX - + db "RAY@", TRAINERTYPE_NORMAL + db 9, VULPIX db -1 ; end -; ================ - ; FIREBREATHER (8) - db "LYLE@" - db TRAINERTYPE_NORMAL - - ; party + db "LYLE@", TRAINERTYPE_NORMAL db 28, KOFFING db 31, FLAREON db 28, KOFFING - db -1 ; end -; ================ -; ================================ - - JugglerGroup: -; ================================ -; ================ - ; JUGGLER (1) - db "IRWIN@" - db TRAINERTYPE_NORMAL - - ; party - db 2, VOLTORB - db 6, VOLTORB + db "IRWIN@", TRAINERTYPE_NORMAL + db 2, VOLTORB + db 6, VOLTORB db 10, VOLTORB db 14, VOLTORB - db -1 ; end -; ================ - ; JUGGLER (2) - db "FRITZ@" - db TRAINERTYPE_NORMAL - - ; party + db "FRITZ@", TRAINERTYPE_NORMAL db 29, MR__MIME db 29, MAGMAR db 29, MACHOKE - db -1 ; end -; ================ - ; JUGGLER (3) - db "HORTON@" - db TRAINERTYPE_NORMAL - - ; party + db "HORTON@", TRAINERTYPE_NORMAL db 33, ELECTRODE db 33, ELECTRODE db 33, ELECTRODE db 33, ELECTRODE - db -1 ; end -; ================ - ; JUGGLER (4) - db "IRWIN@" - db TRAINERTYPE_NORMAL - - ; party - db 6, VOLTORB + db "IRWIN@", TRAINERTYPE_NORMAL + db 6, VOLTORB db 10, VOLTORB db 14, VOLTORB db 18, VOLTORB - db -1 ; end -; ================ - ; JUGGLER (5) - db "IRWIN@" - db TRAINERTYPE_NORMAL - - ; party + db "IRWIN@", TRAINERTYPE_NORMAL db 18, VOLTORB db 22, VOLTORB db 26, VOLTORB db 30, ELECTRODE - db -1 ; end -; ================ - ; JUGGLER (6) - db "IRWIN@" - db TRAINERTYPE_NORMAL - - ; party + db "IRWIN@", TRAINERTYPE_NORMAL db 18, VOLTORB db 22, VOLTORB db 26, VOLTORB db 30, ELECTRODE - db -1 ; end -; ================ -; ================================ - - BlackbeltGroup: -; ================================ -; ================ - ; BLACKBELT_T (1) - db "KENJI@" - db TRAINERTYPE_NORMAL - - ; party + db "KENJI@", TRAINERTYPE_NORMAL db 27, ONIX db 30, HITMONLEE db 27, ONIX db 32, MACHOKE - db -1 ; end -; ================ - ; BLACKBELT_T (2) - db "YOSHI@" - db TRAINERTYPE_MOVES - - ; party - - db 27, HITMONLEE - db DOUBLE_KICK - db MEDITATE - db JUMP_KICK - db FOCUS_ENERGY - + db "YOSHI@", TRAINERTYPE_MOVES + db 27, HITMONLEE, DOUBLE_KICK, MEDITATE, JUMP_KICK, FOCUS_ENERGY db -1 ; end -; ================ - ; BLACKBELT_T (3) - db "KENJI@" - db TRAINERTYPE_MOVES - - ; party - - db 33, ONIX - db BIND - db ROCK_THROW - db TOXIC - db DIG - - db 38, MACHAMP - db HEADBUTT - db SWAGGER - db THUNDERPUNCH - db VITAL_THROW - - db 33, STEELIX - db EARTHQUAKE - db ROCK_THROW - db IRON_TAIL - db SANDSTORM - - db 36, HITMONLEE - db DOUBLE_TEAM - db HI_JUMP_KICK - db MUD_SLAP - db SWIFT - + db "KENJI@", TRAINERTYPE_MOVES + db 33, ONIX, BIND, ROCK_THROW, TOXIC, DIG + db 38, MACHAMP, HEADBUTT, SWAGGER, THUNDERPUNCH, VITAL_THROW + db 33, STEELIX, EARTHQUAKE, ROCK_THROW, IRON_TAIL, SANDSTORM + db 36, HITMONLEE, DOUBLE_TEAM, HI_JUMP_KICK, MUD_SLAP, SWIFT db -1 ; end -; ================ - ; BLACKBELT_T (4) - db "LAO@" - db TRAINERTYPE_MOVES - - ; party - - db 27, HITMONCHAN - db COMET_PUNCH - db THUNDERPUNCH - db ICE_PUNCH - db FIRE_PUNCH - + db "LAO@", TRAINERTYPE_MOVES + db 27, HITMONCHAN, COMET_PUNCH, THUNDERPUNCH, ICE_PUNCH, FIRE_PUNCH db -1 ; end -; ================ - ; BLACKBELT_T (5) - db "NOB@" - db TRAINERTYPE_MOVES - - ; party - - db 25, MACHOP - db LEER - db FOCUS_ENERGY - db KARATE_CHOP - db SEISMIC_TOSS - - db 25, MACHOKE - db LEER - db KARATE_CHOP - db SEISMIC_TOSS - db ROCK_SLIDE - + db "NOB@", TRAINERTYPE_MOVES + db 25, MACHOP, LEER, FOCUS_ENERGY, KARATE_CHOP, SEISMIC_TOSS + db 25, MACHOKE, LEER, KARATE_CHOP, SEISMIC_TOSS, ROCK_SLIDE db -1 ; end -; ================ - ; BLACKBELT_T (6) - db "KIYO@" - db TRAINERTYPE_NORMAL - - ; party + db "KIYO@", TRAINERTYPE_NORMAL db 34, HITMONLEE db 34, HITMONCHAN - db -1 ; end -; ================ - ; BLACKBELT_T (7) - db "LUNG@" - db TRAINERTYPE_NORMAL - - ; party + db "LUNG@", TRAINERTYPE_NORMAL db 23, MANKEY db 23, MANKEY db 25, PRIMEAPE - db -1 ; end -; ================ - ; BLACKBELT_T (8) - db "KENJI@" - db TRAINERTYPE_NORMAL - - ; party + db "KENJI@", TRAINERTYPE_NORMAL db 28, MACHOKE - db -1 ; end -; ================ - ; BLACKBELT_T (9) - db "WAI@" - db TRAINERTYPE_NORMAL - - ; party + db "WAI@", TRAINERTYPE_NORMAL db 30, MACHOKE db 32, MACHOKE db 34, MACHOKE - db -1 ; end -; ================ -; ================================ - - ExecutiveMGroup: -; ================================ -; ================ - ; EXECUTIVEM (1) - db "EXECUTIVE@" - db TRAINERTYPE_MOVES - - ; party - - db 33, HOUNDOUR - db EMBER - db ROAR - db BITE - db FAINT_ATTACK - - db 33, KOFFING - db TACKLE - db SLUDGE - db SMOKESCREEN - db HAZE - - db 35, HOUNDOOM - db EMBER - db SMOG - db BITE - db FAINT_ATTACK - + db "EXECUTIVE@", TRAINERTYPE_MOVES + db 33, HOUNDOUR, EMBER, ROAR, BITE, FAINT_ATTACK + db 33, KOFFING, TACKLE, SLUDGE, SMOKESCREEN, HAZE + db 35, HOUNDOOM, EMBER, SMOG, BITE, FAINT_ATTACK db -1 ; end -; ================ - ; EXECUTIVEM (2) - db "EXECUTIVE@" - db TRAINERTYPE_MOVES - - ; party - - db 36, GOLBAT - db LEECH_LIFE - db BITE - db CONFUSE_RAY - db WING_ATTACK - + db "EXECUTIVE@", TRAINERTYPE_MOVES + db 36, GOLBAT, LEECH_LIFE, BITE, CONFUSE_RAY, WING_ATTACK db -1 ; end -; ================ - ; EXECUTIVEM (3) - db "EXECUTIVE@" - db TRAINERTYPE_MOVES - - ; party - - db 30, KOFFING - db TACKLE - db SELFDESTRUCT - db SLUDGE - db SMOKESCREEN - - db 30, KOFFING - db TACKLE - db SELFDESTRUCT - db SLUDGE - db SMOKESCREEN - - db 30, KOFFING - db TACKLE - db SELFDESTRUCT - db SLUDGE - db SMOKESCREEN - - db 32, WEEZING - db TACKLE - db EXPLOSION - db SLUDGE - db SMOKESCREEN - - db 30, KOFFING - db TACKLE - db SELFDESTRUCT - db SLUDGE - db SMOKESCREEN - - db 30, KOFFING - db TACKLE - db SMOG - db SLUDGE - db SMOKESCREEN - + db "EXECUTIVE@", TRAINERTYPE_MOVES + db 30, KOFFING, TACKLE, SELFDESTRUCT, SLUDGE, SMOKESCREEN + db 30, KOFFING, TACKLE, SELFDESTRUCT, SLUDGE, SMOKESCREEN + db 30, KOFFING, TACKLE, SELFDESTRUCT, SLUDGE, SMOKESCREEN + db 32, WEEZING, TACKLE, EXPLOSION, SLUDGE, SMOKESCREEN + db 30, KOFFING, TACKLE, SELFDESTRUCT, SLUDGE, SMOKESCREEN + db 30, KOFFING, TACKLE, SMOG, SLUDGE, SMOKESCREEN db -1 ; end -; ================ - ; EXECUTIVEM (4) - db "EXECUTIVE@" - db TRAINERTYPE_NORMAL - - ; party + db "EXECUTIVE@", TRAINERTYPE_NORMAL db 22, ZUBAT db 24, RATICATE db 22, KOFFING - db -1 ; end -; ================ -; ================================ - - PsychicGroup: -; ================================ -; ================ - ; PSYCHIC_T (1) - db "NATHAN@" - db TRAINERTYPE_NORMAL - - ; party + db "NATHAN@", TRAINERTYPE_NORMAL db 26, GIRAFARIG - db -1 ; end -; ================ - ; PSYCHIC_T (2) - db "FRANKLIN@" - db TRAINERTYPE_NORMAL - - ; party + db "FRANKLIN@", TRAINERTYPE_NORMAL db 37, KADABRA - db -1 ; end -; ================ - ; PSYCHIC_T (3) - db "HERMAN@" - db TRAINERTYPE_NORMAL - - ; party + db "HERMAN@", TRAINERTYPE_NORMAL db 30, EXEGGCUTE db 30, EXEGGCUTE db 30, EXEGGUTOR - db -1 ; end -; ================ - ; PSYCHIC_T (4) - db "FIDEL@" - db TRAINERTYPE_NORMAL - - ; party + db "FIDEL@", TRAINERTYPE_NORMAL db 34, XATU - db -1 ; end -; ================ - ; PSYCHIC_T (5) - db "GREG@" - db TRAINERTYPE_MOVES - - ; party - - db 17, DROWZEE - db HYPNOSIS - db DISABLE - db DREAM_EATER - db 0 - + db "GREG@", TRAINERTYPE_MOVES + db 17, DROWZEE, HYPNOSIS, DISABLE, DREAM_EATER, NO_MOVE db -1 ; end -; ================ - ; PSYCHIC_T (6) - db "NORMAN@" - db TRAINERTYPE_MOVES - - ; party - - db 17, SLOWPOKE - db TACKLE - db GROWL - db WATER_GUN - db 0 - - db 20, SLOWPOKE - db CURSE - db BODY_SLAM - db WATER_GUN - db CONFUSION - + db "NORMAN@", TRAINERTYPE_MOVES + db 17, SLOWPOKE, TACKLE, GROWL, WATER_GUN, NO_MOVE + db 20, SLOWPOKE, CURSE, BODY_SLAM, WATER_GUN, CONFUSION db -1 ; end -; ================ - ; PSYCHIC_T (7) - db "MARK@" - db TRAINERTYPE_MOVES - - ; party - - db 13, ABRA - db TELEPORT - db FLASH - db 0 - db 0 - - db 13, ABRA - db TELEPORT - db FLASH - db 0 - db 0 - - db 15, KADABRA - db TELEPORT - db KINESIS - db CONFUSION - db 0 - + db "MARK@", TRAINERTYPE_MOVES + db 13, ABRA, TELEPORT, FLASH, NO_MOVE, NO_MOVE + db 13, ABRA, TELEPORT, FLASH, NO_MOVE, NO_MOVE + db 15, KADABRA, TELEPORT, KINESIS, CONFUSION, NO_MOVE db -1 ; end -; ================ - ; PSYCHIC_T (8) - db "PHIL@" - db TRAINERTYPE_MOVES - - ; party - - db 24, NATU - db LEER - db NIGHT_SHADE - db FUTURE_SIGHT - db CONFUSE_RAY - - db 26, KADABRA - db DISABLE - db PSYBEAM - db RECOVER - db FUTURE_SIGHT - + db "PHIL@", TRAINERTYPE_MOVES + db 24, NATU, LEER, NIGHT_SHADE, FUTURE_SIGHT, CONFUSE_RAY + db 26, KADABRA, DISABLE, PSYBEAM, RECOVER, FUTURE_SIGHT db -1 ; end -; ================ - ; PSYCHIC_T (9) - db "RICHARD@" - db TRAINERTYPE_NORMAL - - ; party + db "RICHARD@", TRAINERTYPE_NORMAL db 36, ESPEON - db -1 ; end -; ================ - ; PSYCHIC_T (10) - db "GILBERT@" - db TRAINERTYPE_NORMAL - - ; party + db "GILBERT@", TRAINERTYPE_NORMAL db 30, STARMIE db 30, EXEGGCUTE db 34, GIRAFARIG - db -1 ; end -; ================ - ; PSYCHIC_T (11) - db "JARED@" - db TRAINERTYPE_NORMAL - - ; party + db "JARED@", TRAINERTYPE_NORMAL db 32, MR__MIME db 32, EXEGGCUTE db 35, EXEGGCUTE - db -1 ; end -; ================ - ; PSYCHIC_T (12) - db "RODNEY@" - db TRAINERTYPE_NORMAL - - ; party + db "RODNEY@", TRAINERTYPE_NORMAL db 29, DROWZEE db 33, HYPNO - db -1 ; end -; ================ -; ================================ - - PicnickerGroup: -; ================================ -; ================ - ; PICNICKER (1) - db "LIZ@" - db TRAINERTYPE_NORMAL - - ; party - db 9, NIDORAN_F - + db "LIZ@", TRAINERTYPE_NORMAL + db 9, NIDORAN_F db -1 ; end -; ================ - ; PICNICKER (2) - db "GINA@" - db TRAINERTYPE_NORMAL - - ; party - db 9, HOPPIP - db 9, HOPPIP + db "GINA@", TRAINERTYPE_NORMAL + db 9, HOPPIP + db 9, HOPPIP db 12, BULBASAUR - db -1 ; end -; ================ - ; PICNICKER (3) - db "BROOKE@" - db TRAINERTYPE_MOVES - - ; party - - db 16, PIKACHU - db THUNDERSHOCK - db GROWL - db QUICK_ATTACK - db DOUBLE_TEAM - + db "BROOKE@", TRAINERTYPE_MOVES + db 16, PIKACHU, THUNDERSHOCK, GROWL, QUICK_ATTACK, DOUBLE_TEAM db -1 ; end -; ================ - ; PICNICKER (4) - db "KIM@" - db TRAINERTYPE_NORMAL - - ; party + db "KIM@", TRAINERTYPE_NORMAL db 15, VULPIX - db -1 ; end -; ================ - ; PICNICKER (5) - db "CINDY@" - db TRAINERTYPE_NORMAL - - ; party + db "CINDY@", TRAINERTYPE_NORMAL db 36, NIDOQUEEN - db -1 ; end -; ================ - ; PICNICKER (6) - db "HOPE@" - db TRAINERTYPE_NORMAL - - ; party + db "HOPE@", TRAINERTYPE_NORMAL db 34, FLAAFFY - db -1 ; end -; ================ - ; PICNICKER (7) - db "SHARON@" - db TRAINERTYPE_NORMAL - - ; party + db "SHARON@", TRAINERTYPE_NORMAL db 31, FURRET db 33, RAPIDASH - db -1 ; end -; ================ - ; PICNICKER (8) - db "DEBRA@" - db TRAINERTYPE_NORMAL - - ; party + db "DEBRA@", TRAINERTYPE_NORMAL db 33, SEAKING - db -1 ; end -; ================ - ; PICNICKER (9) - db "GINA@" - db TRAINERTYPE_NORMAL - - ; party + db "GINA@", TRAINERTYPE_NORMAL db 14, HOPPIP db 14, HOPPIP db 17, IVYSAUR - db -1 ; end -; ================ - ; PICNICKER (10) - db "ERIN@" - db TRAINERTYPE_NORMAL - - ; party + db "ERIN@", TRAINERTYPE_NORMAL db 16, PONYTA db 16, PONYTA - db -1 ; end -; ================ - ; PICNICKER (11) - db "LIZ@" - db TRAINERTYPE_NORMAL - - ; party + db "LIZ@", TRAINERTYPE_NORMAL db 15, WEEPINBELL db 15, NIDORINA - db -1 ; end -; ================ - ; PICNICKER (12) - db "LIZ@" - db TRAINERTYPE_NORMAL - - ; party + db "LIZ@", TRAINERTYPE_NORMAL db 19, WEEPINBELL db 19, NIDORINO db 21, NIDOQUEEN - db -1 ; end -; ================ - ; PICNICKER (13) - db "HEIDI@" - db TRAINERTYPE_NORMAL - - ; party + db "HEIDI@", TRAINERTYPE_NORMAL db 32, SKIPLOOM db 32, SKIPLOOM - db -1 ; end -; ================ - ; PICNICKER (14) - db "EDNA@" - db TRAINERTYPE_NORMAL - - ; party + db "EDNA@", TRAINERTYPE_NORMAL db 30, NIDORINA db 34, RAICHU - db -1 ; end -; ================ - ; PICNICKER (15) - db "GINA@" - db TRAINERTYPE_NORMAL - - ; party + db "GINA@", TRAINERTYPE_NORMAL db 26, SKIPLOOM db 26, SKIPLOOM db 29, IVYSAUR - db -1 ; end -; ================ - ; PICNICKER (16) - db "TIFFANY@" - db TRAINERTYPE_MOVES - - ; party - - db 31, CLEFAIRY - db ENCORE - db SING - db DOUBLESLAP - db MINIMIZE - + db "TIFFANY@", TRAINERTYPE_MOVES + db 31, CLEFAIRY, ENCORE, SING, DOUBLESLAP, MINIMIZE db -1 ; end -; ================ - ; PICNICKER (17) - db "TIFFANY@" - db TRAINERTYPE_MOVES - - ; party - - db 37, CLEFAIRY - db ENCORE - db DOUBLESLAP - db MINIMIZE - db METRONOME - + db "TIFFANY@", TRAINERTYPE_MOVES + db 37, CLEFAIRY, ENCORE, DOUBLESLAP, MINIMIZE, METRONOME db -1 ; end -; ================ - ; PICNICKER (18) - db "ERIN@" - db TRAINERTYPE_NORMAL - - ; party + db "ERIN@", TRAINERTYPE_NORMAL db 32, PONYTA db 32, PONYTA - db -1 ; end -; ================ - ; PICNICKER (19) - db "TANYA@" - db TRAINERTYPE_NORMAL - - ; party + db "TANYA@", TRAINERTYPE_NORMAL db 37, EXEGGUTOR - db -1 ; end -; ================ - ; PICNICKER (20) - db "TIFFANY@" - db TRAINERTYPE_MOVES - - ; party - - db 20, CLEFAIRY - db ENCORE - db SING - db DOUBLESLAP - db MINIMIZE - + db "TIFFANY@", TRAINERTYPE_MOVES + db 20, CLEFAIRY, ENCORE, SING, DOUBLESLAP, MINIMIZE db -1 ; end -; ================ - ; PICNICKER (21) - db "ERIN@" - db TRAINERTYPE_MOVES - - ; party - - db 36, PONYTA - db DOUBLE_TEAM - db STOMP - db FIRE_SPIN - db SUNNY_DAY - - db 34, RAICHU - db SWIFT - db MUD_SLAP - db QUICK_ATTACK - db THUNDERBOLT - - db 36, PONYTA - db DOUBLE_TEAM - db STOMP - db FIRE_SPIN - db SUNNY_DAY - + db "ERIN@", TRAINERTYPE_MOVES + db 36, PONYTA, DOUBLE_TEAM, STOMP, FIRE_SPIN, SUNNY_DAY + db 34, RAICHU, SWIFT, MUD_SLAP, QUICK_ATTACK, THUNDERBOLT + db 36, PONYTA, DOUBLE_TEAM, STOMP, FIRE_SPIN, SUNNY_DAY db -1 ; end -; ================ - ; PICNICKER (22) - db "LIZ@" - db TRAINERTYPE_NORMAL - - ; party + db "LIZ@", TRAINERTYPE_NORMAL db 24, WEEPINBELL db 26, NIDORINO db 26, NIDOQUEEN - db -1 ; end -; ================ - ; PICNICKER (23) - db "LIZ@" - db TRAINERTYPE_MOVES - - ; party - - db 30, WEEPINBELL - db SLEEP_POWDER - db POISONPOWDER - db STUN_SPORE - db SLUDGE_BOMB - - db 32, NIDOKING - db EARTHQUAKE - db DOUBLE_KICK - db POISON_STING - db IRON_TAIL - - db 32, NIDOQUEEN - db EARTHQUAKE - db DOUBLE_KICK - db TAIL_WHIP - db BODY_SLAM - + db "LIZ@", TRAINERTYPE_MOVES + db 30, WEEPINBELL, SLEEP_POWDER, POISONPOWDER, STUN_SPORE, SLUDGE_BOMB + db 32, NIDOKING, EARTHQUAKE, DOUBLE_KICK, POISON_STING, IRON_TAIL + db 32, NIDOQUEEN, EARTHQUAKE, DOUBLE_KICK, TAIL_WHIP, BODY_SLAM db -1 ; end -; ================ - ; PICNICKER (24) - db "GINA@" - db TRAINERTYPE_NORMAL - - ; party + db "GINA@", TRAINERTYPE_NORMAL db 30, SKIPLOOM db 30, SKIPLOOM db 32, IVYSAUR - db -1 ; end -; ================ - ; PICNICKER (25) - db "GINA@" - db TRAINERTYPE_MOVES - - ; party - - db 33, JUMPLUFF - db STUN_SPORE - db SUNNY_DAY - db LEECH_SEED - db COTTON_SPORE - - db 33, JUMPLUFF - db SUNNY_DAY - db SLEEP_POWDER - db LEECH_SEED - db COTTON_SPORE - - db 38, VENUSAUR - db SOLARBEAM - db RAZOR_LEAF - db HEADBUTT - db MUD_SLAP - + db "GINA@", TRAINERTYPE_MOVES + db 33, JUMPLUFF, STUN_SPORE, SUNNY_DAY, LEECH_SEED, COTTON_SPORE + db 33, JUMPLUFF, SUNNY_DAY, SLEEP_POWDER, LEECH_SEED, COTTON_SPORE + db 38, VENUSAUR, SOLARBEAM, RAZOR_LEAF, HEADBUTT, MUD_SLAP db -1 ; end -; ================ - ; PICNICKER (26) - db "TIFFANY@" - db TRAINERTYPE_MOVES - - ; party - - db 43, CLEFAIRY - db METRONOME - db ENCORE - db MOONLIGHT - db MINIMIZE - + db "TIFFANY@", TRAINERTYPE_MOVES + db 43, CLEFAIRY, METRONOME, ENCORE, MOONLIGHT, MINIMIZE db -1 ; end -; ================ -; ================================ - - CamperGroup: -; ================================ -; ================ - ; CAMPER (1) - db "ROLAND@" - db TRAINERTYPE_NORMAL - - ; party - db 9, NIDORAN_M - + db "ROLAND@", TRAINERTYPE_NORMAL + db 9, NIDORAN_M db -1 ; end -; ================ - ; CAMPER (2) - db "TODD@" - db TRAINERTYPE_NORMAL - - ; party + db "TODD@", TRAINERTYPE_NORMAL db 14, PSYDUCK - db -1 ; end -; ================ - ; CAMPER (3) - db "IVAN@" - db TRAINERTYPE_NORMAL - - ; party + db "IVAN@", TRAINERTYPE_NORMAL db 10, DIGLETT db 10, ZUBAT db 14, DIGLETT - db -1 ; end -; ================ - ; CAMPER (4) - db "ELLIOT@" - db TRAINERTYPE_NORMAL - - ; party + db "ELLIOT@", TRAINERTYPE_NORMAL db 13, SANDSHREW db 15, MARILL - db -1 ; end -; ================ - ; CAMPER (5) - db "BARRY@" - db TRAINERTYPE_NORMAL - - ; party + db "BARRY@", TRAINERTYPE_NORMAL db 36, NIDOKING - db -1 ; end -; ================ - ; CAMPER (6) - db "LLOYD@" - db TRAINERTYPE_NORMAL - - ; party + db "LLOYD@", TRAINERTYPE_NORMAL db 34, NIDOKING - db -1 ; end -; ================ - ; CAMPER (7) - db "DEAN@" - db TRAINERTYPE_NORMAL - - ; party + db "DEAN@", TRAINERTYPE_NORMAL db 33, GOLDUCK db 31, SANDSLASH - db -1 ; end -; ================ - ; CAMPER (8) - db "SID@" - db TRAINERTYPE_NORMAL - - ; party + db "SID@", TRAINERTYPE_NORMAL db 32, DUGTRIO db 29, PRIMEAPE db 29, POLIWRATH - db -1 ; end -; ================ - ; CAMPER (9) - db "HARVEY@" - db TRAINERTYPE_NORMAL - - ; party + db "HARVEY@", TRAINERTYPE_NORMAL db 15, NIDORINO - db -1 ; end -; ================ - ; CAMPER (10) - db "DALE@" - db TRAINERTYPE_NORMAL - - ; party + db "DALE@", TRAINERTYPE_NORMAL db 15, NIDORINO - db -1 ; end -; ================ - ; CAMPER (11) - db "TED@" - db TRAINERTYPE_NORMAL - - ; party + db "TED@", TRAINERTYPE_NORMAL db 17, MANKEY - db -1 ; end -; ================ - ; CAMPER (12) - db "TODD@" - db TRAINERTYPE_NORMAL - - ; party + db "TODD@", TRAINERTYPE_NORMAL db 17, GEODUDE db 17, GEODUDE db 23, PSYDUCK - db -1 ; end -; ================ - ; CAMPER (13) - db "TODD@" - db TRAINERTYPE_NORMAL - - ; party + db "TODD@", TRAINERTYPE_NORMAL db 23, GEODUDE db 23, GEODUDE db 26, PSYDUCK - db -1 ; end -; ================ - ; CAMPER (14) - db "THOMAS@" - db TRAINERTYPE_NORMAL - - ; party + db "THOMAS@", TRAINERTYPE_NORMAL db 33, GRAVELER db 36, GRAVELER db 40, GOLBAT db 42, GOLDUCK - db -1 ; end -; ================ - ; CAMPER (15) - db "LEROY@" - db TRAINERTYPE_NORMAL - - ; party + db "LEROY@", TRAINERTYPE_NORMAL db 33, GRAVELER db 36, GRAVELER db 40, GOLBAT db 42, GOLDUCK - db -1 ; end -; ================ - ; CAMPER (16) - db "DAVID@" - db TRAINERTYPE_NORMAL - - ; party + db "DAVID@", TRAINERTYPE_NORMAL db 33, GRAVELER db 36, GRAVELER db 40, GOLBAT db 42, GOLDUCK - db -1 ; end -; ================ - ; CAMPER (17) - db "JOHN@" - db TRAINERTYPE_NORMAL - - ; party + db "JOHN@", TRAINERTYPE_NORMAL db 33, GRAVELER db 36, GRAVELER db 40, GOLBAT db 42, GOLDUCK - db -1 ; end -; ================ - ; CAMPER (18) - db "JERRY@" - db TRAINERTYPE_NORMAL - - ; party + db "JERRY@", TRAINERTYPE_NORMAL db 37, SANDSLASH - db -1 ; end -; ================ - ; CAMPER (19) - db "SPENCER@" - db TRAINERTYPE_NORMAL - - ; party + db "SPENCER@", TRAINERTYPE_NORMAL db 17, SANDSHREW db 17, SANDSLASH db 19, ZUBAT - db -1 ; end -; ================ - ; CAMPER (20) - db "TODD@" - db TRAINERTYPE_NORMAL - - ; party + db "TODD@", TRAINERTYPE_NORMAL db 30, GRAVELER db 30, GRAVELER db 30, SLUGMA db 32, PSYDUCK - db -1 ; end -; ================ - ; CAMPER (21) - db "TODD@" - db TRAINERTYPE_MOVES - - ; party - - db 33, GRAVELER - db SELFDESTRUCT - db ROCK_THROW - db HARDEN - db MAGNITUDE - - db 33, GRAVELER - db SELFDESTRUCT - db ROCK_THROW - db HARDEN - db MAGNITUDE - - db 36, MAGCARGO - db ROCK_THROW - db HARDEN - db AMNESIA - db FLAMETHROWER - - db 34, GOLDUCK - db DISABLE - db PSYCHIC_M - db SURF - db PSYCH_UP - + db "TODD@", TRAINERTYPE_MOVES + db 33, GRAVELER, SELFDESTRUCT, ROCK_THROW, HARDEN, MAGNITUDE + db 33, GRAVELER, SELFDESTRUCT, ROCK_THROW, HARDEN, MAGNITUDE + db 36, MAGCARGO, ROCK_THROW, HARDEN, AMNESIA, FLAMETHROWER + db 34, GOLDUCK, DISABLE, PSYCHIC_M, SURF, PSYCH_UP db -1 ; end -; ================ - ; CAMPER (22) - db "QUENTIN@" - db TRAINERTYPE_NORMAL - - ; party + db "QUENTIN@", TRAINERTYPE_NORMAL db 30, FEAROW db 30, PRIMEAPE db 30, TAUROS - db -1 ; end -; ================ -; ================================ - - ExecutiveFGroup: -; ================================ -; ================ - ; EXECUTIVEF (1) - db "EXECUTIVE@" - db TRAINERTYPE_MOVES - - ; party - - db 32, ARBOK - db WRAP - db POISON_STING - db BITE - db GLARE - - db 32, VILEPLUME - db ABSORB - db SWEET_SCENT - db SLEEP_POWDER - db ACID - - db 32, MURKROW - db PECK - db PURSUIT - db HAZE - db NIGHT_SHADE - + db "EXECUTIVE@", TRAINERTYPE_MOVES + db 32, ARBOK, WRAP, POISON_STING, BITE, GLARE + db 32, VILEPLUME, ABSORB, SWEET_SCENT, SLEEP_POWDER, ACID + db 32, MURKROW, PECK, PURSUIT, HAZE, NIGHT_SHADE db -1 ; end -; ================ - ; EXECUTIVEF (2) - db "EXECUTIVE@" - db TRAINERTYPE_MOVES - - ; party - - db 23, ARBOK - db WRAP - db LEER - db POISON_STING - db BITE - - db 23, GLOOM - db ABSORB - db SWEET_SCENT - db SLEEP_POWDER - db ACID - - db 25, MURKROW - db PECK - db PURSUIT - db HAZE - db 0 - + db "EXECUTIVE@", TRAINERTYPE_MOVES + db 23, ARBOK, WRAP, LEER, POISON_STING, BITE + db 23, GLOOM, ABSORB, SWEET_SCENT, SLEEP_POWDER, ACID + db 25, MURKROW, PECK, PURSUIT, HAZE, NO_MOVE db -1 ; end -; ================ -; ================================ - - SageGroup: -; ================================ -; ================ - ; SAGE (1) - db "CHOW@" - db TRAINERTYPE_NORMAL - - ; party - db 3, BELLSPROUT - db 3, BELLSPROUT - db 3, BELLSPROUT - + db "CHOW@", TRAINERTYPE_NORMAL + db 3, BELLSPROUT + db 3, BELLSPROUT + db 3, BELLSPROUT db -1 ; end -; ================ - ; SAGE (2) - db "NICO@" - db TRAINERTYPE_NORMAL - - ; party - db 3, BELLSPROUT - db 3, BELLSPROUT - db 3, BELLSPROUT - + db "NICO@", TRAINERTYPE_NORMAL + db 3, BELLSPROUT + db 3, BELLSPROUT + db 3, BELLSPROUT db -1 ; end -; ================ - ; SAGE (3) - db "JIN@" - db TRAINERTYPE_NORMAL - - ; party - db 6, BELLSPROUT - + db "JIN@", TRAINERTYPE_NORMAL + db 6, BELLSPROUT db -1 ; end -; ================ - ; SAGE (4) - db "TROY@" - db TRAINERTYPE_NORMAL - - ; party - db 7, BELLSPROUT - db 7, HOOTHOOT - + db "TROY@", TRAINERTYPE_NORMAL + db 7, BELLSPROUT + db 7, HOOTHOOT db -1 ; end -; ================ - ; SAGE (5) - db "JEFFREY@" - db TRAINERTYPE_NORMAL - - ; party + db "JEFFREY@", TRAINERTYPE_NORMAL db 22, HAUNTER - db -1 ; end -; ================ - ; SAGE (6) - db "PING@" - db TRAINERTYPE_NORMAL - - ; party + db "PING@", TRAINERTYPE_NORMAL db 16, GASTLY db 16, GASTLY db 16, GASTLY db 16, GASTLY db 16, GASTLY - db -1 ; end -; ================ - ; SAGE (7) - db "EDMOND@" - db TRAINERTYPE_NORMAL - - ; party - db 3, BELLSPROUT - db 3, BELLSPROUT - db 3, BELLSPROUT - + db "EDMOND@", TRAINERTYPE_NORMAL + db 3, BELLSPROUT + db 3, BELLSPROUT + db 3, BELLSPROUT db -1 ; end -; ================ - ; SAGE (8) - db "NEAL@" - db TRAINERTYPE_NORMAL - - ; party - db 6, BELLSPROUT - + db "NEAL@", TRAINERTYPE_NORMAL + db 6, BELLSPROUT db -1 ; end -; ================ - ; SAGE (9) - db "LI@" - db TRAINERTYPE_NORMAL - - ; party - db 7, BELLSPROUT - db 7, BELLSPROUT + db "LI@", TRAINERTYPE_NORMAL + db 7, BELLSPROUT + db 7, BELLSPROUT db 10, HOOTHOOT - db -1 ; end -; ================ - ; SAGE (10) - db "GAKU@" - db TRAINERTYPE_NORMAL - - ; party + db "GAKU@", TRAINERTYPE_NORMAL db 32, NOCTOWL db 32, FLAREON - db -1 ; end -; ================ - ; SAGE (11) - db "MASA@" - db TRAINERTYPE_NORMAL - - ; party + db "MASA@", TRAINERTYPE_NORMAL db 32, NOCTOWL db 32, JOLTEON - db -1 ; end -; ================ - ; SAGE (12) - db "KOJI@" - db TRAINERTYPE_NORMAL - - ; party + db "KOJI@", TRAINERTYPE_NORMAL db 32, NOCTOWL db 32, VAPOREON - db -1 ; end -; ================ -; ================================ - - MediumGroup: -; ================================ -; ================ - ; MEDIUM (1) - db "MARTHA@" - db TRAINERTYPE_NORMAL - - ; party + db "MARTHA@", TRAINERTYPE_NORMAL db 18, GASTLY db 20, HAUNTER db 20, GASTLY - db -1 ; end -; ================ - ; MEDIUM (2) - db "GRACE@" - db TRAINERTYPE_NORMAL - - ; party + db "GRACE@", TRAINERTYPE_NORMAL db 20, HAUNTER db 20, HAUNTER - db -1 ; end -; ================ - ; MEDIUM (3) - db "BETHANY@" - db TRAINERTYPE_NORMAL - - ; party + db "BETHANY@", TRAINERTYPE_NORMAL db 25, HAUNTER - db -1 ; end -; ================ - ; MEDIUM (4) - db "MARGRET@" - db TRAINERTYPE_NORMAL - - ; party + db "MARGRET@", TRAINERTYPE_NORMAL db 25, HAUNTER - db -1 ; end -; ================ - ; MEDIUM (5) - db "ETHEL@" - db TRAINERTYPE_NORMAL - - ; party + db "ETHEL@", TRAINERTYPE_NORMAL db 25, HAUNTER - db -1 ; end -; ================ - ; MEDIUM (6) - db "REBECCA@" - db TRAINERTYPE_NORMAL - - ; party + db "REBECCA@", TRAINERTYPE_NORMAL db 35, DROWZEE db 35, HYPNO - db -1 ; end -; ================ - ; MEDIUM (7) - db "DORIS@" - db TRAINERTYPE_NORMAL - - ; party + db "DORIS@", TRAINERTYPE_NORMAL db 34, SLOWPOKE db 36, SLOWBRO - db -1 ; end -; ================ -; ================================ - - BoarderGroup: -; ================================ -; ================ - ; BOARDER (1) - db "RONALD@" - db TRAINERTYPE_NORMAL - - ; party + db "RONALD@", TRAINERTYPE_NORMAL db 24, SEEL db 25, DEWGONG db 24, SEEL - db -1 ; end -; ================ - ; BOARDER (2) - db "BRAD@" - db TRAINERTYPE_NORMAL - - ; party + db "BRAD@", TRAINERTYPE_NORMAL db 26, SWINUB db 26, SWINUB - db -1 ; end -; ================ - ; BOARDER (3) - db "DOUGLAS@" - db TRAINERTYPE_NORMAL - - ; party + db "DOUGLAS@", TRAINERTYPE_NORMAL db 24, SHELLDER db 25, CLOYSTER db 24, SHELLDER - db -1 ; end -; ================ -; ================================ - - PokefanMGroup: -; ================================ -; ================ - ; POKEFANM (1) - db "WILLIAM@" - db TRAINERTYPE_ITEM - - ; party - db 14, RAICHU, BERRY - + db "WILLIAM@", TRAINERTYPE_ITEM + db 14, RAICHU, BERRY db -1 ; end -; ================ - ; POKEFANM (2) - db "DEREK@" - db TRAINERTYPE_ITEM - - ; party - db 17, PIKACHU, BERRY - + db "DEREK@", TRAINERTYPE_ITEM + db 17, PIKACHU, BERRY db -1 ; end -; ================ - ; POKEFANM (3) - db "ROBERT@" - db TRAINERTYPE_ITEM - - ; party - db 33, QUAGSIRE, BERRY - + db "ROBERT@", TRAINERTYPE_ITEM + db 33, QUAGSIRE, BERRY db -1 ; end -; ================ - ; POKEFANM (4) - db "JOSHUA@" - db TRAINERTYPE_ITEM - - ; party - db 23, PIKACHU, BERRY - db 23, PIKACHU, BERRY - db 23, PIKACHU, BERRY - db 23, PIKACHU, BERRY - db 23, PIKACHU, BERRY - db 23, PIKACHU, BERRY - + db "JOSHUA@", TRAINERTYPE_ITEM + db 23, PIKACHU, BERRY + db 23, PIKACHU, BERRY + db 23, PIKACHU, BERRY + db 23, PIKACHU, BERRY + db 23, PIKACHU, BERRY + db 23, PIKACHU, BERRY db -1 ; end -; ================ - ; POKEFANM (5) - db "CARTER@" - db TRAINERTYPE_ITEM - - ; party - db 29, BULBASAUR, BERRY + db "CARTER@", TRAINERTYPE_ITEM + db 29, BULBASAUR, BERRY db 29, CHARMANDER, BERRY - db 29, SQUIRTLE, BERRY - + db 29, SQUIRTLE, BERRY db -1 ; end -; ================ - ; POKEFANM (6) - db "TREVOR@" - db TRAINERTYPE_ITEM - - ; party - db 33, PSYDUCK, BERRY - + db "TREVOR@", TRAINERTYPE_ITEM + db 33, PSYDUCK, BERRY db -1 ; end -; ================ - ; POKEFANM (7) - db "BRANDON@" - db TRAINERTYPE_ITEM - - ; party - db 13, SNUBBULL, BERRY - + db "BRANDON@", TRAINERTYPE_ITEM + db 13, SNUBBULL, BERRY db -1 ; end -; ================ - ; POKEFANM (8) - db "JEREMY@" - db TRAINERTYPE_ITEM - - ; party - db 28, MEOWTH, BERRY - db 28, MEOWTH, BERRY - db 28, MEOWTH, BERRY - + db "JEREMY@", TRAINERTYPE_ITEM + db 28, MEOWTH, BERRY + db 28, MEOWTH, BERRY + db 28, MEOWTH, BERRY db -1 ; end -; ================ - ; POKEFANM (9) - db "COLIN@" - db TRAINERTYPE_ITEM - - ; party - db 32, DELIBIRD, BERRY - + db "COLIN@", TRAINERTYPE_ITEM + db 32, DELIBIRD, BERRY db -1 ; end -; ================ - ; POKEFANM (10) - db "DEREK@" - db TRAINERTYPE_ITEM - - ; party - db 19, PIKACHU, BERRY - + db "DEREK@", TRAINERTYPE_ITEM + db 19, PIKACHU, BERRY db -1 ; end -; ================ - ; POKEFANM (11) - db "DEREK@" - db TRAINERTYPE_ITEM - - ; party - db 36, PIKACHU, BERRY - + db "DEREK@", TRAINERTYPE_ITEM + db 36, PIKACHU, BERRY db -1 ; end -; ================ - ; POKEFANM (12) - db "ALEX@" - db TRAINERTYPE_ITEM - - ; party - db 29, NIDOKING, BERRY - db 29, SLOWKING, BERRY - db 29, SEAKING, BERRY - + db "ALEX@", TRAINERTYPE_ITEM + db 29, NIDOKING, BERRY + db 29, SLOWKING, BERRY + db 29, SEAKING, BERRY db -1 ; end -; ================ - ; POKEFANM (13) - db "REX@" - db TRAINERTYPE_ITEM - - ; party - db 35, PHANPY, BERRY - + db "REX@", TRAINERTYPE_ITEM + db 35, PHANPY, BERRY db -1 ; end -; ================ - ; POKEFANM (14) - db "ALLAN@" - db TRAINERTYPE_ITEM - - ; party - db 35, TEDDIURSA, BERRY - + db "ALLAN@", TRAINERTYPE_ITEM + db 35, TEDDIURSA, BERRY db -1 ; end -; ================ -; ================================ - - KimonoGirlGroup: -; ================================ -; ================ - ; KIMONO_GIRL (1) - db "NAOKO@" - db TRAINERTYPE_NORMAL - - ; party + db "NAOKO@", TRAINERTYPE_NORMAL db 20, SKIPLOOM db 20, VULPIX db 18, SKIPLOOM - db -1 ; end -; ================ - ; KIMONO_GIRL (2) - db "NAOKO@" - db TRAINERTYPE_NORMAL - - ; party + db "NAOKO@", TRAINERTYPE_NORMAL db 17, FLAREON - db -1 ; end -; ================ - ; KIMONO_GIRL (3) - db "SAYO@" - db TRAINERTYPE_NORMAL - - ; party + db "SAYO@", TRAINERTYPE_NORMAL db 17, ESPEON - db -1 ; end -; ================ - ; KIMONO_GIRL (4) - db "ZUKI@" - db TRAINERTYPE_NORMAL - - ; party + db "ZUKI@", TRAINERTYPE_NORMAL db 17, UMBREON - db -1 ; end -; ================ - ; KIMONO_GIRL (5) - db "KUNI@" - db TRAINERTYPE_NORMAL - - ; party + db "KUNI@", TRAINERTYPE_NORMAL db 17, VAPOREON - db -1 ; end -; ================ - ; KIMONO_GIRL (6) - db "MIKI@" - db TRAINERTYPE_NORMAL - - ; party + db "MIKI@", TRAINERTYPE_NORMAL db 17, JOLTEON - db -1 ; end -; ================ -; ================================ - - TwinsGroup: -; ================================ -; ================ - ; TWINS (1) - db "AMY & MAY@" - db TRAINERTYPE_NORMAL - - ; party + db "AMY & MAY@", TRAINERTYPE_NORMAL db 10, SPINARAK db 10, LEDYBA - db -1 ; end -; ================ - ; TWINS (2) - db "ANN & ANNE@" - db TRAINERTYPE_MOVES - - ; party - - db 16, CLEFAIRY - db GROWL - db ENCORE - db DOUBLESLAP - db METRONOME - - db 16, JIGGLYPUFF - db SING - db DEFENSE_CURL - db POUND - db DISABLE - + db "ANN & ANNE@", TRAINERTYPE_MOVES + db 16, CLEFAIRY, GROWL, ENCORE, DOUBLESLAP, METRONOME + db 16, JIGGLYPUFF, SING, DEFENSE_CURL, POUND, DISABLE db -1 ; end -; ================ - ; TWINS (3) - db "ANN & ANNE@" - db TRAINERTYPE_MOVES - - ; party - - db 16, JIGGLYPUFF - db SING - db DEFENSE_CURL - db POUND - db DISABLE - - db 16, CLEFAIRY - db GROWL - db ENCORE - db DOUBLESLAP - db METRONOME - + db "ANN & ANNE@", TRAINERTYPE_MOVES + db 16, JIGGLYPUFF, SING, DEFENSE_CURL, POUND, DISABLE + db 16, CLEFAIRY, GROWL, ENCORE, DOUBLESLAP, METRONOME db -1 ; end -; ================ - ; TWINS (4) - db "AMY & MAY@" - db TRAINERTYPE_NORMAL - - ; party + db "AMY & MAY@", TRAINERTYPE_NORMAL db 10, LEDYBA db 10, SPINARAK - db -1 ; end -; ================ - ; TWINS (5) - db "JO & ZOE@" - db TRAINERTYPE_NORMAL - - ; party + db "JO & ZOE@", TRAINERTYPE_NORMAL db 35, VICTREEBEL db 35, VILEPLUME - db -1 ; end -; ================ - ; TWINS (6) - db "JO & ZOE@" - db TRAINERTYPE_NORMAL - - ; party + db "JO & ZOE@", TRAINERTYPE_NORMAL db 35, VILEPLUME db 35, VICTREEBEL - db -1 ; end -; ================ - ; TWINS (7) - db "MEG & PEG@" - db TRAINERTYPE_NORMAL - - ; party + db "MEG & PEG@", TRAINERTYPE_NORMAL db 31, TEDDIURSA db 31, PHANPY - db -1 ; end -; ================ - ; TWINS (8) - db "MEG & PEG@" - db TRAINERTYPE_NORMAL - - ; party + db "MEG & PEG@", TRAINERTYPE_NORMAL db 31, PHANPY db 31, TEDDIURSA - db -1 ; end -; ================ - ; TWINS (9) - db "LEA & PIA@" - db TRAINERTYPE_MOVES - - ; party - - db 35, DRATINI - db THUNDER_WAVE - db TWISTER - db FLAMETHROWER - db HEADBUTT - - db 35, DRATINI - db THUNDER_WAVE - db TWISTER - db ICE_BEAM - db HEADBUTT - + db "LEA & PIA@", TRAINERTYPE_MOVES + db 35, DRATINI, THUNDER_WAVE, TWISTER, FLAMETHROWER, HEADBUTT + db 35, DRATINI, THUNDER_WAVE, TWISTER, ICE_BEAM, HEADBUTT db -1 ; end -; ================ - ; TWINS (10) - db "LEA & PIA@" - db TRAINERTYPE_MOVES - - ; party - - db 38, DRATINI - db THUNDER_WAVE - db TWISTER - db ICE_BEAM - db HEADBUTT - - db 38, DRATINI - db THUNDER_WAVE - db TWISTER - db FLAMETHROWER - db HEADBUTT - + db "LEA & PIA@", TRAINERTYPE_MOVES + db 38, DRATINI, THUNDER_WAVE, TWISTER, ICE_BEAM, HEADBUTT + db 38, DRATINI, THUNDER_WAVE, TWISTER, FLAMETHROWER, HEADBUTT db -1 ; end -; ================ -; ================================ - - PokefanFGroup: -; ================================ -; ================ - ; POKEFANF (1) - db "BEVERLY@" - db TRAINERTYPE_ITEM - - ; party - db 14, SNUBBULL, BERRY - + db "BEVERLY@", TRAINERTYPE_ITEM + db 14, SNUBBULL, BERRY db -1 ; end -; ================ - ; POKEFANF (2) - db "RUTH@" - db TRAINERTYPE_ITEM - - ; party - db 17, PIKACHU, BERRY - + db "RUTH@", TRAINERTYPE_ITEM + db 17, PIKACHU, BERRY db -1 ; end -; ================ - ; POKEFANF (3) - db "BEVERLY@" - db TRAINERTYPE_ITEM - - ; party - db 18, SNUBBULL, BERRY - + db "BEVERLY@", TRAINERTYPE_ITEM + db 18, SNUBBULL, BERRY db -1 ; end -; ================ - ; POKEFANF (4) - db "BEVERLY@" - db TRAINERTYPE_ITEM - - ; party - db 30, GRANBULL, BERRY - + db "BEVERLY@", TRAINERTYPE_ITEM + db 30, GRANBULL, BERRY db -1 ; end -; ================ - ; POKEFANF (5) - db "GEORGIA@" - db TRAINERTYPE_ITEM - - ; party - db 23, SENTRET, BERRY - db 23, SENTRET, BERRY - db 23, SENTRET, BERRY - db 28, FURRET, BERRY - db 23, SENTRET, BERRY - + db "GEORGIA@", TRAINERTYPE_ITEM + db 23, SENTRET, BERRY + db 23, SENTRET, BERRY + db 23, SENTRET, BERRY + db 28, FURRET, BERRY + db 23, SENTRET, BERRY db -1 ; end -; ================ - ; POKEFANF (6) - db "JAIME@" - db TRAINERTYPE_ITEM - - ; party - db 16, MEOWTH, BERRY - + db "JAIME@", TRAINERTYPE_ITEM + db 16, MEOWTH, BERRY db -1 ; end -; ================ -; ================================ - - RedGroup: -; ================================ -; ================ - ; RED (1) - db "RED@" - db TRAINERTYPE_MOVES - - ; party - - db 81, PIKACHU - db CHARM - db QUICK_ATTACK - db THUNDERBOLT - db THUNDER - - db 73, ESPEON - db MUD_SLAP - db REFLECT - db SWIFT - db PSYCHIC_M - - db 75, SNORLAX - db AMNESIA - db SNORE - db REST - db BODY_SLAM - - db 77, VENUSAUR - db SUNNY_DAY - db GIGA_DRAIN - db SYNTHESIS - db SOLARBEAM - - db 77, CHARIZARD - db FLAMETHROWER - db WING_ATTACK - db SLASH - db FIRE_SPIN - - db 77, BLASTOISE - db RAIN_DANCE - db SURF - db BLIZZARD - db WHIRLPOOL - + db "RED@", TRAINERTYPE_MOVES + db 81, PIKACHU, CHARM, QUICK_ATTACK, THUNDERBOLT, THUNDER + db 73, ESPEON, MUD_SLAP, REFLECT, SWIFT, PSYCHIC_M + db 75, SNORLAX, AMNESIA, SNORE, REST, BODY_SLAM + db 77, VENUSAUR, SUNNY_DAY, GIGA_DRAIN, SYNTHESIS, SOLARBEAM + db 77, CHARIZARD, FLAMETHROWER, WING_ATTACK, SLASH, FIRE_SPIN + db 77, BLASTOISE, RAIN_DANCE, SURF, BLIZZARD, WHIRLPOOL db -1 ; end -; ================ -; ================================ - - BlueGroup: -; ================================ -; ================ - ; BLUE (1) - db "BLUE@" - db TRAINERTYPE_MOVES - - ; party - - db 56, PIDGEOT - db QUICK_ATTACK - db WHIRLWIND - db WING_ATTACK - db MIRROR_MOVE - - db 54, ALAKAZAM - db DISABLE - db RECOVER - db PSYCHIC_M - db REFLECT - - db 56, RHYDON - db FURY_ATTACK - db SANDSTORM - db ROCK_SLIDE - db EARTHQUAKE - - db 58, GYARADOS - db TWISTER - db HYDRO_PUMP - db RAIN_DANCE - db HYPER_BEAM - - db 58, EXEGGUTOR - db SUNNY_DAY - db LEECH_SEED - db EGG_BOMB - db SOLARBEAM - - db 58, ARCANINE - db ROAR - db SWIFT - db FLAMETHROWER - db EXTREMESPEED - + db "BLUE@", TRAINERTYPE_MOVES + db 56, PIDGEOT, QUICK_ATTACK, WHIRLWIND, WING_ATTACK, MIRROR_MOVE + db 54, ALAKAZAM, DISABLE, RECOVER, PSYCHIC_M, REFLECT + db 56, RHYDON, FURY_ATTACK, SANDSTORM, ROCK_SLIDE, EARTHQUAKE + db 58, GYARADOS, TWISTER, HYDRO_PUMP, RAIN_DANCE, HYPER_BEAM + db 58, EXEGGUTOR, SUNNY_DAY, LEECH_SEED, EGG_BOMB, SOLARBEAM + db 58, ARCANINE, ROAR, SWIFT, FLAMETHROWER, EXTREMESPEED db -1 ; end -; ================ -; ================================ - - OfficerGroup: -; ================================ -; ================ - ; OFFICER (1) - db "KEITH@" - db TRAINERTYPE_NORMAL - - ; party + db "KEITH@", TRAINERTYPE_NORMAL db 17, GROWLITHE - db -1 ; end -; ================ - ; OFFICER (2) - db "DIRK@" - db TRAINERTYPE_NORMAL - - ; party + db "DIRK@", TRAINERTYPE_NORMAL db 14, GROWLITHE db 14, GROWLITHE - db -1 ; end -; ================ -; ================================ - - GruntFGroup: -; ================================ -; ================ - ; GRUNTF (1) - db "GRUNT@" - db TRAINERTYPE_NORMAL - - ; party - db 9, ZUBAT + db "GRUNT@", TRAINERTYPE_NORMAL + db 9, ZUBAT db 11, EKANS - db -1 ; end -; ================ - ; GRUNTF (2) - db "GRUNT@" - db TRAINERTYPE_NORMAL - - ; party + db "GRUNT@", TRAINERTYPE_NORMAL db 26, ARBOK - db -1 ; end -; ================ - ; GRUNTF (3) - db "GRUNT@" - db TRAINERTYPE_NORMAL - - ; party + db "GRUNT@", TRAINERTYPE_NORMAL db 25, GLOOM db 25, GLOOM - db -1 ; end -; ================ - ; GRUNTF (4) - db "GRUNT@" - db TRAINERTYPE_NORMAL - - ; party + db "GRUNT@", TRAINERTYPE_NORMAL db 21, EKANS db 23, ODDISH db 21, EKANS db 24, GLOOM - db -1 ; end -; ================ - ; GRUNTF (5) - db "GRUNT@" - db TRAINERTYPE_MOVES - - ; party - - db 18, EKANS - db WRAP - db LEER - db POISON_STING - db BITE - - db 18, GLOOM - db ABSORB - db SWEET_SCENT - db STUN_SPORE - db SLEEP_POWDER - + db "GRUNT@", TRAINERTYPE_MOVES + db 18, EKANS, WRAP, LEER, POISON_STING, BITE + db 18, GLOOM, ABSORB, SWEET_SCENT, STUN_SPORE, SLEEP_POWDER db -1 ; end -; ================ -; ================================ - - MysticalmanGroup: -; ================================ -; ================ - ; MYSTICALMAN (1) - db "EUSINE@" - db TRAINERTYPE_MOVES - - ; party - - db 23, DROWZEE - db DREAM_EATER - db HYPNOSIS - db DISABLE - db CONFUSION - - db 23, HAUNTER - db LICK - db HYPNOSIS - db MEAN_LOOK - db CURSE - - db 25, ELECTRODE - db SCREECH - db SONICBOOM - db THUNDER - db ROLLOUT - + db "EUSINE@", TRAINERTYPE_MOVES + db 23, DROWZEE, DREAM_EATER, HYPNOSIS, DISABLE, CONFUSION + db 23, HAUNTER, LICK, HYPNOSIS, MEAN_LOOK, CURSE + db 25, ELECTRODE, SCREECH, SONICBOOM, THUNDER, ROLLOUT db -1 ; end - -; ================ -; ================================ 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/badge_type_boosts.asm b/data/types/badge_type_boosts.asm new file mode 100644 index 000000000..b212ef22e --- /dev/null +++ b/data/types/badge_type_boosts.asm @@ -0,0 +1,21 @@ +BadgeTypeBoosts: +; entries correspond to wJohtoBadges constants + db FLYING ; ZEPHYRBADGE + db BUG ; HIVEBADGE + db NORMAL ; PLAINBADGE + db GHOST ; FOGBADGE + db STEEL ; MINERALBADGE + db FIGHTING ; STORMBADGE + db ICE ; GLACIERBADGE + db DRAGON ; RISINGBADGE + ; fallthrough +; entries correspond to wKantoBadges constants + db ROCK ; BOULDERBADGE + db WATER ; CASCADEBADGE + db ELECTRIC ; THUNDERBADGE + db GRASS ; RAINBOWBADGE + db POISON ; SOULBADGE + db PSYCHIC ; MARSHBADGE + db FIRE ; VOLCANOBADGE + db GROUND ; EARTHBADGE + db -1 ; end 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/battle/type_boost_items.asm b/data/types/type_boost_items.asm index 3b7231a59..5b965c4fb 100644 --- a/data/battle/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/battle/type_matchups.asm b/data/types/type_matchups.asm index 90e38ae2c..04bfc3cd1 100644 --- a/data/battle/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/unown_words.asm b/data/unown_words.asm deleted file mode 100644 index ea8c4b2a8..000000000 --- a/data/unown_words.asm +++ /dev/null @@ -1,67 +0,0 @@ -unownword: MACRO -x = 1 - rept STRLEN(\1) - db STRSUB(\1, x, 1) - $40 -x = x + 1 - endr - db -1 -ENDM - -UnownWords: ; fba5a -; entries correspond to Unown forms - dw UnownWord1 - dw UnownWord1 - dw UnownWord2 - dw UnownWord3 - dw UnownWord4 - dw UnownWord5 - dw UnownWord6 - dw UnownWord7 - dw UnownWord8 - dw UnownWord9 - dw UnownWord10 - dw UnownWord11 - dw UnownWord12 - dw UnownWord13 - dw UnownWord14 - dw UnownWord15 - dw UnownWord16 - dw UnownWord17 - dw UnownWord18 - dw UnownWord19 - dw UnownWord20 - dw UnownWord21 - dw UnownWord22 - dw UnownWord23 - dw UnownWord24 - dw UnownWord25 - dw UnownWord26 -; fba90 - -UnownWord1: unownword "ANGRY" -UnownWord2: unownword "BEAR" -UnownWord3: unownword "CHASE" -UnownWord4: unownword "DIRECT" -UnownWord5: unownword "ENGAGE" -UnownWord6: unownword "FIND" -UnownWord7: unownword "GIVE" -UnownWord8: unownword "HELP" -UnownWord9: unownword "INCREASE" -UnownWord10: unownword "JOIN" -UnownWord11: unownword "KEEP" -UnownWord12: unownword "LAUGH" -UnownWord13: unownword "MAKE" -UnownWord14: unownword "NUZZLE" -UnownWord15: unownword "OBSERVE" -UnownWord16: unownword "PERFORM" -UnownWord17: unownword "QUICKEN" -UnownWord18: unownword "REASSURE" -UnownWord19: unownword "SEARCH" -UnownWord20: unownword "TELL" -UnownWord21: unownword "UNDO" -UnownWord22: unownword "VANISH" -UnownWord23: unownword "WANT" -UnownWord24: unownword "XXXXX" -UnownWord25: unownword "YIELD" -UnownWord26: unownword "ZOOM" -; fbb32 diff --git a/data/unused/unknown_53d84.asm b/data/unused/unknown_53d84.asm deleted file mode 100755 index 026ec5275..000000000 --- a/data/unused/unknown_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 91a887b53..1976c8f95 100644 --- a/data/wild/fish.asm +++ b/data/wild/fish.asm @@ -1,227 +1,230 @@ time_group EQUS "0," ; use the nth TimeFishGroups entry -FishGroups: ; 92488 - dbwww 50 percent + 1, .Shore_Old, .Shore_Good, .Shore_Super - dbwww 50 percent + 1, .Ocean_Old, .Ocean_Good, .Ocean_Super - dbwww 50 percent + 1, .Lake_Old, .Lake_Good, .Lake_Super - dbwww 50 percent + 1, .Pond_Old, .Pond_Good, .Pond_Super - dbwww 50 percent + 1, .Dratini_Old, .Dratini_Good, .Dratini_Super - dbwww 50 percent + 1, .Qwilfish_Swarm_Old, .Qwilfish_Swarm_Good, .Qwilfish_Swarm_Super - dbwww 50 percent + 1, .Remoraid_Swarm_Old, .Remoraid_Swarm_Good, .Remoraid_Swarm_Super - dbwww 50 percent + 1, .Gyarados_Old, .Gyarados_Good, .Gyarados_Super - dbwww 50 percent + 1, .Dratini_2_Old, .Dratini_2_Good, .Dratini_2_Super - dbwww 50 percent + 1, .WhirlIslands_Old, .WhirlIslands_Good, .WhirlIslands_Super - dbwww 50 percent + 1, .Qwilfish_Old, .Qwilfish_Good, .Qwilfish_Super - dbwww 50 percent + 1, .Remoraid_Old, .Remoraid_Good, .Remoraid_Super - dbwww 50 percent + 1, .Qwilfish_NoSwarm_Old, .Qwilfish_NoSwarm_Good, .Qwilfish_NoSwarm_Super +fishgroup: MACRO +; chance, old rod, good rod, super rod + dbwww \1, \2, \3, \4 +ENDM -.Shore_Old: ; 924e3 +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 + fishgroup 50 percent + 1, .Lake_Old, .Lake_Good, .Lake_Super + fishgroup 50 percent + 1, .Pond_Old, .Pond_Good, .Pond_Super + fishgroup 50 percent + 1, .Dratini_Old, .Dratini_Good, .Dratini_Super + fishgroup 50 percent + 1, .Qwilfish_Swarm_Old, .Qwilfish_Swarm_Good, .Qwilfish_Swarm_Super + fishgroup 50 percent + 1, .Remoraid_Swarm_Old, .Remoraid_Swarm_Good, .Remoraid_Swarm_Super + fishgroup 50 percent + 1, .Gyarados_Old, .Gyarados_Good, .Gyarados_Super + fishgroup 50 percent + 1, .Dratini_2_Old, .Dratini_2_Good, .Dratini_2_Super + fishgroup 50 percent + 1, .WhirlIslands_Old, .WhirlIslands_Good, .WhirlIslands_Super + fishgroup 50 percent + 1, .Qwilfish_Old, .Qwilfish_Good, .Qwilfish_Super + 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: 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 - db CORSOLA, 40, STARYU, 40 - db SHELLDER, 20, SHELLDER, 20 - db SHELLDER, 40, SHELLDER, 40 - db GOLDEEN, 20, GOLDEEN, 20 - db GOLDEEN, 40, GOLDEEN, 40 - db POLIWAG, 20, POLIWAG, 20 - db POLIWAG, 40, POLIWAG, 40 - db DRATINI, 20, DRATINI, 20 - db DRATINI, 40, DRATINI, 40 - db QWILFISH, 20, QWILFISH, 20 - db QWILFISH, 40, QWILFISH, 40 - db REMORAID, 20, REMORAID, 20 - db REMORAID, 40, REMORAID, 40 - db GYARADOS, 20, GYARADOS, 20 - db GYARADOS, 40, GYARADOS, 40 - db DRATINI, 10, DRATINI, 10 - db DRATINI, 10, DRATINI, 10 - db HORSEA, 20, HORSEA, 20 - db HORSEA, 40, HORSEA, 40 - db TENTACOOL, 20, TENTACOOL, 20 - db TENTACOOL, 40, TENTACOOL, 40 -; 926c7 + db CORSOLA, 20, STARYU, 20 ; 0 + db CORSOLA, 40, STARYU, 40 ; 1 + db SHELLDER, 20, SHELLDER, 20 ; 2 + db SHELLDER, 40, SHELLDER, 40 ; 3 + db GOLDEEN, 20, GOLDEEN, 20 ; 4 + db GOLDEEN, 40, GOLDEEN, 40 ; 5 + db POLIWAG, 20, POLIWAG, 20 ; 6 + db POLIWAG, 40, POLIWAG, 40 ; 7 + db DRATINI, 20, DRATINI, 20 ; 8 + db DRATINI, 40, DRATINI, 40 ; 9 + db QWILFISH, 20, QWILFISH, 20 ; 10 + db QWILFISH, 40, QWILFISH, 40 ; 11 + db REMORAID, 20, REMORAID, 20 ; 12 + db REMORAID, 40, REMORAID, 40 ; 13 + db GYARADOS, 20, GYARADOS, 20 ; 14 + db GYARADOS, 40, GYARADOS, 40 ; 15 + db DRATINI, 10, DRATINI, 10 ; 16 + db DRATINI, 10, DRATINI, 10 ; 17 + db HORSEA, 20, HORSEA, 20 ; 18 + db HORSEA, 40, HORSEA, 40 ; 19 + db TENTACOOL, 20, TENTACOOL, 20 ; 20 + db TENTACOOL, 40, TENTACOOL, 40 ; 21 diff --git a/data/wild/flee_mons.asm b/data/wild/flee_mons.asm index 1b1cea036..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,9 +28,7 @@ OftenFleeMons: ; 3c5a8 db TEDDIURSA db -1 -AlwaysFleeMons: ; 3c5b1 +AlwaysFleeMons: db RAIKOU db ENTEI -; db SUICUNE db -1 -; 3c5b4 diff --git a/data/wild/johto_grass.asm b/data/wild/johto_grass.asm index be435b048..2567e9fcf 100644 --- a/data/wild/johto_grass.asm +++ b/data/wild/johto_grass.asm @@ -1,8 +1,8 @@ ; Johto Pokémon in grass -JohtoGrassWildMons: ; 0x2a5e9 +JohtoGrassWildMons: - map SPROUT_TOWER_2F + map_id SPROUT_TOWER_2F db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite ; morn db 3, RATTATA @@ -29,7 +29,7 @@ JohtoGrassWildMons: ; 0x2a5e9 db 5, RATTATA db 5, RATTATA - map SPROUT_TOWER_3F + map_id SPROUT_TOWER_3F db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite ; morn db 3, RATTATA @@ -56,7 +56,7 @@ JohtoGrassWildMons: ; 0x2a5e9 db 5, RATTATA db 5, RATTATA - map TIN_TOWER_2F + map_id TIN_TOWER_2F db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite ; morn db 20, RATTATA @@ -83,7 +83,7 @@ JohtoGrassWildMons: ; 0x2a5e9 db 24, RATTATA db 24, RATTATA - map TIN_TOWER_3F + map_id TIN_TOWER_3F db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite ; morn db 20, RATTATA @@ -110,7 +110,7 @@ JohtoGrassWildMons: ; 0x2a5e9 db 24, RATTATA db 24, RATTATA - map TIN_TOWER_4F + map_id TIN_TOWER_4F db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite ; morn db 20, RATTATA @@ -137,7 +137,7 @@ JohtoGrassWildMons: ; 0x2a5e9 db 24, RATTATA db 24, RATTATA - map TIN_TOWER_5F + map_id TIN_TOWER_5F db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite ; morn db 20, RATTATA @@ -164,7 +164,7 @@ JohtoGrassWildMons: ; 0x2a5e9 db 24, RATTATA db 24, RATTATA - map TIN_TOWER_6F + map_id TIN_TOWER_6F db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite ; morn db 20, RATTATA @@ -191,7 +191,7 @@ JohtoGrassWildMons: ; 0x2a5e9 db 24, RATTATA db 24, RATTATA - map TIN_TOWER_7F + map_id TIN_TOWER_7F db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite ; morn db 20, RATTATA @@ -218,7 +218,7 @@ JohtoGrassWildMons: ; 0x2a5e9 db 24, RATTATA db 24, RATTATA - map TIN_TOWER_8F + map_id TIN_TOWER_8F db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite ; morn db 20, RATTATA @@ -245,7 +245,7 @@ JohtoGrassWildMons: ; 0x2a5e9 db 24, RATTATA db 24, RATTATA - map TIN_TOWER_9F + map_id TIN_TOWER_9F db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite ; morn db 20, RATTATA @@ -272,7 +272,7 @@ JohtoGrassWildMons: ; 0x2a5e9 db 24, RATTATA db 24, RATTATA - map BURNED_TOWER_1F + map_id BURNED_TOWER_1F db 4 percent, 4 percent, 4 percent ; encounter rates: morn/day/nite ; morn db 13, RATTATA @@ -299,7 +299,7 @@ JohtoGrassWildMons: ; 0x2a5e9 db 15, RATICATE db 15, RATICATE - map BURNED_TOWER_B1F + map_id BURNED_TOWER_B1F db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite ; morn db 14, RATTATA @@ -326,7 +326,7 @@ JohtoGrassWildMons: ; 0x2a5e9 db 16, KOFFING db 16, WEEZING - map NATIONAL_PARK + map_id NATIONAL_PARK db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn db 12, NIDORAN_M @@ -353,7 +353,7 @@ JohtoGrassWildMons: ; 0x2a5e9 db 12, VENONAT db 12, VENONAT - map RUINS_OF_ALPH_OUTSIDE + map_id RUINS_OF_ALPH_OUTSIDE db 4 percent, 4 percent, 4 percent ; encounter rates: morn/day/nite ; morn db 20, NATU @@ -380,7 +380,7 @@ JohtoGrassWildMons: ; 0x2a5e9 db 22, QUAGSIRE db 22, QUAGSIRE - map RUINS_OF_ALPH_INNER_CHAMBER + map_id RUINS_OF_ALPH_INNER_CHAMBER db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite ; morn db 5, UNOWN @@ -407,7 +407,7 @@ JohtoGrassWildMons: ; 0x2a5e9 db 5, UNOWN db 5, UNOWN - map UNION_CAVE_1F + map_id UNION_CAVE_1F db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite ; morn db 6, GEODUDE @@ -434,7 +434,7 @@ JohtoGrassWildMons: ; 0x2a5e9 db 6, ONIX db 6, ONIX - map UNION_CAVE_B1F + map_id UNION_CAVE_B1F db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite ; morn db 8, GEODUDE @@ -461,7 +461,7 @@ JohtoGrassWildMons: ; 0x2a5e9 db 8, RATTATA db 8, RATTATA - map UNION_CAVE_B2F + map_id UNION_CAVE_B2F db 4 percent, 4 percent, 4 percent ; encounter rates: morn/day/nite ; morn db 22, ZUBAT @@ -488,7 +488,7 @@ JohtoGrassWildMons: ; 0x2a5e9 db 23, ONIX db 23, ONIX - map SLOWPOKE_WELL_B1F + map_id SLOWPOKE_WELL_B1F db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite ; morn db 5, ZUBAT @@ -515,7 +515,7 @@ JohtoGrassWildMons: ; 0x2a5e9 db 8, SLOWPOKE db 8, SLOWPOKE - map SLOWPOKE_WELL_B2F + map_id SLOWPOKE_WELL_B2F db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite ; morn db 21, ZUBAT @@ -542,7 +542,7 @@ JohtoGrassWildMons: ; 0x2a5e9 db 23, SLOWPOKE db 23, SLOWPOKE - map ILEX_FOREST + map_id ILEX_FOREST db 4 percent, 4 percent, 4 percent ; encounter rates: morn/day/nite ; morn db 5, CATERPIE @@ -569,7 +569,7 @@ JohtoGrassWildMons: ; 0x2a5e9 db 6, PARAS db 6, PARAS - map MOUNT_MORTAR_1F_OUTSIDE + map_id MOUNT_MORTAR_1F_OUTSIDE db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite ; morn db 14, RATTATA @@ -596,7 +596,7 @@ JohtoGrassWildMons: ; 0x2a5e9 db 16, RATICATE db 16, RATICATE - map MOUNT_MORTAR_1F_INSIDE + map_id MOUNT_MORTAR_1F_INSIDE db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite ; morn db 13, GEODUDE @@ -623,7 +623,7 @@ JohtoGrassWildMons: ; 0x2a5e9 db 15, GOLBAT db 15, GOLBAT - map MOUNT_MORTAR_2F_INSIDE + map_id MOUNT_MORTAR_2F_INSIDE db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite ; morn db 31, GRAVELER @@ -650,7 +650,7 @@ JohtoGrassWildMons: ; 0x2a5e9 db 32, GOLBAT db 32, GOLBAT - map MOUNT_MORTAR_B1F + map_id MOUNT_MORTAR_B1F db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite ; morn db 15, ZUBAT @@ -677,7 +677,7 @@ JohtoGrassWildMons: ; 0x2a5e9 db 18, RATICATE db 18, RATICATE - map ICE_PATH_1F + map_id ICE_PATH_1F db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite ; morn db 21, SWINUB @@ -704,7 +704,7 @@ JohtoGrassWildMons: ; 0x2a5e9 db 22, GOLBAT db 22, GOLBAT - map ICE_PATH_B1F + map_id ICE_PATH_B1F db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite ; morn db 22, SWINUB @@ -731,7 +731,7 @@ JohtoGrassWildMons: ; 0x2a5e9 db 23, GOLBAT db 22, SNEASEL - map ICE_PATH_B2F_MAHOGANY_SIDE + map_id ICE_PATH_B2F_MAHOGANY_SIDE db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite ; morn db 23, SWINUB @@ -758,7 +758,7 @@ JohtoGrassWildMons: ; 0x2a5e9 db 22, SNEASEL db 24, SNEASEL - map ICE_PATH_B2F_BLACKTHORN_SIDE + map_id ICE_PATH_B2F_BLACKTHORN_SIDE db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite ; morn db 23, SWINUB @@ -785,7 +785,7 @@ JohtoGrassWildMons: ; 0x2a5e9 db 22, SNEASEL db 24, SNEASEL - map ICE_PATH_B3F + map_id ICE_PATH_B3F db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite ; morn db 24, SWINUB @@ -812,7 +812,7 @@ JohtoGrassWildMons: ; 0x2a5e9 db 24, SNEASEL db 26, SNEASEL - map WHIRL_ISLAND_NW + map_id WHIRL_ISLAND_NW db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite ; morn db 22, KRABBY @@ -839,7 +839,7 @@ JohtoGrassWildMons: ; 0x2a5e9 db 24, GOLBAT db 24, GOLBAT - map WHIRL_ISLAND_NE + map_id WHIRL_ISLAND_NE db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite ; morn db 22, KRABBY @@ -866,7 +866,7 @@ JohtoGrassWildMons: ; 0x2a5e9 db 24, GOLBAT db 24, GOLBAT - map WHIRL_ISLAND_SW + map_id WHIRL_ISLAND_SW db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite ; morn db 22, KRABBY @@ -893,7 +893,7 @@ JohtoGrassWildMons: ; 0x2a5e9 db 24, GOLBAT db 24, GOLBAT - map WHIRL_ISLAND_CAVE + map_id WHIRL_ISLAND_CAVE db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite ; morn db 22, KRABBY @@ -920,7 +920,7 @@ JohtoGrassWildMons: ; 0x2a5e9 db 24, GOLBAT db 24, GOLBAT - map WHIRL_ISLAND_SE + map_id WHIRL_ISLAND_SE db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite ; morn db 22, KRABBY @@ -947,7 +947,7 @@ JohtoGrassWildMons: ; 0x2a5e9 db 24, GOLBAT db 24, GOLBAT - map WHIRL_ISLAND_B1F + map_id WHIRL_ISLAND_B1F db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite ; morn db 23, KRABBY @@ -974,7 +974,7 @@ JohtoGrassWildMons: ; 0x2a5e9 db 25, GOLBAT db 25, GOLBAT - map WHIRL_ISLAND_B2F + map_id WHIRL_ISLAND_B2F db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite ; morn db 24, KRABBY @@ -1001,7 +1001,7 @@ JohtoGrassWildMons: ; 0x2a5e9 db 26, GOLBAT db 26, GOLBAT - map WHIRL_ISLAND_LUGIA_CHAMBER + map_id WHIRL_ISLAND_LUGIA_CHAMBER db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite ; morn db 25, KRABBY @@ -1028,7 +1028,7 @@ JohtoGrassWildMons: ; 0x2a5e9 db 27, GOLBAT db 27, GOLBAT - map SILVER_CAVE_ROOM_1 + map_id SILVER_CAVE_ROOM_1 db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite ; morn db 43, GRAVELER @@ -1055,7 +1055,7 @@ JohtoGrassWildMons: ; 0x2a5e9 db 46, GOLBAT db 46, GOLBAT - map SILVER_CAVE_ROOM_2 + map_id SILVER_CAVE_ROOM_2 db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite ; morn db 48, GOLBAT @@ -1082,7 +1082,7 @@ JohtoGrassWildMons: ; 0x2a5e9 db 45, MISDREAVUS db 45, MISDREAVUS - map SILVER_CAVE_ROOM_3 + map_id SILVER_CAVE_ROOM_3 db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite ; morn db 51, GOLBAT @@ -1109,7 +1109,7 @@ JohtoGrassWildMons: ; 0x2a5e9 db 53, GOLBAT db 53, GOLBAT - map SILVER_CAVE_ITEM_ROOMS + map_id SILVER_CAVE_ITEM_ROOMS db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite ; morn db 48, GOLBAT @@ -1136,7 +1136,7 @@ JohtoGrassWildMons: ; 0x2a5e9 db 50, PARASECT db 52, PARASECT - map DARK_CAVE_VIOLET_ENTRANCE + map_id DARK_CAVE_VIOLET_ENTRANCE db 4 percent, 4 percent, 4 percent ; encounter rates: morn/day/nite ; morn db 3, GEODUDE @@ -1163,7 +1163,7 @@ JohtoGrassWildMons: ; 0x2a5e9 db 4, ZUBAT db 4, DUNSPARCE - map DARK_CAVE_BLACKTHORN_ENTRANCE + map_id DARK_CAVE_BLACKTHORN_ENTRANCE db 4 percent, 4 percent, 4 percent ; encounter rates: morn/day/nite ; morn db 23, GEODUDE @@ -1190,7 +1190,7 @@ JohtoGrassWildMons: ; 0x2a5e9 db 23, GOLBAT db 23, GOLBAT - map ROUTE_29 + map_id ROUTE_29 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn db 2, PIDGEY @@ -1217,7 +1217,7 @@ JohtoGrassWildMons: ; 0x2a5e9 db 3, HOOTHOOT db 3, HOOTHOOT - map ROUTE_30 + map_id ROUTE_30 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn db 3, LEDYBA @@ -1244,7 +1244,7 @@ JohtoGrassWildMons: ; 0x2a5e9 db 4, HOOTHOOT db 4, HOOTHOOT - map ROUTE_31 + map_id ROUTE_31 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn db 4, LEDYBA @@ -1271,7 +1271,7 @@ JohtoGrassWildMons: ; 0x2a5e9 db 5, GASTLY db 5, GASTLY - map ROUTE_32 + map_id ROUTE_32 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn db 4, EKANS @@ -1298,7 +1298,7 @@ JohtoGrassWildMons: ; 0x2a5e9 db 7, GASTLY db 7, GASTLY - map ROUTE_33 + map_id ROUTE_33 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn db 6, RATTATA @@ -1325,7 +1325,7 @@ JohtoGrassWildMons: ; 0x2a5e9 db 7, RATTATA db 7, RATTATA - map ROUTE_34 + map_id ROUTE_34 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn db 10, SNUBBULL @@ -1352,7 +1352,7 @@ JohtoGrassWildMons: ; 0x2a5e9 db 10, DITTO db 10, DITTO - map ROUTE_35 + map_id ROUTE_35 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn db 12, SNUBBULL @@ -1379,7 +1379,7 @@ JohtoGrassWildMons: ; 0x2a5e9 db 10, DITTO db 12, YANMA - map ROUTE_36 + map_id ROUTE_36 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn db 4, LEDYBA @@ -1406,7 +1406,7 @@ JohtoGrassWildMons: ; 0x2a5e9 db 5, GASTLY db 5, GASTLY - map ROUTE_37 + map_id ROUTE_37 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn db 13, LEDYBA @@ -1433,7 +1433,7 @@ JohtoGrassWildMons: ; 0x2a5e9 db 15, ARIADOS db 15, ARIADOS - map ROUTE_38 + map_id ROUTE_38 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn db 16, RATTATA @@ -1460,7 +1460,7 @@ JohtoGrassWildMons: ; 0x2a5e9 db 16, MEOWTH db 16, MEOWTH - map ROUTE_39 + map_id ROUTE_39 db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite ; morn db 16, RATTATA @@ -1487,7 +1487,7 @@ JohtoGrassWildMons: ; 0x2a5e9 db 18, MEOWTH db 18, MEOWTH - map ROUTE_42 + map_id ROUTE_42 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn db 13, EKANS @@ -1514,7 +1514,7 @@ JohtoGrassWildMons: ; 0x2a5e9 db 16, GOLBAT db 16, GOLBAT - map ROUTE_43 + map_id ROUTE_43 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn db 15, SENTRET @@ -1541,7 +1541,7 @@ JohtoGrassWildMons: ; 0x2a5e9 db 17, VENOMOTH db 17, VENOMOTH - map ROUTE_44 + map_id ROUTE_44 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn db 23, TANGELA @@ -1568,7 +1568,7 @@ JohtoGrassWildMons: ; 0x2a5e9 db 26, POLIWHIRL db 26, POLIWHIRL - map ROUTE_45 + map_id ROUTE_45 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn db 23, GEODUDE @@ -1595,7 +1595,7 @@ JohtoGrassWildMons: ; 0x2a5e9 db 27, GRAVELER db 27, GRAVELER - map ROUTE_46 + map_id ROUTE_46 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn db 2, GEODUDE @@ -1622,7 +1622,7 @@ JohtoGrassWildMons: ; 0x2a5e9 db 2, RATTATA db 2, RATTATA - map SILVER_CAVE_OUTSIDE + map_id SILVER_CAVE_OUTSIDE db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn db 41, TANGELA diff --git a/data/wild/johto_water.asm b/data/wild/johto_water.asm index d6e11c3a0..83e33b2d5 100644 --- a/data/wild/johto_water.asm +++ b/data/wild/johto_water.asm @@ -1,230 +1,230 @@ ; Johto Pokémon in water -JohtoWaterWildMons: ; 0x2b11d +JohtoWaterWildMons: - map RUINS_OF_ALPH_OUTSIDE + map_id RUINS_OF_ALPH_OUTSIDE db 2 percent ; encounter rate db 15, WOOPER db 20, QUAGSIRE db 15, QUAGSIRE - map UNION_CAVE_1F + map_id UNION_CAVE_1F db 2 percent ; encounter rate db 15, WOOPER db 20, QUAGSIRE db 15, QUAGSIRE - map UNION_CAVE_B1F + map_id UNION_CAVE_B1F db 2 percent ; encounter rate db 15, WOOPER db 20, QUAGSIRE db 15, QUAGSIRE - map UNION_CAVE_B2F + map_id UNION_CAVE_B2F db 4 percent ; encounter rate db 15, TENTACOOL db 20, QUAGSIRE db 20, TENTACRUEL - map SLOWPOKE_WELL_B1F + map_id SLOWPOKE_WELL_B1F db 2 percent ; encounter rate db 15, SLOWPOKE db 20, SLOWPOKE db 10, SLOWPOKE - map SLOWPOKE_WELL_B2F + map_id SLOWPOKE_WELL_B2F db 2 percent ; encounter rate db 15, SLOWPOKE db 20, SLOWPOKE db 20, SLOWBRO - map ILEX_FOREST + map_id ILEX_FOREST db 2 percent ; encounter rate db 15, PSYDUCK db 10, PSYDUCK db 15, GOLDUCK - map MOUNT_MORTAR_1F_OUTSIDE + map_id MOUNT_MORTAR_1F_OUTSIDE db 4 percent ; encounter rate db 15, GOLDEEN db 20, MARILL db 20, SEAKING - map MOUNT_MORTAR_2F_INSIDE + map_id MOUNT_MORTAR_2F_INSIDE db 2 percent ; encounter rate db 20, GOLDEEN db 25, MARILL db 25, SEAKING - map MOUNT_MORTAR_B1F + map_id MOUNT_MORTAR_B1F db 2 percent ; encounter rate db 15, GOLDEEN db 20, MARILL db 20, SEAKING - map WHIRL_ISLAND_SW + map_id WHIRL_ISLAND_SW db 4 percent ; encounter rate db 20, TENTACOOL db 15, HORSEA db 20, TENTACRUEL - map WHIRL_ISLAND_B2F + map_id WHIRL_ISLAND_B2F db 4 percent ; encounter rate db 15, HORSEA db 20, HORSEA db 20, TENTACRUEL - map WHIRL_ISLAND_LUGIA_CHAMBER + map_id WHIRL_ISLAND_LUGIA_CHAMBER db 4 percent ; encounter rate db 20, HORSEA db 20, TENTACRUEL db 20, SEADRA - map SILVER_CAVE_ROOM_2 + map_id SILVER_CAVE_ROOM_2 db 2 percent ; encounter rate db 35, SEAKING db 35, GOLDUCK db 35, GOLDEEN - map DARK_CAVE_VIOLET_ENTRANCE + map_id DARK_CAVE_VIOLET_ENTRANCE db 2 percent ; encounter rate db 15, MAGIKARP db 10, MAGIKARP db 5, MAGIKARP - map DARK_CAVE_BLACKTHORN_ENTRANCE + map_id DARK_CAVE_BLACKTHORN_ENTRANCE db 2 percent ; encounter rate db 15, MAGIKARP db 10, MAGIKARP db 5, MAGIKARP - map DRAGONS_DEN_B1F + map_id DRAGONS_DEN_B1F db 4 percent ; encounter rate db 15, MAGIKARP db 10, MAGIKARP db 10, DRATINI - map OLIVINE_PORT + map_id OLIVINE_PORT db 2 percent ; encounter rate db 20, TENTACOOL db 15, TENTACOOL db 20, TENTACRUEL - map ROUTE_30 + map_id ROUTE_30 db 2 percent ; encounter rate db 20, POLIWAG db 15, POLIWAG db 20, POLIWHIRL - map ROUTE_31 + map_id ROUTE_31 db 2 percent ; encounter rate db 20, POLIWAG db 15, POLIWAG db 20, POLIWHIRL - map ROUTE_32 + map_id ROUTE_32 db 6 percent ; encounter rate db 15, TENTACOOL db 20, QUAGSIRE db 20, TENTACRUEL - map ROUTE_34 + map_id ROUTE_34 db 6 percent ; encounter rate db 20, TENTACOOL db 15, TENTACOOL db 20, TENTACRUEL - map ROUTE_35 + map_id ROUTE_35 db 4 percent ; encounter rate db 20, PSYDUCK db 15, PSYDUCK db 20, GOLDUCK - map ROUTE_40 + map_id ROUTE_40 db 6 percent ; encounter rate db 20, TENTACOOL db 15, TENTACOOL db 20, TENTACRUEL - map ROUTE_41 + map_id ROUTE_41 db 6 percent ; encounter rate db 20, TENTACOOL db 20, TENTACRUEL db 20, MANTINE - map ROUTE_42 + map_id ROUTE_42 db 4 percent ; encounter rate db 20, GOLDEEN db 15, GOLDEEN db 20, SEAKING - map ROUTE_43 + map_id ROUTE_43 db 2 percent ; encounter rate db 20, MAGIKARP db 15, MAGIKARP db 10, MAGIKARP - map ROUTE_44 + map_id ROUTE_44 db 2 percent ; encounter rate db 25, POLIWAG db 20, POLIWAG db 25, POLIWHIRL - map ROUTE_45 + map_id ROUTE_45 db 2 percent ; encounter rate db 20, MAGIKARP db 15, MAGIKARP db 5, MAGIKARP - map NEW_BARK_TOWN + map_id NEW_BARK_TOWN db 6 percent ; encounter rate db 20, TENTACOOL db 15, TENTACOOL db 20, TENTACRUEL - map CHERRYGROVE_CITY + map_id CHERRYGROVE_CITY db 6 percent ; encounter rate db 20, TENTACOOL db 15, TENTACOOL db 20, TENTACRUEL - map VIOLET_CITY + map_id VIOLET_CITY db 2 percent ; encounter rate db 20, POLIWAG db 15, POLIWAG db 20, POLIWHIRL - map CIANWOOD_CITY + map_id CIANWOOD_CITY db 6 percent ; encounter rate db 20, TENTACOOL db 15, TENTACOOL db 20, TENTACRUEL - map OLIVINE_CITY + map_id OLIVINE_CITY db 6 percent ; encounter rate db 20, TENTACOOL db 15, TENTACOOL db 20, TENTACRUEL - map ECRUTEAK_CITY + map_id ECRUTEAK_CITY db 2 percent ; encounter rate db 20, POLIWAG db 15, POLIWAG db 20, POLIWHIRL - map LAKE_OF_RAGE + map_id LAKE_OF_RAGE db 6 percent ; encounter rate db 15, MAGIKARP db 10, MAGIKARP db 15, GYARADOS - map BLACKTHORN_CITY + map_id BLACKTHORN_CITY db 4 percent ; encounter rate db 15, MAGIKARP db 10, MAGIKARP db 5, MAGIKARP - map SILVER_CAVE_OUTSIDE + map_id SILVER_CAVE_OUTSIDE db 2 percent ; encounter rate db 35, POLIWHIRL db 40, POLIWHIRL diff --git a/data/wild/kanto_grass.asm b/data/wild/kanto_grass.asm index 415514748..ff1720972 100644 --- a/data/wild/kanto_grass.asm +++ b/data/wild/kanto_grass.asm @@ -1,8 +1,8 @@ ; Kanto Pokémon in grass -KantoGrassWildMons: ; 0x2b274 +KantoGrassWildMons: - map DIGLETTS_CAVE + map_id DIGLETTS_CAVE db 4 percent, 2 percent, 8 percent ; encounter rates: morn/day/nite ; morn db 3, DIGLETT @@ -29,7 +29,7 @@ KantoGrassWildMons: ; 0x2b274 db 32, DUGTRIO db 32, DUGTRIO - map MOUNT_MOON + map_id MOUNT_MOON db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite ; morn db 6, ZUBAT @@ -56,7 +56,7 @@ KantoGrassWildMons: ; 0x2b274 db 12, CLEFAIRY db 12, CLEFAIRY - map ROCK_TUNNEL_1F + map_id ROCK_TUNNEL_1F db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite ; morn db 10, CUBONE @@ -83,7 +83,7 @@ KantoGrassWildMons: ; 0x2b274 db 15, ZUBAT db 15, ZUBAT - map ROCK_TUNNEL_B1F + map_id ROCK_TUNNEL_B1F db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite ; morn db 12, CUBONE @@ -110,7 +110,7 @@ KantoGrassWildMons: ; 0x2b274 db 15, GOLBAT db 15, GOLBAT - map VICTORY_ROAD + map_id VICTORY_ROAD db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite ; morn db 34, GRAVELER @@ -137,7 +137,7 @@ KantoGrassWildMons: ; 0x2b274 db 40, GRAVELER db 40, GRAVELER - map TOHJO_FALLS + map_id TOHJO_FALLS db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite ; morn db 22, ZUBAT @@ -164,7 +164,7 @@ KantoGrassWildMons: ; 0x2b274 db 23, SLOWPOKE db 23, SLOWPOKE - map ROUTE_1 + map_id ROUTE_1 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn db 2, PIDGEY @@ -191,7 +191,7 @@ KantoGrassWildMons: ; 0x2b274 db 4, HOOTHOOT db 4, HOOTHOOT - map ROUTE_2 + map_id ROUTE_2 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn db 3, CATERPIE @@ -218,7 +218,7 @@ KantoGrassWildMons: ; 0x2b274 db 4, NOCTOWL db 4, NOCTOWL - map ROUTE_3 + map_id ROUTE_3 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn db 5, SPEAROW @@ -245,7 +245,7 @@ KantoGrassWildMons: ; 0x2b274 db 6, CLEFAIRY db 6, CLEFAIRY - map ROUTE_4 + map_id ROUTE_4 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn db 5, SPEAROW @@ -272,7 +272,7 @@ KantoGrassWildMons: ; 0x2b274 db 6, CLEFAIRY db 6, CLEFAIRY - map ROUTE_5 + map_id ROUTE_5 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn db 13, PIDGEY @@ -299,7 +299,7 @@ KantoGrassWildMons: ; 0x2b274 db 14, ABRA db 14, ABRA - map ROUTE_6 + map_id ROUTE_6 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn db 13, RATTATA @@ -326,7 +326,7 @@ KantoGrassWildMons: ; 0x2b274 db 15, RATICATE db 15, RATICATE - map ROUTE_7 + map_id ROUTE_7 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn db 17, RATTATA @@ -353,7 +353,7 @@ KantoGrassWildMons: ; 0x2b274 db 16, ABRA db 16, ABRA - map ROUTE_8 + map_id ROUTE_8 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn db 17, SNUBBULL @@ -380,7 +380,7 @@ KantoGrassWildMons: ; 0x2b274 db 18, KADABRA db 18, KADABRA - map ROUTE_9 + map_id ROUTE_9 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn db 15, RATTATA @@ -407,7 +407,7 @@ KantoGrassWildMons: ; 0x2b274 db 18, RATICATE db 18, RATICATE - map ROUTE_10_NORTH + map_id ROUTE_10_NORTH db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn db 15, SPEAROW @@ -434,7 +434,7 @@ KantoGrassWildMons: ; 0x2b274 db 16, ELECTABUZZ db 16, ELECTABUZZ - map ROUTE_11 + map_id ROUTE_11 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn db 14, HOPPIP @@ -461,7 +461,7 @@ KantoGrassWildMons: ; 0x2b274 db 16, HYPNO db 16, HYPNO - map ROUTE_13 + map_id ROUTE_13 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn db 23, NIDORINO @@ -488,7 +488,7 @@ KantoGrassWildMons: ; 0x2b274 db 25, QUAGSIRE db 25, CHANSEY - map ROUTE_14 + map_id ROUTE_14 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn db 26, NIDORINO @@ -515,7 +515,7 @@ KantoGrassWildMons: ; 0x2b274 db 28, QUAGSIRE db 28, CHANSEY - map ROUTE_15 + map_id ROUTE_15 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn db 23, NIDORINO @@ -542,7 +542,7 @@ KantoGrassWildMons: ; 0x2b274 db 25, QUAGSIRE db 25, CHANSEY - map ROUTE_16 + map_id ROUTE_16 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn db 26, GRIMER @@ -569,7 +569,7 @@ KantoGrassWildMons: ; 0x2b274 db 30, MUK db 30, MUK - map ROUTE_17 + map_id ROUTE_17 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn db 30, FEAROW @@ -596,7 +596,7 @@ KantoGrassWildMons: ; 0x2b274 db 33, MUK db 33, MUK - map ROUTE_18 + map_id ROUTE_18 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn db 26, GRIMER @@ -623,7 +623,7 @@ KantoGrassWildMons: ; 0x2b274 db 30, MUK db 30, MUK - map ROUTE_21 + map_id ROUTE_21 db 6 percent, 6 percent, 6 percent ; encounter rates: morn/day/nite ; morn db 30, TANGELA @@ -650,7 +650,7 @@ KantoGrassWildMons: ; 0x2b274 db 28, TANGELA db 28, TANGELA - map ROUTE_22 + map_id ROUTE_22 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn db 3, RATTATA @@ -677,7 +677,7 @@ KantoGrassWildMons: ; 0x2b274 db 7, RATTATA db 7, RATTATA - map ROUTE_24 + map_id ROUTE_24 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn db 8, CATERPIE @@ -704,7 +704,7 @@ KantoGrassWildMons: ; 0x2b274 db 14, GLOOM db 14, GLOOM - map ROUTE_25 + map_id ROUTE_25 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn db 10, CATERPIE @@ -731,7 +731,7 @@ KantoGrassWildMons: ; 0x2b274 db 14, NOCTOWL db 14, NOCTOWL - map ROUTE_26 + map_id ROUTE_26 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn db 28, DODUO @@ -758,7 +758,7 @@ KantoGrassWildMons: ; 0x2b274 db 30, QUAGSIRE db 30, QUAGSIRE - map ROUTE_27 + map_id ROUTE_27 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn db 28, DODUO @@ -785,7 +785,7 @@ KantoGrassWildMons: ; 0x2b274 db 32, NOCTOWL db 32, NOCTOWL - map ROUTE_28 + map_id ROUTE_28 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn db 39, TANGELA diff --git a/data/wild/kanto_water.asm b/data/wild/kanto_water.asm index 71fab48fb..c9abda73d 100644 --- a/data/wild/kanto_water.asm +++ b/data/wild/kanto_water.asm @@ -1,146 +1,146 @@ ; Kanto Pokémon in water -KantoWaterWildMons: ; 0x2b7f7 +KantoWaterWildMons: - map TOHJO_FALLS + map_id TOHJO_FALLS db 4 percent ; encounter rate db 20, GOLDEEN db 20, SLOWPOKE db 20, SEAKING - map VERMILION_PORT + map_id VERMILION_PORT db 2 percent ; encounter rate db 35, TENTACOOL db 30, TENTACOOL db 35, TENTACRUEL - map ROUTE_4 + map_id ROUTE_4 db 4 percent ; encounter rate db 10, GOLDEEN db 5, GOLDEEN db 10, SEAKING - map ROUTE_6 + map_id ROUTE_6 db 2 percent ; encounter rate db 10, PSYDUCK db 5, PSYDUCK db 10, GOLDUCK - map ROUTE_9 + map_id ROUTE_9 db 4 percent ; encounter rate db 15, GOLDEEN db 10, GOLDEEN db 15, SEAKING - map ROUTE_10_NORTH + map_id ROUTE_10_NORTH db 4 percent ; encounter rate db 15, GOLDEEN db 10, GOLDEEN db 15, SEAKING - map ROUTE_12 + map_id ROUTE_12 db 6 percent ; encounter rate db 25, TENTACOOL db 25, QUAGSIRE db 25, TENTACRUEL - map ROUTE_13 + map_id ROUTE_13 db 6 percent ; encounter rate db 25, TENTACOOL db 25, QUAGSIRE db 25, TENTACRUEL - map ROUTE_19 + map_id ROUTE_19 db 6 percent ; encounter rate db 35, TENTACOOL db 30, TENTACOOL db 35, TENTACRUEL - map ROUTE_20 + map_id ROUTE_20 db 6 percent ; encounter rate db 35, TENTACOOL db 30, TENTACOOL db 35, TENTACRUEL - map ROUTE_21 + map_id ROUTE_21 db 6 percent ; encounter rate db 35, TENTACOOL db 30, TENTACOOL db 35, TENTACRUEL - map ROUTE_22 + map_id ROUTE_22 db 2 percent ; encounter rate db 10, POLIWAG db 5, POLIWAG db 10, POLIWHIRL - map ROUTE_24 + map_id ROUTE_24 db 4 percent ; encounter rate db 10, GOLDEEN db 5, GOLDEEN db 10, SEAKING - map ROUTE_25 + map_id ROUTE_25 db 4 percent ; encounter rate db 10, GOLDEEN db 5, GOLDEEN db 10, SEAKING - map ROUTE_26 + map_id ROUTE_26 db 6 percent ; encounter rate db 30, TENTACOOL db 25, TENTACOOL db 30, TENTACRUEL - map ROUTE_27 + map_id ROUTE_27 db 6 percent ; encounter rate db 20, TENTACOOL db 15, TENTACOOL db 20, TENTACRUEL - map ROUTE_28 + map_id ROUTE_28 db 2 percent ; encounter rate db 40, POLIWAG db 35, POLIWAG db 40, POLIWHIRL - map PALLET_TOWN + map_id PALLET_TOWN db 6 percent ; encounter rate db 35, TENTACOOL db 30, TENTACOOL db 35, TENTACRUEL - map VIRIDIAN_CITY + map_id VIRIDIAN_CITY db 2 percent ; encounter rate db 10, POLIWAG db 5, POLIWAG db 10, POLIWHIRL - map CERULEAN_CITY + map_id CERULEAN_CITY db 4 percent ; encounter rate db 10, GOLDEEN db 5, GOLDEEN db 10, SEAKING - map VERMILION_CITY + map_id VERMILION_CITY db 6 percent ; encounter rate db 35, TENTACOOL db 30, TENTACOOL db 35, TENTACRUEL - map CELADON_CITY + map_id CELADON_CITY db 2 percent ; encounter rate db 20, GRIMER db 15, GRIMER db 15, MUK - map FUCHSIA_CITY + map_id FUCHSIA_CITY db 2 percent ; encounter rate db 20, MAGIKARP db 15, MAGIKARP db 10, MAGIKARP - map CINNABAR_ISLAND + map_id CINNABAR_ISLAND db 6 percent ; encounter rate db 35, TENTACOOL db 30, TENTACOOL 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 07bb7a9d9..747dffae1 100644 --- a/data/wild/roammon_maps.asm +++ b/data/wild/roammon_maps.asm @@ -2,33 +2,32 @@ ; Notably missing are Route 40 and Route 41, which are water routes. roam_map: MACRO -; map, # of other maps, other maps - map \1 - db \2 -rept \2 - map \3 + map_id \1 + db _NARG - 1 +rept _NARG + -1 + map_id \2 shift endr db 0 ENDM -RoamMaps: ; 2a40f +RoamMaps: ; there are NUM_ROAMMON_MAPS entries - roam_map ROUTE_29, 2, ROUTE_30, ROUTE_46 - roam_map ROUTE_30, 2, ROUTE_29, ROUTE_31 - roam_map ROUTE_31, 3, ROUTE_30, ROUTE_32, ROUTE_36 - roam_map ROUTE_32, 3, ROUTE_36, ROUTE_31, ROUTE_33 - roam_map ROUTE_33, 2, ROUTE_32, ROUTE_34 - roam_map ROUTE_34, 2, ROUTE_33, ROUTE_35 - roam_map ROUTE_35, 2, ROUTE_34, ROUTE_36 - roam_map ROUTE_36, 4, ROUTE_35, ROUTE_31, ROUTE_32, ROUTE_37 - roam_map ROUTE_37, 3, ROUTE_36, ROUTE_38, ROUTE_42 - roam_map ROUTE_38, 3, ROUTE_37, ROUTE_39, ROUTE_42 - roam_map ROUTE_39, 1, ROUTE_38 - roam_map ROUTE_42, 4, ROUTE_43, ROUTE_44, ROUTE_37, ROUTE_38 - roam_map ROUTE_43, 2, ROUTE_42, ROUTE_44 - roam_map ROUTE_44, 3, ROUTE_42, ROUTE_43, ROUTE_45 - roam_map ROUTE_45, 2, ROUTE_44, ROUTE_46 - roam_map ROUTE_46, 2, ROUTE_45, ROUTE_29 + ; start map, ...other maps + roam_map ROUTE_29, ROUTE_30, ROUTE_46 + roam_map ROUTE_30, ROUTE_29, ROUTE_31 + roam_map ROUTE_31, ROUTE_30, ROUTE_32, ROUTE_36 + roam_map ROUTE_32, ROUTE_36, ROUTE_31, ROUTE_33 + roam_map ROUTE_33, ROUTE_32, ROUTE_34 + roam_map ROUTE_34, ROUTE_33, ROUTE_35 + roam_map ROUTE_35, ROUTE_34, ROUTE_36 + roam_map ROUTE_36, ROUTE_35, ROUTE_31, ROUTE_32, ROUTE_37 + roam_map ROUTE_37, ROUTE_36, ROUTE_38, ROUTE_42 + roam_map ROUTE_38, ROUTE_37, ROUTE_39, ROUTE_42 + roam_map ROUTE_39, ROUTE_38 + roam_map ROUTE_42, ROUTE_43, ROUTE_44, ROUTE_37, ROUTE_38 + roam_map ROUTE_43, ROUTE_42, ROUTE_44 + roam_map ROUTE_44, ROUTE_42, ROUTE_43, ROUTE_45 + 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 a26417f64..dd7110e16 100644 --- a/data/wild/swarm_grass.asm +++ b/data/wild/swarm_grass.asm @@ -1,9 +1,9 @@ ; Pokémon swarms in grass -SwarmGrassWildMons: ; 0x2b8d0 +SwarmGrassWildMons: ; Dunsparce swarm - map DARK_CAVE_VIOLET_ENTRANCE + map_id DARK_CAVE_VIOLET_ENTRANCE db 4 percent, 4 percent, 4 percent ; encounter rates: morn/day/nite ; morn db 3, GEODUDE @@ -31,7 +31,7 @@ SwarmGrassWildMons: ; 0x2b8d0 db 4, DUNSPARCE ; Yanma swarm - map ROUTE_35 + map_id ROUTE_35 db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite ; morn db 12, NIDORAN_M 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 7860110ca..b85962399 100644 --- a/data/wild/treemon_maps.asm +++ b/data/wild/treemon_maps.asm @@ -1,9 +1,9 @@ treemon_map: MACRO - map \1 - db \2 ; treemon set + map_id \1 + 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 @@ -11,7 +11,7 @@ TreeMonMaps: ; b825e treemon_map ROUTE_30, TREEMON_SET_ROUTE treemon_map ROUTE_31, TREEMON_SET_ROUTE treemon_map ROUTE_32, TREEMON_SET_KANTO - treemon_map ROUTE_33, TREEMON_SET_AZALEA + treemon_map ROUTE_33, TREEMON_SET_TOWN treemon_map ROUTE_34, TREEMON_SET_ROUTE treemon_map ROUTE_35, TREEMON_SET_ROUTE treemon_map ROUTE_36, TREEMON_SET_ROUTE @@ -20,7 +20,7 @@ TreeMonMaps: ; b825e treemon_map ROUTE_39, TREEMON_SET_ROUTE treemon_map ROUTE_40, TREEMON_SET_CITY treemon_map ROUTE_41, TREEMON_SET_CITY - treemon_map ROUTE_42, TREEMON_SET_AZALEA + treemon_map ROUTE_42, TREEMON_SET_TOWN treemon_map ROUTE_43, TREEMON_SET_LAKE treemon_map ROUTE_44, TREEMON_SET_CANYON treemon_map ROUTE_45, TREEMON_SET_CANYON @@ -28,7 +28,7 @@ TreeMonMaps: ; b825e treemon_map NEW_BARK_TOWN, TREEMON_SET_CITY treemon_map CHERRYGROVE_CITY, TREEMON_SET_CITY treemon_map VIOLET_CITY, TREEMON_SET_CITY - treemon_map AZALEA_TOWN, TREEMON_SET_AZALEA + treemon_map AZALEA_TOWN, TREEMON_SET_TOWN treemon_map CIANWOOD_CITY, TREEMON_SET_CITY treemon_map GOLDENROD_CITY, TREEMON_SET_CITY treemon_map OLIVINE_CITY, 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 21cef29ec..a6b1922f3 100644 --- a/data/wild/treemons.asm +++ b/data/wild/treemons.asm @@ -1,8 +1,8 @@ -TreeMons: ; b82e8 +TreeMons: ; entries correspond to TREEMON_SET_* constants dw TreeMonSet_City dw TreeMonSet_Canyon - dw TreeMonSet_Azalea + dw TreeMonSet_Town dw TreeMonSet_Route dw TreeMonSet_Kanto dw TreeMonSet_Lake @@ -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_Azalea: ; b8320 +TreeMonSet_Town: ; common db 50, SPEAROW, 10 db 15, EKANS, 10 @@ -51,7 +51,7 @@ TreeMonSet_Azalea: ; 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 diff --git a/data/wild/unlocked_unowns.asm b/data/wild/unlocked_unowns.asm new file mode 100644 index 000000000..d09064c4b --- /dev/null +++ b/data/wild/unlocked_unowns.asm @@ -0,0 +1,24 @@ +unown_set: MACRO +rept _NARG + db UNOWN_\1 + shift +endr + db -1 +ENDM + +UnlockedUnownLetterSets: +; entries correspond to wUnlockedUnowns bits + dw .Set_A_K ; ENGINE_UNLOCKED_UNOWNS_A_TO_K + dw .Set_L_R ; ENGINE_UNLOCKED_UNOWNS_L_TO_R + dw .Set_S_W ; ENGINE_UNLOCKED_UNOWNS_S_TO_W + dw .Set_X_Z ; ENGINE_UNLOCKED_UNOWNS_X_TO_Z +.End + +.Set_A_K: + unown_set A, B, C, D, E, F, G, H, I, J, K +.Set_L_R: + unown_set L, M, N, O, P, Q, R +.Set_S_W: + unown_set S, T, U, V, W +.Set_X_Z: + unown_set X, Y, Z |