diff options
397 files changed, 1970 insertions, 1950 deletions
diff --git a/asm/macros/battle_ai_script.s b/asm/macros/battle_ai_script.s index 3405e7e44..38a44ddfb 100644 --- a/asm/macros/battle_ai_script.s +++ b/asm/macros/battle_ai_script.s @@ -407,7 +407,7 @@ .4byte \address .endm - .macro flee2 + .macro watch .byte 0x47 .endm diff --git a/data/battle_ai_scripts.s b/data/battle_ai_scripts.s index ae21e4797..a0dc3f6cf 100644 --- a/data/battle_ai_scripts.s +++ b/data/battle_ai_scripts.s @@ -41,570 +41,570 @@ BattleAIs:: @ 81DA01C AI_CheckBadMove: @ 81DA09C is_most_powerful_move - if_equal 0, BattleAIScript_1DA108 - if_damage_bonus 0, BattleAIScript_1DA85B + if_equal 0, AI_CheckBadMove_CheckSoundproof + if_damage_bonus 0, Score_Down10 get_ability TARGET - if_equal ABILITY_VOLT_ABSORB, BattleAIScript_1DA0CE - if_equal ABILITY_WATER_ABSORB, BattleAIScript_1DA0DB - if_equal ABILITY_FLASH_FIRE, BattleAIScript_1DA0E8 - if_equal ABILITY_WONDER_GUARD, BattleAIScript_1DA0F5 - if_equal ABILITY_LEVITATE, BattleAIScript_1DA100 - jump BattleAIScript_1DA108 - -BattleAIScript_1DA0CE: @ 81DA0CE + if_equal ABILITY_VOLT_ABSORB, CheckIfVoltAbsorbCancelsElectric + if_equal ABILITY_WATER_ABSORB, CheckIfWaterAbsorbCancelsWater + if_equal ABILITY_FLASH_FIRE, CheckIfFlashFireCancelsFire + if_equal ABILITY_WONDER_GUARD, CheckIfWonderGuardCancelsMove + if_equal ABILITY_LEVITATE, CheckIfLevitateCancelsGroundMove + jump AI_CheckBadMove_CheckSoundproof + +CheckIfVoltAbsorbCancelsElectric: @ 81DA0CE get_type 4 - if_type TYPE_ELECTRIC, BattleAIScript_1DA85E - jump BattleAIScript_1DA108 + if_type TYPE_ELECTRIC, Score_Down12 + jump AI_CheckBadMove_CheckSoundproof -BattleAIScript_1DA0DB: @ 81DA0DB +CheckIfWaterAbsorbCancelsWater: @ 81DA0DB get_type 4 - if_type TYPE_WATER, BattleAIScript_1DA85E - jump BattleAIScript_1DA108 + if_type TYPE_WATER, Score_Down12 + jump AI_CheckBadMove_CheckSoundproof -BattleAIScript_1DA0E8: @ 81DA0E8 +CheckIfFlashFireCancelsFire: @ 81DA0E8 get_type 4 - if_type TYPE_FIRE, BattleAIScript_1DA85E - jump BattleAIScript_1DA108 + if_type TYPE_FIRE, Score_Down12 + jump AI_CheckBadMove_CheckSoundproof -BattleAIScript_1DA0F5: @ 81DA0F5 - if_damage_bonus 80, BattleAIScript_1DA108 - jump BattleAIScript_1DA85B +CheckIfWonderGuardCancelsMove: @ 81DA0F5 + if_damage_bonus 80, AI_CheckBadMove_CheckSoundproof + jump Score_Down10 -BattleAIScript_1DA100: @ 81DA100 +CheckIfLevitateCancelsGroundMove: @ 81DA100 get_type 4 - if_type TYPE_GROUND, BattleAIScript_1DA85B + if_type TYPE_GROUND, Score_Down10 -BattleAIScript_1DA108: @ 81DA108 +AI_CheckBadMove_CheckSoundproof: @ 81DA108 get_ability TARGET - if_not_equal ABILITY_SOUNDPROOF, BattleAIScript_1DA14F - if_move MOVE_GROWL, BattleAIScript_1DA85B - if_move MOVE_ROAR, BattleAIScript_1DA85B - if_move MOVE_SING, BattleAIScript_1DA85B - if_move MOVE_SUPERSONIC, BattleAIScript_1DA85B - if_move MOVE_SCREECH, BattleAIScript_1DA85B - if_move MOVE_SNORE, BattleAIScript_1DA85B - if_move MOVE_UPROAR, BattleAIScript_1DA85B - if_move MOVE_METAL_SOUND, BattleAIScript_1DA85B - if_move MOVE_GRASS_WHISTLE, BattleAIScript_1DA85B - -BattleAIScript_1DA14F: @ 81DA14F - if_effect EFFECT_SLEEP, BattleAIScript_1DA3DE - if_effect EFFECT_EXPLOSION, BattleAIScript_1DA3F7 - if_effect EFFECT_DREAM_EATER, BattleAIScript_1DA430 - if_effect EFFECT_ATTACK_UP, BattleAIScript_1DA448 - if_effect EFFECT_DEFENSE_UP, BattleAIScript_1DA451 - if_effect EFFECT_SPEED_UP, BattleAIScript_1DA45A - if_effect EFFECT_SPECIAL_ATTACK_UP, BattleAIScript_1DA463 - if_effect EFFECT_SPECIAL_DEFENSE_UP, BattleAIScript_1DA46C - if_effect EFFECT_ACCURACY_UP, BattleAIScript_1DA475 - if_effect EFFECT_EVASION_UP, BattleAIScript_1DA47E - if_effect EFFECT_ATTACK_DOWN, BattleAIScript_1DA487 - if_effect EFFECT_DEFENSE_DOWN, BattleAIScript_1DA49C - if_effect EFFECT_SPEED_DOWN, BattleAIScript_1DA4A9 - if_effect EFFECT_SPECIAL_ATTACK_DOWN, BattleAIScript_1DA4B6 - if_effect EFFECT_SPECIAL_DEFENSE_DOWN, BattleAIScript_1DA4C3 - if_effect EFFECT_ACCURACY_DOWN, BattleAIScript_1DA4D0 - if_effect EFFECT_EVASION_DOWN, BattleAIScript_1DA4E5 - if_effect EFFECT_HAZE, BattleAIScript_1DA4FC - if_effect EFFECT_BIDE, BattleAIScript_1DA5DA - if_effect EFFECT_ROAR, BattleAIScript_1DA572 - if_effect EFFECT_TOXIC, BattleAIScript_1DA583 - if_effect EFFECT_LIGHT_SCREEN, BattleAIScript_1DA5B2 - if_effect EFFECT_OHKO, BattleAIScript_1DA5BD - if_effect EFFECT_RAZOR_WIND, BattleAIScript_1DA5DA - if_effect EFFECT_SUPER_FANG, BattleAIScript_1DA5DA - if_effect EFFECT_MIST, BattleAIScript_1DA5F4 - if_effect EFFECT_FOCUS_ENERGY, BattleAIScript_1DA5FF - if_effect EFFECT_CONFUSE, BattleAIScript_1DA60A - if_effect EFFECT_ATTACK_UP_2, BattleAIScript_1DA448 - if_effect EFFECT_DEFENSE_UP_2, BattleAIScript_1DA451 - if_effect EFFECT_SPEED_UP_2, BattleAIScript_1DA45A - if_effect EFFECT_SPECIAL_ATTACK_UP_2, BattleAIScript_1DA463 - if_effect EFFECT_SPECIAL_DEFENSE_UP_2, BattleAIScript_1DA46C - if_effect EFFECT_ACCURACY_UP_2, BattleAIScript_1DA475 - if_effect EFFECT_EVASION_UP_2, BattleAIScript_1DA47E - if_effect EFFECT_ATTACK_DOWN_2, BattleAIScript_1DA487 - if_effect EFFECT_DEFENSE_DOWN_2, BattleAIScript_1DA49C - if_effect EFFECT_SPEED_DOWN_2, BattleAIScript_1DA4A9 - if_effect EFFECT_SPECIAL_ATTACK_DOWN_2, BattleAIScript_1DA4B6 - if_effect EFFECT_SPECIAL_DEFENSE_DOWN_2, BattleAIScript_1DA4C3 - if_effect EFFECT_ACCURACY_DOWN_2, BattleAIScript_1DA4D0 - if_effect EFFECT_EVASION_DOWN_2, BattleAIScript_1DA4E5 - if_effect EFFECT_REFLECT, BattleAIScript_1DA61D - if_effect EFFECT_POISON, BattleAIScript_1DA583 - if_effect EFFECT_PARALYZE, BattleAIScript_1DA628 - if_effect EFFECT_SUBSTITUTE, BattleAIScript_1DA641 - if_effect EFFECT_RECHARGE, BattleAIScript_1DA5DA - if_effect EFFECT_LEECH_SEED, BattleAIScript_1DA653 - if_effect EFFECT_DISABLE, BattleAIScript_1DA66E - if_effect EFFECT_LEVEL_DAMAGE, BattleAIScript_1DA5DA - if_effect EFFECT_PSYWAVE, BattleAIScript_1DA5DA - if_effect EFFECT_COUNTER, BattleAIScript_1DA5DA - if_effect EFFECT_ENCORE, BattleAIScript_1DA676 - if_effect EFFECT_SNORE, BattleAIScript_1DA67E - if_effect EFFECT_SLEEP_TALK, BattleAIScript_1DA67E - if_effect EFFECT_FLAIL, BattleAIScript_1DA5DA - if_effect EFFECT_MEAN_LOOK, BattleAIScript_1DA689 - if_effect EFFECT_NIGHTMARE, BattleAIScript_1DA41B - if_effect EFFECT_MINIMIZE, BattleAIScript_1DA47E - if_effect EFFECT_CURSE, BattleAIScript_1DA694 - if_effect EFFECT_SPIKES, BattleAIScript_1DA6A5 - if_effect EFFECT_FORESIGHT, BattleAIScript_1DA6B0 - if_effect EFFECT_PERISH_SONG, BattleAIScript_1DA6BB - if_effect EFFECT_SANDSTORM, BattleAIScript_1DA6C6 - if_effect EFFECT_SWAGGER, BattleAIScript_1DA60A - if_effect EFFECT_ATTRACT, BattleAIScript_1DA6CE - if_effect EFFECT_RETURN, BattleAIScript_1DA5DA - if_effect EFFECT_PRESENT, BattleAIScript_1DA5DA - if_effect EFFECT_FRUSTRATION, BattleAIScript_1DA5DA - if_effect EFFECT_SAFEGUARD, BattleAIScript_1DA70E - if_effect EFFECT_MAGNITUDE, BattleAIScript_1DA5D2 - if_effect EFFECT_BATON_PASS, BattleAIScript_1DA729 - if_effect EFFECT_SONICBOOM, BattleAIScript_1DA5DA - if_effect EFFECT_RAIN_DANCE, BattleAIScript_1DA732 - if_effect EFFECT_SUNNY_DAY, BattleAIScript_1DA73A - if_effect EFFECT_BELLY_DRUM, BattleAIScript_1DA441 - if_effect EFFECT_PSYCH_UP, BattleAIScript_1DA4FC - if_effect EFFECT_MIRROR_COAT, BattleAIScript_1DA5DA - if_effect EFFECT_SKULL_BASH, BattleAIScript_1DA5DA - if_effect EFFECT_FUTURE_SIGHT, BattleAIScript_1DA742 - if_effect EFFECT_TELEPORT, BattleAIScript_1DA85B - if_effect EFFECT_DEFENSE_CURL, BattleAIScript_1DA451 - if_effect EFFECT_FAKE_OUT, BattleAIScript_1DA74D - if_effect EFFECT_STOCKPILE, BattleAIScript_1DA756 - if_effect EFFECT_SPIT_UP, BattleAIScript_1DA75F - if_effect EFFECT_SWALLOW, BattleAIScript_1DA75F - if_effect EFFECT_HAIL, BattleAIScript_1DA76E - if_effect EFFECT_TORMENT, BattleAIScript_1DA776 - if_effect EFFECT_FLATTER, BattleAIScript_1DA60A - if_effect EFFECT_WILL_O_WISP, BattleAIScript_1DA781 - if_effect EFFECT_MEMENTO, BattleAIScript_1DA719 - if_effect EFFECT_FOCUS_PUNCH, BattleAIScript_1DA5DA - if_effect EFFECT_HELPING_HAND, BattleAIScript_1DA7A6 - if_effect EFFECT_TRICK, BattleAIScript_1DA7AE - if_effect EFFECT_INGRAIN, BattleAIScript_1DA7B7 - if_effect EFFECT_SUPERPOWER, BattleAIScript_1DA5DA - if_effect EFFECT_RECYCLE, BattleAIScript_1DA7C2 - if_effect EFFECT_KNOCK_OFF, BattleAIScript_1DA7AE - if_effect EFFECT_ENDEAVOR, BattleAIScript_1DA5DA - if_effect EFFECT_IMPRISON, BattleAIScript_1DA7CB - if_effect EFFECT_REFRESH, BattleAIScript_1DA7D6 - if_effect EFFECT_LOW_KICK, BattleAIScript_1DA5DA - if_effect EFFECT_MUD_SPORT, BattleAIScript_1DA7E1 - if_effect EFFECT_TICKLE, BattleAIScript_1DA7EC - if_effect EFFECT_COSMIC_POWER, BattleAIScript_1DA7FD - if_effect EFFECT_BULK_UP, BattleAIScript_1DA80E - if_effect EFFECT_WATER_SPORT, BattleAIScript_1DA81F - if_effect EFFECT_CALM_MIND, BattleAIScript_1DA82A - if_effect EFFECT_DRAGON_DANCE, BattleAIScript_1DA83B - end - -BattleAIScript_1DA3DE: @ 81DA3DE + if_not_equal ABILITY_SOUNDPROOF, AI_CheckBadMove_CheckEffect + if_move MOVE_GROWL, Score_Down10 + if_move MOVE_ROAR, Score_Down10 + if_move MOVE_SING, Score_Down10 + if_move MOVE_SUPERSONIC, Score_Down10 + if_move MOVE_SCREECH, Score_Down10 + if_move MOVE_SNORE, Score_Down10 + if_move MOVE_UPROAR, Score_Down10 + if_move MOVE_METAL_SOUND, Score_Down10 + if_move MOVE_GRASS_WHISTLE, Score_Down10 + +AI_CheckBadMove_CheckEffect: @ 81DA14F + if_effect EFFECT_SLEEP, AI_CBM_Sleep + if_effect EFFECT_EXPLOSION, AI_CBM_Explosion + if_effect EFFECT_DREAM_EATER, AI_CBM_DreamEater + if_effect EFFECT_ATTACK_UP, AI_CBM_AttackUp + if_effect EFFECT_DEFENSE_UP, AI_CBM_DefenseUp + if_effect EFFECT_SPEED_UP, AI_CBM_SpeedUp + if_effect EFFECT_SPECIAL_ATTACK_UP, AI_CBM_SpAtkUp + if_effect EFFECT_SPECIAL_DEFENSE_UP, AI_CBM_SpDefUp + if_effect EFFECT_ACCURACY_UP, AI_CBM_AccUp + if_effect EFFECT_EVASION_UP, AI_CBM_EvasionUp + if_effect EFFECT_ATTACK_DOWN, AI_CBM_AttackDown + if_effect EFFECT_DEFENSE_DOWN, AI_CBM_DefenseDown + if_effect EFFECT_SPEED_DOWN, AI_CBM_SpeedDown + if_effect EFFECT_SPECIAL_ATTACK_DOWN, AI_CBM_SpAtkDown + if_effect EFFECT_SPECIAL_DEFENSE_DOWN, AI_CBM_SpDefDown + if_effect EFFECT_ACCURACY_DOWN, AI_CBM_AccDown + if_effect EFFECT_EVASION_DOWN, AI_CBM_EvasionDown + if_effect EFFECT_HAZE, AI_CBM_Haze + if_effect EFFECT_BIDE, AI_CBM_HighRiskForDamage + if_effect EFFECT_ROAR, AI_CBM_Roar + if_effect EFFECT_TOXIC, AI_CBM_Toxic + if_effect EFFECT_LIGHT_SCREEN, AI_CBM_LightScreen + if_effect EFFECT_OHKO, AI_CBM_OneHitKO + if_effect EFFECT_RAZOR_WIND, AI_CBM_HighRiskForDamage + if_effect EFFECT_SUPER_FANG, AI_CBM_HighRiskForDamage + if_effect EFFECT_MIST, AI_CBM_Mist + if_effect EFFECT_FOCUS_ENERGY, AI_CBM_FocusEnergy + if_effect EFFECT_CONFUSE, AI_CBM_Confuse + if_effect EFFECT_ATTACK_UP_2, AI_CBM_AttackUp + if_effect EFFECT_DEFENSE_UP_2, AI_CBM_DefenseUp + if_effect EFFECT_SPEED_UP_2, AI_CBM_SpeedUp + if_effect EFFECT_SPECIAL_ATTACK_UP_2, AI_CBM_SpAtkUp + if_effect EFFECT_SPECIAL_DEFENSE_UP_2, AI_CBM_SpDefUp + if_effect EFFECT_ACCURACY_UP_2, AI_CBM_AccUp + if_effect EFFECT_EVASION_UP_2, AI_CBM_EvasionUp + if_effect EFFECT_ATTACK_DOWN_2, AI_CBM_AttackDown + if_effect EFFECT_DEFENSE_DOWN_2, AI_CBM_DefenseDown + if_effect EFFECT_SPEED_DOWN_2, AI_CBM_SpeedDown + if_effect EFFECT_SPECIAL_ATTACK_DOWN_2, AI_CBM_SpAtkDown + if_effect EFFECT_SPECIAL_DEFENSE_DOWN_2, AI_CBM_SpDefDown + if_effect EFFECT_ACCURACY_DOWN_2, AI_CBM_AccDown + if_effect EFFECT_EVASION_DOWN_2, AI_CBM_EvasionDown + if_effect EFFECT_REFLECT, AI_CBM_Reflect + if_effect EFFECT_POISON, AI_CBM_Toxic + if_effect EFFECT_PARALYZE, AI_CBM_Paralyze + if_effect EFFECT_SUBSTITUTE, AI_CBM_Substitute + if_effect EFFECT_RECHARGE, AI_CBM_HighRiskForDamage + if_effect EFFECT_LEECH_SEED, AI_CBM_LeechSeed + if_effect EFFECT_DISABLE, AI_CBM_Disable + if_effect EFFECT_LEVEL_DAMAGE, AI_CBM_HighRiskForDamage + if_effect EFFECT_PSYWAVE, AI_CBM_HighRiskForDamage + if_effect EFFECT_COUNTER, AI_CBM_HighRiskForDamage + if_effect EFFECT_ENCORE, AI_CBM_Encore + if_effect EFFECT_SNORE, AI_CBM_DamageDuringSleep + if_effect EFFECT_SLEEP_TALK, AI_CBM_DamageDuringSleep + if_effect EFFECT_FLAIL, AI_CBM_HighRiskForDamage + if_effect EFFECT_MEAN_LOOK, AI_CBM_CantEscape + if_effect EFFECT_NIGHTMARE, AI_CBM_Nightmare + if_effect EFFECT_MINIMIZE, AI_CBM_EvasionUp + if_effect EFFECT_CURSE, AI_CBM_Curse + if_effect EFFECT_SPIKES, AI_CBM_Spikes + if_effect EFFECT_FORESIGHT, AI_CBM_Foresight + if_effect EFFECT_PERISH_SONG, AI_CBM_PerishSong + if_effect EFFECT_SANDSTORM, AI_CBM_Sandstorm + if_effect EFFECT_SWAGGER, AI_CBM_Confuse + if_effect EFFECT_ATTRACT, AI_CBM_Attract + if_effect EFFECT_RETURN, AI_CBM_HighRiskForDamage + if_effect EFFECT_PRESENT, AI_CBM_HighRiskForDamage + if_effect EFFECT_FRUSTRATION, AI_CBM_HighRiskForDamage + if_effect EFFECT_SAFEGUARD, AI_CBM_Safeguard + if_effect EFFECT_MAGNITUDE, AI_CBM_Magnitude + if_effect EFFECT_BATON_PASS, AI_CBM_BatonPass + if_effect EFFECT_SONICBOOM, AI_CBM_HighRiskForDamage + if_effect EFFECT_RAIN_DANCE, AI_CBM_RainDance + if_effect EFFECT_SUNNY_DAY, AI_CBM_SunnyDay + if_effect EFFECT_BELLY_DRUM, AI_CBM_BellyDrum + if_effect EFFECT_PSYCH_UP, AI_CBM_Haze + if_effect EFFECT_MIRROR_COAT, AI_CBM_HighRiskForDamage + if_effect EFFECT_SKULL_BASH, AI_CBM_HighRiskForDamage + if_effect EFFECT_FUTURE_SIGHT, AI_CBM_FutureSight + if_effect EFFECT_TELEPORT, Score_Down10 + if_effect EFFECT_DEFENSE_CURL, AI_CBM_DefenseUp + if_effect EFFECT_FAKE_OUT, AI_CBM_FakeOut + if_effect EFFECT_STOCKPILE, AI_CBM_Stockpile + if_effect EFFECT_SPIT_UP, AI_CBM_SpitUpAndSwallow + if_effect EFFECT_SWALLOW, AI_CBM_SpitUpAndSwallow + if_effect EFFECT_HAIL, AI_CBM_Hail + if_effect EFFECT_TORMENT, AI_CBM_Torment + if_effect EFFECT_FLATTER, AI_CBM_Confuse + if_effect EFFECT_WILL_O_WISP, AI_CBM_WillOWisp + if_effect EFFECT_MEMENTO, AI_CBM_Memento + if_effect EFFECT_FOCUS_PUNCH, AI_CBM_HighRiskForDamage + if_effect EFFECT_HELPING_HAND, AI_CBM_HelpingHand + if_effect EFFECT_TRICK, AI_CBM_TrickAndKnockOff + if_effect EFFECT_INGRAIN, AI_CBM_Ingrain + if_effect EFFECT_SUPERPOWER, AI_CBM_HighRiskForDamage + if_effect EFFECT_RECYCLE, AI_CBM_Recycle + if_effect EFFECT_KNOCK_OFF, AI_CBM_TrickAndKnockOff + if_effect EFFECT_ENDEAVOR, AI_CBM_HighRiskForDamage + if_effect EFFECT_IMPRISON, AI_CBM_Imprison + if_effect EFFECT_REFRESH, AI_CBM_Refresh + if_effect EFFECT_LOW_KICK, AI_CBM_HighRiskForDamage + if_effect EFFECT_MUD_SPORT, AI_CBM_MudSport + if_effect EFFECT_TICKLE, AI_CBM_Tickle + if_effect EFFECT_COSMIC_POWER, AI_CBM_CosmicPower + if_effect EFFECT_BULK_UP, AI_CBM_BulkUp + if_effect EFFECT_WATER_SPORT, AI_CBM_WaterSport + if_effect EFFECT_CALM_MIND, AI_CBM_CalmMind + if_effect EFFECT_DRAGON_DANCE, AI_CBM_DragonDance + end + +AI_CBM_Sleep: @ 81DA3DE get_ability TARGET - if_equal ABILITY_INSOMNIA, BattleAIScript_1DA85B - if_equal ABILITY_VITAL_SPIRIT, BattleAIScript_1DA85B - if_status TARGET, SLP | PSN | BRN | FRZ | PAR | TOX, BattleAIScript_1DA85B + if_equal ABILITY_INSOMNIA, Score_Down10 + if_equal ABILITY_VITAL_SPIRIT, Score_Down10 + if_status TARGET, SLP | PSN | BRN | FRZ | PAR | TOX, Score_Down10 end -BattleAIScript_1DA3F7: @ 81DA3F7 - if_damage_bonus 0, BattleAIScript_1DA85B +AI_CBM_Explosion: @ 81DA3F7 + if_damage_bonus 0, Score_Down10 get_ability TARGET - if_equal ABILITY_DAMP, BattleAIScript_1DA85B + if_equal ABILITY_DAMP, Score_Down10 count_alive_pokemon USER - if_not_equal 0, BattleAIScript_1DA41A + if_not_equal 0, AI_CBM_Explosion_End count_alive_pokemon TARGET - if_not_equal 0, BattleAIScript_1DA85B - jump BattleAIScript_1DA84C + if_not_equal 0, Score_Down10 + jump Score_Down1 -BattleAIScript_1DA41A: @ 81DA41A +AI_CBM_Explosion_End: @ 81DA41A end -BattleAIScript_1DA41B: @ 81DA41B - if_status2 TARGET, S_NIGHTMARE, BattleAIScript_1DA85B - if_not_status TARGET, SLP, BattleAIScript_1DA858 +AI_CBM_Nightmare: @ 81DA41B + if_status2 TARGET, S_NIGHTMARE, Score_Down10 + if_not_status TARGET, SLP, Score_Down8 end -BattleAIScript_1DA430: @ 81DA430 - if_not_status TARGET, SLP, BattleAIScript_1DA858 - if_damage_bonus 0, BattleAIScript_1DA85B +AI_CBM_DreamEater: @ 81DA430 + if_not_status TARGET, SLP, Score_Down8 + if_damage_bonus 0, Score_Down10 end -BattleAIScript_1DA441: @ 81DA441 - if_hp_less_than USER, 51, BattleAIScript_1DA85B +AI_CBM_BellyDrum: @ 81DA441 + if_hp_less_than USER, 51, Score_Down10 -BattleAIScript_1DA448: @ 81DA448 - if_stat_level_equal USER, ATTACK, 12, BattleAIScript_1DA85B +AI_CBM_AttackUp: @ 81DA448 + if_stat_level_equal USER, ATTACK, 12, Score_Down10 end -BattleAIScript_1DA451: @ 81DA451 - if_stat_level_equal USER, DEFENSE, 12, BattleAIScript_1DA85B +AI_CBM_DefenseUp: @ 81DA451 + if_stat_level_equal USER, DEFENSE, 12, Score_Down10 end -BattleAIScript_1DA45A: @ 81DA45A - if_stat_level_equal USER, SPEED, 12, BattleAIScript_1DA85B +AI_CBM_SpeedUp: @ 81DA45A + if_stat_level_equal USER, SPEED, 12, Score_Down10 end -BattleAIScript_1DA463: @ 81DA463 - if_stat_level_equal USER, SP_ATTACK, 12, BattleAIScript_1DA85B +AI_CBM_SpAtkUp: @ 81DA463 + if_stat_level_equal USER, SP_ATTACK, 12, Score_Down10 end -BattleAIScript_1DA46C: @ 81DA46C - if_stat_level_equal USER, SP_DEFENSE, 12, BattleAIScript_1DA85B +AI_CBM_SpDefUp: @ 81DA46C + if_stat_level_equal USER, SP_DEFENSE, 12, Score_Down10 end -BattleAIScript_1DA475: @ 81DA475 - if_stat_level_equal USER, ACCURACY, 12, BattleAIScript_1DA85B +AI_CBM_AccUp: @ 81DA475 + if_stat_level_equal USER, ACCURACY, 12, Score_Down10 end -BattleAIScript_1DA47E: @ 81DA47E - if_stat_level_equal USER, EVASION, 12, BattleAIScript_1DA85B +AI_CBM_EvasionUp: @ 81DA47E + if_stat_level_equal USER, EVASION, 12, Score_Down10 end -BattleAIScript_1DA487: @ 81DA487 - if_stat_level_equal TARGET, ATTACK, 0, BattleAIScript_1DA85B +AI_CBM_AttackDown: @ 81DA487 + if_stat_level_equal TARGET, ATTACK, 0, Score_Down10 get_ability TARGET - if_equal ABILITY_HYPER_CUTTER, BattleAIScript_1DA85B - jump BattleAIScript_1DA4ED + if_equal ABILITY_HYPER_CUTTER, Score_Down10 + jump CheckIfAbilityBlocksStatChange -BattleAIScript_1DA49C: @ 81DA49C - if_stat_level_equal TARGET, DEFENSE, 0, BattleAIScript_1DA85B - jump BattleAIScript_1DA4ED +AI_CBM_DefenseDown: @ 81DA49C + if_stat_level_equal TARGET, DEFENSE, 0, Score_Down10 + jump CheckIfAbilityBlocksStatChange -BattleAIScript_1DA4A9: @ 81DA4A9 - if_stat_level_equal TARGET, SPEED, 0, BattleAIScript_1DA85B - jump BattleAIScript_1DA4ED +AI_CBM_SpeedDown: @ 81DA4A9 + if_stat_level_equal TARGET, SPEED, 0, Score_Down10 + jump CheckIfAbilityBlocksStatChange -BattleAIScript_1DA4B6: @ 81DA4B6 - if_stat_level_equal TARGET, SP_ATTACK, 0, BattleAIScript_1DA85B - jump BattleAIScript_1DA4ED +AI_CBM_SpAtkDown: @ 81DA4B6 + if_stat_level_equal TARGET, SP_ATTACK, 0, Score_Down10 + jump CheckIfAbilityBlocksStatChange -BattleAIScript_1DA4C3: @ 81DA4C3 - if_stat_level_equal TARGET, SP_DEFENSE, 0, BattleAIScript_1DA85B - jump BattleAIScript_1DA4ED +AI_CBM_SpDefDown: @ 81DA4C3 + if_stat_level_equal TARGET, SP_DEFENSE, 0, Score_Down10 + jump CheckIfAbilityBlocksStatChange -BattleAIScript_1DA4D0: @ 81DA4D0 - if_stat_level_equal TARGET, ACCURACY, 0, BattleAIScript_1DA85B +AI_CBM_AccDown: @ 81DA4D0 + if_stat_level_equal TARGET, ACCURACY, 0, Score_Down10 get_ability TARGET - if_equal ABILITY_KEEN_EYE, BattleAIScript_1DA85B - jump BattleAIScript_1DA4ED + if_equal ABILITY_KEEN_EYE, Score_Down10 + jump CheckIfAbilityBlocksStatChange -BattleAIScript_1DA4E5: @ 81DA4E5 - if_stat_level_equal TARGET, EVASION, 0, BattleAIScript_1DA85B +AI_CBM_EvasionDown: @ 81DA4E5 + if_stat_level_equal TARGET, EVASION, 0, Score_Down10 -BattleAIScript_1DA4ED: @ 81DA4ED +CheckIfAbilityBlocksStatChange: @ 81DA4ED get_ability TARGET - if_equal ABILITY_CLEAR_BODY, BattleAIScript_1DA85B - if_equal ABILITY_WHITE_SMOKE, BattleAIScript_1DA85B - end - -BattleAIScript_1DA4FC: @ 81DA4FC - if_stat_level_less_than USER, ATTACK, 6, BattleAIScript_1DA571 - if_stat_level_less_than USER, DEFENSE, 6, BattleAIScript_1DA571 - if_stat_level_less_than USER, SPEED, 6, BattleAIScript_1DA571 - if_stat_level_less_than USER, SP_ATTACK, 6, BattleAIScript_1DA571 - if_stat_level_less_than USER, SP_DEFENSE, 6, BattleAIScript_1DA571 - if_stat_level_less_than USER, ACCURACY, 6, BattleAIScript_1DA571 - if_stat_level_less_than USER, EVASION, 6, BattleAIScript_1DA571 - if_stat_level_more_than TARGET, ATTACK, 6, BattleAIScript_1DA571 - if_stat_level_more_than TARGET, DEFENSE, 6, BattleAIScript_1DA571 - if_stat_level_more_than TARGET, SPEED, 6, BattleAIScript_1DA571 - if_stat_level_more_than TARGET, SP_ATTACK, 6, BattleAIScript_1DA571 - if_stat_level_more_than TARGET, SP_DEFENSE, 6, BattleAIScript_1DA571 - if_stat_level_more_than TARGET, ACCURACY, 6, BattleAIScript_1DA571 - if_stat_level_more_than TARGET, EVASION, 6, BattleAIScript_1DA571 - jump BattleAIScript_1DA85B - -BattleAIScript_1DA571: @ 81DA571 - end - -BattleAIScript_1DA572: @ 81DA572 + if_equal ABILITY_CLEAR_BODY, Score_Down10 + if_equal ABILITY_WHITE_SMOKE, Score_Down10 + end + +AI_CBM_Haze: @ 81DA4FC + if_stat_level_less_than USER, ATTACK, 6, AI_CBM_Haze_End + if_stat_level_less_than USER, DEFENSE, 6, AI_CBM_Haze_End + if_stat_level_less_than USER, SPEED, 6, AI_CBM_Haze_End + if_stat_level_less_than USER, SP_ATTACK, 6, AI_CBM_Haze_End + if_stat_level_less_than USER, SP_DEFENSE, 6, AI_CBM_Haze_End + if_stat_level_less_than USER, ACCURACY, 6, AI_CBM_Haze_End + if_stat_level_less_than USER, EVASION, 6, AI_CBM_Haze_End + if_stat_level_more_than TARGET, ATTACK, 6, AI_CBM_Haze_End + if_stat_level_more_than TARGET, DEFENSE, 6, AI_CBM_Haze_End + if_stat_level_more_than TARGET, SPEED, 6, AI_CBM_Haze_End + if_stat_level_more_than TARGET, SP_ATTACK, 6, AI_CBM_Haze_End + if_stat_level_more_than TARGET, SP_DEFENSE, 6, AI_CBM_Haze_End + if_stat_level_more_than TARGET, ACCURACY, 6, AI_CBM_Haze_End + if_stat_level_more_than TARGET, EVASION, 6, AI_CBM_Haze_End + jump Score_Down10 + +AI_CBM_Haze_End: @ 81DA571 + end + +AI_CBM_Roar: @ 81DA572 count_alive_pokemon TARGET - if_equal 0, BattleAIScript_1DA85B + if_equal 0, Score_Down10 get_ability TARGET - if_equal ABILITY_SUCTION_CUPS, BattleAIScript_1DA85B + if_equal ABILITY_SUCTION_CUPS, Score_Down10 end -BattleAIScript_1DA583: @ 81DA583 +AI_CBM_Toxic: @ 81DA583 get_type 0 - if_equal TYPE_STEEL, BattleAIScript_1DA85B - if_equal TYPE_POISON, BattleAIScript_1DA85B + if_equal TYPE_STEEL, Score_Down10 + if_equal TYPE_POISON, Score_Down10 get_type 2 - if_equal TYPE_STEEL, BattleAIScript_1DA85B - if_equal TYPE_POISON, BattleAIScript_1DA85B + if_equal TYPE_STEEL, Score_Down10 + if_equal TYPE_POISON, Score_Down10 get_ability TARGET - if_equal ABILITY_IMMUNITY, BattleAIScript_1DA85B - if_status TARGET, SLP | PSN | BRN | FRZ | PAR | TOX, BattleAIScript_1DA85B + if_equal ABILITY_IMMUNITY, Score_Down10 + if_status TARGET, SLP | PSN | BRN | FRZ | PAR | TOX, Score_Down10 end -BattleAIScript_1DA5B2: @ 81DA5B2 - if_status4 USER, S_LIGHT_SCREEN, BattleAIScript_1DA858 +AI_CBM_LightScreen: @ 81DA5B2 + if_status4 USER, S_LIGHT_SCREEN, Score_Down8 end -BattleAIScript_1DA5BD: @ 81DA5BD - if_damage_bonus 0, BattleAIScript_1DA85B +AI_CBM_OneHitKO: @ 81DA5BD + if_damage_bonus 0, Score_Down10 get_ability TARGET - if_equal ABILITY_STURDY, BattleAIScript_1DA85B - if_target_higher_level BattleAIScript_1DA85B + if_equal ABILITY_STURDY, Score_Down10 + if_target_higher_level Score_Down10 end -BattleAIScript_1DA5D2: @ 81DA5D2 +AI_CBM_Magnitude: @ 81DA5D2 get_ability TARGET - if_equal ABILITY_LEVITATE, BattleAIScript_1DA85B + if_equal ABILITY_LEVITATE, Score_Down10 -BattleAIScript_1DA5DA: @ 81DA5DA - if_damage_bonus 0, BattleAIScript_1DA85B +AI_CBM_HighRiskForDamage: @ 81DA5DA + if_damage_bonus 0, Score_Down10 get_ability TARGET - if_not_equal ABILITY_WONDER_GUARD, BattleAIScript_1DA5F3 - if_damage_bonus 80, BattleAIScript_1DA5F3 - jump BattleAIScript_1DA85B + if_not_equal ABILITY_WONDER_GUARD, AI_CBM_HighRiskForDamage_End + if_damage_bonus 80, AI_CBM_HighRiskForDamage_End + jump Score_Down10 -BattleAIScript_1DA5F3: @ 81DA5F3 +AI_CBM_HighRiskForDamage_End: @ 81DA5F3 end -BattleAIScript_1DA5F4: @ 81DA5F4 - if_status4 USER, S_MIST, BattleAIScript_1DA858 +AI_CBM_Mist: @ 81DA5F4 + if_status4 USER, S_MIST, Score_Down8 end -BattleAIScript_1DA5FF: @ 81DA5FF - if_status2 USER, S_FOCUS_ENERGY, BattleAIScript_1DA85B +AI_CBM_FocusEnergy: @ 81DA5FF + if_status2 USER, S_FOCUS_ENERGY, Score_Down10 end -BattleAIScript_1DA60A: @ 81DA60A - if_status2 TARGET, S_CONFUSED, BattleAIScript_1DA855 +AI_CBM_Confuse: @ 81DA60A + if_status2 TARGET, S_CONFUSED, Score_Down5 get_ability TARGET - if_equal ABILITY_OWN_TEMPO, BattleAIScript_1DA85B + if_equal ABILITY_OWN_TEMPO, Score_Down10 end -BattleAIScript_1DA61D: @ 81DA61D - if_status4 USER, S_REFLECT, BattleAIScript_1DA858 +AI_CBM_Reflect: @ 81DA61D + if_status4 USER, S_REFLECT, Score_Down8 end -BattleAIScript_1DA628: @ 81DA628 - if_damage_bonus 0, BattleAIScript_1DA85B +AI_CBM_Paralyze: @ 81DA628 + if_damage_bonus 0, Score_Down10 get_ability TARGET - if_equal ABILITY_LIMBER, BattleAIScript_1DA85B - if_status TARGET, SLP | PSN | BRN | FRZ | PAR | TOX, BattleAIScript_1DA85B + if_equal ABILITY_LIMBER, Score_Down10 + if_status TARGET, SLP | PSN | BRN | FRZ | PAR | TOX, Score_Down10 end -BattleAIScript_1DA641: @ 81DA641 - if_status2 USER, S_SUBSTITUTE, BattleAIScript_1DA858 - if_hp_less_than USER, 26, BattleAIScript_1DA85B +AI_CBM_Substitute: @ 81DA641 + if_status2 USER, S_SUBSTITUTE, Score_Down8 + if_hp_less_than USER, 26, Score_Down10 end -BattleAIScript_1DA653: @ 81DA653 - if_status3 TARGET, S_LEECH_SEED, BattleAIScript_1DA85B +AI_CBM_LeechSeed: @ 81DA653 + if_status3 TARGET, S_LEECH_SEED, Score_Down10 get_type 0 - if_equal TYPE_GRASS, BattleAIScript_1DA85B + if_equal TYPE_GRASS, Score_Down10 get_type 2 - if_equal TYPE_GRASS, BattleAIScript_1DA85B + if_equal TYPE_GRASS, Score_Down10 end -BattleAIScript_1DA66E: @ 81DA66E - if_last_move_did_damage TARGET, 0, BattleAIScript_1DA858 +AI_CBM_Disable: @ 81DA66E + if_last_move_did_damage TARGET, 0, Score_Down8 end -BattleAIScript_1DA676: @ 81DA676 - if_last_move_did_damage TARGET, 1, BattleAIScript_1DA858 +AI_CBM_Encore: @ 81DA676 + if_last_move_did_damage TARGET, 1, Score_Down8 end -BattleAIScript_1DA67E: @ 81DA67E - if_not_status USER, SLP, BattleAIScript_1DA858 +AI_CBM_DamageDuringSleep: @ 81DA67E + if_not_status USER, SLP, Score_Down8 end -BattleAIScript_1DA689: @ 81DA689 - if_status2 TARGET, S_MEAN_LOOK, BattleAIScript_1DA85B +AI_CBM_CantEscape: @ 81DA689 + if_status2 TARGET, S_MEAN_LOOK, Score_Down10 end -BattleAIScript_1DA694: @ 81DA694 - if_stat_level_equal USER, ATTACK, 12, BattleAIScript_1DA85B - if_stat_level_equal USER, DEFENSE, 12, BattleAIScript_1DA858 +AI_CBM_Curse: @ 81DA694 + if_stat_level_equal USER, ATTACK, 12, Score_Down10 + if_stat_level_equal USER, DEFENSE, 12, Score_Down8 end -BattleAIScript_1DA6A5: @ 81DA6A5 - if_status4 TARGET, S_SPIKES, BattleAIScript_1DA85B +AI_CBM_Spikes: @ 81DA6A5 + if_status4 TARGET, S_SPIKES, Score_Down10 end -BattleAIScript_1DA6B0: @ 81DA6B0 - if_status2 TARGET, S_FORESIGHT, BattleAIScript_1DA85B +AI_CBM_Foresight: @ 81DA6B0 + if_status2 TARGET, S_FORESIGHT, Score_Down10 end -BattleAIScript_1DA6BB: @ 81DA6BB - if_status3 TARGET, S_PERISH_SONG, BattleAIScript_1DA85B +AI_CBM_PerishSong: @ 81DA6BB + if_status3 TARGET, S_PERISH_SONG, Score_Down10 end -BattleAIScript_1DA6C6: @ 81DA6C6 +AI_CBM_Sandstorm: @ 81DA6C6 get_weather - if_equal WEATHER_SANDSTORM, BattleAIScript_1DA858 + if_equal WEATHER_SANDSTORM, Score_Down8 end -BattleAIScript_1DA6CE: @ 81DA6CE - if_status2 TARGET, S_INFATUATED, BattleAIScript_1DA85B +AI_CBM_Attract: @ 81DA6CE + if_status2 TARGET, S_INFATUATED, Score_Down10 get_ability TARGET - if_equal ABILITY_OBLIVIOUS, BattleAIScript_1DA85B + if_equal ABILITY_OBLIVIOUS, Score_Down10 get_gender USER - if_equal 0, BattleAIScript_1DA6F3 - if_equal 254, BattleAIScript_1DA700 - jump BattleAIScript_1DA85B + if_equal 0, AI_CBM_Attract_CheckIfTargetIsFemale + if_equal 254, AI_CBM_Attract_CheckIfTargetIsMale + jump Score_Down10 -BattleAIScript_1DA6F3: @ 81DA6F3 +AI_CBM_Attract_CheckIfTargetIsFemale: @ 81DA6F3 get_gender TARGET - if_equal 254, BattleAIScript_1DA70D - jump BattleAIScript_1DA85B + if_equal 254, AI_CBM_Attract_End + jump Score_Down10 -BattleAIScript_1DA700: @ 81DA700 +AI_CBM_Attract_CheckIfTargetIsMale: @ 81DA700 get_gender TARGET - if_equal 0, BattleAIScript_1DA70D - jump BattleAIScript_1DA85B + if_equal 0, AI_CBM_Attract_End + jump Score_Down10 -BattleAIScript_1DA70D: @ 81DA70D +AI_CBM_Attract_End: @ 81DA70D end -BattleAIScript_1DA70E: @ 81DA70E - if_status4 USER, S_SAFEGUARD, BattleAIScript_1DA858 +AI_CBM_Safeguard: @ 81DA70E + if_status4 USER, S_SAFEGUARD, Score_Down8 end -BattleAIScript_1DA719: @ 81DA719 - if_stat_level_equal TARGET, ATTACK, 0, BattleAIScript_1DA85B - if_stat_level_equal TARGET, SP_ATTACK, 0, BattleAIScript_1DA858 +AI_CBM_Memento: @ 81DA719 + if_stat_level_equal TARGET, ATTACK, 0, Score_Down10 + if_stat_level_equal TARGET, SP_ATTACK, 0, Score_Down8 -BattleAIScript_1DA729: @ 81DA729 +AI_CBM_BatonPass: @ 81DA729 count_alive_pokemon USER - if_equal 0, BattleAIScript_1DA85B + if_equal 0, Score_Down10 end -BattleAIScript_1DA732: @ 81DA732 +AI_CBM_RainDance: @ 81DA732 get_weather - if_equal WEATHER_RAIN, BattleAIScript_1DA858 + if_equal WEATHER_RAIN, Score_Down8 end -BattleAIScript_1DA73A: @ 81DA73A +AI_CBM_SunnyDay: @ 81DA73A get_weather - if_equal WEATHER_SUN, BattleAIScript_1DA858 + if_equal WEATHER_SUN, Score_Down8 end -BattleAIScript_1DA742: @ 81DA742 - if_status4 TARGET, S_FUTURE_SIGHT, BattleAIScript_1DA85B +AI_CBM_FutureSight: @ 81DA742 + if_status4 TARGET, S_FUTURE_SIGHT, Score_Down10 end -BattleAIScript_1DA74D: @ 81DA74D +AI_CBM_FakeOut: @ 81DA74D is_first_turn USER - if_equal 0, BattleAIScript_1DA85B + if_equal 0, Score_Down10 end -BattleAIScript_1DA756: @ 81DA756 +AI_CBM_Stockpile: @ 81DA756 get_stockpile_count USER - if_equal 3, BattleAIScript_1DA85B + if_equal 3, Score_Down10 end -BattleAIScript_1DA75F: @ 81DA75F - if_damage_bonus 0, BattleAIScript_1DA85B +AI_CBM_SpitUpAndSwallow: @ 81DA75F + if_damage_bonus 0, Score_Down10 get_stockpile_count USER - if_equal 0, BattleAIScript_1DA85B + if_equal 0, Score_Down10 end -BattleAIScript_1DA76E: @ 81DA76E +AI_CBM_Hail: @ 81DA76E get_weather - if_equal WEATHER_HAIL, BattleAIScript_1DA858 + if_equal WEATHER_HAIL, Score_Down8 end -BattleAIScript_1DA776: @ 81DA776 - if_status2 TARGET, S_TORMENT, BattleAIScript_1DA85B +AI_CBM_Torment: @ 81DA776 + if_status2 TARGET, S_TORMENT, Score_Down10 end -BattleAIScript_1DA781: @ 81DA781 +AI_CBM_WillOWisp: @ 81DA781 get_ability TARGET - if_equal ABILITY_WATER_VEIL, BattleAIScript_1DA85B - if_status TARGET, SLP | PSN | BRN | FRZ | PAR | TOX, BattleAIScript_1DA85B - if_damage_bonus 0, BattleAIScript_1DA85B - if_damage_bonus 20, BattleAIScript_1DA85B - if_damage_bonus 10, BattleAIScript_1DA85B + if_equal ABILITY_WATER_VEIL, Score_Down10 + if_status TARGET, SLP | PSN | BRN | FRZ | PAR | TOX, Score_Down10 + if_damage_bonus 0, Score_Down10 + if_damage_bonus 20, Score_Down10 + if_damage_bonus 10, Score_Down10 end -BattleAIScript_1DA7A6: @ 81DA7A6 +AI_CBM_HelpingHand: @ 81DA7A6 is_double_battle - if_equal 0, BattleAIScript_1DA85B + if_equal 0, Score_Down10 end -BattleAIScript_1DA7AE: @ 81DA7AE +AI_CBM_TrickAndKnockOff: @ 81DA7AE get_ability TARGET - if_equal ABILITY_STICKY_HOLD, BattleAIScript_1DA85B + if_equal ABILITY_STICKY_HOLD, Score_Down10 end -BattleAIScript_1DA7B7: @ 81DA7B7 - if_status3 USER, S_ROOTED, BattleAIScript_1DA85B +AI_CBM_Ingrain: @ 81DA7B7 + if_status3 USER, S_ROOTED, Score_Down10 end -BattleAIScript_1DA7C2: @ 81DA7C2 +AI_CBM_Recycle: @ 81DA7C2 get_item USER - if_equal ITEM_NONE, BattleAIScript_1DA85B + if_equal ITEM_NONE, Score_Down10 end -BattleAIScript_1DA7CB: @ 81DA7CB - if_status3 USER, S_IMPRISONED, BattleAIScript_1DA85B +AI_CBM_Imprison: @ 81DA7CB + if_status3 USER, S_IMPRISONED, Score_Down10 end -BattleAIScript_1DA7D6: @ 81DA7D6 - if_not_status USER, PSN | BRN | PAR | TOX, BattleAIScript_1DA85B +AI_CBM_Refresh: @ 81DA7D6 + if_not_status USER, PSN | BRN | PAR | TOX, Score_Down10 end -BattleAIScript_1DA7E1: @ 81DA7E1 - if_status3 USER, S_MUD_SPORT, BattleAIScript_1DA85B +AI_CBM_MudSport: @ 81DA7E1 + if_status3 USER, S_MUD_SPORT, Score_Down10 end -BattleAIScript_1DA7EC: @ 81DA7EC - if_stat_level_equal TARGET, ATTACK, 0, BattleAIScript_1DA85B - if_stat_level_equal TARGET, DEFENSE, 0, BattleAIScript_1DA858 +AI_CBM_Tickle: @ 81DA7EC + if_stat_level_equal TARGET, ATTACK, 0, Score_Down10 + if_stat_level_equal TARGET, DEFENSE, 0, Score_Down8 end -BattleAIScript_1DA7FD: @ 81DA7FD - if_stat_level_equal USER, DEFENSE, 12, BattleAIScript_1DA85B - if_stat_level_equal USER, SP_DEFENSE, 12, BattleAIScript_1DA858 +AI_CBM_CosmicPower: @ 81DA7FD + if_stat_level_equal USER, DEFENSE, 12, Score_Down10 + if_stat_level_equal USER, SP_DEFENSE, 12, Score_Down8 end -BattleAIScript_1DA80E: @ 81DA80E - if_stat_level_equal USER, ATTACK, 12, BattleAIScript_1DA85B - if_stat_level_equal USER, DEFENSE, 12, BattleAIScript_1DA858 +AI_CBM_BulkUp: @ 81DA80E + if_stat_level_equal USER, ATTACK, 12, Score_Down10 + if_stat_level_equal USER, DEFENSE, 12, Score_Down8 end -BattleAIScript_1DA81F: @ 81DA81F - if_status3 USER, S_WATER_SPORT, BattleAIScript_1DA85B +AI_CBM_WaterSport: @ 81DA81F + if_status3 USER, S_WATER_SPORT, Score_Down10 end -BattleAIScript_1DA82A: @ 81DA82A - if_stat_level_equal USER, SP_ATTACK, 12, BattleAIScript_1DA85B - if_stat_level_equal USER, SP_DEFENSE, 12, BattleAIScript_1DA858 +AI_CBM_CalmMind: @ 81DA82A + if_stat_level_equal USER, SP_ATTACK, 12, Score_Down10 + if_stat_level_equal USER, SP_DEFENSE, 12, Score_Down8 end -BattleAIScript_1DA83B: @ 81DA83B - if_stat_level_equal USER, ATTACK, 12, BattleAIScript_1DA85B - if_stat_level_equal USER, SPEED, 12, BattleAIScript_1DA858 +AI_CBM_DragonDance: @ 81DA83B + if_stat_level_equal USER, ATTACK, 12, Score_Down10 + if_stat_level_equal USER, SPEED, 12, Score_Down8 end -BattleAIScript_1DA84C: @ 81DA84C +Score_Down1: @ 81DA84C score -1 end -BattleAIScript_1DA84F: @ 81DA84F +Score_Down2: @ 81DA84F score -2 end -BattleAIScript_1DA852: @ 81DA852 +Score_Down3: @ 81DA852 score -3 end -BattleAIScript_1DA855: @ 81DA855 +Score_Down5: @ 81DA855 score -5 end -BattleAIScript_1DA858: @ 81DA858 +Score_Down8: @ 81DA858 score -8 end -BattleAIScript_1DA85B: @ 81DA85B +Score_Down10: @ 81DA85B score -10 end -BattleAIScript_1DA85E: @ 81DA85E +Score_Down12: @ 81DA85E score -12 end @@ -625,214 +625,214 @@ BattleAIScript_1DA85E: @ 81DA85E end AI_CheckViability: @ 81DA86D - if_effect EFFECT_SLEEP, BattleAIScript_1DAB44 - if_effect EFFECT_ABSORB, BattleAIScript_1DAB60 - if_effect EFFECT_EXPLOSION, BattleAIScript_1DAB7A - if_effect EFFECT_DREAM_EATER, BattleAIScript_1DABD8 - if_effect EFFECT_MIRROR_MOVE, BattleAIScript_1DABEC - if_effect EFFECT_ATTACK_UP, BattleAIScript_1DAC70 - if_effect EFFECT_DEFENSE_UP, BattleAIScript_1DACAB - if_effect EFFECT_SPEED_UP, BattleAIScript_1DAD11 - if_effect EFFECT_SPECIAL_ATTACK_UP, BattleAIScript_1DAD27 - if_effect EFFECT_SPECIAL_DEFENSE_UP, BattleAIScript_1DAD62 - if_effect EFFECT_ACCURACY_UP, BattleAIScript_1DADC8 - if_effect EFFECT_EVASION_UP, BattleAIScript_1DADE2 - if_effect EFFECT_ALWAYS_HIT, BattleAIScript_1DAE7C - if_effect EFFECT_ATTACK_DOWN, BattleAIScript_1DAEAC - if_effect EFFECT_DEFENSE_DOWN, BattleAIScript_1DAEFE - if_effect EFFECT_SPEED_DOWN, BattleAIScript_1DAF35 - if_effect EFFECT_SPECIAL_ATTACK_DOWN, BattleAIScript_1DAF4B - if_effect EFFECT_SPECIAL_DEFENSE_DOWN, BattleAIScript_1DAF9F - if_effect EFFECT_ACCURACY_DOWN, BattleAIScript_1DAFC0 - if_effect EFFECT_EVASION_DOWN, BattleAIScript_1DB054 - if_effect EFFECT_HAZE, BattleAIScript_1DB075 - if_effect EFFECT_BIDE, BattleAIScript_1DB138 - if_effect EFFECT_ROAR, BattleAIScript_1DB142 - if_effect EFFECT_CONVERSION, BattleAIScript_1DB17A - if_effect EFFECT_RESTORE_HP, BattleAIScript_1DB1AB - if_effect EFFECT_TOXIC, BattleAIScript_1DB204 - if_effect EFFECT_LIGHT_SCREEN, BattleAIScript_1DB243 - if_effect EFFECT_REST, BattleAIScript_1DB272 - if_effect EFFECT_OHKO, BattleAIScript_1DB2D2 - if_effect EFFECT_RAZOR_WIND, BattleAIScript_1DBA6D - if_effect EFFECT_SUPER_FANG, BattleAIScript_1DB2D3 - if_effect EFFECT_TRAP, BattleAIScript_1DB2DD - if_effect EFFECT_HIGH_CRITICAL, BattleAIScript_1DB313 - if_effect EFFECT_CONFUSE, BattleAIScript_1DB342 - if_effect EFFECT_ATTACK_UP_2, BattleAIScript_1DAC70 - if_effect EFFECT_DEFENSE_UP_2, BattleAIScript_1DACAB - if_effect EFFECT_SPEED_UP_2, BattleAIScript_1DAD11 - if_effect EFFECT_SPECIAL_ATTACK_UP_2, BattleAIScript_1DAD27 - if_effect EFFECT_SPECIAL_DEFENSE_UP_2, BattleAIScript_1DAD62 - if_effect EFFECT_ACCURACY_UP_2, BattleAIScript_1DADC8 - if_effect EFFECT_EVASION_UP_2, BattleAIScript_1DADE2 - if_effect EFFECT_ATTACK_DOWN_2, BattleAIScript_1DAEAC - if_effect EFFECT_DEFENSE_DOWN_2, BattleAIScript_1DAEFE - if_effect EFFECT_SPEED_DOWN_2, BattleAIScript_1DAF35 - if_effect EFFECT_SPECIAL_ATTACK_DOWN_2, BattleAIScript_1DAF4B - if_effect EFFECT_SPECIAL_DEFENSE_DOWN_2, BattleAIScript_1DAF9F - if_effect EFFECT_ACCURACY_DOWN_2, BattleAIScript_1DAFC0 - if_effect EFFECT_EVASION_DOWN_2, BattleAIScript_1DB054 - if_effect EFFECT_REFLECT, BattleAIScript_1DB364 - if_effect EFFECT_POISON, BattleAIScript_1DB394 - if_effect EFFECT_PARALYZE, BattleAIScript_1DB3A5 - if_effect EFFECT_SPEED_DOWN_HIT, BattleAIScript_1DAF1F - if_effect EFFECT_SKY_ATTACK, BattleAIScript_1DBA6D - if_effect EFFECT_VITAL_THROW, BattleAIScript_1DB3C2 - if_effect EFFECT_SUBSTITUTE, BattleAIScript_1DB3E5 - if_effect EFFECT_RECHARGE, BattleAIScript_1DB47B - if_effect EFFECT_LEECH_SEED, BattleAIScript_1DB204 - if_effect EFFECT_DISABLE, BattleAIScript_1DB4A3 - if_effect EFFECT_COUNTER, BattleAIScript_1DB4C2 - if_effect EFFECT_ENCORE, BattleAIScript_1DB563 - if_effect EFFECT_PAIN_SPLIT, BattleAIScript_1DB5CB - if_effect EFFECT_SNORE, BattleAIScript_1DB5F7 - if_effect EFFECT_LOCK_ON, BattleAIScript_1DB5FA - if_effect EFFECT_SLEEP_TALK, BattleAIScript_1DB603 - if_effect EFFECT_DESTINY_BOND, BattleAIScript_1DB606 - if_effect EFFECT_FLAIL, BattleAIScript_1DB63C - if_effect EFFECT_HEAL_BELL, BattleAIScript_1DB681 - if_effect EFFECT_THIEF, BattleAIScript_1DB698 - if_effect EFFECT_MEAN_LOOK, BattleAIScript_1DB2DD - if_effect EFFECT_MINIMIZE, BattleAIScript_1DADE2 - if_effect EFFECT_CURSE, BattleAIScript_1DB6BB - if_effect EFFECT_PROTECT, BattleAIScript_1DB70A - if_effect EFFECT_FORESIGHT, BattleAIScript_1DB7CB - if_effect EFFECT_ENDURE, BattleAIScript_1DB7F9 - if_effect EFFECT_BATON_PASS, BattleAIScript_1DB817 - if_effect EFFECT_PURSUIT, BattleAIScript_1DB8B3 - if_effect EFFECT_MORNING_SUN, BattleAIScript_1DB191 - if_effect EFFECT_SYNTHESIS, BattleAIScript_1DB191 - if_effect EFFECT_MOONLIGHT, BattleAIScript_1DB191 - if_effect EFFECT_RAIN_DANCE, BattleAIScript_1DB8E9 - if_effect EFFECT_SUNNY_DAY, BattleAIScript_1DB928 - if_effect EFFECT_BELLY_DRUM, BattleAIScript_1DB951 - if_effect EFFECT_PSYCH_UP, BattleAIScript_1DB960 - if_effect EFFECT_MIRROR_COAT, BattleAIScript_1DB9CD - if_effect EFFECT_SKULL_BASH, BattleAIScript_1DBA6D - if_effect EFFECT_SOLARBEAM, BattleAIScript_1DBA6D - if_effect EFFECT_FLY, BattleAIScript_1DBA91 - if_effect EFFECT_SOFTBOILED, BattleAIScript_1DB1AB - if_effect EFFECT_FAKE_OUT, BattleAIScript_1DBB1B - if_effect EFFECT_SPIT_UP, BattleAIScript_1DBB1E - if_effect EFFECT_SWALLOW, BattleAIScript_1DB1AB - if_effect EFFECT_HAIL, BattleAIScript_1DBB2F - if_effect EFFECT_FLATTER, BattleAIScript_1DB33A - if_effect EFFECT_MEMENTO, BattleAIScript_1DAB7A - if_effect EFFECT_FACADE, BattleAIScript_1DBB58 - if_effect EFFECT_FOCUS_PUNCH, BattleAIScript_1DBB65 - if_effect EFFECT_SMELLINGSALT, BattleAIScript_1DBBB4 - if_effect EFFECT_TRICK, BattleAIScript_1DBBC6 - if_effect EFFECT_ROLE_PLAY, BattleAIScript_1DBC11 - if_effect EFFECT_SUPERPOWER, BattleAIScript_1DBC48 - if_effect EFFECT_MAGIC_COAT, BattleAIScript_1DBC78 - if_effect EFFECT_RECYCLE, BattleAIScript_1DBCAB - if_effect EFFECT_REVENGE, BattleAIScript_1DBCCA - if_effect EFFECT_BRICK_BREAK, BattleAIScript_1DBCF8 - if_effect EFFECT_KNOCK_OFF, BattleAIScript_1DBD0A - if_effect EFFECT_ENDEAVOR, BattleAIScript_1DBD22 - if_effect EFFECT_ERUPTION, BattleAIScript_1DBD4E - if_effect EFFECT_SKILL_SWAP, BattleAIScript_1DBC11 - if_effect EFFECT_IMPRISON, BattleAIScript_1DBD76 - if_effect EFFECT_REFRESH, BattleAIScript_1DBD87 - if_effect EFFECT_SNATCH, BattleAIScript_1DBD96 - if_effect EFFECT_BLAZE_KICK, BattleAIScript_1DB313 - if_effect EFFECT_MUD_SPORT, BattleAIScript_1DBE00 - if_effect EFFECT_OVERHEAT, BattleAIScript_1DBE26 - if_effect EFFECT_TICKLE, BattleAIScript_1DAEFE - if_effect EFFECT_COSMIC_POWER, BattleAIScript_1DAD62 - if_effect EFFECT_BULK_UP, BattleAIScript_1DACAB - if_effect EFFECT_POISON_TAIL, BattleAIScript_1DB313 - if_effect EFFECT_WATER_SPORT, BattleAIScript_1DBE4E - if_effect EFFECT_CALM_MIND, BattleAIScript_1DAD62 - if_effect EFFECT_DRAGON_DANCE, BattleAIScript_1DBE74 - end - -BattleAIScript_1DAB44: @ 81DAB44 - if_move_effect TARGET, EFFECT_DREAM_EATER, BattleAIScript_1DAB57 - if_move_effect TARGET, EFFECT_NIGHTMARE, BattleAIScript_1DAB57 - jump BattleAIScript_1DAB5F - -BattleAIScript_1DAB57: @ 81DAB57 - if_random 128, BattleAIScript_1DAB5F + if_effect EFFECT_SLEEP, AI_CV_Sleep + if_effect EFFECT_ABSORB, AI_CV_Absorb + if_effect EFFECT_EXPLOSION, AI_CV_SelfKO + if_effect EFFECT_DREAM_EATER, AI_CV_DreamEater + if_effect EFFECT_MIRROR_MOVE, AI_CV_MirrorMove + if_effect EFFECT_ATTACK_UP, AI_CV_AttackUp + if_effect EFFECT_DEFENSE_UP, AI_CV_DefenseUp + if_effect EFFECT_SPEED_UP, AI_CV_SpeedUp + if_effect EFFECT_SPECIAL_ATTACK_UP, AI_CV_SpAtkUp + if_effect EFFECT_SPECIAL_DEFENSE_UP, AI_CV_SpDefUp + if_effect EFFECT_ACCURACY_UP, AI_CV_AccuracyUp + if_effect EFFECT_EVASION_UP, AI_CV_EvasionUp + if_effect EFFECT_ALWAYS_HIT, AI_CV_AlwaysHit + if_effect EFFECT_ATTACK_DOWN, AI_CV_AttackDown + if_effect EFFECT_DEFENSE_DOWN, AI_CV_DefenseDown + if_effect EFFECT_SPEED_DOWN, AI_CV_SpeedDown + if_effect EFFECT_SPECIAL_ATTACK_DOWN, AI_CV_SpAtkDown + if_effect EFFECT_SPECIAL_DEFENSE_DOWN, AI_CV_SpDefDown + if_effect EFFECT_ACCURACY_DOWN, AI_CV_AccuracyDown + if_effect EFFECT_EVASION_DOWN, AI_CV_EvasionDown + if_effect EFFECT_HAZE, AI_CV_Haze + if_effect EFFECT_BIDE, AI_CV_Bide + if_effect EFFECT_ROAR, AI_CV_Roar + if_effect EFFECT_CONVERSION, AI_CV_Conversion + if_effect EFFECT_RESTORE_HP, AI_CV_Heal + if_effect EFFECT_TOXIC, AI_CV_Toxic + if_effect EFFECT_LIGHT_SCREEN, AI_CV_LightScreen + if_effect EFFECT_REST, AI_CV_Rest + if_effect EFFECT_OHKO, AI_CV_OneHitKO + if_effect EFFECT_RAZOR_WIND, AI_CV_ChargeUpMove + if_effect EFFECT_SUPER_FANG, AI_CV_SuperFang + if_effect EFFECT_TRAP, AI_CV_Trap + if_effect EFFECT_HIGH_CRITICAL, AI_CV_HighCrit + if_effect EFFECT_CONFUSE, AI_CV_Confuse + if_effect EFFECT_ATTACK_UP_2, AI_CV_AttackUp + if_effect EFFECT_DEFENSE_UP_2, AI_CV_DefenseUp + if_effect EFFECT_SPEED_UP_2, AI_CV_SpeedUp + if_effect EFFECT_SPECIAL_ATTACK_UP_2, AI_CV_SpAtkUp + if_effect EFFECT_SPECIAL_DEFENSE_UP_2, AI_CV_SpDefUp + if_effect EFFECT_ACCURACY_UP_2, AI_CV_AccuracyUp + if_effect EFFECT_EVASION_UP_2, AI_CV_EvasionUp + if_effect EFFECT_ATTACK_DOWN_2, AI_CV_AttackDown + if_effect EFFECT_DEFENSE_DOWN_2, AI_CV_DefenseDown + if_effect EFFECT_SPEED_DOWN_2, AI_CV_SpeedDown + if_effect EFFECT_SPECIAL_ATTACK_DOWN_2, AI_CV_SpAtkDown + if_effect EFFECT_SPECIAL_DEFENSE_DOWN_2, AI_CV_SpDefDown + if_effect EFFECT_ACCURACY_DOWN_2, AI_CV_AccuracyDown + if_effect EFFECT_EVASION_DOWN_2, AI_CV_EvasionDown + if_effect EFFECT_REFLECT, AI_CV_Reflect + if_effect EFFECT_POISON, AI_CV_Poison + if_effect EFFECT_PARALYZE, AI_CV_Paralyze + if_effect EFFECT_SPEED_DOWN_HIT, AI_CV_SpeedDownFromChance + if_effect EFFECT_SKY_ATTACK, AI_CV_ChargeUpMove + if_effect EFFECT_VITAL_THROW, AI_CV_VitalThrow + if_effect EFFECT_SUBSTITUTE, AI_CV_Substitute + if_effect EFFECT_RECHARGE, AI_CV_Recharge + if_effect EFFECT_LEECH_SEED, AI_CV_Toxic + if_effect EFFECT_DISABLE, AI_CV_Disable + if_effect EFFECT_COUNTER, AI_CV_Counter + if_effect EFFECT_ENCORE, AI_CV_Encore + if_effect EFFECT_PAIN_SPLIT, AI_CV_PainSplit + if_effect EFFECT_SNORE, AI_CV_Snore + if_effect EFFECT_LOCK_ON, AI_CV_LockOn + if_effect EFFECT_SLEEP_TALK, AI_CV_SleepTalk + if_effect EFFECT_DESTINY_BOND, AI_CV_DestinyBond + if_effect EFFECT_FLAIL, AI_CV_Flail + if_effect EFFECT_HEAL_BELL, AI_CV_HealBell + if_effect EFFECT_THIEF, AI_CV_Thief + if_effect EFFECT_MEAN_LOOK, AI_CV_Trap + if_effect EFFECT_MINIMIZE, AI_CV_EvasionUp + if_effect EFFECT_CURSE, AI_CV_Curse + if_effect EFFECT_PROTECT, AI_CV_Protect + if_effect EFFECT_FORESIGHT, AI_CV_Foresight + if_effect EFFECT_ENDURE, AI_CV_Endure + if_effect EFFECT_BATON_PASS, AI_CV_BatonPass + if_effect EFFECT_PURSUIT, AI_CV_Pursuit + if_effect EFFECT_MORNING_SUN, AI_CV_HealWeather + if_effect EFFECT_SYNTHESIS, AI_CV_HealWeather + if_effect EFFECT_MOONLIGHT, AI_CV_HealWeather + if_effect EFFECT_RAIN_DANCE, AI_CV_RainDance + if_effect EFFECT_SUNNY_DAY, AI_CV_SunnyDay + if_effect EFFECT_BELLY_DRUM, AI_CV_BellyDrum + if_effect EFFECT_PSYCH_UP, AI_CV_PsychUp + if_effect EFFECT_MIRROR_COAT, AI_CV_MirrorCoat + if_effect EFFECT_SKULL_BASH, AI_CV_ChargeUpMove + if_effect EFFECT_SOLARBEAM, AI_CV_ChargeUpMove + if_effect EFFECT_FLY, AI_CV_Fly + if_effect EFFECT_SOFTBOILED, AI_CV_Heal + if_effect EFFECT_FAKE_OUT, AI_CV_FakeOut + if_effect EFFECT_SPIT_UP, AI_CV_SpitUp + if_effect EFFECT_SWALLOW, AI_CV_Heal + if_effect EFFECT_HAIL, AI_CV_Hail + if_effect EFFECT_FLATTER, AI_CV_Flatter + if_effect EFFECT_MEMENTO, AI_CV_SelfKO + if_effect EFFECT_FACADE, AI_CV_Facade + if_effect EFFECT_FOCUS_PUNCH, AI_CV_FocusPunch + if_effect EFFECT_SMELLINGSALT, AI_CV_SmellingSalt + if_effect EFFECT_TRICK, AI_CV_Trick + if_effect EFFECT_ROLE_PLAY, AI_CV_ChangeSelfAbility + if_effect EFFECT_SUPERPOWER, AI_CV_Superpower + if_effect EFFECT_MAGIC_COAT, AI_CV_MagicCoat + if_effect EFFECT_RECYCLE, AI_CV_Recycle + if_effect EFFECT_REVENGE, AI_CV_Revenge + if_effect EFFECT_BRICK_BREAK, AI_CV_BrickBreak + if_effect EFFECT_KNOCK_OFF, AI_CV_KnockOff + if_effect EFFECT_ENDEAVOR, AI_CV_Endeavor + if_effect EFFECT_ERUPTION, AI_CV_Eruption + if_effect EFFECT_SKILL_SWAP, AI_CV_ChangeSelfAbility + if_effect EFFECT_IMPRISON, AI_CV_Imprison + if_effect EFFECT_REFRESH, AI_CV_Refresh + if_effect EFFECT_SNATCH, AI_CV_Snatch + if_effect EFFECT_BLAZE_KICK, AI_CV_HighCrit + if_effect EFFECT_MUD_SPORT, AI_CV_MudSport + if_effect EFFECT_OVERHEAT, AI_CV_Overheat + if_effect EFFECT_TICKLE, AI_CV_DefenseDown + if_effect EFFECT_COSMIC_POWER, AI_CV_SpDefUp + if_effect EFFECT_BULK_UP, AI_CV_DefenseUp + if_effect EFFECT_POISON_TAIL, AI_CV_HighCrit + if_effect EFFECT_WATER_SPORT, AI_CV_WaterSport + if_effect EFFECT_CALM_MIND, AI_CV_SpDefUp + if_effect EFFECT_DRAGON_DANCE, AI_CV_DragonDance + end + +AI_CV_Sleep: @ 81DAB44 + if_move_effect TARGET, EFFECT_DREAM_EATER, AI_CV_SleepEncourageSlpDamage + if_move_effect TARGET, EFFECT_NIGHTMARE, AI_CV_SleepEncourageSlpDamage + jump AI_CV_Sleep_End + +AI_CV_SleepEncourageSlpDamage: @ 81DAB57 + if_random 128, AI_CV_Sleep_End score +1 -BattleAIScript_1DAB5F: @ 81DAB5F +AI_CV_Sleep_End: @ 81DAB5F end -BattleAIScript_1DAB60: @ 81DAB60 - if_damage_bonus 20, BattleAIScript_1DAB71 - if_damage_bonus 10, BattleAIScript_1DAB71 - jump BattleAIScript_1DAB79 +AI_CV_Absorb: @ 81DAB60 + if_damage_bonus 20, AI_CV_AbsorbEncourageMaybe + if_damage_bonus 10, AI_CV_AbsorbEncourageMaybe + jump AI_CV_Absorb_End -BattleAIScript_1DAB71: @ 81DAB71 - if_random 50, BattleAIScript_1DAB79 +AI_CV_AbsorbEncourageMaybe: @ 81DAB71 + if_random 50, AI_CV_Absorb_End score -3 -BattleAIScript_1DAB79: @ 81DAB79 +AI_CV_Absorb_End: @ 81DAB79 end -BattleAIScript_1DAB7A: @ 81DAB7A - if_stat_level_less_than TARGET, EVASION, 7, BattleAIScript_1DAB94 +AI_CV_SelfKO: @ 81DAB7A + if_stat_level_less_than TARGET, EVASION, 7, AI_CV_SelfKO_Encourage1 score -1 - if_stat_level_less_than TARGET, EVASION, 10, BattleAIScript_1DAB94 - if_random 128, BattleAIScript_1DAB94 + if_stat_level_less_than TARGET, EVASION, 10, AI_CV_SelfKO_Encourage1 + if_random 128, AI_CV_SelfKO_Encourage1 score -1 -BattleAIScript_1DAB94: @ 81DAB94 - if_hp_less_than USER, 80, BattleAIScript_1DABAC - if_would_go_first USER, BattleAIScript_1DABAC - if_random 50, BattleAIScript_1DABD7 - jump BattleAIScript_1DA852 +AI_CV_SelfKO_Encourage1: @ 81DAB94 + if_hp_less_than USER, 80, AI_CV_SelfKO_Encourage2 + if_would_go_first USER, AI_CV_SelfKO_Encourage2 + if_random 50, AI_CV_SelfKO_End + jump Score_Down3 -BattleAIScript_1DABAC: @ 81DABAC - if_hp_more_than USER, 50, BattleAIScript_1DABCF - if_random 128, BattleAIScript_1DABBB +AI_CV_SelfKO_Encourage2: @ 81DABAC + if_hp_more_than USER, 50, AI_CV_SelfKO_Encourage4 + if_random 128, AI_CV_SelfKO_Encourage3 score +1 -BattleAIScript_1DABBB: @ 81DABBB - if_hp_more_than USER, 30, BattleAIScript_1DABD7 - if_random 50, BattleAIScript_1DABD7 +AI_CV_SelfKO_Encourage3: @ 81DABBB + if_hp_more_than USER, 30, AI_CV_SelfKO_End + if_random 50, AI_CV_SelfKO_End score +1 - jump BattleAIScript_1DABD7 + jump AI_CV_SelfKO_End -BattleAIScript_1DABCF: @ 81DABCF - if_random 50, BattleAIScript_1DABD7 +AI_CV_SelfKO_Encourage4: @ 81DABCF + if_random 50, AI_CV_SelfKO_End score -1 -BattleAIScript_1DABD7: @ 81DABD7 +AI_CV_SelfKO_End: @ 81DABD7 end -BattleAIScript_1DABD8: @ 81DABD8 - if_damage_bonus 10, BattleAIScript_1DABE9 - if_damage_bonus 20, BattleAIScript_1DABE9 - jump BattleAIScript_1DABEB +AI_CV_DreamEater: @ 81DABD8 + if_damage_bonus 10, AI_CV_DreamEater_ScoreDown1 + if_damage_bonus 20, AI_CV_DreamEater_ScoreDown1 + jump AI_CV_DreamEater_End -BattleAIScript_1DABE9: @ 81DABE9 +AI_CV_DreamEater_ScoreDown1: @ 81DABE9 score -1 -BattleAIScript_1DABEB: @ 81DABEB +AI_CV_DreamEater_End: @ 81DABEB end -BattleAIScript_1DABEC: @ 81DABEC - if_would_go_first USER, BattleAIScript_1DAC0A +AI_CV_MirrorMove: @ 81DABEC + if_would_go_first USER, AI_CV_MirrorMove2 get_move TARGET - if_not_in_words MoveList_1DAC20, BattleAIScript_1DAC0A - if_random 128, BattleAIScript_1DAC1D + if_not_in_words AI_CV_MirrorMove_EncouragedMovesToMirror, AI_CV_MirrorMove2 + if_random 128, AI_CV_MirrorMove_End score +2 - jump BattleAIScript_1DAC1D + jump AI_CV_MirrorMove_End -BattleAIScript_1DAC0A: @ 81DAC0A +AI_CV_MirrorMove2: @ 81DAC0A get_move TARGET - if_in_words MoveList_1DAC20, BattleAIScript_1DAC1D - if_random 80, BattleAIScript_1DAC1D + if_in_words AI_CV_MirrorMove_EncouragedMovesToMirror, AI_CV_MirrorMove_End + if_random 80, AI_CV_MirrorMove_End score -1 -BattleAIScript_1DAC1D: @ 81DAC1D +AI_CV_MirrorMove_End: @ 81DAC1D end .align 2 -MoveList_1DAC20: @ 81DAC20 +AI_CV_MirrorMove_EncouragedMovesToMirror: @ 81DAC20 .2byte MOVE_SLEEP_POWDER .2byte MOVE_LOVELY_KISS .2byte MOVE_SPORE @@ -874,63 +874,63 @@ MoveList_1DAC20: @ 81DAC20 .2byte MOVE_SKILL_SWAP .2byte -1 -BattleAIScript_1DAC70: @ 81DAC70 - if_stat_level_less_than USER, ATTACK, 9, BattleAIScript_1DAC85 - if_random 100, BattleAIScript_1DAC94 +AI_CV_AttackUp: @ 81DAC70 + if_stat_level_less_than USER, ATTACK, 9, AI_CV_AttackUp2 + if_random 100, AI_CV_AttackUp3 score -1 - jump BattleAIScript_1DAC94 + jump AI_CV_AttackUp3 -BattleAIScript_1DAC85: @ 81DAC85 - if_hp_not_equal USER, 100, BattleAIScript_1DAC94 - if_random 128, BattleAIScript_1DAC94 +AI_CV_AttackUp2: @ 81DAC85 + if_hp_not_equal USER, 100, AI_CV_AttackUp3 + if_random 128, AI_CV_AttackUp3 score +2 -BattleAIScript_1DAC94: @ 81DAC94 - if_hp_more_than USER, 70, BattleAIScript_1DACAA - if_hp_less_than USER, 40, BattleAIScript_1DACA8 - if_random 40, BattleAIScript_1DACAA +AI_CV_AttackUp3: @ 81DAC94 + if_hp_more_than USER, 70, AI_CV_AttackUp_End + if_hp_less_than USER, 40, AI_CV_AttackUp_ScoreDown2 + if_random 40, AI_CV_AttackUp_End -BattleAIScript_1DACA8: @ 81DACA8 +AI_CV_AttackUp_ScoreDown2: @ 81DACA8 score -2 -BattleAIScript_1DACAA: @ 81DACAA +AI_CV_AttackUp_End: @ 81DACAA end -BattleAIScript_1DACAB: @ 81DACAB - if_stat_level_less_than USER, DEFENSE, 9, BattleAIScript_1DACC0 - if_random 100, BattleAIScript_1DACCF +AI_CV_DefenseUp: @ 81DACAB + if_stat_level_less_than USER, DEFENSE, 9, AI_CV_DefenseUp2 + if_random 100, AI_CV_DefenseUp3 score -1 - jump BattleAIScript_1DACCF + jump AI_CV_DefenseUp3 -BattleAIScript_1DACC0: @ 81DACC0 - if_hp_not_equal USER, 100, BattleAIScript_1DACCF - if_random 128, BattleAIScript_1DACCF +AI_CV_DefenseUp2: @ 81DACC0 + if_hp_not_equal USER, 100, AI_CV_DefenseUp3 + if_random 128, AI_CV_DefenseUp3 score +2 -BattleAIScript_1DACCF: @ 81DACCF - if_hp_less_than USER, 70, BattleAIScript_1DACDC - if_random 200, BattleAIScript_1DAD06 +AI_CV_DefenseUp3: @ 81DACCF + if_hp_less_than USER, 70, AI_CV_DefenseUp4 + if_random 200, AI_CV_DefenseUp_End -BattleAIScript_1DACDC: @ 81DACDC - if_hp_less_than USER, 40, BattleAIScript_1DAD04 +AI_CV_DefenseUp4: @ 81DACDC + if_hp_less_than USER, 40, AI_CV_DefenseUp_ScoreDown2 get_move TARGET get_move_power - if_equal 0, BattleAIScript_1DACFE + if_equal 0, AI_CV_DefenseUp5 get_move TARGET get_move_type - if_not_in_bytes TypeList_1DAD07, BattleAIScript_1DAD04 - if_random 60, BattleAIScript_1DAD06 + if_not_in_bytes AI_CV_DefenseUp_PhysicalTypes, AI_CV_DefenseUp_ScoreDown2 + if_random 60, AI_CV_DefenseUp_End -BattleAIScript_1DACFE: @ 81DACFE - if_random 60, BattleAIScript_1DAD06 +AI_CV_DefenseUp5: @ 81DACFE + if_random 60, AI_CV_DefenseUp_End -BattleAIScript_1DAD04: @ 81DAD04 +AI_CV_DefenseUp_ScoreDown2: @ 81DAD04 score -2 -BattleAIScript_1DAD06: @ 81DAD06 +AI_CV_DefenseUp_End: @ 81DAD06 end -TypeList_1DAD07: @ 81DAD07 +AI_CV_DefenseUp_PhysicalTypes: @ 81DAD07 .byte TYPE_NORMAL .byte TYPE_FIGHTING .byte TYPE_POISON @@ -942,75 +942,75 @@ TypeList_1DAD07: @ 81DAD07 .byte TYPE_STEEL .byte -1 -BattleAIScript_1DAD11: @ 81DAD11 - if_would_go_first USER, BattleAIScript_1DAD1E +AI_CV_SpeedUp: @ 81DAD11 + if_would_go_first USER, AI_CV_SpeedUp2 score -3 - jump BattleAIScript_1DAD26 + jump AI_CV_SpeedUp_End -BattleAIScript_1DAD1E: @ 81DAD1E - if_random 70, BattleAIScript_1DAD26 +AI_CV_SpeedUp2: @ 81DAD1E + if_random 70, AI_CV_SpeedUp_End score +3 -BattleAIScript_1DAD26: @ 81DAD26 +AI_CV_SpeedUp_End: @ 81DAD26 end -BattleAIScript_1DAD27: @ 81DAD27 - if_stat_level_less_than USER, SP_ATTACK, 9, BattleAIScript_1DAD3C - if_random 100, BattleAIScript_1DAD4B +AI_CV_SpAtkUp: @ 81DAD27 + if_stat_level_less_than USER, SP_ATTACK, 9, AI_CV_SpAtkUp2 + if_random 100, AI_CV_SpAtkUp3 score -1 - jump BattleAIScript_1DAD4B + jump AI_CV_SpAtkUp3 -BattleAIScript_1DAD3C: @ 81DAD3C - if_hp_not_equal USER, 100, BattleAIScript_1DAD4B - if_random 128, BattleAIScript_1DAD4B +AI_CV_SpAtkUp2: @ 81DAD3C + if_hp_not_equal USER, 100, AI_CV_SpAtkUp3 + if_random 128, AI_CV_SpAtkUp3 score +2 -BattleAIScript_1DAD4B: @ 81DAD4B - if_hp_more_than USER, 70, BattleAIScript_1DAD61 - if_hp_less_than USER, 40, BattleAIScript_1DAD5F - if_random 70, BattleAIScript_1DAD61 +AI_CV_SpAtkUp3: @ 81DAD4B + if_hp_more_than USER, 70, AI_CV_SpAtkUp_End + if_hp_less_than USER, 40, AI_CV_SpAtkUp_ScoreDown2 + if_random 70, AI_CV_SpAtkUp_End -BattleAIScript_1DAD5F: @ 81DAD5F +AI_CV_SpAtkUp_ScoreDown2: @ 81DAD5F score -2 -BattleAIScript_1DAD61: @ 81DAD61 +AI_CV_SpAtkUp_End: @ 81DAD61 end -BattleAIScript_1DAD62: @ 81DAD62 - if_stat_level_less_than USER, SP_DEFENSE, 9, BattleAIScript_1DAD77 - if_random 100, BattleAIScript_1DAD86 +AI_CV_SpDefUp: @ 81DAD62 + if_stat_level_less_than USER, SP_DEFENSE, 9, AI_CV_SpDefUp2 + if_random 100, AI_CV_SpDefUp3 score -1 - jump BattleAIScript_1DAD86 + jump AI_CV_SpDefUp3 -BattleAIScript_1DAD77: @ 81DAD77 - if_hp_not_equal USER, 100, BattleAIScript_1DAD86 - if_random 128, BattleAIScript_1DAD86 +AI_CV_SpDefUp2: @ 81DAD77 + if_hp_not_equal USER, 100, AI_CV_SpDefUp3 + if_random 128, AI_CV_SpDefUp3 score +2 -BattleAIScript_1DAD86: @ 81DAD86 - if_hp_less_than USER, 70, BattleAIScript_1DAD93 - if_random 200, BattleAIScript_1DADBD +AI_CV_SpDefUp3: @ 81DAD86 + if_hp_less_than USER, 70, AI_CV_SpDefUp4 + if_random 200, AI_CV_SpDefUp_End -BattleAIScript_1DAD93: @ 81DAD93 - if_hp_less_than USER, 40, BattleAIScript_1DADBB +AI_CV_SpDefUp4: @ 81DAD93 + if_hp_less_than USER, 40, AI_CV_SpDefUp_ScoreDown2 get_move TARGET get_move_power - if_equal 0, BattleAIScript_1DADB5 + if_equal 0, AI_CV_SpDefUp5 get_move TARGET get_move_type - if_in_bytes TypeList_1DADBE, BattleAIScript_1DADBB - if_random 60, BattleAIScript_1DADBD + if_in_bytes AI_CV_SpDefUp_PhysicalTypes, AI_CV_SpDefUp_ScoreDown2 + if_random 60, AI_CV_SpDefUp_End -BattleAIScript_1DADB5: @ 81DADB5 - if_random 60, BattleAIScript_1DADBD +AI_CV_SpDefUp5: @ 81DADB5 + if_random 60, AI_CV_SpDefUp_End -BattleAIScript_1DADBB: @ 81DADBB +AI_CV_SpDefUp_ScoreDown2: @ 81DADBB score -2 -BattleAIScript_1DADBD: @ 81DADBD +AI_CV_SpDefUp_End: @ 81DADBD end -TypeList_1DADBE: @ 81DADBE +AI_CV_SpDefUp_PhysicalTypes: @ 81DADBE .byte TYPE_NORMAL .byte TYPE_FIGHTING .byte TYPE_POISON @@ -1022,109 +1022,110 @@ TypeList_1DADBE: @ 81DADBE .byte TYPE_STEEL .byte -1 -BattleAIScript_1DADC8: @ 81DADC8 - if_stat_level_less_than USER, ACCURACY, 9, BattleAIScript_1DADD8 - if_random 50, BattleAIScript_1DADD8 +AI_CV_AccuracyUp: @ 81DADC8 + if_stat_level_less_than USER, ACCURACY, 9, AI_CV_AccuracyUp2 + if_random 50, AI_CV_AccuracyUp2 score -2 -BattleAIScript_1DADD8: @ 81DADD8 - if_hp_more_than USER, 70, BattleAIScript_1DADE1 +AI_CV_AccuracyUp2: @ 81DADD8 + if_hp_more_than USER, 70, AI_CV_AccuracyUp_End score -2 -BattleAIScript_1DADE1: @ 81DADE1 +AI_CV_AccuracyUp_End: @ 81DADE1 end -BattleAIScript_1DADE2: @ 81DADE2 - if_hp_less_than USER, 90, BattleAIScript_1DADF1 - if_random 100, BattleAIScript_1DADF1 +AI_CV_EvasionUp: @ 81DADE2 + if_hp_less_than USER, 90, AI_CV_EvasionUp2 + if_random 100, AI_CV_EvasionUp2 score +3 -BattleAIScript_1DADF1: @ 81DADF1 - if_stat_level_less_than USER, EVASION, 9, BattleAIScript_1DAE01 - if_random 128, BattleAIScript_1DAE01 +AI_CV_EvasionUp2: @ 81DADF1 + if_stat_level_less_than USER, EVASION, 9, AI_CV_EvasionUp3 + if_random 128, AI_CV_EvasionUp3 score -1 -BattleAIScript_1DAE01: @ 81DAE01 - if_not_status TARGET, TOX, BattleAIScript_1DAE20 - if_hp_more_than USER, 50, BattleAIScript_1DAE18 - if_random 80, BattleAIScript_1DAE20 +AI_CV_EvasionUp3: @ 81DAE01 + if_not_status TARGET, TOX, AI_CV_EvasionUp5 + if_hp_more_than USER, 50, AI_CV_EvasionUp4 + if_random 80, AI_CV_EvasionUp5 -BattleAIScript_1DAE18: @ 81DAE18 - if_random 50, BattleAIScript_1DAE20 +AI_CV_EvasionUp4: @ 81DAE18 + if_random 50, AI_CV_EvasionUp5 score +3 -BattleAIScript_1DAE20: @ 81DAE20 - if_not_status3 TARGET, S_LEECH_SEED, BattleAIScript_1DAE32 - if_random 70, BattleAIScript_1DAE32 +AI_CV_EvasionUp5: @ 81DAE20 + if_not_status3 TARGET, S_LEECH_SEED, AI_CV_EvasionUp6 + if_random 70, AI_CV_EvasionUp6 score +3 -BattleAIScript_1DAE32: @ 81DAE32 - if_not_status3 USER, S_ROOTED, BattleAIScript_1DAE44 - if_random 128, BattleAIScript_1DAE44 +AI_CV_EvasionUp6: @ 81DAE32 + if_not_status3 USER, S_ROOTED, AI_CV_EvasionUp7 + if_random 128, AI_CV_EvasionUp7 score +2 -BattleAIScript_1DAE44: @ 81DAE44 - if_not_status2 TARGET, S_CURSED, BattleAIScript_1DAE56 - if_random 70, BattleAIScript_1DAE56 +AI_CV_EvasionUp7: @ 81DAE44 + if_not_status2 TARGET, S_CURSED, AI_CV_EvasionUp8 + if_random 70, AI_CV_EvasionUp8 score +3 -BattleAIScript_1DAE56: @ 81DAE56 - if_hp_more_than USER, 70, BattleAIScript_1DAE7B - if_stat_level_equal USER, EVASION, 6, BattleAIScript_1DAE7B - if_hp_less_than USER, 40, BattleAIScript_1DAE79 - if_hp_less_than TARGET, 40, BattleAIScript_1DAE79 - if_random 70, BattleAIScript_1DAE7B +AI_CV_EvasionUp8: @ 81DAE56 + if_hp_more_than USER, 70, AI_CV_EvasionUp_End + if_stat_level_equal USER, EVASION, 6, AI_CV_EvasionUp_End + if_hp_less_than USER, 40, AI_CV_EvasionUp_ScoreDown2 + if_hp_less_than TARGET, 40, AI_CV_EvasionUp_ScoreDown2 + if_random 70, AI_CV_EvasionUp_End -BattleAIScript_1DAE79: @ 81DAE79 +AI_CV_EvasionUp_ScoreDown2: @ 81DAE79 score -2 -BattleAIScript_1DAE7B: @ 81DAE7B +AI_CV_EvasionUp_End: @ 81DAE7B end -BattleAIScript_1DAE7C: @ 81DAE7C - if_stat_level_more_than TARGET, EVASION, 10, BattleAIScript_1DAEA1 - if_stat_level_less_than USER, ACCURACY, 2, BattleAIScript_1DAEA1 - if_stat_level_more_than TARGET, EVASION, 8, BattleAIScript_1DAEA3 - if_stat_level_less_than USER, ACCURACY, 4, BattleAIScript_1DAEA3 - jump BattleAIScript_1DAEAB +AI_CV_AlwaysHit: @ 81DAE7C + if_stat_level_more_than TARGET, EVASION, 10, AI_CV_AlwaysHit_ScoreUp1 + if_stat_level_less_than USER, ACCURACY, 2, AI_CV_AlwaysHit_ScoreUp1 + if_stat_level_more_than TARGET, EVASION, 8, AI_CV_AlwaysHit2 + if_stat_level_less_than USER, ACCURACY, 4, AI_CV_AlwaysHit2 + jump AI_CV_AlwaysHit_End -BattleAIScript_1DAEA1: @ 81DAEA1 +AI_CV_AlwaysHit_ScoreUp1: @ 81DAEA1 score +1 -BattleAIScript_1DAEA3: @ 81DAEA3 - if_random 100, BattleAIScript_1DAEAB +AI_CV_AlwaysHit2: @ 81DAEA3 + if_random 100, AI_CV_AlwaysHit_End score +1 -BattleAIScript_1DAEAB: @ 81DAEAB +AI_CV_AlwaysHit_End: @ 81DAEAB end -BattleAIScript_1DAEAC: @ 81DAEAC - if_stat_level_equal TARGET, ATTACK, 6, BattleAIScript_1DAECF +AI_CV_AttackDown: @ 81DAEAC + if_stat_level_equal TARGET, ATTACK, 6, AI_CV_AttackDown3 score -1 - if_hp_more_than USER, 90, BattleAIScript_1DAEBF + if_hp_more_than USER, 90, AI_CV_AttackDown2 score -1 -BattleAIScript_1DAEBF: @ 81DAEBF - if_stat_level_more_than TARGET, ATTACK, 3, BattleAIScript_1DAECF - if_random 50, BattleAIScript_1DAECF +AI_CV_AttackDown2: @ 81DAEBF + if_stat_level_more_than TARGET, ATTACK, 3, AI_CV_AttackDown3 + if_random 50, AI_CV_AttackDown3 score -2 -BattleAIScript_1DAECF: @ 81DAECF - if_hp_more_than TARGET, 70, BattleAIScript_1DAED8 +AI_CV_AttackDown3: @ 81DAECF + if_hp_more_than TARGET, 70, AI_CV_AttackDown4 score -2 -BattleAIScript_1DAED8: @ 81DAED8 +AI_CV_AttackDown4: @ 81DAED8 get_type 0 - if_in_bytes TypeList_1DAEF7, BattleAIScript_1DAEF6 + if_in_bytes AI_CV_AttackDown_UnknownTypeList, AI_CV_AttackDown_End get_type 2 - if_in_bytes TypeList_1DAEF7, BattleAIScript_1DAEF6 - if_random 50, BattleAIScript_1DAEF6 + if_in_bytes AI_CV_AttackDown_UnknownTypeList, AI_CV_AttackDown_End + if_random 50, AI_CV_AttackDown_End score -2 -BattleAIScript_1DAEF6: @ 81DAEF6 +AI_CV_AttackDown_End: @ 81DAEF6 end -TypeList_1DAEF7: @ 81DAEF7 +AI_CV_AttackDown_UnknownTypeList: @ 81DAEF7 +@ why these types specifically? .byte TYPE_NORMAL .byte TYPE_FIGHTING .byte TYPE_GROUND @@ -1133,66 +1134,66 @@ TypeList_1DAEF7: @ 81DAEF7 .byte TYPE_STEEL .byte -1 -BattleAIScript_1DAEFE: @ 81DAEFE - if_hp_less_than USER, 70, BattleAIScript_1DAF0D - if_stat_level_more_than TARGET, DEFENSE, 3, BattleAIScript_1DAF15 +AI_CV_DefenseDown: @ 81DAEFE + if_hp_less_than USER, 70, AI_CV_DefenseDown2 + if_stat_level_more_than TARGET, DEFENSE, 3, AI_CV_DefenseDown3 -BattleAIScript_1DAF0D: @ 81DAF0D - if_random 50, BattleAIScript_1DAF15 +AI_CV_DefenseDown2: @ 81DAF0D + if_random 50, AI_CV_DefenseDown3 score -2 -BattleAIScript_1DAF15: @ 81DAF15 - if_hp_more_than TARGET, 70, BattleAIScript_1DAF1E +AI_CV_DefenseDown3: @ 81DAF15 + if_hp_more_than TARGET, 70, AI_CV_DefenseDown_End score -2 -BattleAIScript_1DAF1E: @ 81DAF1E +AI_CV_DefenseDown_End: @ 81DAF1E end -BattleAIScript_1DAF1F: @ 81DAF1F - if_move MOVE_ICY_WIND, BattleAIScript_1DAF35 - if_move MOVE_ROCK_TOMB, BattleAIScript_1DAF35 - if_move MOVE_MUD_SHOT, BattleAIScript_1DAF35 +AI_CV_SpeedDownFromChance: @ 81DAF1F + if_move MOVE_ICY_WIND, AI_CV_SpeedDown + if_move MOVE_ROCK_TOMB, AI_CV_SpeedDown + if_move MOVE_MUD_SHOT, AI_CV_SpeedDown end -BattleAIScript_1DAF35: @ 81DAF35 - if_would_go_first USER, BattleAIScript_1DAF42 +AI_CV_SpeedDown: @ 81DAF35 + if_would_go_first USER, AI_CV_SpeedDown2 score -3 - jump BattleAIScript_1DAF4A + jump AI_CV_SpeedDown_End -BattleAIScript_1DAF42: @ 81DAF42 - if_random 70, BattleAIScript_1DAF4A +AI_CV_SpeedDown2: @ 81DAF42 + if_random 70, AI_CV_SpeedDown_End score +2 -BattleAIScript_1DAF4A: @ 81DAF4A +AI_CV_SpeedDown_End: @ 81DAF4A end -BattleAIScript_1DAF4B: @ 81DAF4B - if_stat_level_equal TARGET, ATTACK, 6, BattleAIScript_1DAF6E +AI_CV_SpAtkDown: @ 81DAF4B + if_stat_level_equal TARGET, ATTACK, 6, AI_CV_SpAtkDown3 score -1 - if_hp_more_than USER, 90, BattleAIScript_1DAF5E + if_hp_more_than USER, 90, AI_CV_SpAtkDown2 score -1 -BattleAIScript_1DAF5E: @ 81DAF5E - if_stat_level_more_than TARGET, SP_ATTACK, 3, BattleAIScript_1DAF6E - if_random 50, BattleAIScript_1DAF6E +AI_CV_SpAtkDown2: @ 81DAF5E + if_stat_level_more_than TARGET, SP_ATTACK, 3, AI_CV_SpAtkDown3 + if_random 50, AI_CV_SpAtkDown3 score -2 -BattleAIScript_1DAF6E: @ 81DAF6E - if_hp_more_than TARGET, 70, BattleAIScript_1DAF77 +AI_CV_SpAtkDown3: @ 81DAF6E + if_hp_more_than TARGET, 70, AI_CV_SpAtkDown4 score -2 -BattleAIScript_1DAF77: @ 81DAF77 +AI_CV_SpAtkDown4: @ 81DAF77 get_type 0 - if_in_bytes TypeList_1DAF96, BattleAIScript_1DAF95 + if_in_bytes AI_CV_SpAtkDown_SpecialTypeList, AI_CV_SpAtkDown_End get_type 2 - if_in_bytes TypeList_1DAF96, BattleAIScript_1DAF95 - if_random 50, BattleAIScript_1DAF95 + if_in_bytes AI_CV_SpAtkDown_SpecialTypeList, AI_CV_SpAtkDown_End + if_random 50, AI_CV_SpAtkDown_End score -2 -BattleAIScript_1DAF95: @ 81DAF95 +AI_CV_SpAtkDown_End: @ 81DAF95 end -TypeList_1DAF96: @ 81DAF96 +AI_CV_SpAtkDown_SpecialTypeList: @ 81DAF96 .byte TYPE_FIRE .byte TYPE_WATER .byte TYPE_GRASS @@ -1203,236 +1204,236 @@ TypeList_1DAF96: @ 81DAF96 .byte TYPE_DARK .byte -1 -BattleAIScript_1DAF9F: @ 81DAF9F - if_hp_less_than USER, 70, BattleAIScript_1DAFAE - if_stat_level_more_than TARGET, SP_DEFENSE, 3, BattleAIScript_1DAFB6 +AI_CV_SpDefDown: @ 81DAF9F + if_hp_less_than USER, 70, AI_CV_SpDefDown2 + if_stat_level_more_than TARGET, SP_DEFENSE, 3, AI_CV_SpDefDown3 -BattleAIScript_1DAFAE: @ 81DAFAE - if_random 50, BattleAIScript_1DAFB6 +AI_CV_SpDefDown2: @ 81DAFAE + if_random 50, AI_CV_SpDefDown3 score -2 -BattleAIScript_1DAFB6: @ 81DAFB6 - if_hp_more_than TARGET, 70, BattleAIScript_1DAFBF +AI_CV_SpDefDown3: @ 81DAFB6 + if_hp_more_than TARGET, 70, AI_CV_SpDefDown_End score -2 -BattleAIScript_1DAFBF: @ 81DAFBF +AI_CV_SpDefDown_End: @ 81DAFBF end -BattleAIScript_1DAFC0: @ 81DAFC0 - if_hp_less_than USER, 70, BattleAIScript_1DAFCE - if_hp_more_than TARGET, 70, BattleAIScript_1DAFD6 +AI_CV_AccuracyDown: @ 81DAFC0 + if_hp_less_than USER, 70, AI_CV_AccuracyDown2 + if_hp_more_than TARGET, 70, AI_CV_AccuracyDown3 -BattleAIScript_1DAFCE: @ 81DAFCE - if_random 100, BattleAIScript_1DAFD6 +AI_CV_AccuracyDown2: @ 81DAFCE + if_random 100, AI_CV_AccuracyDown3 score -1 -BattleAIScript_1DAFD6: @ 81DAFD6 - if_stat_level_more_than USER, ACCURACY, 4, BattleAIScript_1DAFE6 - if_random 80, BattleAIScript_1DAFE6 +AI_CV_AccuracyDown3: @ 81DAFD6 + if_stat_level_more_than USER, ACCURACY, 4, AI_CV_AccuracyDown4 + if_random 80, AI_CV_AccuracyDown4 score -2 -BattleAIScript_1DAFE6: @ 81DAFE6 - if_not_status TARGET, TOX, BattleAIScript_1DAFF8 - if_random 70, BattleAIScript_1DAFF8 +AI_CV_AccuracyDown4: @ 81DAFE6 + if_not_status TARGET, TOX, AI_CV_AccuracyDown5 + if_random 70, AI_CV_AccuracyDown5 score +2 -BattleAIScript_1DAFF8: @ 81DAFF8 - if_not_status3 TARGET, S_LEECH_SEED, BattleAIScript_1DB00A - if_random 70, BattleAIScript_1DB00A +AI_CV_AccuracyDown5: @ 81DAFF8 + if_not_status3 TARGET, S_LEECH_SEED, AI_CV_AccuracyDown6 + if_random 70, AI_CV_AccuracyDown6 score +2 -BattleAIScript_1DB00A: @ 81DB00A - if_not_status3 USER, S_ROOTED, BattleAIScript_1DB01C - if_random 128, BattleAIScript_1DB01C +AI_CV_AccuracyDown6: @ 81DB00A + if_not_status3 USER, S_ROOTED, AI_CV_AccuracyDown7 + if_random 128, AI_CV_AccuracyDown7 score +1 -BattleAIScript_1DB01C: @ 81DB01C - if_not_status2 TARGET, S_CURSED, BattleAIScript_1DB02E - if_random 70, BattleAIScript_1DB02E +AI_CV_AccuracyDown7: @ 81DB01C + if_not_status2 TARGET, S_CURSED, AI_CV_AccuracyDown8 + if_random 70, AI_CV_AccuracyDown8 score +2 -BattleAIScript_1DB02E: @ 81DB02E - if_hp_more_than USER, 70, BattleAIScript_1DB053 - if_stat_level_equal TARGET, ACCURACY, 6, BattleAIScript_1DB053 - if_hp_less_than USER, 40, BattleAIScript_1DB051 - if_hp_less_than TARGET, 40, BattleAIScript_1DB051 - if_random 70, BattleAIScript_1DB053 +AI_CV_AccuracyDown8: @ 81DB02E + if_hp_more_than USER, 70, AI_CV_AccuracyDown_End + if_stat_level_equal TARGET, ACCURACY, 6, AI_CV_AccuracyDown_End + if_hp_less_than USER, 40, AI_CV_AccuracyDown_ScoreDown2 + if_hp_less_than TARGET, 40, AI_CV_AccuracyDown_ScoreDown2 + if_random 70, AI_CV_AccuracyDown_End -BattleAIScript_1DB051: @ 81DB051 +AI_CV_AccuracyDown_ScoreDown2: @ 81DB051 score -2 -BattleAIScript_1DB053: @ 81DB053 +AI_CV_AccuracyDown_End: @ 81DB053 end -BattleAIScript_1DB054: @ 81DB054 - if_hp_less_than USER, 70, BattleAIScript_1DB063 - if_stat_level_more_than TARGET, EVASION, 3, BattleAIScript_1DB06B +AI_CV_EvasionDown: @ 81DB054 + if_hp_less_than USER, 70, AI_CV_EvasionDown2 + if_stat_level_more_than TARGET, EVASION, 3, AI_CV_EvasionDown3 -BattleAIScript_1DB063: @ 81DB063 - if_random 50, BattleAIScript_1DB06B +AI_CV_EvasionDown2: @ 81DB063 + if_random 50, AI_CV_EvasionDown3 score -2 -BattleAIScript_1DB06B: @ 81DB06B - if_hp_more_than TARGET, 70, BattleAIScript_1DB074 +AI_CV_EvasionDown3: @ 81DB06B + if_hp_more_than TARGET, 70, AI_CV_EvasionDown_End score -2 -BattleAIScript_1DB074: @ 81DB074 +AI_CV_EvasionDown_End: @ 81DB074 end -BattleAIScript_1DB075: @ 81DB075 - if_stat_level_more_than USER, ATTACK, 8, BattleAIScript_1DB0CA - if_stat_level_more_than USER, DEFENSE, 8, BattleAIScript_1DB0CA - if_stat_level_more_than USER, SP_ATTACK, 8, BattleAIScript_1DB0CA - if_stat_level_more_than USER, SP_DEFENSE, 8, BattleAIScript_1DB0CA - if_stat_level_more_than USER, EVASION, 8, BattleAIScript_1DB0CA - if_stat_level_less_than TARGET, ATTACK, 4, BattleAIScript_1DB0CA - if_stat_level_less_than TARGET, DEFENSE, 4, BattleAIScript_1DB0CA - if_stat_level_less_than TARGET, SP_ATTACK, 4, BattleAIScript_1DB0CA - if_stat_level_less_than TARGET, SP_DEFENSE, 4, BattleAIScript_1DB0CA - if_stat_level_less_than TARGET, ACCURACY, 4, BattleAIScript_1DB0CA - jump BattleAIScript_1DB0D2 +AI_CV_Haze: @ 81DB075 + if_stat_level_more_than USER, ATTACK, 8, AI_CV_Haze2 + if_stat_level_more_than USER, DEFENSE, 8, AI_CV_Haze2 + if_stat_level_more_than USER, SP_ATTACK, 8, AI_CV_Haze2 + if_stat_level_more_than USER, SP_DEFENSE, 8, AI_CV_Haze2 + if_stat_level_more_than USER, EVASION, 8, AI_CV_Haze2 + if_stat_level_less_than TARGET, ATTACK, 4, AI_CV_Haze2 + if_stat_level_less_than TARGET, DEFENSE, 4, AI_CV_Haze2 + if_stat_level_less_than TARGET, SP_ATTACK, 4, AI_CV_Haze2 + if_stat_level_less_than TARGET, SP_DEFENSE, 4, AI_CV_Haze2 + if_stat_level_less_than TARGET, ACCURACY, 4, AI_CV_Haze2 + jump AI_CV_Haze3 -BattleAIScript_1DB0CA: @ 81DB0CA - if_random 50, BattleAIScript_1DB0D2 +AI_CV_Haze2: @ 81DB0CA + if_random 50, AI_CV_Haze3 score -3 -BattleAIScript_1DB0D2: @ 81DB0D2 - if_stat_level_more_than TARGET, ATTACK, 8, BattleAIScript_1DB12F - if_stat_level_more_than TARGET, DEFENSE, 8, BattleAIScript_1DB12F - if_stat_level_more_than TARGET, SP_ATTACK, 8, BattleAIScript_1DB12F - if_stat_level_more_than TARGET, SP_DEFENSE, 8, BattleAIScript_1DB12F - if_stat_level_more_than TARGET, EVASION, 8, BattleAIScript_1DB12F - if_stat_level_less_than USER, ATTACK, 4, BattleAIScript_1DB12F - if_stat_level_less_than USER, DEFENSE, 4, BattleAIScript_1DB12F - if_stat_level_less_than USER, SP_ATTACK, 4, BattleAIScript_1DB12F - if_stat_level_less_than USER, SP_DEFENSE, 4, BattleAIScript_1DB12F - if_stat_level_less_than USER, ACCURACY, 4, BattleAIScript_1DB12F - if_random 50, BattleAIScript_1DB137 +AI_CV_Haze3: @ 81DB0D2 + if_stat_level_more_than TARGET, ATTACK, 8, AI_CV_Haze4 + if_stat_level_more_than TARGET, DEFENSE, 8, AI_CV_Haze4 + if_stat_level_more_than TARGET, SP_ATTACK, 8, AI_CV_Haze4 + if_stat_level_more_than TARGET, SP_DEFENSE, 8, AI_CV_Haze4 + if_stat_level_more_than TARGET, EVASION, 8, AI_CV_Haze4 + if_stat_level_less_than USER, ATTACK, 4, AI_CV_Haze4 + if_stat_level_less_than USER, DEFENSE, 4, AI_CV_Haze4 + if_stat_level_less_than USER, SP_ATTACK, 4, AI_CV_Haze4 + if_stat_level_less_than USER, SP_DEFENSE, 4, AI_CV_Haze4 + if_stat_level_less_than USER, ACCURACY, 4, AI_CV_Haze4 + if_random 50, AI_CV_Haze_End score -1 - jump BattleAIScript_1DB137 + jump AI_CV_Haze_End -BattleAIScript_1DB12F: @ 81DB12F - if_random 50, BattleAIScript_1DB137 +AI_CV_Haze4: @ 81DB12F + if_random 50, AI_CV_Haze_End score +3 -BattleAIScript_1DB137: @ 81DB137 +AI_CV_Haze_End: @ 81DB137 end -BattleAIScript_1DB138: @ 81DB138 - if_hp_more_than USER, 90, BattleAIScript_1DB141 +AI_CV_Bide: @ 81DB138 + if_hp_more_than USER, 90, AI_CV_Bide_End score -2 -BattleAIScript_1DB141: @ 81DB141 +AI_CV_Bide_End: @ 81DB141 end -BattleAIScript_1DB142: @ 81DB142 - if_stat_level_more_than TARGET, ATTACK, 8, BattleAIScript_1DB171 - if_stat_level_more_than TARGET, DEFENSE, 8, BattleAIScript_1DB171 - if_stat_level_more_than TARGET, SP_ATTACK, 8, BattleAIScript_1DB171 - if_stat_level_more_than TARGET, SP_DEFENSE, 8, BattleAIScript_1DB171 - if_stat_level_more_than TARGET, EVASION, 8, BattleAIScript_1DB171 +AI_CV_Roar: @ 81DB142 + if_stat_level_more_than TARGET, ATTACK, 8, AI_CV_Roar2 + if_stat_level_more_than TARGET, DEFENSE, 8, AI_CV_Roar2 + if_stat_level_more_than TARGET, SP_ATTACK, 8, AI_CV_Roar2 + if_stat_level_more_than TARGET, SP_DEFENSE, 8, AI_CV_Roar2 + if_stat_level_more_than TARGET, EVASION, 8, AI_CV_Roar2 score -3 - jump BattleAIScript_1DB179 + jump AI_CV_Roar_End -BattleAIScript_1DB171: @ 81DB171 - if_random 128, BattleAIScript_1DB179 +AI_CV_Roar2: @ 81DB171 + if_random 128, AI_CV_Roar_End score +2 -BattleAIScript_1DB179: @ 81DB179 +AI_CV_Roar_End: @ 81DB179 end -BattleAIScript_1DB17A: @ 81DB17A - if_hp_more_than USER, 90, BattleAIScript_1DB183 +AI_CV_Conversion: @ 81DB17A + if_hp_more_than USER, 90, AI_CV_Conversion2 score -2 -BattleAIScript_1DB183: @ 81DB183 +AI_CV_Conversion2: @ 81DB183 get_turn_count - if_equal 0, BattleAIScript_1DB190 - if_random 200, BattleAIScript_1DA84F + if_equal 0, AI_CV_Conversion_End + if_random 200, Score_Down2 -BattleAIScript_1DB190: @ 81DB190 +AI_CV_Conversion_End: @ 81DB190 end -BattleAIScript_1DB191: @ 81DB191 +AI_CV_HealWeather: @ 81DB191 get_weather - if_equal WEATHER_HAIL, BattleAIScript_1DB1A9 - if_equal WEATHER_RAIN, BattleAIScript_1DB1A9 - if_equal WEATHER_SANDSTORM, BattleAIScript_1DB1A9 - jump BattleAIScript_1DB1AB + if_equal WEATHER_HAIL, AI_CV_HealWeather_ScoreDown2 + if_equal WEATHER_RAIN, AI_CV_HealWeather_ScoreDown2 + if_equal WEATHER_SANDSTORM, AI_CV_HealWeather_ScoreDown2 + jump AI_CV_Heal -BattleAIScript_1DB1A9: @ 81DB1A9 +AI_CV_HealWeather_ScoreDown2: @ 81DB1A9 score -2 -BattleAIScript_1DB1AB: @ 81DB1AB - if_hp_equal USER, 100, BattleAIScript_1DB1D3 - if_would_go_first USER, BattleAIScript_1DB1DA +AI_CV_Heal: @ 81DB1AB + if_hp_equal USER, 100, AI_CV_Heal3 + if_would_go_first USER, AI_CV_Heal4 score -8 - jump BattleAIScript_1DB203 + jump AI_CV_Heal_End -@ unreferenced - if_hp_less_than USER, 50, BattleAIScript_1DB1EE - if_hp_more_than USER, 80, BattleAIScript_1DB1D3 - if_random 70, BattleAIScript_1DB1EE +AI_CV_Heal2: @ unreferenced + if_hp_less_than USER, 50, AI_CV_Heal5 + if_hp_more_than USER, 80, AI_CV_Heal3 + if_random 70, AI_CV_Heal5 -BattleAIScript_1DB1D3: @ 81DB1D3 +AI_CV_Heal3: @ 81DB1D3 score -3 - jump BattleAIScript_1DB203 + jump AI_CV_Heal_End -BattleAIScript_1DB1DA: @ 81DB1DA - if_hp_less_than USER, 70, BattleAIScript_1DB1EE - if_random 30, BattleAIScript_1DB1EE +AI_CV_Heal4: @ 81DB1DA + if_hp_less_than USER, 70, AI_CV_Heal5 + if_random 30, AI_CV_Heal5 score -3 - jump BattleAIScript_1DB203 + jump AI_CV_Heal_End -BattleAIScript_1DB1EE: @ 81DB1EE - if_not_move_effect TARGET, EFFECT_SNATCH, BattleAIScript_1DB1FB - if_random 100, BattleAIScript_1DB203 +AI_CV_Heal5: @ 81DB1EE + if_not_move_effect TARGET, EFFECT_SNATCH, AI_CV_Heal6 + if_random 100, AI_CV_Heal_End -BattleAIScript_1DB1FB: @ 81DB1FB - if_random 20, BattleAIScript_1DB203 +AI_CV_Heal6: @ 81DB1FB + if_random 20, AI_CV_Heal_End score +2 -BattleAIScript_1DB203: @ 81DB203 +AI_CV_Heal_End: @ 81DB203 end -BattleAIScript_1DB204: @ 81DB204 - if_user_cant_damage BattleAIScript_1DB227 - if_hp_more_than USER, 50, BattleAIScript_1DB218 - if_random 50, BattleAIScript_1DB218 +AI_CV_Toxic: @ 81DB204 + if_user_cant_damage AI_CV_Toxic3 + if_hp_more_than USER, 50, AI_CV_Toxic2 + if_random 50, AI_CV_Toxic2 score -3 -BattleAIScript_1DB218: @ 81DB218 - if_hp_more_than TARGET, 50, BattleAIScript_1DB227 - if_random 50, BattleAIScript_1DB227 +AI_CV_Toxic2: @ 81DB218 + if_hp_more_than TARGET, 50, AI_CV_Toxic3 + if_random 50, AI_CV_Toxic3 score -3 -BattleAIScript_1DB227: @ 81DB227 - if_move_effect USER, EFFECT_SPECIAL_DEFENSE_UP, BattleAIScript_1DB23A - if_move_effect USER, EFFECT_PROTECT, BattleAIScript_1DB23A - jump BattleAIScript_1DB242 +AI_CV_Toxic3: @ 81DB227 + if_move_effect USER, EFFECT_SPECIAL_DEFENSE_UP, AI_CV_Toxic4 + if_move_effect USER, EFFECT_PROTECT, AI_CV_Toxic4 + jump AI_CV_Toxic_End -BattleAIScript_1DB23A: @ 81DB23A - if_random 60, BattleAIScript_1DB242 +AI_CV_Toxic4: @ 81DB23A + if_random 60, AI_CV_Toxic_End score +2 -BattleAIScript_1DB242: @ 81DB242 +AI_CV_Toxic_End: @ 81DB242 end -BattleAIScript_1DB243: @ 81DB243 - if_hp_less_than USER, 50, BattleAIScript_1DB266 +AI_CV_LightScreen: @ 81DB243 + if_hp_less_than USER, 50, AI_CV_LightScreen_ScoreDown2 get_type 0 - if_in_bytes TypeList_1DB269, BattleAIScript_1DB268 + if_in_bytes AI_CV_LightScreen_SpecialTypeList, AI_CV_LightScreen_End get_type 2 - if_in_bytes TypeList_1DB269, BattleAIScript_1DB268 - if_random 50, BattleAIScript_1DB268 + if_in_bytes AI_CV_LightScreen_SpecialTypeList, AI_CV_LightScreen_End + if_random 50, AI_CV_LightScreen_End -BattleAIScript_1DB266: @ 81DB266 +AI_CV_LightScreen_ScoreDown2: @ 81DB266 score -2 -BattleAIScript_1DB268: @ 81DB268 +AI_CV_LightScreen_End: @ 81DB268 end -TypeList_1DB269: @ 81DB269 +AI_CV_LightScreen_SpecialTypeList: @ 81DB269 .byte TYPE_FIRE .byte TYPE_WATER .byte TYPE_GRASS @@ -1443,112 +1444,112 @@ TypeList_1DB269: @ 81DB269 .byte TYPE_DARK .byte -1 -BattleAIScript_1DB272: @ 81DB272 - if_would_go_first USER, BattleAIScript_1DB2A1 - if_hp_not_equal USER, 100, BattleAIScript_1DB286 +AI_CV_Rest: @ 81DB272 + if_would_go_first USER, AI_CV_Rest4 + if_hp_not_equal USER, 100, AI_CV_Rest2 score -8 - jump BattleAIScript_1DB2D1 + jump AI_CV_Rest_End -BattleAIScript_1DB286: @ 81DB286 - if_hp_less_than USER, 40, BattleAIScript_1DB2BC - if_hp_more_than USER, 50, BattleAIScript_1DB29A - if_random 70, BattleAIScript_1DB2BC +AI_CV_Rest2: @ 81DB286 + if_hp_less_than USER, 40, AI_CV_Rest6 + if_hp_more_than USER, 50, AI_CV_Rest3 + if_random 70, AI_CV_Rest6 -BattleAIScript_1DB29A: @ 81DB29A +AI_CV_Rest3: @ 81DB29A score -3 - jump BattleAIScript_1DB2D1 + jump AI_CV_Rest_End -BattleAIScript_1DB2A1: @ 81DB2A1 - if_hp_less_than USER, 60, BattleAIScript_1DB2BC - if_hp_more_than USER, 70, BattleAIScript_1DB2B5 - if_random 50, BattleAIScript_1DB2BC +AI_CV_Rest4: @ 81DB2A1 + if_hp_less_than USER, 60, AI_CV_Rest6 + if_hp_more_than USER, 70, AI_CV_Rest5 + if_random 50, AI_CV_Rest6 -BattleAIScript_1DB2B5: @ 81DB2B5 +AI_CV_Rest5: @ 81DB2B5 score -3 - jump BattleAIScript_1DB2D1 + jump AI_CV_Rest_End -BattleAIScript_1DB2BC: @ 81DB2BC - if_not_move_effect TARGET, EFFECT_SNATCH, BattleAIScript_1DB2C9 - if_random 50, BattleAIScript_1DB2D1 +AI_CV_Rest6: @ 81DB2BC + if_not_move_effect TARGET, EFFECT_SNATCH, AI_CV_Rest7 + if_random 50, AI_CV_Rest_End -BattleAIScript_1DB2C9: @ 81DB2C9 - if_random 10, BattleAIScript_1DB2D1 +AI_CV_Rest7: @ 81DB2C9 + if_random 10, AI_CV_Rest_End score +3 -BattleAIScript_1DB2D1: @ 81DB2D1 +AI_CV_Rest_End: @ 81DB2D1 end -BattleAIScript_1DB2D2: @ 81DB2D2 +AI_CV_OneHitKO: @ 81DB2D2 end -BattleAIScript_1DB2D3: @ 81DB2D3 - if_hp_more_than TARGET, 50, BattleAIScript_1DB2DC +AI_CV_SuperFang: @ 81DB2D3 + if_hp_more_than TARGET, 50, AI_CV_SuperFang_End score -1 -BattleAIScript_1DB2DC: @ 81DB2DC +AI_CV_SuperFang_End: @ 81DB2DC end -BattleAIScript_1DB2DD: @ 81DB2DD - if_status TARGET, TOX, BattleAIScript_1DB30A - if_status2 TARGET, S_CURSED, BattleAIScript_1DB30A - if_status3 TARGET, S_PERISH_SONG, BattleAIScript_1DB30A - if_status2 TARGET, S_INFATUATED, BattleAIScript_1DB30A - jump BattleAIScript_1DB312 +AI_CV_Trap: @ 81DB2DD + if_status TARGET, TOX, AI_CV_Trap2 + if_status2 TARGET, S_CURSED, AI_CV_Trap2 + if_status3 TARGET, S_PERISH_SONG, AI_CV_Trap2 + if_status2 TARGET, S_INFATUATED, AI_CV_Trap2 + jump AI_CV_Trap_End -BattleAIScript_1DB30A: @ 81DB30A - if_random 128, BattleAIScript_1DB312 +AI_CV_Trap2: @ 81DB30A + if_random 128, AI_CV_Trap_End score +1 -BattleAIScript_1DB312: @ 81DB312 +AI_CV_Trap_End: @ 81DB312 end -BattleAIScript_1DB313: @ 81DB313 - if_damage_bonus 10, BattleAIScript_1DB339 - if_damage_bonus 20, BattleAIScript_1DB339 - if_damage_bonus 80, BattleAIScript_1DB331 - if_damage_bonus 160, BattleAIScript_1DB331 - if_random 128, BattleAIScript_1DB339 +AI_CV_HighCrit: @ 81DB313 + if_damage_bonus 10, AI_CV_HighCrit_End + if_damage_bonus 20, AI_CV_HighCrit_End + if_damage_bonus 80, AI_CV_HighCrit2 + if_damage_bonus 160, AI_CV_HighCrit2 + if_random 128, AI_CV_HighCrit_End -BattleAIScript_1DB331: @ 81DB331 - if_random 128, BattleAIScript_1DB339 +AI_CV_HighCrit2: @ 81DB331 + if_random 128, AI_CV_HighCrit_End score +1 -BattleAIScript_1DB339: @ 81DB339 +AI_CV_HighCrit_End: @ 81DB339 end -BattleAIScript_1DB33A: @ 81DB33A - if_random 128, BattleAIScript_1DB342 +AI_CV_Flatter: @ 81DB33A + if_random 128, AI_CV_Confuse score +1 -BattleAIScript_1DB342: @ 81DB342 - if_hp_more_than TARGET, 70, BattleAIScript_1DB363 - if_random 128, BattleAIScript_1DB351 +AI_CV_Confuse: @ 81DB342 + if_hp_more_than TARGET, 70, AI_CV_Confuse_End + if_random 128, AI_CV_Confuse2 score -1 -BattleAIScript_1DB351: @ 81DB351 - if_hp_more_than TARGET, 50, BattleAIScript_1DB363 +AI_CV_Confuse2: @ 81DB351 + if_hp_more_than TARGET, 50, AI_CV_Confuse_End score -1 - if_hp_more_than TARGET, 30, BattleAIScript_1DB363 + if_hp_more_than TARGET, 30, AI_CV_Confuse_End score -1 -BattleAIScript_1DB363: @ 81DB363 +AI_CV_Confuse_End: @ 81DB363 end -BattleAIScript_1DB364: @ 81DB364 - if_hp_less_than USER, 50, BattleAIScript_1DB387 +AI_CV_Reflect: @ 81DB364 + if_hp_less_than USER, 50, AI_CV_Reflect_ScoreDown2 get_type 0 - if_in_bytes TypeList_1DB38A, BattleAIScript_1DB389 + if_in_bytes AI_CV_Reflect_PhysicalTypeList, AI_CV_Reflect_End get_type 2 - if_in_bytes TypeList_1DB38A, BattleAIScript_1DB389 - if_random 50, BattleAIScript_1DB389 + if_in_bytes AI_CV_Reflect_PhysicalTypeList, AI_CV_Reflect_End + if_random 50, AI_CV_Reflect_End -BattleAIScript_1DB387: @ 81DB387 +AI_CV_Reflect_ScoreDown2: @ 81DB387 score -2 -BattleAIScript_1DB389: @ 81DB389 +AI_CV_Reflect_End: @ 81DB389 end -TypeList_1DB38A: @ 81DB38A +AI_CV_Reflect_PhysicalTypeList: @ 81DB38A .byte TYPE_NORMAL .byte TYPE_FIGHTING .byte TYPE_FLYING @@ -1560,167 +1561,167 @@ TypeList_1DB38A: @ 81DB38A .byte TYPE_STEEL .byte -1 -BattleAIScript_1DB394: @ 81DB394 - if_hp_less_than USER, 50, BattleAIScript_1DB3A2 - if_hp_more_than TARGET, 50, BattleAIScript_1DB3A4 +AI_CV_Poison: @ 81DB394 + if_hp_less_than USER, 50, AI_CV_Poison_ScoreDown1 + if_hp_more_than TARGET, 50, AI_CV_Poison_End -BattleAIScript_1DB3A2: @ 81DB3A2 +AI_CV_Poison_ScoreDown1: @ 81DB3A2 score -1 -BattleAIScript_1DB3A4: @ 81DB3A4 +AI_CV_Poison_End: @ 81DB3A4 end -BattleAIScript_1DB3A5: @ 81DB3A5 - if_would_go_first USER, BattleAIScript_1DB3B9 - if_hp_more_than USER, 70, BattleAIScript_1DB3C1 +AI_CV_Paralyze: @ 81DB3A5 + if_would_go_first USER, AI_CV_Paralyze2 + if_hp_more_than USER, 70, AI_CV_Paralyze_End score -1 - jump BattleAIScript_1DB3C1 + jump AI_CV_Paralyze_End -BattleAIScript_1DB3B9: @ 81DB3B9 - if_random 20, BattleAIScript_1DB3C1 +AI_CV_Paralyze2: @ 81DB3B9 + if_random 20, AI_CV_Paralyze_End score +3 -BattleAIScript_1DB3C1: @ 81DB3C1 +AI_CV_Paralyze_End: @ 81DB3C1 end -BattleAIScript_1DB3C2: @ 81DB3C2 - if_would_go_first USER, BattleAIScript_1DB3E4 - if_hp_more_than USER, 60, BattleAIScript_1DB3E4 - if_hp_less_than USER, 40, BattleAIScript_1DB3DC - if_random 180, BattleAIScript_1DB3E4 +AI_CV_VitalThrow: @ 81DB3C2 + if_would_go_first USER, AI_CV_VitalThrow_End + if_hp_more_than USER, 60, AI_CV_VitalThrow_End + if_hp_less_than USER, 40, AI_CV_VitalThrow2 + if_random 180, AI_CV_VitalThrow_End -BattleAIScript_1DB3DC: @ 81DB3DC - if_random 50, BattleAIScript_1DB3E4 +AI_CV_VitalThrow2: @ 81DB3DC + if_random 50, AI_CV_VitalThrow_End score -1 -BattleAIScript_1DB3E4: @ 81DB3E4 +AI_CV_VitalThrow_End: @ 81DB3E4 end -BattleAIScript_1DB3E5: @ 81DB3E5 - if_hp_more_than USER, 90, BattleAIScript_1DB412 - if_hp_more_than USER, 70, BattleAIScript_1DB40A - if_hp_more_than USER, 50, BattleAIScript_1DB402 - if_random 100, BattleAIScript_1DB402 +AI_CV_Substitute: @ 81DB3E5 + if_hp_more_than USER, 90, AI_CV_Substitute4 + if_hp_more_than USER, 70, AI_CV_Substitute3 + if_hp_more_than USER, 50, AI_CV_Substitute2 + if_random 100, AI_CV_Substitute2 score -1 -BattleAIScript_1DB402: @ 81DB402 - if_random 100, BattleAIScript_1DB40A +AI_CV_Substitute2: @ 81DB402 + if_random 100, AI_CV_Substitute3 score -1 -BattleAIScript_1DB40A: @ 81DB40A - if_random 100, BattleAIScript_1DB412 +AI_CV_Substitute3: @ 81DB40A + if_random 100, AI_CV_Substitute4 score -1 -BattleAIScript_1DB412: @ 81DB412 - if_would_go_first USER, BattleAIScript_1DB47A +AI_CV_Substitute4: @ 81DB412 + if_would_go_first USER, AI_CV_Substitute_End get_move TARGET get_move_effect - if_equal EFFECT_SLEEP, BattleAIScript_1DB44A - if_equal EFFECT_TOXIC, BattleAIScript_1DB44A - if_equal EFFECT_POISON, BattleAIScript_1DB44A - if_equal EFFECT_PARALYZE, BattleAIScript_1DB44A - if_equal EFFECT_WILL_O_WISP, BattleAIScript_1DB44A - if_equal EFFECT_CONFUSE, BattleAIScript_1DB459 - if_equal EFFECT_LEECH_SEED, BattleAIScript_1DB468 - jump BattleAIScript_1DB47A - -BattleAIScript_1DB44A: @ 81DB44A - if_not_status TARGET, SLP | PSN | BRN | FRZ | PAR | TOX, BattleAIScript_1DB472 - jump BattleAIScript_1DB47A - -BattleAIScript_1DB459: @ 81DB459 - if_not_status2 TARGET, S_CONFUSED, BattleAIScript_1DB472 - jump BattleAIScript_1DB47A - -BattleAIScript_1DB468: @ 81DB468 - if_status3 TARGET, S_LEECH_SEED, BattleAIScript_1DB47A - -BattleAIScript_1DB472: @ 81DB472 - if_random 100, BattleAIScript_1DB47A + if_equal EFFECT_SLEEP, AI_CV_Substitute5 + if_equal EFFECT_TOXIC, AI_CV_Substitute5 + if_equal EFFECT_POISON, AI_CV_Substitute5 + if_equal EFFECT_PARALYZE, AI_CV_Substitute5 + if_equal EFFECT_WILL_O_WISP, AI_CV_Substitute5 + if_equal EFFECT_CONFUSE, AI_CV_Substitute6 + if_equal EFFECT_LEECH_SEED, AI_CV_Substitute7 + jump AI_CV_Substitute_End + +AI_CV_Substitute5: @ 81DB44A + if_not_status TARGET, SLP | PSN | BRN | FRZ | PAR | TOX, AI_CV_Substitute8 + jump AI_CV_Substitute_End + +AI_CV_Substitute6: @ 81DB459 + if_not_status2 TARGET, S_CONFUSED, AI_CV_Substitute8 + jump AI_CV_Substitute_End + +AI_CV_Substitute7: @ 81DB468 + if_status3 TARGET, S_LEECH_SEED, AI_CV_Substitute_End + +AI_CV_Substitute8: @ 81DB472 + if_random 100, AI_CV_Substitute_End score +1 -BattleAIScript_1DB47A: @ 81DB47A +AI_CV_Substitute_End: @ 81DB47A end -BattleAIScript_1DB47B: @ 81DB47B - if_damage_bonus 10, BattleAIScript_1DB4A0 - if_damage_bonus 20, BattleAIScript_1DB4A0 - if_would_go_first USER, BattleAIScript_1DB499 - if_hp_more_than USER, 40, BattleAIScript_1DB4A0 - jump BattleAIScript_1DB4A2 +AI_CV_Recharge: @ 81DB47B + if_damage_bonus 10, AI_CV_Recharge_ScoreDown1 + if_damage_bonus 20, AI_CV_Recharge_ScoreDown1 + if_would_go_first USER, AI_CV_Recharge2 + if_hp_more_than USER, 40, AI_CV_Recharge_ScoreDown1 + jump AI_CV_Recharge_End -BattleAIScript_1DB499: @ 81DB499 - if_hp_less_than USER, 60, BattleAIScript_1DB4A2 +AI_CV_Recharge2: @ 81DB499 + if_hp_less_than USER, 60, AI_CV_Recharge_End -BattleAIScript_1DB4A0: @ 81DB4A0 +AI_CV_Recharge_ScoreDown1: @ 81DB4A0 score -1 -BattleAIScript_1DB4A2: @ 81DB4A2 +AI_CV_Recharge_End: @ 81DB4A2 end -BattleAIScript_1DB4A3: @ 81DB4A3 - if_would_go_first USER, BattleAIScript_1DB4C1 +AI_CV_Disable: @ 81DB4A3 + if_would_go_first USER, AI_CV_Disable_End get_move TARGET get_move_power - if_equal 0, BattleAIScript_1DB4B9 + if_equal 0, AI_CV_Disable2 score +1 - jump BattleAIScript_1DB4C1 + jump AI_CV_Disable_End -BattleAIScript_1DB4B9: @ 81DB4B9 - if_random 100, BattleAIScript_1DB4C1 +AI_CV_Disable2: @ 81DB4B9 + if_random 100, AI_CV_Disable_End score -1 -BattleAIScript_1DB4C1: @ 81DB4C1 +AI_CV_Disable_End: @ 81DB4C1 end -BattleAIScript_1DB4C2: @ 81DB4C2 - if_status TARGET, SLP, BattleAIScript_1DB556 - if_status2 TARGET, S_INFATUATED, BattleAIScript_1DB556 - if_status2 TARGET, S_CONFUSED, BattleAIScript_1DB556 - if_hp_more_than USER, 30, BattleAIScript_1DB4EF - if_random 10, BattleAIScript_1DB4EF +AI_CV_Counter: @ 81DB4C2 + if_status TARGET, SLP, AI_CV_Counter_ScoreDown1 + if_status2 TARGET, S_INFATUATED, AI_CV_Counter_ScoreDown1 + if_status2 TARGET, S_CONFUSED, AI_CV_Counter_ScoreDown1 + if_hp_more_than USER, 30, AI_CV_Counter2 + if_random 10, AI_CV_Counter2 score -1 -BattleAIScript_1DB4EF: @ 81DB4EF - if_hp_more_than USER, 50, BattleAIScript_1DB4FE - if_random 100, BattleAIScript_1DB4FE +AI_CV_Counter2: @ 81DB4EF + if_hp_more_than USER, 50, AI_CV_Counter3 + if_random 100, AI_CV_Counter3 score -1 -BattleAIScript_1DB4FE: @ 81DB4FE +AI_CV_Counter3: @ 81DB4FE get_move TARGET get_move_power - if_equal 0, BattleAIScript_1DB52D - if_not_taunted BattleAIScript_1DB514 - if_random 100, BattleAIScript_1DB514 + if_equal 0, AI_CV_Counter5 + if_not_taunted AI_CV_Counter4 + if_random 100, AI_CV_Counter4 score +1 -BattleAIScript_1DB514: @ 81DB514 +AI_CV_Counter4: @ 81DB514 get_move TARGET get_move_type - if_not_in_bytes TypeList_1DB559, BattleAIScript_1DB556 - if_random 100, BattleAIScript_1DB558 + if_not_in_bytes AI_CV_Counter_PhysicalTypeList, AI_CV_Counter_ScoreDown1 + if_random 100, AI_CV_Counter_End score +1 - jump BattleAIScript_1DB558 + jump AI_CV_Counter_End -BattleAIScript_1DB52D: @ 81DB52D - if_not_taunted BattleAIScript_1DB53A - if_random 100, BattleAIScript_1DB53A +AI_CV_Counter5: @ 81DB52D + if_not_taunted AI_CV_Counter6 + if_random 100, AI_CV_Counter6 score +1 -BattleAIScript_1DB53A: @ 81DB53A +AI_CV_Counter6: @ 81DB53A get_type 0 - if_in_bytes TypeList_1DB559, BattleAIScript_1DB558 + if_in_bytes AI_CV_Counter_PhysicalTypeList, AI_CV_Counter_End get_type 2 - if_in_bytes TypeList_1DB559, BattleAIScript_1DB558 - if_random 50, BattleAIScript_1DB558 + if_in_bytes AI_CV_Counter_PhysicalTypeList, AI_CV_Counter_End + if_random 50, AI_CV_Counter_End -BattleAIScript_1DB556: @ 81DB556 +AI_CV_Counter_ScoreDown1: @ 81DB556 score -1 -BattleAIScript_1DB558: @ 81DB558 +AI_CV_Counter_End: @ 81DB558 end -TypeList_1DB559: @ 81DB559 +AI_CV_Counter_PhysicalTypeList: @ 81DB559 .byte TYPE_NORMAL .byte TYPE_FIGHTING .byte TYPE_FLYING @@ -1732,25 +1733,25 @@ TypeList_1DB559: @ 81DB559 .byte TYPE_STEEL .byte -1 -BattleAIScript_1DB563: @ 81DB563 - if_last_move_did_damage TARGET, 0, BattleAIScript_1DB57C - if_would_go_first USER, BattleAIScript_1DB589 +AI_CV_Encore: @ 81DB563 + if_last_move_did_damage TARGET, 0, AI_CV_Encore2 + if_would_go_first USER, AI_CV_Encore_ScoreDown2 get_move TARGET get_move_effect - if_not_in_bytes MoveEffectList_1DB58C, BattleAIScript_1DB589 + if_not_in_bytes AI_CV_Encore_EncouragedMovesToEncore, AI_CV_Encore_ScoreDown2 -BattleAIScript_1DB57C: @ 81DB57C - if_random 30, BattleAIScript_1DB58B +AI_CV_Encore2: @ 81DB57C + if_random 30, AI_CV_Encore_End score +3 - jump BattleAIScript_1DB58B + jump AI_CV_Encore_End -BattleAIScript_1DB589: @ 81DB589 +AI_CV_Encore_ScoreDown2: @ 81DB589 score -2 -BattleAIScript_1DB58B: @ 81DB58B +AI_CV_Encore_End: @ 81DB58B end -MoveEffectList_1DB58C: @ 81DB58C +AI_CV_Encore_EncouragedMovesToEncore: @ 81DB58C .byte EFFECT_DREAM_EATER .byte EFFECT_ATTACK_UP .byte EFFECT_DEFENSE_UP @@ -1815,107 +1816,107 @@ MoveEffectList_1DB58C: @ 81DB58C .byte EFFECT_CAMOUFLAGE .byte -1 -BattleAIScript_1DB5CB: @ 81DB5CB - if_hp_less_than TARGET, 80, BattleAIScript_1DB5F4 - if_would_go_first USER, BattleAIScript_1DB5E6 - if_hp_more_than USER, 40, BattleAIScript_1DB5F4 +AI_CV_PainSplit: @ 81DB5CB + if_hp_less_than TARGET, 80, AI_CV_PainSplit_ScoreDown1 + if_would_go_first USER, AI_CV_PainSplit2 + if_hp_more_than USER, 40, AI_CV_PainSplit_ScoreDown1 score +1 - jump BattleAIScript_1DB5F6 + jump AI_CV_PainSplit_End -BattleAIScript_1DB5E6: @ 81DB5E6 - if_hp_more_than USER, 60, BattleAIScript_1DB5F4 +AI_CV_PainSplit2: @ 81DB5E6 + if_hp_more_than USER, 60, AI_CV_PainSplit_ScoreDown1 score +1 - jump BattleAIScript_1DB5F6 + jump AI_CV_PainSplit_End -BattleAIScript_1DB5F4: @ 81DB5F4 +AI_CV_PainSplit_ScoreDown1: @ 81DB5F4 score -1 -BattleAIScript_1DB5F6: @ 81DB5F6 +AI_CV_PainSplit_End: @ 81DB5F6 end -BattleAIScript_1DB5F7: @ 81DB5F7 +AI_CV_Snore: @ 81DB5F7 score +2 end -BattleAIScript_1DB5FA: @ 81DB5FA - if_random 128, BattleAIScript_1DB602 +AI_CV_LockOn: @ 81DB5FA + if_random 128, AI_CV_LockOn_End score +2 -BattleAIScript_1DB602: @ 81DB602 +AI_CV_LockOn_End: @ 81DB602 end -BattleAIScript_1DB603: @ 81DB603 +AI_CV_SleepTalk: @ 81DB603 score +2 end -BattleAIScript_1DB606: @ 81DB606 +AI_CV_DestinyBond: @ 81DB606 score -1 - if_would_go_first USER, BattleAIScript_1DB63B - if_hp_more_than USER, 70, BattleAIScript_1DB63B - if_random 128, BattleAIScript_1DB61D + if_would_go_first USER, AI_CV_DestinyBond_End + if_hp_more_than USER, 70, AI_CV_DestinyBond_End + if_random 128, AI_CV_DestinyBond2 score +1 -BattleAIScript_1DB61D: @ 81DB61D - if_hp_more_than USER, 50, BattleAIScript_1DB63B - if_random 128, BattleAIScript_1DB62C +AI_CV_DestinyBond2: @ 81DB61D + if_hp_more_than USER, 50, AI_CV_DestinyBond_End + if_random 128, AI_CV_DestinyBond3 score +1 -BattleAIScript_1DB62C: @ 81DB62C - if_hp_more_than USER, 30, BattleAIScript_1DB63B - if_random 100, BattleAIScript_1DB63B +AI_CV_DestinyBond3: @ 81DB62C + if_hp_more_than USER, 30, AI_CV_DestinyBond_End + if_random 100, AI_CV_DestinyBond_End score +2 -BattleAIScript_1DB63B: @ 81DB63B +AI_CV_DestinyBond_End: @ 81DB63B end -BattleAIScript_1DB63C: @ 81DB63C - if_would_go_first USER, BattleAIScript_1DB65C - if_hp_more_than USER, 33, BattleAIScript_1DB67E - if_hp_more_than USER, 20, BattleAIScript_1DB680 - if_hp_less_than USER, 8, BattleAIScript_1DB66F - jump BattleAIScript_1DB671 +AI_CV_Flail: @ 81DB63C + if_would_go_first USER, AI_CV_Flail2 + if_hp_more_than USER, 33, AI_CV_Flail_ScoreDown1 + if_hp_more_than USER, 20, AI_CV_Flail_End + if_hp_less_than USER, 8, AI_CV_Flail_ScoreUp1 + jump AI_CV_Flail3 -BattleAIScript_1DB65C: @ 81DB65C - if_hp_more_than USER, 60, BattleAIScript_1DB67E - if_hp_more_than USER, 40, BattleAIScript_1DB680 - jump BattleAIScript_1DB671 +AI_CV_Flail2: @ 81DB65C + if_hp_more_than USER, 60, AI_CV_Flail_ScoreDown1 + if_hp_more_than USER, 40, AI_CV_Flail_End + jump AI_CV_Flail3 -BattleAIScript_1DB66F: @ 81DB66F +AI_CV_Flail_ScoreUp1: @ 81DB66F score +1 -BattleAIScript_1DB671: @ 81DB671 - if_random 100, BattleAIScript_1DB680 +AI_CV_Flail3: @ 81DB671 + if_random 100, AI_CV_Flail_End score +1 - jump BattleAIScript_1DB680 + jump AI_CV_Flail_End -BattleAIScript_1DB67E: @ 81DB67E +AI_CV_Flail_ScoreDown1: @ 81DB67E score -1 -BattleAIScript_1DB680: @ 81DB680 +AI_CV_Flail_End: @ 81DB680 end -BattleAIScript_1DB681: @ 81DB681 - if_status TARGET, SLP | PSN | BRN | FRZ | PAR | TOX, BattleAIScript_1DB697 - if_status_in_party TARGET, SLP | PSN | BRN | FRZ | PAR | TOX, BattleAIScript_1DB697 +AI_CV_HealBell: @ 81DB681 + if_status TARGET, SLP | PSN | BRN | FRZ | PAR | TOX, AI_CV_HealBell_End + if_status_in_party TARGET, SLP | PSN | BRN | FRZ | PAR | TOX, AI_CV_HealBell_End score -5 -BattleAIScript_1DB697: @ 81DB697 +AI_CV_HealBell_End: @ 81DB697 end -BattleAIScript_1DB698: @ 81DB698 +AI_CV_Thief: @ 81DB698 get_hold_effect TARGET - if_not_in_bytes HoldEffectList_1DB6B3, BattleAIScript_1DB6B0 - if_random 50, BattleAIScript_1DB6B2 + if_not_in_bytes AI_CV_Thief_EncourageItemsToSteal, AI_CV_Thief_ScoreDown2 + if_random 50, AI_CV_Thief_End score +1 - jump BattleAIScript_1DB6B2 + jump AI_CV_Thief_End -BattleAIScript_1DB6B0: @ 81DB6B0 +AI_CV_Thief_ScoreDown2: @ 81DB6B0 score -2 -BattleAIScript_1DB6B2: @ 81DB6B2 +AI_CV_Thief_End: @ 81DB6B2 end -HoldEffectList_1DB6B3: @ 81DB6B3 +AI_CV_Thief_EncourageItemsToSteal: @ 81DB6B3 .byte HOLD_EFFECT_CURE_SLP .byte HOLD_EFFECT_CURE_STATUS .byte HOLD_EFFECT_RESTORE_HP @@ -1925,305 +1926,305 @@ HoldEffectList_1DB6B3: @ 81DB6B3 .byte HOLD_EFFECT_THICK_CLUB .byte -1 -BattleAIScript_1DB6BB: @ 81DB6BB +AI_CV_Curse: @ 81DB6BB get_type 1 - if_equal TYPE_GHOST, BattleAIScript_1DB700 + if_equal TYPE_GHOST, AI_CV_Curse4 get_type 3 - if_equal TYPE_GHOST, BattleAIScript_1DB700 - if_stat_level_more_than USER, DEFENSE, 9, BattleAIScript_1DB709 - if_random 128, BattleAIScript_1DB6DB + if_equal TYPE_GHOST, AI_CV_Curse4 + if_stat_level_more_than USER, DEFENSE, 9, AI_CV_Curse_End + if_random 128, AI_CV_Curse2 score +1 -BattleAIScript_1DB6DB: @ 81DB6DB - if_stat_level_more_than USER, DEFENSE, 7, BattleAIScript_1DB709 - if_random 128, BattleAIScript_1DB6EB +AI_CV_Curse2: @ 81DB6DB + if_stat_level_more_than USER, DEFENSE, 7, AI_CV_Curse_End + if_random 128, AI_CV_Curse3 score +1 -BattleAIScript_1DB6EB: @ 81DB6EB - if_stat_level_more_than USER, DEFENSE, 6, BattleAIScript_1DB709 - if_random 128, BattleAIScript_1DB709 +AI_CV_Curse3: @ 81DB6EB + if_stat_level_more_than USER, DEFENSE, 6, AI_CV_Curse_End + if_random 128, AI_CV_Curse_End score +1 - jump BattleAIScript_1DB709 + jump AI_CV_Curse_End -BattleAIScript_1DB700: @ 81DB700 - if_hp_more_than USER, 80, BattleAIScript_1DB709 +AI_CV_Curse4: @ 81DB700 + if_hp_more_than USER, 80, AI_CV_Curse_End score -1 -BattleAIScript_1DB709: @ 81DB709 +AI_CV_Curse_End: @ 81DB709 end -BattleAIScript_1DB70A: @ 81DB70A +AI_CV_Protect: @ 81DB70A get_protect_count USER - if_more_than 1, BattleAIScript_1DB7C8 - if_status USER, TOX, BattleAIScript_1DB7BF - if_status2 USER, S_CURSED, BattleAIScript_1DB7BF - if_status3 USER, S_PERISH_SONG, BattleAIScript_1DB7BF - if_status2 USER, S_INFATUATED, BattleAIScript_1DB7BF - if_status3 USER, S_LEECH_SEED, BattleAIScript_1DB7BF - if_status3 USER, S_YAWN, BattleAIScript_1DB7BF - if_move_effect TARGET, EFFECT_RESTORE_HP, BattleAIScript_1DB7BF - if_move_effect TARGET, EFFECT_DEFENSE_CURL, BattleAIScript_1DB7BF - if_status TARGET, TOX, BattleAIScript_1DB7A6 - if_status2 TARGET, S_CURSED, BattleAIScript_1DB7A6 - if_status3 TARGET, S_PERISH_SONG, BattleAIScript_1DB7A6 - if_status2 TARGET, S_INFATUATED, BattleAIScript_1DB7A6 - if_status3 TARGET, S_LEECH_SEED, BattleAIScript_1DB7A6 - if_status3 TARGET, S_YAWN, BattleAIScript_1DB7A6 + if_more_than 1, AI_CV_Protect_ScoreDown2 + if_status USER, TOX, AI_CV_Protect3 + if_status2 USER, S_CURSED, AI_CV_Protect3 + if_status3 USER, S_PERISH_SONG, AI_CV_Protect3 + if_status2 USER, S_INFATUATED, AI_CV_Protect3 + if_status3 USER, S_LEECH_SEED, AI_CV_Protect3 + if_status3 USER, S_YAWN, AI_CV_Protect3 + if_move_effect TARGET, EFFECT_RESTORE_HP, AI_CV_Protect3 + if_move_effect TARGET, EFFECT_DEFENSE_CURL, AI_CV_Protect3 + if_status TARGET, TOX, AI_CV_Protect_ScoreUp2 + if_status2 TARGET, S_CURSED, AI_CV_Protect_ScoreUp2 + if_status3 TARGET, S_PERISH_SONG, AI_CV_Protect_ScoreUp2 + if_status2 TARGET, S_INFATUATED, AI_CV_Protect_ScoreUp2 + if_status3 TARGET, S_LEECH_SEED, AI_CV_Protect_ScoreUp2 + if_status3 TARGET, S_YAWN, AI_CV_Protect_ScoreUp2 get_move TARGET get_move_effect - if_not_equal EFFECT_LOCK_ON, BattleAIScript_1DB7A6 - jump BattleAIScript_1DB7A8 + if_not_equal EFFECT_LOCK_ON, AI_CV_Protect_ScoreUp2 + jump AI_CV_Protect2 -BattleAIScript_1DB7A6: @ 81DB7A6 +AI_CV_Protect_ScoreUp2: @ 81DB7A6 score +2 -BattleAIScript_1DB7A8: @ 81DB7A8 +AI_CV_Protect2: @ 81DB7A8 get_protect_count USER - if_equal 0, BattleAIScript_1DB7CA + if_equal 0, AI_CV_Protect_End score -1 - if_random 128, BattleAIScript_1DB7CA + if_random 128, AI_CV_Protect_End score -1 - jump BattleAIScript_1DB7CA + jump AI_CV_Protect_End -BattleAIScript_1DB7BF: @ 81DB7BF +AI_CV_Protect3: @ 81DB7BF get_move TARGET get_move_effect - if_not_equal EFFECT_LOCK_ON, BattleAIScript_1DB7CA + if_not_equal EFFECT_LOCK_ON, AI_CV_Protect_End -BattleAIScript_1DB7C8: @ 81DB7C8 +AI_CV_Protect_ScoreDown2: @ 81DB7C8 score -2 -BattleAIScript_1DB7CA: @ 81DB7CA +AI_CV_Protect_End: @ 81DB7CA end -BattleAIScript_1DB7CB: @ 81DB7CB +AI_CV_Foresight: @ 81DB7CB get_type 1 - if_equal TYPE_GHOST, BattleAIScript_1DB7EA + if_equal TYPE_GHOST, AI_CV_Foresight2 get_type 3 - if_equal TYPE_GHOST, BattleAIScript_1DB7EA - if_stat_level_more_than USER, EVASION, 8, BattleAIScript_1DB7F0 + if_equal TYPE_GHOST, AI_CV_Foresight2 + if_stat_level_more_than USER, EVASION, 8, AI_CV_Foresight3 score -2 - jump BattleAIScript_1DB7F8 + jump AI_CV_Foresight_End -BattleAIScript_1DB7EA: @ 81DB7EA - if_random 80, BattleAIScript_1DB7F8 +AI_CV_Foresight2: @ 81DB7EA + if_random 80, AI_CV_Foresight_End -BattleAIScript_1DB7F0: @ 81DB7F0 - if_random 80, BattleAIScript_1DB7F8 +AI_CV_Foresight3: @ 81DB7F0 + if_random 80, AI_CV_Foresight_End score +2 -BattleAIScript_1DB7F8: @ 81DB7F8 +AI_CV_Foresight_End: @ 81DB7F8 end -BattleAIScript_1DB7F9: @ 81DB7F9 - if_hp_less_than USER, 4, BattleAIScript_1DB807 - if_hp_less_than USER, 35, BattleAIScript_1DB80E +AI_CV_Endure: @ 81DB7F9 + if_hp_less_than USER, 4, AI_CV_Endure2 + if_hp_less_than USER, 35, AI_CV_Endure3 -BattleAIScript_1DB807: @ 81DB807 +AI_CV_Endure2: @ 81DB807 score -1 - jump BattleAIScript_1DB816 + jump AI_CV_Endure_End -BattleAIScript_1DB80E: @ 81DB80E - if_random 70, BattleAIScript_1DB816 +AI_CV_Endure3: @ 81DB80E + if_random 70, AI_CV_Endure_End score +1 -BattleAIScript_1DB816: @ 81DB816 +AI_CV_Endure_End: @ 81DB816 end -BattleAIScript_1DB817: @ 81DB817 - if_stat_level_more_than USER, ATTACK, 8, BattleAIScript_1DB844 - if_stat_level_more_than USER, DEFENSE, 8, BattleAIScript_1DB844 - if_stat_level_more_than USER, SP_ATTACK, 8, BattleAIScript_1DB844 - if_stat_level_more_than USER, SP_DEFENSE, 8, BattleAIScript_1DB844 - if_stat_level_more_than USER, EVASION, 8, BattleAIScript_1DB844 - jump BattleAIScript_1DB86A +AI_CV_BatonPass: @ 81DB817 + if_stat_level_more_than USER, ATTACK, 8, AI_CV_BatonPass2 + if_stat_level_more_than USER, DEFENSE, 8, AI_CV_BatonPass2 + if_stat_level_more_than USER, SP_ATTACK, 8, AI_CV_BatonPass2 + if_stat_level_more_than USER, SP_DEFENSE, 8, AI_CV_BatonPass2 + if_stat_level_more_than USER, EVASION, 8, AI_CV_BatonPass2 + jump AI_CV_BatonPass5 -BattleAIScript_1DB844: @ 81DB844 - if_would_go_first USER, BattleAIScript_1DB856 - if_hp_more_than USER, 60, BattleAIScript_1DB8B2 - jump BattleAIScript_1DB85D +AI_CV_BatonPass2: @ 81DB844 + if_would_go_first USER, AI_CV_BatonPass3 + if_hp_more_than USER, 60, AI_CV_BatonPass_End + jump AI_CV_BatonPass4 -BattleAIScript_1DB856: @ 81DB856 - if_hp_more_than USER, 70, BattleAIScript_1DB8B2 +AI_CV_BatonPass3: @ 81DB856 + if_hp_more_than USER, 70, AI_CV_BatonPass_End -BattleAIScript_1DB85D: @ 81DB85D - if_random 80, BattleAIScript_1DB8B2 +AI_CV_BatonPass4: @ 81DB85D + if_random 80, AI_CV_BatonPass_End score +2 - jump BattleAIScript_1DB8B2 + jump AI_CV_BatonPass_End -BattleAIScript_1DB86A: @ 81DB86A - if_stat_level_more_than USER, ATTACK, 7, BattleAIScript_1DB897 - if_stat_level_more_than USER, DEFENSE, 7, BattleAIScript_1DB897 - if_stat_level_more_than USER, SP_ATTACK, 7, BattleAIScript_1DB897 - if_stat_level_more_than USER, SP_DEFENSE, 7, BattleAIScript_1DB897 - if_stat_level_more_than USER, EVASION, 7, BattleAIScript_1DB897 - jump BattleAIScript_1DB8B0 +AI_CV_BatonPass5: @ 81DB86A + if_stat_level_more_than USER, ATTACK, 7, AI_CV_BatonPass6 + if_stat_level_more_than USER, DEFENSE, 7, AI_CV_BatonPass6 + if_stat_level_more_than USER, SP_ATTACK, 7, AI_CV_BatonPass6 + if_stat_level_more_than USER, SP_DEFENSE, 7, AI_CV_BatonPass6 + if_stat_level_more_than USER, EVASION, 7, AI_CV_BatonPass6 + jump AI_CV_BatonPass_ScoreDown2 -BattleAIScript_1DB897: @ 81DB897 - if_would_go_first USER, BattleAIScript_1DB8A9 - if_hp_more_than USER, 60, BattleAIScript_1DB8B0 - jump BattleAIScript_1DB8B2 +AI_CV_BatonPass6: @ 81DB897 + if_would_go_first USER, AI_CV_BatonPass7 + if_hp_more_than USER, 60, AI_CV_BatonPass_ScoreDown2 + jump AI_CV_BatonPass_End -BattleAIScript_1DB8A9: @ 81DB8A9 - if_hp_less_than USER, 70, BattleAIScript_1DB8B2 +AI_CV_BatonPass7: @ 81DB8A9 + if_hp_less_than USER, 70, AI_CV_BatonPass_End -BattleAIScript_1DB8B0: @ 81DB8B0 +AI_CV_BatonPass_ScoreDown2: @ 81DB8B0 score -2 -BattleAIScript_1DB8B2: @ 81DB8B2 +AI_CV_BatonPass_End: @ 81DB8B2 end -BattleAIScript_1DB8B3: @ 81DB8B3 +AI_CV_Pursuit: @ 81DB8B3 is_first_turn USER - if_not_equal 0, BattleAIScript_1DB8E8 + if_not_equal 0, AI_CV_Pursuit_End get_type 0 - if_equal TYPE_GHOST, BattleAIScript_1DB8E0 + if_equal TYPE_GHOST, AI_CV_Pursuit2 get_type 0 - if_equal TYPE_PSYCHIC, BattleAIScript_1DB8E0 + if_equal TYPE_PSYCHIC, AI_CV_Pursuit2 get_type 2 - if_equal TYPE_GHOST, BattleAIScript_1DB8E0 + if_equal TYPE_GHOST, AI_CV_Pursuit2 get_type 2 - if_equal TYPE_PSYCHIC, BattleAIScript_1DB8E0 - jump BattleAIScript_1DB8E8 + if_equal TYPE_PSYCHIC, AI_CV_Pursuit2 + jump AI_CV_Pursuit_End -BattleAIScript_1DB8E0: @ 81DB8E0 - if_random 128, BattleAIScript_1DB8E8 +AI_CV_Pursuit2: @ 81DB8E0 + if_random 128, AI_CV_Pursuit_End score +1 -BattleAIScript_1DB8E8: @ 81DB8E8 +AI_CV_Pursuit_End: @ 81DB8E8 end -BattleAIScript_1DB8E9: @ 81DB8E9 - if_would_go_first TARGET, BattleAIScript_1DB8F7 +AI_CV_RainDance: @ 81DB8E9 + if_would_go_first TARGET, AI_CV_RainDance2 get_ability USER - if_equal ABILITY_SWIFT_SWIM, BattleAIScript_1DB91E + if_equal ABILITY_SWIFT_SWIM, AI_CV_RainDance3 -BattleAIScript_1DB8F7: @ 81DB8F7 - if_hp_less_than USER, 40, BattleAIScript_1DB925 +AI_CV_RainDance2: @ 81DB8F7 + if_hp_less_than USER, 40, AI_CV_RainDance_ScoreDown1 get_weather - if_equal WEATHER_HAIL, BattleAIScript_1DB91E - if_equal WEATHER_SUN, BattleAIScript_1DB91E - if_equal WEATHER_SANDSTORM, BattleAIScript_1DB91E + if_equal WEATHER_HAIL, AI_CV_RainDance3 + if_equal WEATHER_SUN, AI_CV_RainDance3 + if_equal WEATHER_SANDSTORM, AI_CV_RainDance3 get_ability USER - if_equal ABILITY_RAIN_DISH, BattleAIScript_1DB91E - jump BattleAIScript_1DB927 + if_equal ABILITY_RAIN_DISH, AI_CV_RainDance3 + jump AI_CV_RainDance_End -BattleAIScript_1DB91E: @ 81DB91E +AI_CV_RainDance3: @ 81DB91E score +1 - jump BattleAIScript_1DB927 + jump AI_CV_RainDance_End -BattleAIScript_1DB925: @ 81DB925 +AI_CV_RainDance_ScoreDown1: @ 81DB925 score -1 -BattleAIScript_1DB927: @ 81DB927 +AI_CV_RainDance_End: @ 81DB927 end -BattleAIScript_1DB928: @ 81DB928 - if_hp_less_than USER, 40, BattleAIScript_1DB94E +AI_CV_SunnyDay: @ 81DB928 + if_hp_less_than USER, 40, AI_CV_SunnyDay_ScoreDown1 get_weather - if_equal WEATHER_HAIL, BattleAIScript_1DB947 - if_equal WEATHER_RAIN, BattleAIScript_1DB947 - if_equal WEATHER_SANDSTORM, BattleAIScript_1DB947 - jump BattleAIScript_1DB950 + if_equal WEATHER_HAIL, AI_CV_SunnyDay2 + if_equal WEATHER_RAIN, AI_CV_SunnyDay2 + if_equal WEATHER_SANDSTORM, AI_CV_SunnyDay2 + jump AI_CV_SunnyDay_End -BattleAIScript_1DB947: @ 81DB947 +AI_CV_SunnyDay2: @ 81DB947 score +1 - jump BattleAIScript_1DB950 + jump AI_CV_SunnyDay_End -BattleAIScript_1DB94E: @ 81DB94E +AI_CV_SunnyDay_ScoreDown1: @ 81DB94E score -1 -BattleAIScript_1DB950: @ 81DB950 +AI_CV_SunnyDay_End: @ 81DB950 end -BattleAIScript_1DB951: @ 81DB951 - if_hp_less_than USER, 90, BattleAIScript_1DB95D - jump BattleAIScript_1DB95F +AI_CV_BellyDrum: @ 81DB951 + if_hp_less_than USER, 90, AI_CV_BellyDrum_ScoreDown2 + jump AI_CV_BellyDrum_End -BattleAIScript_1DB95D: @ 81DB95D +AI_CV_BellyDrum_ScoreDown2: @ 81DB95D score -2 -BattleAIScript_1DB95F: @ 81DB95F +AI_CV_BellyDrum_End: @ 81DB95F end -BattleAIScript_1DB960: @ 81DB960 - if_stat_level_more_than TARGET, ATTACK, 8, BattleAIScript_1DB98D - if_stat_level_more_than TARGET, DEFENSE, 8, BattleAIScript_1DB98D - if_stat_level_more_than TARGET, SP_ATTACK, 8, BattleAIScript_1DB98D - if_stat_level_more_than TARGET, SP_DEFENSE, 8, BattleAIScript_1DB98D - if_stat_level_more_than TARGET, EVASION, 8, BattleAIScript_1DB98D - jump BattleAIScript_1DB9CA +AI_CV_PsychUp: @ 81DB960 + if_stat_level_more_than TARGET, ATTACK, 8, AI_CV_PsychUp2 + if_stat_level_more_than TARGET, DEFENSE, 8, AI_CV_PsychUp2 + if_stat_level_more_than TARGET, SP_ATTACK, 8, AI_CV_PsychUp2 + if_stat_level_more_than TARGET, SP_DEFENSE, 8, AI_CV_PsychUp2 + if_stat_level_more_than TARGET, EVASION, 8, AI_CV_PsychUp2 + jump AI_CV_PsychUp_ScoreDown2 -BattleAIScript_1DB98D: @ 81DB98D - if_stat_level_less_than USER, ATTACK, 7, BattleAIScript_1DB9C2 - if_stat_level_less_than USER, DEFENSE, 7, BattleAIScript_1DB9C2 - if_stat_level_less_than USER, SP_ATTACK, 7, BattleAIScript_1DB9C2 - if_stat_level_less_than USER, SP_DEFENSE, 7, BattleAIScript_1DB9C2 - if_stat_level_less_than USER, EVASION, 7, BattleAIScript_1DB9C0 - if_random 50, BattleAIScript_1DB9CC - jump BattleAIScript_1DB9CA +AI_CV_PsychUp2: @ 81DB98D + if_stat_level_less_than USER, ATTACK, 7, AI_CV_PsychUp3 + if_stat_level_less_than USER, DEFENSE, 7, AI_CV_PsychUp3 + if_stat_level_less_than USER, SP_ATTACK, 7, AI_CV_PsychUp3 + if_stat_level_less_than USER, SP_DEFENSE, 7, AI_CV_PsychUp3 + if_stat_level_less_than USER, EVASION, 7, AI_CV_PsychUp_ScoreUp1 + if_random 50, AI_CV_PsychUp_End + jump AI_CV_PsychUp_ScoreDown2 -BattleAIScript_1DB9C0: @ 81DB9C0 +AI_CV_PsychUp_ScoreUp1: @ 81DB9C0 score +1 -BattleAIScript_1DB9C2: @ 81DB9C2 - if_random 128, BattleAIScript_1DB9CC +AI_CV_PsychUp3: @ 81DB9C2 + if_random 128, AI_CV_PsychUp_End score +1 -BattleAIScript_1DB9CA: @ 81DB9CA +AI_CV_PsychUp_ScoreDown2: @ 81DB9CA score -2 -BattleAIScript_1DB9CC: @ 81DB9CC +AI_CV_PsychUp_End: @ 81DB9CC end -BattleAIScript_1DB9CD: @ 81DB9CD - if_status TARGET, SLP, BattleAIScript_1DBA61 - if_status2 TARGET, S_INFATUATED, BattleAIScript_1DBA61 - if_status2 TARGET, S_CONFUSED, BattleAIScript_1DBA61 - if_hp_more_than USER, 30, BattleAIScript_1DB9FA - if_random 10, BattleAIScript_1DB9FA +AI_CV_MirrorCoat: @ 81DB9CD + if_status TARGET, SLP, AI_CV_MirrorCoat_ScoreDown1 + if_status2 TARGET, S_INFATUATED, AI_CV_MirrorCoat_ScoreDown1 + if_status2 TARGET, S_CONFUSED, AI_CV_MirrorCoat_ScoreDown1 + if_hp_more_than USER, 30, AI_CV_MirrorCoat2 + if_random 10, AI_CV_MirrorCoat2 score -1 -BattleAIScript_1DB9FA: @ 81DB9FA - if_hp_more_than USER, 50, BattleAIScript_1DBA09 - if_random 100, BattleAIScript_1DBA09 +AI_CV_MirrorCoat2: @ 81DB9FA + if_hp_more_than USER, 50, AI_CV_MirrorCoat3 + if_random 100, AI_CV_MirrorCoat3 score -1 -BattleAIScript_1DBA09: @ 81DBA09 +AI_CV_MirrorCoat3: @ 81DBA09 get_move TARGET get_move_power - if_equal 0, BattleAIScript_1DBA38 - if_not_taunted BattleAIScript_1DBA1F - if_random 100, BattleAIScript_1DBA1F + if_equal 0, AI_CV_MirrorCoat5 + if_not_taunted AI_CV_MirrorCoat4 + if_random 100, AI_CV_MirrorCoat4 score +1 -BattleAIScript_1DBA1F: @ 81DBA1F +AI_CV_MirrorCoat4: @ 81DBA1F get_move TARGET get_move_type - if_not_in_bytes TypeList_1DBA64, BattleAIScript_1DBA61 - if_random 100, BattleAIScript_1DBA63 + if_not_in_bytes AI_CV_MirrorCoat_SpecialTypeList, AI_CV_MirrorCoat_ScoreDown1 + if_random 100, AI_CV_MirrorCoat_End score +1 - jump BattleAIScript_1DBA63 + jump AI_CV_MirrorCoat_End -BattleAIScript_1DBA38: @ 81DBA38 - if_not_taunted BattleAIScript_1DBA45 - if_random 100, BattleAIScript_1DBA45 +AI_CV_MirrorCoat5: @ 81DBA38 + if_not_taunted AI_CV_MirrorCoat6 + if_random 100, AI_CV_MirrorCoat6 score +1 -BattleAIScript_1DBA45: @ 81DBA45 +AI_CV_MirrorCoat6: @ 81DBA45 get_type 0 - if_in_bytes TypeList_1DBA64, BattleAIScript_1DBA63 + if_in_bytes AI_CV_MirrorCoat_SpecialTypeList, AI_CV_MirrorCoat_End get_type 2 - if_in_bytes TypeList_1DBA64, BattleAIScript_1DBA63 - if_random 50, BattleAIScript_1DBA63 + if_in_bytes AI_CV_MirrorCoat_SpecialTypeList, AI_CV_MirrorCoat_End + if_random 50, AI_CV_MirrorCoat_End -BattleAIScript_1DBA61: @ 81DBA61 +AI_CV_MirrorCoat_ScoreDown1: @ 81DBA61 score -1 -BattleAIScript_1DBA63: @ 81DBA63 +AI_CV_MirrorCoat_End: @ 81DBA63 end -TypeList_1DBA64: @ 81DBA64 +AI_CV_MirrorCoat_SpecialTypeList: @ 81DBA64 .byte TYPE_FIRE .byte TYPE_WATER .byte TYPE_GRASS @@ -2234,165 +2235,165 @@ TypeList_1DBA64: @ 81DBA64 .byte TYPE_DARK .byte -1 -BattleAIScript_1DBA6D: @ 81DBA6D - if_damage_bonus 10, BattleAIScript_1DBA8E - if_damage_bonus 20, BattleAIScript_1DBA8E - if_move_effect TARGET, EFFECT_PROTECT, BattleAIScript_1DBA8E - if_hp_more_than USER, 38, BattleAIScript_1DBA90 +AI_CV_ChargeUpMove: @ 81DBA6D + if_damage_bonus 10, AI_CV_ChargeUpMove_ScoreDown2 + if_damage_bonus 20, AI_CV_ChargeUpMove_ScoreDown2 + if_move_effect TARGET, EFFECT_PROTECT, AI_CV_ChargeUpMove_ScoreDown2 + if_hp_more_than USER, 38, AI_CV_ChargeUpMove_End score -1 - jump BattleAIScript_1DBA90 + jump AI_CV_ChargeUpMove_End -BattleAIScript_1DBA8E: @ 81DBA8E +AI_CV_ChargeUpMove_ScoreDown2: @ 81DBA8E score -2 -BattleAIScript_1DBA90: @ 81DBA90 +AI_CV_ChargeUpMove_End: @ 81DBA90 end -BattleAIScript_1DBA91: @ 81DBA91 - if_not_move_effect TARGET, EFFECT_PROTECT, BattleAIScript_1DBA9F +AI_CV_Fly: @ 81DBA91 + if_not_move_effect TARGET, EFFECT_PROTECT, AI_CV_Fly2 score -1 - jump BattleAIScript_1DBB16 + jump AI_CV_Fly_End -BattleAIScript_1DBA9F: @ 81DBA9F - if_status TARGET, TOX, BattleAIScript_1DBB0E - if_status2 TARGET, S_CURSED, BattleAIScript_1DBB0E - if_status3 TARGET, S_LEECH_SEED, BattleAIScript_1DBB0E +AI_CV_Fly2: @ 81DBA9F + if_status TARGET, TOX, AI_CV_Fly6 + if_status2 TARGET, S_CURSED, AI_CV_Fly6 + if_status3 TARGET, S_LEECH_SEED, AI_CV_Fly6 get_weather - if_equal WEATHER_HAIL, BattleAIScript_1DBACF - if_equal WEATHER_SANDSTORM, BattleAIScript_1DBAEA - jump BattleAIScript_1DBAFA + if_equal WEATHER_HAIL, AI_CV_Fly3 + if_equal WEATHER_SANDSTORM, AI_CV_Fly4 + jump AI_CV_Fly5 -BattleAIScript_1DBACF: @ 81DBACF +AI_CV_Fly3: @ 81DBACF get_type 1 - if_in_bytes TypeList_1DBB17, BattleAIScript_1DBB0E + if_in_bytes AI_CV_Fly_TypesToEncourage, AI_CV_Fly6 get_type 3 - if_in_bytes TypeList_1DBB17, BattleAIScript_1DBB0E - jump BattleAIScript_1DBAFA + if_in_bytes AI_CV_Fly_TypesToEncourage, AI_CV_Fly6 + jump AI_CV_Fly5 -BattleAIScript_1DBAEA: @ 81DBAEA +AI_CV_Fly4: @ 81DBAEA get_type 1 - if_equal TYPE_ICE, BattleAIScript_1DBB0E + if_equal TYPE_ICE, AI_CV_Fly6 get_type 3 - if_equal TYPE_ICE, BattleAIScript_1DBB0E + if_equal TYPE_ICE, AI_CV_Fly6 -BattleAIScript_1DBAFA: @ 81DBAFA - if_would_go_first USER, BattleAIScript_1DBB16 +AI_CV_Fly5: @ 81DBAFA + if_would_go_first USER, AI_CV_Fly_End get_move TARGET get_move_effect - if_not_equal EFFECT_LOCK_ON, BattleAIScript_1DBB0E - jump BattleAIScript_1DBB16 + if_not_equal EFFECT_LOCK_ON, AI_CV_Fly6 + jump AI_CV_Fly_End -BattleAIScript_1DBB0E: @ 81DBB0E - if_random 80, BattleAIScript_1DBB16 +AI_CV_Fly6: @ 81DBB0E + if_random 80, AI_CV_Fly_End score +1 -BattleAIScript_1DBB16: @ 81DBB16 +AI_CV_Fly_End: @ 81DBB16 end -TypeList_1DBB17: @ 81DBB17 +AI_CV_Fly_TypesToEncourage: @ 81DBB17 .byte TYPE_GROUND .byte TYPE_ROCK .byte TYPE_STEEL .byte -1 -BattleAIScript_1DBB1B: @ 81DBB1B +AI_CV_FakeOut: @ 81DBB1B score +2 end -BattleAIScript_1DBB1E: @ 81DBB1E +AI_CV_SpitUp: @ 81DBB1E get_stockpile_count USER - if_less_than 2, BattleAIScript_1DBB2E - if_random 80, BattleAIScript_1DBB2E + if_less_than 2, AI_CV_SpitUp_End + if_random 80, AI_CV_SpitUp_End score +2 -BattleAIScript_1DBB2E: @ 81DBB2E +AI_CV_SpitUp_End: @ 81DBB2E end -BattleAIScript_1DBB2F: @ 81DBB2F - if_hp_less_than USER, 40, BattleAIScript_1DBB55 +AI_CV_Hail: @ 81DBB2F + if_hp_less_than USER, 40, AI_CV_Hail_ScoreDown1 get_weather - if_equal WEATHER_SUN, BattleAIScript_1DBB4E - if_equal WEATHER_RAIN, BattleAIScript_1DBB4E - if_equal WEATHER_SANDSTORM, BattleAIScript_1DBB4E - jump BattleAIScript_1DBB57 + if_equal WEATHER_SUN, AI_CV_Hail2 + if_equal WEATHER_RAIN, AI_CV_Hail2 + if_equal WEATHER_SANDSTORM, AI_CV_Hail2 + jump AI_CV_Hail_End -BattleAIScript_1DBB4E: @ 81DBB4E +AI_CV_Hail2: @ 81DBB4E score +1 - jump BattleAIScript_1DBB57 + jump AI_CV_Hail_End -BattleAIScript_1DBB55: @ 81DBB55 +AI_CV_Hail_ScoreDown1: @ 81DBB55 score -1 -BattleAIScript_1DBB57: @ 81DBB57 +AI_CV_Hail_End: @ 81DBB57 end -BattleAIScript_1DBB58: @ 81DBB58 - if_not_status TARGET, PSN | BRN | PAR | TOX, BattleAIScript_1DBB64 +AI_CV_Facade: @ 81DBB58 + if_not_status TARGET, PSN | BRN | PAR | TOX, AI_CV_Facade_End score +1 -BattleAIScript_1DBB64: @ 81DBB64 +AI_CV_Facade_End: @ 81DBB64 end -BattleAIScript_1DBB65: @ 81DBB65 - if_damage_bonus 10, BattleAIScript_1DBBA4 - if_damage_bonus 20, BattleAIScript_1DBBA4 - if_status TARGET, SLP, BattleAIScript_1DBBB1 - if_status2 TARGET, S_INFATUATED, BattleAIScript_1DBBAB - if_status2 TARGET, S_CONFUSED, BattleAIScript_1DBBAB +AI_CV_FocusPunch: @ 81DBB65 + if_damage_bonus 10, AI_CV_FocusPunch2 + if_damage_bonus 20, AI_CV_FocusPunch2 + if_status TARGET, SLP, AI_CV_FocusPunch_ScoreUp1 + if_status2 TARGET, S_INFATUATED, AI_CV_FocusPunch3 + if_status2 TARGET, S_CONFUSED, AI_CV_FocusPunch3 is_first_turn USER - if_not_equal 0, BattleAIScript_1DBBB3 - if_random 100, BattleAIScript_1DBBB3 + if_not_equal 0, AI_CV_FocusPunch_End + if_random 100, AI_CV_FocusPunch_End score +1 - jump BattleAIScript_1DBBB3 + jump AI_CV_FocusPunch_End -BattleAIScript_1DBBA4: @ 81DBBA4 +AI_CV_FocusPunch2: @ 81DBBA4 score -1 - jump BattleAIScript_1DBBB3 + jump AI_CV_FocusPunch_End -BattleAIScript_1DBBAB: @ 81DBBAB - if_random 100, BattleAIScript_1DBBB3 +AI_CV_FocusPunch3: @ 81DBBAB + if_random 100, AI_CV_FocusPunch_End -BattleAIScript_1DBBB1: @ 81DBBB1 +AI_CV_FocusPunch_ScoreUp1: @ 81DBBB1 score +1 -BattleAIScript_1DBBB3: @ 81DBBB3 +AI_CV_FocusPunch_End: @ 81DBBB3 end -BattleAIScript_1DBBB4: @ 81DBBB4 - if_status TARGET, PAR, BattleAIScript_1DBBC3 - jump BattleAIScript_1DBBC5 +AI_CV_SmellingSalt: @ 81DBBB4 + if_status TARGET, PAR, AI_CV_SmellingSalt_ScoreUp1 + jump AI_CV_SmellingSalt_End -BattleAIScript_1DBBC3: @ 81DBBC3 +AI_CV_SmellingSalt_ScoreUp1: @ 81DBBC3 score +1 -BattleAIScript_1DBBC5: @ 81DBBC5 +AI_CV_SmellingSalt_End: @ 81DBBC5 end -BattleAIScript_1DBBC6: @ 81DBBC6 +AI_CV_Trick: @ 81DBBC6 get_hold_effect USER - if_in_bytes HoldEffectList_1DBC0F, BattleAIScript_1DBBE1 - if_in_bytes HoldEffectList_1DBC07, BattleAIScript_1DBBF3 + if_in_bytes AI_CV_Trick_EffectsToEncourage2, AI_CV_Trick3 + if_in_bytes AI_CV_Trick_EffectsToEncourage, AI_CV_Trick4 -BattleAIScript_1DBBDA: @ 81DBBDA +AI_CV_Trick2: @ 81DBBDA score -3 - jump BattleAIScript_1DBC06 + jump AI_CV_Trick_End -BattleAIScript_1DBBE1: @ 81DBBE1 +AI_CV_Trick3: @ 81DBBE1 get_hold_effect TARGET - if_in_bytes HoldEffectList_1DBC0F, BattleAIScript_1DBBDA + if_in_bytes AI_CV_Trick_EffectsToEncourage2, AI_CV_Trick2 score +5 - jump BattleAIScript_1DBC06 + jump AI_CV_Trick_End -BattleAIScript_1DBBF3: @ 81DBBF3 +AI_CV_Trick4: @ 81DBBF3 get_hold_effect TARGET - if_in_bytes HoldEffectList_1DBC07, BattleAIScript_1DBBDA - if_random 50, BattleAIScript_1DBC06 + if_in_bytes AI_CV_Trick_EffectsToEncourage, AI_CV_Trick2 + if_random 50, AI_CV_Trick_End score +2 -BattleAIScript_1DBC06: @ 81DBC06 +AI_CV_Trick_End: @ 81DBC06 end -HoldEffectList_1DBC07: @ 81DBC07 +AI_CV_Trick_EffectsToEncourage: @ 81DBC07 .byte HOLD_EFFECT_CONFUSE_SPICY .byte HOLD_EFFECT_CONFUSE_DRY .byte HOLD_EFFECT_CONFUSE_SWEET @@ -2402,28 +2403,28 @@ HoldEffectList_1DBC07: @ 81DBC07 .byte HOLD_EFFECT_CHOICE_BAND .byte -1 -HoldEffectList_1DBC0F: @ 81DBC0F +AI_CV_Trick_EffectsToEncourage2: @ 81DBC0F .byte HOLD_EFFECT_CHOICE_BAND .byte -1 -BattleAIScript_1DBC11: @ 81DBC11 +AI_CV_ChangeSelfAbility: @ 81DBC11 get_ability USER - if_in_bytes AbilityList_1DBC37, BattleAIScript_1DBC27 + if_in_bytes AI_CV_ChangeSelfAbility_AbilitiesToEncourage, AI_CV_ChangeSelfAbility2 get_ability TARGET - if_in_bytes AbilityList_1DBC37, BattleAIScript_1DBC2E + if_in_bytes AI_CV_ChangeSelfAbility_AbilitiesToEncourage, AI_CV_ChangeSelfAbility3 -BattleAIScript_1DBC27: @ 81DBC27 +AI_CV_ChangeSelfAbility2: @ 81DBC27 score -1 - jump BattleAIScript_1DBC36 + jump AI_CV_ChangeSelfAbility_End -BattleAIScript_1DBC2E: @ 81DBC2E - if_random 50, BattleAIScript_1DBC36 +AI_CV_ChangeSelfAbility3: @ 81DBC2E + if_random 50, AI_CV_ChangeSelfAbility_End score +2 -BattleAIScript_1DBC36: @ 81DBC36 +AI_CV_ChangeSelfAbility_End: @ 81DBC36 end -AbilityList_1DBC37: @ 81DBC37 +AI_CV_ChangeSelfAbility_AbilitiesToEncourage: @ 81DBC37 .byte ABILITY_SPEED_BOOST .byte ABILITY_BATTLE_ARMOR .byte ABILITY_SAND_VEIL @@ -2442,279 +2443,279 @@ AbilityList_1DBC37: @ 81DBC37 .byte ABILITY_SHIELD_DUST .byte -1 -BattleAIScript_1DBC48: @ 81DBC48 - if_damage_bonus 10, BattleAIScript_1DBC75 - if_damage_bonus 20, BattleAIScript_1DBC75 - if_stat_level_less_than USER, ATTACK, 6, BattleAIScript_1DBC75 - if_would_go_first USER, BattleAIScript_1DBC6E - if_hp_more_than USER, 40, BattleAIScript_1DBC75 - jump BattleAIScript_1DBC77 +AI_CV_Superpower: @ 81DBC48 + if_damage_bonus 10, AI_CV_Superpower_ScoreDown1 + if_damage_bonus 20, AI_CV_Superpower_ScoreDown1 + if_stat_level_less_than USER, ATTACK, 6, AI_CV_Superpower_ScoreDown1 + if_would_go_first USER, AI_CV_Superpower2 + if_hp_more_than USER, 40, AI_CV_Superpower_ScoreDown1 + jump AI_CV_Superpower_End -BattleAIScript_1DBC6E: @ 81DBC6E - if_hp_less_than USER, 60, BattleAIScript_1DBC77 +AI_CV_Superpower2: @ 81DBC6E + if_hp_less_than USER, 60, AI_CV_Superpower_End -BattleAIScript_1DBC75: @ 81DBC75 +AI_CV_Superpower_ScoreDown1: @ 81DBC75 score -1 -BattleAIScript_1DBC77: @ 81DBC77 +AI_CV_Superpower_End: @ 81DBC77 end -BattleAIScript_1DBC78: @ 81DBC78 - if_hp_more_than TARGET, 30, BattleAIScript_1DBC87 - if_random 100, BattleAIScript_1DBC87 +AI_CV_MagicCoat: @ 81DBC78 + if_hp_more_than TARGET, 30, AI_CV_MagicCoat2 + if_random 100, AI_CV_MagicCoat2 score -1 -BattleAIScript_1DBC87: @ 81DBC87 +AI_CV_MagicCoat2: @ 81DBC87 is_first_turn USER - if_equal 0, BattleAIScript_1DBCA2 - if_random 150, BattleAIScript_1DBCAA + if_equal 0, AI_CV_MagicCoat4 + if_random 150, AI_CV_MagicCoat_End score +1 - jump BattleAIScript_1DBCAA + jump AI_CV_MagicCoat_End -@ unreferenced - if_random 50, BattleAIScript_1DBCAA +AI_CV_MagicCoat3: @ unreferenced + if_random 50, AI_CV_MagicCoat_End -BattleAIScript_1DBCA2: @ 81DBCA2 - if_random 30, BattleAIScript_1DBCAA +AI_CV_MagicCoat4: @ 81DBCA2 + if_random 30, AI_CV_MagicCoat_End score -1 -BattleAIScript_1DBCAA: @ 81DBCAA +AI_CV_MagicCoat_End: @ 81DBCAA end -BattleAIScript_1DBCAB: @ 81DBCAB +AI_CV_Recycle: @ 81DBCAB get_item USER - if_not_in_bytes ItemList_1DBCC6, BattleAIScript_1DBCC3 - if_random 50, BattleAIScript_1DBCC5 + if_not_in_bytes AI_CV_Recycle_ItemsToEncourage, AI_CV_Recycle_ScoreDown2 + if_random 50, AI_CV_Recycle_End score +1 - jump BattleAIScript_1DBCC5 + jump AI_CV_Recycle_End -BattleAIScript_1DBCC3: @ 81DBCC3 +AI_CV_Recycle_ScoreDown2: @ 81DBCC3 score -2 -BattleAIScript_1DBCC5: @ 81DBCC5 +AI_CV_Recycle_End: @ 81DBCC5 end -ItemList_1DBCC6: @ 81DBCC6 +AI_CV_Recycle_ItemsToEncourage: @ 81DBCC6 .byte ITEM_CHESTO_BERRY .byte ITEM_LUM_BERRY .byte ITEM_STARF_BERRY .byte -1 -BattleAIScript_1DBCCA: @ 81DBCCA - if_status TARGET, SLP, BattleAIScript_1DBCF5 - if_status2 TARGET, S_INFATUATED, BattleAIScript_1DBCF5 - if_status2 TARGET, S_CONFUSED, BattleAIScript_1DBCF5 - if_random 180, BattleAIScript_1DBCF5 +AI_CV_Revenge: @ 81DBCCA + if_status TARGET, SLP, AI_CV_Revenge_ScoreDown2 + if_status2 TARGET, S_INFATUATED, AI_CV_Revenge_ScoreDown2 + if_status2 TARGET, S_CONFUSED, AI_CV_Revenge_ScoreDown2 + if_random 180, AI_CV_Revenge_ScoreDown2 score +2 - jump BattleAIScript_1DBCF7 + jump AI_CV_Revenge_End -BattleAIScript_1DBCF5: @ 81DBCF5 +AI_CV_Revenge_ScoreDown2: @ 81DBCF5 score -2 -BattleAIScript_1DBCF7: @ 81DBCF7 +AI_CV_Revenge_End: @ 81DBCF7 end -BattleAIScript_1DBCF8: @ 81DBCF8 - if_status4 TARGET, S_REFLECT, BattleAIScript_1DBD07 - jump BattleAIScript_1DBD09 +AI_CV_BrickBreak: @ 81DBCF8 + if_status4 TARGET, S_REFLECT, AI_CV_BrickBreak_ScoreUp1 + jump AI_CV_BrickBreak_End -BattleAIScript_1DBD07: @ 81DBD07 +AI_CV_BrickBreak_ScoreUp1: @ 81DBD07 score +1 -BattleAIScript_1DBD09: @ 81DBD09 +AI_CV_BrickBreak_End: @ 81DBD09 end -BattleAIScript_1DBD0A: @ 81DBD0A - if_hp_less_than TARGET, 30, BattleAIScript_1DBD21 +AI_CV_KnockOff: @ 81DBD0A + if_hp_less_than TARGET, 30, AI_CV_KnockOff_End is_first_turn USER - if_more_than 0, BattleAIScript_1DBD21 - if_random 180, BattleAIScript_1DBD21 + if_more_than 0, AI_CV_KnockOff_End + if_random 180, AI_CV_KnockOff_End score +1 -BattleAIScript_1DBD21: @ 81DBD21 +AI_CV_KnockOff_End: @ 81DBD21 end -BattleAIScript_1DBD22: @ 81DBD22 - if_hp_less_than TARGET, 70, BattleAIScript_1DBD4B - if_would_go_first USER, BattleAIScript_1DBD3D - if_hp_more_than USER, 40, BattleAIScript_1DBD4B +AI_CV_Endeavor: @ 81DBD22 + if_hp_less_than TARGET, 70, AI_CV_Endeavor_ScoreDown1 + if_would_go_first USER, AI_CV_Endeavor2 + if_hp_more_than USER, 40, AI_CV_Endeavor_ScoreDown1 score +1 - jump BattleAIScript_1DBD4D + jump AI_CV_Endeavor_End -BattleAIScript_1DBD3D: @ 81DBD3D - if_hp_more_than USER, 50, BattleAIScript_1DBD4B +AI_CV_Endeavor2: @ 81DBD3D + if_hp_more_than USER, 50, AI_CV_Endeavor_ScoreDown1 score +1 - jump BattleAIScript_1DBD4D + jump AI_CV_Endeavor_End -BattleAIScript_1DBD4B: @ 81DBD4B +AI_CV_Endeavor_ScoreDown1: @ 81DBD4B score -1 -BattleAIScript_1DBD4D: @ 81DBD4D +AI_CV_Endeavor_End: @ 81DBD4D end -BattleAIScript_1DBD4E: @ 81DBD4E - if_damage_bonus 10, BattleAIScript_1DBD73 - if_damage_bonus 20, BattleAIScript_1DBD73 - if_would_go_first USER, BattleAIScript_1DBD6C - if_hp_more_than TARGET, 50, BattleAIScript_1DBD75 - jump BattleAIScript_1DBD73 +AI_CV_Eruption: @ 81DBD4E + if_damage_bonus 10, AI_CV_Eruption_ScoreDown1 + if_damage_bonus 20, AI_CV_Eruption_ScoreDown1 + if_would_go_first USER, AI_CV_Eruption2 + if_hp_more_than TARGET, 50, AI_CV_Eruption_End + jump AI_CV_Eruption_ScoreDown1 -BattleAIScript_1DBD6C: @ 81DBD6C - if_hp_more_than TARGET, 70, BattleAIScript_1DBD75 +AI_CV_Eruption2: @ 81DBD6C + if_hp_more_than TARGET, 70, AI_CV_Eruption_End -BattleAIScript_1DBD73: @ 81DBD73 +AI_CV_Eruption_ScoreDown1: @ 81DBD73 score -1 -BattleAIScript_1DBD75: @ 81DBD75 +AI_CV_Eruption_End: @ 81DBD75 end -BattleAIScript_1DBD76: @ 81DBD76 +AI_CV_Imprison: @ 81DBD76 is_first_turn USER - if_more_than 0, BattleAIScript_1DBD86 - if_random 100, BattleAIScript_1DBD86 + if_more_than 0, AI_CV_Imprison_End + if_random 100, AI_CV_Imprison_End score +2 -BattleAIScript_1DBD86: @ 81DBD86 +AI_CV_Imprison_End: @ 81DBD86 end -BattleAIScript_1DBD87: @ 81DBD87 - if_hp_less_than TARGET, 50, BattleAIScript_1DBD93 - jump BattleAIScript_1DBD95 +AI_CV_Refresh: @ 81DBD87 + if_hp_less_than TARGET, 50, AI_CV_Refresh_ScoreDown1 + jump AI_CV_Refresh_End -BattleAIScript_1DBD93: @ 81DBD93 +AI_CV_Refresh_ScoreDown1: @ 81DBD93 score -1 -BattleAIScript_1DBD95: @ 81DBD95 +AI_CV_Refresh_End: @ 81DBD95 end -BattleAIScript_1DBD96: @ 81DBD96 +AI_CV_Snatch: @ 81DBD96 is_first_turn USER - if_equal 1, BattleAIScript_1DBDDD - if_random 30, BattleAIScript_1DBDFF - if_would_go_first USER, BattleAIScript_1DBDC3 - if_hp_not_equal USER, 100, BattleAIScript_1DBDF7 - if_hp_less_than TARGET, 70, BattleAIScript_1DBDF7 - if_random 60, BattleAIScript_1DBDFF - jump BattleAIScript_1DBDF7 - -BattleAIScript_1DBDC3: @ 81DBDC3 - if_hp_more_than TARGET, 25, BattleAIScript_1DBDF7 - if_move_effect TARGET, EFFECT_RESTORE_HP, BattleAIScript_1DBDDD - if_move_effect TARGET, EFFECT_DEFENSE_CURL, BattleAIScript_1DBDDD - jump BattleAIScript_1DBDEA - -BattleAIScript_1DBDDD: @ 81DBDDD - if_random 150, BattleAIScript_1DBDFF + if_equal 1, AI_CV_Snatch3 + if_random 30, AI_CV_Snatch_End + if_would_go_first USER, AI_CV_Snatch2 + if_hp_not_equal USER, 100, AI_CV_Snatch5 + if_hp_less_than TARGET, 70, AI_CV_Snatch5 + if_random 60, AI_CV_Snatch_End + jump AI_CV_Snatch5 + +AI_CV_Snatch2: @ 81DBDC3 + if_hp_more_than TARGET, 25, AI_CV_Snatch5 + if_move_effect TARGET, EFFECT_RESTORE_HP, AI_CV_Snatch3 + if_move_effect TARGET, EFFECT_DEFENSE_CURL, AI_CV_Snatch3 + jump AI_CV_Snatch4 + +AI_CV_Snatch3: @ 81DBDDD + if_random 150, AI_CV_Snatch_End score +2 - jump BattleAIScript_1DBDFF + jump AI_CV_Snatch_End -BattleAIScript_1DBDEA: @ 81DBDEA - if_random 230, BattleAIScript_1DBDF7 +AI_CV_Snatch4: @ 81DBDEA + if_random 230, AI_CV_Snatch5 score +1 - jump BattleAIScript_1DBDFF + jump AI_CV_Snatch_End -BattleAIScript_1DBDF7: @ 81DBDF7 - if_random 30, BattleAIScript_1DBDFF +AI_CV_Snatch5: @ 81DBDF7 + if_random 30, AI_CV_Snatch_End score -2 -BattleAIScript_1DBDFF: @ 81DBDFF +AI_CV_Snatch_End: @ 81DBDFF end -BattleAIScript_1DBE00: @ 81DBE00 - if_hp_less_than USER, 50, BattleAIScript_1DBE23 +AI_CV_MudSport: @ 81DBE00 + if_hp_less_than USER, 50, AI_CV_MudSport_ScoreDown1 get_type 0 - if_equal TYPE_ELECTRIC, BattleAIScript_1DBE1C + if_equal TYPE_ELECTRIC, AI_CV_MudSport2 get_type 2 - if_equal TYPE_ELECTRIC, BattleAIScript_1DBE1C - jump BattleAIScript_1DBE23 + if_equal TYPE_ELECTRIC, AI_CV_MudSport2 + jump AI_CV_MudSport_ScoreDown1 -BattleAIScript_1DBE1C: @ 81DBE1C +AI_CV_MudSport2: @ 81DBE1C score +1 - jump BattleAIScript_1DBE25 + jump AI_CV_MudSport_End -BattleAIScript_1DBE23: @ 81DBE23 +AI_CV_MudSport_ScoreDown1: @ 81DBE23 score -1 -BattleAIScript_1DBE25: @ 81DBE25 +AI_CV_MudSport_End: @ 81DBE25 end -BattleAIScript_1DBE26: @ 81DBE26 - if_damage_bonus 10, BattleAIScript_1DBE4B - if_damage_bonus 20, BattleAIScript_1DBE4B - if_would_go_first USER, BattleAIScript_1DBE44 - if_hp_more_than USER, 60, BattleAIScript_1DBE4D - jump BattleAIScript_1DBE4B +AI_CV_Overheat: @ 81DBE26 + if_damage_bonus 10, AI_CV_Overheat_ScoreDown1 + if_damage_bonus 20, AI_CV_Overheat_ScoreDown1 + if_would_go_first USER, AI_CV_Overheat2 + if_hp_more_than USER, 60, AI_CV_Overheat_End + jump AI_CV_Overheat_ScoreDown1 -BattleAIScript_1DBE44: @ 81DBE44 - if_hp_more_than USER, 80, BattleAIScript_1DBE4D +AI_CV_Overheat2: @ 81DBE44 + if_hp_more_than USER, 80, AI_CV_Overheat_End -BattleAIScript_1DBE4B: @ 81DBE4B +AI_CV_Overheat_ScoreDown1: @ 81DBE4B score -1 -BattleAIScript_1DBE4D: @ 81DBE4D +AI_CV_Overheat_End: @ 81DBE4D end -BattleAIScript_1DBE4E: @ 81DBE4E - if_hp_less_than USER, 50, BattleAIScript_1DBE71 +AI_CV_WaterSport: @ 81DBE4E + if_hp_less_than USER, 50, AI_CV_WaterSport_ScoreDown1 get_type 0 - if_equal TYPE_FIRE, BattleAIScript_1DBE6A + if_equal TYPE_FIRE, AI_CV_WaterSport2 get_type 2 - if_equal TYPE_FIRE, BattleAIScript_1DBE6A - jump BattleAIScript_1DBE71 + if_equal TYPE_FIRE, AI_CV_WaterSport2 + jump AI_CV_WaterSport_ScoreDown1 -BattleAIScript_1DBE6A: @ 81DBE6A +AI_CV_WaterSport2: @ 81DBE6A score +1 - jump BattleAIScript_1DBE73 + jump AI_CV_WaterSport_End -BattleAIScript_1DBE71: @ 81DBE71 +AI_CV_WaterSport_ScoreDown1: @ 81DBE71 score -1 -BattleAIScript_1DBE73: @ 81DBE73 +AI_CV_WaterSport_End: @ 81DBE73 end -BattleAIScript_1DBE74: @ 81DBE74 - if_would_go_first USER, BattleAIScript_1DBE8E - if_hp_more_than USER, 50, BattleAIScript_1DBE96 - if_random 70, BattleAIScript_1DBE96 +AI_CV_DragonDance: @ 81DBE74 + if_would_go_first USER, AI_CV_DragonDance2 + if_hp_more_than USER, 50, AI_CV_DragonDance_End + if_random 70, AI_CV_DragonDance_End score -1 - jump BattleAIScript_1DBE96 + jump AI_CV_DragonDance_End -BattleAIScript_1DBE8E: @ 81DBE8E - if_random 128, BattleAIScript_1DBE96 +AI_CV_DragonDance2: @ 81DBE8E + if_random 128, AI_CV_DragonDance_End score +1 -BattleAIScript_1DBE96: @ 81DBE96 +AI_CV_DragonDance_End: @ 81DBE96 end AI_TryToFaint: @ 81DBE97 - if_can_faint BattleAIScript_1DBEA4 + if_can_faint AI_TryToFaint_TryToEncourageQuickAttack is_most_powerful_move - if_equal 1, BattleAIScript_1DA84C + if_equal 1, Score_Down1 end -BattleAIScript_1DBEA4: @ 81DBEA4 - if_effect EFFECT_EXPLOSION, BattleAIScript_1DBEB4 - if_not_effect EFFECT_QUICK_ATTACK, BattleAIScript_1DBEB2 +AI_TryToFaint_TryToEncourageQuickAttack: @ 81DBEA4 + if_effect EFFECT_EXPLOSION, AI_TryToFaint_End + if_not_effect EFFECT_QUICK_ATTACK, AI_TryToFaint_ScoreUp4 score +2 -BattleAIScript_1DBEB2: @ 81DBEB2 +AI_TryToFaint_ScoreUp4: @ 81DBEB2 score +4 -BattleAIScript_1DBEB4: @ 81DBEB4 +AI_TryToFaint_End: @ 81DBEB4 end AI_SetupFirstTurn: @ 81DBEB5 get_turn_count - if_not_equal 0, BattleAIScript_1DBECE + if_not_equal 0, AI_SetupFirstTurn_End get_effect - if_not_in_bytes MoveEffectList_1DBECF, BattleAIScript_1DBECE - if_random 80, BattleAIScript_1DBECE + if_not_in_bytes AI_SetupFirstTurn_SetupEffectsToEncourage, AI_SetupFirstTurn_End + if_random 80, AI_SetupFirstTurn_End score +2 -BattleAIScript_1DBECE: @ 81DBECE +AI_SetupFirstTurn_End: @ 81DBECE end -MoveEffectList_1DBECF: @ 81DBECF +AI_SetupFirstTurn_SetupEffectsToEncourage: @ 81DBECF .byte EFFECT_ATTACK_UP .byte EFFECT_DEFENSE_UP .byte EFFECT_SPEED_UP @@ -2774,23 +2775,23 @@ MoveEffectList_1DBECF: @ 81DBECF AI_PreferStrongestMove: @ 81DBF07 is_most_powerful_move - if_not_equal 0, BattleAIScript_1DBF16 - if_random 100, BattleAIScript_1DBF16 + if_not_equal 0, AI_PreferStrongestMove_End + if_random 100, AI_PreferStrongestMove_End score +2 -BattleAIScript_1DBF16: @ 81DBF16 +AI_PreferStrongestMove_End: @ 81DBF16 end AI_Risky: @ 81DBF17 get_effect - if_not_in_bytes MoveEffectList_1DBF2A, BattleAIScript_1DBF29 - if_random 128, BattleAIScript_1DBF29 + if_not_in_bytes AI_Risky_EffectsToEncourage, AI_Risky_End + if_random 128, AI_Risky_End score +2 -BattleAIScript_1DBF29: @ 81DBF29 +AI_Risky_End: @ 81DBF29 end -MoveEffectList_1DBF2A: @ 81DBF2A +AI_Risky_EffectsToEncourage: @ 81DBF2A .byte EFFECT_SLEEP .byte EFFECT_EXPLOSION .byte EFFECT_MIRROR_MOVE @@ -2814,68 +2815,68 @@ MoveEffectList_1DBF2A: @ 81DBF2A AI_PreferBatonPass: @ 81DBF3E count_alive_pokemon USER - if_equal 0, BattleAIScript_1DBF62 + if_equal 0, AI_PreferBatonPass_End is_most_powerful_move - if_not_equal 0, BattleAIScript_1DBF62 - if_move_effect USER, EFFECT_BATON_PASS, BattleAIScript_1DBF5A - if_random 80, BattleAIScript_1DBF29 + if_not_equal 0, AI_PreferBatonPass_End + if_move_effect USER, EFFECT_BATON_PASS, AI_PreferBatonPass_GoForBatonPass + if_random 80, AI_Risky_End -BattleAIScript_1DBF5A: @ 81DBF5A - if_random 20, BattleAIScript_1DBF29 +AI_PreferBatonPass_GoForBatonPass: @ 81DBF5A + if_random 20, AI_Risky_End score +3 -BattleAIScript_1DBF62: @ 81DBF62 +AI_PreferBatonPass_End: @ 81DBF62 end AI_Nothing: @ 81DBF63 end AI_HPAware: @ 81DBF64 - if_hp_more_than USER, 70, BattleAIScript_1DBF81 - if_hp_more_than USER, 30, BattleAIScript_1DBF90 + if_hp_more_than USER, 70, AI_HPAware_UserHasHighHP + if_hp_more_than USER, 30, AI_HPAware_UserHasMediumHP get_effect - if_in_bytes MoveEffectList_1DC024, BattleAIScript_1DBF9F - jump BattleAIScript_1DBFA7 + if_in_bytes AI_HPAware_DiscouragedEffectsWhenLowHP, AI_HPAware_TryToDiscourage + jump AI_HPAware_ConsiderTarget -BattleAIScript_1DBF81: @ 81DBF81 +AI_HPAware_UserHasHighHP: @ 81DBF81 get_effect - if_in_bytes MoveEffectList_1DBFEB, BattleAIScript_1DBF9F - jump BattleAIScript_1DBFA7 + if_in_bytes AI_HPAware_DiscouragedEffectsWhenHighHP, AI_HPAware_TryToDiscourage + jump AI_HPAware_ConsiderTarget -BattleAIScript_1DBF90: @ 81DBF90 +AI_HPAware_UserHasMediumHP: @ 81DBF90 get_effect - if_in_bytes MoveEffectList_1DBFF9, BattleAIScript_1DBF9F - jump BattleAIScript_1DBFA7 + if_in_bytes AI_HPAware_DiscouragedEffectsWhenMediumHP, AI_HPAware_TryToDiscourage + jump AI_HPAware_ConsiderTarget -BattleAIScript_1DBF9F: @ 81DBF9F - if_random 50, BattleAIScript_1DBFA7 +AI_HPAware_TryToDiscourage: @ 81DBF9F + if_random 50, AI_HPAware_ConsiderTarget score -2 -BattleAIScript_1DBFA7: @ 81DBFA7 - if_hp_more_than TARGET, 70, BattleAIScript_1DBFC4 - if_hp_more_than TARGET, 30, BattleAIScript_1DBFD3 +AI_HPAware_ConsiderTarget: @ 81DBFA7 + if_hp_more_than TARGET, 70, AI_HPAware_TargetHasHighHP + if_hp_more_than TARGET, 30, AI_HPAware_TargetHasMediumHP get_effect - if_in_bytes MoveEffectList_1DC07D, BattleAIScript_1DBFE2 - jump BattleAIScript_1DBFEA + if_in_bytes AI_HPAware_DiscouragedEffectsWhenTargetLowHP, AI_HPAware_TargetTryToDiscourage + jump AI_HPAware_End -BattleAIScript_1DBFC4: @ 81DBFC4 +AI_HPAware_TargetHasHighHP: @ 81DBFC4 get_effect - if_in_bytes MoveEffectList_1DC054, BattleAIScript_1DBFE2 - jump BattleAIScript_1DBFEA + if_in_bytes AI_HPAware_DiscouragedEffectsWhenTargetHighHP, AI_HPAware_TargetTryToDiscourage + jump AI_HPAware_End -BattleAIScript_1DBFD3: @ 81DBFD3 +AI_HPAware_TargetHasMediumHP: @ 81DBFD3 get_effect - if_in_bytes MoveEffectList_1DC055, BattleAIScript_1DBFE2 - jump BattleAIScript_1DBFEA + if_in_bytes AI_HPAware_DiscouragedEffectsWhenTargetMediumHP, AI_HPAware_TargetTryToDiscourage + jump AI_HPAware_End -BattleAIScript_1DBFE2: @ 81DBFE2 - if_random 50, BattleAIScript_1DBFEA +AI_HPAware_TargetTryToDiscourage: @ 81DBFE2 + if_random 50, AI_HPAware_End score -2 -BattleAIScript_1DBFEA: @ 81DBFEA +AI_HPAware_End: @ 81DBFEA end -MoveEffectList_1DBFEB: @ 81DBFEB +AI_HPAware_DiscouragedEffectsWhenHighHP: @ 81DBFEB .byte EFFECT_EXPLOSION .byte EFFECT_RESTORE_HP .byte EFFECT_REST @@ -2891,7 +2892,7 @@ MoveEffectList_1DBFEB: @ 81DBFEB .byte EFFECT_OVERHEAT .byte -1 -MoveEffectList_1DBFF9: @ 81DBFF9 +AI_HPAware_DiscouragedEffectsWhenMediumHP: @ 81DBFF9 .byte EFFECT_EXPLOSION .byte EFFECT_ATTACK_UP .byte EFFECT_DEFENSE_UP @@ -2936,7 +2937,7 @@ MoveEffectList_1DBFF9: @ 81DBFF9 .byte EFFECT_DRAGON_DANCE .byte -1 -MoveEffectList_1DC024: @ 81DC024 +AI_HPAware_DiscouragedEffectsWhenLowHP: @ 81DC024 .byte EFFECT_ATTACK_UP .byte EFFECT_DEFENSE_UP .byte EFFECT_SPEED_UP @@ -2986,10 +2987,10 @@ MoveEffectList_1DC024: @ 81DC024 .byte EFFECT_DRAGON_DANCE .byte -1 -MoveEffectList_1DC054: @ 81DC054 +AI_HPAware_DiscouragedEffectsWhenTargetHighHP: @ 81DC054 .byte -1 -MoveEffectList_1DC055: @ 81DC055 +AI_HPAware_DiscouragedEffectsWhenTargetMediumHP: @ 81DC055 .byte EFFECT_ATTACK_UP .byte EFFECT_DEFENSE_UP .byte EFFECT_SPEED_UP @@ -3031,7 +3032,7 @@ MoveEffectList_1DC055: @ 81DC055 .byte EFFECT_DRAGON_DANCE .byte -1 -MoveEffectList_1DC07D: @ 81DC07D +AI_HPAware_DiscouragedEffectsWhenTargetLowHP: @ 81DC07D .byte EFFECT_SLEEP .byte EFFECT_EXPLOSION .byte EFFECT_ATTACK_UP @@ -3094,44 +3095,44 @@ MoveEffectList_1DC07D: @ 81DC07D .byte -1 AI_Unknown: @ 81DC0B9 - if_not_effect EFFECT_SUNNY_DAY, BattleAIScript_1DC0CF - if_equal 0, BattleAIScript_1DC0CF + if_not_effect EFFECT_SUNNY_DAY, AI_Unknown_End + if_equal 0, AI_Unknown_End is_first_turn USER - if_equal 0, BattleAIScript_1DC0CF + if_equal 0, AI_Unknown_End score +5 -BattleAIScript_1DC0CF: @ 81DC0CF +AI_Unknown_End: @ 81DC0CF end AI_Roaming: @ 81DC0D0 - if_status2 USER, S_TEMP_TRAP, BattleAIScript_1DC0FD - if_status2 USER, S_MEAN_LOOK, BattleAIScript_1DC0FD + if_status2 USER, S_TEMP_TRAP, AI_Roaming_End + if_status2 USER, S_MEAN_LOOK, AI_Roaming_End get_ability TARGET - if_equal ABILITY_SHADOW_TAG, BattleAIScript_1DC0FD + if_equal ABILITY_SHADOW_TAG, AI_Roaming_End get_ability USER - if_equal ABILITY_LEVITATE, BattleAIScript_1DC0FC + if_equal ABILITY_LEVITATE, AI_Roaming_Flee get_ability TARGET - if_equal ABILITY_ARENA_TRAP, BattleAIScript_1DC0FD + if_equal ABILITY_ARENA_TRAP, AI_Roaming_End -BattleAIScript_1DC0FC: @ 81DC0FC +AI_Roaming_Flee: @ 81DC0FC flee -BattleAIScript_1DC0FD: @ 81DC0FD +AI_Roaming_End: @ 81DC0FD end AI_Safari: @ 81DC0FE - if_random_2 BattleAIScript_1DC104 - flee2 + if_random_2 AI_Safari_Flee + watch -BattleAIScript_1DC104: @ 81DC104 +AI_Safari_Flee: @ 81DC104 flee AI_FleeInDanger: @ 81DC105 - if_hp_equal TARGET, 20, BattleAIScript_1DC114 - if_hp_less_than TARGET, 20, BattleAIScript_1DC114 + if_hp_equal TARGET, 20, AI_FleeInDanger_Flee + if_hp_less_than TARGET, 20, AI_FleeInDanger_Flee end -BattleAIScript_1DC114: @ 81DC114 +AI_FleeInDanger_Flee: @ 81DC114 flee AI_Unused: @ 81DC115 diff --git a/data/maps/AbandonedShip_CaptainsOffice/header.s b/data/maps/AbandonedShip_CaptainsOffice/header.s index fa58f95f9..e5e3adc3a 100644 --- a/data/maps/AbandonedShip_CaptainsOffice/header.s +++ b/data/maps/AbandonedShip_CaptainsOffice/header.s @@ -3,7 +3,7 @@ AbandonedShip_CaptainsOffice:: @ 8307454 .4byte AbandonedShip_CaptainsOffice_MapEvents .4byte AbandonedShip_CaptainsOffice_MapScripts .4byte 0x0 - .2byte 381 + .2byte BGM_DAN02 .2byte 196 .byte 61 .byte 0 diff --git a/data/maps/AbandonedShip_Corridors_1F/header.s b/data/maps/AbandonedShip_Corridors_1F/header.s index 6d69374f1..e2bd23252 100644 --- a/data/maps/AbandonedShip_Corridors_1F/header.s +++ b/data/maps/AbandonedShip_Corridors_1F/header.s @@ -3,7 +3,7 @@ AbandonedShip_Corridors_1F:: @ 8307374 .4byte AbandonedShip_Corridors_1F_MapEvents .4byte AbandonedShip_Corridors_1F_MapScripts .4byte 0x0 - .2byte 381 + .2byte BGM_DAN02 .2byte 188 .byte 61 .byte 0 diff --git a/data/maps/AbandonedShip_Corridors_B1F/header.s b/data/maps/AbandonedShip_Corridors_B1F/header.s index c691fea4f..064e24e92 100644 --- a/data/maps/AbandonedShip_Corridors_B1F/header.s +++ b/data/maps/AbandonedShip_Corridors_B1F/header.s @@ -3,7 +3,7 @@ AbandonedShip_Corridors_B1F:: @ 83073AC .4byte AbandonedShip_Corridors_B1F_MapEvents .4byte AbandonedShip_Corridors_B1F_MapScripts .4byte 0x0 - .2byte 381 + .2byte BGM_DAN02 .2byte 190 .byte 61 .byte 0 diff --git a/data/maps/AbandonedShip_Deck/header.s b/data/maps/AbandonedShip_Deck/header.s index 66adee677..1db367db8 100644 --- a/data/maps/AbandonedShip_Deck/header.s +++ b/data/maps/AbandonedShip_Deck/header.s @@ -3,7 +3,7 @@ AbandonedShip_Deck:: @ 8307358 .4byte AbandonedShip_Deck_MapEvents .4byte AbandonedShip_Deck_MapScripts .4byte 0x0 - .2byte 381 + .2byte BGM_DAN02 .2byte 187 .byte 61 .byte 0 diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/header.s b/data/maps/AbandonedShip_HiddenFloorCorridors/header.s index f0913dfae..a841ee87c 100644 --- a/data/maps/AbandonedShip_HiddenFloorCorridors/header.s +++ b/data/maps/AbandonedShip_HiddenFloorCorridors/header.s @@ -3,7 +3,7 @@ AbandonedShip_HiddenFloorCorridors:: @ 830748C .4byte AbandonedShip_HiddenFloorCorridors_MapEvents .4byte AbandonedShip_HiddenFloorCorridors_MapScripts .4byte 0x0 - .2byte 381 + .2byte BGM_DAN02 .2byte 290 .byte 61 .byte 0 diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/header.s b/data/maps/AbandonedShip_HiddenFloorRooms/header.s index a32bba09b..647b22977 100644 --- a/data/maps/AbandonedShip_HiddenFloorRooms/header.s +++ b/data/maps/AbandonedShip_HiddenFloorRooms/header.s @@ -3,7 +3,7 @@ AbandonedShip_HiddenFloorRooms:: @ 83074A8 .4byte AbandonedShip_HiddenFloorRooms_MapEvents .4byte AbandonedShip_HiddenFloorRooms_MapScripts .4byte 0x0 - .2byte 381 + .2byte BGM_DAN02 .2byte 311 .byte 61 .byte 0 diff --git a/data/maps/AbandonedShip_Room_B1F/header.s b/data/maps/AbandonedShip_Room_B1F/header.s index 29166cd18..7b88baf94 100644 --- a/data/maps/AbandonedShip_Room_B1F/header.s +++ b/data/maps/AbandonedShip_Room_B1F/header.s @@ -3,7 +3,7 @@ AbandonedShip_Room_B1F:: @ 830741C .4byte AbandonedShip_Room_B1F_MapEvents .4byte AbandonedShip_Room_B1F_MapScripts .4byte 0x0 - .2byte 381 + .2byte BGM_DAN02 .2byte 194 .byte 61 .byte 0 diff --git a/data/maps/AbandonedShip_Rooms2_1F/header.s b/data/maps/AbandonedShip_Rooms2_1F/header.s index b92ea516d..44bcd4733 100644 --- a/data/maps/AbandonedShip_Rooms2_1F/header.s +++ b/data/maps/AbandonedShip_Rooms2_1F/header.s @@ -3,7 +3,7 @@ AbandonedShip_Rooms2_1F:: @ 8307438 .4byte AbandonedShip_Rooms2_1F_MapEvents .4byte AbandonedShip_Rooms2_1F_MapScripts .4byte 0x0 - .2byte 381 + .2byte BGM_DAN02 .2byte 195 .byte 61 .byte 0 diff --git a/data/maps/AbandonedShip_Rooms2_B1F/header.s b/data/maps/AbandonedShip_Rooms2_B1F/header.s index ee72b282b..017b1382b 100644 --- a/data/maps/AbandonedShip_Rooms2_B1F/header.s +++ b/data/maps/AbandonedShip_Rooms2_B1F/header.s @@ -3,7 +3,7 @@ AbandonedShip_Rooms2_B1F:: @ 83073E4 .4byte AbandonedShip_Rooms2_B1F_MapEvents .4byte AbandonedShip_Rooms2_B1F_MapScripts .4byte 0x0 - .2byte 381 + .2byte BGM_DAN02 .2byte 192 .byte 61 .byte 0 diff --git a/data/maps/AbandonedShip_Rooms_1F/header.s b/data/maps/AbandonedShip_Rooms_1F/header.s index ee232211a..7e8dbd5b8 100644 --- a/data/maps/AbandonedShip_Rooms_1F/header.s +++ b/data/maps/AbandonedShip_Rooms_1F/header.s @@ -3,7 +3,7 @@ AbandonedShip_Rooms_1F:: @ 8307390 .4byte AbandonedShip_Rooms_1F_MapEvents .4byte AbandonedShip_Rooms_1F_MapScripts .4byte 0x0 - .2byte 381 + .2byte BGM_DAN02 .2byte 189 .byte 61 .byte 0 diff --git a/data/maps/AbandonedShip_Rooms_B1F/header.s b/data/maps/AbandonedShip_Rooms_B1F/header.s index f06962567..6ac6e3794 100644 --- a/data/maps/AbandonedShip_Rooms_B1F/header.s +++ b/data/maps/AbandonedShip_Rooms_B1F/header.s @@ -3,7 +3,7 @@ AbandonedShip_Rooms_B1F:: @ 83073C8 .4byte AbandonedShip_Rooms_B1F_MapEvents .4byte AbandonedShip_Rooms_B1F_MapScripts .4byte 0x0 - .2byte 381 + .2byte BGM_DAN02 .2byte 191 .byte 61 .byte 0 diff --git a/data/maps/AbandonedShip_Underwater1/header.s b/data/maps/AbandonedShip_Underwater1/header.s index 43bcad003..6313cf6f1 100644 --- a/data/maps/AbandonedShip_Underwater1/header.s +++ b/data/maps/AbandonedShip_Underwater1/header.s @@ -3,7 +3,7 @@ AbandonedShip_Underwater1:: @ 8307400 .4byte AbandonedShip_Underwater1_MapEvents .4byte AbandonedShip_Underwater1_MapScripts .4byte 0x0 - .2byte 411 + .2byte BGM_DEEPDEEP .2byte 193 .byte 61 .byte 0 diff --git a/data/maps/AbandonedShip_Underwater2/header.s b/data/maps/AbandonedShip_Underwater2/header.s index 366653971..c81b78357 100644 --- a/data/maps/AbandonedShip_Underwater2/header.s +++ b/data/maps/AbandonedShip_Underwater2/header.s @@ -3,7 +3,7 @@ AbandonedShip_Underwater2:: @ 8307470 .4byte AbandonedShip_Underwater2_MapEvents .4byte AbandonedShip_Underwater2_MapScripts .4byte 0x0 - .2byte 411 + .2byte BGM_DEEPDEEP .2byte 197 .byte 61 .byte 0 diff --git a/data/maps/AncientTomb/header.s b/data/maps/AncientTomb/header.s index 98755054c..82ac0555d 100644 --- a/data/maps/AncientTomb/header.s +++ b/data/maps/AncientTomb/header.s @@ -3,7 +3,7 @@ AncientTomb:: @ 83074E0 .4byte AncientTomb_MapEvents .4byte AncientTomb_MapScripts .4byte 0x0 - .2byte 438 + .2byte BGM_MABOROSI .2byte 282 .byte 83 .byte 0 diff --git a/data/maps/AquaHideout_1F/header.s b/data/maps/AquaHideout_1F/header.s index e76caf1f4..94650821d 100644 --- a/data/maps/AquaHideout_1F/header.s +++ b/data/maps/AquaHideout_1F/header.s @@ -3,7 +3,7 @@ AquaHideout_1F:: @ 8306FF4 .4byte AquaHideout_1F_MapEvents .4byte AquaHideout_1F_MapScripts .4byte 0x0 - .2byte 430 + .2byte BGM_AJITO .2byte 144 .byte 66 .byte 0 diff --git a/data/maps/AquaHideout_B1F/header.s b/data/maps/AquaHideout_B1F/header.s index 366d49129..ef7f4cfdf 100644 --- a/data/maps/AquaHideout_B1F/header.s +++ b/data/maps/AquaHideout_B1F/header.s @@ -3,7 +3,7 @@ AquaHideout_B1F:: @ 8307010 .4byte AquaHideout_B1F_MapEvents .4byte AquaHideout_B1F_MapScripts .4byte 0x0 - .2byte 430 + .2byte BGM_AJITO .2byte 145 .byte 66 .byte 0 diff --git a/data/maps/AquaHideout_B2F/header.s b/data/maps/AquaHideout_B2F/header.s index df72c7e0e..38b3f546f 100644 --- a/data/maps/AquaHideout_B2F/header.s +++ b/data/maps/AquaHideout_B2F/header.s @@ -3,7 +3,7 @@ AquaHideout_B2F:: @ 830702C .4byte AquaHideout_B2F_MapEvents .4byte AquaHideout_B2F_MapScripts .4byte 0x0 - .2byte 430 + .2byte BGM_AJITO .2byte 146 .byte 66 .byte 0 diff --git a/data/maps/BattleTower_BattleRoom/header.s b/data/maps/BattleTower_BattleRoom/header.s index 21af266fd..3104824ed 100644 --- a/data/maps/BattleTower_BattleRoom/header.s +++ b/data/maps/BattleTower_BattleRoom/header.s @@ -3,7 +3,7 @@ BattleTower_BattleRoom:: @ 8307C88 .4byte BattleTower_BattleRoom_MapEvents .4byte BattleTower_BattleRoom_MapScripts .4byte 0x0 - .2byte 384 + .2byte BGM_B_TOWER .2byte 269 .byte 58 .byte 0 diff --git a/data/maps/BattleTower_Corridor/header.s b/data/maps/BattleTower_Corridor/header.s index 98419af12..016e178ac 100644 --- a/data/maps/BattleTower_Corridor/header.s +++ b/data/maps/BattleTower_Corridor/header.s @@ -3,7 +3,7 @@ BattleTower_Corridor:: @ 8307C6C .4byte BattleTower_Corridor_MapEvents .4byte BattleTower_Corridor_MapScripts .4byte 0x0 - .2byte 384 + .2byte BGM_B_TOWER .2byte 268 .byte 58 .byte 0 diff --git a/data/maps/BattleTower_Elevator/header.s b/data/maps/BattleTower_Elevator/header.s index aa5ef1703..0a7285261 100644 --- a/data/maps/BattleTower_Elevator/header.s +++ b/data/maps/BattleTower_Elevator/header.s @@ -3,7 +3,7 @@ BattleTower_Elevator:: @ 8307C50 .4byte BattleTower_Elevator_MapEvents .4byte BattleTower_Elevator_MapScripts .4byte 0x0 - .2byte 384 + .2byte BGM_B_TOWER .2byte 267 .byte 58 .byte 0 diff --git a/data/maps/BattleTower_Lobby/header.s b/data/maps/BattleTower_Lobby/header.s index 6a4963c95..c8c0b0473 100644 --- a/data/maps/BattleTower_Lobby/header.s +++ b/data/maps/BattleTower_Lobby/header.s @@ -3,7 +3,7 @@ BattleTower_Lobby:: @ 8307C34 .4byte BattleTower_Lobby_MapEvents .4byte BattleTower_Lobby_MapScripts .4byte 0x0 - .2byte 384 + .2byte BGM_B_TOWER .2byte 265 .byte 58 .byte 0 diff --git a/data/maps/BattleTower_Outside/header.s b/data/maps/BattleTower_Outside/header.s index d569b384a..01bbc2fd9 100644 --- a/data/maps/BattleTower_Outside/header.s +++ b/data/maps/BattleTower_Outside/header.s @@ -3,7 +3,7 @@ BattleTower_Outside:: @ 8307C18 .4byte BattleTower_Outside_MapEvents .4byte BattleTower_Outside_MapScripts .4byte 0x0 - .2byte 384 + .2byte BGM_B_TOWER .2byte 266 .byte 58 .byte 0 diff --git a/data/maps/CaveOfOrigin_1F/header.s b/data/maps/CaveOfOrigin_1F/header.s index e19563cce..b49287535 100644 --- a/data/maps/CaveOfOrigin_1F/header.s +++ b/data/maps/CaveOfOrigin_1F/header.s @@ -3,7 +3,7 @@ CaveOfOrigin_1F:: @ 8307198 .4byte CaveOfOrigin_1F_MapEvents .4byte CaveOfOrigin_1F_MapScripts .4byte 0x0 - .2byte 386 + .2byte BGM_DAN03 .2byte 159 .byte 72 .byte 1 diff --git a/data/maps/CaveOfOrigin_B1F/header.s b/data/maps/CaveOfOrigin_B1F/header.s index d3b05c0fc..97e5e68c8 100644 --- a/data/maps/CaveOfOrigin_B1F/header.s +++ b/data/maps/CaveOfOrigin_B1F/header.s @@ -3,7 +3,7 @@ CaveOfOrigin_B1F:: @ 83071B4 .4byte CaveOfOrigin_B1F_MapEvents .4byte CaveOfOrigin_B1F_MapScripts .4byte 0x0 - .2byte 386 + .2byte BGM_DAN03 .2byte 160 .byte 72 .byte 1 diff --git a/data/maps/CaveOfOrigin_B2F/header.s b/data/maps/CaveOfOrigin_B2F/header.s index 8ccf13e5c..79e76f693 100644 --- a/data/maps/CaveOfOrigin_B2F/header.s +++ b/data/maps/CaveOfOrigin_B2F/header.s @@ -3,7 +3,7 @@ CaveOfOrigin_B2F:: @ 83071D0 .4byte CaveOfOrigin_B2F_MapEvents .4byte CaveOfOrigin_B2F_MapScripts .4byte 0x0 - .2byte 386 + .2byte BGM_DAN03 .2byte 161 .byte 72 .byte 1 diff --git a/data/maps/CaveOfOrigin_B3F/header.s b/data/maps/CaveOfOrigin_B3F/header.s index 1d76b682f..746d187f3 100644 --- a/data/maps/CaveOfOrigin_B3F/header.s +++ b/data/maps/CaveOfOrigin_B3F/header.s @@ -3,7 +3,7 @@ CaveOfOrigin_B3F:: @ 83071EC .4byte CaveOfOrigin_B3F_MapEvents .4byte CaveOfOrigin_B3F_MapScripts .4byte 0x0 - .2byte 386 + .2byte BGM_DAN03 .2byte 162 .byte 72 .byte 1 diff --git a/data/maps/CaveOfOrigin_B4F/header.s b/data/maps/CaveOfOrigin_B4F/header.s index 824954700..0cb1ad83b 100644 --- a/data/maps/CaveOfOrigin_B4F/header.s +++ b/data/maps/CaveOfOrigin_B4F/header.s @@ -3,7 +3,7 @@ CaveOfOrigin_B4F:: @ 8307208 .4byte CaveOfOrigin_B4F_MapEvents .4byte CaveOfOrigin_B4F_MapScripts .4byte 0x0 - .2byte 0 + .2byte SE_STOP .2byte 163 .byte 72 .byte 0 diff --git a/data/maps/CaveOfOrigin_Entrance/header.s b/data/maps/CaveOfOrigin_Entrance/header.s index 88cb41ef5..606997174 100644 --- a/data/maps/CaveOfOrigin_Entrance/header.s +++ b/data/maps/CaveOfOrigin_Entrance/header.s @@ -3,7 +3,7 @@ CaveOfOrigin_Entrance:: @ 830717C .4byte CaveOfOrigin_Entrance_MapEvents .4byte CaveOfOrigin_Entrance_MapScripts .4byte 0x0 - .2byte 386 + .2byte BGM_DAN03 .2byte 158 .byte 72 .byte 0 diff --git a/data/maps/DesertRuins/header.s b/data/maps/DesertRuins/header.s index f4c916820..79e681666 100644 --- a/data/maps/DesertRuins/header.s +++ b/data/maps/DesertRuins/header.s @@ -3,7 +3,7 @@ DesertRuins:: @ 8306E18 .4byte DesertRuins_MapEvents .4byte DesertRuins_MapScripts .4byte 0x0 - .2byte 438 + .2byte BGM_MABOROSI .2byte 132 .byte 82 .byte 0 diff --git a/data/maps/DewfordTown/header.s b/data/maps/DewfordTown/header.s index 5bb04f212..7aed01d94 100644 --- a/data/maps/DewfordTown/header.s +++ b/data/maps/DewfordTown/header.s @@ -3,7 +3,7 @@ DewfordTown:: @ 830557C .4byte DewfordTown_MapEvents .4byte DewfordTown_MapScripts .4byte DewfordTown_MapConnections - .2byte 427 + .2byte BGM_HIGHTOWN .2byte 12 .byte 2 .byte 0 diff --git a/data/maps/DewfordTown_Gym/header.s b/data/maps/DewfordTown_Gym/header.s index b581ed15a..79227e545 100644 --- a/data/maps/DewfordTown_Gym/header.s +++ b/data/maps/DewfordTown_Gym/header.s @@ -3,7 +3,7 @@ DewfordTown_Gym:: @ 8305B9C .4byte DewfordTown_Gym_MapEvents .4byte DewfordTown_Gym_MapScripts .4byte 0x0 - .2byte 364 + .2byte BGM_GIM .2byte 65 .byte 2 .byte 0 diff --git a/data/maps/DewfordTown_Hall/header.s b/data/maps/DewfordTown_Hall/header.s index ce698589f..975a257d8 100644 --- a/data/maps/DewfordTown_Hall/header.s +++ b/data/maps/DewfordTown_Hall/header.s @@ -3,7 +3,7 @@ DewfordTown_Hall:: @ 8305BB8 .4byte DewfordTown_Hall_MapEvents .4byte DewfordTown_Hall_MapScripts .4byte 0x0 - .2byte 427 + .2byte BGM_HIGHTOWN .2byte 66 .byte 2 .byte 0 diff --git a/data/maps/DewfordTown_House1/header.s b/data/maps/DewfordTown_House1/header.s index 509836b57..95a8a8339 100644 --- a/data/maps/DewfordTown_House1/header.s +++ b/data/maps/DewfordTown_House1/header.s @@ -3,7 +3,7 @@ DewfordTown_House1:: @ 8305B48 .4byte DewfordTown_House1_MapEvents .4byte DewfordTown_House1_MapScripts .4byte 0x0 - .2byte 427 + .2byte BGM_HIGHTOWN .2byte 64 .byte 2 .byte 0 diff --git a/data/maps/DewfordTown_House2/header.s b/data/maps/DewfordTown_House2/header.s index 3e789ff7e..37aac2ead 100644 --- a/data/maps/DewfordTown_House2/header.s +++ b/data/maps/DewfordTown_House2/header.s @@ -3,7 +3,7 @@ DewfordTown_House2:: @ 8305BD4 .4byte DewfordTown_House2_MapEvents .4byte DewfordTown_House2_MapScripts .4byte 0x0 - .2byte 427 + .2byte BGM_HIGHTOWN .2byte 67 .byte 2 .byte 0 diff --git a/data/maps/DewfordTown_PokemonCenter_1F/header.s b/data/maps/DewfordTown_PokemonCenter_1F/header.s index c88288f28..9cf0a8f46 100644 --- a/data/maps/DewfordTown_PokemonCenter_1F/header.s +++ b/data/maps/DewfordTown_PokemonCenter_1F/header.s @@ -3,7 +3,7 @@ DewfordTown_PokemonCenter_1F:: @ 8305B64 .4byte DewfordTown_PokemonCenter_1F_MapEvents .4byte DewfordTown_PokemonCenter_1F_MapScripts .4byte 0x0 - .2byte 400 + .2byte BGM_POKECEN .2byte 61 .byte 2 .byte 0 diff --git a/data/maps/DewfordTown_PokemonCenter_2F/header.s b/data/maps/DewfordTown_PokemonCenter_2F/header.s index 8e6f846fc..a54a51c94 100644 --- a/data/maps/DewfordTown_PokemonCenter_2F/header.s +++ b/data/maps/DewfordTown_PokemonCenter_2F/header.s @@ -3,7 +3,7 @@ DewfordTown_PokemonCenter_2F:: @ 8305B80 .4byte DewfordTown_PokemonCenter_2F_MapEvents .4byte DewfordTown_PokemonCenter_2F_MapScripts .4byte 0x0 - .2byte 400 + .2byte BGM_POKECEN .2byte 62 .byte 2 .byte 0 diff --git a/data/maps/DoubleBattleColosseum/header.s b/data/maps/DoubleBattleColosseum/header.s index 8a2db2709..baf1b8076 100644 --- a/data/maps/DoubleBattleColosseum/header.s +++ b/data/maps/DoubleBattleColosseum/header.s @@ -3,7 +3,7 @@ DoubleBattleColosseum:: @ 83079CC .4byte DoubleBattleColosseum_MapEvents .4byte DoubleBattleColosseum_MapScripts .4byte 0x0 - .2byte 422 + .2byte BGM_RAINBOW .2byte 225 .byte 87 .byte 0 diff --git a/data/maps/EverGrandeCity/header.s b/data/maps/EverGrandeCity/header.s index 13eee4188..0c1f6eab0 100644 --- a/data/maps/EverGrandeCity/header.s +++ b/data/maps/EverGrandeCity/header.s @@ -3,7 +3,7 @@ EverGrandeCity:: @ 8305528 .4byte EverGrandeCity_MapEvents .4byte EverGrandeCity_MapScripts .4byte EverGrandeCity_MapConnections - .2byte 422 + .2byte BGM_RAINBOW .2byte 9 .byte 15 .byte 0 diff --git a/data/maps/EverGrandeCity_ChampionsRoom/header.s b/data/maps/EverGrandeCity_ChampionsRoom/header.s index 1953c6a69..154d5ba29 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/header.s +++ b/data/maps/EverGrandeCity_ChampionsRoom/header.s @@ -3,7 +3,7 @@ EverGrandeCity_ChampionsRoom:: @ 8306B08 .4byte EverGrandeCity_ChampionsRoom_MapEvents .4byte EverGrandeCity_ChampionsRoom_MapScripts .4byte 0x0 - .2byte 429 + .2byte BGM_C_ROAD .2byte 116 .byte 15 .byte 0 diff --git a/data/maps/EverGrandeCity_Corridor1/header.s b/data/maps/EverGrandeCity_Corridor1/header.s index 37ee202bf..68d16484e 100644 --- a/data/maps/EverGrandeCity_Corridor1/header.s +++ b/data/maps/EverGrandeCity_Corridor1/header.s @@ -3,7 +3,7 @@ EverGrandeCity_Corridor1:: @ 8306B24 .4byte EverGrandeCity_Corridor1_MapEvents .4byte EverGrandeCity_Corridor1_MapScripts .4byte 0x0 - .2byte 429 + .2byte BGM_C_ROAD .2byte 117 .byte 15 .byte 0 diff --git a/data/maps/EverGrandeCity_Corridor2/header.s b/data/maps/EverGrandeCity_Corridor2/header.s index efb2d7c83..0dab21f9a 100644 --- a/data/maps/EverGrandeCity_Corridor2/header.s +++ b/data/maps/EverGrandeCity_Corridor2/header.s @@ -3,7 +3,7 @@ EverGrandeCity_Corridor2:: @ 8306B40 .4byte EverGrandeCity_Corridor2_MapEvents .4byte EverGrandeCity_Corridor2_MapScripts .4byte 0x0 - .2byte 429 + .2byte BGM_C_ROAD .2byte 117 .byte 15 .byte 0 diff --git a/data/maps/EverGrandeCity_Corridor3/header.s b/data/maps/EverGrandeCity_Corridor3/header.s index e53702275..3d20a6a41 100644 --- a/data/maps/EverGrandeCity_Corridor3/header.s +++ b/data/maps/EverGrandeCity_Corridor3/header.s @@ -3,7 +3,7 @@ EverGrandeCity_Corridor3:: @ 8306B5C .4byte EverGrandeCity_Corridor3_MapEvents .4byte EverGrandeCity_Corridor3_MapScripts .4byte 0x0 - .2byte 429 + .2byte BGM_C_ROAD .2byte 117 .byte 15 .byte 0 diff --git a/data/maps/EverGrandeCity_Corridor4/header.s b/data/maps/EverGrandeCity_Corridor4/header.s index cccaaeeb7..56a5297d7 100644 --- a/data/maps/EverGrandeCity_Corridor4/header.s +++ b/data/maps/EverGrandeCity_Corridor4/header.s @@ -3,7 +3,7 @@ EverGrandeCity_Corridor4:: @ 8306B78 .4byte EverGrandeCity_Corridor4_MapEvents .4byte EverGrandeCity_Corridor4_MapScripts .4byte 0x0 - .2byte 429 + .2byte BGM_C_ROAD .2byte 316 .byte 15 .byte 0 diff --git a/data/maps/EverGrandeCity_Corridor5/header.s b/data/maps/EverGrandeCity_Corridor5/header.s index 0bdc7f61f..2ca1fef86 100644 --- a/data/maps/EverGrandeCity_Corridor5/header.s +++ b/data/maps/EverGrandeCity_Corridor5/header.s @@ -3,7 +3,7 @@ EverGrandeCity_Corridor5:: @ 8306B94 .4byte EverGrandeCity_Corridor5_MapEvents .4byte EverGrandeCity_Corridor5_MapScripts .4byte 0x0 - .2byte 429 + .2byte BGM_C_ROAD .2byte 117 .byte 15 .byte 0 diff --git a/data/maps/EverGrandeCity_DrakesRoom/header.s b/data/maps/EverGrandeCity_DrakesRoom/header.s index 7305222e9..04c1d9f32 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/header.s +++ b/data/maps/EverGrandeCity_DrakesRoom/header.s @@ -3,7 +3,7 @@ EverGrandeCity_DrakesRoom:: @ 8306AEC .4byte EverGrandeCity_DrakesRoom_MapEvents .4byte EverGrandeCity_DrakesRoom_MapScripts .4byte 0x0 - .2byte 429 + .2byte BGM_C_ROAD .2byte 115 .byte 15 .byte 0 diff --git a/data/maps/EverGrandeCity_GlaciasRoom/header.s b/data/maps/EverGrandeCity_GlaciasRoom/header.s index 7bcda408a..e0a48f9a6 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/header.s +++ b/data/maps/EverGrandeCity_GlaciasRoom/header.s @@ -3,7 +3,7 @@ EverGrandeCity_GlaciasRoom:: @ 8306AD0 .4byte EverGrandeCity_GlaciasRoom_MapEvents .4byte EverGrandeCity_GlaciasRoom_MapScripts .4byte 0x0 - .2byte 429 + .2byte BGM_C_ROAD .2byte 114 .byte 15 .byte 0 diff --git a/data/maps/EverGrandeCity_HallOfFame/header.s b/data/maps/EverGrandeCity_HallOfFame/header.s index 1574fde12..b7816ea86 100644 --- a/data/maps/EverGrandeCity_HallOfFame/header.s +++ b/data/maps/EverGrandeCity_HallOfFame/header.s @@ -3,7 +3,7 @@ EverGrandeCity_HallOfFame:: @ 8306BCC .4byte EverGrandeCity_HallOfFame_MapEvents .4byte EverGrandeCity_HallOfFame_MapScripts .4byte 0x0 - .2byte 447 + .2byte BGM_EIKOU_R .2byte 299 .byte 15 .byte 0 diff --git a/data/maps/EverGrandeCity_PhoebesRoom/header.s b/data/maps/EverGrandeCity_PhoebesRoom/header.s index f97ab8f17..f9ef5a516 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/header.s +++ b/data/maps/EverGrandeCity_PhoebesRoom/header.s @@ -3,7 +3,7 @@ EverGrandeCity_PhoebesRoom:: @ 8306AB4 .4byte EverGrandeCity_PhoebesRoom_MapEvents .4byte EverGrandeCity_PhoebesRoom_MapScripts .4byte 0x0 - .2byte 429 + .2byte BGM_C_ROAD .2byte 113 .byte 15 .byte 0 diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/header.s b/data/maps/EverGrandeCity_PokemonCenter_1F/header.s index 4cb93f7ec..2b72fc661 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/header.s +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/header.s @@ -3,7 +3,7 @@ EverGrandeCity_PokemonCenter_1F:: @ 8306BE8 .4byte EverGrandeCity_PokemonCenter_1F_MapEvents .4byte EverGrandeCity_PokemonCenter_1F_MapScripts .4byte 0x0 - .2byte 400 + .2byte BGM_POKECEN .2byte 61 .byte 15 .byte 0 diff --git a/data/maps/EverGrandeCity_PokemonCenter_2F/header.s b/data/maps/EverGrandeCity_PokemonCenter_2F/header.s index 01e0f8eff..b60e3c3df 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_2F/header.s +++ b/data/maps/EverGrandeCity_PokemonCenter_2F/header.s @@ -3,7 +3,7 @@ EverGrandeCity_PokemonCenter_2F:: @ 8306C04 .4byte EverGrandeCity_PokemonCenter_2F_MapEvents .4byte EverGrandeCity_PokemonCenter_2F_MapScripts .4byte 0x0 - .2byte 400 + .2byte BGM_POKECEN .2byte 62 .byte 15 .byte 0 diff --git a/data/maps/EverGrandeCity_PokemonLeague/header.s b/data/maps/EverGrandeCity_PokemonLeague/header.s index fd521dcb9..cf24b61dc 100644 --- a/data/maps/EverGrandeCity_PokemonLeague/header.s +++ b/data/maps/EverGrandeCity_PokemonLeague/header.s @@ -3,7 +3,7 @@ EverGrandeCity_PokemonLeague:: @ 8306BB0 .4byte EverGrandeCity_PokemonLeague_MapEvents .4byte EverGrandeCity_PokemonLeague_MapScripts .4byte 0x0 - .2byte 400 + .2byte BGM_POKECEN .2byte 271 .byte 15 .byte 0 diff --git a/data/maps/EverGrandeCity_SidneysRoom/header.s b/data/maps/EverGrandeCity_SidneysRoom/header.s index 1ac25f1e5..7c2ee11f8 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/header.s +++ b/data/maps/EverGrandeCity_SidneysRoom/header.s @@ -3,7 +3,7 @@ EverGrandeCity_SidneysRoom:: @ 8306A98 .4byte EverGrandeCity_SidneysRoom_MapEvents .4byte EverGrandeCity_SidneysRoom_MapScripts .4byte 0x0 - .2byte 429 + .2byte BGM_C_ROAD .2byte 112 .byte 15 .byte 0 diff --git a/data/maps/FallarborTown/header.s b/data/maps/FallarborTown/header.s index 952a7a5f2..bd719a36b 100644 --- a/data/maps/FallarborTown/header.s +++ b/data/maps/FallarborTown/header.s @@ -3,7 +3,7 @@ FallarborTown:: @ 83055B4 .4byte FallarborTown_MapEvents .4byte FallarborTown_MapScripts .4byte FallarborTown_MapConnections - .2byte 437 + .2byte BGM_TONEKUSA .2byte 14 .byte 4 .byte 0 diff --git a/data/maps/FallarborTown_ContestHall/header.s b/data/maps/FallarborTown_ContestHall/header.s index cb3367ba8..aa540e338 100644 --- a/data/maps/FallarborTown_ContestHall/header.s +++ b/data/maps/FallarborTown_ContestHall/header.s @@ -3,7 +3,7 @@ FallarborTown_ContestHall:: @ 8305CEC .4byte FallarborTown_ContestHall_MapEvents .4byte FallarborTown_ContestHall_MapScripts .4byte 0x0 - .2byte 452 + .2byte BGM_CONLOBBY .2byte 73 .byte 4 .byte 0 diff --git a/data/maps/FallarborTown_ContestLobby/header.s b/data/maps/FallarborTown_ContestLobby/header.s index be4a98950..2f25d3675 100644 --- a/data/maps/FallarborTown_ContestLobby/header.s +++ b/data/maps/FallarborTown_ContestLobby/header.s @@ -3,7 +3,7 @@ FallarborTown_ContestLobby:: @ 8305CD0 .4byte FallarborTown_ContestLobby_MapEvents .4byte FallarborTown_ContestLobby_MapScripts .4byte 0x0 - .2byte 452 + .2byte BGM_CONLOBBY .2byte 72 .byte 4 .byte 0 diff --git a/data/maps/FallarborTown_House1/header.s b/data/maps/FallarborTown_House1/header.s index 33dcfbe20..2761536b6 100644 --- a/data/maps/FallarborTown_House1/header.s +++ b/data/maps/FallarborTown_House1/header.s @@ -3,7 +3,7 @@ FallarborTown_House1:: @ 8305D40 .4byte FallarborTown_House1_MapEvents .4byte FallarborTown_House1_MapScripts .4byte 0x0 - .2byte 437 + .2byte BGM_TONEKUSA .2byte 59 .byte 4 .byte 0 diff --git a/data/maps/FallarborTown_House2/header.s b/data/maps/FallarborTown_House2/header.s index 6e4a8276f..0366c201a 100644 --- a/data/maps/FallarborTown_House2/header.s +++ b/data/maps/FallarborTown_House2/header.s @@ -3,7 +3,7 @@ FallarborTown_House2:: @ 8305D5C .4byte FallarborTown_House2_MapEvents .4byte FallarborTown_House2_MapScripts .4byte 0x0 - .2byte 437 + .2byte BGM_TONEKUSA .2byte 60 .byte 4 .byte 0 diff --git a/data/maps/FallarborTown_Mart/header.s b/data/maps/FallarborTown_Mart/header.s index 817bc23b0..b60fa85c8 100644 --- a/data/maps/FallarborTown_Mart/header.s +++ b/data/maps/FallarborTown_Mart/header.s @@ -3,7 +3,7 @@ FallarborTown_Mart:: @ 8305CB4 .4byte FallarborTown_Mart_MapEvents .4byte FallarborTown_Mart_MapScripts .4byte 0x0 - .2byte 404 + .2byte BGM_FRIENDLY .2byte 63 .byte 4 .byte 0 diff --git a/data/maps/FallarborTown_PokemonCenter_1F/header.s b/data/maps/FallarborTown_PokemonCenter_1F/header.s index 62d11d1c1..8ffb95e0c 100644 --- a/data/maps/FallarborTown_PokemonCenter_1F/header.s +++ b/data/maps/FallarborTown_PokemonCenter_1F/header.s @@ -3,7 +3,7 @@ FallarborTown_PokemonCenter_1F:: @ 8305D08 .4byte FallarborTown_PokemonCenter_1F_MapEvents .4byte FallarborTown_PokemonCenter_1F_MapScripts .4byte 0x0 - .2byte 400 + .2byte BGM_POKECEN .2byte 61 .byte 4 .byte 0 diff --git a/data/maps/FallarborTown_PokemonCenter_2F/header.s b/data/maps/FallarborTown_PokemonCenter_2F/header.s index f82b32047..45120890d 100644 --- a/data/maps/FallarborTown_PokemonCenter_2F/header.s +++ b/data/maps/FallarborTown_PokemonCenter_2F/header.s @@ -3,7 +3,7 @@ FallarborTown_PokemonCenter_2F:: @ 8305D24 .4byte FallarborTown_PokemonCenter_2F_MapEvents .4byte FallarborTown_PokemonCenter_2F_MapScripts .4byte 0x0 - .2byte 400 + .2byte BGM_POKECEN .2byte 62 .byte 4 .byte 0 diff --git a/data/maps/FieryPath/header.s b/data/maps/FieryPath/header.s index d515bb062..ccca2e656 100644 --- a/data/maps/FieryPath/header.s +++ b/data/maps/FieryPath/header.s @@ -3,7 +3,7 @@ FieryPath:: @ 8306EF8 .4byte FieryPath_MapEvents .4byte FieryPath_MapScripts .4byte 0x0 - .2byte 366 + .2byte BGM_DAN01 .2byte 294 .byte 74 .byte 0 diff --git a/data/maps/FortreeCity/header.s b/data/maps/FortreeCity/header.s index ccc81ae72..4c96de2b2 100644 --- a/data/maps/FortreeCity/header.s +++ b/data/maps/FortreeCity/header.s @@ -3,7 +3,7 @@ FortreeCity:: @ 83054B8 .4byte FortreeCity_MapEvents .4byte FortreeCity_MapScripts .4byte FortreeCity_MapConnections - .2byte 382 + .2byte BGM_MACHI_S3 .2byte 5 .byte 11 .byte 0 diff --git a/data/maps/FortreeCity_DecorationShop/header.s b/data/maps/FortreeCity_DecorationShop/header.s index f2f8c058a..5334ca92c 100644 --- a/data/maps/FortreeCity_DecorationShop/header.s +++ b/data/maps/FortreeCity_DecorationShop/header.s @@ -3,7 +3,7 @@ FortreeCity_DecorationShop:: @ 8306504 .4byte FortreeCity_DecorationShop_MapEvents .4byte FortreeCity_DecorationShop_MapScripts .4byte 0x0 - .2byte 382 + .2byte BGM_MACHI_S3 .2byte 256 .byte 11 .byte 0 diff --git a/data/maps/FortreeCity_Gym/header.s b/data/maps/FortreeCity_Gym/header.s index d0c1f5008..378a73b52 100644 --- a/data/maps/FortreeCity_Gym/header.s +++ b/data/maps/FortreeCity_Gym/header.s @@ -3,7 +3,7 @@ FortreeCity_Gym:: @ 8306424 .4byte FortreeCity_Gym_MapEvents .4byte FortreeCity_Gym_MapScripts .4byte 0x0 - .2byte 364 + .2byte BGM_GIM .2byte 100 .byte 11 .byte 0 diff --git a/data/maps/FortreeCity_House1/header.s b/data/maps/FortreeCity_House1/header.s index dff1bc7ec..ad8198c43 100644 --- a/data/maps/FortreeCity_House1/header.s +++ b/data/maps/FortreeCity_House1/header.s @@ -3,7 +3,7 @@ FortreeCity_House1:: @ 8306408 .4byte FortreeCity_House1_MapEvents .4byte FortreeCity_House1_MapScripts .4byte 0x0 - .2byte 382 + .2byte BGM_MACHI_S3 .2byte 99 .byte 11 .byte 0 diff --git a/data/maps/FortreeCity_House2/header.s b/data/maps/FortreeCity_House2/header.s index 255d6ae67..3c803636b 100644 --- a/data/maps/FortreeCity_House2/header.s +++ b/data/maps/FortreeCity_House2/header.s @@ -3,7 +3,7 @@ FortreeCity_House2:: @ 8306494 .4byte FortreeCity_House2_MapEvents .4byte FortreeCity_House2_MapScripts .4byte 0x0 - .2byte 382 + .2byte BGM_MACHI_S3 .2byte 101 .byte 11 .byte 0 diff --git a/data/maps/FortreeCity_House3/header.s b/data/maps/FortreeCity_House3/header.s index c88ef57ce..40bf85478 100644 --- a/data/maps/FortreeCity_House3/header.s +++ b/data/maps/FortreeCity_House3/header.s @@ -3,7 +3,7 @@ FortreeCity_House3:: @ 83064B0 .4byte FortreeCity_House3_MapEvents .4byte FortreeCity_House3_MapScripts .4byte 0x0 - .2byte 382 + .2byte BGM_MACHI_S3 .2byte 99 .byte 11 .byte 0 diff --git a/data/maps/FortreeCity_House4/header.s b/data/maps/FortreeCity_House4/header.s index fabd74e80..bed750ecb 100644 --- a/data/maps/FortreeCity_House4/header.s +++ b/data/maps/FortreeCity_House4/header.s @@ -3,7 +3,7 @@ FortreeCity_House4:: @ 83064CC .4byte FortreeCity_House4_MapEvents .4byte FortreeCity_House4_MapScripts .4byte 0x0 - .2byte 382 + .2byte BGM_MACHI_S3 .2byte 101 .byte 11 .byte 0 diff --git a/data/maps/FortreeCity_House5/header.s b/data/maps/FortreeCity_House5/header.s index 80368a28e..a8bb67d65 100644 --- a/data/maps/FortreeCity_House5/header.s +++ b/data/maps/FortreeCity_House5/header.s @@ -3,7 +3,7 @@ FortreeCity_House5:: @ 83064E8 .4byte FortreeCity_House5_MapEvents .4byte FortreeCity_House5_MapScripts .4byte 0x0 - .2byte 382 + .2byte BGM_MACHI_S3 .2byte 99 .byte 11 .byte 0 diff --git a/data/maps/FortreeCity_Mart/header.s b/data/maps/FortreeCity_Mart/header.s index 2664b2489..4b8793d36 100644 --- a/data/maps/FortreeCity_Mart/header.s +++ b/data/maps/FortreeCity_Mart/header.s @@ -3,7 +3,7 @@ FortreeCity_Mart:: @ 8306478 .4byte FortreeCity_Mart_MapEvents .4byte FortreeCity_Mart_MapScripts .4byte 0x0 - .2byte 404 + .2byte BGM_FRIENDLY .2byte 63 .byte 11 .byte 0 diff --git a/data/maps/FortreeCity_PokemonCenter_1F/header.s b/data/maps/FortreeCity_PokemonCenter_1F/header.s index 0e1f89a65..fcafbe2af 100644 --- a/data/maps/FortreeCity_PokemonCenter_1F/header.s +++ b/data/maps/FortreeCity_PokemonCenter_1F/header.s @@ -3,7 +3,7 @@ FortreeCity_PokemonCenter_1F:: @ 8306440 .4byte FortreeCity_PokemonCenter_1F_MapEvents .4byte FortreeCity_PokemonCenter_1F_MapScripts .4byte 0x0 - .2byte 400 + .2byte BGM_POKECEN .2byte 61 .byte 11 .byte 0 diff --git a/data/maps/FortreeCity_PokemonCenter_2F/header.s b/data/maps/FortreeCity_PokemonCenter_2F/header.s index 798502754..0421b7880 100644 --- a/data/maps/FortreeCity_PokemonCenter_2F/header.s +++ b/data/maps/FortreeCity_PokemonCenter_2F/header.s @@ -3,7 +3,7 @@ FortreeCity_PokemonCenter_2F:: @ 830645C .4byte FortreeCity_PokemonCenter_2F_MapEvents .4byte FortreeCity_PokemonCenter_2F_MapScripts .4byte 0x0 - .2byte 400 + .2byte BGM_POKECEN .2byte 62 .byte 11 .byte 0 diff --git a/data/maps/GraniteCave_1F/header.s b/data/maps/GraniteCave_1F/header.s index e4a362d11..cf22ded8a 100644 --- a/data/maps/GraniteCave_1F/header.s +++ b/data/maps/GraniteCave_1F/header.s @@ -3,7 +3,7 @@ GraniteCave_1F:: @ 8306E34 .4byte GraniteCave_1F_MapEvents .4byte GraniteCave_1F_MapScripts .4byte 0x0 - .2byte 366 + .2byte BGM_DAN01 .2byte 133 .byte 55 .byte 0 diff --git a/data/maps/GraniteCave_B1F/header.s b/data/maps/GraniteCave_B1F/header.s index 3cc5dcf1e..654803312 100644 --- a/data/maps/GraniteCave_B1F/header.s +++ b/data/maps/GraniteCave_B1F/header.s @@ -3,7 +3,7 @@ GraniteCave_B1F:: @ 8306E50 .4byte GraniteCave_B1F_MapEvents .4byte GraniteCave_B1F_MapScripts .4byte 0x0 - .2byte 366 + .2byte BGM_DAN01 .2byte 134 .byte 55 .byte 1 diff --git a/data/maps/GraniteCave_B2F/header.s b/data/maps/GraniteCave_B2F/header.s index bed072720..4d243f3da 100644 --- a/data/maps/GraniteCave_B2F/header.s +++ b/data/maps/GraniteCave_B2F/header.s @@ -3,7 +3,7 @@ GraniteCave_B2F:: @ 8306E6C .4byte GraniteCave_B2F_MapEvents .4byte GraniteCave_B2F_MapScripts .4byte 0x0 - .2byte 366 + .2byte BGM_DAN01 .2byte 135 .byte 55 .byte 1 diff --git a/data/maps/GraniteCave_StevensRoom/header.s b/data/maps/GraniteCave_StevensRoom/header.s index 52c40b121..fb9b18436 100644 --- a/data/maps/GraniteCave_StevensRoom/header.s +++ b/data/maps/GraniteCave_StevensRoom/header.s @@ -3,7 +3,7 @@ GraniteCave_StevensRoom:: @ 8306E88 .4byte GraniteCave_StevensRoom_MapEvents .4byte GraniteCave_StevensRoom_MapScripts .4byte 0x0 - .2byte 366 + .2byte BGM_DAN01 .2byte 289 .byte 55 .byte 0 diff --git a/data/maps/InsideOfTruck/header.s b/data/maps/InsideOfTruck/header.s index 2f1ee1fc4..ee88d280d 100644 --- a/data/maps/InsideOfTruck/header.s +++ b/data/maps/InsideOfTruck/header.s @@ -3,7 +3,7 @@ InsideOfTruck:: @ 8307B38 .4byte InsideOfTruck_MapEvents .4byte InsideOfTruck_MapScripts .4byte 0x0 - .2byte 0 + .2byte SE_STOP .2byte 238 .byte 84 .byte 0 diff --git a/data/maps/IslandCave/header.s b/data/maps/IslandCave/header.s index f60b76813..f811fe3da 100644 --- a/data/maps/IslandCave/header.s +++ b/data/maps/IslandCave/header.s @@ -3,7 +3,7 @@ IslandCave:: @ 83074C4 .4byte IslandCave_MapEvents .4byte IslandCave_MapScripts .4byte 0x0 - .2byte 438 + .2byte BGM_MABOROSI .2byte 281 .byte 81 .byte 0 diff --git a/data/maps/JaggedPass/header.s b/data/maps/JaggedPass/header.s index 3f0fbc61f..6770756e8 100644 --- a/data/maps/JaggedPass/header.s +++ b/data/maps/JaggedPass/header.s @@ -3,7 +3,7 @@ JaggedPass:: @ 8306EDC .4byte JaggedPass_MapEvents .4byte JaggedPass_MapScripts .4byte 0x0 - .2byte 366 + .2byte BGM_DAN01 .2byte 293 .byte 76 .byte 0 diff --git a/data/maps/LavaridgeTown/header.s b/data/maps/LavaridgeTown/header.s index fa9ba9ee7..e34eec863 100644 --- a/data/maps/LavaridgeTown/header.s +++ b/data/maps/LavaridgeTown/header.s @@ -3,7 +3,7 @@ LavaridgeTown:: @ 8305598 .4byte LavaridgeTown_MapEvents .4byte LavaridgeTown_MapScripts .4byte LavaridgeTown_MapConnections - .2byte 363 + .2byte BGM_MACHI_S4 .2byte 13 .byte 3 .byte 0 diff --git a/data/maps/LavaridgeTown_Gym_1F/header.s b/data/maps/LavaridgeTown_Gym_1F/header.s index 2051cd18d..929b07ae7 100644 --- a/data/maps/LavaridgeTown_Gym_1F/header.s +++ b/data/maps/LavaridgeTown_Gym_1F/header.s @@ -3,7 +3,7 @@ LavaridgeTown_Gym_1F:: @ 8305C0C .4byte LavaridgeTown_Gym_1F_MapEvents .4byte LavaridgeTown_Gym_1F_MapScripts .4byte 0x0 - .2byte 364 + .2byte BGM_GIM .2byte 69 .byte 3 .byte 0 diff --git a/data/maps/LavaridgeTown_Gym_B1F/header.s b/data/maps/LavaridgeTown_Gym_B1F/header.s index 21fb9f56a..d8a747789 100644 --- a/data/maps/LavaridgeTown_Gym_B1F/header.s +++ b/data/maps/LavaridgeTown_Gym_B1F/header.s @@ -3,7 +3,7 @@ LavaridgeTown_Gym_B1F:: @ 8305C28 .4byte LavaridgeTown_Gym_B1F_MapEvents .4byte LavaridgeTown_Gym_B1F_MapScripts .4byte 0x0 - .2byte 364 + .2byte BGM_GIM .2byte 70 .byte 3 .byte 0 diff --git a/data/maps/LavaridgeTown_HerbShop/header.s b/data/maps/LavaridgeTown_HerbShop/header.s index 08a0c45ec..f44118c5c 100644 --- a/data/maps/LavaridgeTown_HerbShop/header.s +++ b/data/maps/LavaridgeTown_HerbShop/header.s @@ -3,7 +3,7 @@ LavaridgeTown_HerbShop:: @ 8305BF0 .4byte LavaridgeTown_HerbShop_MapEvents .4byte LavaridgeTown_HerbShop_MapScripts .4byte 0x0 - .2byte 363 + .2byte BGM_MACHI_S4 .2byte 68 .byte 3 .byte 0 diff --git a/data/maps/LavaridgeTown_House/header.s b/data/maps/LavaridgeTown_House/header.s index 1973e43be..f43ea0bc4 100644 --- a/data/maps/LavaridgeTown_House/header.s +++ b/data/maps/LavaridgeTown_House/header.s @@ -3,7 +3,7 @@ LavaridgeTown_House:: @ 8305C44 .4byte LavaridgeTown_House_MapEvents .4byte LavaridgeTown_House_MapScripts .4byte 0x0 - .2byte 363 + .2byte BGM_MACHI_S4 .2byte 64 .byte 3 .byte 0 diff --git a/data/maps/LavaridgeTown_Mart/header.s b/data/maps/LavaridgeTown_Mart/header.s index 8539aa534..0882a6bf0 100644 --- a/data/maps/LavaridgeTown_Mart/header.s +++ b/data/maps/LavaridgeTown_Mart/header.s @@ -3,7 +3,7 @@ LavaridgeTown_Mart:: @ 8305C60 .4byte LavaridgeTown_Mart_MapEvents .4byte LavaridgeTown_Mart_MapScripts .4byte 0x0 - .2byte 404 + .2byte BGM_FRIENDLY .2byte 63 .byte 3 .byte 0 diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/header.s b/data/maps/LavaridgeTown_PokemonCenter_1F/header.s index 4d1a204dd..78576d740 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_1F/header.s +++ b/data/maps/LavaridgeTown_PokemonCenter_1F/header.s @@ -3,7 +3,7 @@ LavaridgeTown_PokemonCenter_1F:: @ 8305C7C .4byte LavaridgeTown_PokemonCenter_1F_MapEvents .4byte LavaridgeTown_PokemonCenter_1F_MapScripts .4byte 0x0 - .2byte 400 + .2byte BGM_POKECEN .2byte 71 .byte 3 .byte 0 diff --git a/data/maps/LavaridgeTown_PokemonCenter_2F/header.s b/data/maps/LavaridgeTown_PokemonCenter_2F/header.s index 4de09efd1..3d86fa588 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_2F/header.s +++ b/data/maps/LavaridgeTown_PokemonCenter_2F/header.s @@ -3,7 +3,7 @@ LavaridgeTown_PokemonCenter_2F:: @ 8305C98 .4byte LavaridgeTown_PokemonCenter_2F_MapEvents .4byte LavaridgeTown_PokemonCenter_2F_MapScripts .4byte 0x0 - .2byte 400 + .2byte BGM_POKECEN .2byte 62 .byte 3 .byte 0 diff --git a/data/maps/LilycoveCity/header.s b/data/maps/LilycoveCity/header.s index e364a422f..204e2098d 100644 --- a/data/maps/LilycoveCity/header.s +++ b/data/maps/LilycoveCity/header.s @@ -3,7 +3,7 @@ LilycoveCity:: @ 83054D4 .4byte LilycoveCity_MapEvents .4byte LilycoveCity_MapScripts .4byte LilycoveCity_MapConnections - .2byte 408 + .2byte BGM_MINAMO .2byte 6 .byte 12 .byte 0 diff --git a/data/maps/LilycoveCity_ContestHall/header.s b/data/maps/LilycoveCity_ContestHall/header.s index eaf143e2c..47329e0f7 100644 --- a/data/maps/LilycoveCity_ContestHall/header.s +++ b/data/maps/LilycoveCity_ContestHall/header.s @@ -3,7 +3,7 @@ LilycoveCity_ContestHall:: @ 83065AC .4byte LilycoveCity_ContestHall_MapEvents .4byte LilycoveCity_ContestHall_MapScripts .4byte 0x0 - .2byte 452 + .2byte BGM_CONLOBBY .2byte 106 .byte 12 .byte 0 diff --git a/data/maps/LilycoveCity_ContestLobby/header.s b/data/maps/LilycoveCity_ContestLobby/header.s index a9630d22e..5bf98a32b 100644 --- a/data/maps/LilycoveCity_ContestLobby/header.s +++ b/data/maps/LilycoveCity_ContestLobby/header.s @@ -3,7 +3,7 @@ LilycoveCity_ContestLobby:: @ 8306590 .4byte LilycoveCity_ContestLobby_MapEvents .4byte LilycoveCity_ContestLobby_MapScripts .4byte 0x0 - .2byte 452 + .2byte BGM_CONLOBBY .2byte 105 .byte 12 .byte 0 diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/header.s b/data/maps/LilycoveCity_CoveLilyMotel_1F/header.s index 1496cb162..141fda863 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/header.s +++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/header.s @@ -3,7 +3,7 @@ LilycoveCity_CoveLilyMotel_1F:: @ 8306520 .4byte LilycoveCity_CoveLilyMotel_1F_MapEvents .4byte LilycoveCity_CoveLilyMotel_1F_MapScripts .4byte 0x0 - .2byte 408 + .2byte BGM_MINAMO .2byte 300 .byte 12 .byte 0 diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/header.s b/data/maps/LilycoveCity_CoveLilyMotel_2F/header.s index a136ffd06..2d6f9de4b 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/header.s +++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/header.s @@ -3,7 +3,7 @@ LilycoveCity_CoveLilyMotel_2F:: @ 830653C .4byte LilycoveCity_CoveLilyMotel_2F_MapEvents .4byte LilycoveCity_CoveLilyMotel_2F_MapScripts .4byte 0x0 - .2byte 408 + .2byte BGM_MINAMO .2byte 301 .byte 12 .byte 0 diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/header.s b/data/maps/LilycoveCity_DepartmentStoreElevator/header.s index 8c3f029aa..3f1a8ada9 100644 --- a/data/maps/LilycoveCity_DepartmentStoreElevator/header.s +++ b/data/maps/LilycoveCity_DepartmentStoreElevator/header.s @@ -3,7 +3,7 @@ LilycoveCity_DepartmentStoreElevator:: @ 83067A4 .4byte LilycoveCity_DepartmentStoreElevator_MapEvents .4byte LilycoveCity_DepartmentStoreElevator_MapScripts .4byte 0x0 - .2byte 408 + .2byte BGM_MINAMO .2byte 274 .byte 12 .byte 0 diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/header.s b/data/maps/LilycoveCity_DepartmentStoreRooftop/header.s index 3a55748b2..292c621d3 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/header.s +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/header.s @@ -3,7 +3,7 @@ LilycoveCity_DepartmentStoreRooftop:: @ 8306788 .4byte LilycoveCity_DepartmentStoreRooftop_MapEvents .4byte LilycoveCity_DepartmentStoreRooftop_MapScripts .4byte 0x0 - .2byte 408 + .2byte BGM_MINAMO .2byte 263 .byte 12 .byte 0 diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/header.s b/data/maps/LilycoveCity_DepartmentStore_1F/header.s index 2ee2bb677..ecfb77604 100644 --- a/data/maps/LilycoveCity_DepartmentStore_1F/header.s +++ b/data/maps/LilycoveCity_DepartmentStore_1F/header.s @@ -3,7 +3,7 @@ LilycoveCity_DepartmentStore_1F:: @ 83066FC .4byte LilycoveCity_DepartmentStore_1F_MapEvents .4byte LilycoveCity_DepartmentStore_1F_MapScripts .4byte 0x0 - .2byte 408 + .2byte BGM_MINAMO .2byte 258 .byte 12 .byte 0 diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/header.s b/data/maps/LilycoveCity_DepartmentStore_2F/header.s index ded2d806e..f10428935 100644 --- a/data/maps/LilycoveCity_DepartmentStore_2F/header.s +++ b/data/maps/LilycoveCity_DepartmentStore_2F/header.s @@ -3,7 +3,7 @@ LilycoveCity_DepartmentStore_2F:: @ 8306718 .4byte LilycoveCity_DepartmentStore_2F_MapEvents .4byte LilycoveCity_DepartmentStore_2F_MapScripts .4byte 0x0 - .2byte 404 + .2byte BGM_FRIENDLY .2byte 259 .byte 12 .byte 0 diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/header.s b/data/maps/LilycoveCity_DepartmentStore_3F/header.s index 3f9ad6257..16f453da0 100644 --- a/data/maps/LilycoveCity_DepartmentStore_3F/header.s +++ b/data/maps/LilycoveCity_DepartmentStore_3F/header.s @@ -3,7 +3,7 @@ LilycoveCity_DepartmentStore_3F:: @ 8306734 .4byte LilycoveCity_DepartmentStore_3F_MapEvents .4byte LilycoveCity_DepartmentStore_3F_MapScripts .4byte 0x0 - .2byte 404 + .2byte BGM_FRIENDLY .2byte 260 .byte 12 .byte 0 diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/header.s b/data/maps/LilycoveCity_DepartmentStore_4F/header.s index 65e02a8fd..169f21d92 100644 --- a/data/maps/LilycoveCity_DepartmentStore_4F/header.s +++ b/data/maps/LilycoveCity_DepartmentStore_4F/header.s @@ -3,7 +3,7 @@ LilycoveCity_DepartmentStore_4F:: @ 8306750 .4byte LilycoveCity_DepartmentStore_4F_MapEvents .4byte LilycoveCity_DepartmentStore_4F_MapScripts .4byte 0x0 - .2byte 404 + .2byte BGM_FRIENDLY .2byte 261 .byte 12 .byte 0 diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/header.s b/data/maps/LilycoveCity_DepartmentStore_5F/header.s index fefdcb37b..19b45696c 100644 --- a/data/maps/LilycoveCity_DepartmentStore_5F/header.s +++ b/data/maps/LilycoveCity_DepartmentStore_5F/header.s @@ -3,7 +3,7 @@ LilycoveCity_DepartmentStore_5F:: @ 830676C .4byte LilycoveCity_DepartmentStore_5F_MapEvents .4byte LilycoveCity_DepartmentStore_5F_MapScripts .4byte 0x0 - .2byte 404 + .2byte BGM_FRIENDLY .2byte 262 .byte 12 .byte 0 diff --git a/data/maps/LilycoveCity_EmptyMap/header.s b/data/maps/LilycoveCity_EmptyMap/header.s index f9fe3959d..a83e7139d 100644 --- a/data/maps/LilycoveCity_EmptyMap/header.s +++ b/data/maps/LilycoveCity_EmptyMap/header.s @@ -3,7 +3,7 @@ LilycoveCity_EmptyMap:: @ 8306654 .4byte LilycoveCity_EmptyMap_MapEvents .4byte LilycoveCity_EmptyMap_MapScripts .4byte 0x0 - .2byte 408 + .2byte BGM_MINAMO .2byte 108 .byte 12 .byte 0 diff --git a/data/maps/LilycoveCity_Harbor/header.s b/data/maps/LilycoveCity_Harbor/header.s index bac55f148..022eb0356 100644 --- a/data/maps/LilycoveCity_Harbor/header.s +++ b/data/maps/LilycoveCity_Harbor/header.s @@ -3,7 +3,7 @@ LilycoveCity_Harbor:: @ 8306638 .4byte LilycoveCity_Harbor_MapEvents .4byte LilycoveCity_Harbor_MapScripts .4byte 0x0 - .2byte 408 + .2byte BGM_MINAMO .2byte 88 .byte 12 .byte 0 diff --git a/data/maps/LilycoveCity_House1/header.s b/data/maps/LilycoveCity_House1/header.s index 47ca2617b..5cfc8540b 100644 --- a/data/maps/LilycoveCity_House1/header.s +++ b/data/maps/LilycoveCity_House1/header.s @@ -3,7 +3,7 @@ LilycoveCity_House1:: @ 830668C .4byte LilycoveCity_House1_MapEvents .4byte LilycoveCity_House1_MapScripts .4byte 0x0 - .2byte 408 + .2byte BGM_MINAMO .2byte 59 .byte 12 .byte 0 diff --git a/data/maps/LilycoveCity_House2/header.s b/data/maps/LilycoveCity_House2/header.s index 735a2375c..8aac9185c 100644 --- a/data/maps/LilycoveCity_House2/header.s +++ b/data/maps/LilycoveCity_House2/header.s @@ -3,7 +3,7 @@ LilycoveCity_House2:: @ 83066A8 .4byte LilycoveCity_House2_MapEvents .4byte LilycoveCity_House2_MapScripts .4byte 0x0 - .2byte 408 + .2byte BGM_MINAMO .2byte 74 .byte 12 .byte 0 diff --git a/data/maps/LilycoveCity_House3/header.s b/data/maps/LilycoveCity_House3/header.s index 63cd45911..599e904d5 100644 --- a/data/maps/LilycoveCity_House3/header.s +++ b/data/maps/LilycoveCity_House3/header.s @@ -3,7 +3,7 @@ LilycoveCity_House3:: @ 83066C4 .4byte LilycoveCity_House3_MapEvents .4byte LilycoveCity_House3_MapScripts .4byte 0x0 - .2byte 408 + .2byte BGM_MINAMO .2byte 60 .byte 12 .byte 0 diff --git a/data/maps/LilycoveCity_House4/header.s b/data/maps/LilycoveCity_House4/header.s index 6137fcc46..d9cd2c7f0 100644 --- a/data/maps/LilycoveCity_House4/header.s +++ b/data/maps/LilycoveCity_House4/header.s @@ -3,7 +3,7 @@ LilycoveCity_House4:: @ 83066E0 .4byte LilycoveCity_House4_MapEvents .4byte LilycoveCity_House4_MapScripts .4byte 0x0 - .2byte 408 + .2byte BGM_MINAMO .2byte 59 .byte 12 .byte 0 diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/header.s b/data/maps/LilycoveCity_LilycoveMuseum_1F/header.s index 45a6c3531..d48ffc94f 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/header.s +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/header.s @@ -3,7 +3,7 @@ LilycoveCity_LilycoveMuseum_1F:: @ 8306558 .4byte LilycoveCity_LilycoveMuseum_1F_MapEvents .4byte LilycoveCity_LilycoveMuseum_1F_MapScripts .4byte 0x0 - .2byte 373 + .2byte BGM_BIJYUTU .2byte 103 .byte 12 .byte 0 diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/header.s b/data/maps/LilycoveCity_LilycoveMuseum_2F/header.s index 84ff93244..460ed87f9 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/header.s +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/header.s @@ -3,7 +3,7 @@ LilycoveCity_LilycoveMuseum_2F:: @ 8306574 .4byte LilycoveCity_LilycoveMuseum_2F_MapEvents .4byte LilycoveCity_LilycoveMuseum_2F_MapScripts .4byte 0x0 - .2byte 373 + .2byte BGM_BIJYUTU .2byte 104 .byte 12 .byte 0 diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/header.s b/data/maps/LilycoveCity_MoveDeletersHouse/header.s index 338921b0c..bcfc3435f 100644 --- a/data/maps/LilycoveCity_MoveDeletersHouse/header.s +++ b/data/maps/LilycoveCity_MoveDeletersHouse/header.s @@ -3,7 +3,7 @@ LilycoveCity_MoveDeletersHouse:: @ 8306670 .4byte LilycoveCity_MoveDeletersHouse_MapEvents .4byte LilycoveCity_MoveDeletersHouse_MapScripts .4byte 0x0 - .2byte 408 + .2byte BGM_MINAMO .2byte 60 .byte 12 .byte 0 diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/header.s b/data/maps/LilycoveCity_PokemonCenter_1F/header.s index 21e5e11c9..a1eb040ae 100644 --- a/data/maps/LilycoveCity_PokemonCenter_1F/header.s +++ b/data/maps/LilycoveCity_PokemonCenter_1F/header.s @@ -3,7 +3,7 @@ LilycoveCity_PokemonCenter_1F:: @ 83065C8 .4byte LilycoveCity_PokemonCenter_1F_MapEvents .4byte LilycoveCity_PokemonCenter_1F_MapScripts .4byte 0x0 - .2byte 400 + .2byte BGM_POKECEN .2byte 61 .byte 12 .byte 0 diff --git a/data/maps/LilycoveCity_PokemonCenter_2F/header.s b/data/maps/LilycoveCity_PokemonCenter_2F/header.s index 3dda04d36..341ce8590 100644 --- a/data/maps/LilycoveCity_PokemonCenter_2F/header.s +++ b/data/maps/LilycoveCity_PokemonCenter_2F/header.s @@ -3,7 +3,7 @@ LilycoveCity_PokemonCenter_2F:: @ 83065E4 .4byte LilycoveCity_PokemonCenter_2F_MapEvents .4byte LilycoveCity_PokemonCenter_2F_MapScripts .4byte 0x0 - .2byte 400 + .2byte BGM_POKECEN .2byte 62 .byte 12 .byte 0 diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/header.s b/data/maps/LilycoveCity_PokemonTrainerFanClub/header.s index deffd48d5..4e75b2193 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/header.s +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/header.s @@ -3,7 +3,7 @@ LilycoveCity_PokemonTrainerFanClub:: @ 830661C .4byte LilycoveCity_PokemonTrainerFanClub_MapEvents .4byte LilycoveCity_PokemonTrainerFanClub_MapScripts .4byte 0x0 - .2byte 408 + .2byte BGM_MINAMO .2byte 107 .byte 12 .byte 0 diff --git a/data/maps/LilycoveCity_UnusedMart/header.s b/data/maps/LilycoveCity_UnusedMart/header.s index 8b22ea2a7..43137d33b 100644 --- a/data/maps/LilycoveCity_UnusedMart/header.s +++ b/data/maps/LilycoveCity_UnusedMart/header.s @@ -3,7 +3,7 @@ LilycoveCity_UnusedMart:: @ 8306600 .4byte LilycoveCity_UnusedMart_MapEvents .4byte LilycoveCity_UnusedMart_MapScripts .4byte 0x0 - .2byte 404 + .2byte BGM_FRIENDLY .2byte 63 .byte 12 .byte 0 diff --git a/data/maps/LinkContestRoom1/header.s b/data/maps/LinkContestRoom1/header.s index 67d4b0994..9e265d9c9 100644 --- a/data/maps/LinkContestRoom1/header.s +++ b/data/maps/LinkContestRoom1/header.s @@ -3,7 +3,7 @@ LinkContestRoom1:: @ 83079E8 .4byte LinkContestRoom1_MapEvents .4byte LinkContestRoom1_MapScripts .4byte 0x0 - .2byte 440 + .2byte BGM_CONTEST0 .2byte 226 .byte 87 .byte 0 diff --git a/data/maps/LinkContestRoom2/header.s b/data/maps/LinkContestRoom2/header.s index a2a5831b1..f492eab03 100644 --- a/data/maps/LinkContestRoom2/header.s +++ b/data/maps/LinkContestRoom2/header.s @@ -3,7 +3,7 @@ LinkContestRoom2:: @ 8307AAC .4byte LinkContestRoom2_MapEvents .4byte LinkContestRoom2_MapScripts .4byte 0x0 - .2byte 440 + .2byte BGM_CONTEST0 .2byte 233 .byte 87 .byte 0 diff --git a/data/maps/LinkContestRoom3/header.s b/data/maps/LinkContestRoom3/header.s index 156212502..90de4491d 100644 --- a/data/maps/LinkContestRoom3/header.s +++ b/data/maps/LinkContestRoom3/header.s @@ -3,7 +3,7 @@ LinkContestRoom3:: @ 8307AC8 .4byte LinkContestRoom3_MapEvents .4byte LinkContestRoom3_MapScripts .4byte 0x0 - .2byte 440 + .2byte BGM_CONTEST0 .2byte 234 .byte 87 .byte 0 diff --git a/data/maps/LinkContestRoom4/header.s b/data/maps/LinkContestRoom4/header.s index a931c7a6f..774e55abc 100644 --- a/data/maps/LinkContestRoom4/header.s +++ b/data/maps/LinkContestRoom4/header.s @@ -3,7 +3,7 @@ LinkContestRoom4:: @ 8307AE4 .4byte LinkContestRoom4_MapEvents .4byte LinkContestRoom4_MapScripts .4byte 0x0 - .2byte 440 + .2byte BGM_CONTEST0 .2byte 235 .byte 87 .byte 0 diff --git a/data/maps/LinkContestRoom5/header.s b/data/maps/LinkContestRoom5/header.s index 33e4b99e3..22b90f6c9 100644 --- a/data/maps/LinkContestRoom5/header.s +++ b/data/maps/LinkContestRoom5/header.s @@ -3,7 +3,7 @@ LinkContestRoom5:: @ 8307B00 .4byte LinkContestRoom5_MapEvents .4byte LinkContestRoom5_MapScripts .4byte 0x0 - .2byte 440 + .2byte BGM_CONTEST0 .2byte 236 .byte 87 .byte 0 diff --git a/data/maps/LinkContestRoom6/header.s b/data/maps/LinkContestRoom6/header.s index 8aa8d5a7b..773912080 100644 --- a/data/maps/LinkContestRoom6/header.s +++ b/data/maps/LinkContestRoom6/header.s @@ -3,7 +3,7 @@ LinkContestRoom6:: @ 8307B1C .4byte LinkContestRoom6_MapEvents .4byte LinkContestRoom6_MapScripts .4byte 0x0 - .2byte 440 + .2byte BGM_CONTEST0 .2byte 237 .byte 87 .byte 0 diff --git a/data/maps/LittlerootTown/header.s b/data/maps/LittlerootTown/header.s index dc70e474f..5493f6005 100644 --- a/data/maps/LittlerootTown/header.s +++ b/data/maps/LittlerootTown/header.s @@ -3,7 +3,7 @@ LittlerootTown:: @ 8305544 .4byte LittlerootTown_MapEvents .4byte LittlerootTown_MapScripts .4byte LittlerootTown_MapConnections - .2byte 405 + .2byte BGM_MISHIRO .2byte 10 .byte 0 .byte 0 diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/header.s b/data/maps/LittlerootTown_BrendansHouse_1F/header.s index 553257c28..122fdc82a 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/header.s +++ b/data/maps/LittlerootTown_BrendansHouse_1F/header.s @@ -3,7 +3,7 @@ LittlerootTown_BrendansHouse_1F:: @ 8305A30 .4byte LittlerootTown_BrendansHouse_1F_MapEvents .4byte LittlerootTown_BrendansHouse_1F_MapScripts .4byte 0x0 - .2byte 405 + .2byte BGM_MISHIRO .2byte 54 .byte 0 .byte 0 diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/header.s b/data/maps/LittlerootTown_BrendansHouse_2F/header.s index 4c195fa1d..449a883cb 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/header.s +++ b/data/maps/LittlerootTown_BrendansHouse_2F/header.s @@ -3,7 +3,7 @@ LittlerootTown_BrendansHouse_2F:: @ 8305A4C .4byte LittlerootTown_BrendansHouse_2F_MapEvents .4byte LittlerootTown_BrendansHouse_2F_MapScripts .4byte 0x0 - .2byte 405 + .2byte BGM_MISHIRO .2byte 55 .byte 0 .byte 0 diff --git a/data/maps/LittlerootTown_MaysHouse_1F/header.s b/data/maps/LittlerootTown_MaysHouse_1F/header.s index d89c99680..6d6220086 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/header.s +++ b/data/maps/LittlerootTown_MaysHouse_1F/header.s @@ -3,7 +3,7 @@ LittlerootTown_MaysHouse_1F:: @ 8305A68 .4byte LittlerootTown_MaysHouse_1F_MapEvents .4byte LittlerootTown_MaysHouse_1F_MapScripts .4byte 0x0 - .2byte 405 + .2byte BGM_MISHIRO .2byte 56 .byte 0 .byte 0 diff --git a/data/maps/LittlerootTown_MaysHouse_2F/header.s b/data/maps/LittlerootTown_MaysHouse_2F/header.s index 6b2e72b77..44859dd4c 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/header.s +++ b/data/maps/LittlerootTown_MaysHouse_2F/header.s @@ -3,7 +3,7 @@ LittlerootTown_MaysHouse_2F:: @ 8305A84 .4byte LittlerootTown_MaysHouse_2F_MapEvents .4byte LittlerootTown_MaysHouse_2F_MapScripts .4byte 0x0 - .2byte 405 + .2byte BGM_MISHIRO .2byte 57 .byte 0 .byte 0 diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/header.s b/data/maps/LittlerootTown_ProfessorBirchsLab/header.s index 669f3cdd2..31fb03c64 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/header.s +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/header.s @@ -3,7 +3,7 @@ LittlerootTown_ProfessorBirchsLab:: @ 8305AA0 .4byte LittlerootTown_ProfessorBirchsLab_MapEvents .4byte LittlerootTown_ProfessorBirchsLab_MapScripts .4byte 0x0 - .2byte 383 + .2byte BGM_ODAMAKI .2byte 58 .byte 0 .byte 0 diff --git a/data/maps/MagmaHideout_1F/header.s b/data/maps/MagmaHideout_1F/header.s index dd057a802..3876e17ec 100644 --- a/data/maps/MagmaHideout_1F/header.s +++ b/data/maps/MagmaHideout_1F/header.s @@ -3,7 +3,7 @@ MagmaHideout_1F:: @ 8307588 .4byte MagmaHideout_1F_MapEvents .4byte MagmaHideout_1F_MapScripts .4byte 0x0 - .2byte 430 + .2byte BGM_AJITO .2byte 317 .byte 66 .byte 0 diff --git a/data/maps/MagmaHideout_B1F/header.s b/data/maps/MagmaHideout_B1F/header.s index 1a61acd3b..16fe3f2ba 100644 --- a/data/maps/MagmaHideout_B1F/header.s +++ b/data/maps/MagmaHideout_B1F/header.s @@ -3,7 +3,7 @@ MagmaHideout_B1F:: @ 83075A4 .4byte MagmaHideout_B1F_MapEvents .4byte MagmaHideout_B1F_MapScripts .4byte 0x0 - .2byte 430 + .2byte BGM_AJITO .2byte 318 .byte 66 .byte 0 diff --git a/data/maps/MagmaHideout_B2F/header.s b/data/maps/MagmaHideout_B2F/header.s index 9e7ec2583..3aee695b4 100644 --- a/data/maps/MagmaHideout_B2F/header.s +++ b/data/maps/MagmaHideout_B2F/header.s @@ -3,7 +3,7 @@ MagmaHideout_B2F:: @ 83075C0 .4byte MagmaHideout_B2F_MapEvents .4byte MagmaHideout_B2F_MapScripts .4byte 0x0 - .2byte 430 + .2byte BGM_AJITO .2byte 319 .byte 66 .byte 0 diff --git a/data/maps/MauvilleCity/header.s b/data/maps/MauvilleCity/header.s index 350fb891d..e0e2c4f22 100644 --- a/data/maps/MauvilleCity/header.s +++ b/data/maps/MauvilleCity/header.s @@ -3,7 +3,7 @@ MauvilleCity:: @ 8305480 .4byte MauvilleCity_MapEvents .4byte MauvilleCity_MapScripts .4byte MauvilleCity_MapConnections - .2byte 399 + .2byte BGM_GOTOWN .2byte 3 .byte 9 .byte 0 diff --git a/data/maps/MauvilleCity_BikeShop/header.s b/data/maps/MauvilleCity_BikeShop/header.s index 89577e200..c99124794 100644 --- a/data/maps/MauvilleCity_BikeShop/header.s +++ b/data/maps/MauvilleCity_BikeShop/header.s @@ -3,7 +3,7 @@ MauvilleCity_BikeShop:: @ 8306168 .4byte MauvilleCity_BikeShop_MapEvents .4byte MauvilleCity_BikeShop_MapScripts .4byte 0x0 - .2byte 399 + .2byte BGM_GOTOWN .2byte 90 .byte 9 .byte 0 diff --git a/data/maps/MauvilleCity_GameCorner/header.s b/data/maps/MauvilleCity_GameCorner/header.s index 052b32314..653a41544 100644 --- a/data/maps/MauvilleCity_GameCorner/header.s +++ b/data/maps/MauvilleCity_GameCorner/header.s @@ -3,7 +3,7 @@ MauvilleCity_GameCorner:: @ 83061A0 .4byte MauvilleCity_GameCorner_MapEvents .4byte MauvilleCity_GameCorner_MapScripts .4byte 0x0 - .2byte 426 + .2byte BGM_CASINO .2byte 91 .byte 9 .byte 0 diff --git a/data/maps/MauvilleCity_Gym/header.s b/data/maps/MauvilleCity_Gym/header.s index 572978efc..efbd61fe0 100644 --- a/data/maps/MauvilleCity_Gym/header.s +++ b/data/maps/MauvilleCity_Gym/header.s @@ -3,7 +3,7 @@ MauvilleCity_Gym:: @ 830614C .4byte MauvilleCity_Gym_MapEvents .4byte MauvilleCity_Gym_MapScripts .4byte 0x0 - .2byte 364 + .2byte BGM_GIM .2byte 89 .byte 9 .byte 0 diff --git a/data/maps/MauvilleCity_House1/header.s b/data/maps/MauvilleCity_House1/header.s index 2191d7996..30c59da1e 100644 --- a/data/maps/MauvilleCity_House1/header.s +++ b/data/maps/MauvilleCity_House1/header.s @@ -3,7 +3,7 @@ MauvilleCity_House1:: @ 8306184 .4byte MauvilleCity_House1_MapEvents .4byte MauvilleCity_House1_MapScripts .4byte 0x0 - .2byte 399 + .2byte BGM_GOTOWN .2byte 60 .byte 9 .byte 0 diff --git a/data/maps/MauvilleCity_House2/header.s b/data/maps/MauvilleCity_House2/header.s index ff6ea8f07..9bd7d9c11 100644 --- a/data/maps/MauvilleCity_House2/header.s +++ b/data/maps/MauvilleCity_House2/header.s @@ -3,7 +3,7 @@ MauvilleCity_House2:: @ 83061BC .4byte MauvilleCity_House2_MapEvents .4byte MauvilleCity_House2_MapScripts .4byte 0x0 - .2byte 399 + .2byte BGM_GOTOWN .2byte 59 .byte 9 .byte 0 diff --git a/data/maps/MauvilleCity_Mart/header.s b/data/maps/MauvilleCity_Mart/header.s index 9c0406e58..7712e16df 100644 --- a/data/maps/MauvilleCity_Mart/header.s +++ b/data/maps/MauvilleCity_Mart/header.s @@ -3,7 +3,7 @@ MauvilleCity_Mart:: @ 8306210 .4byte MauvilleCity_Mart_MapEvents .4byte MauvilleCity_Mart_MapScripts .4byte 0x0 - .2byte 404 + .2byte BGM_FRIENDLY .2byte 63 .byte 9 .byte 0 diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/header.s b/data/maps/MauvilleCity_PokemonCenter_1F/header.s index 05e5da891..b6e0a1628 100644 --- a/data/maps/MauvilleCity_PokemonCenter_1F/header.s +++ b/data/maps/MauvilleCity_PokemonCenter_1F/header.s @@ -3,7 +3,7 @@ MauvilleCity_PokemonCenter_1F:: @ 83061D8 .4byte MauvilleCity_PokemonCenter_1F_MapEvents .4byte MauvilleCity_PokemonCenter_1F_MapScripts .4byte 0x0 - .2byte 400 + .2byte BGM_POKECEN .2byte 61 .byte 9 .byte 0 diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/header.s b/data/maps/MauvilleCity_PokemonCenter_2F/header.s index f54b76b56..8787c975e 100644 --- a/data/maps/MauvilleCity_PokemonCenter_2F/header.s +++ b/data/maps/MauvilleCity_PokemonCenter_2F/header.s @@ -3,7 +3,7 @@ MauvilleCity_PokemonCenter_2F:: @ 83061F4 .4byte MauvilleCity_PokemonCenter_2F_MapEvents .4byte MauvilleCity_PokemonCenter_2F_MapScripts .4byte 0x0 - .2byte 400 + .2byte BGM_POKECEN .2byte 62 .byte 9 .byte 0 diff --git a/data/maps/MeteorFalls_1F_1R/header.s b/data/maps/MeteorFalls_1F_1R/header.s index 4ce27a74a..dcb3fbbde 100644 --- a/data/maps/MeteorFalls_1F_1R/header.s +++ b/data/maps/MeteorFalls_1F_1R/header.s @@ -3,7 +3,7 @@ MeteorFalls_1F_1R:: @ 8306D70 .4byte MeteorFalls_1F_1R_MapEvents .4byte MeteorFalls_1F_1R_MapScripts .4byte 0x0 - .2byte 386 + .2byte BGM_DAN03 .2byte 126 .byte 63 .byte 0 diff --git a/data/maps/MeteorFalls_1F_2R/header.s b/data/maps/MeteorFalls_1F_2R/header.s index 96c97d12b..0d9d797aa 100644 --- a/data/maps/MeteorFalls_1F_2R/header.s +++ b/data/maps/MeteorFalls_1F_2R/header.s @@ -3,7 +3,7 @@ MeteorFalls_1F_2R:: @ 8306D8C .4byte MeteorFalls_1F_2R_MapEvents .4byte MeteorFalls_1F_2R_MapScripts .4byte 0x0 - .2byte 386 + .2byte BGM_DAN03 .2byte 127 .byte 63 .byte 0 diff --git a/data/maps/MeteorFalls_B1F_1R/header.s b/data/maps/MeteorFalls_B1F_1R/header.s index 75c28b630..f67ab9ea7 100644 --- a/data/maps/MeteorFalls_B1F_1R/header.s +++ b/data/maps/MeteorFalls_B1F_1R/header.s @@ -3,7 +3,7 @@ MeteorFalls_B1F_1R:: @ 8306DA8 .4byte MeteorFalls_B1F_1R_MapEvents .4byte MeteorFalls_B1F_1R_MapScripts .4byte 0x0 - .2byte 386 + .2byte BGM_DAN03 .2byte 128 .byte 63 .byte 0 diff --git a/data/maps/MeteorFalls_B1F_2R/header.s b/data/maps/MeteorFalls_B1F_2R/header.s index f375cbfe5..779e6d23a 100644 --- a/data/maps/MeteorFalls_B1F_2R/header.s +++ b/data/maps/MeteorFalls_B1F_2R/header.s @@ -3,7 +3,7 @@ MeteorFalls_B1F_2R:: @ 8306DC4 .4byte MeteorFalls_B1F_2R_MapEvents .4byte MeteorFalls_B1F_2R_MapScripts .4byte 0x0 - .2byte 386 + .2byte BGM_DAN03 .2byte 129 .byte 63 .byte 0 diff --git a/data/maps/MossdeepCity/header.s b/data/maps/MossdeepCity/header.s index cc71e408d..26b3e1db0 100644 --- a/data/maps/MossdeepCity/header.s +++ b/data/maps/MossdeepCity/header.s @@ -3,7 +3,7 @@ MossdeepCity:: @ 83054F0 .4byte MossdeepCity_MapEvents .4byte MossdeepCity_MapScripts .4byte MossdeepCity_MapConnections - .2byte 399 + .2byte BGM_GOTOWN .2byte 7 .byte 13 .byte 0 diff --git a/data/maps/MossdeepCity_GameCorner_1F/header.s b/data/maps/MossdeepCity_GameCorner_1F/header.s index 6b8940fd2..d96d383ea 100644 --- a/data/maps/MossdeepCity_GameCorner_1F/header.s +++ b/data/maps/MossdeepCity_GameCorner_1F/header.s @@ -3,7 +3,7 @@ MossdeepCity_GameCorner_1F:: @ 83068F4 .4byte MossdeepCity_GameCorner_1F_MapEvents .4byte MossdeepCity_GameCorner_1F_MapScripts .4byte 0x0 - .2byte 399 + .2byte BGM_GOTOWN .2byte 306 .byte 13 .byte 0 diff --git a/data/maps/MossdeepCity_GameCorner_B1F/header.s b/data/maps/MossdeepCity_GameCorner_B1F/header.s index 56b1c9a99..7692281f0 100644 --- a/data/maps/MossdeepCity_GameCorner_B1F/header.s +++ b/data/maps/MossdeepCity_GameCorner_B1F/header.s @@ -3,7 +3,7 @@ MossdeepCity_GameCorner_B1F:: @ 8306910 .4byte MossdeepCity_GameCorner_B1F_MapEvents .4byte MossdeepCity_GameCorner_B1F_MapScripts .4byte 0x0 - .2byte 399 + .2byte BGM_GOTOWN .2byte 307 .byte 13 .byte 0 diff --git a/data/maps/MossdeepCity_Gym/header.s b/data/maps/MossdeepCity_Gym/header.s index b83acfa0b..b72bdf62e 100644 --- a/data/maps/MossdeepCity_Gym/header.s +++ b/data/maps/MossdeepCity_Gym/header.s @@ -3,7 +3,7 @@ MossdeepCity_Gym:: @ 83067C0 .4byte MossdeepCity_Gym_MapEvents .4byte MossdeepCity_Gym_MapScripts .4byte 0x0 - .2byte 364 + .2byte BGM_GIM .2byte 109 .byte 13 .byte 0 diff --git a/data/maps/MossdeepCity_House1/header.s b/data/maps/MossdeepCity_House1/header.s index 8ecdc33cc..70f681e7a 100644 --- a/data/maps/MossdeepCity_House1/header.s +++ b/data/maps/MossdeepCity_House1/header.s @@ -3,7 +3,7 @@ MossdeepCity_House1:: @ 83067DC .4byte MossdeepCity_House1_MapEvents .4byte MossdeepCity_House1_MapScripts .4byte 0x0 - .2byte 399 + .2byte BGM_GOTOWN .2byte 60 .byte 13 .byte 0 diff --git a/data/maps/MossdeepCity_House2/header.s b/data/maps/MossdeepCity_House2/header.s index 9e3716b94..62bd6bdec 100644 --- a/data/maps/MossdeepCity_House2/header.s +++ b/data/maps/MossdeepCity_House2/header.s @@ -3,7 +3,7 @@ MossdeepCity_House2:: @ 83067F8 .4byte MossdeepCity_House2_MapEvents .4byte MossdeepCity_House2_MapScripts .4byte 0x0 - .2byte 399 + .2byte BGM_GOTOWN .2byte 59 .byte 13 .byte 0 diff --git a/data/maps/MossdeepCity_House3/header.s b/data/maps/MossdeepCity_House3/header.s index ff2c5a853..54c6641b6 100644 --- a/data/maps/MossdeepCity_House3/header.s +++ b/data/maps/MossdeepCity_House3/header.s @@ -3,7 +3,7 @@ MossdeepCity_House3:: @ 8306868 .4byte MossdeepCity_House3_MapEvents .4byte MossdeepCity_House3_MapScripts .4byte 0x0 - .2byte 399 + .2byte BGM_GOTOWN .2byte 60 .byte 13 .byte 0 diff --git a/data/maps/MossdeepCity_House4/header.s b/data/maps/MossdeepCity_House4/header.s index 66027ac4a..1c0e433bb 100644 --- a/data/maps/MossdeepCity_House4/header.s +++ b/data/maps/MossdeepCity_House4/header.s @@ -3,7 +3,7 @@ MossdeepCity_House4:: @ 83068A0 .4byte MossdeepCity_House4_MapEvents .4byte MossdeepCity_House4_MapScripts .4byte 0x0 - .2byte 399 + .2byte BGM_GOTOWN .2byte 80 .byte 13 .byte 0 diff --git a/data/maps/MossdeepCity_Mart/header.s b/data/maps/MossdeepCity_Mart/header.s index 398c52086..c18fca0e3 100644 --- a/data/maps/MossdeepCity_Mart/header.s +++ b/data/maps/MossdeepCity_Mart/header.s @@ -3,7 +3,7 @@ MossdeepCity_Mart:: @ 830684C .4byte MossdeepCity_Mart_MapEvents .4byte MossdeepCity_Mart_MapScripts .4byte 0x0 - .2byte 404 + .2byte BGM_FRIENDLY .2byte 63 .byte 13 .byte 0 diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/header.s b/data/maps/MossdeepCity_PokemonCenter_1F/header.s index 636a03755..036604eff 100644 --- a/data/maps/MossdeepCity_PokemonCenter_1F/header.s +++ b/data/maps/MossdeepCity_PokemonCenter_1F/header.s @@ -3,7 +3,7 @@ MossdeepCity_PokemonCenter_1F:: @ 8306814 .4byte MossdeepCity_PokemonCenter_1F_MapEvents .4byte MossdeepCity_PokemonCenter_1F_MapScripts .4byte 0x0 - .2byte 400 + .2byte BGM_POKECEN .2byte 61 .byte 13 .byte 0 diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/header.s b/data/maps/MossdeepCity_PokemonCenter_2F/header.s index 47e859aac..cb42c5c80 100644 --- a/data/maps/MossdeepCity_PokemonCenter_2F/header.s +++ b/data/maps/MossdeepCity_PokemonCenter_2F/header.s @@ -3,7 +3,7 @@ MossdeepCity_PokemonCenter_2F:: @ 8306830 .4byte MossdeepCity_PokemonCenter_2F_MapEvents .4byte MossdeepCity_PokemonCenter_2F_MapScripts .4byte 0x0 - .2byte 400 + .2byte BGM_POKECEN .2byte 62 .byte 13 .byte 0 diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/header.s b/data/maps/MossdeepCity_SpaceCenter_1F/header.s index 699741a45..65ba897fb 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/header.s +++ b/data/maps/MossdeepCity_SpaceCenter_1F/header.s @@ -3,7 +3,7 @@ MossdeepCity_SpaceCenter_1F:: @ 83068BC .4byte MossdeepCity_SpaceCenter_1F_MapEvents .4byte MossdeepCity_SpaceCenter_1F_MapScripts .4byte 0x0 - .2byte 399 + .2byte BGM_GOTOWN .2byte 276 .byte 13 .byte 0 diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/header.s b/data/maps/MossdeepCity_SpaceCenter_2F/header.s index 824b8cc66..2195ee8e2 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/header.s +++ b/data/maps/MossdeepCity_SpaceCenter_2F/header.s @@ -3,7 +3,7 @@ MossdeepCity_SpaceCenter_2F:: @ 83068D8 .4byte MossdeepCity_SpaceCenter_2F_MapEvents .4byte MossdeepCity_SpaceCenter_2F_MapScripts .4byte 0x0 - .2byte 399 + .2byte BGM_GOTOWN .2byte 277 .byte 13 .byte 0 diff --git a/data/maps/MossdeepCity_StevensHouse/header.s b/data/maps/MossdeepCity_StevensHouse/header.s index 25892ad50..761ea9b73 100644 --- a/data/maps/MossdeepCity_StevensHouse/header.s +++ b/data/maps/MossdeepCity_StevensHouse/header.s @@ -3,7 +3,7 @@ MossdeepCity_StevensHouse:: @ 8306884 .4byte MossdeepCity_StevensHouse_MapEvents .4byte MossdeepCity_StevensHouse_MapScripts .4byte 0x0 - .2byte 399 + .2byte BGM_GOTOWN .2byte 328 .byte 13 .byte 0 diff --git a/data/maps/MtChimney/header.s b/data/maps/MtChimney/header.s index 597b1cf35..cdc29ce7f 100644 --- a/data/maps/MtChimney/header.s +++ b/data/maps/MtChimney/header.s @@ -3,7 +3,7 @@ MtChimney:: @ 8306EC0 .4byte MtChimney_MapEvents .4byte MtChimney_MapScripts .4byte 0x0 - .2byte 406 + .2byte BGM_TOZAN .2byte 137 .byte 56 .byte 0 diff --git a/data/maps/MtChimney_CableCarStation/header.s b/data/maps/MtChimney_CableCarStation/header.s index f76c321cf..f5207578b 100644 --- a/data/maps/MtChimney_CableCarStation/header.s +++ b/data/maps/MtChimney_CableCarStation/header.s @@ -3,7 +3,7 @@ MtChimney_CableCarStation:: @ 8306CAC .4byte MtChimney_CableCarStation_MapEvents .4byte MtChimney_CableCarStation_MapScripts .4byte 0x0 - .2byte 360 + .2byte BGM_DOORO_X1 .2byte 119 .byte 56 .byte 0 diff --git a/data/maps/MtPyre_1F/header.s b/data/maps/MtPyre_1F/header.s index 52c690299..cfdff9591 100644 --- a/data/maps/MtPyre_1F/header.s +++ b/data/maps/MtPyre_1F/header.s @@ -3,7 +3,7 @@ MtPyre_1F:: @ 8306F14 .4byte MtPyre_1F_MapEvents .4byte MtPyre_1F_MapScripts .4byte 0x0 - .2byte 432 + .2byte BGM_M_DUNGON .2byte 138 .byte 65 .byte 0 diff --git a/data/maps/MtPyre_2F/header.s b/data/maps/MtPyre_2F/header.s index 757c8e2ac..914fdabd4 100644 --- a/data/maps/MtPyre_2F/header.s +++ b/data/maps/MtPyre_2F/header.s @@ -3,7 +3,7 @@ MtPyre_2F:: @ 8306F30 .4byte MtPyre_2F_MapEvents .4byte MtPyre_2F_MapScripts .4byte 0x0 - .2byte 432 + .2byte BGM_M_DUNGON .2byte 139 .byte 65 .byte 0 diff --git a/data/maps/MtPyre_3F/header.s b/data/maps/MtPyre_3F/header.s index 2bb599ea5..b4a59adbd 100644 --- a/data/maps/MtPyre_3F/header.s +++ b/data/maps/MtPyre_3F/header.s @@ -3,7 +3,7 @@ MtPyre_3F:: @ 8306F4C .4byte MtPyre_3F_MapEvents .4byte MtPyre_3F_MapScripts .4byte 0x0 - .2byte 432 + .2byte BGM_M_DUNGON .2byte 140 .byte 65 .byte 0 diff --git a/data/maps/MtPyre_4F/header.s b/data/maps/MtPyre_4F/header.s index b20121e25..8dcbd4e64 100644 --- a/data/maps/MtPyre_4F/header.s +++ b/data/maps/MtPyre_4F/header.s @@ -3,7 +3,7 @@ MtPyre_4F:: @ 8306F68 .4byte MtPyre_4F_MapEvents .4byte MtPyre_4F_MapScripts .4byte 0x0 - .2byte 432 + .2byte BGM_M_DUNGON .2byte 141 .byte 65 .byte 0 diff --git a/data/maps/MtPyre_5F/header.s b/data/maps/MtPyre_5F/header.s index dcd1f1e64..0eb7f7bba 100644 --- a/data/maps/MtPyre_5F/header.s +++ b/data/maps/MtPyre_5F/header.s @@ -3,7 +3,7 @@ MtPyre_5F:: @ 8306F84 .4byte MtPyre_5F_MapEvents .4byte MtPyre_5F_MapScripts .4byte 0x0 - .2byte 432 + .2byte BGM_M_DUNGON .2byte 142 .byte 65 .byte 0 diff --git a/data/maps/MtPyre_6F/header.s b/data/maps/MtPyre_6F/header.s index 5ce5e1c3d..3cab722cd 100644 --- a/data/maps/MtPyre_6F/header.s +++ b/data/maps/MtPyre_6F/header.s @@ -3,7 +3,7 @@ MtPyre_6F:: @ 8306FA0 .4byte MtPyre_6F_MapEvents .4byte MtPyre_6F_MapScripts .4byte 0x0 - .2byte 432 + .2byte BGM_M_DUNGON .2byte 143 .byte 65 .byte 0 diff --git a/data/maps/MtPyre_Exterior/header.s b/data/maps/MtPyre_Exterior/header.s index 28575a62e..543e090f0 100644 --- a/data/maps/MtPyre_Exterior/header.s +++ b/data/maps/MtPyre_Exterior/header.s @@ -3,7 +3,7 @@ MtPyre_Exterior:: @ 8306FBC .4byte MtPyre_Exterior_MapEvents .4byte MtPyre_Exterior_MapScripts .4byte 0x0 - .2byte 434 + .2byte BGM_MACHUPI .2byte 303 .byte 65 .byte 0 diff --git a/data/maps/MtPyre_Summit/header.s b/data/maps/MtPyre_Summit/header.s index 494656218..e07d849a6 100644 --- a/data/maps/MtPyre_Summit/header.s +++ b/data/maps/MtPyre_Summit/header.s @@ -3,7 +3,7 @@ MtPyre_Summit:: @ 8306FD8 .4byte MtPyre_Summit_MapEvents .4byte MtPyre_Summit_MapScripts .4byte 0x0 - .2byte 434 + .2byte BGM_MACHUPI .2byte 304 .byte 65 .byte 0 diff --git a/data/maps/NewMauville_Entrance/header.s b/data/maps/NewMauville_Entrance/header.s index f66bf901c..28ac26ccf 100644 --- a/data/maps/NewMauville_Entrance/header.s +++ b/data/maps/NewMauville_Entrance/header.s @@ -3,7 +3,7 @@ NewMauville_Entrance:: @ 8307320 .4byte NewMauville_Entrance_MapEvents .4byte NewMauville_Entrance_MapScripts .4byte 0x0 - .2byte 432 + .2byte BGM_M_DUNGON .2byte 185 .byte 62 .byte 0 diff --git a/data/maps/NewMauville_Inside/header.s b/data/maps/NewMauville_Inside/header.s index b528160b0..9771d7ec7 100644 --- a/data/maps/NewMauville_Inside/header.s +++ b/data/maps/NewMauville_Inside/header.s @@ -3,7 +3,7 @@ NewMauville_Inside:: @ 830733C .4byte NewMauville_Inside_MapEvents .4byte NewMauville_Inside_MapScripts .4byte 0x0 - .2byte 432 + .2byte BGM_M_DUNGON .2byte 186 .byte 62 .byte 0 diff --git a/data/maps/OldaleTown/header.s b/data/maps/OldaleTown/header.s index 2b6333203..22965da3d 100644 --- a/data/maps/OldaleTown/header.s +++ b/data/maps/OldaleTown/header.s @@ -3,7 +3,7 @@ OldaleTown:: @ 8305560 .4byte OldaleTown_MapEvents .4byte OldaleTown_MapScripts .4byte OldaleTown_MapConnections - .2byte 363 + .2byte BGM_MACHI_S4 .2byte 11 .byte 1 .byte 0 diff --git a/data/maps/OldaleTown_House1/header.s b/data/maps/OldaleTown_House1/header.s index 5bff7d359..550ff5a75 100644 --- a/data/maps/OldaleTown_House1/header.s +++ b/data/maps/OldaleTown_House1/header.s @@ -3,7 +3,7 @@ OldaleTown_House1:: @ 8305ABC .4byte OldaleTown_House1_MapEvents .4byte OldaleTown_House1_MapScripts .4byte 0x0 - .2byte 363 + .2byte BGM_MACHI_S4 .2byte 59 .byte 1 .byte 0 diff --git a/data/maps/OldaleTown_House2/header.s b/data/maps/OldaleTown_House2/header.s index 0d92fc00b..eb1660cf9 100644 --- a/data/maps/OldaleTown_House2/header.s +++ b/data/maps/OldaleTown_House2/header.s @@ -3,7 +3,7 @@ OldaleTown_House2:: @ 8305AD8 .4byte OldaleTown_House2_MapEvents .4byte OldaleTown_House2_MapScripts .4byte 0x0 - .2byte 363 + .2byte BGM_MACHI_S4 .2byte 60 .byte 1 .byte 0 diff --git a/data/maps/OldaleTown_Mart/header.s b/data/maps/OldaleTown_Mart/header.s index a8336dabd..a0e8a8851 100644 --- a/data/maps/OldaleTown_Mart/header.s +++ b/data/maps/OldaleTown_Mart/header.s @@ -3,7 +3,7 @@ OldaleTown_Mart:: @ 8305B2C .4byte OldaleTown_Mart_MapEvents .4byte OldaleTown_Mart_MapScripts .4byte 0x0 - .2byte 404 + .2byte BGM_FRIENDLY .2byte 63 .byte 1 .byte 0 diff --git a/data/maps/OldaleTown_PokemonCenter_1F/header.s b/data/maps/OldaleTown_PokemonCenter_1F/header.s index c3cedf311..82ced7328 100644 --- a/data/maps/OldaleTown_PokemonCenter_1F/header.s +++ b/data/maps/OldaleTown_PokemonCenter_1F/header.s @@ -3,7 +3,7 @@ OldaleTown_PokemonCenter_1F:: @ 8305AF4 .4byte OldaleTown_PokemonCenter_1F_MapEvents .4byte OldaleTown_PokemonCenter_1F_MapScripts .4byte 0x0 - .2byte 400 + .2byte BGM_POKECEN .2byte 61 .byte 1 .byte 0 diff --git a/data/maps/OldaleTown_PokemonCenter_2F/header.s b/data/maps/OldaleTown_PokemonCenter_2F/header.s index 0448334f9..79e6ca99d 100644 --- a/data/maps/OldaleTown_PokemonCenter_2F/header.s +++ b/data/maps/OldaleTown_PokemonCenter_2F/header.s @@ -3,7 +3,7 @@ OldaleTown_PokemonCenter_2F:: @ 8305B10 .4byte OldaleTown_PokemonCenter_2F_MapEvents .4byte OldaleTown_PokemonCenter_2F_MapScripts .4byte 0x0 - .2byte 400 + .2byte BGM_POKECEN .2byte 62 .byte 1 .byte 0 diff --git a/data/maps/PacifidlogTown/header.s b/data/maps/PacifidlogTown/header.s index 574ea3a68..057e83264 100644 --- a/data/maps/PacifidlogTown/header.s +++ b/data/maps/PacifidlogTown/header.s @@ -3,7 +3,7 @@ PacifidlogTown:: @ 83055EC .4byte PacifidlogTown_MapEvents .4byte PacifidlogTown_MapScripts .4byte PacifidlogTown_MapConnections - .2byte 408 + .2byte BGM_MINAMO .2byte 16 .byte 6 .byte 0 diff --git a/data/maps/PacifidlogTown_House1/header.s b/data/maps/PacifidlogTown_House1/header.s index b80e3786b..7842574f9 100644 --- a/data/maps/PacifidlogTown_House1/header.s +++ b/data/maps/PacifidlogTown_House1/header.s @@ -3,7 +3,7 @@ PacifidlogTown_House1:: @ 8305E90 .4byte PacifidlogTown_House1_MapEvents .4byte PacifidlogTown_House1_MapScripts .4byte 0x0 - .2byte 408 + .2byte BGM_MINAMO .2byte 77 .byte 6 .byte 0 diff --git a/data/maps/PacifidlogTown_House2/header.s b/data/maps/PacifidlogTown_House2/header.s index 9c3a409df..3fc2aba99 100644 --- a/data/maps/PacifidlogTown_House2/header.s +++ b/data/maps/PacifidlogTown_House2/header.s @@ -3,7 +3,7 @@ PacifidlogTown_House2:: @ 8305EAC .4byte PacifidlogTown_House2_MapEvents .4byte PacifidlogTown_House2_MapScripts .4byte 0x0 - .2byte 408 + .2byte BGM_MINAMO .2byte 78 .byte 6 .byte 0 diff --git a/data/maps/PacifidlogTown_House3/header.s b/data/maps/PacifidlogTown_House3/header.s index 1b0f9ac16..6bf1e6bd6 100644 --- a/data/maps/PacifidlogTown_House3/header.s +++ b/data/maps/PacifidlogTown_House3/header.s @@ -3,7 +3,7 @@ PacifidlogTown_House3:: @ 8305EC8 .4byte PacifidlogTown_House3_MapEvents .4byte PacifidlogTown_House3_MapScripts .4byte 0x0 - .2byte 408 + .2byte BGM_MINAMO .2byte 77 .byte 6 .byte 0 diff --git a/data/maps/PacifidlogTown_House4/header.s b/data/maps/PacifidlogTown_House4/header.s index af0f1f64d..df930a533 100644 --- a/data/maps/PacifidlogTown_House4/header.s +++ b/data/maps/PacifidlogTown_House4/header.s @@ -3,7 +3,7 @@ PacifidlogTown_House4:: @ 8305EE4 .4byte PacifidlogTown_House4_MapEvents .4byte PacifidlogTown_House4_MapScripts .4byte 0x0 - .2byte 408 + .2byte BGM_MINAMO .2byte 78 .byte 6 .byte 0 diff --git a/data/maps/PacifidlogTown_House5/header.s b/data/maps/PacifidlogTown_House5/header.s index 9006d5670..d0fca156f 100644 --- a/data/maps/PacifidlogTown_House5/header.s +++ b/data/maps/PacifidlogTown_House5/header.s @@ -3,7 +3,7 @@ PacifidlogTown_House5:: @ 8305F00 .4byte PacifidlogTown_House5_MapEvents .4byte PacifidlogTown_House5_MapScripts .4byte 0x0 - .2byte 408 + .2byte BGM_MINAMO .2byte 77 .byte 6 .byte 0 diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/header.s b/data/maps/PacifidlogTown_PokemonCenter_1F/header.s index 63d71c2e2..ef2ddbf4c 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_1F/header.s +++ b/data/maps/PacifidlogTown_PokemonCenter_1F/header.s @@ -3,7 +3,7 @@ PacifidlogTown_PokemonCenter_1F:: @ 8305E58 .4byte PacifidlogTown_PokemonCenter_1F_MapEvents .4byte PacifidlogTown_PokemonCenter_1F_MapScripts .4byte 0x0 - .2byte 400 + .2byte BGM_POKECEN .2byte 61 .byte 6 .byte 0 diff --git a/data/maps/PacifidlogTown_PokemonCenter_2F/header.s b/data/maps/PacifidlogTown_PokemonCenter_2F/header.s index 0477b5f07..b985545a8 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_2F/header.s +++ b/data/maps/PacifidlogTown_PokemonCenter_2F/header.s @@ -3,7 +3,7 @@ PacifidlogTown_PokemonCenter_2F:: @ 8305E74 .4byte PacifidlogTown_PokemonCenter_2F_MapEvents .4byte PacifidlogTown_PokemonCenter_2F_MapScripts .4byte 0x0 - .2byte 400 + .2byte BGM_POKECEN .2byte 62 .byte 6 .byte 0 diff --git a/data/maps/PetalburgCity/header.s b/data/maps/PetalburgCity/header.s index c78bc59d6..c1706a55a 100644 --- a/data/maps/PetalburgCity/header.s +++ b/data/maps/PetalburgCity/header.s @@ -3,7 +3,7 @@ PetalburgCity:: @ 8305448 .4byte PetalburgCity_MapEvents .4byte PetalburgCity_MapScripts .4byte PetalburgCity_MapConnections - .2byte 362 + .2byte BGM_MACHI_S2 .2byte 1 .byte 7 .byte 0 diff --git a/data/maps/PetalburgCity_Gym/header.s b/data/maps/PetalburgCity_Gym/header.s index 49832d900..af00ed5f0 100644 --- a/data/maps/PetalburgCity_Gym/header.s +++ b/data/maps/PetalburgCity_Gym/header.s @@ -3,7 +3,7 @@ PetalburgCity_Gym:: @ 8305F38 .4byte PetalburgCity_Gym_MapEvents .4byte PetalburgCity_Gym_MapScripts .4byte 0x0 - .2byte 364 + .2byte BGM_GIM .2byte 79 .byte 7 .byte 0 diff --git a/data/maps/PetalburgCity_House1/header.s b/data/maps/PetalburgCity_House1/header.s index bf22508c8..e1f5c1f63 100644 --- a/data/maps/PetalburgCity_House1/header.s +++ b/data/maps/PetalburgCity_House1/header.s @@ -3,7 +3,7 @@ PetalburgCity_House1:: @ 8305F54 .4byte PetalburgCity_House1_MapEvents .4byte PetalburgCity_House1_MapScripts .4byte 0x0 - .2byte 362 + .2byte BGM_MACHI_S2 .2byte 59 .byte 7 .byte 0 diff --git a/data/maps/PetalburgCity_House2/header.s b/data/maps/PetalburgCity_House2/header.s index ce18dd50d..fb76b1bfe 100644 --- a/data/maps/PetalburgCity_House2/header.s +++ b/data/maps/PetalburgCity_House2/header.s @@ -3,7 +3,7 @@ PetalburgCity_House2:: @ 8305F70 .4byte PetalburgCity_House2_MapEvents .4byte PetalburgCity_House2_MapScripts .4byte 0x0 - .2byte 362 + .2byte BGM_MACHI_S2 .2byte 80 .byte 7 .byte 0 diff --git a/data/maps/PetalburgCity_Mart/header.s b/data/maps/PetalburgCity_Mart/header.s index 764c22f44..56275cfaf 100644 --- a/data/maps/PetalburgCity_Mart/header.s +++ b/data/maps/PetalburgCity_Mart/header.s @@ -3,7 +3,7 @@ PetalburgCity_Mart:: @ 8305FC4 .4byte PetalburgCity_Mart_MapEvents .4byte PetalburgCity_Mart_MapScripts .4byte 0x0 - .2byte 404 + .2byte BGM_FRIENDLY .2byte 63 .byte 7 .byte 0 diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/header.s b/data/maps/PetalburgCity_PokemonCenter_1F/header.s index 364158d8f..2596fb65d 100644 --- a/data/maps/PetalburgCity_PokemonCenter_1F/header.s +++ b/data/maps/PetalburgCity_PokemonCenter_1F/header.s @@ -3,7 +3,7 @@ PetalburgCity_PokemonCenter_1F:: @ 8305F8C .4byte PetalburgCity_PokemonCenter_1F_MapEvents .4byte PetalburgCity_PokemonCenter_1F_MapScripts .4byte 0x0 - .2byte 400 + .2byte BGM_POKECEN .2byte 61 .byte 7 .byte 0 diff --git a/data/maps/PetalburgCity_PokemonCenter_2F/header.s b/data/maps/PetalburgCity_PokemonCenter_2F/header.s index f394640ce..ac6c77b6a 100644 --- a/data/maps/PetalburgCity_PokemonCenter_2F/header.s +++ b/data/maps/PetalburgCity_PokemonCenter_2F/header.s @@ -3,7 +3,7 @@ PetalburgCity_PokemonCenter_2F:: @ 8305FA8 .4byte PetalburgCity_PokemonCenter_2F_MapEvents .4byte PetalburgCity_PokemonCenter_2F_MapScripts .4byte 0x0 - .2byte 400 + .2byte BGM_POKECEN .2byte 62 .byte 7 .byte 0 diff --git a/data/maps/PetalburgCity_WallysHouse/header.s b/data/maps/PetalburgCity_WallysHouse/header.s index 6485ab1dd..e16ac5a7f 100644 --- a/data/maps/PetalburgCity_WallysHouse/header.s +++ b/data/maps/PetalburgCity_WallysHouse/header.s @@ -3,7 +3,7 @@ PetalburgCity_WallysHouse:: @ 8305F1C .4byte PetalburgCity_WallysHouse_MapEvents .4byte PetalburgCity_WallysHouse_MapScripts .4byte 0x0 - .2byte 362 + .2byte BGM_MACHI_S2 .2byte 60 .byte 7 .byte 0 diff --git a/data/maps/PetalburgWoods/header.s b/data/maps/PetalburgWoods/header.s index 3dab3bdaa..b3a981af9 100644 --- a/data/maps/PetalburgWoods/header.s +++ b/data/maps/PetalburgWoods/header.s @@ -3,7 +3,7 @@ PetalburgWoods:: @ 8306EA4 .4byte PetalburgWoods_MapEvents .4byte PetalburgWoods_MapScripts .4byte 0x0 - .2byte 366 + .2byte BGM_DAN01 .2byte 136 .byte 59 .byte 0 diff --git a/data/maps/RecordCorner/header.s b/data/maps/RecordCorner/header.s index f550cdbff..a8322ebee 100644 --- a/data/maps/RecordCorner/header.s +++ b/data/maps/RecordCorner/header.s @@ -3,7 +3,7 @@ RecordCorner:: @ 83079B0 .4byte RecordCorner_MapEvents .4byte RecordCorner_MapScripts .4byte 0x0 - .2byte 422 + .2byte BGM_RAINBOW .2byte 224 .byte 87 .byte 0 diff --git a/data/maps/Route101/header.s b/data/maps/Route101/header.s index 1f74ee386..1b4b6b1c4 100644 --- a/data/maps/Route101/header.s +++ b/data/maps/Route101/header.s @@ -3,7 +3,7 @@ Route101:: @ 8305608 .4byte Route101_MapEvents .4byte Route101_MapScripts .4byte Route101_MapConnections - .2byte 359 + .2byte BGM_DOORO1 .2byte 17 .byte 16 .byte 0 diff --git a/data/maps/Route102/header.s b/data/maps/Route102/header.s index 0686d9b67..a4318e2d2 100644 --- a/data/maps/Route102/header.s +++ b/data/maps/Route102/header.s @@ -3,7 +3,7 @@ Route102:: @ 8305624 .4byte Route102_MapEvents .4byte Route102_MapScripts .4byte Route102_MapConnections - .2byte 359 + .2byte BGM_DOORO1 .2byte 18 .byte 17 .byte 0 diff --git a/data/maps/Route103/header.s b/data/maps/Route103/header.s index aa9392261..b23f9d523 100644 --- a/data/maps/Route103/header.s +++ b/data/maps/Route103/header.s @@ -3,7 +3,7 @@ Route103:: @ 8305640 .4byte Route103_MapEvents .4byte Route103_MapScripts .4byte Route103_MapConnections - .2byte 359 + .2byte BGM_DOORO1 .2byte 19 .byte 18 .byte 0 diff --git a/data/maps/Route104/header.s b/data/maps/Route104/header.s index 9e7908531..71e7059b5 100644 --- a/data/maps/Route104/header.s +++ b/data/maps/Route104/header.s @@ -3,7 +3,7 @@ Route104:: @ 830565C .4byte Route104_MapEvents .4byte Route104_MapScripts .4byte Route104_MapConnections - .2byte 401 + .2byte BGM_NEXTROAD .2byte 20 .byte 19 .byte 0 diff --git a/data/maps/Route104_MrBrineysHouse/header.s b/data/maps/Route104_MrBrineysHouse/header.s index 50914f60e..3055a73d6 100644 --- a/data/maps/Route104_MrBrineysHouse/header.s +++ b/data/maps/Route104_MrBrineysHouse/header.s @@ -3,7 +3,7 @@ Route104_MrBrineysHouse:: @ 8306C20 .4byte Route104_MrBrineysHouse_MapEvents .4byte Route104_MrBrineysHouse_MapScripts .4byte 0x0 - .2byte 362 + .2byte BGM_MACHI_S2 .2byte 102 .byte 19 .byte 0 diff --git a/data/maps/Route104_PrettyPetalFlowerShop/header.s b/data/maps/Route104_PrettyPetalFlowerShop/header.s index c4bdcb6a6..3dae6a068 100644 --- a/data/maps/Route104_PrettyPetalFlowerShop/header.s +++ b/data/maps/Route104_PrettyPetalFlowerShop/header.s @@ -3,7 +3,7 @@ Route104_PrettyPetalFlowerShop:: @ 8306C3C .4byte Route104_PrettyPetalFlowerShop_MapEvents .4byte Route104_PrettyPetalFlowerShop_MapScripts .4byte 0x0 - .2byte 362 + .2byte BGM_MACHI_S2 .2byte 118 .byte 19 .byte 0 diff --git a/data/maps/Route104_Prototype/header.s b/data/maps/Route104_Prototype/header.s index 1d3768712..7f5115386 100644 --- a/data/maps/Route104_Prototype/header.s +++ b/data/maps/Route104_Prototype/header.s @@ -3,7 +3,7 @@ Route104_Prototype:: @ 8307CF8 .4byte Route104_Prototype_MapEvents .4byte Route104_Prototype_MapScripts .4byte 0x0 - .2byte 401 + .2byte BGM_NEXTROAD .2byte 288 .byte 19 .byte 0 diff --git a/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.s b/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.s index 4e98f97dd..51b27eb0a 100644 --- a/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.s +++ b/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.s @@ -3,7 +3,7 @@ Route104_PrototypePrettyPetalFlowerShop:: @ 8307D14 .4byte Route104_PrototypePrettyPetalFlowerShop_MapEvents .4byte Route104_PrototypePrettyPetalFlowerShop_MapScripts .4byte 0x0 - .2byte 401 + .2byte BGM_NEXTROAD .2byte 118 .byte 19 .byte 0 diff --git a/data/maps/Route105/header.s b/data/maps/Route105/header.s index e8af05d51..344b8f634 100644 --- a/data/maps/Route105/header.s +++ b/data/maps/Route105/header.s @@ -3,7 +3,7 @@ Route105:: @ 8305678 .4byte Route105_MapEvents .4byte Route105_MapScripts .4byte Route105_MapConnections - .2byte 401 + .2byte BGM_NEXTROAD .2byte 21 .byte 20 .byte 0 diff --git a/data/maps/Route106/header.s b/data/maps/Route106/header.s index 6ebcbbd0a..494690340 100644 --- a/data/maps/Route106/header.s +++ b/data/maps/Route106/header.s @@ -3,7 +3,7 @@ Route106:: @ 8305694 .4byte Route106_MapEvents .4byte Route106_MapScripts .4byte Route106_MapConnections - .2byte 401 + .2byte BGM_NEXTROAD .2byte 22 .byte 21 .byte 0 diff --git a/data/maps/Route107/header.s b/data/maps/Route107/header.s index 2b218dce5..382b617ba 100644 --- a/data/maps/Route107/header.s +++ b/data/maps/Route107/header.s @@ -3,7 +3,7 @@ Route107:: @ 83056B0 .4byte Route107_MapEvents .4byte Route107_MapScripts .4byte Route107_MapConnections - .2byte 401 + .2byte BGM_NEXTROAD .2byte 23 .byte 22 .byte 0 diff --git a/data/maps/Route108/header.s b/data/maps/Route108/header.s index 4038eb33b..3214f7b89 100644 --- a/data/maps/Route108/header.s +++ b/data/maps/Route108/header.s @@ -3,7 +3,7 @@ Route108:: @ 83056CC .4byte Route108_MapEvents .4byte Route108_MapScripts .4byte Route108_MapConnections - .2byte 401 + .2byte BGM_NEXTROAD .2byte 24 .byte 23 .byte 0 diff --git a/data/maps/Route109/header.s b/data/maps/Route109/header.s index 0c48c680f..db91d1368 100644 --- a/data/maps/Route109/header.s +++ b/data/maps/Route109/header.s @@ -3,7 +3,7 @@ Route109:: @ 83056E8 .4byte Route109_MapEvents .4byte Route109_MapScripts .4byte Route109_MapConnections - .2byte 401 + .2byte BGM_NEXTROAD .2byte 25 .byte 24 .byte 0 diff --git a/data/maps/Route109_SeashoreHouse/header.s b/data/maps/Route109_SeashoreHouse/header.s index c64d90560..064d428bd 100644 --- a/data/maps/Route109_SeashoreHouse/header.s +++ b/data/maps/Route109_SeashoreHouse/header.s @@ -3,7 +3,7 @@ Route109_SeashoreHouse:: @ 8307D30 .4byte Route109_SeashoreHouse_MapEvents .4byte Route109_SeashoreHouse_MapScripts .4byte 0x0 - .2byte 427 + .2byte BGM_HIGHTOWN .2byte 244 .byte 24 .byte 0 diff --git a/data/maps/Route110/header.s b/data/maps/Route110/header.s index 92f2a0f60..442a02ccb 100644 --- a/data/maps/Route110/header.s +++ b/data/maps/Route110/header.s @@ -3,7 +3,7 @@ Route110:: @ 8305704 .4byte Route110_MapEvents .4byte Route110_MapScripts .4byte Route110_MapConnections - .2byte 360 + .2byte BGM_DOORO_X1 .2byte 26 .byte 25 .byte 0 diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.s b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.s index a0e84e133..749ab18e9 100644 --- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.s +++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.s @@ -3,7 +3,7 @@ Route110_SeasideCyclingRoadNorthEntrance:: @ 8307E9C .4byte Route110_SeasideCyclingRoadNorthEntrance_MapEvents .4byte Route110_SeasideCyclingRoadNorthEntrance_MapScripts .4byte 0x0 - .2byte 433 + .2byte BGM_FINECITY .2byte 257 .byte 25 .byte 0 diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.s b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.s index 5435ddd6d..a4bd0cbd7 100644 --- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.s +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.s @@ -3,7 +3,7 @@ Route110_SeasideCyclingRoadSouthEntrance:: @ 8307E80 .4byte Route110_SeasideCyclingRoadSouthEntrance_MapEvents .4byte Route110_SeasideCyclingRoadSouthEntrance_MapScripts .4byte 0x0 - .2byte 433 + .2byte BGM_FINECITY .2byte 257 .byte 25 .byte 0 diff --git a/data/maps/Route110_TrickHouseCorridor/header.s b/data/maps/Route110_TrickHouseCorridor/header.s index a70401c4b..f2b2c691d 100644 --- a/data/maps/Route110_TrickHouseCorridor/header.s +++ b/data/maps/Route110_TrickHouseCorridor/header.s @@ -3,7 +3,7 @@ Route110_TrickHouseCorridor:: @ 8307D84 .4byte Route110_TrickHouseCorridor_MapEvents .4byte Route110_TrickHouseCorridor_MapScripts .4byte 0x0 - .2byte 448 + .2byte BGM_KARAKURI .2byte 247 .byte 25 .byte 0 diff --git a/data/maps/Route110_TrickHouseEnd/header.s b/data/maps/Route110_TrickHouseEnd/header.s index 923d7f992..d61808d7f 100644 --- a/data/maps/Route110_TrickHouseEnd/header.s +++ b/data/maps/Route110_TrickHouseEnd/header.s @@ -3,7 +3,7 @@ Route110_TrickHouseEnd:: @ 8307D68 .4byte Route110_TrickHouseEnd_MapEvents .4byte Route110_TrickHouseEnd_MapScripts .4byte 0x0 - .2byte 448 + .2byte BGM_KARAKURI .2byte 246 .byte 25 .byte 0 diff --git a/data/maps/Route110_TrickHouseEntrance/header.s b/data/maps/Route110_TrickHouseEntrance/header.s index f45f7d5f1..80d6c597f 100644 --- a/data/maps/Route110_TrickHouseEntrance/header.s +++ b/data/maps/Route110_TrickHouseEntrance/header.s @@ -3,7 +3,7 @@ Route110_TrickHouseEntrance:: @ 8307D4C .4byte Route110_TrickHouseEntrance_MapEvents .4byte Route110_TrickHouseEntrance_MapScripts .4byte 0x0 - .2byte 448 + .2byte BGM_KARAKURI .2byte 245 .byte 25 .byte 0 diff --git a/data/maps/Route110_TrickHousePuzzle1/header.s b/data/maps/Route110_TrickHousePuzzle1/header.s index 8c38972e9..c4c87877c 100644 --- a/data/maps/Route110_TrickHousePuzzle1/header.s +++ b/data/maps/Route110_TrickHousePuzzle1/header.s @@ -3,7 +3,7 @@ Route110_TrickHousePuzzle1:: @ 8307DA0 .4byte Route110_TrickHousePuzzle1_MapEvents .4byte Route110_TrickHousePuzzle1_MapScripts .4byte 0x0 - .2byte 448 + .2byte BGM_KARAKURI .2byte 248 .byte 25 .byte 0 diff --git a/data/maps/Route110_TrickHousePuzzle2/header.s b/data/maps/Route110_TrickHousePuzzle2/header.s index 43d407507..d278ca3aa 100644 --- a/data/maps/Route110_TrickHousePuzzle2/header.s +++ b/data/maps/Route110_TrickHousePuzzle2/header.s @@ -3,7 +3,7 @@ Route110_TrickHousePuzzle2:: @ 8307DBC .4byte Route110_TrickHousePuzzle2_MapEvents .4byte Route110_TrickHousePuzzle2_MapScripts .4byte 0x0 - .2byte 448 + .2byte BGM_KARAKURI .2byte 249 .byte 25 .byte 0 diff --git a/data/maps/Route110_TrickHousePuzzle3/header.s b/data/maps/Route110_TrickHousePuzzle3/header.s index 440479123..736a1dc19 100644 --- a/data/maps/Route110_TrickHousePuzzle3/header.s +++ b/data/maps/Route110_TrickHousePuzzle3/header.s @@ -3,7 +3,7 @@ Route110_TrickHousePuzzle3:: @ 8307DD8 .4byte Route110_TrickHousePuzzle3_MapEvents .4byte Route110_TrickHousePuzzle3_MapScripts .4byte 0x0 - .2byte 448 + .2byte BGM_KARAKURI .2byte 250 .byte 25 .byte 0 diff --git a/data/maps/Route110_TrickHousePuzzle4/header.s b/data/maps/Route110_TrickHousePuzzle4/header.s index 0f4a509f4..f4117a578 100644 --- a/data/maps/Route110_TrickHousePuzzle4/header.s +++ b/data/maps/Route110_TrickHousePuzzle4/header.s @@ -3,7 +3,7 @@ Route110_TrickHousePuzzle4:: @ 8307DF4 .4byte Route110_TrickHousePuzzle4_MapEvents .4byte Route110_TrickHousePuzzle4_MapScripts .4byte 0x0 - .2byte 448 + .2byte BGM_KARAKURI .2byte 251 .byte 25 .byte 0 diff --git a/data/maps/Route110_TrickHousePuzzle5/header.s b/data/maps/Route110_TrickHousePuzzle5/header.s index 3a6e1d3d9..7216f556e 100644 --- a/data/maps/Route110_TrickHousePuzzle5/header.s +++ b/data/maps/Route110_TrickHousePuzzle5/header.s @@ -3,7 +3,7 @@ Route110_TrickHousePuzzle5:: @ 8307E10 .4byte Route110_TrickHousePuzzle5_MapEvents .4byte Route110_TrickHousePuzzle5_MapScripts .4byte 0x0 - .2byte 448 + .2byte BGM_KARAKURI .2byte 252 .byte 25 .byte 0 diff --git a/data/maps/Route110_TrickHousePuzzle6/header.s b/data/maps/Route110_TrickHousePuzzle6/header.s index c85112658..5ffc844bd 100644 --- a/data/maps/Route110_TrickHousePuzzle6/header.s +++ b/data/maps/Route110_TrickHousePuzzle6/header.s @@ -3,7 +3,7 @@ Route110_TrickHousePuzzle6:: @ 8307E2C .4byte Route110_TrickHousePuzzle6_MapEvents .4byte Route110_TrickHousePuzzle6_MapScripts .4byte 0x0 - .2byte 448 + .2byte BGM_KARAKURI .2byte 253 .byte 25 .byte 0 diff --git a/data/maps/Route110_TrickHousePuzzle7/header.s b/data/maps/Route110_TrickHousePuzzle7/header.s index 57bcf842a..cea170daa 100644 --- a/data/maps/Route110_TrickHousePuzzle7/header.s +++ b/data/maps/Route110_TrickHousePuzzle7/header.s @@ -3,7 +3,7 @@ Route110_TrickHousePuzzle7:: @ 8307E48 .4byte Route110_TrickHousePuzzle7_MapEvents .4byte Route110_TrickHousePuzzle7_MapScripts .4byte 0x0 - .2byte 448 + .2byte BGM_KARAKURI .2byte 254 .byte 25 .byte 0 diff --git a/data/maps/Route110_TrickHousePuzzle8/header.s b/data/maps/Route110_TrickHousePuzzle8/header.s index 8f533b4c2..6a4dc7051 100644 --- a/data/maps/Route110_TrickHousePuzzle8/header.s +++ b/data/maps/Route110_TrickHousePuzzle8/header.s @@ -3,7 +3,7 @@ Route110_TrickHousePuzzle8:: @ 8307E64 .4byte Route110_TrickHousePuzzle8_MapEvents .4byte Route110_TrickHousePuzzle8_MapScripts .4byte 0x0 - .2byte 448 + .2byte BGM_KARAKURI .2byte 255 .byte 25 .byte 0 diff --git a/data/maps/Route111/header.s b/data/maps/Route111/header.s index 7d9be0476..5af1fb1c2 100644 --- a/data/maps/Route111/header.s +++ b/data/maps/Route111/header.s @@ -3,7 +3,7 @@ Route111:: @ 8305720 .4byte Route111_MapEvents .4byte Route111_MapScripts .4byte Route111_MapConnections - .2byte 360 + .2byte BGM_DOORO_X1 .2byte 27 .byte 26 .byte 0 diff --git a/data/maps/Route111_OldLadysRestStop/header.s b/data/maps/Route111_OldLadysRestStop/header.s index 23eeec456..23f4959a3 100644 --- a/data/maps/Route111_OldLadysRestStop/header.s +++ b/data/maps/Route111_OldLadysRestStop/header.s @@ -3,7 +3,7 @@ Route111_OldLadysRestStop:: @ 8306C74 .4byte Route111_OldLadysRestStop_MapEvents .4byte Route111_OldLadysRestStop_MapScripts .4byte 0x0 - .2byte 399 + .2byte BGM_GOTOWN .2byte 64 .byte 26 .byte 0 diff --git a/data/maps/Route111_WinstrateFamilysHouse/header.s b/data/maps/Route111_WinstrateFamilysHouse/header.s index 7df9a44d8..d7333f070 100644 --- a/data/maps/Route111_WinstrateFamilysHouse/header.s +++ b/data/maps/Route111_WinstrateFamilysHouse/header.s @@ -3,7 +3,7 @@ Route111_WinstrateFamilysHouse:: @ 8306C58 .4byte Route111_WinstrateFamilysHouse_MapEvents .4byte Route111_WinstrateFamilysHouse_MapScripts .4byte 0x0 - .2byte 399 + .2byte BGM_GOTOWN .2byte 60 .byte 26 .byte 0 diff --git a/data/maps/Route112/header.s b/data/maps/Route112/header.s index 810701a97..f798451d6 100644 --- a/data/maps/Route112/header.s +++ b/data/maps/Route112/header.s @@ -3,7 +3,7 @@ Route112:: @ 830573C .4byte Route112_MapEvents .4byte Route112_MapScripts .4byte Route112_MapConnections - .2byte 360 + .2byte BGM_DOORO_X1 .2byte 28 .byte 27 .byte 0 diff --git a/data/maps/Route112_CableCarStation/header.s b/data/maps/Route112_CableCarStation/header.s index 641e4664a..3d025fb7b 100644 --- a/data/maps/Route112_CableCarStation/header.s +++ b/data/maps/Route112_CableCarStation/header.s @@ -3,7 +3,7 @@ Route112_CableCarStation:: @ 8306C90 .4byte Route112_CableCarStation_MapEvents .4byte Route112_CableCarStation_MapScripts .4byte 0x0 - .2byte 360 + .2byte BGM_DOORO_X1 .2byte 119 .byte 27 .byte 0 diff --git a/data/maps/Route113/header.s b/data/maps/Route113/header.s index eba978731..5792f97c3 100644 --- a/data/maps/Route113/header.s +++ b/data/maps/Route113/header.s @@ -3,7 +3,7 @@ Route113:: @ 8305758 .4byte Route113_MapEvents .4byte Route113_MapScripts .4byte Route113_MapConnections - .2byte 418 + .2byte BGM_KAZANBAI .2byte 29 .byte 28 .byte 0 diff --git a/data/maps/Route113_GlassWorkshop/header.s b/data/maps/Route113_GlassWorkshop/header.s index b90b0c1d5..a8bfdd35d 100644 --- a/data/maps/Route113_GlassWorkshop/header.s +++ b/data/maps/Route113_GlassWorkshop/header.s @@ -3,7 +3,7 @@ Route113_GlassWorkshop:: @ 8307EB8 .4byte Route113_GlassWorkshop_MapEvents .4byte Route113_GlassWorkshop_MapScripts .4byte 0x0 - .2byte 399 + .2byte BGM_GOTOWN .2byte 67 .byte 28 .byte 0 diff --git a/data/maps/Route114/header.s b/data/maps/Route114/header.s index b5db689c7..cfb5f4114 100644 --- a/data/maps/Route114/header.s +++ b/data/maps/Route114/header.s @@ -3,7 +3,7 @@ Route114:: @ 8305774 .4byte Route114_MapEvents .4byte Route114_MapScripts .4byte Route114_MapConnections - .2byte 360 + .2byte BGM_DOORO_X1 .2byte 30 .byte 29 .byte 0 diff --git a/data/maps/Route114_FossilManiacsHouse/header.s b/data/maps/Route114_FossilManiacsHouse/header.s index 103ba0168..2da95c284 100644 --- a/data/maps/Route114_FossilManiacsHouse/header.s +++ b/data/maps/Route114_FossilManiacsHouse/header.s @@ -3,7 +3,7 @@ Route114_FossilManiacsHouse:: @ 8306CC8 .4byte Route114_FossilManiacsHouse_MapEvents .4byte Route114_FossilManiacsHouse_MapScripts .4byte 0x0 - .2byte 437 + .2byte BGM_TONEKUSA .2byte 120 .byte 29 .byte 0 diff --git a/data/maps/Route114_FossilManiacsTunnel/header.s b/data/maps/Route114_FossilManiacsTunnel/header.s index 8f5a9ba97..b410c822c 100644 --- a/data/maps/Route114_FossilManiacsTunnel/header.s +++ b/data/maps/Route114_FossilManiacsTunnel/header.s @@ -3,7 +3,7 @@ Route114_FossilManiacsTunnel:: @ 8306CE4 .4byte Route114_FossilManiacsTunnel_MapEvents .4byte Route114_FossilManiacsTunnel_MapScripts .4byte 0x0 - .2byte 437 + .2byte BGM_TONEKUSA .2byte 121 .byte 29 .byte 0 diff --git a/data/maps/Route114_LanettesHouse/header.s b/data/maps/Route114_LanettesHouse/header.s index 68ef2db79..a5b7eea50 100644 --- a/data/maps/Route114_LanettesHouse/header.s +++ b/data/maps/Route114_LanettesHouse/header.s @@ -3,7 +3,7 @@ Route114_LanettesHouse:: @ 8306D00 .4byte Route114_LanettesHouse_MapEvents .4byte Route114_LanettesHouse_MapScripts .4byte 0x0 - .2byte 437 + .2byte BGM_TONEKUSA .2byte 122 .byte 29 .byte 0 diff --git a/data/maps/Route115/header.s b/data/maps/Route115/header.s index 68432e76a..b11134e28 100644 --- a/data/maps/Route115/header.s +++ b/data/maps/Route115/header.s @@ -3,7 +3,7 @@ Route115:: @ 8305790 .4byte Route115_MapEvents .4byte Route115_MapScripts .4byte Route115_MapConnections - .2byte 401 + .2byte BGM_NEXTROAD .2byte 31 .byte 30 .byte 0 diff --git a/data/maps/Route116/header.s b/data/maps/Route116/header.s index 67f090c8c..f4e145bf1 100644 --- a/data/maps/Route116/header.s +++ b/data/maps/Route116/header.s @@ -3,7 +3,7 @@ Route116:: @ 83057AC .4byte Route116_MapEvents .4byte Route116_MapScripts .4byte Route116_MapConnections - .2byte 401 + .2byte BGM_NEXTROAD .2byte 32 .byte 31 .byte 0 diff --git a/data/maps/Route116_TunnelersRestHouse/header.s b/data/maps/Route116_TunnelersRestHouse/header.s index 8c2ab81b0..a52c6cada 100644 --- a/data/maps/Route116_TunnelersRestHouse/header.s +++ b/data/maps/Route116_TunnelersRestHouse/header.s @@ -3,7 +3,7 @@ Route116_TunnelersRestHouse:: @ 8306D1C .4byte Route116_TunnelersRestHouse_MapEvents .4byte Route116_TunnelersRestHouse_MapScripts .4byte 0x0 - .2byte 399 + .2byte BGM_GOTOWN .2byte 123 .byte 31 .byte 0 diff --git a/data/maps/Route117/header.s b/data/maps/Route117/header.s index 9beee6013..9649f4728 100644 --- a/data/maps/Route117/header.s +++ b/data/maps/Route117/header.s @@ -3,7 +3,7 @@ Route117:: @ 83057C8 .4byte Route117_MapEvents .4byte Route117_MapScripts .4byte Route117_MapConnections - .2byte 360 + .2byte BGM_DOORO_X1 .2byte 33 .byte 32 .byte 0 diff --git a/data/maps/Route117_PokemonDayCare/header.s b/data/maps/Route117_PokemonDayCare/header.s index 8e39b50a4..567819b48 100644 --- a/data/maps/Route117_PokemonDayCare/header.s +++ b/data/maps/Route117_PokemonDayCare/header.s @@ -3,7 +3,7 @@ Route117_PokemonDayCare:: @ 8306D38 .4byte Route117_PokemonDayCare_MapEvents .4byte Route117_PokemonDayCare_MapScripts .4byte 0x0 - .2byte 399 + .2byte BGM_GOTOWN .2byte 124 .byte 32 .byte 0 diff --git a/data/maps/Route118/header.s b/data/maps/Route118/header.s index ab287c3b3..6b8ec4763 100644 --- a/data/maps/Route118/header.s +++ b/data/maps/Route118/header.s @@ -3,7 +3,7 @@ Route118:: @ 83057E4 .4byte Route118_MapEvents .4byte Route118_MapScripts .4byte Route118_MapConnections - .2byte 32767 + .2byte 0x7fff .2byte 34 .byte 33 .byte 0 diff --git a/data/maps/Route119/header.s b/data/maps/Route119/header.s index 2e9bd74d6..ef5887676 100644 --- a/data/maps/Route119/header.s +++ b/data/maps/Route119/header.s @@ -3,7 +3,7 @@ Route119:: @ 8305800 .4byte Route119_MapEvents .4byte Route119_MapScripts .4byte Route119_MapConnections - .2byte 402 + .2byte BGM_GRANROAD .2byte 35 .byte 34 .byte 0 diff --git a/data/maps/Route119_House/header.s b/data/maps/Route119_House/header.s index b22291683..d64c4b804 100644 --- a/data/maps/Route119_House/header.s +++ b/data/maps/Route119_House/header.s @@ -3,7 +3,7 @@ Route119_House:: @ 8307F28 .4byte Route119_House_MapEvents .4byte Route119_House_MapScripts .4byte 0x0 - .2byte 399 + .2byte BGM_GOTOWN .2byte 59 .byte 34 .byte 0 diff --git a/data/maps/Route119_WeatherInstitute_1F/header.s b/data/maps/Route119_WeatherInstitute_1F/header.s index 63c0bf769..b392fbc41 100644 --- a/data/maps/Route119_WeatherInstitute_1F/header.s +++ b/data/maps/Route119_WeatherInstitute_1F/header.s @@ -3,7 +3,7 @@ Route119_WeatherInstitute_1F:: @ 8307EF0 .4byte Route119_WeatherInstitute_1F_MapEvents .4byte Route119_WeatherInstitute_1F_MapScripts .4byte 0x0 - .2byte 399 + .2byte BGM_GOTOWN .2byte 272 .byte 34 .byte 0 diff --git a/data/maps/Route119_WeatherInstitute_2F/header.s b/data/maps/Route119_WeatherInstitute_2F/header.s index d505d7241..9a5c3d9d8 100644 --- a/data/maps/Route119_WeatherInstitute_2F/header.s +++ b/data/maps/Route119_WeatherInstitute_2F/header.s @@ -3,7 +3,7 @@ Route119_WeatherInstitute_2F:: @ 8307F0C .4byte Route119_WeatherInstitute_2F_MapEvents .4byte Route119_WeatherInstitute_2F_MapScripts .4byte 0x0 - .2byte 399 + .2byte BGM_GOTOWN .2byte 273 .byte 34 .byte 0 diff --git a/data/maps/Route120/header.s b/data/maps/Route120/header.s index 32e8cc656..3f8be7e95 100644 --- a/data/maps/Route120/header.s +++ b/data/maps/Route120/header.s @@ -3,7 +3,7 @@ Route120:: @ 830581C .4byte Route120_MapEvents .4byte Route120_MapScripts .4byte Route120_MapConnections - .2byte 361 + .2byte BGM_DOORO_X3 .2byte 36 .byte 35 .byte 0 diff --git a/data/maps/Route121/header.s b/data/maps/Route121/header.s index 530c037a2..ba2c3d2da 100644 --- a/data/maps/Route121/header.s +++ b/data/maps/Route121/header.s @@ -3,7 +3,7 @@ Route121:: @ 8305838 .4byte Route121_MapEvents .4byte Route121_MapScripts .4byte Route121_MapConnections - .2byte 361 + .2byte BGM_DOORO_X3 .2byte 37 .byte 36 .byte 0 diff --git a/data/maps/Route121_SafariZoneEntrance/header.s b/data/maps/Route121_SafariZoneEntrance/header.s index 6c567c3ac..4a0bbe244 100644 --- a/data/maps/Route121_SafariZoneEntrance/header.s +++ b/data/maps/Route121_SafariZoneEntrance/header.s @@ -3,7 +3,7 @@ Route121_SafariZoneEntrance:: @ 8306D54 .4byte Route121_SafariZoneEntrance_MapEvents .4byte Route121_SafariZoneEntrance_MapScripts .4byte 0x0 - .2byte 382 + .2byte BGM_MACHI_S3 .2byte 125 .byte 36 .byte 0 diff --git a/data/maps/Route122/header.s b/data/maps/Route122/header.s index 08aeccda0..9889cc813 100644 --- a/data/maps/Route122/header.s +++ b/data/maps/Route122/header.s @@ -3,7 +3,7 @@ Route122:: @ 8305854 .4byte Route122_MapEvents .4byte Route122_MapScripts .4byte Route122_MapConnections - .2byte 374 + .2byte BGM_DOORO_X4 .2byte 38 .byte 37 .byte 0 diff --git a/data/maps/Route123/header.s b/data/maps/Route123/header.s index d66753a00..f33ab3e98 100644 --- a/data/maps/Route123/header.s +++ b/data/maps/Route123/header.s @@ -3,7 +3,7 @@ Route123:: @ 8305870 .4byte Route123_MapEvents .4byte Route123_MapScripts .4byte Route123_MapConnections - .2byte 374 + .2byte BGM_DOORO_X4 .2byte 39 .byte 38 .byte 0 diff --git a/data/maps/Route123_BerryMastersHouse/header.s b/data/maps/Route123_BerryMastersHouse/header.s index b9517e6d8..0eb77ca2e 100644 --- a/data/maps/Route123_BerryMastersHouse/header.s +++ b/data/maps/Route123_BerryMastersHouse/header.s @@ -3,7 +3,7 @@ Route123_BerryMastersHouse:: @ 8307ED4 .4byte Route123_BerryMastersHouse_MapEvents .4byte Route123_BerryMastersHouse_MapScripts .4byte 0x0 - .2byte 399 + .2byte BGM_GOTOWN .2byte 60 .byte 38 .byte 0 diff --git a/data/maps/Route124/header.s b/data/maps/Route124/header.s index ae48b524e..6e4466225 100644 --- a/data/maps/Route124/header.s +++ b/data/maps/Route124/header.s @@ -3,7 +3,7 @@ Route124:: @ 830588C .4byte Route124_MapEvents .4byte Route124_MapScripts .4byte Route124_MapConnections - .2byte 361 + .2byte BGM_DOORO_X3 .2byte 40 .byte 39 .byte 0 diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/header.s b/data/maps/Route124_DivingTreasureHuntersHouse/header.s index 1f56bceee..472ebc45a 100644 --- a/data/maps/Route124_DivingTreasureHuntersHouse/header.s +++ b/data/maps/Route124_DivingTreasureHuntersHouse/header.s @@ -3,7 +3,7 @@ Route124_DivingTreasureHuntersHouse:: @ 8307F44 .4byte Route124_DivingTreasureHuntersHouse_MapEvents .4byte Route124_DivingTreasureHuntersHouse_MapScripts .4byte 0x0 - .2byte 408 + .2byte BGM_MINAMO .2byte 302 .byte 39 .byte 0 diff --git a/data/maps/Route125/header.s b/data/maps/Route125/header.s index aa067185f..e7a43a64d 100644 --- a/data/maps/Route125/header.s +++ b/data/maps/Route125/header.s @@ -3,7 +3,7 @@ Route125:: @ 83058A8 .4byte Route125_MapEvents .4byte Route125_MapScripts .4byte Route125_MapConnections - .2byte 361 + .2byte BGM_DOORO_X3 .2byte 41 .byte 40 .byte 0 diff --git a/data/maps/Route126/header.s b/data/maps/Route126/header.s index 1b2b23004..a973af531 100644 --- a/data/maps/Route126/header.s +++ b/data/maps/Route126/header.s @@ -3,7 +3,7 @@ Route126:: @ 83058C4 .4byte Route126_MapEvents .4byte Route126_MapScripts .4byte Route126_MapConnections - .2byte 361 + .2byte BGM_DOORO_X3 .2byte 42 .byte 41 .byte 0 diff --git a/data/maps/Route127/header.s b/data/maps/Route127/header.s index 500c803f0..a9f887a2b 100644 --- a/data/maps/Route127/header.s +++ b/data/maps/Route127/header.s @@ -3,7 +3,7 @@ Route127:: @ 83058E0 .4byte Route127_MapEvents .4byte Route127_MapScripts .4byte Route127_MapConnections - .2byte 361 + .2byte BGM_DOORO_X3 .2byte 43 .byte 42 .byte 0 diff --git a/data/maps/Route128/header.s b/data/maps/Route128/header.s index 019f919d8..9ecc76fb7 100644 --- a/data/maps/Route128/header.s +++ b/data/maps/Route128/header.s @@ -3,7 +3,7 @@ Route128:: @ 83058FC .4byte Route128_MapEvents .4byte Route128_MapScripts .4byte Route128_MapConnections - .2byte 361 + .2byte BGM_DOORO_X3 .2byte 44 .byte 43 .byte 0 diff --git a/data/maps/Route129/header.s b/data/maps/Route129/header.s index bd192c6b0..580d69fc7 100644 --- a/data/maps/Route129/header.s +++ b/data/maps/Route129/header.s @@ -3,7 +3,7 @@ Route129:: @ 8305918 .4byte Route129_MapEvents .4byte Route129_MapScripts .4byte Route129_MapConnections - .2byte 402 + .2byte BGM_GRANROAD .2byte 45 .byte 44 .byte 0 diff --git a/data/maps/Route130/header.s b/data/maps/Route130/header.s index cc6115ea4..a788bf9b5 100644 --- a/data/maps/Route130/header.s +++ b/data/maps/Route130/header.s @@ -3,7 +3,7 @@ Route130:: @ 8305934 .4byte Route130_MapEvents .4byte Route130_MapScripts .4byte Route130_MapConnections - .2byte 402 + .2byte BGM_GRANROAD .2byte 264 .byte 45 .byte 0 diff --git a/data/maps/Route131/header.s b/data/maps/Route131/header.s index 4a83dfc48..e7d9ea231 100644 --- a/data/maps/Route131/header.s +++ b/data/maps/Route131/header.s @@ -3,7 +3,7 @@ Route131:: @ 8305950 .4byte Route131_MapEvents .4byte Route131_MapScripts .4byte Route131_MapConnections - .2byte 402 + .2byte BGM_GRANROAD .2byte 47 .byte 46 .byte 0 diff --git a/data/maps/Route132/header.s b/data/maps/Route132/header.s index 53f6e9f8f..d7ad0b2a4 100644 --- a/data/maps/Route132/header.s +++ b/data/maps/Route132/header.s @@ -3,7 +3,7 @@ Route132:: @ 830596C .4byte Route132_MapEvents .4byte Route132_MapScripts .4byte Route132_MapConnections - .2byte 402 + .2byte BGM_GRANROAD .2byte 48 .byte 47 .byte 0 diff --git a/data/maps/Route133/header.s b/data/maps/Route133/header.s index 7d1b48d1c..4c0f718ec 100644 --- a/data/maps/Route133/header.s +++ b/data/maps/Route133/header.s @@ -3,7 +3,7 @@ Route133:: @ 8305988 .4byte Route133_MapEvents .4byte Route133_MapScripts .4byte Route133_MapConnections - .2byte 402 + .2byte BGM_GRANROAD .2byte 49 .byte 48 .byte 0 diff --git a/data/maps/Route134/header.s b/data/maps/Route134/header.s index 7379892b8..2ca22c40e 100644 --- a/data/maps/Route134/header.s +++ b/data/maps/Route134/header.s @@ -3,7 +3,7 @@ Route134:: @ 83059A4 .4byte Route134_MapEvents .4byte Route134_MapScripts .4byte Route134_MapConnections - .2byte 402 + .2byte BGM_GRANROAD .2byte 50 .byte 49 .byte 0 diff --git a/data/maps/RustboroCity/header.s b/data/maps/RustboroCity/header.s index d47f93c1d..d1352ea3e 100644 --- a/data/maps/RustboroCity/header.s +++ b/data/maps/RustboroCity/header.s @@ -3,7 +3,7 @@ RustboroCity:: @ 830549C .4byte RustboroCity_MapEvents .4byte RustboroCity_MapScripts .4byte RustboroCity_MapConnections - .2byte 399 + .2byte BGM_GOTOWN .2byte 4 .byte 10 .byte 0 diff --git a/data/maps/RustboroCity_CuttersHouse/header.s b/data/maps/RustboroCity_CuttersHouse/header.s index b7532c0ab..c3b5a6d7c 100644 --- a/data/maps/RustboroCity_CuttersHouse/header.s +++ b/data/maps/RustboroCity_CuttersHouse/header.s @@ -3,7 +3,7 @@ RustboroCity_CuttersHouse:: @ 8306360 .4byte RustboroCity_CuttersHouse_MapEvents .4byte RustboroCity_CuttersHouse_MapScripts .4byte 0x0 - .2byte 399 + .2byte BGM_GOTOWN .2byte 98 .byte 10 .byte 0 diff --git a/data/maps/RustboroCity_DevonCorp_1F/header.s b/data/maps/RustboroCity_DevonCorp_1F/header.s index 8f85508e6..5539006ff 100644 --- a/data/maps/RustboroCity_DevonCorp_1F/header.s +++ b/data/maps/RustboroCity_DevonCorp_1F/header.s @@ -3,7 +3,7 @@ RustboroCity_DevonCorp_1F:: @ 830622C .4byte RustboroCity_DevonCorp_1F_MapEvents .4byte RustboroCity_DevonCorp_1F_MapScripts .4byte 0x0 - .2byte 399 + .2byte BGM_GOTOWN .2byte 92 .byte 10 .byte 0 diff --git a/data/maps/RustboroCity_DevonCorp_2F/header.s b/data/maps/RustboroCity_DevonCorp_2F/header.s index adc0ca3bf..76bbea60b 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/header.s +++ b/data/maps/RustboroCity_DevonCorp_2F/header.s @@ -3,7 +3,7 @@ RustboroCity_DevonCorp_2F:: @ 8306248 .4byte RustboroCity_DevonCorp_2F_MapEvents .4byte RustboroCity_DevonCorp_2F_MapScripts .4byte 0x0 - .2byte 399 + .2byte BGM_GOTOWN .2byte 93 .byte 10 .byte 0 diff --git a/data/maps/RustboroCity_DevonCorp_3F/header.s b/data/maps/RustboroCity_DevonCorp_3F/header.s index bead1aec5..c3d4549de 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/header.s +++ b/data/maps/RustboroCity_DevonCorp_3F/header.s @@ -3,7 +3,7 @@ RustboroCity_DevonCorp_3F:: @ 8306264 .4byte RustboroCity_DevonCorp_3F_MapEvents .4byte RustboroCity_DevonCorp_3F_MapScripts .4byte 0x0 - .2byte 399 + .2byte BGM_GOTOWN .2byte 270 .byte 10 .byte 0 diff --git a/data/maps/RustboroCity_Flat1_1F/header.s b/data/maps/RustboroCity_Flat1_1F/header.s index f61b4180e..68a5697be 100644 --- a/data/maps/RustboroCity_Flat1_1F/header.s +++ b/data/maps/RustboroCity_Flat1_1F/header.s @@ -3,7 +3,7 @@ RustboroCity_Flat1_1F:: @ 830630C .4byte RustboroCity_Flat1_1F_MapEvents .4byte RustboroCity_Flat1_1F_MapScripts .4byte 0x0 - .2byte 399 + .2byte BGM_GOTOWN .2byte 314 .byte 10 .byte 0 diff --git a/data/maps/RustboroCity_Flat1_2F/header.s b/data/maps/RustboroCity_Flat1_2F/header.s index bcec29b82..f0b29ae0d 100644 --- a/data/maps/RustboroCity_Flat1_2F/header.s +++ b/data/maps/RustboroCity_Flat1_2F/header.s @@ -3,7 +3,7 @@ RustboroCity_Flat1_2F:: @ 8306328 .4byte RustboroCity_Flat1_2F_MapEvents .4byte RustboroCity_Flat1_2F_MapScripts .4byte 0x0 - .2byte 399 + .2byte BGM_GOTOWN .2byte 315 .byte 10 .byte 0 diff --git a/data/maps/RustboroCity_Flat2_1F/header.s b/data/maps/RustboroCity_Flat2_1F/header.s index 7ce84500f..5f54f2624 100644 --- a/data/maps/RustboroCity_Flat2_1F/header.s +++ b/data/maps/RustboroCity_Flat2_1F/header.s @@ -3,7 +3,7 @@ RustboroCity_Flat2_1F:: @ 8306398 .4byte RustboroCity_Flat2_1F_MapEvents .4byte RustboroCity_Flat2_1F_MapScripts .4byte 0x0 - .2byte 399 + .2byte BGM_GOTOWN .2byte 295 .byte 10 .byte 0 diff --git a/data/maps/RustboroCity_Flat2_2F/header.s b/data/maps/RustboroCity_Flat2_2F/header.s index af43cce45..086947abf 100644 --- a/data/maps/RustboroCity_Flat2_2F/header.s +++ b/data/maps/RustboroCity_Flat2_2F/header.s @@ -3,7 +3,7 @@ RustboroCity_Flat2_2F:: @ 83063B4 .4byte RustboroCity_Flat2_2F_MapEvents .4byte RustboroCity_Flat2_2F_MapScripts .4byte 0x0 - .2byte 399 + .2byte BGM_GOTOWN .2byte 296 .byte 10 .byte 0 diff --git a/data/maps/RustboroCity_Flat2_3F/header.s b/data/maps/RustboroCity_Flat2_3F/header.s index 7309198e4..42866ebf2 100644 --- a/data/maps/RustboroCity_Flat2_3F/header.s +++ b/data/maps/RustboroCity_Flat2_3F/header.s @@ -3,7 +3,7 @@ RustboroCity_Flat2_3F:: @ 83063D0 .4byte RustboroCity_Flat2_3F_MapEvents .4byte RustboroCity_Flat2_3F_MapScripts .4byte 0x0 - .2byte 399 + .2byte BGM_GOTOWN .2byte 297 .byte 10 .byte 0 diff --git a/data/maps/RustboroCity_Gym/header.s b/data/maps/RustboroCity_Gym/header.s index 42a1da28c..5d18e933b 100644 --- a/data/maps/RustboroCity_Gym/header.s +++ b/data/maps/RustboroCity_Gym/header.s @@ -3,7 +3,7 @@ RustboroCity_Gym:: @ 8306280 .4byte RustboroCity_Gym_MapEvents .4byte RustboroCity_Gym_MapScripts .4byte 0x0 - .2byte 364 + .2byte BGM_GIM .2byte 94 .byte 10 .byte 0 diff --git a/data/maps/RustboroCity_House1/header.s b/data/maps/RustboroCity_House1/header.s index 4a4f2ff04..9ee09b4e3 100644 --- a/data/maps/RustboroCity_House1/header.s +++ b/data/maps/RustboroCity_House1/header.s @@ -3,7 +3,7 @@ RustboroCity_House1:: @ 8306344 .4byte RustboroCity_House1_MapEvents .4byte RustboroCity_House1_MapScripts .4byte 0x0 - .2byte 399 + .2byte BGM_GOTOWN .2byte 97 .byte 10 .byte 0 diff --git a/data/maps/RustboroCity_House2/header.s b/data/maps/RustboroCity_House2/header.s index 648148734..0122c6a92 100644 --- a/data/maps/RustboroCity_House2/header.s +++ b/data/maps/RustboroCity_House2/header.s @@ -3,7 +3,7 @@ RustboroCity_House2:: @ 830637C .4byte RustboroCity_House2_MapEvents .4byte RustboroCity_House2_MapScripts .4byte 0x0 - .2byte 399 + .2byte BGM_GOTOWN .2byte 96 .byte 10 .byte 0 diff --git a/data/maps/RustboroCity_House3/header.s b/data/maps/RustboroCity_House3/header.s index eac488d84..8876f8499 100644 --- a/data/maps/RustboroCity_House3/header.s +++ b/data/maps/RustboroCity_House3/header.s @@ -3,7 +3,7 @@ RustboroCity_House3:: @ 83063EC .4byte RustboroCity_House3_MapEvents .4byte RustboroCity_House3_MapScripts .4byte 0x0 - .2byte 399 + .2byte BGM_GOTOWN .2byte 96 .byte 10 .byte 0 diff --git a/data/maps/RustboroCity_Mart/header.s b/data/maps/RustboroCity_Mart/header.s index ffb8e4d09..535c3e2fc 100644 --- a/data/maps/RustboroCity_Mart/header.s +++ b/data/maps/RustboroCity_Mart/header.s @@ -3,7 +3,7 @@ RustboroCity_Mart:: @ 83062F0 .4byte RustboroCity_Mart_MapEvents .4byte RustboroCity_Mart_MapScripts .4byte 0x0 - .2byte 404 + .2byte BGM_FRIENDLY .2byte 63 .byte 10 .byte 0 diff --git a/data/maps/RustboroCity_PokemonCenter_1F/header.s b/data/maps/RustboroCity_PokemonCenter_1F/header.s index 06aa2bc2f..57cb84729 100644 --- a/data/maps/RustboroCity_PokemonCenter_1F/header.s +++ b/data/maps/RustboroCity_PokemonCenter_1F/header.s @@ -3,7 +3,7 @@ RustboroCity_PokemonCenter_1F:: @ 83062B8 .4byte RustboroCity_PokemonCenter_1F_MapEvents .4byte RustboroCity_PokemonCenter_1F_MapScripts .4byte 0x0 - .2byte 400 + .2byte BGM_POKECEN .2byte 61 .byte 10 .byte 0 diff --git a/data/maps/RustboroCity_PokemonCenter_2F/header.s b/data/maps/RustboroCity_PokemonCenter_2F/header.s index 7e4f1d4f8..838a5e5a9 100644 --- a/data/maps/RustboroCity_PokemonCenter_2F/header.s +++ b/data/maps/RustboroCity_PokemonCenter_2F/header.s @@ -3,7 +3,7 @@ RustboroCity_PokemonCenter_2F:: @ 83062D4 .4byte RustboroCity_PokemonCenter_2F_MapEvents .4byte RustboroCity_PokemonCenter_2F_MapScripts .4byte 0x0 - .2byte 400 + .2byte BGM_POKECEN .2byte 62 .byte 10 .byte 0 diff --git a/data/maps/RustboroCity_PokemonSchool/header.s b/data/maps/RustboroCity_PokemonSchool/header.s index 6b54f30d9..dfb46b6f1 100644 --- a/data/maps/RustboroCity_PokemonSchool/header.s +++ b/data/maps/RustboroCity_PokemonSchool/header.s @@ -3,7 +3,7 @@ RustboroCity_PokemonSchool:: @ 830629C .4byte RustboroCity_PokemonSchool_MapEvents .4byte RustboroCity_PokemonSchool_MapScripts .4byte 0x0 - .2byte 435 + .2byte BGM_P_SCHOOL .2byte 95 .byte 10 .byte 0 diff --git a/data/maps/RusturfTunnel/header.s b/data/maps/RusturfTunnel/header.s index 825762dcd..3e497a1e5 100644 --- a/data/maps/RusturfTunnel/header.s +++ b/data/maps/RusturfTunnel/header.s @@ -3,7 +3,7 @@ RusturfTunnel:: @ 8306DE0 .4byte RusturfTunnel_MapEvents .4byte RusturfTunnel_MapScripts .4byte 0x0 - .2byte 366 + .2byte BGM_DAN01 .2byte 130 .byte 60 .byte 0 diff --git a/data/maps/SSTidalCorridor/header.s b/data/maps/SSTidalCorridor/header.s index 96cd31588..6370e81ca 100644 --- a/data/maps/SSTidalCorridor/header.s +++ b/data/maps/SSTidalCorridor/header.s @@ -3,7 +3,7 @@ SSTidalCorridor:: @ 8307B54 .4byte SSTidalCorridor_MapEvents .4byte SSTidalCorridor_MapScripts .4byte 0x0 - .2byte 431 + .2byte BGM_M_BOAT .2byte 278 .byte 87 .byte 0 diff --git a/data/maps/SSTidalLowerDeck/header.s b/data/maps/SSTidalLowerDeck/header.s index 2e42372d8..5b6bec321 100644 --- a/data/maps/SSTidalLowerDeck/header.s +++ b/data/maps/SSTidalLowerDeck/header.s @@ -3,7 +3,7 @@ SSTidalLowerDeck:: @ 8307B70 .4byte SSTidalLowerDeck_MapEvents .4byte SSTidalLowerDeck_MapScripts .4byte 0x0 - .2byte 431 + .2byte BGM_M_BOAT .2byte 279 .byte 87 .byte 0 diff --git a/data/maps/SSTidalRooms/header.s b/data/maps/SSTidalRooms/header.s index b71367c9c..36bcab75e 100644 --- a/data/maps/SSTidalRooms/header.s +++ b/data/maps/SSTidalRooms/header.s @@ -3,7 +3,7 @@ SSTidalRooms:: @ 8307B8C .4byte SSTidalRooms_MapEvents .4byte SSTidalRooms_MapScripts .4byte 0x0 - .2byte 431 + .2byte BGM_M_BOAT .2byte 280 .byte 87 .byte 0 diff --git a/data/maps/SafariZone_Northeast/header.s b/data/maps/SafariZone_Northeast/header.s index 3842c7d06..55bef875f 100644 --- a/data/maps/SafariZone_Northeast/header.s +++ b/data/maps/SafariZone_Northeast/header.s @@ -3,7 +3,7 @@ SafariZone_Northeast:: @ 8307BC4 .4byte SafariZone_Northeast_MapEvents .4byte SafariZone_Northeast_MapScripts .4byte SafariZone_Northeast_MapConnections - .2byte 428 + .2byte BGM_SAFARI .2byte 240 .byte 57 .byte 0 diff --git a/data/maps/SafariZone_Northwest/header.s b/data/maps/SafariZone_Northwest/header.s index eae357c4f..a3c85c6ed 100644 --- a/data/maps/SafariZone_Northwest/header.s +++ b/data/maps/SafariZone_Northwest/header.s @@ -3,7 +3,7 @@ SafariZone_Northwest:: @ 8307BA8 .4byte SafariZone_Northwest_MapEvents .4byte SafariZone_Northwest_MapScripts .4byte SafariZone_Northwest_MapConnections - .2byte 428 + .2byte BGM_SAFARI .2byte 239 .byte 57 .byte 0 diff --git a/data/maps/SafariZone_RestHouse/header.s b/data/maps/SafariZone_RestHouse/header.s index 1a9fdf1ea..3db84b0b7 100644 --- a/data/maps/SafariZone_RestHouse/header.s +++ b/data/maps/SafariZone_RestHouse/header.s @@ -3,7 +3,7 @@ SafariZone_RestHouse:: @ 8307CDC .4byte SafariZone_RestHouse_MapEvents .4byte SafariZone_RestHouse_MapScripts .4byte 0x0 - .2byte 428 + .2byte BGM_SAFARI .2byte 330 .byte 57 .byte 0 diff --git a/data/maps/SafariZone_Southeast/header.s b/data/maps/SafariZone_Southeast/header.s index 54cc5c621..1307c9700 100644 --- a/data/maps/SafariZone_Southeast/header.s +++ b/data/maps/SafariZone_Southeast/header.s @@ -3,7 +3,7 @@ SafariZone_Southeast:: @ 8307BFC .4byte SafariZone_Southeast_MapEvents .4byte SafariZone_Southeast_MapScripts .4byte SafariZone_Southeast_MapConnections - .2byte 428 + .2byte BGM_SAFARI .2byte 242 .byte 57 .byte 0 diff --git a/data/maps/SafariZone_Southwest/header.s b/data/maps/SafariZone_Southwest/header.s index 06a7f5336..548dc24b7 100644 --- a/data/maps/SafariZone_Southwest/header.s +++ b/data/maps/SafariZone_Southwest/header.s @@ -3,7 +3,7 @@ SafariZone_Southwest:: @ 8307BE0 .4byte SafariZone_Southwest_MapEvents .4byte SafariZone_Southwest_MapScripts .4byte SafariZone_Southwest_MapConnections - .2byte 428 + .2byte BGM_SAFARI .2byte 241 .byte 57 .byte 0 diff --git a/data/maps/ScorchedSlab/header.s b/data/maps/ScorchedSlab/header.s index ac60d92ed..16e45546e 100644 --- a/data/maps/ScorchedSlab/header.s +++ b/data/maps/ScorchedSlab/header.s @@ -3,7 +3,7 @@ ScorchedSlab:: @ 830756C .4byte ScorchedSlab_MapEvents .4byte ScorchedSlab_MapScripts .4byte 0x0 - .2byte 366 + .2byte BGM_DAN01 .2byte 312 .byte 80 .byte 0 diff --git a/data/maps/SeafloorCavern_Entrance/header.s b/data/maps/SeafloorCavern_Entrance/header.s index bf11411cf..d768c1099 100644 --- a/data/maps/SeafloorCavern_Entrance/header.s +++ b/data/maps/SeafloorCavern_Entrance/header.s @@ -3,7 +3,7 @@ SeafloorCavern_Entrance:: @ 8307064 .4byte SeafloorCavern_Entrance_MapEvents .4byte SeafloorCavern_Entrance_MapScripts .4byte 0x0 - .2byte 406 + .2byte BGM_TOZAN .2byte 148 .byte 68 .byte 0 diff --git a/data/maps/SeafloorCavern_Room1/header.s b/data/maps/SeafloorCavern_Room1/header.s index c366ec3da..affbaf21c 100644 --- a/data/maps/SeafloorCavern_Room1/header.s +++ b/data/maps/SeafloorCavern_Room1/header.s @@ -3,7 +3,7 @@ SeafloorCavern_Room1:: @ 8307080 .4byte SeafloorCavern_Room1_MapEvents .4byte SeafloorCavern_Room1_MapScripts .4byte 0x0 - .2byte 406 + .2byte BGM_TOZAN .2byte 149 .byte 68 .byte 0 diff --git a/data/maps/SeafloorCavern_Room2/header.s b/data/maps/SeafloorCavern_Room2/header.s index d9cbc8b46..6e0e7455d 100644 --- a/data/maps/SeafloorCavern_Room2/header.s +++ b/data/maps/SeafloorCavern_Room2/header.s @@ -3,7 +3,7 @@ SeafloorCavern_Room2:: @ 830709C .4byte SeafloorCavern_Room2_MapEvents .4byte SeafloorCavern_Room2_MapScripts .4byte 0x0 - .2byte 406 + .2byte BGM_TOZAN .2byte 150 .byte 68 .byte 0 diff --git a/data/maps/SeafloorCavern_Room3/header.s b/data/maps/SeafloorCavern_Room3/header.s index be6afcc9f..e2a432cd9 100644 --- a/data/maps/SeafloorCavern_Room3/header.s +++ b/data/maps/SeafloorCavern_Room3/header.s @@ -3,7 +3,7 @@ SeafloorCavern_Room3:: @ 83070B8 .4byte SeafloorCavern_Room3_MapEvents .4byte SeafloorCavern_Room3_MapScripts .4byte 0x0 - .2byte 406 + .2byte BGM_TOZAN .2byte 151 .byte 68 .byte 0 diff --git a/data/maps/SeafloorCavern_Room4/header.s b/data/maps/SeafloorCavern_Room4/header.s index 97c3f4198..0416091d4 100644 --- a/data/maps/SeafloorCavern_Room4/header.s +++ b/data/maps/SeafloorCavern_Room4/header.s @@ -3,7 +3,7 @@ SeafloorCavern_Room4:: @ 83070D4 .4byte SeafloorCavern_Room4_MapEvents .4byte SeafloorCavern_Room4_MapScripts .4byte 0x0 - .2byte 406 + .2byte BGM_TOZAN .2byte 152 .byte 68 .byte 0 diff --git a/data/maps/SeafloorCavern_Room5/header.s b/data/maps/SeafloorCavern_Room5/header.s index 1a326445c..3272c7021 100644 --- a/data/maps/SeafloorCavern_Room5/header.s +++ b/data/maps/SeafloorCavern_Room5/header.s @@ -3,7 +3,7 @@ SeafloorCavern_Room5:: @ 83070F0 .4byte SeafloorCavern_Room5_MapEvents .4byte SeafloorCavern_Room5_MapScripts .4byte 0x0 - .2byte 406 + .2byte BGM_TOZAN .2byte 153 .byte 68 .byte 0 diff --git a/data/maps/SeafloorCavern_Room6/header.s b/data/maps/SeafloorCavern_Room6/header.s index a3e3dbbba..18fab912d 100644 --- a/data/maps/SeafloorCavern_Room6/header.s +++ b/data/maps/SeafloorCavern_Room6/header.s @@ -3,7 +3,7 @@ SeafloorCavern_Room6:: @ 830710C .4byte SeafloorCavern_Room6_MapEvents .4byte SeafloorCavern_Room6_MapScripts .4byte 0x0 - .2byte 406 + .2byte BGM_TOZAN .2byte 154 .byte 68 .byte 0 diff --git a/data/maps/SeafloorCavern_Room7/header.s b/data/maps/SeafloorCavern_Room7/header.s index 452197ecf..ff7579206 100644 --- a/data/maps/SeafloorCavern_Room7/header.s +++ b/data/maps/SeafloorCavern_Room7/header.s @@ -3,7 +3,7 @@ SeafloorCavern_Room7:: @ 8307128 .4byte SeafloorCavern_Room7_MapEvents .4byte SeafloorCavern_Room7_MapScripts .4byte 0x0 - .2byte 406 + .2byte BGM_TOZAN .2byte 155 .byte 68 .byte 0 diff --git a/data/maps/SeafloorCavern_Room8/header.s b/data/maps/SeafloorCavern_Room8/header.s index 450ddbfca..f443c8530 100644 --- a/data/maps/SeafloorCavern_Room8/header.s +++ b/data/maps/SeafloorCavern_Room8/header.s @@ -3,7 +3,7 @@ SeafloorCavern_Room8:: @ 8307144 .4byte SeafloorCavern_Room8_MapEvents .4byte SeafloorCavern_Room8_MapScripts .4byte 0x0 - .2byte 406 + .2byte BGM_TOZAN .2byte 156 .byte 68 .byte 0 diff --git a/data/maps/SeafloorCavern_Room9/header.s b/data/maps/SeafloorCavern_Room9/header.s index 3649c3c7c..10303ec46 100644 --- a/data/maps/SeafloorCavern_Room9/header.s +++ b/data/maps/SeafloorCavern_Room9/header.s @@ -3,7 +3,7 @@ SeafloorCavern_Room9:: @ 8307160 .4byte SeafloorCavern_Room9_MapEvents .4byte SeafloorCavern_Room9_MapScripts .4byte 0x0 - .2byte 406 + .2byte BGM_TOZAN .2byte 157 .byte 68 .byte 0 diff --git a/data/maps/SealedChamber_InnerRoom/header.s b/data/maps/SealedChamber_InnerRoom/header.s index d60306249..6ae714a1f 100644 --- a/data/maps/SealedChamber_InnerRoom/header.s +++ b/data/maps/SealedChamber_InnerRoom/header.s @@ -3,7 +3,7 @@ SealedChamber_InnerRoom:: @ 8307550 .4byte SealedChamber_InnerRoom_MapEvents .4byte SealedChamber_InnerRoom_MapScripts .4byte 0x0 - .2byte 438 + .2byte BGM_MABOROSI .2byte 305 .byte 78 .byte 0 diff --git a/data/maps/SealedChamber_OuterRoom/header.s b/data/maps/SealedChamber_OuterRoom/header.s index e8bf52810..fe35a8210 100644 --- a/data/maps/SealedChamber_OuterRoom/header.s +++ b/data/maps/SealedChamber_OuterRoom/header.s @@ -3,7 +3,7 @@ SealedChamber_OuterRoom:: @ 8307534 .4byte SealedChamber_OuterRoom_MapEvents .4byte SealedChamber_OuterRoom_MapScripts .4byte 0x0 - .2byte 438 + .2byte BGM_MABOROSI .2byte 285 .byte 78 .byte 0 diff --git a/data/maps/SecretBase_BlueCave1/header.s b/data/maps/SecretBase_BlueCave1/header.s index 38804ea6b..24641e4e6 100644 --- a/data/maps/SecretBase_BlueCave1/header.s +++ b/data/maps/SecretBase_BlueCave1/header.s @@ -3,7 +3,7 @@ SecretBase_BlueCave1:: @ 8307710 .4byte SecretBase_BlueCave1_MapEvents .4byte SecretBase_BlueCave1_MapScripts .4byte 0x0 - .2byte 382 + .2byte BGM_MACHI_S3 .2byte 200 .byte 86 .byte 0 diff --git a/data/maps/SecretBase_BlueCave2/header.s b/data/maps/SecretBase_BlueCave2/header.s index 3f65641c2..599abd34a 100644 --- a/data/maps/SecretBase_BlueCave2/header.s +++ b/data/maps/SecretBase_BlueCave2/header.s @@ -3,7 +3,7 @@ SecretBase_BlueCave2:: @ 83077B8 .4byte SecretBase_BlueCave2_MapEvents .4byte SecretBase_BlueCave2_MapScripts .4byte 0x0 - .2byte 382 + .2byte BGM_MACHI_S3 .2byte 206 .byte 86 .byte 0 diff --git a/data/maps/SecretBase_BlueCave3/header.s b/data/maps/SecretBase_BlueCave3/header.s index a332f5744..2adbdb4e5 100644 --- a/data/maps/SecretBase_BlueCave3/header.s +++ b/data/maps/SecretBase_BlueCave3/header.s @@ -3,7 +3,7 @@ SecretBase_BlueCave3:: @ 8307860 .4byte SecretBase_BlueCave3_MapEvents .4byte SecretBase_BlueCave3_MapScripts .4byte 0x0 - .2byte 382 + .2byte BGM_MACHI_S3 .2byte 212 .byte 86 .byte 0 diff --git a/data/maps/SecretBase_BlueCave4/header.s b/data/maps/SecretBase_BlueCave4/header.s index 2df707f32..269a276ef 100644 --- a/data/maps/SecretBase_BlueCave4/header.s +++ b/data/maps/SecretBase_BlueCave4/header.s @@ -3,7 +3,7 @@ SecretBase_BlueCave4:: @ 8307908 .4byte SecretBase_BlueCave4_MapEvents .4byte SecretBase_BlueCave4_MapScripts .4byte 0x0 - .2byte 382 + .2byte BGM_MACHI_S3 .2byte 218 .byte 86 .byte 0 diff --git a/data/maps/SecretBase_BrownCave1/header.s b/data/maps/SecretBase_BrownCave1/header.s index 6b44b46d3..b54737d93 100644 --- a/data/maps/SecretBase_BrownCave1/header.s +++ b/data/maps/SecretBase_BrownCave1/header.s @@ -3,7 +3,7 @@ SecretBase_BrownCave1:: @ 83076F4 .4byte SecretBase_BrownCave1_MapEvents .4byte SecretBase_BrownCave1_MapScripts .4byte 0x0 - .2byte 382 + .2byte BGM_MACHI_S3 .2byte 199 .byte 86 .byte 0 diff --git a/data/maps/SecretBase_BrownCave2/header.s b/data/maps/SecretBase_BrownCave2/header.s index 7a2d87527..e84bfd2eb 100644 --- a/data/maps/SecretBase_BrownCave2/header.s +++ b/data/maps/SecretBase_BrownCave2/header.s @@ -3,7 +3,7 @@ SecretBase_BrownCave2:: @ 830779C .4byte SecretBase_BrownCave2_MapEvents .4byte SecretBase_BrownCave2_MapScripts .4byte 0x0 - .2byte 382 + .2byte BGM_MACHI_S3 .2byte 205 .byte 86 .byte 0 diff --git a/data/maps/SecretBase_BrownCave3/header.s b/data/maps/SecretBase_BrownCave3/header.s index cf9e68e17..9e0dc78e0 100644 --- a/data/maps/SecretBase_BrownCave3/header.s +++ b/data/maps/SecretBase_BrownCave3/header.s @@ -3,7 +3,7 @@ SecretBase_BrownCave3:: @ 8307844 .4byte SecretBase_BrownCave3_MapEvents .4byte SecretBase_BrownCave3_MapScripts .4byte 0x0 - .2byte 382 + .2byte BGM_MACHI_S3 .2byte 211 .byte 86 .byte 0 diff --git a/data/maps/SecretBase_BrownCave4/header.s b/data/maps/SecretBase_BrownCave4/header.s index 33a72390a..d21c844da 100644 --- a/data/maps/SecretBase_BrownCave4/header.s +++ b/data/maps/SecretBase_BrownCave4/header.s @@ -3,7 +3,7 @@ SecretBase_BrownCave4:: @ 83078EC .4byte SecretBase_BrownCave4_MapEvents .4byte SecretBase_BrownCave4_MapScripts .4byte 0x0 - .2byte 382 + .2byte BGM_MACHI_S3 .2byte 217 .byte 86 .byte 0 diff --git a/data/maps/SecretBase_RedCave1/header.s b/data/maps/SecretBase_RedCave1/header.s index c03bedb0f..60df36c7e 100644 --- a/data/maps/SecretBase_RedCave1/header.s +++ b/data/maps/SecretBase_RedCave1/header.s @@ -3,7 +3,7 @@ SecretBase_RedCave1:: @ 83076D8 .4byte SecretBase_RedCave1_MapEvents .4byte SecretBase_RedCave1_MapScripts .4byte 0x0 - .2byte 382 + .2byte BGM_MACHI_S3 .2byte 198 .byte 86 .byte 0 diff --git a/data/maps/SecretBase_RedCave2/header.s b/data/maps/SecretBase_RedCave2/header.s index 1dcbf967c..5325c424e 100644 --- a/data/maps/SecretBase_RedCave2/header.s +++ b/data/maps/SecretBase_RedCave2/header.s @@ -3,7 +3,7 @@ SecretBase_RedCave2:: @ 8307780 .4byte SecretBase_RedCave2_MapEvents .4byte SecretBase_RedCave2_MapScripts .4byte 0x0 - .2byte 382 + .2byte BGM_MACHI_S3 .2byte 204 .byte 86 .byte 0 diff --git a/data/maps/SecretBase_RedCave3/header.s b/data/maps/SecretBase_RedCave3/header.s index 584a1fbac..a86997805 100644 --- a/data/maps/SecretBase_RedCave3/header.s +++ b/data/maps/SecretBase_RedCave3/header.s @@ -3,7 +3,7 @@ SecretBase_RedCave3:: @ 8307828 .4byte SecretBase_RedCave3_MapEvents .4byte SecretBase_RedCave3_MapScripts .4byte 0x0 - .2byte 382 + .2byte BGM_MACHI_S3 .2byte 210 .byte 86 .byte 0 diff --git a/data/maps/SecretBase_RedCave4/header.s b/data/maps/SecretBase_RedCave4/header.s index 44d931749..40e830726 100644 --- a/data/maps/SecretBase_RedCave4/header.s +++ b/data/maps/SecretBase_RedCave4/header.s @@ -3,7 +3,7 @@ SecretBase_RedCave4:: @ 83078D0 .4byte SecretBase_RedCave4_MapEvents .4byte SecretBase_RedCave4_MapScripts .4byte 0x0 - .2byte 382 + .2byte BGM_MACHI_S3 .2byte 216 .byte 86 .byte 0 diff --git a/data/maps/SecretBase_Shrub1/header.s b/data/maps/SecretBase_Shrub1/header.s index f289f1c2c..3b634c729 100644 --- a/data/maps/SecretBase_Shrub1/header.s +++ b/data/maps/SecretBase_Shrub1/header.s @@ -3,7 +3,7 @@ SecretBase_Shrub1:: @ 8307764 .4byte SecretBase_Shrub1_MapEvents .4byte SecretBase_Shrub1_MapScripts .4byte 0x0 - .2byte 382 + .2byte BGM_MACHI_S3 .2byte 203 .byte 86 .byte 0 diff --git a/data/maps/SecretBase_Shrub2/header.s b/data/maps/SecretBase_Shrub2/header.s index c4be880e2..1c27f8945 100644 --- a/data/maps/SecretBase_Shrub2/header.s +++ b/data/maps/SecretBase_Shrub2/header.s @@ -3,7 +3,7 @@ SecretBase_Shrub2:: @ 830780C .4byte SecretBase_Shrub2_MapEvents .4byte SecretBase_Shrub2_MapScripts .4byte 0x0 - .2byte 382 + .2byte BGM_MACHI_S3 .2byte 209 .byte 86 .byte 0 diff --git a/data/maps/SecretBase_Shrub3/header.s b/data/maps/SecretBase_Shrub3/header.s index 2fe1f5140..e6e85c9ed 100644 --- a/data/maps/SecretBase_Shrub3/header.s +++ b/data/maps/SecretBase_Shrub3/header.s @@ -3,7 +3,7 @@ SecretBase_Shrub3:: @ 83078B4 .4byte SecretBase_Shrub3_MapEvents .4byte SecretBase_Shrub3_MapScripts .4byte 0x0 - .2byte 382 + .2byte BGM_MACHI_S3 .2byte 215 .byte 86 .byte 0 diff --git a/data/maps/SecretBase_Shrub4/header.s b/data/maps/SecretBase_Shrub4/header.s index f61b24843..1e610463f 100644 --- a/data/maps/SecretBase_Shrub4/header.s +++ b/data/maps/SecretBase_Shrub4/header.s @@ -3,7 +3,7 @@ SecretBase_Shrub4:: @ 830795C .4byte SecretBase_Shrub4_MapEvents .4byte SecretBase_Shrub4_MapScripts .4byte 0x0 - .2byte 382 + .2byte BGM_MACHI_S3 .2byte 221 .byte 86 .byte 0 diff --git a/data/maps/SecretBase_Tree1/header.s b/data/maps/SecretBase_Tree1/header.s index 63cff3825..64722268c 100644 --- a/data/maps/SecretBase_Tree1/header.s +++ b/data/maps/SecretBase_Tree1/header.s @@ -3,7 +3,7 @@ SecretBase_Tree1:: @ 8307748 .4byte SecretBase_Tree1_MapEvents .4byte SecretBase_Tree1_MapScripts .4byte 0x0 - .2byte 382 + .2byte BGM_MACHI_S3 .2byte 202 .byte 86 .byte 0 diff --git a/data/maps/SecretBase_Tree2/header.s b/data/maps/SecretBase_Tree2/header.s index 5d7b38767..fefd54e68 100644 --- a/data/maps/SecretBase_Tree2/header.s +++ b/data/maps/SecretBase_Tree2/header.s @@ -3,7 +3,7 @@ SecretBase_Tree2:: @ 83077F0 .4byte SecretBase_Tree2_MapEvents .4byte SecretBase_Tree2_MapScripts .4byte 0x0 - .2byte 382 + .2byte BGM_MACHI_S3 .2byte 208 .byte 86 .byte 0 diff --git a/data/maps/SecretBase_Tree3/header.s b/data/maps/SecretBase_Tree3/header.s index b1a4cfd21..09e55e66d 100644 --- a/data/maps/SecretBase_Tree3/header.s +++ b/data/maps/SecretBase_Tree3/header.s @@ -3,7 +3,7 @@ SecretBase_Tree3:: @ 8307898 .4byte SecretBase_Tree3_MapEvents .4byte SecretBase_Tree3_MapScripts .4byte 0x0 - .2byte 382 + .2byte BGM_MACHI_S3 .2byte 214 .byte 86 .byte 0 diff --git a/data/maps/SecretBase_Tree4/header.s b/data/maps/SecretBase_Tree4/header.s index 4b03d2957..cfb58242e 100644 --- a/data/maps/SecretBase_Tree4/header.s +++ b/data/maps/SecretBase_Tree4/header.s @@ -3,7 +3,7 @@ SecretBase_Tree4:: @ 8307940 .4byte SecretBase_Tree4_MapEvents .4byte SecretBase_Tree4_MapScripts .4byte 0x0 - .2byte 382 + .2byte BGM_MACHI_S3 .2byte 220 .byte 86 .byte 0 diff --git a/data/maps/SecretBase_YellowCave1/header.s b/data/maps/SecretBase_YellowCave1/header.s index 755f1c924..42a63256f 100644 --- a/data/maps/SecretBase_YellowCave1/header.s +++ b/data/maps/SecretBase_YellowCave1/header.s @@ -3,7 +3,7 @@ SecretBase_YellowCave1:: @ 830772C .4byte SecretBase_YellowCave1_MapEvents .4byte SecretBase_YellowCave1_MapScripts .4byte 0x0 - .2byte 382 + .2byte BGM_MACHI_S3 .2byte 201 .byte 86 .byte 0 diff --git a/data/maps/SecretBase_YellowCave2/header.s b/data/maps/SecretBase_YellowCave2/header.s index 0b0b71390..d57acde5c 100644 --- a/data/maps/SecretBase_YellowCave2/header.s +++ b/data/maps/SecretBase_YellowCave2/header.s @@ -3,7 +3,7 @@ SecretBase_YellowCave2:: @ 83077D4 .4byte SecretBase_YellowCave2_MapEvents .4byte SecretBase_YellowCave2_MapScripts .4byte 0x0 - .2byte 382 + .2byte BGM_MACHI_S3 .2byte 207 .byte 86 .byte 0 diff --git a/data/maps/SecretBase_YellowCave3/header.s b/data/maps/SecretBase_YellowCave3/header.s index 8a6c13c35..ecb6b7086 100644 --- a/data/maps/SecretBase_YellowCave3/header.s +++ b/data/maps/SecretBase_YellowCave3/header.s @@ -3,7 +3,7 @@ SecretBase_YellowCave3:: @ 830787C .4byte SecretBase_YellowCave3_MapEvents .4byte SecretBase_YellowCave3_MapScripts .4byte 0x0 - .2byte 382 + .2byte BGM_MACHI_S3 .2byte 213 .byte 86 .byte 0 diff --git a/data/maps/SecretBase_YellowCave4/header.s b/data/maps/SecretBase_YellowCave4/header.s index e7bc2f713..97de9362b 100644 --- a/data/maps/SecretBase_YellowCave4/header.s +++ b/data/maps/SecretBase_YellowCave4/header.s @@ -3,7 +3,7 @@ SecretBase_YellowCave4:: @ 8307924 .4byte SecretBase_YellowCave4_MapEvents .4byte SecretBase_YellowCave4_MapScripts .4byte 0x0 - .2byte 382 + .2byte BGM_MACHI_S3 .2byte 219 .byte 86 .byte 0 diff --git a/data/maps/ShoalCave_HighTideEntranceRoom/header.s b/data/maps/ShoalCave_HighTideEntranceRoom/header.s index 0066bd93b..e012b1a69 100644 --- a/data/maps/ShoalCave_HighTideEntranceRoom/header.s +++ b/data/maps/ShoalCave_HighTideEntranceRoom/header.s @@ -3,7 +3,7 @@ ShoalCave_HighTideEntranceRoom:: @ 83072E8 .4byte ShoalCave_HighTideEntranceRoom_MapEvents .4byte ShoalCave_HighTideEntranceRoom_MapScripts .4byte 0x0 - .2byte 432 + .2byte BGM_M_DUNGON .2byte 169 .byte 67 .byte 0 diff --git a/data/maps/ShoalCave_HighTideInnerRoom/header.s b/data/maps/ShoalCave_HighTideInnerRoom/header.s index 816661cbb..c3f16869b 100644 --- a/data/maps/ShoalCave_HighTideInnerRoom/header.s +++ b/data/maps/ShoalCave_HighTideInnerRoom/header.s @@ -3,7 +3,7 @@ ShoalCave_HighTideInnerRoom:: @ 8307304 .4byte ShoalCave_HighTideInnerRoom_MapEvents .4byte ShoalCave_HighTideInnerRoom_MapScripts .4byte 0x0 - .2byte 432 + .2byte BGM_M_DUNGON .2byte 170 .byte 67 .byte 0 diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/header.s b/data/maps/ShoalCave_LowTideEntranceRoom/header.s index ba8d6d253..db63a0f9d 100644 --- a/data/maps/ShoalCave_LowTideEntranceRoom/header.s +++ b/data/maps/ShoalCave_LowTideEntranceRoom/header.s @@ -3,7 +3,7 @@ ShoalCave_LowTideEntranceRoom:: @ 8307278 .4byte ShoalCave_LowTideEntranceRoom_MapEvents .4byte ShoalCave_LowTideEntranceRoom_MapScripts .4byte 0x0 - .2byte 432 + .2byte BGM_M_DUNGON .2byte 165 .byte 67 .byte 0 diff --git a/data/maps/ShoalCave_LowTideIceRoom/header.s b/data/maps/ShoalCave_LowTideIceRoom/header.s index 45569d729..ba36a090d 100644 --- a/data/maps/ShoalCave_LowTideIceRoom/header.s +++ b/data/maps/ShoalCave_LowTideIceRoom/header.s @@ -3,7 +3,7 @@ ShoalCave_LowTideIceRoom:: @ 8307684 .4byte ShoalCave_LowTideIceRoom_MapEvents .4byte ShoalCave_LowTideIceRoom_MapScripts .4byte 0x0 - .2byte 432 + .2byte BGM_M_DUNGON .2byte 329 .byte 67 .byte 0 diff --git a/data/maps/ShoalCave_LowTideInnerRoom/header.s b/data/maps/ShoalCave_LowTideInnerRoom/header.s index 336e0fb85..c038dafcd 100644 --- a/data/maps/ShoalCave_LowTideInnerRoom/header.s +++ b/data/maps/ShoalCave_LowTideInnerRoom/header.s @@ -3,7 +3,7 @@ ShoalCave_LowTideInnerRoom:: @ 8307294 .4byte ShoalCave_LowTideInnerRoom_MapEvents .4byte ShoalCave_LowTideInnerRoom_MapScripts .4byte 0x0 - .2byte 432 + .2byte BGM_M_DUNGON .2byte 166 .byte 67 .byte 0 diff --git a/data/maps/ShoalCave_LowTideLowerRoom/header.s b/data/maps/ShoalCave_LowTideLowerRoom/header.s index 83f4880b8..6fe4efb01 100644 --- a/data/maps/ShoalCave_LowTideLowerRoom/header.s +++ b/data/maps/ShoalCave_LowTideLowerRoom/header.s @@ -3,7 +3,7 @@ ShoalCave_LowTideLowerRoom:: @ 83072CC .4byte ShoalCave_LowTideLowerRoom_MapEvents .4byte ShoalCave_LowTideLowerRoom_MapScripts .4byte 0x0 - .2byte 432 + .2byte BGM_M_DUNGON .2byte 168 .byte 67 .byte 0 diff --git a/data/maps/ShoalCave_LowTideStairsRoom/header.s b/data/maps/ShoalCave_LowTideStairsRoom/header.s index 493b20d70..d3d904731 100644 --- a/data/maps/ShoalCave_LowTideStairsRoom/header.s +++ b/data/maps/ShoalCave_LowTideStairsRoom/header.s @@ -3,7 +3,7 @@ ShoalCave_LowTideStairsRoom:: @ 83072B0 .4byte ShoalCave_LowTideStairsRoom_MapEvents .4byte ShoalCave_LowTideStairsRoom_MapScripts .4byte 0x0 - .2byte 432 + .2byte BGM_M_DUNGON .2byte 167 .byte 67 .byte 0 diff --git a/data/maps/SingleBattleColosseum/header.s b/data/maps/SingleBattleColosseum/header.s index b88c1871f..f62205a55 100644 --- a/data/maps/SingleBattleColosseum/header.s +++ b/data/maps/SingleBattleColosseum/header.s @@ -3,7 +3,7 @@ SingleBattleColosseum:: @ 8307978 .4byte SingleBattleColosseum_MapEvents .4byte SingleBattleColosseum_MapScripts .4byte 0x0 - .2byte 422 + .2byte BGM_RAINBOW .2byte 222 .byte 87 .byte 0 diff --git a/data/maps/SkyPillar_1F/header.s b/data/maps/SkyPillar_1F/header.s index 5615e0435..4ccc410da 100644 --- a/data/maps/SkyPillar_1F/header.s +++ b/data/maps/SkyPillar_1F/header.s @@ -3,7 +3,7 @@ SkyPillar_1F:: @ 8307614 .4byte SkyPillar_1F_MapEvents .4byte SkyPillar_1F_MapScripts .4byte 0x0 - .2byte 406 + .2byte BGM_TOZAN .2byte 323 .byte 85 .byte 0 diff --git a/data/maps/SkyPillar_2F/header.s b/data/maps/SkyPillar_2F/header.s index 66f8370fb..1e3b0393d 100644 --- a/data/maps/SkyPillar_2F/header.s +++ b/data/maps/SkyPillar_2F/header.s @@ -3,7 +3,7 @@ SkyPillar_2F:: @ 8307630 .4byte SkyPillar_2F_MapEvents .4byte SkyPillar_2F_MapScripts .4byte 0x0 - .2byte 406 + .2byte BGM_TOZAN .2byte 324 .byte 85 .byte 0 diff --git a/data/maps/SkyPillar_3F/header.s b/data/maps/SkyPillar_3F/header.s index d802e24b7..bd6d9cb86 100644 --- a/data/maps/SkyPillar_3F/header.s +++ b/data/maps/SkyPillar_3F/header.s @@ -3,7 +3,7 @@ SkyPillar_3F:: @ 830764C .4byte SkyPillar_3F_MapEvents .4byte SkyPillar_3F_MapScripts .4byte 0x0 - .2byte 406 + .2byte BGM_TOZAN .2byte 325 .byte 85 .byte 0 diff --git a/data/maps/SkyPillar_4F/header.s b/data/maps/SkyPillar_4F/header.s index 13ec76ff3..50869e629 100644 --- a/data/maps/SkyPillar_4F/header.s +++ b/data/maps/SkyPillar_4F/header.s @@ -3,7 +3,7 @@ SkyPillar_4F:: @ 8307668 .4byte SkyPillar_4F_MapEvents .4byte SkyPillar_4F_MapScripts .4byte 0x0 - .2byte 406 + .2byte BGM_TOZAN .2byte 326 .byte 85 .byte 0 diff --git a/data/maps/SkyPillar_5F/header.s b/data/maps/SkyPillar_5F/header.s index 40ec34f4f..16da8bcf4 100644 --- a/data/maps/SkyPillar_5F/header.s +++ b/data/maps/SkyPillar_5F/header.s @@ -3,7 +3,7 @@ SkyPillar_5F:: @ 83076A0 .4byte SkyPillar_5F_MapEvents .4byte SkyPillar_5F_MapScripts .4byte 0x0 - .2byte 406 + .2byte BGM_TOZAN .2byte 331 .byte 85 .byte 0 diff --git a/data/maps/SkyPillar_Entrance/header.s b/data/maps/SkyPillar_Entrance/header.s index 0c939e3c1..89d9becd9 100644 --- a/data/maps/SkyPillar_Entrance/header.s +++ b/data/maps/SkyPillar_Entrance/header.s @@ -3,7 +3,7 @@ SkyPillar_Entrance:: @ 83075DC .4byte SkyPillar_Entrance_MapEvents .4byte SkyPillar_Entrance_MapScripts .4byte 0x0 - .2byte 406 + .2byte BGM_TOZAN .2byte 321 .byte 85 .byte 0 diff --git a/data/maps/SkyPillar_Outside/header.s b/data/maps/SkyPillar_Outside/header.s index 8f33ab11a..44e9a5991 100644 --- a/data/maps/SkyPillar_Outside/header.s +++ b/data/maps/SkyPillar_Outside/header.s @@ -3,7 +3,7 @@ SkyPillar_Outside:: @ 83075F8 .4byte SkyPillar_Outside_MapEvents .4byte SkyPillar_Outside_MapScripts .4byte 0x0 - .2byte 406 + .2byte BGM_TOZAN .2byte 322 .byte 85 .byte 0 diff --git a/data/maps/SkyPillar_Top/header.s b/data/maps/SkyPillar_Top/header.s index 3c2e00f24..0c241fe27 100644 --- a/data/maps/SkyPillar_Top/header.s +++ b/data/maps/SkyPillar_Top/header.s @@ -3,7 +3,7 @@ SkyPillar_Top:: @ 83076BC .4byte SkyPillar_Top_MapEvents .4byte SkyPillar_Top_MapScripts .4byte 0x0 - .2byte 406 + .2byte BGM_TOZAN .2byte 332 .byte 85 .byte 0 diff --git a/data/maps/SlateportCity/header.s b/data/maps/SlateportCity/header.s index fa955af6c..6575e0de5 100644 --- a/data/maps/SlateportCity/header.s +++ b/data/maps/SlateportCity/header.s @@ -3,7 +3,7 @@ SlateportCity:: @ 8305464 .4byte SlateportCity_MapEvents .4byte SlateportCity_MapScripts .4byte SlateportCity_MapConnections - .2byte 433 + .2byte BGM_FINECITY .2byte 2 .byte 8 .byte 0 diff --git a/data/maps/SlateportCity_ContestHall/header.s b/data/maps/SlateportCity_ContestHall/header.s index ee9992dcd..64cc06565 100644 --- a/data/maps/SlateportCity_ContestHall/header.s +++ b/data/maps/SlateportCity_ContestHall/header.s @@ -3,7 +3,7 @@ SlateportCity_ContestHall:: @ 8306034 .4byte SlateportCity_ContestHall_MapEvents .4byte SlateportCity_ContestHall_MapScripts .4byte 0x0 - .2byte 452 + .2byte BGM_CONLOBBY .2byte 73 .byte 8 .byte 0 diff --git a/data/maps/SlateportCity_ContestLobby/header.s b/data/maps/SlateportCity_ContestLobby/header.s index f13a37da5..440139e64 100644 --- a/data/maps/SlateportCity_ContestLobby/header.s +++ b/data/maps/SlateportCity_ContestLobby/header.s @@ -3,7 +3,7 @@ SlateportCity_ContestLobby:: @ 8306018 .4byte SlateportCity_ContestLobby_MapEvents .4byte SlateportCity_ContestLobby_MapScripts .4byte 0x0 - .2byte 452 + .2byte BGM_CONLOBBY .2byte 72 .byte 8 .byte 0 diff --git a/data/maps/SlateportCity_Harbor/header.s b/data/maps/SlateportCity_Harbor/header.s index 645b5fc26..d7da07b49 100644 --- a/data/maps/SlateportCity_Harbor/header.s +++ b/data/maps/SlateportCity_Harbor/header.s @@ -3,7 +3,7 @@ SlateportCity_Harbor:: @ 83060C0 .4byte SlateportCity_Harbor_MapEvents .4byte SlateportCity_Harbor_MapScripts .4byte 0x0 - .2byte 433 + .2byte BGM_FINECITY .2byte 88 .byte 8 .byte 0 diff --git a/data/maps/SlateportCity_House1/header.s b/data/maps/SlateportCity_House1/header.s index e5234ad62..75a5cdb72 100644 --- a/data/maps/SlateportCity_House1/header.s +++ b/data/maps/SlateportCity_House1/header.s @@ -3,7 +3,7 @@ SlateportCity_House1:: @ 8306050 .4byte SlateportCity_House1_MapEvents .4byte SlateportCity_House1_MapScripts .4byte 0x0 - .2byte 433 + .2byte BGM_FINECITY .2byte 80 .byte 8 .byte 0 diff --git a/data/maps/SlateportCity_House2/header.s b/data/maps/SlateportCity_House2/header.s index 78c67b4d2..00b9399a3 100644 --- a/data/maps/SlateportCity_House2/header.s +++ b/data/maps/SlateportCity_House2/header.s @@ -3,7 +3,7 @@ SlateportCity_House2:: @ 83060DC .4byte SlateportCity_House2_MapEvents .4byte SlateportCity_House2_MapScripts .4byte 0x0 - .2byte 433 + .2byte BGM_FINECITY .2byte 60 .byte 8 .byte 0 diff --git a/data/maps/SlateportCity_Mart/header.s b/data/maps/SlateportCity_Mart/header.s index 8f2ea7d2f..12f2172be 100644 --- a/data/maps/SlateportCity_Mart/header.s +++ b/data/maps/SlateportCity_Mart/header.s @@ -3,7 +3,7 @@ SlateportCity_Mart:: @ 8306130 .4byte SlateportCity_Mart_MapEvents .4byte SlateportCity_Mart_MapScripts .4byte 0x0 - .2byte 404 + .2byte BGM_FRIENDLY .2byte 63 .byte 8 .byte 0 diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/header.s b/data/maps/SlateportCity_OceanicMuseum_1F/header.s index 1b2b8f012..7aaa2ff91 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/header.s +++ b/data/maps/SlateportCity_OceanicMuseum_1F/header.s @@ -3,7 +3,7 @@ SlateportCity_OceanicMuseum_1F:: @ 8306088 .4byte SlateportCity_OceanicMuseum_1F_MapEvents .4byte SlateportCity_OceanicMuseum_1F_MapScripts .4byte 0x0 - .2byte 375 + .2byte BGM_FUNE_KAN .2byte 86 .byte 8 .byte 0 diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/header.s b/data/maps/SlateportCity_OceanicMuseum_2F/header.s index f9c6b095a..3d9153f56 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/header.s +++ b/data/maps/SlateportCity_OceanicMuseum_2F/header.s @@ -3,7 +3,7 @@ SlateportCity_OceanicMuseum_2F:: @ 83060A4 .4byte SlateportCity_OceanicMuseum_2F_MapEvents .4byte SlateportCity_OceanicMuseum_2F_MapScripts .4byte 0x0 - .2byte 375 + .2byte BGM_FUNE_KAN .2byte 87 .byte 8 .byte 0 diff --git a/data/maps/SlateportCity_PokemonCenter_1F/header.s b/data/maps/SlateportCity_PokemonCenter_1F/header.s index 5d9803150..d668f0efc 100644 --- a/data/maps/SlateportCity_PokemonCenter_1F/header.s +++ b/data/maps/SlateportCity_PokemonCenter_1F/header.s @@ -3,7 +3,7 @@ SlateportCity_PokemonCenter_1F:: @ 83060F8 .4byte SlateportCity_PokemonCenter_1F_MapEvents .4byte SlateportCity_PokemonCenter_1F_MapScripts .4byte 0x0 - .2byte 400 + .2byte BGM_POKECEN .2byte 61 .byte 8 .byte 0 diff --git a/data/maps/SlateportCity_PokemonCenter_2F/header.s b/data/maps/SlateportCity_PokemonCenter_2F/header.s index 2b46a3d59..36c726d7f 100644 --- a/data/maps/SlateportCity_PokemonCenter_2F/header.s +++ b/data/maps/SlateportCity_PokemonCenter_2F/header.s @@ -3,7 +3,7 @@ SlateportCity_PokemonCenter_2F:: @ 8306114 .4byte SlateportCity_PokemonCenter_2F_MapEvents .4byte SlateportCity_PokemonCenter_2F_MapScripts .4byte 0x0 - .2byte 400 + .2byte BGM_POKECEN .2byte 62 .byte 8 .byte 0 diff --git a/data/maps/SlateportCity_PokemonFanClub/header.s b/data/maps/SlateportCity_PokemonFanClub/header.s index 1f5a697be..1672d21b1 100644 --- a/data/maps/SlateportCity_PokemonFanClub/header.s +++ b/data/maps/SlateportCity_PokemonFanClub/header.s @@ -3,7 +3,7 @@ SlateportCity_PokemonFanClub:: @ 830606C .4byte SlateportCity_PokemonFanClub_MapEvents .4byte SlateportCity_PokemonFanClub_MapScripts .4byte 0x0 - .2byte 433 + .2byte BGM_FINECITY .2byte 85 .byte 8 .byte 0 diff --git a/data/maps/SlateportCity_SternsShipyard_1F/header.s b/data/maps/SlateportCity_SternsShipyard_1F/header.s index 3b25c7156..c3516151e 100644 --- a/data/maps/SlateportCity_SternsShipyard_1F/header.s +++ b/data/maps/SlateportCity_SternsShipyard_1F/header.s @@ -3,7 +3,7 @@ SlateportCity_SternsShipyard_1F:: @ 8305FE0 .4byte SlateportCity_SternsShipyard_1F_MapEvents .4byte SlateportCity_SternsShipyard_1F_MapScripts .4byte 0x0 - .2byte 433 + .2byte BGM_FINECITY .2byte 81 .byte 8 .byte 0 diff --git a/data/maps/SlateportCity_SternsShipyard_2F/header.s b/data/maps/SlateportCity_SternsShipyard_2F/header.s index 51b30bc7a..242e061aa 100644 --- a/data/maps/SlateportCity_SternsShipyard_2F/header.s +++ b/data/maps/SlateportCity_SternsShipyard_2F/header.s @@ -3,7 +3,7 @@ SlateportCity_SternsShipyard_2F:: @ 8305FFC .4byte SlateportCity_SternsShipyard_2F_MapEvents .4byte SlateportCity_SternsShipyard_2F_MapScripts .4byte 0x0 - .2byte 433 + .2byte BGM_FINECITY .2byte 82 .byte 8 .byte 0 diff --git a/data/maps/SootopolisCity/header.s b/data/maps/SootopolisCity/header.s index 031cad1ae..d5cbae0be 100644 --- a/data/maps/SootopolisCity/header.s +++ b/data/maps/SootopolisCity/header.s @@ -3,7 +3,7 @@ SootopolisCity:: @ 830550C .4byte SootopolisCity_MapEvents .4byte SootopolisCity_MapScripts .4byte 0x0 - .2byte 445 + .2byte BGM_RUNECITY .2byte 8 .byte 14 .byte 0 diff --git a/data/maps/SootopolisCity_Gym_1F/header.s b/data/maps/SootopolisCity_Gym_1F/header.s index 1340c63b0..185bdc970 100644 --- a/data/maps/SootopolisCity_Gym_1F/header.s +++ b/data/maps/SootopolisCity_Gym_1F/header.s @@ -3,7 +3,7 @@ SootopolisCity_Gym_1F:: @ 830692C .4byte SootopolisCity_Gym_1F_MapEvents .4byte SootopolisCity_Gym_1F_MapScripts .4byte 0x0 - .2byte 364 + .2byte BGM_GIM .2byte 110 .byte 14 .byte 0 diff --git a/data/maps/SootopolisCity_Gym_B1F/header.s b/data/maps/SootopolisCity_Gym_B1F/header.s index eb76e37c5..104ee8215 100644 --- a/data/maps/SootopolisCity_Gym_B1F/header.s +++ b/data/maps/SootopolisCity_Gym_B1F/header.s @@ -3,7 +3,7 @@ SootopolisCity_Gym_B1F:: @ 8306948 .4byte SootopolisCity_Gym_B1F_MapEvents .4byte SootopolisCity_Gym_B1F_MapScripts .4byte 0x0 - .2byte 364 + .2byte BGM_GIM .2byte 111 .byte 14 .byte 0 diff --git a/data/maps/SootopolisCity_House1/header.s b/data/maps/SootopolisCity_House1/header.s index b51fbf189..5ff1eb351 100644 --- a/data/maps/SootopolisCity_House1/header.s +++ b/data/maps/SootopolisCity_House1/header.s @@ -3,7 +3,7 @@ SootopolisCity_House1:: @ 83069B8 .4byte SootopolisCity_House1_MapEvents .4byte SootopolisCity_House1_MapScripts .4byte 0x0 - .2byte 445 + .2byte BGM_RUNECITY .2byte 308 .byte 14 .byte 0 diff --git a/data/maps/SootopolisCity_House2/header.s b/data/maps/SootopolisCity_House2/header.s index e3860a6b3..1ff5a7df1 100644 --- a/data/maps/SootopolisCity_House2/header.s +++ b/data/maps/SootopolisCity_House2/header.s @@ -3,7 +3,7 @@ SootopolisCity_House2:: @ 83069D4 .4byte SootopolisCity_House2_MapEvents .4byte SootopolisCity_House2_MapScripts .4byte 0x0 - .2byte 445 + .2byte BGM_RUNECITY .2byte 309 .byte 14 .byte 0 diff --git a/data/maps/SootopolisCity_House3/header.s b/data/maps/SootopolisCity_House3/header.s index 6f1b628eb..3c6075fe7 100644 --- a/data/maps/SootopolisCity_House3/header.s +++ b/data/maps/SootopolisCity_House3/header.s @@ -3,7 +3,7 @@ SootopolisCity_House3:: @ 83069F0 .4byte SootopolisCity_House3_MapEvents .4byte SootopolisCity_House3_MapScripts .4byte 0x0 - .2byte 445 + .2byte BGM_RUNECITY .2byte 310 .byte 14 .byte 0 diff --git a/data/maps/SootopolisCity_House4/header.s b/data/maps/SootopolisCity_House4/header.s index 9ceb8e015..f155d1980 100644 --- a/data/maps/SootopolisCity_House4/header.s +++ b/data/maps/SootopolisCity_House4/header.s @@ -3,7 +3,7 @@ SootopolisCity_House4:: @ 8306A0C .4byte SootopolisCity_House4_MapEvents .4byte SootopolisCity_House4_MapScripts .4byte 0x0 - .2byte 445 + .2byte BGM_RUNECITY .2byte 308 .byte 14 .byte 0 diff --git a/data/maps/SootopolisCity_House5/header.s b/data/maps/SootopolisCity_House5/header.s index fd245fdb5..7cfe101ac 100644 --- a/data/maps/SootopolisCity_House5/header.s +++ b/data/maps/SootopolisCity_House5/header.s @@ -3,7 +3,7 @@ SootopolisCity_House5:: @ 8306A28 .4byte SootopolisCity_House5_MapEvents .4byte SootopolisCity_House5_MapScripts .4byte 0x0 - .2byte 445 + .2byte BGM_RUNECITY .2byte 309 .byte 14 .byte 0 diff --git a/data/maps/SootopolisCity_House6/header.s b/data/maps/SootopolisCity_House6/header.s index c430f1053..536872e88 100644 --- a/data/maps/SootopolisCity_House6/header.s +++ b/data/maps/SootopolisCity_House6/header.s @@ -3,7 +3,7 @@ SootopolisCity_House6:: @ 8306A44 .4byte SootopolisCity_House6_MapEvents .4byte SootopolisCity_House6_MapScripts .4byte 0x0 - .2byte 445 + .2byte BGM_RUNECITY .2byte 310 .byte 14 .byte 0 diff --git a/data/maps/SootopolisCity_House7/header.s b/data/maps/SootopolisCity_House7/header.s index 349759d09..598a84316 100644 --- a/data/maps/SootopolisCity_House7/header.s +++ b/data/maps/SootopolisCity_House7/header.s @@ -3,7 +3,7 @@ SootopolisCity_House7:: @ 8306A60 .4byte SootopolisCity_House7_MapEvents .4byte SootopolisCity_House7_MapScripts .4byte 0x0 - .2byte 445 + .2byte BGM_RUNECITY .2byte 308 .byte 14 .byte 0 diff --git a/data/maps/SootopolisCity_House8/header.s b/data/maps/SootopolisCity_House8/header.s index 0e75ce398..4d6619797 100644 --- a/data/maps/SootopolisCity_House8/header.s +++ b/data/maps/SootopolisCity_House8/header.s @@ -3,7 +3,7 @@ SootopolisCity_House8:: @ 8306A7C .4byte SootopolisCity_House8_MapEvents .4byte SootopolisCity_House8_MapScripts .4byte 0x0 - .2byte 445 + .2byte BGM_RUNECITY .2byte 298 .byte 14 .byte 0 diff --git a/data/maps/SootopolisCity_Mart/header.s b/data/maps/SootopolisCity_Mart/header.s index 72ac17601..47505e04d 100644 --- a/data/maps/SootopolisCity_Mart/header.s +++ b/data/maps/SootopolisCity_Mart/header.s @@ -3,7 +3,7 @@ SootopolisCity_Mart:: @ 830699C .4byte SootopolisCity_Mart_MapEvents .4byte SootopolisCity_Mart_MapScripts .4byte 0x0 - .2byte 404 + .2byte BGM_FRIENDLY .2byte 63 .byte 14 .byte 0 diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/header.s b/data/maps/SootopolisCity_PokemonCenter_1F/header.s index f226fa0db..d0cef1039 100644 --- a/data/maps/SootopolisCity_PokemonCenter_1F/header.s +++ b/data/maps/SootopolisCity_PokemonCenter_1F/header.s @@ -3,7 +3,7 @@ SootopolisCity_PokemonCenter_1F:: @ 8306964 .4byte SootopolisCity_PokemonCenter_1F_MapEvents .4byte SootopolisCity_PokemonCenter_1F_MapScripts .4byte 0x0 - .2byte 400 + .2byte BGM_POKECEN .2byte 61 .byte 14 .byte 0 diff --git a/data/maps/SootopolisCity_PokemonCenter_2F/header.s b/data/maps/SootopolisCity_PokemonCenter_2F/header.s index a7a4124d7..4bdb48a7d 100644 --- a/data/maps/SootopolisCity_PokemonCenter_2F/header.s +++ b/data/maps/SootopolisCity_PokemonCenter_2F/header.s @@ -3,7 +3,7 @@ SootopolisCity_PokemonCenter_2F:: @ 8306980 .4byte SootopolisCity_PokemonCenter_2F_MapEvents .4byte SootopolisCity_PokemonCenter_2F_MapScripts .4byte 0x0 - .2byte 400 + .2byte BGM_POKECEN .2byte 62 .byte 14 .byte 0 diff --git a/data/maps/SouthernIsland_Exterior/header.s b/data/maps/SouthernIsland_Exterior/header.s index a4953b8c3..0579c81bc 100644 --- a/data/maps/SouthernIsland_Exterior/header.s +++ b/data/maps/SouthernIsland_Exterior/header.s @@ -3,7 +3,7 @@ SouthernIsland_Exterior:: @ 8307CA4 .4byte SouthernIsland_Exterior_MapEvents .4byte SouthernIsland_Exterior_MapScripts .4byte 0x0 - .2byte 381 + .2byte BGM_DAN02 .2byte 291 .byte 73 .byte 0 diff --git a/data/maps/SouthernIsland_Interior/header.s b/data/maps/SouthernIsland_Interior/header.s index a9a63850e..42cf6db66 100644 --- a/data/maps/SouthernIsland_Interior/header.s +++ b/data/maps/SouthernIsland_Interior/header.s @@ -3,7 +3,7 @@ SouthernIsland_Interior:: @ 8307CC0 .4byte SouthernIsland_Interior_MapEvents .4byte SouthernIsland_Interior_MapScripts .4byte 0x0 - .2byte 381 + .2byte BGM_DAN02 .2byte 292 .byte 73 .byte 0 diff --git a/data/maps/TradeCenter/header.s b/data/maps/TradeCenter/header.s index 0e9a83b16..62bac5400 100644 --- a/data/maps/TradeCenter/header.s +++ b/data/maps/TradeCenter/header.s @@ -3,7 +3,7 @@ TradeCenter:: @ 8307994 .4byte TradeCenter_MapEvents .4byte TradeCenter_MapScripts .4byte 0x0 - .2byte 422 + .2byte BGM_RAINBOW .2byte 223 .byte 87 .byte 0 diff --git a/data/maps/Underwater1/header.s b/data/maps/Underwater1/header.s index f45ee7621..cfd06e4ce 100644 --- a/data/maps/Underwater1/header.s +++ b/data/maps/Underwater1/header.s @@ -3,7 +3,7 @@ Underwater1:: @ 83059C0 .4byte Underwater1_MapEvents .4byte Underwater1_MapScripts .4byte Underwater1_MapConnections - .2byte 411 + .2byte BGM_DEEPDEEP .2byte 275 .byte 50 .byte 0 diff --git a/data/maps/Underwater2/header.s b/data/maps/Underwater2/header.s index b1dbc13ca..38446fecc 100644 --- a/data/maps/Underwater2/header.s +++ b/data/maps/Underwater2/header.s @@ -3,7 +3,7 @@ Underwater2:: @ 83059DC .4byte Underwater2_MapEvents .4byte Underwater2_MapScripts .4byte Underwater2_MapConnections - .2byte 411 + .2byte BGM_DEEPDEEP .2byte 51 .byte 51 .byte 0 diff --git a/data/maps/Underwater3/header.s b/data/maps/Underwater3/header.s index 97fa5e3af..3cc773730 100644 --- a/data/maps/Underwater3/header.s +++ b/data/maps/Underwater3/header.s @@ -3,7 +3,7 @@ Underwater3:: @ 83059F8 .4byte Underwater3_MapEvents .4byte Underwater3_MapScripts .4byte Underwater3_MapConnections - .2byte 411 + .2byte BGM_DEEPDEEP .2byte 52 .byte 52 .byte 0 diff --git a/data/maps/Underwater4/header.s b/data/maps/Underwater4/header.s index f77f787cd..8fb1e6faa 100644 --- a/data/maps/Underwater4/header.s +++ b/data/maps/Underwater4/header.s @@ -3,7 +3,7 @@ Underwater4:: @ 8305A14 .4byte Underwater4_MapEvents .4byte Underwater4_MapScripts .4byte Underwater4_MapConnections - .2byte 411 + .2byte BGM_DEEPDEEP .2byte 53 .byte 53 .byte 0 diff --git a/data/maps/Underwater_Route134/header.s b/data/maps/Underwater_Route134/header.s index 8d63e07ca..fbc90290c 100644 --- a/data/maps/Underwater_Route134/header.s +++ b/data/maps/Underwater_Route134/header.s @@ -3,7 +3,7 @@ Underwater_Route134:: @ 83074FC .4byte Underwater_Route134_MapEvents .4byte Underwater_Route134_MapScripts .4byte 0x0 - .2byte 411 + .2byte BGM_DEEPDEEP .2byte 283 .byte 79 .byte 0 diff --git a/data/maps/Underwater_SeafloorCavern/header.s b/data/maps/Underwater_SeafloorCavern/header.s index a97092503..09f36c16f 100644 --- a/data/maps/Underwater_SeafloorCavern/header.s +++ b/data/maps/Underwater_SeafloorCavern/header.s @@ -3,7 +3,7 @@ Underwater_SeafloorCavern:: @ 8307048 .4byte Underwater_SeafloorCavern_MapEvents .4byte Underwater_SeafloorCavern_MapScripts .4byte 0x0 - .2byte 411 + .2byte BGM_DEEPDEEP .2byte 147 .byte 69 .byte 0 diff --git a/data/maps/Underwater_SealedChamber/header.s b/data/maps/Underwater_SealedChamber/header.s index 82c4aa247..86ff3384d 100644 --- a/data/maps/Underwater_SealedChamber/header.s +++ b/data/maps/Underwater_SealedChamber/header.s @@ -3,7 +3,7 @@ Underwater_SealedChamber:: @ 8307518 .4byte Underwater_SealedChamber_MapEvents .4byte Underwater_SealedChamber_MapScripts .4byte 0x0 - .2byte 411 + .2byte BGM_DEEPDEEP .2byte 284 .byte 79 .byte 0 diff --git a/data/maps/Underwater_SootopolisCity/header.s b/data/maps/Underwater_SootopolisCity/header.s index 45952ef31..8aa8bb316 100644 --- a/data/maps/Underwater_SootopolisCity/header.s +++ b/data/maps/Underwater_SootopolisCity/header.s @@ -3,7 +3,7 @@ Underwater_SootopolisCity:: @ 8306DFC .4byte Underwater_SootopolisCity_MapEvents .4byte Underwater_SootopolisCity_MapScripts .4byte 0x0 - .2byte 411 + .2byte BGM_DEEPDEEP .2byte 131 .byte 54 .byte 0 diff --git a/data/maps/UnknownMap_25_29/header.s b/data/maps/UnknownMap_25_29/header.s index e374b01b9..93d3ab03f 100644 --- a/data/maps/UnknownMap_25_29/header.s +++ b/data/maps/UnknownMap_25_29/header.s @@ -3,7 +3,7 @@ UnknownMap_25_29:: @ 8307A04 .4byte UnknownMap_25_29_MapEvents .4byte UnknownMap_25_29_MapScripts .4byte 0x0 - .2byte 357 + .2byte BGM_NIBI .2byte 227 .byte 87 .byte 0 diff --git a/data/maps/UnknownMap_25_30/header.s b/data/maps/UnknownMap_25_30/header.s index 944f176c7..96f2e3de2 100644 --- a/data/maps/UnknownMap_25_30/header.s +++ b/data/maps/UnknownMap_25_30/header.s @@ -3,7 +3,7 @@ UnknownMap_25_30:: @ 8307A20 .4byte UnknownMap_25_30_MapEvents .4byte UnknownMap_25_30_MapScripts .4byte 0x0 - .2byte 357 + .2byte BGM_NIBI .2byte 228 .byte 87 .byte 0 diff --git a/data/maps/UnknownMap_25_31/header.s b/data/maps/UnknownMap_25_31/header.s index 53f848a22..135e1c4b1 100644 --- a/data/maps/UnknownMap_25_31/header.s +++ b/data/maps/UnknownMap_25_31/header.s @@ -3,7 +3,7 @@ UnknownMap_25_31:: @ 8307A3C .4byte UnknownMap_25_31_MapEvents .4byte UnknownMap_25_31_MapScripts .4byte 0x0 - .2byte 357 + .2byte BGM_NIBI .2byte 229 .byte 87 .byte 0 diff --git a/data/maps/UnknownMap_25_32/header.s b/data/maps/UnknownMap_25_32/header.s index 024e18dcb..4aaae9710 100644 --- a/data/maps/UnknownMap_25_32/header.s +++ b/data/maps/UnknownMap_25_32/header.s @@ -3,7 +3,7 @@ UnknownMap_25_32:: @ 8307A58 .4byte UnknownMap_25_32_MapEvents .4byte UnknownMap_25_32_MapScripts .4byte 0x0 - .2byte 357 + .2byte BGM_NIBI .2byte 230 .byte 87 .byte 0 diff --git a/data/maps/UnknownMap_25_33/header.s b/data/maps/UnknownMap_25_33/header.s index ed0e5949d..e0bebe753 100644 --- a/data/maps/UnknownMap_25_33/header.s +++ b/data/maps/UnknownMap_25_33/header.s @@ -3,7 +3,7 @@ UnknownMap_25_33:: @ 8307A74 .4byte UnknownMap_25_33_MapEvents .4byte UnknownMap_25_33_MapScripts .4byte 0x0 - .2byte 357 + .2byte BGM_NIBI .2byte 231 .byte 87 .byte 0 diff --git a/data/maps/UnknownMap_25_34/header.s b/data/maps/UnknownMap_25_34/header.s index 5bf079b9d..b2c174c06 100644 --- a/data/maps/UnknownMap_25_34/header.s +++ b/data/maps/UnknownMap_25_34/header.s @@ -3,7 +3,7 @@ UnknownMap_25_34:: @ 8307A90 .4byte UnknownMap_25_34_MapEvents .4byte UnknownMap_25_34_MapScripts .4byte 0x0 - .2byte 357 + .2byte BGM_NIBI .2byte 232 .byte 87 .byte 0 diff --git a/data/maps/VerdanturfTown/header.s b/data/maps/VerdanturfTown/header.s index a1b78bffa..ee41c767f 100644 --- a/data/maps/VerdanturfTown/header.s +++ b/data/maps/VerdanturfTown/header.s @@ -3,7 +3,7 @@ VerdanturfTown:: @ 83055D0 .4byte VerdanturfTown_MapEvents .4byte VerdanturfTown_MapScripts .4byte VerdanturfTown_MapConnections - .2byte 398 + .2byte BGM_GOMACHI0 .2byte 15 .byte 5 .byte 0 diff --git a/data/maps/VerdanturfTown_ContestHall/header.s b/data/maps/VerdanturfTown_ContestHall/header.s index e9db05aa6..1c0179afb 100644 --- a/data/maps/VerdanturfTown_ContestHall/header.s +++ b/data/maps/VerdanturfTown_ContestHall/header.s @@ -3,7 +3,7 @@ VerdanturfTown_ContestHall:: @ 8305D94 .4byte VerdanturfTown_ContestHall_MapEvents .4byte VerdanturfTown_ContestHall_MapScripts .4byte 0x0 - .2byte 452 + .2byte BGM_CONLOBBY .2byte 73 .byte 5 .byte 0 diff --git a/data/maps/VerdanturfTown_ContestLobby/header.s b/data/maps/VerdanturfTown_ContestLobby/header.s index 1cc278802..31274e19f 100644 --- a/data/maps/VerdanturfTown_ContestLobby/header.s +++ b/data/maps/VerdanturfTown_ContestLobby/header.s @@ -3,7 +3,7 @@ VerdanturfTown_ContestLobby:: @ 8305D78 .4byte VerdanturfTown_ContestLobby_MapEvents .4byte VerdanturfTown_ContestLobby_MapScripts .4byte 0x0 - .2byte 452 + .2byte BGM_CONLOBBY .2byte 72 .byte 5 .byte 0 diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/header.s b/data/maps/VerdanturfTown_FriendshipRatersHouse/header.s index 81a460b8a..f1aae5a19 100644 --- a/data/maps/VerdanturfTown_FriendshipRatersHouse/header.s +++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/header.s @@ -3,7 +3,7 @@ VerdanturfTown_FriendshipRatersHouse:: @ 8305E20 .4byte VerdanturfTown_FriendshipRatersHouse_MapEvents .4byte VerdanturfTown_FriendshipRatersHouse_MapScripts .4byte 0x0 - .2byte 398 + .2byte BGM_GOMACHI0 .2byte 60 .byte 5 .byte 0 diff --git a/data/maps/VerdanturfTown_House/header.s b/data/maps/VerdanturfTown_House/header.s index 94f779ddc..e81adee1b 100644 --- a/data/maps/VerdanturfTown_House/header.s +++ b/data/maps/VerdanturfTown_House/header.s @@ -3,7 +3,7 @@ VerdanturfTown_House:: @ 8305E3C .4byte VerdanturfTown_House_MapEvents .4byte VerdanturfTown_House_MapScripts .4byte 0x0 - .2byte 398 + .2byte BGM_GOMACHI0 .2byte 59 .byte 5 .byte 0 diff --git a/data/maps/VerdanturfTown_Mart/header.s b/data/maps/VerdanturfTown_Mart/header.s index 8deafb2d3..db037960c 100644 --- a/data/maps/VerdanturfTown_Mart/header.s +++ b/data/maps/VerdanturfTown_Mart/header.s @@ -3,7 +3,7 @@ VerdanturfTown_Mart:: @ 8305DB0 .4byte VerdanturfTown_Mart_MapEvents .4byte VerdanturfTown_Mart_MapScripts .4byte 0x0 - .2byte 404 + .2byte BGM_FRIENDLY .2byte 63 .byte 5 .byte 0 diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/header.s b/data/maps/VerdanturfTown_PokemonCenter_1F/header.s index 739f16fce..384c8719e 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_1F/header.s +++ b/data/maps/VerdanturfTown_PokemonCenter_1F/header.s @@ -3,7 +3,7 @@ VerdanturfTown_PokemonCenter_1F:: @ 8305DCC .4byte VerdanturfTown_PokemonCenter_1F_MapEvents .4byte VerdanturfTown_PokemonCenter_1F_MapScripts .4byte 0x0 - .2byte 400 + .2byte BGM_POKECEN .2byte 61 .byte 5 .byte 0 diff --git a/data/maps/VerdanturfTown_PokemonCenter_2F/header.s b/data/maps/VerdanturfTown_PokemonCenter_2F/header.s index 9e61645dc..518c11352 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_2F/header.s +++ b/data/maps/VerdanturfTown_PokemonCenter_2F/header.s @@ -3,7 +3,7 @@ VerdanturfTown_PokemonCenter_2F:: @ 8305DE8 .4byte VerdanturfTown_PokemonCenter_2F_MapEvents .4byte VerdanturfTown_PokemonCenter_2F_MapScripts .4byte 0x0 - .2byte 400 + .2byte BGM_POKECEN .2byte 62 .byte 5 .byte 0 diff --git a/data/maps/VerdanturfTown_WandasHouse/header.s b/data/maps/VerdanturfTown_WandasHouse/header.s index 99438c19b..bc31f5457 100644 --- a/data/maps/VerdanturfTown_WandasHouse/header.s +++ b/data/maps/VerdanturfTown_WandasHouse/header.s @@ -3,7 +3,7 @@ VerdanturfTown_WandasHouse:: @ 8305E04 .4byte VerdanturfTown_WandasHouse_MapEvents .4byte VerdanturfTown_WandasHouse_MapScripts .4byte 0x0 - .2byte 398 + .2byte BGM_GOMACHI0 .2byte 76 .byte 5 .byte 0 diff --git a/data/maps/VictoryRoad_1F/header.s b/data/maps/VictoryRoad_1F/header.s index d0446cbd7..21937891e 100644 --- a/data/maps/VictoryRoad_1F/header.s +++ b/data/maps/VictoryRoad_1F/header.s @@ -3,7 +3,7 @@ VictoryRoad_1F:: @ 8307224 .4byte VictoryRoad_1F_MapEvents .4byte VictoryRoad_1F_MapScripts .4byte 0x0 - .2byte 429 + .2byte BGM_C_ROAD .2byte 164 .byte 70 .byte 0 diff --git a/data/maps/VictoryRoad_B1F/header.s b/data/maps/VictoryRoad_B1F/header.s index 7d1d01f08..ebaa67358 100644 --- a/data/maps/VictoryRoad_B1F/header.s +++ b/data/maps/VictoryRoad_B1F/header.s @@ -3,7 +3,7 @@ VictoryRoad_B1F:: @ 8307240 .4byte VictoryRoad_B1F_MapEvents .4byte VictoryRoad_B1F_MapScripts .4byte 0x0 - .2byte 429 + .2byte BGM_C_ROAD .2byte 286 .byte 70 .byte 1 diff --git a/data/maps/VictoryRoad_B2F/header.s b/data/maps/VictoryRoad_B2F/header.s index 7014ef865..4690acbb7 100644 --- a/data/maps/VictoryRoad_B2F/header.s +++ b/data/maps/VictoryRoad_B2F/header.s @@ -3,7 +3,7 @@ VictoryRoad_B2F:: @ 830725C .4byte VictoryRoad_B2F_MapEvents .4byte VictoryRoad_B2F_MapScripts .4byte 0x0 - .2byte 429 + .2byte BGM_C_ROAD .2byte 287 .byte 70 .byte 1 diff --git a/include/fieldmap.h b/include/fieldmap.h index 9a134e65c..852a6c337 100644 --- a/include/fieldmap.h +++ b/include/fieldmap.h @@ -55,6 +55,25 @@ struct WarpEvent s8 mapNum; }; +struct CoordEvent +{ + s16 x, y; + u8 filler_4[0x2]; + u16 trigger; + u16 index; + u8 filler_A[0x2]; + u8 *script; +}; + +struct BgEvent +{ + s16 x, y; + u8 filler_4; + u8 kind; + s16 filler_6; + u8 *script; +}; + struct MapEvents { u8 mapObjectCount; @@ -64,8 +83,8 @@ struct MapEvents struct MapObjectTemplate *mapObjects; struct WarpEvent *warps; - void *coordEvents; - void *bgEvents; + struct CoordEvent *coordEvents; + struct BgEvent *bgEvents; }; struct MapConnection |