diff options
Diffstat (limited to 'data')
199 files changed, 839 insertions, 1196 deletions
diff --git a/data/battle_ai_scripts.s b/data/battle_ai_scripts.s index 8f3cfb657..03f76fe29 100644 --- a/data/battle_ai_scripts.s +++ b/data/battle_ai_scripts.s @@ -3307,7 +3307,7 @@ AI_HPAware_DiscouragedEffectsWhenTargetLowHP: @ 82DE2B1 .byte EFFECT_TOXIC .byte EFFECT_LIGHT_SCREEN .byte EFFECT_OHKO - .byte EFFECT_SUPER_FANG + .byte EFFECT_SUPER_FANG //Maybe supposed to be EFFECT_RAZOR_WIND .byte EFFECT_SUPER_FANG .byte EFFECT_MIST .byte EFFECT_FOCUS_ENERGY diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index 8655d9bc3..f366d4426 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -2960,7 +2960,7 @@ SkyAttackSetUpAgainstPartner: SkyAttackUnleash: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_BIRD - call SetFlyingBg + call SetSkyBg monbg ANIM_ATTACKER createvisualtask sub_8116620, 10, 2, 0, 0, 16, RGB_WHITE delay 4 @@ -2977,7 +2977,7 @@ SkyAttackUnleash: createvisualtask sub_8116620, 10, 2, 0, 15, 0, RGB_WHITE waitforvisualfinish clearmonbg ANIM_ATTACKER - call UnsetFlyingBg + call UnsetSkyBg goto SkyAttackEnd Move_FLASH: @@ -5392,7 +5392,7 @@ Move_WITHDRAW: Move_AURORA_BEAM: loadspritegfx ANIM_TAG_RAINBOW_RINGS - fadetobg BG_AURORABEAM + fadetobg BG_AURORA waitbgfadein playsewithpan SE_W062, SOUND_PAN_ATTACKER setarg 7, 0 @@ -6195,7 +6195,7 @@ Move_AEROBLAST: loadspritegfx ANIM_TAG_AIR_WAVE_2 loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER - call SetFlyingBg + call SetSkyBg monbgprio_28 ANIM_TARGET setalpha 12, 8 call Aeroblast1 @@ -6211,7 +6211,7 @@ Move_AEROBLAST: clearmonbg ANIM_DEF_PARTNER blendoff delay 0 - call UnsetFlyingBg + call UnsetSkyBg end Aeroblast1: playsewithpan SE_W026, SOUND_PAN_ATTACKER @@ -6568,7 +6568,7 @@ Move_DYNAMIC_PUNCH: loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_EXPLOSION - loadspritegfx ANIM_TAG_UNUSED_EXPLOSION + loadspritegfx ANIM_TAG_EXPLOSION_6 delay 1 monbg ANIM_DEF_PARTNER setalpha 12, 8 @@ -9419,7 +9419,7 @@ Move_SEISMIC_TOSS: waitforvisualfinish createvisualtask AnimTask_GetSeismicTossDamageLevel, 3 delay 1 - fadetobg BG_SEISMICTOSS_SKUUPPERCUT + fadetobg BG_IN_AIR waitbgfadeout createvisualtask sub_811152C, 3 playsewithpan SE_W327, 0 @@ -9589,7 +9589,7 @@ Move_SKY_UPPERCUT: loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER monbgprio_28 ANIM_TARGET - fadetobg BG_SEISMICTOSS_SKUUPPERCUT + fadetobg BG_IN_AIR waitbgfadeout playsewithpan SE_W327, SOUND_PAN_ATTACKER createvisualtask sub_810DABC, 5, 55 @@ -10165,21 +10165,21 @@ UnsetPsychicBackground: waitbgfadein return -SetFlyingBg: - jumpifcontest SetBgFlyingContest - fadetobg BG_FLYING +SetSkyBg: + jumpifcontest SetSkyBgContest + fadetobg BG_SKY waitbgfadeout createvisualtask sub_8117660, 5, -2304, 768, 1, -1 -SetBgFlyingContinue: +SetSkyBgContinue: waitbgfadein return -SetBgFlyingContest: - fadetobg BG_FLYING_CONTESTS +SetSkyBgContest: + fadetobg BG_SKY_CONTESTS waitbgfadeout createvisualtask sub_8117660, 5, 2304, 768, 0, -1 - goto SetBgFlyingContinue + goto SetSkyBgContinue -UnsetFlyingBg: +UnsetSkyBg: restorebg waitbgfadeout setarg 7, -1 @@ -10331,15 +10331,15 @@ General_SubstituteAppear: General_PokeblockThrow: createvisualtask sub_817345C, 2, 0 - createvisualtask sub_81732B0, 2 + createvisualtask AnimTask_LoadPokeblockGfx, 2 delay 0 waitplaysewithpan SE_W026, SOUND_PAN_ATTACKER, 22 - createsprite gBattleAnimSpriteTemplate_85E5338, ANIM_TARGET, 3, -18, 12, 0, 32 + createsprite gPokeblockSpriteTemplate, ANIM_TARGET, 3, -18, 12, 0, 32 delay 50 loopsewithpan SE_W039, SOUND_PAN_TARGET, 19, 2 createvisualtask AnimTask_SwayMon, 5, 1, 8, 1536, 2, ANIM_TARGET waitforvisualfinish - createvisualtask sub_81732E4, 2 + createvisualtask AnimTask_FreePokeblockGfx, 2 end General_ItemKnockoff: @@ -10516,7 +10516,7 @@ General_Hail: goto Move_HAIL General_LeechSeedDrain: - createvisualtask sub_817351C, 5 + createvisualtask AnimTask_GetBattlersFromArg, 5 delay 0 goto Move_ABSORB @@ -10535,7 +10535,7 @@ General_MonHit: General_ItemSteal: loadspritegfx ANIM_TAG_ITEM_BAG createvisualtask sub_8117F30, 2 - createvisualtask sub_8172ED0, 2 + createvisualtask AnimTask_TargetToEffectBattler, 2 delay 1 createsprite gItemStealSpriteTemplate, ANIM_ATTACKER, 2, 0, -5, 10, 2, -1 end @@ -10664,8 +10664,8 @@ General_WishHeal: end AnimScript_82D85A3: - createvisualtask sub_8172E9C, 2 - jumpreteq 1, AnimScript_82D85B4 + createvisualtask AnimTask_IsAttackerBehindSubstitute, 2 + jumprettrue AnimScript_82D85B4 AnimScript_82D85B2: waitforvisualfinish return @@ -10675,8 +10675,8 @@ AnimScript_82D85B4: goto AnimScript_82D85B2 AnimScript_82D85C3: - createvisualtask sub_8172E9C, 2 - jumpreteq 1, AnimScript_82D85D4 + createvisualtask AnimTask_IsAttackerBehindSubstitute, 2 + jumprettrue AnimScript_82D85D4 AnimScript_82D85D2: waitforvisualfinish return diff --git a/data/contest_ai_scripts.s b/data/contest_ai_scripts.s index 6eb254dae..7346876d7 100644 --- a/data/contest_ai_scripts.s +++ b/data/contest_ai_scripts.s @@ -11,39 +11,40 @@ enum MON_4 .align 2 -gContestAIs:: @ 82DE350 - .4byte AI_CheckForBadMove - .4byte AI_CheckForCombo - .4byte AI_CheckBoring - .4byte AI_CheckExcitement - .4byte AI_CheckOrder - .4byte AI_CheckForGoodMove - .4byte AI_Erratic - .4byte AI_Nothing - .4byte AI_Nothing - .4byte AI_Nothing - .4byte AI_Nothing - .4byte AI_Nothing - .4byte AI_Nothing - .4byte AI_Nothing - .4byte AI_Nothing - .4byte AI_Nothing - .4byte AI_Nothing - .4byte AI_Nothing - .4byte AI_Nothing - .4byte AI_Nothing - .4byte AI_Nothing - .4byte AI_Nothing - .4byte AI_Nothing - .4byte AI_Nothing - .4byte AI_Nothing - .4byte AI_Nothing - .4byte AI_Nothing - .4byte AI_Nothing - .4byte AI_Nothing - .4byte AI_Nothing - .4byte AI_Nothing - .4byte AI_Nothing +gContestAIChecks:: @ 82DE350 + .4byte AI_CheckForBadMove // 0x00000001 + .4byte AI_CheckForCombo // 0x00000002 + .4byte AI_CheckBoring // 0x00000004 + .4byte AI_CheckExcitement // 0x00000008 + .4byte AI_CheckOrder // 0x00000010 + .4byte AI_CheckForGoodMove // 0x00000020 + .4byte AI_Erratic // 0x00000040 + .4byte AI_Nothing // 0x00000080 + .4byte AI_Nothing // 0x00000100 + .4byte AI_Nothing // 0x00000200 + .4byte AI_Nothing // 0x00000400 + .4byte AI_Nothing // 0x00000800 + .4byte AI_Nothing // 0x00001000 + .4byte AI_Nothing // 0x00002000 + .4byte AI_Nothing // 0x00004000 + .4byte AI_Nothing // 0x00008000 + .4byte AI_Nothing // 0x00010000 + .4byte AI_Nothing // 0x00020000 + .4byte AI_Nothing // 0x00040000 + .4byte AI_Nothing // 0x00080000 + .4byte AI_Nothing // 0x00100000 + .4byte AI_Nothing // 0x00200000 + .4byte AI_Nothing // 0x00400000 + .4byte AI_Nothing // 0x00800000 + .4byte AI_Nothing // 0x01000000 + .4byte AI_Nothing // 0x02000000 + .4byte AI_Nothing // 0x04000000 + .4byte AI_Nothing // 0x08000000 + .4byte AI_Nothing // 0x10000000 + .4byte AI_Nothing // 0x20000000 + .4byte AI_Nothing // 0x40000000 + .4byte AI_Nothing // 0x80000000 + @ Unreferenced AI routine to encourage moves that improve condition on the first @ turn. Additionally, it checks the appeal order of the user and the effect diff --git a/data/event_scripts.s b/data/event_scripts.s index 5c3c408aa..bf32eae83 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -6,6 +6,7 @@ #include "constants/event_object_movement_constants.h" #include "constants/field_effects.h" #include "constants/flags.h" +#include "constants/decorations.h" #include "constants/items.h" #include "constants/heal_locations.h" #include "constants/layouts.h" @@ -454,7 +455,7 @@ EventScript_SecretBasePC:: @ 823B4BB EventScript_SecretBasePCShowMainMenu:: @ 823B4D3 message Text_SecretBasePCStartMenu waitmessage - goto_if_set FLAG_DECORATION_16, EventScript_SecretBasePCMainMenuChoice + goto_if_set FLAG_SECRET_BASE_REGISTRY_ENABLED, EventScript_SecretBasePCMainMenuChoice goto EventScript_23B531 end @@ -487,16 +488,16 @@ EventScript_23B568:: @ 823B568 compare VAR_RESULT, 0 goto_if_eq EventScript_SecretBasePCShowMainMenu closemessage - special sub_80E9AC0 + special MoveOutOfSecretBase releaseall end EventScript_23B581:: @ 823B581 - special sub_80E9C74 + special ShowSecretBaseDecorationMenu end EventScript_23B585:: @ 823B585 - special sub_80E9C88 + special ShowSecretBaseRegistryMenu end EventScript_RecordMixingSecretBasePC:: @ 823B589 @@ -529,17 +530,17 @@ gUnknown_0823B5E9:: @ 823B5E9 end EventScript_23B5F0:: @ 823B5F0 - special sub_80E9BDC + special GetCurSecretBaseRegistrationValidity compare VAR_RESULT, 1 goto_if_eq EventScript_23B62F compare VAR_RESULT, 2 goto_if_eq EventScript_CantRegisterTooManyBases - special sub_80E980C - msgbox Text_276707, MSGBOX_YESNO + special CopyCurSecretBaseOwnerName_StrVar1 + msgbox Text_WantToRegisterSecretBase, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if_eq EventScript_23B5A1 msgbox Text_2767D1, MSGBOX_SIGN - special sub_80E9C2C + special ToggleCurSecretBaseRegistry special DoSecretBasePCTurnOffEffect releaseall end @@ -549,7 +550,7 @@ EventScript_23B62F:: @ 823B62F compare VAR_RESULT, 0 goto_if_eq EventScript_23B5A1 msgbox Text_2767E9, MSGBOX_SIGN - special sub_80E9C2C + special ToggleCurSecretBaseRegistry special DoSecretBasePCTurnOffEffect releaseall end @@ -573,23 +574,23 @@ EventScript_23B66E:: @ 823B66E end EventScript_23B674:: @ 823B674 - special sub_80EB498 + special SetSecretBaseSecretsTvFlags_Poster end EventScript_23B678:: @ 823B678 - special sub_80EB56C + special SetSecretBaseSecretsTvFlags_MiscFurnature end EventScript_23B67C:: @ 823B67C - special sub_80EB9E0 + special SetSecretBaseSecretsTvFlags_LargeDecorationSpot end EventScript_23B680:: @ 823B680 - special sub_80EBB28 + special SetSecretBaseSecretsTvFlags_SmallDecorationSpot end EventScript_SecretBaseSandOrnament:: @ 823B684 - special sub_80EBE7C + special SetSecretBaseSecretsTvFlags_SandOrnament dofieldeffect FLDEFF_SAND_PILLAR waitstate end @@ -825,7 +826,7 @@ Std_10: @ 8271347 waitmessage return -EventScript_27134E: @ 827134E +EventScript_UnusedReturn: @ 827134E return Common_EventScript_SaveGame:: @ 827134F @@ -846,7 +847,7 @@ Std_MsgboxAutoclose:: @ 8271494 release return -EventScript_27149D:: @ 827149D +EventScript_ResetAllBerries:: @ 827149D setberrytree 2, 7, 5 setberrytree 1, 3, 5 setberrytree 11, 7, 5 @@ -1089,13 +1090,13 @@ EventScript_ResetAllMapFlags:: @ 82715DE setflag FLAG_HIDE_EVER_GRANDE_POKEMON_CENTER_1F_SCOTT setflag FLAG_HIDE_SKY_PILLAR_WALLACE setflag FLAG_RAYQUAZA_ON_SKY_TOWER_SUMMIT - call EventScript_27149D + call EventScript_ResetAllBerries end EverGrandeCity_HallOfFame_EventScript_2717C1:: @ 82717C1 special sub_81AFDD0 setflag FLAG_IS_CHAMPION - call EverGrandeCity_HallOfFame_EventScript_271829 + call EverGrandeCity_HallOfFame_EventScript_ResetDefeatedEventLegendaries compare VAR_FOSSIL_MANIAC_STATE, 0 call_if_eq EverGrandeCity_HallOfFame_EventScript_271839 clearflag FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS @@ -1120,7 +1121,7 @@ EverGrandeCity_HallOfFame_EventScript_2717C1:: @ 82717C1 call_if_eq EverGrandeCity_HallOfFame_EventScript_271851 return -EverGrandeCity_HallOfFame_EventScript_271829:: @ 8271829 +EverGrandeCity_HallOfFame_EventScript_ResetDefeatedEventLegendaries:: @ 8271829 clearflag FLAG_DEFEATED_MEW clearflag FLAG_DEFEATED_LATIAS_OR_LATIOS clearflag FLAG_DEFEATED_DEOXYS @@ -1193,7 +1194,7 @@ EventScript_MoveMrBrineyToRoute108:: @ 82718B3 end EverGrandeCity_HallOfFame_EventScript_ResetEliteFour:: @ 82718CC - clearflag FLAG_DEFEATED_ELITE_4_SYDNEY + clearflag FLAG_DEFEATED_ELITE_4_SIDNEY clearflag FLAG_DEFEATED_ELITE_4_PHOEBE clearflag FLAG_DEFEATED_ELITE_4_GLACIA clearflag FLAG_DEFEATED_ELITE_4_DRAKE @@ -2766,7 +2767,7 @@ EventScript_2736F8:: @ 82736F8 Common_EventScript_NopReturn:: @ 827374E return -EventScript_27374F:: @ 827374F +EventScript_UnusedSetVarResult1:: @ 827374F setvar VAR_RESULT, 1 return @@ -3460,7 +3461,7 @@ EventScript_GotoTrainerScript:: @ 82742F6 gUnknown_0827E8CE:: @ 827E8CE .string "Missed turn$" -gUnknown_0827E8DA:: @ 827E8DA +gText_LinkStandby4:: @ 827E8DA .string "Link standby!$" gUnknown_0827E8E8:: @ 827E8E8 diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc b/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc index 1c517735e..2d6f7ee77 100644 --- a/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc +++ b/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc @@ -42,11 +42,11 @@ AbandonedShip_HiddenFloorRooms_EventScript_238CE3:: @ 8238CE3 setfieldeffectargument 0, 10 setfieldeffectargument 1, 10 setfieldeffectargument 2, 0 - dofieldeffect 54 + dofieldeffect FLDEFF_SPARKLE specialvar VAR_RESULT, FoundAbandonedShipRoom4Key compare VAR_RESULT, 0 call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238DD3 - waitfieldeffect 54 + waitfieldeffect FLDEFF_SPARKLE delay 10 end @@ -60,7 +60,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_238D0D:: @ 8238D0D delay 20 compare VAR_RESULT, 0 call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238DB3 - waitfieldeffect 54 + waitfieldeffect FLDEFF_SPARKLE delay 10 end @@ -72,15 +72,15 @@ AbandonedShip_HiddenFloorRooms_EventScript_238D33:: @ 8238D33 setfieldeffectargument 0, 8 setfieldeffectargument 1, 5 setfieldeffectargument 2, 0 - dofieldeffect 54 + dofieldeffect FLDEFF_SPARKLE setfieldeffectargument 0, 11 setfieldeffectargument 1, 3 setfieldeffectargument 2, 0 - dofieldeffect 54 + dofieldeffect FLDEFF_SPARKLE specialvar VAR_RESULT, FoundAbandonedShipRoom6Key compare VAR_RESULT, 0 call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238DE3 - waitfieldeffect 54 + waitfieldeffect FLDEFF_SPARKLE delay 10 end @@ -89,19 +89,19 @@ AbandonedShip_HiddenFloorRooms_EventScript_238D6B:: @ 8238D6B setfieldeffectargument 0, 16 setfieldeffectargument 1, 3 setfieldeffectargument 2, 0 - dofieldeffect 54 + dofieldeffect FLDEFF_SPARKLE setfieldeffectargument 0, 25 setfieldeffectargument 1, 2 setfieldeffectargument 2, 0 - dofieldeffect 54 + dofieldeffect FLDEFF_SPARKLE setfieldeffectargument 0, 24 setfieldeffectargument 1, 6 setfieldeffectargument 2, 0 - dofieldeffect 54 + dofieldeffect FLDEFF_SPARKLE specialvar VAR_RESULT, FoundAbandonedShipRoom2Key compare VAR_RESULT, 0 call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_238DC3 - waitfieldeffect 54 + waitfieldeffect FLDEFF_SPARKLE delay 10 end @@ -112,28 +112,28 @@ AbandonedShip_HiddenFloorRooms_EventScript_238DB3:: @ 8238DB3 setfieldeffectargument 0, 42 setfieldeffectargument 1, 10 setfieldeffectargument 2, 0 - dofieldeffect 54 + dofieldeffect FLDEFF_SPARKLE return AbandonedShip_HiddenFloorRooms_EventScript_238DC3:: @ 8238DC3 setfieldeffectargument 0, 20 setfieldeffectargument 1, 5 setfieldeffectargument 2, 0 - dofieldeffect 54 + dofieldeffect FLDEFF_SPARKLE return AbandonedShip_HiddenFloorRooms_EventScript_238DD3:: @ 8238DD3 setfieldeffectargument 0, 1 setfieldeffectargument 1, 12 setfieldeffectargument 2, 0 - dofieldeffect 54 + dofieldeffect FLDEFF_SPARKLE return AbandonedShip_HiddenFloorRooms_EventScript_238DE3:: @ 8238DE3 setfieldeffectargument 0, 1 setfieldeffectargument 1, 2 setfieldeffectargument 2, 0 - dofieldeffect 54 + dofieldeffect FLDEFF_SPARKLE return AbandonedShip_HiddenFloorRooms_EventScript_238DF3:: @ 8238DF3 diff --git a/data/maps/AquaHideout_B1F/scripts.inc b/data/maps/AquaHideout_B1F/scripts.inc index 2995f48dc..589e41612 100644 --- a/data/maps/AquaHideout_B1F/scripts.inc +++ b/data/maps/AquaHideout_B1F/scripts.inc @@ -1,6 +1,6 @@ AquaHideout_B1F_MapScripts:: @ 82339A7 map_script MAP_SCRIPT_ON_RESUME, AquaHideout_B1F_MapScript1_2339B2 - map_script MAP_SCRIPT_ON_TRANSITION, AquaHideout_B1F_MapScript1_2339D0 + map_script MAP_SCRIPT_ON_TRANSITION, AquaHideout_B1F_OnTransition .byte 0 AquaHideout_B1F_MapScript1_2339B2: @ 82339B2 @@ -14,7 +14,7 @@ AquaHideout_B1F_EventScript_2339BC:: @ 82339BC removeobject VAR_LAST_TALKED return -AquaHideout_B1F_MapScript1_2339D0: @ 82339D0 +AquaHideout_B1F_OnTransition: @ 82339D0 call_if_unset FLAG_DEFEATED_ELECTRODE_1_AQUA_HIDEOUT, AquaHideout_B1F_EventScript_2339E3 call_if_unset FLAG_DEFEATED_ELECTRODE_2_AQUA_HIDEOUT, AquaHideout_B1F_EventScript_2339E7 end diff --git a/data/maps/AquaHideout_B2F/scripts.inc b/data/maps/AquaHideout_B2F/scripts.inc index cdfe3f58e..975715fc2 100644 --- a/data/maps/AquaHideout_B2F/scripts.inc +++ b/data/maps/AquaHideout_B2F/scripts.inc @@ -1,8 +1,8 @@ AquaHideout_B2F_MapScripts:: @ 8233DCF - map_script MAP_SCRIPT_ON_TRANSITION, AquaHideout_B2F_MapScript1_233DD5 + map_script MAP_SCRIPT_ON_TRANSITION, AquaHideout_B2F_OnTransition .byte 0 -AquaHideout_B2F_MapScript1_233DD5: @ 8233DD5 +AquaHideout_B2F_OnTransition: @ 8233DD5 call_if_set FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE, AquaHideout_B2F_EventScript_233DDF end diff --git a/data/maps/BattleFrontier_PokemonCenter_2F/scripts.inc b/data/maps/BattleFrontier_PokemonCenter_2F/scripts.inc index c6ae8da2a..59ede7f6a 100644 --- a/data/maps/BattleFrontier_PokemonCenter_2F/scripts.inc +++ b/data/maps/BattleFrontier_PokemonCenter_2F/scripts.inc @@ -2,7 +2,7 @@ BattleFrontier_PokemonCenter_2F_MapScripts:: @ 8267AA4 map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_PokemonCenter_2F_MapScript2_276C3B map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_PokemonCenter_2F_MapScript2_276B6C map_script MAP_SCRIPT_ON_LOAD, BattleFrontier_PokemonCenter_2F_MapScript1_276BBE - map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition .byte 0 BattleFrontier_PokemonCenter_2F_EventScript_267AB9:: @ 8267AB9 diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc index 594790ff3..3eb491e0f 100644 --- a/data/maps/BirthIsland_Exterior/scripts.inc +++ b/data/maps/BirthIsland_Exterior/scripts.inc @@ -1,5 +1,5 @@ BirthIsland_Exterior_MapScripts:: @ 8267F15 - map_script MAP_SCRIPT_ON_TRANSITION, BirthIsland_Exterior_MapScript1_267F29 + map_script MAP_SCRIPT_ON_TRANSITION, BirthIsland_Exterior_OnTransition map_script MAP_SCRIPT_ON_RESUME, BirthIsland_Exterior_MapScript1_267F65 map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, BirthIsland_Exterior_MapScript1_267F25 .byte 0 @@ -8,7 +8,7 @@ BirthIsland_Exterior_MapScript1_267F25: @ 8267F25 special sub_813B1D0 end -BirthIsland_Exterior_MapScript1_267F29: @ 8267F29 +BirthIsland_Exterior_OnTransition: @ 8267F29 setflag FLAG_MAP_SCRIPT_CHECKED_DEOXYS setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL setvar VAR_DEOXYS_ROCK_STEP_COUNT, 0 @@ -68,9 +68,9 @@ BirthIsland_Exterior_EventScript_267FC1:: @ 8267FC1 setfieldeffectargument 0, 1 setfieldeffectargument 1, 58 setfieldeffectargument 2, 26 - dofieldeffect 65 + dofieldeffect FLDEFF_65 playbgm MUS_RG_DEOEYE, 0 - waitfieldeffect 65 + waitfieldeffect FLDEFF_65 addobject 2 applymovement 2, BirthIsland_Exterior_Movement_268054 waitmovement 0 diff --git a/data/maps/CaveOfOrigin_1F/scripts.inc b/data/maps/CaveOfOrigin_1F/scripts.inc index e8d722dee..8c72ec4b8 100644 --- a/data/maps/CaveOfOrigin_1F/scripts.inc +++ b/data/maps/CaveOfOrigin_1F/scripts.inc @@ -1,7 +1,7 @@ CaveOfOrigin_1F_MapScripts:: @ 8235768 - map_script MAP_SCRIPT_ON_TRANSITION, CaveOfOrigin_1F_MapScript1_23576E + map_script MAP_SCRIPT_ON_TRANSITION, CaveOfOrigin_1F_OnTransition .byte 0 -CaveOfOrigin_1F_MapScript1_23576E: @ 823576E +CaveOfOrigin_1F_OnTransition: @ 823576E call_if_set FLAG_UNUSED_RS_LEGENDARY_BATTLE_DONE, CaveOfOrigin_1F_EventScript_2722C1 end diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc index e3e296945..bc574be2d 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc @@ -1,7 +1,7 @@ CaveOfOrigin_UnusedRubySapphireMap1_MapScripts:: @ 8235778 - map_script MAP_SCRIPT_ON_TRANSITION, CaveOfOrigin_UnusedRubySapphireMap1_MapScript1_23577E + map_script MAP_SCRIPT_ON_TRANSITION, CaveOfOrigin_UnusedRubySapphireMap1_OnTransition .byte 0 -CaveOfOrigin_UnusedRubySapphireMap1_MapScript1_23577E: @ 823577E +CaveOfOrigin_UnusedRubySapphireMap1_OnTransition: @ 823577E call_if_set FLAG_UNUSED_RS_LEGENDARY_BATTLE_DONE, CaveOfOrigin_UnusedRubySapphireMap1_EventScript_2722C1 end diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc index 417a7369a..340e4a585 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc @@ -1,8 +1,8 @@ CaveOfOrigin_UnusedRubySapphireMap2_MapScripts:: @ 8235788 - map_script MAP_SCRIPT_ON_TRANSITION, CaveOfOrigin_UnusedRubySapphireMap2_MapScript1_23578E + map_script MAP_SCRIPT_ON_TRANSITION, CaveOfOrigin_UnusedRubySapphireMap2_OnTransition .byte 0 -CaveOfOrigin_UnusedRubySapphireMap2_MapScript1_23578E: @ 823578E +CaveOfOrigin_UnusedRubySapphireMap2_OnTransition: @ 823578E call_if_set FLAG_UNUSED_RS_LEGENDARY_BATTLE_DONE, CaveOfOrigin_UnusedRubySapphireMap2_EventScript_2722C1 end diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc index 51d9b8654..f2e118907 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc @@ -1,8 +1,8 @@ CaveOfOrigin_UnusedRubySapphireMap3_MapScripts:: @ 8235798 - map_script MAP_SCRIPT_ON_TRANSITION, CaveOfOrigin_UnusedRubySapphireMap3_MapScript1_23579E + map_script MAP_SCRIPT_ON_TRANSITION, CaveOfOrigin_UnusedRubySapphireMap3_OnTransition .byte 0 -CaveOfOrigin_UnusedRubySapphireMap3_MapScript1_23579E: @ 823579E +CaveOfOrigin_UnusedRubySapphireMap3_OnTransition: @ 823579E call_if_set FLAG_UNUSED_RS_LEGENDARY_BATTLE_DONE, CaveOfOrigin_UnusedRubySapphireMap3_EventScript_2722C1 end diff --git a/data/maps/DewfordTown/scripts.inc b/data/maps/DewfordTown/scripts.inc index ed8acea17..1fcaab8d6 100644 --- a/data/maps/DewfordTown/scripts.inc +++ b/data/maps/DewfordTown/scripts.inc @@ -1,8 +1,8 @@ DewfordTown_MapScripts:: @ 81E9507 - map_script MAP_SCRIPT_ON_TRANSITION, DewfordTown_MapScript1_1E950D + map_script MAP_SCRIPT_ON_TRANSITION, DewfordTown_OnTransition .byte 0 -DewfordTown_MapScript1_1E950D: @ 81E950D +DewfordTown_OnTransition: @ 81E950D setflag FLAG_VISITED_DEWFORD_TOWN end diff --git a/data/maps/DewfordTown_Gym/scripts.inc b/data/maps/DewfordTown_Gym/scripts.inc index eb8183585..5601c7477 100644 --- a/data/maps/DewfordTown_Gym/scripts.inc +++ b/data/maps/DewfordTown_Gym/scripts.inc @@ -1,8 +1,8 @@ DewfordTown_Gym_MapScripts:: @ 81FC63C - map_script MAP_SCRIPT_ON_TRANSITION, DewfordTown_Gym_MapScript1_1FC642 + map_script MAP_SCRIPT_ON_TRANSITION, DewfordTown_Gym_OnTransition .byte 0 -DewfordTown_Gym_MapScript1_1FC642: @ 81FC642 +DewfordTown_Gym_OnTransition: @ 81FC642 call DewfordTown_Gym_EventScript_1FC648 end diff --git a/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc b/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc index b4f5fc4c6..be9005d7d 100644 --- a/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc @@ -1,9 +1,9 @@ DewfordTown_PokemonCenter_1F_MapScripts:: @ 81FC523 - map_script MAP_SCRIPT_ON_TRANSITION, DewfordTown_PokemonCenter_1F_MapScript1_1FC52E + map_script MAP_SCRIPT_ON_TRANSITION, DewfordTown_PokemonCenter_1F_OnTransition map_script MAP_SCRIPT_ON_RESUME, DewfordTown_PokemonCenter_1F_MapScript1_277C30 .byte 0 -DewfordTown_PokemonCenter_1F_MapScript1_1FC52E: @ 81FC52E +DewfordTown_PokemonCenter_1F_OnTransition: @ 81FC52E setrespawn HEAL_LOCATION_DEWFORD_TOWN call DewfordTown_PokemonCenter_1F_EventScript_2718DE end diff --git a/data/maps/DewfordTown_PokemonCenter_2F/scripts.inc b/data/maps/DewfordTown_PokemonCenter_2F/scripts.inc index 58b0b63a1..f49560d8c 100644 --- a/data/maps/DewfordTown_PokemonCenter_2F/scripts.inc +++ b/data/maps/DewfordTown_PokemonCenter_2F/scripts.inc @@ -2,7 +2,7 @@ DewfordTown_PokemonCenter_2F_MapScripts:: @ 81FC615 map_script MAP_SCRIPT_ON_FRAME_TABLE, DewfordTown_PokemonCenter_2F_MapScript2_276C3B map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, DewfordTown_PokemonCenter_2F_MapScript2_276B6C map_script MAP_SCRIPT_ON_LOAD, DewfordTown_PokemonCenter_2F_MapScript1_276BBE - map_script MAP_SCRIPT_ON_TRANSITION, DewfordTown_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition .byte 0 DewfordTown_PokemonCenter_2F_EventScript_1FC62A:: @ 81FC62A diff --git a/data/maps/EverGrandeCity/scripts.inc b/data/maps/EverGrandeCity/scripts.inc index ffbf5a6cd..39e57f563 100644 --- a/data/maps/EverGrandeCity/scripts.inc +++ b/data/maps/EverGrandeCity/scripts.inc @@ -1,8 +1,8 @@ EverGrandeCity_MapScripts:: @ 81E7D1B - map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_MapScript1_1E7D21 + map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_OnTransition .byte 0 -EverGrandeCity_MapScript1_1E7D21: @ 81E7D21 +EverGrandeCity_OnTransition: @ 81E7D21 call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15 end diff --git a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc index 49411aeb4..72c5cc916 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc +++ b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc @@ -1,10 +1,10 @@ EverGrandeCity_ChampionsRoom_MapScripts:: @ 82289EF - map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_ChampionsRoom_MapScript1_2289FF + map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_ChampionsRoom_OnTransition map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_ChampionsRoom_MapScript2_228A05 map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_ChampionsRoom_MapScript2_228A14 .byte 0 -EverGrandeCity_ChampionsRoom_MapScript1_2289FF: @ 82289FF +EverGrandeCity_ChampionsRoom_OnTransition: @ 82289FF call Common_EventScript_SetupRivalGender end diff --git a/data/maps/EverGrandeCity_HallOfFame/scripts.inc b/data/maps/EverGrandeCity_HallOfFame/scripts.inc index f61547c14..343614d85 100644 --- a/data/maps/EverGrandeCity_HallOfFame/scripts.inc +++ b/data/maps/EverGrandeCity_HallOfFame/scripts.inc @@ -38,8 +38,8 @@ EverGrandeCity_HallOfFame_EventScript_229850:: @ 8229850 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp waitmovement 0 delay 20 - dofieldeffect 62 - waitfieldeffect 62 + dofieldeffect FLDEFF_HALL_OF_FAME_RECORD + waitfieldeffect FLDEFF_HALL_OF_FAME_RECORD delay 40 setvar VAR_TEMP_1, 1 call EverGrandeCity_HallOfFame_EventScript_2717C1 diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc index 12c6bbb77..0b292530e 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc @@ -1,9 +1,9 @@ EverGrandeCity_PokemonCenter_1F_MapScripts:: @ 8229A34 - map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_PokemonCenter_1F_MapScript1_229A3F + map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_PokemonCenter_1F_OnTransition map_script MAP_SCRIPT_ON_RESUME, EverGrandeCity_PokemonCenter_1F_MapScript1_277C30 .byte 0 -EverGrandeCity_PokemonCenter_1F_MapScript1_229A3F: @ 8229A3F +EverGrandeCity_PokemonCenter_1F_OnTransition: @ 8229A3F setrespawn HEAL_LOCATION_EVER_GRANDE_CITY_1 call_if_unset FLAG_MET_SCOTT_IN_EVERGRANDE, EverGrandeCity_PokemonCenter_1F_EventScript_229A4C end diff --git a/data/maps/EverGrandeCity_PokemonCenter_2F/scripts.inc b/data/maps/EverGrandeCity_PokemonCenter_2F/scripts.inc index 40408c1f8..690032b8a 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_2F/scripts.inc @@ -2,7 +2,7 @@ EverGrandeCity_PokemonCenter_2F_MapScripts:: @ 8229CE0 map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_PokemonCenter_2F_MapScript2_276C3B map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_PokemonCenter_2F_MapScript2_276B6C map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_PokemonCenter_2F_MapScript1_276BBE - map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition .byte 0 EverGrandeCity_PokemonCenter_2F_EventScript_229CF5:: @ 8229CF5 diff --git a/data/maps/EverGrandeCity_PokemonLeague_2F/scripts.inc b/data/maps/EverGrandeCity_PokemonLeague_2F/scripts.inc index 2d2d916a3..2a2652938 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_2F/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonLeague_2F/scripts.inc @@ -2,7 +2,7 @@ EverGrandeCity_PokemonLeague_2F_MapScripts:: @ 8229D07 map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_PokemonLeague_2F_MapScript2_276C3B map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_PokemonLeague_2F_MapScript2_276B6C map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_PokemonLeague_2F_MapScript1_276BBE - map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_PokemonLeague_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition .byte 0 EverGrandeCity_PokemonLeague_2F_EventScript_229D1C:: @ 8229D1C diff --git a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc index 1713a6d3e..380b3aaf7 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc +++ b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc @@ -1,17 +1,17 @@ EverGrandeCity_SidneysRoom_MapScripts:: @ 8227F01 map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_SidneysRoom_MapScript1_227F1D map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_SidneysRoom_MapScript2_227F3E - map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_SidneysRoom_MapScript1_227F16 + map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_SidneysRoom_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_SidneysRoom_MapScript2_227F4D .byte 0 -EverGrandeCity_SidneysRoom_MapScript1_227F16: @ 8227F16 +EverGrandeCity_SidneysRoom_OnTransition: @ 8227F16 setflag FLAG_MET_SCOTT_IN_EVERGRANDE setflag FLAG_HIDE_EVER_GRANDE_POKEMON_CENTER_1F_SCOTT end EverGrandeCity_SidneysRoom_MapScript1_227F1D: @ 8227F1D - call_if_set FLAG_DEFEATED_ELITE_4_SYDNEY, EverGrandeCity_SidneysRoom_EventScript_227F32 + call_if_set FLAG_DEFEATED_ELITE_4_SIDNEY, EverGrandeCity_SidneysRoom_EventScript_227F32 compare VAR_ELITE_4_STATE, 1 call_if_eq EverGrandeCity_SidneysRoom_EventScript_227F38 end @@ -47,7 +47,7 @@ EverGrandeCity_SidneysRoom_EventScript_227F57:: @ 8227F57 EverGrandeCity_SidneysRoom_EventScript_227F64:: @ 8227F64 lock faceplayer - goto_if_set FLAG_DEFEATED_ELITE_4_SYDNEY, EverGrandeCity_SidneysRoom_EventScript_227F8B + goto_if_set FLAG_DEFEATED_ELITE_4_SIDNEY, EverGrandeCity_SidneysRoom_EventScript_227F8B playbgm MUS_SITENNOU, 0 msgbox EverGrandeCity_SidneysRoom_Text_227FA7, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_SIDNEY, EverGrandeCity_SidneysRoom_Text_2280A2 @@ -60,7 +60,7 @@ EverGrandeCity_SidneysRoom_EventScript_227F8B:: @ 8227F8B end EverGrandeCity_SidneysRoom_EventScript_227F95:: @ 8227F95 - setflag FLAG_DEFEATED_ELITE_4_SYDNEY + setflag FLAG_DEFEATED_ELITE_4_SIDNEY call EverGrandeCity_SidneysRoom_EventScript_2723F8 msgbox EverGrandeCity_SidneysRoom_Text_2280EC, MSGBOX_DEFAULT release diff --git a/data/maps/FallarborTown/scripts.inc b/data/maps/FallarborTown/scripts.inc index 50e19cfe5..15942007b 100644 --- a/data/maps/FallarborTown/scripts.inc +++ b/data/maps/FallarborTown/scripts.inc @@ -1,8 +1,8 @@ FallarborTown_MapScripts:: @ 81EB1FA - map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_MapScript1_1EB200 + map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_OnTransition .byte 0 -FallarborTown_MapScript1_1EB200: @ 81EB200 +FallarborTown_OnTransition: @ 81EB200 setflag FLAG_VISITED_FALLARBOR_TOWN setvar VAR_LINK_CONTEST_ROOM_STATE, 0 clearflag FLAG_CONTEST_SKETCH_CREATED diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc b/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc index b376f72e4..7501f6e8d 100644 --- a/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc +++ b/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc @@ -1,10 +1,10 @@ FallarborTown_BattleTentBattleRoom_MapScripts:: @ 8200899 - map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_BattleTentBattleRoom_MapScript1_2008A9 + map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_BattleTentBattleRoom_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, FallarborTown_BattleTentBattleRoom_MapScript2_2008DD map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FallarborTown_BattleTentBattleRoom_MapScript2_200BB0 .byte 0 -FallarborTown_BattleTentBattleRoom_MapScript1_2008A9: @ 82008A9 +FallarborTown_BattleTentBattleRoom_OnTransition: @ 82008A9 call FallarborTown_BattleTentBattleRoom_EventScript_2008AF end diff --git a/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc index d34e139eb..5dbd35b48 100644 --- a/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc @@ -1,9 +1,9 @@ FallarborTown_PokemonCenter_1F_MapScripts:: @ 8200BCD - map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_PokemonCenter_1F_MapScript1_200BD8 + map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_PokemonCenter_1F_OnTransition map_script MAP_SCRIPT_ON_RESUME, FallarborTown_PokemonCenter_1F_MapScript1_277C30 .byte 0 -FallarborTown_PokemonCenter_1F_MapScript1_200BD8: @ 8200BD8 +FallarborTown_PokemonCenter_1F_OnTransition: @ 8200BD8 setrespawn HEAL_LOCATION_FALLARBOR_TOWN call FallarborTown_PokemonCenter_1F_EventScript_2718DE end diff --git a/data/maps/FallarborTown_PokemonCenter_2F/scripts.inc b/data/maps/FallarborTown_PokemonCenter_2F/scripts.inc index 8fce8e729..0d5332647 100644 --- a/data/maps/FallarborTown_PokemonCenter_2F/scripts.inc +++ b/data/maps/FallarborTown_PokemonCenter_2F/scripts.inc @@ -2,7 +2,7 @@ FallarborTown_PokemonCenter_2F_MapScripts:: @ 8200EEB map_script MAP_SCRIPT_ON_FRAME_TABLE, FallarborTown_PokemonCenter_2F_MapScript2_276C3B map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FallarborTown_PokemonCenter_2F_MapScript2_276B6C map_script MAP_SCRIPT_ON_LOAD, FallarborTown_PokemonCenter_2F_MapScript1_276BBE - map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition .byte 0 FallarborTown_PokemonCenter_2F_EventScript_200F00:: @ 8200F00 diff --git a/data/maps/FarawayIsland_Entrance/scripts.inc b/data/maps/FarawayIsland_Entrance/scripts.inc index 347c89aa0..bd91918c3 100644 --- a/data/maps/FarawayIsland_Entrance/scripts.inc +++ b/data/maps/FarawayIsland_Entrance/scripts.inc @@ -1,8 +1,8 @@ FarawayIsland_Entrance_MapScripts:: @ 8267C8E - map_script MAP_SCRIPT_ON_TRANSITION, FarawayIsland_Entrance_MapScript1_267C94 + map_script MAP_SCRIPT_ON_TRANSITION, FarawayIsland_Entrance_OnTransition .byte 0 -FarawayIsland_Entrance_MapScript1_267C94: @ 8267C94 +FarawayIsland_Entrance_OnTransition: @ 8267C94 setflag FLAG_ARRIVED_ON_FARAWAY_ISLAND end diff --git a/data/maps/FarawayIsland_Interior/scripts.inc b/data/maps/FarawayIsland_Interior/scripts.inc index fe180184b..b6a278b03 100644 --- a/data/maps/FarawayIsland_Interior/scripts.inc +++ b/data/maps/FarawayIsland_Interior/scripts.inc @@ -1,6 +1,6 @@ FarawayIsland_Interior_MapScripts:: @ 8267CFA map_script MAP_SCRIPT_ON_RESUME, FarawayIsland_Interior_MapScript1_267D54 - map_script MAP_SCRIPT_ON_TRANSITION, FarawayIsland_Interior_MapScript1_267D72 + map_script MAP_SCRIPT_ON_TRANSITION, FarawayIsland_Interior_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, FarawayIsland_Interior_MapScript2_267D98 map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, FarawayIsland_Interior_MapScript1_267D0F .byte 0 @@ -37,7 +37,7 @@ FarawayIsland_Interior_EventScript_267D5E:: @ 8267D5E removeobject VAR_LAST_TALKED return -FarawayIsland_Interior_MapScript1_267D72: @ 8267D72 +FarawayIsland_Interior_OnTransition: @ 8267D72 setvar VAR_FARAWAY_ISLAND_STEP_COUNTER, 0 setvar VAR_TEMP_1, 1 call_if_unset FLAG_CAUGHT_MEW, FarawayIsland_Interior_EventScript_267D86 diff --git a/data/maps/FieryPath/map.json b/data/maps/FieryPath/map.json index 9bb09fe5a..70d1a2cfd 100644 --- a/data/maps/FieryPath/map.json +++ b/data/maps/FieryPath/map.json @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FieryPath_EventScript_2908BA", + "script": "EventScript_StrengthBoulder", "flag": "FLAG_TEMP_11" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FieryPath_EventScript_2908BA", + "script": "EventScript_StrengthBoulder", "flag": "FLAG_TEMP_12" }, { @@ -63,7 +63,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FieryPath_EventScript_2908BA", + "script": "EventScript_StrengthBoulder", "flag": "FLAG_TEMP_13" }, { @@ -76,7 +76,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FieryPath_EventScript_2908BA", + "script": "EventScript_StrengthBoulder", "flag": "FLAG_TEMP_14" }, { @@ -89,7 +89,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FieryPath_EventScript_2908BA", + "script": "EventScript_StrengthBoulder", "flag": "FLAG_TEMP_15" }, { @@ -102,7 +102,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "FieryPath_EventScript_2908BA", + "script": "EventScript_StrengthBoulder", "flag": "FLAG_TEMP_16" }, { diff --git a/data/maps/FortreeCity/scripts.inc b/data/maps/FortreeCity/scripts.inc index 1c464df9d..30f617f78 100644 --- a/data/maps/FortreeCity/scripts.inc +++ b/data/maps/FortreeCity/scripts.inc @@ -1,9 +1,9 @@ FortreeCity_MapScripts:: @ 81E25A4 - map_script MAP_SCRIPT_ON_TRANSITION, FortreeCity_MapScript1_1E25AF + map_script MAP_SCRIPT_ON_TRANSITION, FortreeCity_OnTransition map_script MAP_SCRIPT_ON_RESUME, FortreeCity_MapScript1_1E25B3 .byte 0 -FortreeCity_MapScript1_1E25AF: @ 81E25AF +FortreeCity_OnTransition: @ 81E25AF setflag FLAG_VISITED_FORTREE_CITY end diff --git a/data/maps/FortreeCity_DecorationShop/scripts.inc b/data/maps/FortreeCity_DecorationShop/scripts.inc index 5274daeda..3b0021cf3 100644 --- a/data/maps/FortreeCity_DecorationShop/scripts.inc +++ b/data/maps/FortreeCity_DecorationShop/scripts.inc @@ -14,22 +14,22 @@ FortreeCity_DecorationShop_EventScript_218020:: @ 8218020 faceplayer message gUnknown_08272A21 waitmessage - pokemartdecoration FortreeCity_DecorationShop_PokemartDecor_218038 + pokemartdecoration FortreeCity_DecorationShop_PokemartDecor_Desks msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end .align 2 -FortreeCity_DecorationShop_PokemartDecor_218038: @ 8218038 - .2byte 1 - .2byte 2 - .2byte 3 - .2byte 4 - .2byte 5 - .2byte 7 - .2byte 8 - .2byte 9 - .2byte 0 +FortreeCity_DecorationShop_PokemartDecor_Desks: @ 8218038 + .2byte DECOR_SMALL_DESK + .2byte DECOR_POKEMON_DESK + .2byte DECOR_HEAVY_DESK + .2byte DECOR_RAGGED_DESK + .2byte DECOR_COMFORT_DESK + .2byte DECOR_BRICK_DESK + .2byte DECOR_CAMP_DESK + .2byte DECOR_HARD_DESK + .2byte DECOR_NONE release end @@ -38,22 +38,22 @@ FortreeCity_DecorationShop_EventScript_21804C:: @ 821804C faceplayer message gUnknown_08272A21 waitmessage - pokemartdecoration FortreeCity_DecorationShop_PokemartDecor_218064 + pokemartdecoration FortreeCity_DecorationShop_PokemartDecor_Chairs msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end .align 2 -FortreeCity_DecorationShop_PokemartDecor_218064: @ 8218064 - .2byte 10 - .2byte 11 - .2byte 12 - .2byte 15 - .2byte 14 - .2byte 16 - .2byte 17 - .2byte 18 - .2byte 0 +FortreeCity_DecorationShop_PokemartDecor_Chairs: @ 8218064 + .2byte DECOR_SMALL_CHAIR + .2byte DECOR_POKEMON_CHAIR + .2byte DECOR_HEAVY_CHAIR + .2byte DECOR_RAGGED_CHAIR + .2byte DECOR_COMFORT_CHAIR + .2byte DECOR_BRICK_CHAIR + .2byte DECOR_CAMP_CHAIR + .2byte DECOR_HARD_CHAIR + .2byte DECOR_NONE release end diff --git a/data/maps/FortreeCity_Gym/scripts.inc b/data/maps/FortreeCity_Gym/scripts.inc index 8192e2039..1b3cf29e9 100644 --- a/data/maps/FortreeCity_Gym/scripts.inc +++ b/data/maps/FortreeCity_Gym/scripts.inc @@ -1,9 +1,9 @@ FortreeCity_Gym_MapScripts:: @ 82165AB - map_script MAP_SCRIPT_ON_TRANSITION, FortreeCity_Gym_MapScript1_2165B6 + map_script MAP_SCRIPT_ON_TRANSITION, FortreeCity_Gym_OnTransition map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FortreeCity_Gym_MapScript2_2165BA .byte 0 -FortreeCity_Gym_MapScript1_2165B6: @ 82165B6 +FortreeCity_Gym_OnTransition: @ 82165B6 special RotatingGate_InitPuzzle end diff --git a/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc b/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc index 070956590..0c62f97e2 100644 --- a/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc @@ -1,9 +1,9 @@ FortreeCity_PokemonCenter_1F_MapScripts:: @ 82173D8 - map_script MAP_SCRIPT_ON_TRANSITION, FortreeCity_PokemonCenter_1F_MapScript1_2173E3 + map_script MAP_SCRIPT_ON_TRANSITION, FortreeCity_PokemonCenter_1F_OnTransition map_script MAP_SCRIPT_ON_RESUME, FortreeCity_PokemonCenter_1F_MapScript1_277C30 .byte 0 -FortreeCity_PokemonCenter_1F_MapScript1_2173E3: @ 82173E3 +FortreeCity_PokemonCenter_1F_OnTransition: @ 82173E3 setrespawn HEAL_LOCATION_FORTREE_CITY end diff --git a/data/maps/FortreeCity_PokemonCenter_2F/scripts.inc b/data/maps/FortreeCity_PokemonCenter_2F/scripts.inc index dbe2e31ec..2ab9510f3 100644 --- a/data/maps/FortreeCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/FortreeCity_PokemonCenter_2F/scripts.inc @@ -2,7 +2,7 @@ FortreeCity_PokemonCenter_2F_MapScripts:: @ 821763E map_script MAP_SCRIPT_ON_FRAME_TABLE, FortreeCity_PokemonCenter_2F_MapScript2_276C3B map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FortreeCity_PokemonCenter_2F_MapScript2_276B6C map_script MAP_SCRIPT_ON_LOAD, FortreeCity_PokemonCenter_2F_MapScript1_276BBE - map_script MAP_SCRIPT_ON_TRANSITION, FortreeCity_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition .byte 0 FortreeCity_PokemonCenter_2F_EventScript_217653:: @ 8217653 diff --git a/data/maps/GraniteCave_B2F/map.json b/data/maps/GraniteCave_B2F/map.json index 73a13d6d2..72e403046 100644 --- a/data/maps/GraniteCave_B2F/map.json +++ b/data/maps/GraniteCave_B2F/map.json @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "GraniteCave_B2F_EventScript_2907A6", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_11" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "GraniteCave_B2F_EventScript_2907A6", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_12" }, { @@ -76,7 +76,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "GraniteCave_B2F_EventScript_2907A6", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_13" }, { @@ -89,7 +89,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "GraniteCave_B2F_EventScript_2907A6", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_14" }, { @@ -102,7 +102,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "GraniteCave_B2F_EventScript_2907A6", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_15" }, { @@ -115,7 +115,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "GraniteCave_B2F_EventScript_2907A6", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_16" }, { @@ -128,7 +128,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "GraniteCave_B2F_EventScript_2907A6", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_17" } ], diff --git a/data/maps/JaggedPass/scripts.inc b/data/maps/JaggedPass/scripts.inc index c51a5ec26..34ff367ae 100644 --- a/data/maps/JaggedPass/scripts.inc +++ b/data/maps/JaggedPass/scripts.inc @@ -1,6 +1,6 @@ JaggedPass_MapScripts:: @ 8230656 map_script MAP_SCRIPT_ON_RESUME, JaggedPass_MapScript1_230666 - map_script MAP_SCRIPT_ON_TRANSITION, JaggedPass_MapScript1_23068B + map_script MAP_SCRIPT_ON_TRANSITION, JaggedPass_OnTransition map_script MAP_SCRIPT_ON_LOAD, JaggedPass_MapScript1_23069C .byte 0 @@ -20,7 +20,7 @@ JaggedPass_EventScript_230685:: @ 8230685 setvar VAR_JAGGED_PASS_STATE, 1 return -JaggedPass_MapScript1_23068B: @ 823068B +JaggedPass_OnTransition: @ 823068B compare VAR_JAGGED_PASS_ASH_WEATHER, 1 call_if_eq JaggedPass_EventScript_230697 end diff --git a/data/maps/LavaridgeTown/scripts.inc b/data/maps/LavaridgeTown/scripts.inc index acbb3fcd2..9e20673b7 100644 --- a/data/maps/LavaridgeTown/scripts.inc +++ b/data/maps/LavaridgeTown/scripts.inc @@ -1,9 +1,9 @@ LavaridgeTown_MapScripts:: @ 81EA4D3 - map_script MAP_SCRIPT_ON_TRANSITION, LavaridgeTown_MapScript1_1EA4DE + map_script MAP_SCRIPT_ON_TRANSITION, LavaridgeTown_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, LavaridgeTown_MapScript2_1EA547 .byte 0 -LavaridgeTown_MapScript1_1EA4DE: @ 81EA4DE +LavaridgeTown_OnTransition: @ 81EA4DE setflag FLAG_VISITED_LAVARIDGE_TOWN call_if_set FLAG_FLANNERY_GIVES_BADGE_INFO, LavaridgeTown_EventScript_1EA514 call_if_set FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, LavaridgeTown_EventScript_1EA53F diff --git a/data/maps/LavaridgeTown_Gym_1F/scripts.inc b/data/maps/LavaridgeTown_Gym_1F/scripts.inc index bccd1dfef..bdc1da32f 100644 --- a/data/maps/LavaridgeTown_Gym_1F/scripts.inc +++ b/data/maps/LavaridgeTown_Gym_1F/scripts.inc @@ -1,8 +1,8 @@ LavaridgeTown_Gym_1F_MapScripts:: @ 81FE6F4 - map_script MAP_SCRIPT_ON_TRANSITION, LavaridgeTown_Gym_1F_MapScript1_1FE6FA + map_script MAP_SCRIPT_ON_TRANSITION, LavaridgeTown_Gym_1F_OnTransition .byte 0 -LavaridgeTown_Gym_1F_MapScript1_1FE6FA: @ 81FE6FA +LavaridgeTown_Gym_1F_OnTransition: @ 81FE6FA call LavaridgeTown_Gym_1F_EventScript_1FE705 call LavaridgeTown_Gym_1F_EventScript_1FE757 end diff --git a/data/maps/LavaridgeTown_Gym_B1F/scripts.inc b/data/maps/LavaridgeTown_Gym_B1F/scripts.inc index d2e8d90b5..4f3bb062d 100644 --- a/data/maps/LavaridgeTown_Gym_B1F/scripts.inc +++ b/data/maps/LavaridgeTown_Gym_B1F/scripts.inc @@ -1,8 +1,8 @@ LavaridgeTown_Gym_B1F_MapScripts:: @ 81FF87E - map_script MAP_SCRIPT_ON_TRANSITION, LavaridgeTown_Gym_B1F_MapScript1_1FF884 + map_script MAP_SCRIPT_ON_TRANSITION, LavaridgeTown_Gym_B1F_OnTransition .byte 0 -LavaridgeTown_Gym_B1F_MapScript1_1FF884: @ 81FF884 +LavaridgeTown_Gym_B1F_OnTransition: @ 81FF884 call LavaridgeTown_Gym_B1F_EventScript_1FF88F call LavaridgeTown_Gym_B1F_EventScript_1FF8DC end diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc index 2a0cb4a1e..4905a5bce 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc @@ -1,9 +1,9 @@ LavaridgeTown_PokemonCenter_1F_MapScripts:: @ 81FFAFA - map_script MAP_SCRIPT_ON_TRANSITION, LavaridgeTown_PokemonCenter_1F_MapScript1_1FFB05 + map_script MAP_SCRIPT_ON_TRANSITION, LavaridgeTown_PokemonCenter_1F_OnTransition map_script MAP_SCRIPT_ON_RESUME, LavaridgeTown_PokemonCenter_1F_MapScript1_277C30 .byte 0 -LavaridgeTown_PokemonCenter_1F_MapScript1_1FFB05: @ 81FFB05 +LavaridgeTown_PokemonCenter_1F_OnTransition: @ 81FFB05 setrespawn HEAL_LOCATION_LAVARIDGE_TOWN call LavaridgeTown_PokemonCenter_1F_EventScript_2718DE end diff --git a/data/maps/LavaridgeTown_PokemonCenter_2F/scripts.inc b/data/maps/LavaridgeTown_PokemonCenter_2F/scripts.inc index b022df141..c8e52468f 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_2F/scripts.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_2F/scripts.inc @@ -2,7 +2,7 @@ LavaridgeTown_PokemonCenter_2F_MapScripts:: @ 81FFC97 map_script MAP_SCRIPT_ON_FRAME_TABLE, LavaridgeTown_PokemonCenter_2F_MapScript2_276C3B map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LavaridgeTown_PokemonCenter_2F_MapScript2_276B6C map_script MAP_SCRIPT_ON_LOAD, LavaridgeTown_PokemonCenter_2F_MapScript1_276BBE - map_script MAP_SCRIPT_ON_TRANSITION, LavaridgeTown_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition .byte 0 LavaridgeTown_PokemonCenter_2F_EventScript_1FFCAC:: @ 81FFCAC diff --git a/data/maps/LilycoveCity/scripts.inc b/data/maps/LilycoveCity/scripts.inc index 7f4c9e3fd..68ffd5f99 100644 --- a/data/maps/LilycoveCity/scripts.inc +++ b/data/maps/LilycoveCity/scripts.inc @@ -1,9 +1,9 @@ LilycoveCity_MapScripts:: @ 81E2B3C - map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_MapScript1_1E2B47 + map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_OnTransition map_script MAP_SCRIPT_ON_LOAD, LilycoveCity_MapScript1_1E2B61 .byte 0 -LilycoveCity_MapScript1_1E2B47: @ 81E2B47 +LilycoveCity_OnTransition: @ 81E2B47 setflag FLAG_VISITED_LILYCOVE_CITY setvar VAR_LINK_CONTEST_ROOM_STATE, 0 setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER @@ -391,10 +391,10 @@ LilycoveCity_EventScript_1E3006:: @ 81E3006 waitmovement 0 delay 50 setfieldeffectargument 0, 1 - dofieldeffect 30 + dofieldeffect FLDEFF_NPCFLY_OUT delay 15 removeobject VAR_LAST_TALKED - waitfieldeffect 30 + waitfieldeffect FLDEFF_NPCFLY_OUT savebgm MUS_DUMMY fadedefaultbgm setflag FLAG_MET_RIVAL_LILYCOVE diff --git a/data/maps/LilycoveCity_ContestLobby/scripts.inc b/data/maps/LilycoveCity_ContestLobby/scripts.inc index d5dac8bfd..34afac0a5 100644 --- a/data/maps/LilycoveCity_ContestLobby/scripts.inc +++ b/data/maps/LilycoveCity_ContestLobby/scripts.inc @@ -1,9 +1,9 @@ LilycoveCity_ContestLobby_MapScripts:: @ 821A211 - map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_ContestLobby_MapScript1_21A21C + map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_ContestLobby_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, LilycoveCity_ContestLobby_MapScript2_21A243 .byte 0 -LilycoveCity_ContestLobby_MapScript1_21A21C: @ 821A21C +LilycoveCity_ContestLobby_OnTransition: @ 821A21C call LilycoveCity_ContestLobby_EventScript_28CB2B call LilycoveCity_ContestLobby_EventScript_21A227 end diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc index 4e292a1f9..42ced50b9 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc @@ -1,8 +1,8 @@ LilycoveCity_DepartmentStoreRooftop_MapScripts:: @ 8220207 - map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_DepartmentStoreRooftop_MapScript1_22020D + map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_DepartmentStoreRooftop_OnTransition .byte 0 -LilycoveCity_DepartmentStoreRooftop_MapScript1_22020D: @ 822020D +LilycoveCity_DepartmentStoreRooftop_OnTransition: @ 822020D getpricereduction 3 compare VAR_RESULT, 1 call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220227 @@ -30,20 +30,20 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_22022F:: @ 822022F .align 2 LilycoveCity_DepartmentStoreRooftop_PokemartDecor_220248: @ 8220248 - .2byte 39 - .2byte 35 - .2byte 36 - .2byte 37 - .2byte 40 - .2byte 33 - .2byte 41 - .2byte 38 - .2byte 34 - .2byte 45 - .2byte 46 - .2byte 47 - .2byte 117 - .2byte 112 + .2byte DECOR_MUD_BALL + .2byte DECOR_FENCE_LENGTH + .2byte DECOR_FENCE_WIDTH + .2byte DECOR_TIRE + .2byte DECOR_BREAKABLE_DOOR + .2byte DECOR_SOLID_BOARD + .2byte DECOR_SAND_ORNAMENT + .2byte DECOR_STAND + .2byte DECOR_SLIDE + .2byte DECOR_TV + .2byte DECOR_ROUND_TV + .2byte DECOR_CUTE_TV + .2byte DECOR_WAILMER_DOLL + .2byte DECOR_RHYDON_DOLL .2byte 0 release end @@ -235,4 +235,3 @@ LilycoveCity_DepartmentStoreRooftop_Text_2205F1: @ 82205F1 LilycoveCity_DepartmentStoreRooftop_Text_220603: @ 8220603 .string "Decided against buying a drink.$" - diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc index 7cab0f1fa..8dd40f4b3 100644 --- a/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc @@ -18,26 +18,26 @@ LilycoveCity_DepartmentStore_5F_EventScript_21FFA6:: @ 821FFA6 faceplayer message gUnknown_08272A21 waitmessage - pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Pokemart_21FFC0 + pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Pokemart_Dolls msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end .align 2 -LilycoveCity_DepartmentStore_5F_Pokemart_21FFC0: @ 821FFC0 - .2byte ITEM_X_DEFEND - .2byte ITEM_X_SPEED - .2byte ITEM_X_ACCURACY - .2byte ITEM_SUPER_REPEL - .2byte 91 - .2byte 92 - .2byte ITEM_SUN_STONE - .2byte ITEM_MOON_STONE - .2byte ITEM_FIRE_STONE - .2byte ITEM_THUNDER_STONE - .2byte ITEM_WATER_STONE - .2byte ITEM_LEAF_STONE - .2byte ITEM_NONE +LilycoveCity_DepartmentStore_5F_Pokemart_Dolls: @ 821FFC0 + .2byte DECOR_PICHU_DOLL + .2byte DECOR_PIKACHU_DOLL + .2byte DECOR_MARILL_DOLL + .2byte DECOR_JIGGLYPUFF_DOLL + .2byte DECOR_DUSKULL_DOLL + .2byte DECOR_WYNAUT_DOLL + .2byte DECOR_BALTOY_DOLL + .2byte DECOR_KECLEON_DOLL + .2byte DECOR_AZURILL_DOLL + .2byte DECOR_SKITTY_DOLL + .2byte DECOR_SWABLU_DOLL + .2byte DECOR_GULPIN_DOLL + .2byte DECOR_NONE release end @@ -46,23 +46,23 @@ LilycoveCity_DepartmentStore_5F_EventScript_21FFDC:: @ 821FFDC faceplayer message gUnknown_08272A21 waitmessage - pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Pokemart_21FFF4 + pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Pokemart_Cushions msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end .align 2 -LilycoveCity_DepartmentStore_5F_Pokemart_21FFF4: @ 821FFF4 - .2byte 101 - .2byte 102 - .2byte ITEM_BIG_MUSHROOM - .2byte 105 - .2byte ITEM_PEARL - .2byte ITEM_BIG_PEARL - .2byte ITEM_STARDUST - .2byte ITEM_STAR_PIECE - .2byte ITEM_NUGGET - .2byte ITEM_NONE +LilycoveCity_DepartmentStore_5F_Pokemart_Cushions: @ 821FFF4 + .2byte DECOR_PIKA_CUSHION + .2byte DECOR_ROUND_CUSHION + .2byte DECOR_ZIGZAG_CUSHION + .2byte DECOR_SPIN_CUSHION + .2byte DECOR_DIAMOND_CUSHION + .2byte DECOR_BALL_CUSHION + .2byte DECOR_GRASS_CUSHION + .2byte DECOR_FIRE_CUSHION + .2byte DECOR_WATER_CUSHION + .2byte DECOR_NONE release end @@ -71,23 +71,23 @@ LilycoveCity_DepartmentStore_5F_EventScript_22000A:: @ 822000A faceplayer message gUnknown_08272A21 waitmessage - pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Pokemart_220024 + pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Pokemart_Posters msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end .align 2 -LilycoveCity_DepartmentStore_5F_Pokemart_220024: @ 8220024 - .2byte ITEM_CARBOS - .2byte ITEM_CALCIUM - .2byte ITEM_RARE_CANDY - .2byte ITEM_PP_UP - .2byte ITEM_ZINC - .2byte ITEM_PP_MAX - .2byte 72 - .2byte ITEM_GUARD_SPEC - .2byte ITEM_DIRE_HIT - .2byte ITEM_NONE +LilycoveCity_DepartmentStore_5F_Pokemart_Posters: @ 8220024 + .2byte DECOR_BALL_POSTER + .2byte DECOR_GREEN_POSTER + .2byte DECOR_RED_POSTER + .2byte DECOR_BLUE_POSTER + .2byte DECOR_CUTE_POSTER + .2byte DECOR_PIKA_POSTER + .2byte DECOR_LONG_POSTER + .2byte DECOR_SEA_POSTER + .2byte DECOR_SKY_POSTER + .2byte DECOR_NONE release end @@ -96,24 +96,24 @@ LilycoveCity_DepartmentStore_5F_EventScript_22003A:: @ 822003A faceplayer message gUnknown_08272A21 waitmessage - pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Pokemart_220054 + pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Pokemart_Mats msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end .align 2 -LilycoveCity_DepartmentStore_5F_Pokemart_220054: @ 8220054 - .2byte 59 - .2byte 60 - .2byte 61 - .2byte 62 - .2byte ITEM_HP_UP - .2byte ITEM_PROTEIN - .2byte ITEM_IRON - .2byte ITEM_RED_SHARD - .2byte ITEM_BLUE_SHARD - .2byte ITEM_YELLOW_SHARD - .2byte ITEM_NONE +LilycoveCity_DepartmentStore_5F_Pokemart_Mats: @ 8220054 + .2byte DECOR_SURF_MAT + .2byte DECOR_THUNDER_MAT + .2byte DECOR_FIRE_BLAST_MAT + .2byte DECOR_POWDER_SNOW_MAT + .2byte DECOR_ATTRACT_MAT + .2byte DECOR_FISSURE_MAT + .2byte DECOR_SPIKES_MAT + .2byte DECOR_GLITTER_MAT + .2byte DECOR_JUMP_MAT + .2byte DECOR_SPIN_MAT + .2byte DECOR_NONE release end @@ -167,4 +167,3 @@ LilycoveCity_DepartmentStore_5F_Text_22016B: @ 822016B LilycoveCity_DepartmentStore_5F_Text_2201C4: @ 82201C4 .string "I think they closed the rooftop\n" .string "because the weather is wild today.$" - diff --git a/data/maps/LilycoveCity_Harbor/scripts.inc b/data/maps/LilycoveCity_Harbor/scripts.inc index 67b05c692..4b446c39b 100644 --- a/data/maps/LilycoveCity_Harbor/scripts.inc +++ b/data/maps/LilycoveCity_Harbor/scripts.inc @@ -1,8 +1,8 @@ LilycoveCity_Harbor_MapScripts:: @ 821E000 - map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_Harbor_MapScript1_21E006 + map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_Harbor_OnTransition .byte 0 -LilycoveCity_Harbor_MapScript1_21E006: @ 821E006 +LilycoveCity_Harbor_OnTransition: @ 821E006 setescapewarp MAP_LILYCOVE_CITY, 255, 12, 33 end diff --git a/data/maps/LilycoveCity_House3/scripts.inc b/data/maps/LilycoveCity_House3/scripts.inc index ad8989b4c..7d949fd8b 100644 --- a/data/maps/LilycoveCity_House3/scripts.inc +++ b/data/maps/LilycoveCity_House3/scripts.inc @@ -1,8 +1,8 @@ LilycoveCity_House3_MapScripts:: @ 821EE3C - map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_House3_MapScript1_21EE42 + map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_House3_OnTransition .byte 0 -LilycoveCity_House3_MapScript1_21EE42: @ 821EE42 +LilycoveCity_House3_OnTransition: @ 821EE42 random 4 copyvar VAR_TEMP_1, VAR_RESULT end diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc b/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc index 0d8da38d5..236eb3d23 100644 --- a/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc @@ -1,9 +1,9 @@ LilycoveCity_PokemonCenter_1F_MapScripts:: @ 821C5B2 - map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_PokemonCenter_1F_MapScript1_21C5BD + map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_PokemonCenter_1F_OnTransition map_script MAP_SCRIPT_ON_RESUME, LilycoveCity_PokemonCenter_1F_MapScript1_277C30 .byte 0 -LilycoveCity_PokemonCenter_1F_MapScript1_21C5BD: @ 821C5BD +LilycoveCity_PokemonCenter_1F_OnTransition: @ 821C5BD setrespawn HEAL_LOCATION_LILYCOVE_CITY goto LilycoveCity_PokemonCenter_1F_EventScript_21C5C6 end diff --git a/data/maps/LilycoveCity_PokemonCenter_2F/scripts.inc b/data/maps/LilycoveCity_PokemonCenter_2F/scripts.inc index 1e8035483..9bbf4f349 100644 --- a/data/maps/LilycoveCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/LilycoveCity_PokemonCenter_2F/scripts.inc @@ -2,7 +2,7 @@ LilycoveCity_PokemonCenter_2F_MapScripts:: @ 821C75D map_script MAP_SCRIPT_ON_FRAME_TABLE, LilycoveCity_PokemonCenter_2F_MapScript2_276C3B map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LilycoveCity_PokemonCenter_2F_MapScript2_276B6C map_script MAP_SCRIPT_ON_LOAD, LilycoveCity_PokemonCenter_2F_MapScript1_276BBE - map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition .byte 0 LilycoveCity_PokemonCenter_2F_EventScript_21C772:: @ 821C772 diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc index f83be42b9..62fdd3427 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc @@ -1,6 +1,6 @@ LilycoveCity_PokemonTrainerFanClub_MapScripts:: @ 821C785 map_script MAP_SCRIPT_ON_FRAME_TABLE, LilycoveCity_PokemonTrainerFanClub_MapScript2_21C790 - map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_PokemonTrainerFanClub_MapScript1_21C80D + map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_PokemonTrainerFanClub_OnTransition .byte 0 LilycoveCity_PokemonTrainerFanClub_MapScript2_21C790: @ 821C790 @@ -60,7 +60,7 @@ LilycoveCity_PokemonTrainerFanClub_Movement_21C807: @ 821C807 walk_in_place_fastest_down step_end -LilycoveCity_PokemonTrainerFanClub_MapScript1_21C80D: @ 821C80D +LilycoveCity_PokemonTrainerFanClub_OnTransition: @ 821C80D call LilycoveCity_PokemonTrainerFanClub_EventScript_21C8DA compare VAR_LILYCOVE_FAN_CLUB_STATE, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C9F8 diff --git a/data/maps/LinkContestRoom1/scripts.inc b/data/maps/LinkContestRoom1/scripts.inc index b81f35834..8b753471a 100644 --- a/data/maps/LinkContestRoom1/scripts.inc +++ b/data/maps/LinkContestRoom1/scripts.inc @@ -1,7 +1,7 @@ LinkContestRoom1_MapScripts:: @ 823B781 map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LinkContestRoom1_MapScript2_23B81F map_script MAP_SCRIPT_ON_FRAME_TABLE, LinkContestRoom1_MapScript2_23B815 - map_script MAP_SCRIPT_ON_TRANSITION, LinkContestRoom1_MapScript1_23B79F + map_script MAP_SCRIPT_ON_TRANSITION, LinkContestRoom1_OnTransition map_script MAP_SCRIPT_ON_RESUME, LinkContestRoom1_MapScript1_23B803 map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, LinkContestRoom1_MapScript1_23B79B .byte 0 @@ -10,7 +10,7 @@ LinkContestRoom1_MapScript1_23B79B: @ 823B79B special sub_80F8B94 end -LinkContestRoom1_MapScript1_23B79F: @ 823B79F +LinkContestRoom1_OnTransition: @ 823B79F call LinkContestRoom1_EventScript_23B7AF setvar VAR_TEMP_0, 1 call LinkContestRoom1_EventScript_23B842 diff --git a/data/maps/MagmaHideout_1F/map.json b/data/maps/MagmaHideout_1F/map.json index 2bbcf77a0..350c52b4f 100644 --- a/data/maps/MagmaHideout_1F/map.json +++ b/data/maps/MagmaHideout_1F/map.json @@ -63,7 +63,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MagmaHideout_1F_EventScript_2908BA", + "script": "EventScript_StrengthBoulder", "flag": "FLAG_TEMP_11" }, { @@ -76,7 +76,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MagmaHideout_1F_EventScript_2908BA", + "script": "EventScript_StrengthBoulder", "flag": "FLAG_TEMP_12" }, { @@ -89,7 +89,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MagmaHideout_1F_EventScript_2908BA", + "script": "EventScript_StrengthBoulder", "flag": "FLAG_TEMP_13" } ], diff --git a/data/maps/MagmaHideout_1F/scripts.inc b/data/maps/MagmaHideout_1F/scripts.inc index 0e0360990..2fe4ad581 100644 --- a/data/maps/MagmaHideout_1F/scripts.inc +++ b/data/maps/MagmaHideout_1F/scripts.inc @@ -1,8 +1,8 @@ MagmaHideout_1F_MapScripts:: @ 8239880 - map_script MAP_SCRIPT_ON_TRANSITION, MagmaHideout_1F_MapScript1_239886 + map_script MAP_SCRIPT_ON_TRANSITION, MagmaHideout_1F_OnTransition .byte 0 -MagmaHideout_1F_MapScript1_239886: @ 8239886 +MagmaHideout_1F_OnTransition: @ 8239886 setvar VAR_JAGGED_PASS_ASH_WEATHER, 0 end diff --git a/data/maps/MagmaHideout_4F/scripts.inc b/data/maps/MagmaHideout_4F/scripts.inc index 77c339b11..e6464a7f9 100644 --- a/data/maps/MagmaHideout_4F/scripts.inc +++ b/data/maps/MagmaHideout_4F/scripts.inc @@ -12,8 +12,8 @@ MagmaHideout_4F_EventScript_23A560:: @ 823A560 setfieldeffectargument 0, 18 setfieldeffectargument 1, 42 setfieldeffectargument 2, 0 - dofieldeffect 54 - waitfieldeffect 54 + dofieldeffect FLDEFF_SPARKLE + waitfieldeffect FLDEFF_SPARKLE setvar VAR_RESULT, 1 playfanfare MUS_ME_TAMA playse SE_TAMA diff --git a/data/maps/MarineCave_End/scripts.inc b/data/maps/MarineCave_End/scripts.inc index 028075648..be3a6a57b 100644 --- a/data/maps/MarineCave_End/scripts.inc +++ b/data/maps/MarineCave_End/scripts.inc @@ -1,6 +1,6 @@ MarineCave_End_MapScripts:: @ 823AFDF map_script MAP_SCRIPT_ON_RESUME, MarineCave_End_MapScript1_23AFEA - map_script MAP_SCRIPT_ON_TRANSITION, MarineCave_End_MapScript1_23B008 + map_script MAP_SCRIPT_ON_TRANSITION, MarineCave_End_OnTransition .byte 0 MarineCave_End_MapScript1_23AFEA: @ 823AFEA @@ -14,7 +14,7 @@ MarineCave_End_EventScript_23AFF4:: @ 823AFF4 removeobject 1 return -MarineCave_End_MapScript1_23B008: @ 823B008 +MarineCave_End_OnTransition: @ 823B008 call_if_unset FLAG_DEFEATED_KYOGRE, MarineCave_End_EventScript_23B012 end diff --git a/data/maps/MauvilleCity/scripts.inc b/data/maps/MauvilleCity/scripts.inc index 61839d108..445930e70 100644 --- a/data/maps/MauvilleCity/scripts.inc +++ b/data/maps/MauvilleCity/scripts.inc @@ -1,8 +1,8 @@ MauvilleCity_MapScripts:: @ 81DF385 - map_script MAP_SCRIPT_ON_TRANSITION, MauvilleCity_MapScript1_1DF38B + map_script MAP_SCRIPT_ON_TRANSITION, MauvilleCity_OnTransition .byte 0 -MauvilleCity_MapScript1_1DF38B: @ 81DF38B +MauvilleCity_OnTransition: @ 81DF38B setflag FLAG_VISITED_MAUVILLE_CITY clearflag FLAG_FORCE_MIRAGE_TOWER_VISIBLE clearflag FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc b/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc index a866e6aa4..50250de8e 100644 --- a/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc @@ -1,9 +1,9 @@ MauvilleCity_PokemonCenter_1F_MapScripts:: @ 8210E5B - map_script MAP_SCRIPT_ON_TRANSITION, MauvilleCity_PokemonCenter_1F_MapScript1_210E66 + map_script MAP_SCRIPT_ON_TRANSITION, MauvilleCity_PokemonCenter_1F_OnTransition map_script MAP_SCRIPT_ON_RESUME, MauvilleCity_PokemonCenter_1F_MapScript1_277C30 .byte 0 -MauvilleCity_PokemonCenter_1F_MapScript1_210E66: @ 8210E66 +MauvilleCity_PokemonCenter_1F_OnTransition: @ 8210E66 setrespawn HEAL_LOCATION_MAUVILLE_CITY call MauvilleCity_PokemonCenter_1F_EventScript_2718DE goto MauvilleCity_PokemonCenter_1F_EventScript_210E74 diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc b/data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc index a289886a3..c0200ea1f 100644 --- a/data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc @@ -2,7 +2,7 @@ MauvilleCity_PokemonCenter_2F_MapScripts:: @ 8211008 map_script MAP_SCRIPT_ON_FRAME_TABLE, MauvilleCity_PokemonCenter_2F_MapScript2_276C3B map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, MauvilleCity_PokemonCenter_2F_MapScript2_276B6C map_script MAP_SCRIPT_ON_LOAD, MauvilleCity_PokemonCenter_2F_MapScript1_276BBE - map_script MAP_SCRIPT_ON_TRANSITION, MauvilleCity_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition .byte 0 MauvilleCity_PokemonCenter_2F_EventScript_21101D:: @ 821101D diff --git a/data/maps/MirageTower_3F/map.json b/data/maps/MirageTower_3F/map.json index a653c6e52..c24e2a006 100644 --- a/data/maps/MirageTower_3F/map.json +++ b/data/maps/MirageTower_3F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MirageTower_3F_EventScript_2907A6", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_11" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MirageTower_3F_EventScript_2907A6", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_12" } ], diff --git a/data/maps/MirageTower_4F/map.json b/data/maps/MirageTower_4F/map.json index d6b69a14c..45e5fa62b 100644 --- a/data/maps/MirageTower_4F/map.json +++ b/data/maps/MirageTower_4F/map.json @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MirageTower_4F_EventScript_2907A6", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_11" } ], diff --git a/data/maps/MossdeepCity/scripts.inc b/data/maps/MossdeepCity/scripts.inc index 493cded0a..2da9f1f19 100644 --- a/data/maps/MossdeepCity/scripts.inc +++ b/data/maps/MossdeepCity/scripts.inc @@ -1,8 +1,8 @@ MossdeepCity_MapScripts:: @ 81E4A96 - map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_MapScript1_1E4A9C + map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_OnTransition .byte 0 -MossdeepCity_MapScript1_1E4A9C: @ 81E4A9C +MossdeepCity_OnTransition: @ 81E4A9C clearflag FLAG_MOSSDEEP_GYM_SWITCH_1 clearflag FLAG_MOSSDEEP_GYM_SWITCH_2 clearflag FLAG_MOSSDEEP_GYM_SWITCH_3 diff --git a/data/maps/MossdeepCity_House4/scripts.inc b/data/maps/MossdeepCity_House4/scripts.inc index 1763a9c46..4505b1f03 100644 --- a/data/maps/MossdeepCity_House4/scripts.inc +++ b/data/maps/MossdeepCity_House4/scripts.inc @@ -17,7 +17,7 @@ MossdeepCity_House4_EventScript_222DED:: @ 8222DED MossdeepCity_House4_EventScript_222DF7:: @ 8222DF7 lock faceplayer - special sub_80E8BC8 + special CheckPlayerHasSecretBase compare VAR_RESULT, 0 goto_if_eq MossdeepCity_House4_EventScript_222E14 special GetSecretBaseNearbyMapName diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc b/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc index 9dbead25e..3806bfc5a 100644 --- a/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc @@ -1,9 +1,9 @@ MossdeepCity_PokemonCenter_1F_MapScripts:: @ 822223F - map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_PokemonCenter_1F_MapScript1_22224A + map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_PokemonCenter_1F_OnTransition map_script MAP_SCRIPT_ON_RESUME, MossdeepCity_PokemonCenter_1F_MapScript1_277C30 .byte 0 -MossdeepCity_PokemonCenter_1F_MapScript1_22224A: @ 822224A +MossdeepCity_PokemonCenter_1F_OnTransition: @ 822224A setrespawn HEAL_LOCATION_MOSSDEEP_CITY end diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc b/data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc index 922c9a064..1c9c89fef 100644 --- a/data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc @@ -2,7 +2,7 @@ MossdeepCity_PokemonCenter_2F_MapScripts:: @ 8222334 map_script MAP_SCRIPT_ON_FRAME_TABLE, MossdeepCity_PokemonCenter_2F_MapScript2_276C3B map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, MossdeepCity_PokemonCenter_2F_MapScript2_276B6C map_script MAP_SCRIPT_ON_LOAD, MossdeepCity_PokemonCenter_2F_MapScript1_276BBE - map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition .byte 0 MossdeepCity_PokemonCenter_2F_EventScript_222349:: @ 8222349 diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc index 13bf111ba..bb60fc2f6 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc +++ b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc @@ -1,9 +1,9 @@ MossdeepCity_SpaceCenter_1F_MapScripts:: @ 8222F41 map_script MAP_SCRIPT_ON_LOAD, MossdeepCity_SpaceCenter_1F_MapScript1_222FC2 - map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_SpaceCenter_1F_MapScript1_222F4C + map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_SpaceCenter_1F_OnTransition .byte 0 -MossdeepCity_SpaceCenter_1F_MapScript1_222F4C: @ 8222F4C +MossdeepCity_SpaceCenter_1F_OnTransition: @ 8222F4C compare VAR_MOSSDEEP_STATE, 2 goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_222F58 end diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc index 41f8af97c..b258740ac 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc +++ b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc @@ -1,9 +1,9 @@ MossdeepCity_SpaceCenter_2F_MapScripts:: @ 8223D58 - map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_SpaceCenter_2F_MapScript1_223D63 + map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_SpaceCenter_2F_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, MossdeepCity_SpaceCenter_2F_MapScript2_223DB5 .byte 0 -MossdeepCity_SpaceCenter_2F_MapScript1_223D63: @ 8223D63 +MossdeepCity_SpaceCenter_2F_OnTransition: @ 8223D63 compare VAR_MOSSDEEP_STATE, 2 call_if_eq MossdeepCity_SpaceCenter_2F_EventScript_223D7A compare VAR_MOSSDEEP_SPACE_CENTER_STATE_2, 2 diff --git a/data/maps/MossdeepCity_StevensHouse/scripts.inc b/data/maps/MossdeepCity_StevensHouse/scripts.inc index b3a704443..55c32653a 100644 --- a/data/maps/MossdeepCity_StevensHouse/scripts.inc +++ b/data/maps/MossdeepCity_StevensHouse/scripts.inc @@ -1,6 +1,6 @@ MossdeepCity_StevensHouse_MapScripts:: @ 8222784 map_script MAP_SCRIPT_ON_LOAD, MossdeepCity_StevensHouse_MapScript1_222794 - map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_StevensHouse_MapScript1_2227A8 + map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_StevensHouse_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, MossdeepCity_StevensHouse_MapScript2_2227C0 .byte 0 @@ -12,7 +12,7 @@ MossdeepCity_StevensHouse_EventScript_22279E:: @ 822279E setmetatile 6, 4, 753, 1 return -MossdeepCity_StevensHouse_MapScript1_2227A8: @ 82227A8 +MossdeepCity_StevensHouse_OnTransition: @ 82227A8 compare VAR_STEVENS_HOUSE_STATE, 2 call_if_eq MossdeepCity_StevensHouse_EventScript_2227B4 end diff --git a/data/maps/MtChimney/scripts.inc b/data/maps/MtChimney/scripts.inc index db1fd59ef..d770f095c 100644 --- a/data/maps/MtChimney/scripts.inc +++ b/data/maps/MtChimney/scripts.inc @@ -1,9 +1,9 @@ MtChimney_MapScripts:: @ 822EDC1 map_script MAP_SCRIPT_ON_RESUME, MtChimney_MapScript1_22EDD2 - map_script MAP_SCRIPT_ON_TRANSITION, MtChimney_MapScript1_22EDCC + map_script MAP_SCRIPT_ON_TRANSITION, MtChimney_OnTransition .byte 0 -MtChimney_MapScript1_22EDCC: @ 822EDCC +MtChimney_OnTransition: @ 822EDCC setvar VAR_JAGGED_PASS_ASH_WEATHER, 1 end diff --git a/data/maps/MtChimney_CableCarStation/scripts.inc b/data/maps/MtChimney_CableCarStation/scripts.inc index 057001111..444f62d9f 100644 --- a/data/maps/MtChimney_CableCarStation/scripts.inc +++ b/data/maps/MtChimney_CableCarStation/scripts.inc @@ -1,9 +1,9 @@ MtChimney_CableCarStation_MapScripts:: @ 822ABFA - map_script MAP_SCRIPT_ON_TRANSITION, MtChimney_CableCarStation_MapScript1_22AC05 + map_script MAP_SCRIPT_ON_TRANSITION, MtChimney_CableCarStation_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, MtChimney_CableCarStation_MapScript2_22AC1D .byte 0 -MtChimney_CableCarStation_MapScript1_22AC05: @ 822AC05 +MtChimney_CableCarStation_OnTransition: @ 822AC05 compare VAR_CABLE_CAR_STATION_STATE, 1 call_if_eq MtChimney_CableCarStation_EventScript_22AC11 end diff --git a/data/maps/MtPyre_Exterior/scripts.inc b/data/maps/MtPyre_Exterior/scripts.inc index e24f8ea68..b66c50374 100644 --- a/data/maps/MtPyre_Exterior/scripts.inc +++ b/data/maps/MtPyre_Exterior/scripts.inc @@ -1,8 +1,8 @@ MtPyre_Exterior_MapScripts:: @ 8231FCC - map_script MAP_SCRIPT_ON_TRANSITION, MtPyre_Exterior_MapScript1_231FD2 + map_script MAP_SCRIPT_ON_TRANSITION, MtPyre_Exterior_OnTransition .byte 0 -MtPyre_Exterior_MapScript1_231FD2: @ 8231FD2 +MtPyre_Exterior_OnTransition: @ 8231FD2 call MtPyre_Exterior_EventScript_231FD8 end diff --git a/data/maps/MtPyre_Summit/scripts.inc b/data/maps/MtPyre_Summit/scripts.inc index a0da7e907..eb61c4c2d 100644 --- a/data/maps/MtPyre_Summit/scripts.inc +++ b/data/maps/MtPyre_Summit/scripts.inc @@ -1,8 +1,8 @@ MtPyre_Summit_MapScripts:: @ 8231FF7 - map_script MAP_SCRIPT_ON_TRANSITION, MtPyre_Summit_MapScript1_231FFD + map_script MAP_SCRIPT_ON_TRANSITION, MtPyre_Summit_OnTransition .byte 0 -MtPyre_Summit_MapScript1_231FFD: @ 8231FFD +MtPyre_Summit_OnTransition: @ 8231FFD compare VAR_MT_PYRE_STATE, 2 call_if_eq MtPyre_Summit_EventScript_232009 end diff --git a/data/maps/NavelRock_Bottom/scripts.inc b/data/maps/NavelRock_Bottom/scripts.inc index 8a617236c..f3c244e3d 100644 --- a/data/maps/NavelRock_Bottom/scripts.inc +++ b/data/maps/NavelRock_Bottom/scripts.inc @@ -1,9 +1,9 @@ NavelRock_Bottom_MapScripts:: @ 8269255 - map_script MAP_SCRIPT_ON_TRANSITION, NavelRock_Bottom_MapScript1_269260 + map_script MAP_SCRIPT_ON_TRANSITION, NavelRock_Bottom_OnTransition map_script MAP_SCRIPT_ON_RESUME, NavelRock_Bottom_MapScript1_269284 .byte 0 -NavelRock_Bottom_MapScript1_269260: @ 8269260 +NavelRock_Bottom_OnTransition: @ 8269260 call_if_set FLAG_CAUGHT_LUGIA, NavelRock_Bottom_EventScript_269273 call_if_unset FLAG_CAUGHT_LUGIA, NavelRock_Bottom_EventScript_269277 end diff --git a/data/maps/NavelRock_Exterior/scripts.inc b/data/maps/NavelRock_Exterior/scripts.inc index 33bbb6391..827408068 100644 --- a/data/maps/NavelRock_Exterior/scripts.inc +++ b/data/maps/NavelRock_Exterior/scripts.inc @@ -1,8 +1,8 @@ NavelRock_Exterior_MapScripts:: @ 82690B2 - map_script MAP_SCRIPT_ON_TRANSITION, NavelRock_Exterior_MapScript1_2690B8 + map_script MAP_SCRIPT_ON_TRANSITION, NavelRock_Exterior_OnTransition .byte 0 -NavelRock_Exterior_MapScript1_2690B8: @ 82690B8 +NavelRock_Exterior_OnTransition: @ 82690B8 setflag FLAG_ARRIVED_AT_NAVEL_ROCK end diff --git a/data/maps/NavelRock_Top/scripts.inc b/data/maps/NavelRock_Top/scripts.inc index af011e058..816e20206 100644 --- a/data/maps/NavelRock_Top/scripts.inc +++ b/data/maps/NavelRock_Top/scripts.inc @@ -1,9 +1,9 @@ NavelRock_Top_MapScripts:: @ 8269113 - map_script MAP_SCRIPT_ON_TRANSITION, NavelRock_Top_MapScript1_26911E + map_script MAP_SCRIPT_ON_TRANSITION, NavelRock_Top_OnTransition map_script MAP_SCRIPT_ON_RESUME, NavelRock_Top_MapScript1_269151 .byte 0 -NavelRock_Top_MapScript1_26911E: @ 826911E +NavelRock_Top_OnTransition: @ 826911E call_if_set FLAG_CAUGHT_HO_OH, NavelRock_Top_EventScript_269131 call_if_unset FLAG_CAUGHT_HO_OH, NavelRock_Top_EventScript_26913A end diff --git a/data/maps/NewMauville_Inside/scripts.inc b/data/maps/NewMauville_Inside/scripts.inc index 15d2cb02a..0582e2a32 100644 --- a/data/maps/NewMauville_Inside/scripts.inc +++ b/data/maps/NewMauville_Inside/scripts.inc @@ -1,6 +1,6 @@ NewMauville_Inside_MapScripts:: @ 82373D7 map_script MAP_SCRIPT_ON_RESUME, NewMauville_Inside_MapScript1_2373E7 - map_script MAP_SCRIPT_ON_TRANSITION, NewMauville_Inside_MapScript1_23741B + map_script MAP_SCRIPT_ON_TRANSITION, NewMauville_Inside_OnTransition map_script MAP_SCRIPT_ON_LOAD, NewMauville_Inside_MapScript1_23744D .byte 0 @@ -19,7 +19,7 @@ NewMauville_Inside_EventScript_237407:: @ 8237407 removeobject VAR_LAST_TALKED return -NewMauville_Inside_MapScript1_23741B: @ 823741B +NewMauville_Inside_OnTransition: @ 823741B setvar VAR_TEMP_1, 0 setvar VAR_TEMP_2, 0 call_if_unset FLAG_DEFEATED_VOLTORB_1_NEW_MAUVILLE, NewMauville_Inside_EventScript_237441 diff --git a/data/maps/OldaleTown/scripts.inc b/data/maps/OldaleTown/scripts.inc index c68ecbd08..3a8b8046b 100644 --- a/data/maps/OldaleTown/scripts.inc +++ b/data/maps/OldaleTown/scripts.inc @@ -1,8 +1,8 @@ OldaleTown_MapScripts:: @ 81E8EA2 - map_script MAP_SCRIPT_ON_TRANSITION, OldaleTown_MapScript1_1E8EA8 + map_script MAP_SCRIPT_ON_TRANSITION, OldaleTown_OnTransition .byte 0 -OldaleTown_MapScript1_1E8EA8: @ 81E8EA8 +OldaleTown_OnTransition: @ 81E8EA8 call Common_EventScript_SetupRivalGender setflag FLAG_VISITED_OLDALE_TOWN call_if_unset FLAG_ADVENTURE_STARTED, OldaleTown_EventScript_1E8ED2 diff --git a/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc b/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc index 49452da71..2396573dc 100644 --- a/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc @@ -1,9 +1,9 @@ OldaleTown_PokemonCenter_1F_MapScripts:: @ 81FC006 - map_script MAP_SCRIPT_ON_TRANSITION, OldaleTown_PokemonCenter_1F_MapScript1_1FC011 + map_script MAP_SCRIPT_ON_TRANSITION, OldaleTown_PokemonCenter_1F_OnTransition map_script MAP_SCRIPT_ON_RESUME, OldaleTown_PokemonCenter_1F_MapScript1_277C30 .byte 0 -OldaleTown_PokemonCenter_1F_MapScript1_1FC011: @ 81FC011 +OldaleTown_PokemonCenter_1F_OnTransition: @ 81FC011 setrespawn HEAL_LOCATION_OLDALE_TOWN call OldaleTown_PokemonCenter_1F_EventScript_2718DE end diff --git a/data/maps/OldaleTown_PokemonCenter_2F/scripts.inc b/data/maps/OldaleTown_PokemonCenter_2F/scripts.inc index b6795876b..aead0bd65 100644 --- a/data/maps/OldaleTown_PokemonCenter_2F/scripts.inc +++ b/data/maps/OldaleTown_PokemonCenter_2F/scripts.inc @@ -2,7 +2,7 @@ OldaleTown_PokemonCenter_2F_MapScripts:: @ 81FC218 map_script MAP_SCRIPT_ON_FRAME_TABLE, OldaleTown_PokemonCenter_2F_MapScript2_276C3B map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, OldaleTown_PokemonCenter_2F_MapScript2_276B6C map_script MAP_SCRIPT_ON_LOAD, OldaleTown_PokemonCenter_2F_MapScript1_276BBE - map_script MAP_SCRIPT_ON_TRANSITION, OldaleTown_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition .byte 0 OldaleTown_PokemonCenter_2F_EventScript_1FC22D:: @ 81FC22D diff --git a/data/maps/PacifidlogTown/scripts.inc b/data/maps/PacifidlogTown/scripts.inc index 0ae0a53a8..1d1518c0a 100644 --- a/data/maps/PacifidlogTown/scripts.inc +++ b/data/maps/PacifidlogTown/scripts.inc @@ -1,9 +1,9 @@ PacifidlogTown_MapScripts:: @ 81EBAB1 - map_script MAP_SCRIPT_ON_TRANSITION, PacifidlogTown_MapScript1_1EBABC + map_script MAP_SCRIPT_ON_TRANSITION, PacifidlogTown_OnTransition map_script MAP_SCRIPT_ON_RESUME, PacifidlogTown_MapScript1_1EBAC0 .byte 0 -PacifidlogTown_MapScript1_1EBABC: @ 81EBABC +PacifidlogTown_OnTransition: @ 81EBABC setflag FLAG_VISITED_PACIFIDLOG_TOWN end diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc index 89fec7f6b..f4fe115e5 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc @@ -1,9 +1,9 @@ PacifidlogTown_PokemonCenter_1F_MapScripts:: @ 82034A7 - map_script MAP_SCRIPT_ON_TRANSITION, PacifidlogTown_PokemonCenter_1F_MapScript1_2034B2 + map_script MAP_SCRIPT_ON_TRANSITION, PacifidlogTown_PokemonCenter_1F_OnTransition map_script MAP_SCRIPT_ON_RESUME, PacifidlogTown_PokemonCenter_1F_MapScript1_277C30 .byte 0 -PacifidlogTown_PokemonCenter_1F_MapScript1_2034B2: @ 82034B2 +PacifidlogTown_PokemonCenter_1F_OnTransition: @ 82034B2 setrespawn HEAL_LOCATION_PACIFIDLOG_TOWN end diff --git a/data/maps/PacifidlogTown_PokemonCenter_2F/scripts.inc b/data/maps/PacifidlogTown_PokemonCenter_2F/scripts.inc index cb28d577e..fcb4f1ab4 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_2F/scripts.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_2F/scripts.inc @@ -2,7 +2,7 @@ PacifidlogTown_PokemonCenter_2F_MapScripts:: @ 8203635 map_script MAP_SCRIPT_ON_FRAME_TABLE, PacifidlogTown_PokemonCenter_2F_MapScript2_276C3B map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PacifidlogTown_PokemonCenter_2F_MapScript2_276B6C map_script MAP_SCRIPT_ON_LOAD, PacifidlogTown_PokemonCenter_2F_MapScript1_276BBE - map_script MAP_SCRIPT_ON_TRANSITION, PacifidlogTown_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition .byte 0 PacifidlogTown_PokemonCenter_2F_EventScript_20364A:: @ 820364A diff --git a/data/maps/PetalburgCity/scripts.inc b/data/maps/PetalburgCity/scripts.inc index c8b723383..59e28734d 100644 --- a/data/maps/PetalburgCity/scripts.inc +++ b/data/maps/PetalburgCity/scripts.inc @@ -1,9 +1,9 @@ PetalburgCity_MapScripts:: - map_script MAP_SCRIPT_ON_TRANSITION, PetalburgCity_MapScript1_1DC2D7 + map_script MAP_SCRIPT_ON_TRANSITION, PetalburgCity_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, PetalburgCity_MapScript2_1DC31C .byte 0 -PetalburgCity_MapScript1_1DC2D7: @ 81DC2D7 +PetalburgCity_OnTransition: @ 81DC2D7 setflag FLAG_VISITED_PETALBURG_CITY compare VAR_PETALBURG_STATE, 0 call_if_eq PetalburgCity_EventScript_1DC307 diff --git a/data/maps/PetalburgCity_Gym/scripts.inc b/data/maps/PetalburgCity_Gym/scripts.inc index a256a6547..f5d1f3ff6 100644 --- a/data/maps/PetalburgCity_Gym/scripts.inc +++ b/data/maps/PetalburgCity_Gym/scripts.inc @@ -1,11 +1,11 @@ PetalburgCity_Gym_MapScripts:: @ 8204889 - map_script MAP_SCRIPT_ON_LOAD, PetalburgCity_Gym_MapScript1_20489E + map_script MAP_SCRIPT_ON_LOAD, PetalburgCity_Gym_OnTransition map_script MAP_SCRIPT_ON_TRANSITION, PetalburgCity_Gym_MapScript1_20492D map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PetalburgCity_Gym_MapScript2_20498B map_script MAP_SCRIPT_ON_FRAME_TABLE, PetalburgCity_Gym_MapScript2_20499A .byte 0 -PetalburgCity_Gym_MapScript1_20489E: @ 820489E +PetalburgCity_Gym_OnTransition: @ 820489E compare VAR_PETALBURG_GYM_STATE, 6 goto_if_eq PetalburgCity_Gym_EventScript_2048B5 compare VAR_PETALBURG_GYM_STATE, 7 diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc b/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc index 382847bc7..286b9f7d9 100644 --- a/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc @@ -1,9 +1,9 @@ PetalburgCity_PokemonCenter_1F_MapScripts:: @ 82079E8 - map_script MAP_SCRIPT_ON_TRANSITION, PetalburgCity_PokemonCenter_1F_MapScript1_2079F3 + map_script MAP_SCRIPT_ON_TRANSITION, PetalburgCity_PokemonCenter_1F_OnTransition map_script MAP_SCRIPT_ON_RESUME, PetalburgCity_PokemonCenter_1F_MapScript1_277C30 .byte 0 -PetalburgCity_PokemonCenter_1F_MapScript1_2079F3: @ 82079F3 +PetalburgCity_PokemonCenter_1F_OnTransition: @ 82079F3 setrespawn HEAL_LOCATION_PETALBURG_CITY call PetalburgCity_PokemonCenter_1F_EventScript_2718DE end diff --git a/data/maps/PetalburgCity_PokemonCenter_2F/scripts.inc b/data/maps/PetalburgCity_PokemonCenter_2F/scripts.inc index 7b5f5af55..d2370c6b1 100644 --- a/data/maps/PetalburgCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/PetalburgCity_PokemonCenter_2F/scripts.inc @@ -2,7 +2,7 @@ PetalburgCity_PokemonCenter_2F_MapScripts:: @ 8207D41 map_script MAP_SCRIPT_ON_FRAME_TABLE, PetalburgCity_PokemonCenter_2F_MapScript2_276C3B map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PetalburgCity_PokemonCenter_2F_MapScript2_276B6C map_script MAP_SCRIPT_ON_LOAD, PetalburgCity_PokemonCenter_2F_MapScript1_276BBE - map_script MAP_SCRIPT_ON_TRANSITION, PetalburgCity_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition .byte 0 PetalburgCity_PokemonCenter_2F_EventScript_207D56:: @ 8207D56 diff --git a/data/maps/PetalburgWoods/map.json b/data/maps/PetalburgWoods/map.json index 6d1bc22a5..7e7de784a 100644 --- a/data/maps/PetalburgWoods/map.json +++ b/data/maps/PetalburgWoods/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgWoods_EventScript_2906BB", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_11" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "PetalburgWoods_EventScript_2906BB", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_12" }, { diff --git a/data/maps/Route101/scripts.inc b/data/maps/Route101/scripts.inc index 47663e1dd..73bfe570c 100644 --- a/data/maps/Route101/scripts.inc +++ b/data/maps/Route101/scripts.inc @@ -1,9 +1,9 @@ Route101_MapScripts:: @ 81EBCBA - map_script MAP_SCRIPT_ON_TRANSITION, Route101_MapScript1_1EBCC5 + map_script MAP_SCRIPT_ON_TRANSITION, Route101_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, Route101_MapScript2_1EBCCB .byte 0 -Route101_MapScript1_1EBCC5: @ 81EBCC5 +Route101_OnTransition: @ 81EBCC5 call Route101_EventScript_2720AD end diff --git a/data/maps/Route103/map.json b/data/maps/Route103/map.json index 91004d1ab..bf207ec2f 100644 --- a/data/maps/Route103/map.json +++ b/data/maps/Route103/map.json @@ -204,7 +204,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route103_EventScript_2906BB", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_12" }, { @@ -217,7 +217,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route103_EventScript_2906BB", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_13" }, { diff --git a/data/maps/Route103/scripts.inc b/data/maps/Route103/scripts.inc index f711416fd..710f26e7c 100644 --- a/data/maps/Route103/scripts.inc +++ b/data/maps/Route103/scripts.inc @@ -1,9 +1,9 @@ Route103_MapScripts:: @ 81EC38E - map_script MAP_SCRIPT_ON_TRANSITION, Route103_MapScript1_1EC399 + map_script MAP_SCRIPT_ON_TRANSITION, Route103_OnTransition map_script MAP_SCRIPT_ON_LOAD, Route103_MapScript1_1EC3A4 .byte 0 -Route103_MapScript1_1EC399: @ 81EC399 +Route103_OnTransition: @ 81EC399 call Common_EventScript_SetupRivalGender call Route103_EventScript_2720AD end diff --git a/data/maps/Route104/map.json b/data/maps/Route104/map.json index 7bfe6e164..d2c7cc146 100644 --- a/data/maps/Route104/map.json +++ b/data/maps/Route104/map.json @@ -417,7 +417,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route104_EventScript_2906BB", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_11" }, { diff --git a/data/maps/Route104/scripts.inc b/data/maps/Route104/scripts.inc index 1daa9e52c..33200b800 100644 --- a/data/maps/Route104/scripts.inc +++ b/data/maps/Route104/scripts.inc @@ -1,6 +1,6 @@ Route104_MapScripts:: @ 81ECC32 map_script MAP_SCRIPT_ON_FRAME_TABLE, Route104_MapScript2_1ECC3D - map_script MAP_SCRIPT_ON_TRANSITION, Route104_MapScript1_1ECC4E + map_script MAP_SCRIPT_ON_TRANSITION, Route104_OnTransition .byte 0 Route104_MapScript2_1ECC3D: @ 81ECC3D @@ -12,7 +12,7 @@ Route104_EventScript_1ECC47:: @ 81ECC47 goto Route104_EventScript_1ED099 end -Route104_MapScript1_1ECC4E: @ 81ECC4E +Route104_OnTransition: @ 81ECC4E call Common_EventScript_SetupRivalGender call Route104_EventScript_1ECC78 call Route104_EventScript_1ECC5E diff --git a/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc b/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc index 2a8a8b88e..b4d10cf0f 100644 --- a/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc +++ b/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc @@ -48,20 +48,20 @@ Route104_PrettyPetalFlowerShop_EventScript_22A3DB:: @ 822A3DB Route104_PrettyPetalFlowerShop_EventScript_22A3E4:: @ 822A3E4 message gUnknown_08272A52 waitmessage - pokemartdecoration2 Route104_PrettyPetalFlowerShop_Pokemart_22A3FC + pokemartdecoration2 Route104_PrettyPetalFlowerShop_Pokemart_Plants msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end .align 2 -Route104_PrettyPetalFlowerShop_Pokemart_22A3FC: @ 822A3FC - .2byte ITEM_FULL_RESTORE - .2byte ITEM_MAX_POTION - .2byte ITEM_HYPER_POTION - .2byte ITEM_SUPER_POTION - .2byte ITEM_FULL_HEAL - .2byte ITEM_REVIVE - .2byte ITEM_NONE +Route104_PrettyPetalFlowerShop_Pokemart_Plants: @ 822A3FC + .2byte DECOR_RED_PLANT + .2byte DECOR_TROPICAL_PLANT + .2byte DECOR_PRETTY_FLOWERS + .2byte DECOR_COLORFUL_PLANT + .2byte DECOR_BIG_PLANT + .2byte DECOR_GORGEOUS_PLANT + .2byte DECOR_NONE release end @@ -101,4 +101,3 @@ Route104_PrettyPetalFlowerShop_EventScript_22A482:: @ 822A482 msgbox Route104_PrettyPetalFlowerShop_Text_2A7AF3, MSGBOX_DEFAULT release end - diff --git a/data/maps/Route105/scripts.inc b/data/maps/Route105/scripts.inc index 2b8ebe305..041a64709 100644 --- a/data/maps/Route105/scripts.inc +++ b/data/maps/Route105/scripts.inc @@ -1,6 +1,6 @@ Route105_MapScripts:: @ 81EE1DB map_script MAP_SCRIPT_ON_LOAD, Route105_MapScript1_1EE1EB - map_script MAP_SCRIPT_ON_TRANSITION, Route105_MapScript1_1EE21E + map_script MAP_SCRIPT_ON_TRANSITION, Route105_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, Route105_MapScript2_1EE240 .byte 0 @@ -17,7 +17,7 @@ Route105_EventScript_1EE20B:: @ 81EE20B setmetatile 9, 20, 145, 1 return -Route105_MapScript1_1EE21E: @ 81EE21E +Route105_OnTransition: @ 81EE21E compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1 call_if_eq Route105_EventScript_273D13 compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_105_NORTH diff --git a/data/maps/Route110/scripts.inc b/data/maps/Route110/scripts.inc index cddfbebcc..bc4768207 100644 --- a/data/maps/Route110/scripts.inc +++ b/data/maps/Route110/scripts.inc @@ -1,6 +1,6 @@ Route110_MapScripts:: @ 81EF269 map_script MAP_SCRIPT_ON_RESUME, Route110_MapScript1_1EF279 - map_script MAP_SCRIPT_ON_TRANSITION, Route110_MapScript1_1EF27D + map_script MAP_SCRIPT_ON_TRANSITION, Route110_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, Route110_MapScript2_1EF297 .byte 0 @@ -8,7 +8,7 @@ Route110_MapScript1_1EF279: @ 81EF279 special UpdateCyclingRoadState end -Route110_MapScript1_1EF27D: @ 81EF27D +Route110_OnTransition: @ 81EF27D call Common_EventScript_SetupRivalGender call Common_EventScript_SetupRivalOnBikeGender compare VAR_CYCLING_CHALLENGE_STATE, 1 diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc index 1d353dcdd..1d0ca55bb 100644 --- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc @@ -1,8 +1,8 @@ Route110_SeasideCyclingRoadSouthEntrance_MapScripts:: @ 826EBA1 - map_script MAP_SCRIPT_ON_TRANSITION, Route110_SeasideCyclingRoadSouthEntrance_MapScript1_26EBA7 + map_script MAP_SCRIPT_ON_TRANSITION, Route110_SeasideCyclingRoadSouthEntrance_OnTransition .byte 0 -Route110_SeasideCyclingRoadSouthEntrance_MapScript1_26EBA7: @ 826EBA7 +Route110_SeasideCyclingRoadSouthEntrance_OnTransition: @ 826EBA7 compare VAR_CYCLING_CHALLENGE_STATE, 3 call_if_eq Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBBE compare VAR_CYCLING_CHALLENGE_STATE, 2 diff --git a/data/maps/Route110_TrickHouseCorridor/scripts.inc b/data/maps/Route110_TrickHouseCorridor/scripts.inc index 996f9d605..80a6ac3dd 100644 --- a/data/maps/Route110_TrickHouseCorridor/scripts.inc +++ b/data/maps/Route110_TrickHouseCorridor/scripts.inc @@ -1,8 +1,8 @@ Route110_TrickHouseCorridor_MapScripts:: @ 826B903 - map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHouseCorridor_MapScript1_26B909 + map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHouseCorridor_OnTransition .byte 0 -Route110_TrickHouseCorridor_MapScript1_26B909: @ 826B909 +Route110_TrickHouseCorridor_OnTransition: @ 826B909 setvar VAR_TRICK_HOUSE_STATE, 1 end diff --git a/data/maps/Route110_TrickHouseEnd/scripts.inc b/data/maps/Route110_TrickHouseEnd/scripts.inc index 3ce8cfd5e..1c1aa76b4 100644 --- a/data/maps/Route110_TrickHouseEnd/scripts.inc +++ b/data/maps/Route110_TrickHouseEnd/scripts.inc @@ -1,6 +1,6 @@ Route110_TrickHouseEnd_MapScripts:: @ 826ACAF map_script MAP_SCRIPT_ON_RESUME, Route110_TrickHouseEnd_MapScript1_26ACC4 - map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHouseEnd_MapScript1_26ACD0 + map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHouseEnd_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, Route110_TrickHouseEnd_MapScript2_26ACF5 map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route110_TrickHouseEnd_MapScript2_26ACDE .byte 0 @@ -10,7 +10,7 @@ Route110_TrickHouseEnd_MapScript1_26ACC4: @ 826ACC4 call_if_eq Route110_TrickHouseEnd_EventScript_26AD0D end -Route110_TrickHouseEnd_MapScript1_26ACD0: @ 826ACD0 +Route110_TrickHouseEnd_OnTransition: @ 826ACD0 setvar VAR_TEMP_1, 0 setvar VAR_TEMP_2, 0 special SetTrickHouseEndRoomFlag diff --git a/data/maps/Route110_TrickHouseEntrance/scripts.inc b/data/maps/Route110_TrickHouseEntrance/scripts.inc index 46610937e..aae615a62 100644 --- a/data/maps/Route110_TrickHouseEntrance/scripts.inc +++ b/data/maps/Route110_TrickHouseEntrance/scripts.inc @@ -759,8 +759,8 @@ Route110_TrickHouseEntrance_EventScript_26A459:: @ 826A459 setfieldeffectargument 0, VAR_0x8004 setfieldeffectargument 1, VAR_0x8005 setfieldeffectargument 2, VAR_0x8006 - dofieldeffect 54 - waitfieldeffect 54 + dofieldeffect FLDEFF_SPARKLE + waitfieldeffect FLDEFF_SPARKLE delay 10 return diff --git a/data/maps/Route110_TrickHousePuzzle1/map.json b/data/maps/Route110_TrickHousePuzzle1/map.json index c6609d103..18dc10027 100644 --- a/data/maps/Route110_TrickHousePuzzle1/map.json +++ b/data/maps/Route110_TrickHousePuzzle1/map.json @@ -63,7 +63,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route110_TrickHousePuzzle1_EventScript_2906BB", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_13" }, { @@ -76,7 +76,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route110_TrickHousePuzzle1_EventScript_2906BB", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_12" }, { @@ -89,7 +89,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route110_TrickHousePuzzle1_EventScript_2906BB", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_14" }, { @@ -102,7 +102,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route110_TrickHousePuzzle1_EventScript_2906BB", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_17" }, { @@ -115,7 +115,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route110_TrickHousePuzzle1_EventScript_2906BB", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_16" }, { @@ -128,7 +128,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route110_TrickHousePuzzle1_EventScript_2906BB", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_15" }, { @@ -141,7 +141,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route110_TrickHousePuzzle1_EventScript_2906BB", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_19" }, { @@ -154,7 +154,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route110_TrickHousePuzzle1_EventScript_2906BB", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_18" }, { @@ -167,7 +167,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route110_TrickHousePuzzle1_EventScript_2906BB", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_1B" }, { @@ -193,7 +193,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route110_TrickHousePuzzle1_EventScript_2906BB", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_1C" }, { @@ -206,7 +206,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route110_TrickHousePuzzle1_EventScript_2906BB", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_1E" } ], diff --git a/data/maps/Route110_TrickHousePuzzle2/scripts.inc b/data/maps/Route110_TrickHousePuzzle2/scripts.inc index 2c8ef8cb0..057f6ea32 100644 --- a/data/maps/Route110_TrickHousePuzzle2/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle2/scripts.inc @@ -1,6 +1,6 @@ Route110_TrickHousePuzzle2_MapScripts:: @ 826BB73 map_script MAP_SCRIPT_ON_RESUME, Route110_TrickHousePuzzle2_MapScript1_26BB7E - map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHousePuzzle2_MapScript1_26BBAB + map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHousePuzzle2_OnTransition .byte 0 Route110_TrickHousePuzzle2_MapScript1_26BB7E: @ 826BB7E @@ -14,7 +14,7 @@ Route110_TrickHousePuzzle2_MapScript1_26BB7E: @ 826BB7E call_if_eq Route110_TrickHousePuzzle2_EventScript_26BC62 end -Route110_TrickHousePuzzle2_MapScript1_26BBAB: @ 826BBAB +Route110_TrickHousePuzzle2_OnTransition: @ 826BBAB setvar VAR_TEMP_1, 0 setvar VAR_TEMP_2, 0 setvar VAR_TEMP_3, 0 diff --git a/data/maps/Route110_TrickHousePuzzle3/map.json b/data/maps/Route110_TrickHousePuzzle3/map.json index e69580793..a37498fd2 100644 --- a/data/maps/Route110_TrickHousePuzzle3/map.json +++ b/data/maps/Route110_TrickHousePuzzle3/map.json @@ -89,7 +89,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route110_TrickHousePuzzle3_EventScript_2907A6", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_15" }, { @@ -102,7 +102,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route110_TrickHousePuzzle3_EventScript_2907A6", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_16" } ], diff --git a/data/maps/Route110_TrickHousePuzzle3/scripts.inc b/data/maps/Route110_TrickHousePuzzle3/scripts.inc index d93ef95e8..48b81e0cc 100644 --- a/data/maps/Route110_TrickHousePuzzle3/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle3/scripts.inc @@ -1,6 +1,6 @@ Route110_TrickHousePuzzle3_MapScripts:: @ 826BED8 map_script MAP_SCRIPT_ON_RESUME, Route110_TrickHousePuzzle3_MapScript1_26BEE3 - map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHousePuzzle3_MapScript1_26BEFF + map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHousePuzzle3_OnTransition .byte 0 Route110_TrickHousePuzzle3_MapScript1_26BEE3: @ 826BEE3 @@ -11,7 +11,7 @@ Route110_TrickHousePuzzle3_MapScript1_26BEE3: @ 826BEE3 call_if_eq Route110_TrickHousePuzzle3_EventScript_26C232 end -Route110_TrickHousePuzzle3_MapScript1_26BEFF: @ 826BEFF +Route110_TrickHousePuzzle3_OnTransition: @ 826BEFF setvar VAR_TEMP_1, 0 setvar VAR_TEMP_2, 0 setvar VAR_TEMP_3, 0 diff --git a/data/maps/Route110_TrickHousePuzzle4/map.json b/data/maps/Route110_TrickHousePuzzle4/map.json index 47238a559..f77fa9b22 100644 --- a/data/maps/Route110_TrickHousePuzzle4/map.json +++ b/data/maps/Route110_TrickHousePuzzle4/map.json @@ -76,7 +76,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route110_TrickHousePuzzle4_EventScript_2908BA", + "script": "EventScript_StrengthBoulder", "flag": "FLAG_TEMP_11" }, { @@ -89,7 +89,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route110_TrickHousePuzzle4_EventScript_2908BA", + "script": "EventScript_StrengthBoulder", "flag": "FLAG_TEMP_12" }, { @@ -102,7 +102,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route110_TrickHousePuzzle4_EventScript_2908BA", + "script": "EventScript_StrengthBoulder", "flag": "FLAG_TEMP_13" }, { @@ -115,7 +115,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route110_TrickHousePuzzle4_EventScript_2908BA", + "script": "EventScript_StrengthBoulder", "flag": "FLAG_TEMP_14" }, { @@ -128,7 +128,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route110_TrickHousePuzzle4_EventScript_2908BA", + "script": "EventScript_StrengthBoulder", "flag": "FLAG_TEMP_15" }, { @@ -141,7 +141,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route110_TrickHousePuzzle4_EventScript_2908BA", + "script": "EventScript_StrengthBoulder", "flag": "FLAG_TEMP_16" }, { @@ -154,7 +154,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route110_TrickHousePuzzle4_EventScript_2908BA", + "script": "EventScript_StrengthBoulder", "flag": "FLAG_TEMP_17" }, { @@ -167,7 +167,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route110_TrickHousePuzzle4_EventScript_2908BA", + "script": "EventScript_StrengthBoulder", "flag": "FLAG_TEMP_18" }, { @@ -180,7 +180,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route110_TrickHousePuzzle4_EventScript_2908BA", + "script": "EventScript_StrengthBoulder", "flag": "FLAG_TEMP_19" }, { @@ -193,7 +193,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route110_TrickHousePuzzle4_EventScript_2908BA", + "script": "EventScript_StrengthBoulder", "flag": "FLAG_TEMP_1A" } ], diff --git a/data/maps/Route110_TrickHousePuzzle5/scripts.inc b/data/maps/Route110_TrickHousePuzzle5/scripts.inc index 86b950e8a..9ae8dc759 100644 --- a/data/maps/Route110_TrickHousePuzzle5/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle5/scripts.inc @@ -1,8 +1,8 @@ Route110_TrickHousePuzzle5_MapScripts:: @ 826CAF0 - map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHousePuzzle5_MapScript1_26CAF6 + map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHousePuzzle5_OnTransition .byte 0 -Route110_TrickHousePuzzle5_MapScript1_26CAF6: @ 826CAF6 +Route110_TrickHousePuzzle5_OnTransition: @ 826CAF6 setvar VAR_TEMP_1, 0 setvar VAR_TEMP_2, 0 setvar VAR_TEMP_3, 0 diff --git a/data/maps/Route110_TrickHousePuzzle6/scripts.inc b/data/maps/Route110_TrickHousePuzzle6/scripts.inc index a5b433d13..685a0170b 100644 --- a/data/maps/Route110_TrickHousePuzzle6/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle6/scripts.inc @@ -1,9 +1,9 @@ Route110_TrickHousePuzzle6_MapScripts:: @ 826DDA7 - map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHousePuzzle6_MapScript1_26DDB2 + map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHousePuzzle6_OnTransition map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route110_TrickHousePuzzle6_MapScript2_26DDB6 .byte 0 -Route110_TrickHousePuzzle6_MapScript1_26DDB2: @ 826DDB2 +Route110_TrickHousePuzzle6_OnTransition: @ 826DDB2 special RotatingGate_InitPuzzle end diff --git a/data/maps/Route110_TrickHousePuzzle7/scripts.inc b/data/maps/Route110_TrickHousePuzzle7/scripts.inc index b4bd782cf..27177ed22 100644 --- a/data/maps/Route110_TrickHousePuzzle7/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle7/scripts.inc @@ -1,6 +1,6 @@ Route110_TrickHousePuzzle7_MapScripts:: @ 826E091 map_script MAP_SCRIPT_ON_RESUME, Route110_TrickHousePuzzle7_MapScript1_26E0A6 - map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHousePuzzle7_MapScript1_26E198 + map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHousePuzzle7_OnTransition map_script MAP_SCRIPT_ON_LOAD, Route110_TrickHousePuzzle7_MapScript1_26E1B4 map_script MAP_SCRIPT_ON_FRAME_TABLE, Route110_TrickHousePuzzle7_MapScript2_26E1C0 .byte 0 @@ -67,7 +67,7 @@ Route110_TrickHousePuzzle7_EventScript_26E185:: @ 826E185 setmetatile 7, 5, 574, 1 return -Route110_TrickHousePuzzle7_MapScript1_26E198: @ 826E198 +Route110_TrickHousePuzzle7_OnTransition: @ 826E198 compare VAR_TRICK_HOUSE_PUZZLE_7_STATE_2, 1 goto_if_eq Route110_TrickHousePuzzle7_EventScript_26E1B3 clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1 diff --git a/data/maps/Route111/map.json b/data/maps/Route111/map.json index d3428f8c6..ef7e29999 100644 --- a/data/maps/Route111/map.json +++ b/data/maps/Route111/map.json @@ -222,7 +222,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route111_EventScript_2907A6", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_11" }, { @@ -235,7 +235,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route111_EventScript_2907A6", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_12" }, { @@ -378,7 +378,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route111_EventScript_2906BB", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_13" }, { diff --git a/data/maps/Route111/scripts.inc b/data/maps/Route111/scripts.inc index 3755ee5e4..8371071da 100644 --- a/data/maps/Route111/scripts.inc +++ b/data/maps/Route111/scripts.inc @@ -1,6 +1,6 @@ Route111_MapScripts:: @ 81F0CA7 map_script MAP_SCRIPT_ON_LOAD, Route111_MapScript1_1F0CBC - map_script MAP_SCRIPT_ON_TRANSITION, Route111_MapScript1_1F0D87 + map_script MAP_SCRIPT_ON_TRANSITION, Route111_OnTransition map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route111_MapScript2_1F0E46 map_script MAP_SCRIPT_ON_FRAME_TABLE, Route111_MapScript2_1F0E56 .byte 0 @@ -37,7 +37,7 @@ Route111_EventScript_1F0CE4:: @ 81F0CE4 setmetatile 20, 58, 997, 0 return -Route111_MapScript1_1F0D87: @ 81F0D87 +Route111_OnTransition: @ 81F0D87 setvar VAR_TRAINER_HILL_IS_ACTIVE, 0 special SetMirageTowerVisibility call_if_unset FLAG_MIRAGE_TOWER_VISIBLE, Route111_EventScript_1F0E3C diff --git a/data/maps/Route112/scripts.inc b/data/maps/Route112/scripts.inc index abc3ca4cd..58109bd40 100644 --- a/data/maps/Route112/scripts.inc +++ b/data/maps/Route112/scripts.inc @@ -1,8 +1,8 @@ Route112_MapScripts:: @ 81F1DA8 - map_script MAP_SCRIPT_ON_TRANSITION, Route112_MapScript1_1F1DAE + map_script MAP_SCRIPT_ON_TRANSITION, Route112_OnTransition .byte 0 -Route112_MapScript1_1F1DAE: @ 81F1DAE +Route112_OnTransition: @ 81F1DAE clearflag FLAG_FORCE_MIRAGE_TOWER_VISIBLE setvar VAR_JAGGED_PASS_ASH_WEATHER, 0 end diff --git a/data/maps/Route112_CableCarStation/scripts.inc b/data/maps/Route112_CableCarStation/scripts.inc index f3cdae8f9..d9eec8efd 100644 --- a/data/maps/Route112_CableCarStation/scripts.inc +++ b/data/maps/Route112_CableCarStation/scripts.inc @@ -1,9 +1,9 @@ Route112_CableCarStation_MapScripts:: @ 822AABE - map_script MAP_SCRIPT_ON_TRANSITION, Route112_CableCarStation_MapScript1_22AAC9 + map_script MAP_SCRIPT_ON_TRANSITION, Route112_CableCarStation_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, Route112_CableCarStation_MapScript2_22AAE9 .byte 0 -Route112_CableCarStation_MapScript1_22AAC9: @ 822AAC9 +Route112_CableCarStation_OnTransition: @ 822AAC9 setescapewarp MAP_ROUTE112, 255, 28, 28 compare VAR_CABLE_CAR_STATION_STATE, 2 call_if_eq Route112_CableCarStation_EventScript_22AADD diff --git a/data/maps/Route113/scripts.inc b/data/maps/Route113/scripts.inc index 6efd05d6e..e8fb08ee4 100644 --- a/data/maps/Route113/scripts.inc +++ b/data/maps/Route113/scripts.inc @@ -1,13 +1,13 @@ Route113_MapScripts:: @ 81F2153 map_script MAP_SCRIPT_ON_RESUME, Route113_MapScript1_1F215E - map_script MAP_SCRIPT_ON_TRANSITION, Route113_MapScript1_1F2161 + map_script MAP_SCRIPT_ON_TRANSITION, Route113_OnTransition .byte 0 Route113_MapScript1_1F215E: @ 81F215E setstepcallback 1 end -Route113_MapScript1_1F2161: @ 81F2161 +Route113_OnTransition: @ 81F2161 clearflag FLAG_FORCE_MIRAGE_TOWER_VISIBLE call Route113_EventScript_1F216A end diff --git a/data/maps/Route114/map.json b/data/maps/Route114/map.json index 08f2996d2..1aee2d422 100644 --- a/data/maps/Route114/map.json +++ b/data/maps/Route114/map.json @@ -165,7 +165,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route114_EventScript_2907A6", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_11" }, { @@ -256,7 +256,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route114_EventScript_2907A6", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_12" }, { @@ -269,7 +269,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route114_EventScript_2907A6", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_13" }, { @@ -282,7 +282,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route114_EventScript_2907A6", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_14" }, { @@ -295,7 +295,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route114_EventScript_2907A6", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_15" }, { diff --git a/data/maps/Route114/scripts.inc b/data/maps/Route114/scripts.inc index b03a2f228..925f693fa 100644 --- a/data/maps/Route114/scripts.inc +++ b/data/maps/Route114/scripts.inc @@ -1,10 +1,10 @@ Route114_MapScripts:: @ 81F252F - map_script MAP_SCRIPT_ON_TRANSITION, Route114_MapScript1_1F253F + map_script MAP_SCRIPT_ON_TRANSITION, Route114_OnTransition map_script MAP_SCRIPT_ON_LOAD, Route114_MapScript1_1F2561 map_script MAP_SCRIPT_ON_FRAME_TABLE, Route114_MapScript2_1F2578 .byte 0 -Route114_MapScript1_1F253F: @ 81F253F +Route114_OnTransition: @ 81F253F compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1 call_if_eq Route114_EventScript_273D13 compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_114_NORTH diff --git a/data/maps/Route114_FossilManiacsTunnel/scripts.inc b/data/maps/Route114_FossilManiacsTunnel/scripts.inc index 8ab83a441..8cfd754a3 100644 --- a/data/maps/Route114_FossilManiacsTunnel/scripts.inc +++ b/data/maps/Route114_FossilManiacsTunnel/scripts.inc @@ -1,9 +1,9 @@ Route114_FossilManiacsTunnel_MapScripts:: @ 822AF28 - map_script MAP_SCRIPT_ON_TRANSITION, Route114_FossilManiacsTunnel_MapScript1_22AF33 + map_script MAP_SCRIPT_ON_TRANSITION, Route114_FossilManiacsTunnel_OnTransition map_script MAP_SCRIPT_ON_LOAD, Route114_FossilManiacsTunnel_MapScript1_22AF49 .byte 0 -Route114_FossilManiacsTunnel_MapScript1_22AF33: @ 822AF33 +Route114_FossilManiacsTunnel_OnTransition: @ 822AF33 call_if_set FLAG_SYS_GAME_CLEAR, Route114_FossilManiacsTunnel_EventScript_22AF3D end diff --git a/data/maps/Route115/map.json b/data/maps/Route115/map.json index 484699ec6..53ce80ce7 100644 --- a/data/maps/Route115/map.json +++ b/data/maps/Route115/map.json @@ -217,7 +217,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route115_EventScript_2907A6", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_11" }, { diff --git a/data/maps/Route115/scripts.inc b/data/maps/Route115/scripts.inc index 259cd5904..7c5b63bcd 100644 --- a/data/maps/Route115/scripts.inc +++ b/data/maps/Route115/scripts.inc @@ -1,6 +1,6 @@ Route115_MapScripts:: @ 81F2920 map_script MAP_SCRIPT_ON_LOAD, Route115_MapScript1_1F2930 - map_script MAP_SCRIPT_ON_TRANSITION, Route115_MapScript1_1F2947 + map_script MAP_SCRIPT_ON_TRANSITION, Route115_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, Route115_MapScript2_1F2969 .byte 0 @@ -11,7 +11,7 @@ Route115_MapScript1_1F2930: @ 81F2930 call_if_eq UnusualWeather_EventScript_PlaceTilesRoute115East end -Route115_MapScript1_1F2947: @ 81F2947 +Route115_OnTransition: @ 81F2947 compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1 call_if_eq Route115_EventScript_273D13 compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_115_WEST diff --git a/data/maps/Route116/map.json b/data/maps/Route116/map.json index 0745af08c..8a369e407 100644 --- a/data/maps/Route116/map.json +++ b/data/maps/Route116/map.json @@ -74,7 +74,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route116_EventScript_2906BB", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_11" }, { @@ -87,7 +87,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route116_EventScript_2906BB", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_12" }, { @@ -178,7 +178,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route116_EventScript_2906BB", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_13" }, { @@ -204,7 +204,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route116_EventScript_2906BB", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_14" }, { @@ -360,7 +360,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route116_EventScript_2906BB", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_15" }, { diff --git a/data/maps/Route116/scripts.inc b/data/maps/Route116/scripts.inc index 454201307..161e9be51 100644 --- a/data/maps/Route116/scripts.inc +++ b/data/maps/Route116/scripts.inc @@ -1,10 +1,10 @@ Route116_MapScripts:: @ 81F2C0C - map_script MAP_SCRIPT_ON_TRANSITION, Route116_MapScript1_1F2C1C + map_script MAP_SCRIPT_ON_TRANSITION, Route116_OnTransition map_script MAP_SCRIPT_ON_LOAD, Route116_MapScript1_1F2C4F map_script MAP_SCRIPT_ON_FRAME_TABLE, Route116_MapScript2_1F2C66 .byte 0 -Route116_MapScript1_1F2C1C: @ 81F2C1C +Route116_OnTransition: @ 81F2C1C call_if_set FLAG_RECOVERED_DEVON_GOODS, Route116_EventScript_1F2C47 compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1 call_if_eq Route116_EventScript_273D13 diff --git a/data/maps/Route117/map.json b/data/maps/Route117/map.json index efaad2802..b29b58639 100644 --- a/data/maps/Route117/map.json +++ b/data/maps/Route117/map.json @@ -217,7 +217,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route117_EventScript_2906BB", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_11" }, { diff --git a/data/maps/Route117/scripts.inc b/data/maps/Route117/scripts.inc index 08571690f..5435595ee 100644 --- a/data/maps/Route117/scripts.inc +++ b/data/maps/Route117/scripts.inc @@ -1,8 +1,8 @@ Route117_MapScripts:: @ 81F397D - map_script MAP_SCRIPT_ON_TRANSITION, Route117_MapScript1_1F3983 + map_script MAP_SCRIPT_ON_TRANSITION, Route117_OnTransition .byte 0 -Route117_MapScript1_1F3983: @ 81F3983 +Route117_OnTransition: @ 81F3983 call Route117_EventScript_1F3989 end diff --git a/data/maps/Route118/map.json b/data/maps/Route118/map.json index 0a3fee210..e7737bf1e 100644 --- a/data/maps/Route118/map.json +++ b/data/maps/Route118/map.json @@ -183,7 +183,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route118_EventScript_2906BB", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_11" }, { diff --git a/data/maps/Route118/scripts.inc b/data/maps/Route118/scripts.inc index 9c1ec46ca..858f0d598 100644 --- a/data/maps/Route118/scripts.inc +++ b/data/maps/Route118/scripts.inc @@ -1,10 +1,10 @@ Route118_MapScripts:: @ 81F3DBC - map_script MAP_SCRIPT_ON_TRANSITION, Route118_MapScript1_1F3DCC + map_script MAP_SCRIPT_ON_TRANSITION, Route118_OnTransition map_script MAP_SCRIPT_ON_LOAD, Route118_MapScript1_1F3DF3 map_script MAP_SCRIPT_ON_FRAME_TABLE, Route118_MapScript2_1F3E0A .byte 0 -Route118_MapScript1_1F3DCC: @ 81F3DCC +Route118_OnTransition: @ 81F3DCC call Route118_EventScript_28CCC7 compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1 call_if_eq Route118_EventScript_273D13 diff --git a/data/maps/Route119/scripts.inc b/data/maps/Route119/scripts.inc index 22a73b74b..1902333ed 100644 --- a/data/maps/Route119/scripts.inc +++ b/data/maps/Route119/scripts.inc @@ -1,6 +1,6 @@ Route119_MapScripts:: @ 81F4424 map_script MAP_SCRIPT_ON_RESUME, Route119_MapScript1_1F442F - map_script MAP_SCRIPT_ON_TRANSITION, Route119_MapScript1_1F444D + map_script MAP_SCRIPT_ON_TRANSITION, Route119_OnTransition .byte 0 Route119_MapScript1_1F442F: @ 81F442F @@ -14,7 +14,7 @@ Route119_EventScript_1F4439:: @ 81F4439 removeobject VAR_LAST_TALKED return -Route119_MapScript1_1F444D: @ 81F444D +Route119_OnTransition: @ 81F444D call Common_EventScript_SetupRivalGender call Common_EventScript_SetupRivalOnBikeGender compare VAR_WEATHER_INSTITUTE_STATE, 1 diff --git a/data/maps/Route119_WeatherInstitute_1F/scripts.inc b/data/maps/Route119_WeatherInstitute_1F/scripts.inc index 09ed3c4f5..b4b309d80 100644 --- a/data/maps/Route119_WeatherInstitute_1F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_1F/scripts.inc @@ -1,8 +1,8 @@ Route119_WeatherInstitute_1F_MapScripts:: @ 826FA86 - map_script MAP_SCRIPT_ON_TRANSITION, Route119_WeatherInstitute_1F_MapScript1_26FA8C + map_script MAP_SCRIPT_ON_TRANSITION, Route119_WeatherInstitute_1F_OnTransition .byte 0 -Route119_WeatherInstitute_1F_MapScript1_26FA8C: @ 826FA8C +Route119_WeatherInstitute_1F_OnTransition: @ 826FA8C compare VAR_WEATHER_INSTITUTE_STATE, 0 call_if_eq Route119_WeatherInstitute_1F_EventScript_26FA98 end diff --git a/data/maps/Route119_WeatherInstitute_2F/scripts.inc b/data/maps/Route119_WeatherInstitute_2F/scripts.inc index e41960fde..1a9ccfa7e 100644 --- a/data/maps/Route119_WeatherInstitute_2F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_2F/scripts.inc @@ -1,8 +1,8 @@ Route119_WeatherInstitute_2F_MapScripts:: @ 826FF1E - map_script MAP_SCRIPT_ON_TRANSITION, Route119_WeatherInstitute_2F_MapScript1_26FF24 + map_script MAP_SCRIPT_ON_TRANSITION, Route119_WeatherInstitute_2F_OnTransition .byte 0 -Route119_WeatherInstitute_2F_MapScript1_26FF24: @ 826FF24 +Route119_WeatherInstitute_2F_OnTransition: @ 826FF24 compare VAR_WEATHER_INSTITUTE_STATE, 0 call_if_eq Route119_WeatherInstitute_2F_EventScript_26FF44 compare VAR_WEATHER_INSTITUTE_STATE, 1 diff --git a/data/maps/Route120/map.json b/data/maps/Route120/map.json index 1bdbd0bca..fccf5c88e 100644 --- a/data/maps/Route120/map.json +++ b/data/maps/Route120/map.json @@ -295,7 +295,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route120_EventScript_2906BB", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_11" }, { @@ -438,7 +438,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route120_EventScript_2906BB", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_14" }, { @@ -451,7 +451,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route120_EventScript_2906BB", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_12" }, { diff --git a/data/maps/Route120/scripts.inc b/data/maps/Route120/scripts.inc index 40c9ee09a..1268b9965 100644 --- a/data/maps/Route120/scripts.inc +++ b/data/maps/Route120/scripts.inc @@ -1,6 +1,6 @@ Route120_MapScripts:: @ 81F53EC map_script MAP_SCRIPT_ON_RESUME, Route120_MapScript1_1F53FC - map_script MAP_SCRIPT_ON_TRANSITION, Route120_MapScript1_1F54CD + map_script MAP_SCRIPT_ON_TRANSITION, Route120_OnTransition map_script MAP_SCRIPT_ON_LOAD, Route120_MapScript1_1F5474 .byte 0 @@ -60,7 +60,7 @@ Route120_EventScript_1F54C8:: @ 81F54C8 setobjectmovementtype 36, MOVEMENT_TYPE_FACE_RIGHT return -Route120_MapScript1_1F54CD: @ 81F54CD +Route120_OnTransition: @ 81F54CD call Route120_EventScript_28CCC7 call Route120_EventScript_1F54D8 end @@ -245,10 +245,10 @@ Route120_EventScript_1F572C:: @ 81F572C waitmovement 0 delay 50 setfieldeffectargument 0, 1 - dofieldeffect 30 + dofieldeffect FLDEFF_NPCFLY_OUT delay 15 removeobject 31 - waitfieldeffect 30 + waitfieldeffect FLDEFF_NPCFLY_OUT setmetatile 13, 15, 663, 0 setmetatile 12, 16, 671, 0 setmetatile 12, 17, 161, 0 diff --git a/data/maps/Route121/map.json b/data/maps/Route121/map.json index f1152b465..9382ab375 100644 --- a/data/maps/Route121/map.json +++ b/data/maps/Route121/map.json @@ -222,7 +222,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route121_EventScript_2906BB", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_11" }, { @@ -235,7 +235,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route121_EventScript_2906BB", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_12" }, { @@ -313,7 +313,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route121_EventScript_2906BB", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_13" }, { diff --git a/data/maps/Route123/map.json b/data/maps/Route123/map.json index 1e562420d..c13d17a0c 100644 --- a/data/maps/Route123/map.json +++ b/data/maps/Route123/map.json @@ -256,7 +256,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route123_EventScript_2906BB", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_11" }, { @@ -269,7 +269,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route123_EventScript_2906BB", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_12" }, { @@ -282,7 +282,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route123_EventScript_2906BB", + "script": "EventScript_CutTree", "flag": "FLAG_TEMP_13" }, { diff --git a/data/maps/Route123/scripts.inc b/data/maps/Route123/scripts.inc index 8e1692114..ce74cbadc 100644 --- a/data/maps/Route123/scripts.inc +++ b/data/maps/Route123/scripts.inc @@ -1,8 +1,8 @@ Route123_MapScripts:: @ 81F6147 - map_script MAP_SCRIPT_ON_TRANSITION, Route123_MapScript1_1F614D + map_script MAP_SCRIPT_ON_TRANSITION, Route123_OnTransition .byte 0 -Route123_MapScript1_1F614D: @ 81F614D +Route123_OnTransition: @ 81F614D special SetRoute123Weather end diff --git a/data/maps/Route124/scripts.inc b/data/maps/Route124/scripts.inc index 34e315792..9a11cec2c 100644 --- a/data/maps/Route124/scripts.inc +++ b/data/maps/Route124/scripts.inc @@ -1,8 +1,8 @@ Route124_MapScripts:: @ 81F656C - map_script MAP_SCRIPT_ON_TRANSITION, Route124_MapScript1_1F6572 + map_script MAP_SCRIPT_ON_TRANSITION, Route124_OnTransition .byte 0 -Route124_MapScript1_1F6572: @ 81F6572 +Route124_OnTransition: @ 81F6572 call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15 end diff --git a/data/maps/Route125/scripts.inc b/data/maps/Route125/scripts.inc index 8abcbe787..2c15eee3d 100644 --- a/data/maps/Route125/scripts.inc +++ b/data/maps/Route125/scripts.inc @@ -1,10 +1,10 @@ Route125_MapScripts:: @ 81F6748 - map_script MAP_SCRIPT_ON_TRANSITION, Route125_MapScript1_1F6758 + map_script MAP_SCRIPT_ON_TRANSITION, Route125_OnTransition map_script MAP_SCRIPT_ON_LOAD, Route125_MapScript1_1F6783 map_script MAP_SCRIPT_ON_FRAME_TABLE, Route125_MapScript2_1F679A .byte 0 -Route125_MapScript1_1F6758: @ 81F6758 +Route125_OnTransition: @ 81F6758 call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15 compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1 call_if_eq Route125_EventScript_273D13 diff --git a/data/maps/Route126/scripts.inc b/data/maps/Route126/scripts.inc index 71bc77b28..7a606e020 100644 --- a/data/maps/Route126/scripts.inc +++ b/data/maps/Route126/scripts.inc @@ -1,8 +1,8 @@ Route126_MapScripts:: @ 81F68C6 - map_script MAP_SCRIPT_ON_TRANSITION, Route126_MapScript1_1F68CC + map_script MAP_SCRIPT_ON_TRANSITION, Route126_OnTransition .byte 0 -Route126_MapScript1_1F68CC: @ 81F68CC +Route126_OnTransition: @ 81F68CC call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15 end diff --git a/data/maps/Route127/scripts.inc b/data/maps/Route127/scripts.inc index 91fab2b61..1829dbcfd 100644 --- a/data/maps/Route127/scripts.inc +++ b/data/maps/Route127/scripts.inc @@ -1,10 +1,10 @@ Route127_MapScripts:: @ 81F69D9 - map_script MAP_SCRIPT_ON_TRANSITION, Route127_MapScript1_1F69E9 + map_script MAP_SCRIPT_ON_TRANSITION, Route127_OnTransition map_script MAP_SCRIPT_ON_LOAD, Route127_MapScript1_1F6A14 map_script MAP_SCRIPT_ON_FRAME_TABLE, Route127_MapScript2_1F6A2B .byte 0 -Route127_MapScript1_1F69E9: @ 81F69E9 +Route127_OnTransition: @ 81F69E9 call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15 compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1 call_if_eq Route127_EventScript_273D13 diff --git a/data/maps/Route128/scripts.inc b/data/maps/Route128/scripts.inc index 84091ac3a..bad74f451 100644 --- a/data/maps/Route128/scripts.inc +++ b/data/maps/Route128/scripts.inc @@ -1,9 +1,9 @@ Route128_MapScripts:: @ 81F6B38 - map_script MAP_SCRIPT_ON_TRANSITION, Route128_MapScript1_1F6B43 + map_script MAP_SCRIPT_ON_TRANSITION, Route128_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, Route128_MapScript2_1F6B4D .byte 0 -Route128_MapScript1_1F6B43: @ 81F6B43 +Route128_OnTransition: @ 81F6B43 call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15 end @@ -48,8 +48,8 @@ Route128_EventScript_1F6B57:: @ 81F6B57 removeobject 4 delay 100 setfieldeffectargument 0, 1 - dofieldeffect 30 - waitfieldeffect 30 + dofieldeffect FLDEFF_NPCFLY_OUT + waitfieldeffect FLDEFF_NPCFLY_OUT addobject 3 applymovement 3, Route128_Movement_1F6C87 waitmovement 0 @@ -69,10 +69,10 @@ Route128_EventScript_1F6B57:: @ 81F6B57 waitmovement 0 delay 50 setfieldeffectargument 0, 1 - dofieldeffect 30 + dofieldeffect FLDEFF_NPCFLY_OUT delay 15 removeobject 3 - waitfieldeffect 30 + waitfieldeffect FLDEFF_NPCFLY_OUT clearflag FLAG_HIDE_MAP_NAME_POPUP setvar VAR_ROUTE128_STATE, 2 releaseall diff --git a/data/maps/Route129/scripts.inc b/data/maps/Route129/scripts.inc index 25aa675a6..49b26011a 100644 --- a/data/maps/Route129/scripts.inc +++ b/data/maps/Route129/scripts.inc @@ -1,5 +1,5 @@ Route129_MapScripts:: @ 81F7284 - map_script MAP_SCRIPT_ON_TRANSITION, Route129_MapScript1_1F72AB + map_script MAP_SCRIPT_ON_TRANSITION, Route129_OnTransition map_script MAP_SCRIPT_ON_LOAD, Route129_MapScript1_1F7294 map_script MAP_SCRIPT_ON_FRAME_TABLE, Route129_MapScript2_1F72E2 .byte 0 @@ -11,7 +11,7 @@ Route129_MapScript1_1F7294: @ 81F7294 call_if_eq UnusualWeather_EventScript_PlaceTilesRoute129East end -Route129_MapScript1_1F72AB: @ 81F72AB +Route129_OnTransition: @ 81F72AB compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1 call_if_eq Route129_EventScript_273D13 compare VAR_RAYQUAZA_STATE, 4 diff --git a/data/maps/Route130/scripts.inc b/data/maps/Route130/scripts.inc index cdcc61550..213287237 100644 --- a/data/maps/Route130/scripts.inc +++ b/data/maps/Route130/scripts.inc @@ -1,8 +1,8 @@ Route130_MapScripts:: @ 81F735F - map_script MAP_SCRIPT_ON_TRANSITION, Route130_MapScript1_1F7365 + map_script MAP_SCRIPT_ON_TRANSITION, Route130_OnTransition .byte 0 -Route130_MapScript1_1F7365: @ 81F7365 +Route130_OnTransition: @ 81F7365 compare VAR_RAYQUAZA_STATE, 4 call_if_ge Route130_EventScript_1F73B5 specialvar VAR_RESULT, IsMirageIslandPresent diff --git a/data/maps/Route131/scripts.inc b/data/maps/Route131/scripts.inc index 0d178e969..17ac3f52f 100644 --- a/data/maps/Route131/scripts.inc +++ b/data/maps/Route131/scripts.inc @@ -1,8 +1,8 @@ Route131_MapScripts:: @ 81F7404 - map_script MAP_SCRIPT_ON_TRANSITION, Route131_MapScript1_1F740A + map_script MAP_SCRIPT_ON_TRANSITION, Route131_OnTransition .byte 0 -Route131_MapScript1_1F740A: @ 81F740A +Route131_OnTransition: @ 81F740A compare VAR_RAYQUAZA_STATE, 4 call_if_ge Route131_EventScript_1F741F call Route131_EventScript_1F741B diff --git a/data/maps/RustboroCity/scripts.inc b/data/maps/RustboroCity/scripts.inc index 1ba63c959..e72496ff3 100644 --- a/data/maps/RustboroCity/scripts.inc +++ b/data/maps/RustboroCity/scripts.inc @@ -1,9 +1,9 @@ RustboroCity_MapScripts:: @ 81E06BD - map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_MapScript1_1E06C8 + map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, RustboroCity_MapScript2_1E070B .byte 0 -RustboroCity_MapScript1_1E06C8: @ 81E06C8 +RustboroCity_OnTransition: @ 81E06C8 setflag FLAG_VISITED_RUSTBORO_CITY call Common_EventScript_SetupRivalGender compare VAR_RUSTBORO_STATE, 6 diff --git a/data/maps/RustboroCity_DevonCorp_1F/scripts.inc b/data/maps/RustboroCity_DevonCorp_1F/scripts.inc index 4f1971c80..788a403f2 100644 --- a/data/maps/RustboroCity_DevonCorp_1F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_1F/scripts.inc @@ -1,8 +1,8 @@ RustboroCity_DevonCorp_1F_MapScripts:: @ 8211245 - map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_DevonCorp_1F_MapScript1_21124B + map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_DevonCorp_1F_OnTransition .byte 0 -RustboroCity_DevonCorp_1F_MapScript1_21124B: @ 821124B +RustboroCity_DevonCorp_1F_OnTransition: @ 821124B call_if_unset FLAG_RETURNED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_211255 end diff --git a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc index fab587fb7..dfcd03dc6 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc @@ -1,8 +1,8 @@ RustboroCity_DevonCorp_2F_MapScripts:: @ 8211857 - map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_DevonCorp_2F_MapScript1_21185D + map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_DevonCorp_2F_OnTransition .byte 0 -RustboroCity_DevonCorp_2F_MapScript1_21185D: @ 821185D +RustboroCity_DevonCorp_2F_OnTransition: @ 821185D compare VAR_FOSSIL_RESURRECTION_STATE, 1 call_if_eq RustboroCity_DevonCorp_2F_EventScript_211869 end diff --git a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc index 6d0a78a42..6be85a0b0 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc @@ -1,10 +1,10 @@ RustboroCity_DevonCorp_3F_MapScripts:: @ 821242D - map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_DevonCorp_3F_MapScript1_21243D + map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_DevonCorp_3F_OnTransition map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, RustboroCity_DevonCorp_3F_MapScript2_212455 map_script MAP_SCRIPT_ON_FRAME_TABLE, RustboroCity_DevonCorp_3F_MapScript2_212464 .byte 0 -RustboroCity_DevonCorp_3F_MapScript1_21243D: @ 821243D +RustboroCity_DevonCorp_3F_OnTransition: @ 821243D compare VAR_DEVON_CORP_3F_STATE, 0 call_if_eq RustboroCity_DevonCorp_3F_EventScript_212449 end diff --git a/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc b/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc index e7bea0f0d..4d50ca89c 100644 --- a/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc @@ -1,9 +1,9 @@ RustboroCity_PokemonCenter_1F_MapScripts:: @ 8214D62 - map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_PokemonCenter_1F_MapScript1_214D6D + map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_PokemonCenter_1F_OnTransition map_script MAP_SCRIPT_ON_RESUME, RustboroCity_PokemonCenter_1F_MapScript1_277C30 .byte 0 -RustboroCity_PokemonCenter_1F_MapScript1_214D6D: @ 8214D6D +RustboroCity_PokemonCenter_1F_OnTransition: @ 8214D6D setrespawn HEAL_LOCATION_RUSTBORO_CITY call RustboroCity_PokemonCenter_1F_EventScript_2718DE end diff --git a/data/maps/RustboroCity_PokemonCenter_2F/scripts.inc b/data/maps/RustboroCity_PokemonCenter_2F/scripts.inc index fac3cb059..3c62abc4a 100644 --- a/data/maps/RustboroCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/RustboroCity_PokemonCenter_2F/scripts.inc @@ -2,7 +2,7 @@ RustboroCity_PokemonCenter_2F_MapScripts:: @ 8214EDE map_script MAP_SCRIPT_ON_FRAME_TABLE, RustboroCity_PokemonCenter_2F_MapScript2_276C3B map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, RustboroCity_PokemonCenter_2F_MapScript2_276B6C map_script MAP_SCRIPT_ON_LOAD, RustboroCity_PokemonCenter_2F_MapScript1_276BBE - map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition .byte 0 RustboroCity_PokemonCenter_2F_EventScript_214EF3:: @ 8214EF3 diff --git a/data/maps/RusturfTunnel/map.json b/data/maps/RusturfTunnel/map.json index 9fc378729..bd5c8206d 100644 --- a/data/maps/RusturfTunnel/map.json +++ b/data/maps/RusturfTunnel/map.json @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RusturfTunnel_EventScript_2907A6", + "script": "EventScript_RockSmash", "flag": "FLAG_HIDE_RUSTURF_TUNNEL_ROCK_1" }, { @@ -115,7 +115,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "RusturfTunnel_EventScript_2907A6", + "script": "EventScript_RockSmash", "flag": "FLAG_HIDE_RUSTURF_TUNNEL_ROCK_2" }, { diff --git a/data/maps/RusturfTunnel/scripts.inc b/data/maps/RusturfTunnel/scripts.inc index 8e7e2342e..e489580c9 100644 --- a/data/maps/RusturfTunnel/scripts.inc +++ b/data/maps/RusturfTunnel/scripts.inc @@ -1,5 +1,5 @@ RusturfTunnel_MapScripts:: @ 822CE27 - map_script MAP_SCRIPT_ON_TRANSITION, RusturfTunnel_MapScript1_22CE44 + map_script MAP_SCRIPT_ON_TRANSITION, RusturfTunnel_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, RusturfTunnel_MapScript2_22CE32 .byte 0 @@ -8,7 +8,7 @@ RusturfTunnel_MapScript2_22CE32: @ 822CE32 map_script_2 VAR_RUSTURF_TUNNEL_STATE, 5, RusturfTunnel_EventScript_22CEAE .2byte 0 -RusturfTunnel_MapScript1_22CE44: @ 822CE44 +RusturfTunnel_OnTransition: @ 822CE44 compare VAR_RUSTURF_TUNNEL_STATE, 2 call_if_eq RusturfTunnel_EventScript_22CE50 end diff --git a/data/maps/SafariZone_North/map.json b/data/maps/SafariZone_North/map.json index 967e55f3e..0dafeb180 100644 --- a/data/maps/SafariZone_North/map.json +++ b/data/maps/SafariZone_North/map.json @@ -66,7 +66,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SafariZone_North_EventScript_2907A6", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_11" }, { @@ -79,7 +79,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SafariZone_North_EventScript_2907A6", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_12" }, { @@ -92,7 +92,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SafariZone_North_EventScript_2907A6", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_13" }, { @@ -105,7 +105,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SafariZone_North_EventScript_2907A6", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_14" }, { @@ -118,7 +118,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SafariZone_North_EventScript_2907A6", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_15" }, { @@ -131,7 +131,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SafariZone_North_EventScript_2907A6", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_16" }, { diff --git a/data/maps/SafariZone_Northeast/map.json b/data/maps/SafariZone_Northeast/map.json index 94c2c268f..798563263 100644 --- a/data/maps/SafariZone_Northeast/map.json +++ b/data/maps/SafariZone_Northeast/map.json @@ -61,7 +61,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SafariZone_Northeast_EventScript_2907A6", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_15" }, { @@ -87,7 +87,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SafariZone_Northeast_EventScript_2907A6", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_13" }, { @@ -100,7 +100,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SafariZone_Northeast_EventScript_2907A6", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_11" }, { @@ -113,7 +113,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SafariZone_Northeast_EventScript_2907A6", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_14" }, { @@ -126,7 +126,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SafariZone_Northeast_EventScript_2907A6", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_12" }, { diff --git a/data/maps/SafariZone_South/scripts.inc b/data/maps/SafariZone_South/scripts.inc index 75ec95d33..45273de12 100644 --- a/data/maps/SafariZone_South/scripts.inc +++ b/data/maps/SafariZone_South/scripts.inc @@ -1,5 +1,5 @@ SafariZone_South_MapScripts:: @ 823D279 - map_script MAP_SCRIPT_ON_TRANSITION, SafariZone_South_MapScript1_23D2B1 + map_script MAP_SCRIPT_ON_TRANSITION, SafariZone_South_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, SafariZone_South_MapScript2_23D284 .byte 0 @@ -18,7 +18,7 @@ SafariZone_South_EventScript_23D28E:: @ 823D28E releaseall end -SafariZone_South_MapScript1_23D2B1: @ 823D2B1 +SafariZone_South_OnTransition: @ 823D2B1 compare VAR_SAFARI_ZONE_STATE, 2 call_if_eq SafariZone_South_EventScript_23D2BD end diff --git a/data/maps/SeafloorCavern_Room1/map.json b/data/maps/SeafloorCavern_Room1/map.json index bcac09256..88db72b4a 100644 --- a/data/maps/SeafloorCavern_Room1/map.json +++ b/data/maps/SeafloorCavern_Room1/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SeafloorCavern_Room1_EventScript_2908BA", + "script": "EventScript_StrengthBoulder", "flag": "FLAG_TEMP_11" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SeafloorCavern_Room1_EventScript_2908BA", + "script": "EventScript_StrengthBoulder", "flag": "FLAG_TEMP_12" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SeafloorCavern_Room1_EventScript_2907A6", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_13" }, { diff --git a/data/maps/SeafloorCavern_Room2/map.json b/data/maps/SeafloorCavern_Room2/map.json index 3e5d6b127..f402b50d0 100644 --- a/data/maps/SeafloorCavern_Room2/map.json +++ b/data/maps/SeafloorCavern_Room2/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SeafloorCavern_Room2_EventScript_2908BA", + "script": "EventScript_StrengthBoulder", "flag": "FLAG_TEMP_12" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SeafloorCavern_Room2_EventScript_2908BA", + "script": "EventScript_StrengthBoulder", "flag": "FLAG_TEMP_13" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SeafloorCavern_Room2_EventScript_2908BA", + "script": "EventScript_StrengthBoulder", "flag": "FLAG_TEMP_11" }, { @@ -63,7 +63,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SeafloorCavern_Room2_EventScript_2908BA", + "script": "EventScript_StrengthBoulder", "flag": "FLAG_TEMP_15" }, { @@ -76,7 +76,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SeafloorCavern_Room2_EventScript_2908BA", + "script": "EventScript_StrengthBoulder", "flag": "FLAG_TEMP_16" }, { @@ -89,7 +89,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SeafloorCavern_Room2_EventScript_2907A6", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_18" }, { @@ -102,7 +102,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SeafloorCavern_Room2_EventScript_2907A6", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_19" }, { @@ -115,7 +115,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SeafloorCavern_Room2_EventScript_2908BA", + "script": "EventScript_StrengthBoulder", "flag": "FLAG_TEMP_17" } ], diff --git a/data/maps/SeafloorCavern_Room3/map.json b/data/maps/SeafloorCavern_Room3/map.json index c7a90b42d..2a33c44cf 100644 --- a/data/maps/SeafloorCavern_Room3/map.json +++ b/data/maps/SeafloorCavern_Room3/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SeafloorCavern_Room3_EventScript_2908BA", + "script": "EventScript_StrengthBoulder", "flag": "FLAG_TEMP_12" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SeafloorCavern_Room3_EventScript_2908BA", + "script": "EventScript_StrengthBoulder", "flag": "FLAG_TEMP_14" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SeafloorCavern_Room3_EventScript_2908BA", + "script": "EventScript_StrengthBoulder", "flag": "FLAG_TEMP_15" }, { @@ -63,7 +63,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SeafloorCavern_Room3_EventScript_2908BA", + "script": "EventScript_StrengthBoulder", "flag": "FLAG_TEMP_16" }, { @@ -76,7 +76,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SeafloorCavern_Room3_EventScript_2908BA", + "script": "EventScript_StrengthBoulder", "flag": "FLAG_TEMP_17" }, { @@ -89,7 +89,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SeafloorCavern_Room3_EventScript_2908BA", + "script": "EventScript_StrengthBoulder", "flag": "FLAG_TEMP_18" }, { @@ -102,7 +102,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SeafloorCavern_Room3_EventScript_2908BA", + "script": "EventScript_StrengthBoulder", "flag": "FLAG_TEMP_19" }, { diff --git a/data/maps/SeafloorCavern_Room5/map.json b/data/maps/SeafloorCavern_Room5/map.json index 975fc6a98..b9c85c9bf 100644 --- a/data/maps/SeafloorCavern_Room5/map.json +++ b/data/maps/SeafloorCavern_Room5/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SeafloorCavern_Room5_EventScript_2908BA", + "script": "EventScript_StrengthBoulder", "flag": "FLAG_TEMP_11" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SeafloorCavern_Room5_EventScript_2908BA", + "script": "EventScript_StrengthBoulder", "flag": "FLAG_TEMP_12" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SeafloorCavern_Room5_EventScript_2908BA", + "script": "EventScript_StrengthBoulder", "flag": "FLAG_TEMP_13" }, { @@ -63,7 +63,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SeafloorCavern_Room5_EventScript_2907A6", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_15" }, { @@ -76,7 +76,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SeafloorCavern_Room5_EventScript_2907A6", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_16" }, { @@ -89,7 +89,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SeafloorCavern_Room5_EventScript_2908BA", + "script": "EventScript_StrengthBoulder", "flag": "FLAG_TEMP_14" } ], diff --git a/data/maps/SeafloorCavern_Room8/map.json b/data/maps/SeafloorCavern_Room8/map.json index 88ea40e3a..c1d3b6cc2 100644 --- a/data/maps/SeafloorCavern_Room8/map.json +++ b/data/maps/SeafloorCavern_Room8/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SeafloorCavern_Room8_EventScript_2908BA", + "script": "EventScript_StrengthBoulder", "flag": "FLAG_TEMP_11" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SeafloorCavern_Room8_EventScript_2908BA", + "script": "EventScript_StrengthBoulder", "flag": "FLAG_TEMP_12" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SeafloorCavern_Room8_EventScript_2908BA", + "script": "EventScript_StrengthBoulder", "flag": "FLAG_TEMP_13" }, { @@ -63,7 +63,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SeafloorCavern_Room8_EventScript_2908BA", + "script": "EventScript_StrengthBoulder", "flag": "FLAG_TEMP_14" }, { @@ -76,7 +76,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SeafloorCavern_Room8_EventScript_2908BA", + "script": "EventScript_StrengthBoulder", "flag": "FLAG_TEMP_15" }, { @@ -89,7 +89,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SeafloorCavern_Room8_EventScript_2908BA", + "script": "EventScript_StrengthBoulder", "flag": "FLAG_TEMP_16" }, { @@ -102,7 +102,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SeafloorCavern_Room8_EventScript_2908BA", + "script": "EventScript_StrengthBoulder", "flag": "FLAG_TEMP_17" }, { @@ -115,7 +115,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SeafloorCavern_Room8_EventScript_2908BA", + "script": "EventScript_StrengthBoulder", "flag": "FLAG_TEMP_18" }, { @@ -128,7 +128,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SeafloorCavern_Room8_EventScript_2908BA", + "script": "EventScript_StrengthBoulder", "flag": "FLAG_TEMP_19" }, { @@ -141,7 +141,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SeafloorCavern_Room8_EventScript_2908BA", + "script": "EventScript_StrengthBoulder", "flag": "FLAG_TEMP_1A" }, { @@ -154,7 +154,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SeafloorCavern_Room8_EventScript_2908BA", + "script": "EventScript_StrengthBoulder", "flag": "FLAG_TEMP_1B" }, { @@ -167,7 +167,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SeafloorCavern_Room8_EventScript_2908BA", + "script": "EventScript_StrengthBoulder", "flag": "FLAG_TEMP_1C" } ], diff --git a/data/maps/SeafloorCavern_Room9/scripts.inc b/data/maps/SeafloorCavern_Room9/scripts.inc index 4c630a1d4..b5e5034e7 100644 --- a/data/maps/SeafloorCavern_Room9/scripts.inc +++ b/data/maps/SeafloorCavern_Room9/scripts.inc @@ -40,8 +40,8 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9 setfieldeffectargument 0, 16 setfieldeffectargument 1, 42 setfieldeffectargument 2, 0 - dofieldeffect 54 - waitfieldeffect 54 + dofieldeffect FLDEFF_SPARKLE + waitfieldeffect FLDEFF_SPARKLE closemessage setvar VAR_RESULT, 0 playfanfare MUS_ME_TAMA diff --git a/data/maps/SecretBase_YellowCave4/scripts.inc b/data/maps/SecretBase_YellowCave4/scripts.inc index 805d7e299..c05ea13c0 100644 --- a/data/maps/SecretBase_YellowCave4/scripts.inc +++ b/data/maps/SecretBase_YellowCave4/scripts.inc @@ -1,6 +1,6 @@ SecretBase_YellowCave4_MapScripts:: @ 823B483 map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SecretBase_RedCave1_MapScript2_23B498 - map_script MAP_SCRIPT_ON_TRANSITION, SecretBase_RedCave1_MapScript1_23B4A2 + map_script MAP_SCRIPT_ON_TRANSITION, SecretBase_RedCave1_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, SecretBase_RedCave1_MapScript2_23B4AE map_script MAP_SCRIPT_ON_RESUME, SecretBase_RedCave1_MapScript1_23B4B8 .byte 0 @@ -9,9 +9,9 @@ SecretBase_RedCave1_MapScript2_23B498: @ 823B498 map_script_2 VAR_SECRET_BASE_INITIALIZED, 0, EventScript_275D0C .2byte 0 -SecretBase_RedCave1_MapScript1_23B4A2: @ 823B4A2 +SecretBase_RedCave1_OnTransition: @ 823B4A2 call SecretBase_RedCave1_EventScript_275CE1 - special sub_80E95D4 + special SetSecretBaseOwnerGfxId special sub_80EB1AC end diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc b/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc index 218cabc67..13d8f92d9 100644 --- a/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc @@ -1,8 +1,8 @@ ShoalCave_LowTideEntranceRoom_MapScripts:: @ 8236DBA - map_script MAP_SCRIPT_ON_TRANSITION, ShoalCave_LowTideEntranceRoom_MapScript1_236DC0 + map_script MAP_SCRIPT_ON_TRANSITION, ShoalCave_LowTideEntranceRoom_OnTransition .byte 0 -ShoalCave_LowTideEntranceRoom_MapScript1_236DC0: @ 8236DC0 +ShoalCave_LowTideEntranceRoom_OnTransition: @ 8236DC0 special UpdateShoalTideFlag goto_if_set FLAG_SYS_SHOAL_TIDE, ShoalCave_LowTideEntranceRoom_EventScript_236DD1 goto ShoalCave_LowTideEntranceRoom_EventScript_236DD5 diff --git a/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc b/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc index f1a29b28a..300d06317 100644 --- a/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc @@ -1,9 +1,9 @@ ShoalCave_LowTideInnerRoom_MapScripts:: @ 8236EF5 map_script MAP_SCRIPT_ON_LOAD, ShoalCave_LowTideInnerRoom_MapScript1_236F16 - map_script MAP_SCRIPT_ON_TRANSITION, ShoalCave_LowTideInnerRoom_MapScript1_236F00 + map_script MAP_SCRIPT_ON_TRANSITION, ShoalCave_LowTideInnerRoom_OnTransition .byte 0 -ShoalCave_LowTideInnerRoom_MapScript1_236F00: @ 8236F00 +ShoalCave_LowTideInnerRoom_OnTransition: @ 8236F00 goto_if_set FLAG_SYS_SHOAL_TIDE, ShoalCave_LowTideInnerRoom_EventScript_236F0E goto ShoalCave_LowTideInnerRoom_EventScript_236F12 diff --git a/data/maps/ShoalCave_LowTideLowerRoom/map.json b/data/maps/ShoalCave_LowTideLowerRoom/map.json index 92f0fd11a..fad5ddc00 100644 --- a/data/maps/ShoalCave_LowTideLowerRoom/map.json +++ b/data/maps/ShoalCave_LowTideLowerRoom/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "ShoalCave_LowTideLowerRoom_EventScript_2908BA", + "script": "EventScript_StrengthBoulder", "flag": "FLAG_TEMP_11" }, { diff --git a/data/maps/SkyPillar_1F/scripts.inc b/data/maps/SkyPillar_1F/scripts.inc index 18ec43ad6..d60feb155 100644 --- a/data/maps/SkyPillar_1F/scripts.inc +++ b/data/maps/SkyPillar_1F/scripts.inc @@ -1,13 +1,13 @@ SkyPillar_1F_MapScripts:: @ 8239615 - map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_1F_MapScript1_23961B + map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_1F_OnTransition .byte 0 -SkyPillar_1F_MapScript1_23961B: @ 823961B +SkyPillar_1F_OnTransition: @ 823961B compare VAR_SKY_PILLAR_STATE, 2 - call_if_lt SkyPillar_1F_EventScript_239627 + call_if_lt SkyPillar_1F_EventScript_CleanFloor end -SkyPillar_1F_EventScript_239627:: @ 8239627 +SkyPillar_1F_EventScript_CleanFloor:: @ 8239627 setmaplayoutindex LAYOUT_SKY_PILLAR_1F_CLEAN return diff --git a/data/maps/SkyPillar_2F/scripts.inc b/data/maps/SkyPillar_2F/scripts.inc index 9059bd246..dcbff3642 100644 --- a/data/maps/SkyPillar_2F/scripts.inc +++ b/data/maps/SkyPillar_2F/scripts.inc @@ -1,16 +1,16 @@ SkyPillar_2F_MapScripts:: @ 823962B map_script MAP_SCRIPT_ON_FRAME_TABLE, SkyPillar_2F_MapScript2_2A8327 - map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_2F_MapScript1_23963B + map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_2F_OnTransition map_script MAP_SCRIPT_ON_RESUME, SkyPillar_2F_MapScript1_239650 .byte 0 -SkyPillar_2F_MapScript1_23963B: @ 823963B +SkyPillar_2F_OnTransition: @ 823963B compare VAR_SKY_PILLAR_STATE, 2 - call_if_lt SkyPillar_2F_EventScript_23964C + call_if_lt SkyPillar_2F_EventScript_CleanFloor copyvar VAR_ICE_STEP_COUNT, 0x1 end -SkyPillar_2F_EventScript_23964C:: @ 823964C +SkyPillar_2F_EventScript_CleanFloor:: @ 823964C setmaplayoutindex LAYOUT_SKY_PILLAR_2F_CLEAN return diff --git a/data/maps/SkyPillar_3F/scripts.inc b/data/maps/SkyPillar_3F/scripts.inc index ba6a5128d..d55ac27af 100644 --- a/data/maps/SkyPillar_3F/scripts.inc +++ b/data/maps/SkyPillar_3F/scripts.inc @@ -1,13 +1,13 @@ SkyPillar_3F_MapScripts:: @ 823965B - map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_3F_MapScript1_239661 + map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_3F_OnTransition .byte 0 -SkyPillar_3F_MapScript1_239661: @ 8239661 +SkyPillar_3F_OnTransition: @ 8239661 compare VAR_SKY_PILLAR_STATE, 2 - call_if_lt SkyPillar_3F_EventScript_23966D + call_if_lt SkyPillar_3F_EventScript_CleanFloor end -SkyPillar_3F_EventScript_23966D:: @ 823966D +SkyPillar_3F_EventScript_CleanFloor:: @ 823966D setmaplayoutindex LAYOUT_SKY_PILLAR_3F_CLEAN return diff --git a/data/maps/SkyPillar_4F/scripts.inc b/data/maps/SkyPillar_4F/scripts.inc index 355530fdc..413f56521 100644 --- a/data/maps/SkyPillar_4F/scripts.inc +++ b/data/maps/SkyPillar_4F/scripts.inc @@ -1,16 +1,16 @@ SkyPillar_4F_MapScripts:: @ 8239671 map_script MAP_SCRIPT_ON_FRAME_TABLE, SkyPillar_4F_MapScript2_2A8327 - map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_4F_MapScript1_239681 + map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_4F_OnTransition map_script MAP_SCRIPT_ON_RESUME, SkyPillar_4F_MapScript1_239696 .byte 0 -SkyPillar_4F_MapScript1_239681: @ 8239681 +SkyPillar_4F_OnTransition: @ 8239681 compare VAR_SKY_PILLAR_STATE, 2 - call_if_lt SkyPillar_4F_EventScript_239692 + call_if_lt SkyPillar_4F_EventScript_CleanFloor copyvar VAR_ICE_STEP_COUNT, 0x1 end -SkyPillar_4F_EventScript_239692:: @ 8239692 +SkyPillar_4F_EventScript_CleanFloor:: @ 8239692 setmaplayoutindex LAYOUT_SKY_PILLAR_4F_CLEAN return diff --git a/data/maps/SkyPillar_5F/scripts.inc b/data/maps/SkyPillar_5F/scripts.inc index ba35e16f2..2ba0c0db8 100644 --- a/data/maps/SkyPillar_5F/scripts.inc +++ b/data/maps/SkyPillar_5F/scripts.inc @@ -1,13 +1,13 @@ SkyPillar_5F_MapScripts:: @ 82396A2 - map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_5F_MapScript1_2396A8 + map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_5F_OnTransition .byte 0 -SkyPillar_5F_MapScript1_2396A8: @ 82396A8 +SkyPillar_5F_OnTransition: @ 82396A8 compare VAR_SKY_PILLAR_STATE, 2 - call_if_lt SkyPillar_5F_EventScript_2396B4 + call_if_lt SkyPillar_5F_EventScript_CleanFloor return -SkyPillar_5F_EventScript_2396B4:: @ 82396B4 +SkyPillar_5F_EventScript_CleanFloor:: @ 82396B4 setmaplayoutindex LAYOUT_SKY_PILLAR_5F_CLEAN return diff --git a/data/maps/SkyPillar_Outside/scripts.inc b/data/maps/SkyPillar_Outside/scripts.inc index c4769c990..ffc581fd4 100644 --- a/data/maps/SkyPillar_Outside/scripts.inc +++ b/data/maps/SkyPillar_Outside/scripts.inc @@ -1,10 +1,10 @@ SkyPillar_Outside_MapScripts:: @ 82392A8 - map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_Outside_MapScript1_2392B8 + map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_Outside_OnTransition map_script MAP_SCRIPT_ON_LOAD, SkyPillar_Outside_MapScript1_2392DD map_script MAP_SCRIPT_ON_FRAME_TABLE, SkyPillar_Outside_MapScript2_2392FA .byte 0 -SkyPillar_Outside_MapScript1_2392B8: @ 82392B8 +SkyPillar_Outside_OnTransition: @ 82392B8 compare VAR_RAYQUAZA_STATE, 3 call_if_eq SkyPillar_Outside_EventScript_2392CF compare VAR_RAYQUAZA_STATE, 4 diff --git a/data/maps/SkyPillar_Top/scripts.inc b/data/maps/SkyPillar_Top/scripts.inc index dccdac1b4..6afbbd58c 100644 --- a/data/maps/SkyPillar_Top/scripts.inc +++ b/data/maps/SkyPillar_Top/scripts.inc @@ -1,6 +1,6 @@ SkyPillar_Top_MapScripts:: @ 82396B8 map_script MAP_SCRIPT_ON_RESUME, SkyPillar_Top_MapScript1_2396C8 - map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_Top_MapScript1_2396E6 + map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_Top_OnTransition map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SkyPillar_Top_MapScript2_239713 .byte 0 @@ -15,7 +15,7 @@ SkyPillar_Top_EventScript_2396D2:: @ 82396D2 removeobject VAR_LAST_TALKED return -SkyPillar_Top_MapScript1_2396E6: @ 82396E6 +SkyPillar_Top_OnTransition: @ 82396E6 compare VAR_SKY_PILLAR_STATE, 2 call_if_lt SkyPillar_Top_EventScript_2396FD compare VAR_SKY_PILLAR_STATE, 2 diff --git a/data/maps/SlateportCity/scripts.inc b/data/maps/SlateportCity/scripts.inc index 88bcb2e6c..f537694dd 100644 --- a/data/maps/SlateportCity/scripts.inc +++ b/data/maps/SlateportCity/scripts.inc @@ -1,9 +1,9 @@ SlateportCity_MapScripts:: @ 81DCC61 - map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_MapScript1_1DCC6C + map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, SlateportCity_MapScript2_1DCD12 .byte 0 -SlateportCity_MapScript1_1DCC6C: @ 81DCC6C +SlateportCity_OnTransition: @ 81DCC6C setvar VAR_SLATEPORT_MUSEUM_1F_STATE, 0 call SlateportCity_EventScript_1DCC8D compare VAR_SLATEPORT_STATE, 1 @@ -491,17 +491,17 @@ SlateportCity_EventScript_1DD16A:: @ 81DD16A faceplayer message gUnknown_08272A21 waitmessage - pokemartdecoration SlateportCity_PokemartDecor_1DD184 + pokemartdecoration SlateportCity_PokemartDecor_Dolls msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end .align 2 -SlateportCity_PokemartDecor_1DD184: @ 81DD184 - .2byte 95 - .2byte 78 - .2byte 96 - .2byte 0 +SlateportCity_PokemartDecor_Dolls: @ 81DD184 + .2byte DECOR_AZURILL_DOLL + .2byte DECOR_MARILL_DOLL + .2byte DECOR_SKITTY_DOLL + .2byte DECOR_NONE release end @@ -522,21 +522,21 @@ SlateportCity_EventScript_1DD198:: @ 81DD198 end SlateportCity_PokemartDecor_1DD1B8: @ 81DD1B8 - .2byte 25 - .2byte 27 - .2byte 26 - .2byte 28 - .2byte 29 - .2byte 30 - .2byte 51 - .2byte 52 - .2byte 53 - .2byte 54 - .2byte 55 - .2byte 56 - .2byte 57 - .2byte 58 - .2byte 0 + .2byte DECOR_RED_BRICK + .2byte DECOR_BLUE_BRICK + .2byte DECOR_YELLOW_BRICK + .2byte DECOR_RED_BALLOON + .2byte DECOR_BLUE_BALLOON + .2byte DECOR_YELLOW_BALLOON + .2byte DECOR_C_LOW_NOTE_MAT + .2byte DECOR_D_NOTE_MAT + .2byte DECOR_E_NOTE_MAT + .2byte DECOR_F_NOTE_MAT + .2byte DECOR_G_NOTE_MAT + .2byte DECOR_A_NOTE_MAT + .2byte DECOR_B_NOTE_MAT + .2byte DECOR_C_HIGH_NOTE_MAT + .2byte DECOR_NONE release end @@ -1372,4 +1372,4 @@ SlateportCity_Text_1DF28C: @ 81DF28C .string "That's a really great idea!\p" .string "After all, a tough TRAINER is\n" .string "the perfect fit for the BATTLE TENT!\p" - .string "Give it your best effort!$" + .string "Give it your best effort!$"
\ No newline at end of file diff --git a/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc b/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc index a5e2a493c..e178155a9 100644 --- a/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc +++ b/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc @@ -1,10 +1,10 @@ SlateportCity_BattleTentBattleRoom_MapScripts:: @ 8209960 - map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_BattleTentBattleRoom_MapScript1_209970 + map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_BattleTentBattleRoom_OnTransition map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SlateportCity_BattleTentBattleRoom_MapScript2_20999A map_script MAP_SCRIPT_ON_FRAME_TABLE, SlateportCity_BattleTentBattleRoom_MapScript2_2099B4 .byte 0 -SlateportCity_BattleTentBattleRoom_MapScript1_209970: @ 8209970 +SlateportCity_BattleTentBattleRoom_OnTransition: @ 8209970 call SlateportCity_BattleTentBattleRoom_EventScript_209976 end diff --git a/data/maps/SlateportCity_Harbor/scripts.inc b/data/maps/SlateportCity_Harbor/scripts.inc index 8f9f77e97..32fa9fa5d 100644 --- a/data/maps/SlateportCity_Harbor/scripts.inc +++ b/data/maps/SlateportCity_Harbor/scripts.inc @@ -1,8 +1,8 @@ SlateportCity_Harbor_MapScripts:: @ 820C97D - map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_Harbor_MapScript1_20C983 + map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_Harbor_OnTransition .byte 0 -SlateportCity_Harbor_MapScript1_20C983: @ 820C983 +SlateportCity_Harbor_OnTransition: @ 820C983 setescapewarp MAP_SLATEPORT_CITY, 255, 28, 13 setvar VAR_TEMP_1, 0 compare VAR_SLATEPORT_HARBOR_STATE, 1 diff --git a/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc b/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc index 8c1f87e63..4c6b3ec7f 100644 --- a/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc @@ -1,9 +1,9 @@ SlateportCity_PokemonCenter_1F_MapScripts:: @ 820DABF - map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_PokemonCenter_1F_MapScript1_20DACA + map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_PokemonCenter_1F_OnTransition map_script MAP_SCRIPT_ON_RESUME, SlateportCity_PokemonCenter_1F_MapScript1_277C30 .byte 0 -SlateportCity_PokemonCenter_1F_MapScript1_20DACA: @ 820DACA +SlateportCity_PokemonCenter_1F_OnTransition: @ 820DACA setrespawn HEAL_LOCATION_SLATEPORT_CITY call SlateportCity_PokemonCenter_1F_EventScript_2718DE end diff --git a/data/maps/SlateportCity_PokemonCenter_2F/scripts.inc b/data/maps/SlateportCity_PokemonCenter_2F/scripts.inc index 1ddbcc0be..a9d48f43d 100644 --- a/data/maps/SlateportCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/SlateportCity_PokemonCenter_2F/scripts.inc @@ -2,7 +2,7 @@ SlateportCity_PokemonCenter_2F_MapScripts:: @ 820DC21 map_script MAP_SCRIPT_ON_FRAME_TABLE, SlateportCity_PokemonCenter_2F_MapScript2_276C3B map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SlateportCity_PokemonCenter_2F_MapScript2_276B6C map_script MAP_SCRIPT_ON_LOAD, SlateportCity_PokemonCenter_2F_MapScript1_276BBE - map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition .byte 0 SlateportCity_PokemonCenter_2F_EventScript_20DC36:: @ 820DC36 diff --git a/data/maps/SootopolisCity/scripts.inc b/data/maps/SootopolisCity/scripts.inc index ad72120f9..afad44536 100644 --- a/data/maps/SootopolisCity/scripts.inc +++ b/data/maps/SootopolisCity/scripts.inc @@ -1,6 +1,6 @@ SootopolisCity_MapScripts:: @ 81E565C map_script MAP_SCRIPT_ON_LOAD, SootopolisCity_MapScript1_1E5676 - map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_MapScript1_1E56EF + map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_OnTransition map_script MAP_SCRIPT_ON_RESUME, SootopolisCity_MapScript1_1E590B map_script MAP_SCRIPT_ON_FRAME_TABLE, SootopolisCity_MapScript2_1E5914 map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SootopolisCity_MapScript2_1E58DB @@ -31,7 +31,7 @@ SootopolisCity_EventScript_1E56E5:: @ 81E56E5 setmetatile 31, 32, 592, 1 return -SootopolisCity_MapScript1_1E56EF: @ 81E56EF +SootopolisCity_OnTransition: @ 81E56EF setflag FLAG_VISITED_SOOTOPOLIS_CITY compare VAR_RAYQUAZA_STATE, 1 call_if_eq SootopolisCity_EventScript_1E5781 diff --git a/data/maps/SootopolisCity_Gym_1F/scripts.inc b/data/maps/SootopolisCity_Gym_1F/scripts.inc index b9abdf656..e9b5d327f 100644 --- a/data/maps/SootopolisCity_Gym_1F/scripts.inc +++ b/data/maps/SootopolisCity_Gym_1F/scripts.inc @@ -2,10 +2,10 @@ SootopolisCity_Gym_1F_MapScripts:: @ 8224E4C map_script MAP_SCRIPT_ON_FRAME_TABLE, SootopolisCity_Gym_1F_MapScript2_224ECB map_script MAP_SCRIPT_ON_RESUME, SootopolisCity_Gym_1F_MapScript1_224E67 map_script MAP_SCRIPT_ON_LOAD, SootopolisCity_Gym_1F_MapScript1_224E6A - map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_Gym_1F_MapScript1_224E61 + map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_Gym_1F_OnTransition .byte 0 -SootopolisCity_Gym_1F_MapScript1_224E61: @ 8224E61 +SootopolisCity_Gym_1F_OnTransition: @ 8224E61 setvar VAR_ICE_STEP_COUNT, 1 end diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc index c7ceb0a4f..5f2352645 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc @@ -1,9 +1,9 @@ SootopolisCity_MysteryEventsHouse_1F_MapScripts:: @ 8227953 - map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_MysteryEventsHouse_1F_MapScript1_22795E + map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_MysteryEventsHouse_1F_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, SootopolisCity_MysteryEventsHouse_1F_MapScript2_22799D .byte 0 -SootopolisCity_MysteryEventsHouse_1F_MapScript1_22795E: @ 822795E +SootopolisCity_MysteryEventsHouse_1F_OnTransition: @ 822795E setvar VAR_0x8004, 16 special CallFrontierUtilFunc compare VAR_RESULT, 0 diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc index 374aa6270..16533649c 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc @@ -1,9 +1,9 @@ SootopolisCity_MysteryEventsHouse_B1F_MapScripts:: @ 8227E4F - map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_MysteryEventsHouse_B1F_MapScript1_227E5A + map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_MysteryEventsHouse_B1F_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, SootopolisCity_MysteryEventsHouse_B1F_MapScript2_227E5E .byte 0 -SootopolisCity_MysteryEventsHouse_B1F_MapScript1_227E5A: @ 8227E5A +SootopolisCity_MysteryEventsHouse_B1F_OnTransition: @ 8227E5A special SetEReaderTrainerGfxId end diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc b/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc index 97cb2d4d7..d3dfb91b0 100644 --- a/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc @@ -1,9 +1,9 @@ SootopolisCity_PokemonCenter_1F_MapScripts:: @ 82264F1 - map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_PokemonCenter_1F_MapScript1_2264FC + map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_PokemonCenter_1F_OnTransition map_script MAP_SCRIPT_ON_RESUME, SootopolisCity_PokemonCenter_1F_MapScript1_277C30 .byte 0 -SootopolisCity_PokemonCenter_1F_MapScript1_2264FC: @ 82264FC +SootopolisCity_PokemonCenter_1F_OnTransition: @ 82264FC setrespawn HEAL_LOCATION_SOOTOPOLIS_CITY end diff --git a/data/maps/SootopolisCity_PokemonCenter_2F/scripts.inc b/data/maps/SootopolisCity_PokemonCenter_2F/scripts.inc index 275fe3046..4c9fce912 100644 --- a/data/maps/SootopolisCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/SootopolisCity_PokemonCenter_2F/scripts.inc @@ -2,7 +2,7 @@ SootopolisCity_PokemonCenter_2F_MapScripts:: @ 822676D map_script MAP_SCRIPT_ON_FRAME_TABLE, SootopolisCity_PokemonCenter_2F_MapScript2_276C3B map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SootopolisCity_PokemonCenter_2F_MapScript2_276B6C map_script MAP_SCRIPT_ON_LOAD, SootopolisCity_PokemonCenter_2F_MapScript1_276BBE - map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition .byte 0 SootopolisCity_PokemonCenter_2F_EventScript_226782:: @ 8226782 diff --git a/data/maps/SouthernIsland_Interior/scripts.inc b/data/maps/SouthernIsland_Interior/scripts.inc index 958c5f546..a87b59079 100644 --- a/data/maps/SouthernIsland_Interior/scripts.inc +++ b/data/maps/SouthernIsland_Interior/scripts.inc @@ -1,6 +1,6 @@ SouthernIsland_Interior_MapScripts:: @ 8242A45 map_script MAP_SCRIPT_ON_RESUME, SouthernIsland_Interior_MapScript1_242A50 - map_script MAP_SCRIPT_ON_TRANSITION, SouthernIsland_Interior_MapScript1_242A6E + map_script MAP_SCRIPT_ON_TRANSITION, SouthernIsland_Interior_OnTransition .byte 0 SouthernIsland_Interior_MapScript1_242A50: @ 8242A50 @@ -14,7 +14,7 @@ SouthernIsland_Interior_EventScript_242A5A:: @ 8242A5A removeobject 2 return -SouthernIsland_Interior_MapScript1_242A6E: @ 8242A6E +SouthernIsland_Interior_OnTransition: @ 8242A6E compare VAR_ROAMER_POKEMON, 0 call_if_eq SouthernIsland_Interior_EventScript_242A8A compare VAR_ROAMER_POKEMON, 0 diff --git a/data/maps/TerraCave_End/scripts.inc b/data/maps/TerraCave_End/scripts.inc index b5a664a76..79b209e8a 100644 --- a/data/maps/TerraCave_End/scripts.inc +++ b/data/maps/TerraCave_End/scripts.inc @@ -1,6 +1,6 @@ TerraCave_End_MapScripts:: @ 823B0B0 map_script MAP_SCRIPT_ON_RESUME, TerraCave_End_MapScript1_23B0BB - map_script MAP_SCRIPT_ON_TRANSITION, TerraCave_End_MapScript1_23B0D9 + map_script MAP_SCRIPT_ON_TRANSITION, TerraCave_End_OnTransition .byte 0 TerraCave_End_MapScript1_23B0BB: @ 823B0BB @@ -14,7 +14,7 @@ TerraCave_End_EventScript_23B0C5:: @ 823B0C5 removeobject 1 return -TerraCave_End_MapScript1_23B0D9: @ 823B0D9 +TerraCave_End_OnTransition: @ 823B0D9 call_if_unset FLAG_DEFEATED_GROUDON, TerraCave_End_EventScript_23B0E3 end diff --git a/data/maps/TerraCave_Entrance/scripts.inc b/data/maps/TerraCave_Entrance/scripts.inc index b9e3e5910..70aa9cdfa 100644 --- a/data/maps/TerraCave_Entrance/scripts.inc +++ b/data/maps/TerraCave_Entrance/scripts.inc @@ -1,8 +1,8 @@ TerraCave_Entrance_MapScripts:: @ 823B0A6 - map_script MAP_SCRIPT_ON_TRANSITION, TerraCave_Entrance_MapScript1_23B0AC + map_script MAP_SCRIPT_ON_TRANSITION, TerraCave_Entrance_OnTransition .byte 0 -TerraCave_Entrance_MapScript1_23B0AC: @ 823B0AC +TerraCave_Entrance_OnTransition: @ 823B0AC setflag FLAG_ARRIVED_AT_TERRA_CAVE_ENTRANCE end diff --git a/data/maps/Underwater_MarineCave/scripts.inc b/data/maps/Underwater_MarineCave/scripts.inc index 9309d51f4..248854dd7 100644 --- a/data/maps/Underwater_MarineCave/scripts.inc +++ b/data/maps/Underwater_MarineCave/scripts.inc @@ -1,13 +1,13 @@ Underwater_MarineCave_MapScripts:: @ 823AFB8 - map_script MAP_SCRIPT_ON_RESUME, Underwater_MarineCave_MapScript1_23AFC7 - map_script MAP_SCRIPT_ON_TRANSITION, Underwater_MarineCave_MapScript1_23AFC3 + map_script MAP_SCRIPT_ON_RESUME, Underwater_MarineCave_MapScript1_OnResume + map_script MAP_SCRIPT_ON_TRANSITION, Underwater_MarineCave_OnTransition .byte 0 -Underwater_MarineCave_MapScript1_23AFC3: @ 823AFC3 +Underwater_MarineCave_OnTransition: @ 823AFC3 setflag FLAG_ARRIVED_AT_MARINE_CAVE_EMERGE_SPOT end -Underwater_MarineCave_MapScript1_23AFC7: @ 823AFC7 +Underwater_MarineCave_MapScript1_OnResume: @ 823AFC7 setdivewarp MAP_MARINE_CAVE_ENTRANCE, 255, 10, 17 end diff --git a/data/maps/UnionRoom/scripts.inc b/data/maps/UnionRoom/scripts.inc index 0871ae033..c2f375e0f 100644 --- a/data/maps/UnionRoom/scripts.inc +++ b/data/maps/UnionRoom/scripts.inc @@ -1,6 +1,6 @@ UnionRoom_MapScripts:: @ 823D1A6 map_script MAP_SCRIPT_ON_RESUME, UnionRoom_MapScript1_23D1B1 - map_script MAP_SCRIPT_ON_TRANSITION, UnionRoom_MapScript1_23D1E5 + map_script MAP_SCRIPT_ON_TRANSITION, UnionRoom_OnTransition .byte 0 UnionRoom_MapScript1_23D1B1: @ 823D1B1 @@ -23,7 +23,7 @@ UnionRoom_MapScript1_23D1B1: @ 823D1B1 special UnionRoomSpecial end -UnionRoom_MapScript1_23D1E5: @ 823D1E5 +UnionRoom_OnTransition: @ 823D1E5 end UnionRoom_EventScript_23D1E6:: @ 823D1E6 diff --git a/data/maps/VerdanturfTown/scripts.inc b/data/maps/VerdanturfTown/scripts.inc index bd2bce048..bd8328db8 100644 --- a/data/maps/VerdanturfTown/scripts.inc +++ b/data/maps/VerdanturfTown/scripts.inc @@ -1,8 +1,8 @@ VerdanturfTown_MapScripts:: @ 81EB566 - map_script MAP_SCRIPT_ON_TRANSITION, VerdanturfTown_MapScript1_1EB56C + map_script MAP_SCRIPT_ON_TRANSITION, VerdanturfTown_OnTransition .byte 0 -VerdanturfTown_MapScript1_1EB56C: @ 81EB56C +VerdanturfTown_OnTransition: @ 81EB56C setflag FLAG_VISITED_VERDANTURF_TOWN setvar VAR_LINK_CONTEST_ROOM_STATE, 0 end diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc b/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc index 9d98e790c..b43bc6077 100644 --- a/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc +++ b/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc @@ -1,10 +1,10 @@ VerdanturfTown_BattleTentBattleRoom_MapScripts:: @ 82022FA - map_script MAP_SCRIPT_ON_TRANSITION, VerdanturfTown_BattleTentBattleRoom_MapScript1_20230A + map_script MAP_SCRIPT_ON_TRANSITION, VerdanturfTown_BattleTentBattleRoom_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, VerdanturfTown_BattleTentBattleRoom_MapScript2_20233E map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, VerdanturfTown_BattleTentBattleRoom_MapScript2_202541 .byte 0 -VerdanturfTown_BattleTentBattleRoom_MapScript1_20230A: @ 820230A +VerdanturfTown_BattleTentBattleRoom_OnTransition: @ 820230A call VerdanturfTown_BattleTentBattleRoom_EventScript_202310 end diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc index 474448132..5eb738e73 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc @@ -1,9 +1,9 @@ VerdanturfTown_PokemonCenter_1F_MapScripts:: @ 8202726 - map_script MAP_SCRIPT_ON_TRANSITION, VerdanturfTown_PokemonCenter_1F_MapScript1_202731 + map_script MAP_SCRIPT_ON_TRANSITION, VerdanturfTown_PokemonCenter_1F_OnTransition map_script MAP_SCRIPT_ON_RESUME, VerdanturfTown_PokemonCenter_1F_MapScript1_277C30 .byte 0 -VerdanturfTown_PokemonCenter_1F_MapScript1_202731: @ 8202731 +VerdanturfTown_PokemonCenter_1F_OnTransition: @ 8202731 setrespawn HEAL_LOCATION_VERDANTURF_TOWN call VerdanturfTown_PokemonCenter_1F_EventScript_2718DE end diff --git a/data/maps/VerdanturfTown_PokemonCenter_2F/scripts.inc b/data/maps/VerdanturfTown_PokemonCenter_2F/scripts.inc index b09335fb2..0964fa96f 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_2F/scripts.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_2F/scripts.inc @@ -2,7 +2,7 @@ VerdanturfTown_PokemonCenter_2F_MapScripts:: @ 8202897 map_script MAP_SCRIPT_ON_FRAME_TABLE, VerdanturfTown_PokemonCenter_2F_MapScript2_276C3B map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, VerdanturfTown_PokemonCenter_2F_MapScript2_276B6C map_script MAP_SCRIPT_ON_LOAD, VerdanturfTown_PokemonCenter_2F_MapScript1_276BBE - map_script MAP_SCRIPT_ON_TRANSITION, VerdanturfTown_PokemonCenter_2F_MapScript1_276ACF + map_script MAP_SCRIPT_ON_TRANSITION, PokemonCenter_2F_OnTransition .byte 0 VerdanturfTown_PokemonCenter_2F_EventScript_2028AC:: @ 82028AC diff --git a/data/maps/VictoryRoad_1F/scripts.inc b/data/maps/VictoryRoad_1F/scripts.inc index 96f3c6f42..5214edc44 100644 --- a/data/maps/VictoryRoad_1F/scripts.inc +++ b/data/maps/VictoryRoad_1F/scripts.inc @@ -1,8 +1,8 @@ VictoryRoad_1F_MapScripts:: @ 8235D7A - map_script MAP_SCRIPT_ON_TRANSITION, VictoryRoad_1F_MapScript1_235D80 + map_script MAP_SCRIPT_ON_TRANSITION, VictoryRoad_1F_OnTransition .byte 0 -VictoryRoad_1F_MapScript1_235D80: @ 8235D80 +VictoryRoad_1F_OnTransition: @ 8235D80 compare VAR_VICTORY_ROAD_1F_STATE, 1 call_if_eq VictoryRoad_1F_EventScript_235D97 compare VAR_VICTORY_ROAD_1F_STATE, 2 diff --git a/data/maps/VictoryRoad_B1F/map.json b/data/maps/VictoryRoad_B1F/map.json index 74bd3dbf8..b8f00f4fb 100644 --- a/data/maps/VictoryRoad_B1F/map.json +++ b/data/maps/VictoryRoad_B1F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "VictoryRoad_B1F_EventScript_2908BA", + "script": "EventScript_StrengthBoulder", "flag": "FLAG_TEMP_13" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "VictoryRoad_B1F_EventScript_2908BA", + "script": "EventScript_StrengthBoulder", "flag": "FLAG_TEMP_14" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "VictoryRoad_B1F_EventScript_2908BA", + "script": "EventScript_StrengthBoulder", "flag": "FLAG_TEMP_11" }, { @@ -63,7 +63,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "VictoryRoad_B1F_EventScript_2908BA", + "script": "EventScript_StrengthBoulder", "flag": "FLAG_TEMP_12" }, { @@ -76,7 +76,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "VictoryRoad_B1F_EventScript_2908BA", + "script": "EventScript_StrengthBoulder", "flag": "FLAG_TEMP_17" }, { @@ -89,7 +89,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "VictoryRoad_B1F_EventScript_2908BA", + "script": "EventScript_StrengthBoulder", "flag": "FLAG_TEMP_16" }, { @@ -102,7 +102,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "VictoryRoad_B1F_EventScript_2908BA", + "script": "EventScript_StrengthBoulder", "flag": "FLAG_TEMP_1E" }, { @@ -115,7 +115,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "VictoryRoad_B1F_EventScript_2907A6", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_19" }, { @@ -128,7 +128,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "VictoryRoad_B1F_EventScript_2907A6", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_1A" }, { @@ -141,7 +141,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "VictoryRoad_B1F_EventScript_2907A6", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_1B" }, { @@ -154,7 +154,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "VictoryRoad_B1F_EventScript_2907A6", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_1C" }, { @@ -167,7 +167,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "VictoryRoad_B1F_EventScript_2907A6", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_1D" }, { @@ -180,7 +180,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "VictoryRoad_B1F_EventScript_2908BA", + "script": "EventScript_StrengthBoulder", "flag": "FLAG_TEMP_1F" }, { @@ -232,7 +232,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "VictoryRoad_B1F_EventScript_2907A6", + "script": "EventScript_RockSmash", "flag": "FLAG_TEMP_15" }, { diff --git a/data/menu_specialized.s b/data/menu_specialized.s deleted file mode 100644 index 2005d5bf6..000000000 --- a/data/menu_specialized.s +++ /dev/null @@ -1,72 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - - -gUnknown_08625AD0:: @ 8625AD0 - .2byte 0 - .2byte 0x4000 - .2byte 0 - .2byte 0 - -gUnknown_08625AD8:: @ 8625AD8 - .2byte 0 - .2byte 5 - .2byte 4 - .2byte 5 - -gUnknown_08625AE0:: @ 8625AE0 - .2byte 8 - .2byte 5 - .2byte 12 - .2byte 5 - -gUnknown_08625AE8:: @ 8625AE8 - .2byte 16 - .2byte 5 - .2byte 20 - .2byte 5 - -gUnknown_08625AF0:: @ 8625AF0 - .2byte 24 - .2byte 5 - .2byte 0xFFFF - .2byte 0 - -gUnknown_08625AF8:: @ 8625AF8 - .4byte gUnknown_08625AD8 - .4byte gUnknown_08625AE0 - -gUnknown_08625B00:: @ 8625B00 - .4byte gUnknown_08625AE8 - .4byte gUnknown_08625AF0 - -gUnknown_08625B08:: @ 8625B08 - .4byte gUnknown_08625AF8 - .4byte gUnknown_08625B00 - .4byte gUnknown_08625B08 - -gUnknown_08625B14:: @ 8625B14 - spr_template 0x68, 0x68, gUnknown_08625AD0, gUnknown_08625AF8, NULL gDummySpriteAffineAnimTable, sub_81D3564 - -gUnknown_08625B2C:: @ 8625B2C - .2byte 0, 0xFFDD - .2byte 20, 0xFFE4 - .2byte 33, 0xFFF6 - .2byte 33, 10 - .2byte 20, 28 - .2byte 0, 35 - .2byte 0xFFEC, 28 - .2byte 0xFFDF, 10 - .2byte 0xFFDF, 0xFFF6 - .2byte 0xFFEC, 0xFFE4 - -gUnknown_08625B54:: @ 8625B54 - .4byte gUnknown_085EEA46 - .4byte gUnknown_085EEA4E - .4byte gUnknown_085EEA55 - .4byte gUnknown_085EEA63 - .4byte gUnknown_085EEA6B - .4byte gUnknown_085EEA5D diff --git a/data/pokemon_jump.s b/data/pokemon_jump.s index 8ef0201e4..b10c37600 100755 --- a/data/pokemon_jump.s +++ b/data/pokemon_jump.s @@ -5,133 +5,6 @@ .section .rodata .align 2 -gPkmnJumpSpecies:: @ 82FB464 - .2byte SPECIES_BULBASAUR, 0x0002 - .2byte SPECIES_CHARMANDER, 0x0001 - .2byte SPECIES_SQUIRTLE, 0x0000 - .2byte SPECIES_CATERPIE, 0x0001 - .2byte SPECIES_METAPOD, 0x0001 - .2byte SPECIES_WEEDLE, 0x0001 - .2byte SPECIES_KAKUNA, 0x0001 - .2byte SPECIES_RATTATA, 0x0001 - .2byte SPECIES_RATICATE, 0x0001 - .2byte SPECIES_PIKACHU, 0x0000 - .2byte SPECIES_SANDSHREW, 0x0000 - .2byte SPECIES_NIDORAN_F, 0x0000 - .2byte SPECIES_NIDORAN_M, 0x0000 - .2byte SPECIES_CLEFAIRY, 0x0000 - .2byte SPECIES_VULPIX, 0x0000 - .2byte SPECIES_JIGGLYPUFF, 0x0002 - .2byte SPECIES_ODDISH, 0x0002 - .2byte SPECIES_PARAS, 0x0001 - .2byte SPECIES_MEOWTH, 0x0000 - .2byte SPECIES_PSYDUCK, 0x0002 - .2byte SPECIES_MANKEY, 0x0001 - .2byte SPECIES_GROWLITHE, 0x0001 - .2byte SPECIES_POLIWAG, 0x0002 - .2byte SPECIES_BELLSPROUT, 0x0002 - .2byte SPECIES_SHELLDER, 0x0001 - .2byte SPECIES_KRABBY, 0x0001 - .2byte SPECIES_EXEGGCUTE, 0x0002 - .2byte SPECIES_CUBONE, 0x0000 - .2byte SPECIES_DITTO, 0x0002 - .2byte SPECIES_EEVEE, 0x0000 - .2byte SPECIES_OMANYTE, 0x0001 - .2byte SPECIES_KABUTO, 0x0001 - .2byte SPECIES_CHIKORITA, 0x0002 - .2byte SPECIES_CYNDAQUIL, 0x0001 - .2byte SPECIES_TOTODILE, 0x0000 - .2byte SPECIES_SPINARAK, 0x0001 - .2byte SPECIES_PICHU, 0x0000 - .2byte SPECIES_CLEFFA, 0x0000 - .2byte SPECIES_IGGLYBUFF, 0x0002 - .2byte SPECIES_TOGEPI, 0x0002 - .2byte SPECIES_MAREEP, 0x0000 - .2byte SPECIES_BELLOSSOM, 0x0002 - .2byte SPECIES_MARILL, 0x0002 - .2byte SPECIES_SUNKERN, 0x0002 - .2byte SPECIES_WOOPER, 0x0002 - .2byte SPECIES_PINECO, 0x0002 - .2byte SPECIES_SNUBBULL, 0x0000 - .2byte SPECIES_SHUCKLE, 0x0002 - .2byte SPECIES_TEDDIURSA, 0x0000 - .2byte SPECIES_SLUGMA, 0x0002 - .2byte SPECIES_SWINUB, 0x0000 - .2byte SPECIES_HOUNDOUR, 0x0001 - .2byte SPECIES_PHANPY, 0x0000 - .2byte SPECIES_PORYGON2, 0x0000 - .2byte SPECIES_TYROGUE, 0x0001 - .2byte SPECIES_SMOOCHUM, 0x0002 - .2byte SPECIES_ELEKID, 0x0001 - .2byte SPECIES_MAGBY, 0x0001 - .2byte SPECIES_LARVITAR, 0x0001 - .2byte SPECIES_TREECKO, 0x0001 - .2byte SPECIES_TORCHIC, 0x0002 - .2byte SPECIES_MUDKIP, 0x0000 - .2byte SPECIES_MARSHTOMP, 0x0000 - .2byte SPECIES_POOCHYENA, 0x0001 - .2byte SPECIES_ZIGZAGOON, 0x0000 - .2byte SPECIES_LINOONE, 0x0000 - .2byte SPECIES_WURMPLE, 0x0001 - .2byte SPECIES_SILCOON, 0x0002 - .2byte SPECIES_CASCOON, 0x0002 - .2byte SPECIES_LOTAD, 0x0002 - .2byte SPECIES_SEEDOT, 0x0001 - .2byte SPECIES_RALTS, 0x0000 - .2byte SPECIES_KIRLIA, 0x0000 - .2byte SPECIES_SURSKIT, 0x0002 - .2byte SPECIES_SHROOMISH, 0x0002 - .2byte SPECIES_NINCADA, 0x0001 - .2byte SPECIES_WHISMUR, 0x0000 - .2byte SPECIES_AZURILL, 0x0002 - .2byte SPECIES_SKITTY, 0x0000 - .2byte SPECIES_SABLEYE, 0x0000 - .2byte SPECIES_MAWILE, 0x0000 - .2byte SPECIES_ARON, 0x0001 - .2byte SPECIES_MEDITITE, 0x0002 - .2byte SPECIES_ELECTRIKE, 0x0001 - .2byte SPECIES_PLUSLE, 0x0001 - .2byte SPECIES_MINUN, 0x0001 - .2byte SPECIES_VOLBEAT, 0x0000 - .2byte SPECIES_ILLUMISE, 0x0000 - .2byte SPECIES_ROSELIA, 0x0002 - .2byte SPECIES_GULPIN, 0x0002 - .2byte SPECIES_NUMEL, 0x0002 - .2byte SPECIES_TORKOAL, 0x0002 - .2byte SPECIES_SPOINK, 0x0000 - .2byte SPECIES_TRAPINCH, 0x0002 - .2byte SPECIES_CACNEA, 0x0002 - .2byte SPECIES_ANORITH, 0x0001 - .2byte SPECIES_WYNAUT, 0x0000 - .2byte SPECIES_SNORUNT, 0x0000 - .2byte SPECIES_CLAMPERL, 0x0001 - .2byte SPECIES_BAGON, 0x0001 - - .align 2 -gUnknown_082FB5F4:: @ 82FB5F4 - .4byte sub_802B248 - .4byte sub_802B2D4 - .4byte sub_802B368 - .4byte sub_802B3D4 - .4byte sub_802B4CC - .4byte sub_802B5C8 - .4byte sub_802B664 - .4byte sub_802B6B8 - .4byte sub_802B720 - - .align 2 -gUnknown_082FB618:: @ 82FB618 - .4byte sub_802B29C - .4byte sub_802B31C - .4byte sub_802B3B4 - .4byte sub_802B470 - .4byte sub_802B568 - .4byte sub_802B628 - .4byte sub_802B664 - .4byte sub_802B704 - .4byte sub_802B720 - - .align 2 gUnknown_082FB63C:: @ 82FB63C .2byte 0x001a, 0x001f, 0x0024, 0x0029, 0x002e, 0x0033, 0x0038, 0x003d @@ -151,12 +24,14 @@ gUnknown_082FB65C:: @ 82FB65C .byte 0xee, 0xef, 0xf1, 0xf3, 0xf5, 0xf8, 0xfa, 0xfc .byte 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0xfd, 0xfa, 0xf7, 0xf5, 0xf2, 0xf0, 0xee, 0xec .byte 0xea, 0xe8, 0xe6, 0xe4, 0xe3, 0xe2, 0xe2, 0xe4 .byte 0xe6, 0xe8, 0xea, 0xec, 0xee, 0xf0, 0xf2, 0xf5 .byte 0xf7, 0xfa, 0xfc, 0xff, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0xfd, 0xfa, 0xf7, 0xf5, 0xf3, 0xf1, 0xef, 0xed .byte 0xeb, 0xe9, 0xe7, 0xe5, 0xe4, 0xe3, 0xe2, 0xe2 .byte 0xe2, 0xe2, 0xe3, 0xe3, 0xe4, 0xe4, 0xe5, 0xe5 diff --git a/data/pokenav.s b/data/pokenav.s index cb5030b4b..81ee9024d 100644 --- a/data/pokenav.s +++ b/data/pokenav.s @@ -3,128 +3,7 @@ .section .rodata -gUnknown_0861FA6C:: @ 861FA6C - obj_tiles gPokenavLeftHeaderMainMenu_Gfx, 0x20, 3 - obj_tiles gPokenavLeftHeaderCondition_Gfx, 0x20, 1 - obj_tiles gPokenavLeftHeaderRibbons_Gfx, 0x20, 2 - obj_tiles gPokenavLeftHeaderMatchCall_Gfx, 0x20, 4 - obj_tiles gPokenavLeftHeaderHoennMap_Gfx, 0x20, 0 - obj_tiles gPokenavLeftHeaderHoennMap_Gfx, 0x40, 0 - -gUnknown_0861FA9C:: @ 861FA9C - .4byte gPokenavLeftHeaderParty_Gfx, 1 - .4byte gPokenavLeftHeaderSearch_Gfx, 1 - .4byte gPokenavLeftHeaderCool_Gfx, 4 - .4byte gPokenavLeftHeaderBeauty_Gfx, 1 - .4byte gPokenavLeftHeaderCute_Gfx, 2 - .4byte gPokenavLeftHeaderSmart_Gfx, 0 - .4byte gPokenavLeftHeaderTough_Gfx, 0 - -gUnknown_0861FAD4:: @ 861FAD4 - .2byte 0x0 - .2byte 0x8000 - .2byte 0x0 - .2byte 0x0 - -gUnknown_0861FADC:: - obj_image_anim_frame 0, 8 - obj_image_anim_frame 16, 8 - obj_image_anim_frame 32, 8 - obj_image_anim_frame 48, 8 - obj_image_anim_frame 64, 8 - obj_image_anim_frame 80, 8 - obj_image_anim_frame 96, 8 - obj_image_anim_frame 112, 8 - obj_image_anim_jump 0 - -gUnknown_0861FB00:: - .4byte gUnknown_0861FADC - -gUnknown_0861FB04:: @ 861FB04 - spr_template 0, 0, gUnknown_0861FAD4, gUnknown_0861FB00, NULL, gDummySpriteAffineAnimTable, sub_81C7CB4 - -gUnknown_0861FB1C:: - .2byte 0x4000 - .2byte 0xC000 - .2byte 0x400 - .2byte 0x0 - -gUnknown_0861FB24:: - .2byte 0x4000 - .2byte 0x8000 - .2byte 0x400 - .2byte 0x0 - -gUnknown_0861FB2C:: @ 861FB2C - spr_template 2, 1, gUnknown_0861FB1C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - -gUnknown_0861FB44:: @ 861FB44 - spr_template 2, 2, gUnknown_0861FB24, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - -gUnknown_0861FB5C:: @ 861FB5C - .incbin "graphics/pokenav/arrows_matchcall.gbapal" - -gUnknown_0861FB7C:: @ 861FB7C - .incbin "graphics/pokenav/arrows_matchcall.4bpp.lz" - -gUnknown_0861FBE4:: @ 861FBE4 - .byte 0x0 - .byte 0x2 - .byte 0x5 - .byte 0x0 - -gUnknown_0861FBE8:: @ 861FBE8 - .4byte gUnknown_085EBEA8 - .4byte gUnknown_085EBEB1 - .4byte gUnknown_085EBEC3 - -gUnknown_0861FBF4:: @ 861FBF4 - .byte 0x1 - .byte 0x4 - .byte 0x5 - -gUnknown_0861FBF7:: @ 861FBF7 - .byte 0x2 - .byte 0x4 - .byte 0x6 - .byte 0x7 - .byte 0x0 - -gUnknown_0861FBFC:: @ 861FBFC - .4byte gUnknown_0861FB7C - .2byte 0xC0 - .2byte 0xA - -gUnknown_0861FC04:: @ 861FC04 - .4byte gUnknown_0861FB5C - .4byte 0x14 - .4byte 0x0 - .4byte 0x0 - -gUnknown_0861FC14:: @ 861FC14 - .4byte 0x8000 - .4byte 0x800 - -gUnknown_0861FC1C:: @ 861FC1C - spr_template 10, 20, gUnknown_0861FC14, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81C9080 - -gUnknown_0861FC34:: @ 861FC34 - .4byte 0x4000 - .4byte 0x800 - -gUnknown_0861FC3C:: @ 861FC3C - spr_template 10, 20, gUnknown_0861FC34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - -gUnknown_0861FC54:: @ 861FC54 - .byte 2 - .byte 3 - .byte 4 - .byte 2 - .byte 5 - -gUnknown_0861FC59:: @ 861FC59 - .byte 0, 1, 4, 4, 4, 4, 0, 1, 2, 4, 4, 4, 0, 1, 2, 3, 4, 4, 5, 6, 7, 4, 4, 4, 8, 9, 10, 11, 12, 13, 0 - +// pokenav_unk_2.s gUnknown_0861FC78:: @ 861FC78 .incbin "graphics/pokenav/bg.gbapal" @@ -313,7 +192,8 @@ gUnknown_08620384:: @ 8620384 .4byte 0x4000040 .4byte 0xa2600001 .byte 1, 0, 0, 0 - + +// pokenav_unk_3.s gUnknown_08620390:: @ 8620390 .string "Becalm fighting emotions.$" @@ -1339,6 +1219,7 @@ gUnknown_08622508:: @ 8622508 gUnknown_0862250A:: @ 862250A .byte 0, 1, 2, 0, 0, 0 +// pokenav_unk_4.s gUnknown_08622510:: @ 8622510 .incbin "graphics/pokenav/ui_matchcall.gbapal" @@ -1371,7 +1252,7 @@ gUnknown_0862278C:: @ 862278C .4byte 0x20206A gUnknown_08622794:: @ 8622794 - .4byte 0x3077 + .4byte 0x00003077 gUnknown_08622798:: @ 8622798 .4byte NULL @@ -1435,6 +1316,7 @@ gUnknown_08622848:: @ 8622848 gUnknown_08622850:: @ 8622850 spr_template 8, 13, gUnknown_08622848, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy +// pokenav_unk_5.s gUnknown_08622868:: @ 8622868 .incbin "graphics/pokenav/8622868.gbapal" @@ -1568,6 +1450,10 @@ gUnknown_086231C8:: @ 86231C8 gUnknown_086231D0:: @ 86231D0 spr_template 6, 11, gUnknown_086231C8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81CCEF4 +// pokenav_unk_6.s +// <none> + +// pokenav_unk_7.s gUnknown_086231E8:: @ 86231E8 .incbin "graphics/pokenav/86231E8.gbapal" @@ -1600,6 +1486,7 @@ gUnknown_08623374:: @ 8623374 gUnknown_0862337C:: @ 862337C window_template 1, 13, 0x1C, 3, 2, 15, 0x44 +// pokenav_unk_8.s gUnknown_08623384:: @ 8623384 .4byte NULL .4byte sub_81CE37C @@ -1660,6 +1547,7 @@ gUnknown_086235D4:: @ 86235D4 .string "{UNK_SPACER}$" .align 2 +// pokenav_unk_9.s gUnknown_086235D8:: @ 86235D8 .4byte sub_81CFB8C .4byte sub_81CFC2C @@ -1707,6 +1595,7 @@ gUnknown_086237F4:: @ 86237F4 .string "{UNK_SPACER}$" .align 2 +// pokenav_unk_10.s gUnknown_086237F8:: @ 86237F8 .byte 1, 1, 0, 0 .byte 3, 4, 1, 0 diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index c755493dc..fe3fa9fae 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -1,24 +1,8 @@ -BattleFrontier_PokemonCenter_2F_MapScript1_276ACF: @ 8276ACF -DewfordTown_PokemonCenter_2F_MapScript1_276ACF: @ 8276ACF -EverGrandeCity_PokemonCenter_2F_MapScript1_276ACF: @ 8276ACF -EverGrandeCity_PokemonLeague_2F_MapScript1_276ACF: @ 8276ACF -FallarborTown_PokemonCenter_2F_MapScript1_276ACF: @ 8276ACF -FortreeCity_PokemonCenter_2F_MapScript1_276ACF: @ 8276ACF -LavaridgeTown_PokemonCenter_2F_MapScript1_276ACF: @ 8276ACF -LilycoveCity_PokemonCenter_2F_MapScript1_276ACF: @ 8276ACF -MauvilleCity_PokemonCenter_2F_MapScript1_276ACF: @ 8276ACF -MossdeepCity_PokemonCenter_2F_MapScript1_276ACF: @ 8276ACF -OldaleTown_PokemonCenter_2F_MapScript1_276ACF: @ 8276ACF -PacifidlogTown_PokemonCenter_2F_MapScript1_276ACF: @ 8276ACF -PetalburgCity_PokemonCenter_2F_MapScript1_276ACF: @ 8276ACF -RustboroCity_PokemonCenter_2F_MapScript1_276ACF: @ 8276ACF -SlateportCity_PokemonCenter_2F_MapScript1_276ACF: @ 8276ACF -SootopolisCity_PokemonCenter_2F_MapScript1_276ACF: @ 8276ACF -VerdanturfTown_PokemonCenter_2F_MapScript1_276ACF: @ 8276ACF - call OldaleTown_PokemonCenter_2F_EventScript_276AD5 - end - -OldaleTown_PokemonCenter_2F_EventScript_276AD5:: @ 8276AD5 +PokemonCenter_2F_OnTransition: @ 8276ACF + call OldaleTown_PokemonCenter_2F_EventScript_OnTransitionCheckMysteryGift + end + +OldaleTown_PokemonCenter_2F_EventScript_OnTransitionCheckMysteryGift:: @ 8276AD5 specialvar VAR_RESULT, sub_813B514 compare VAR_RESULT, 1 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_276AFB diff --git a/data/scripts/field_move_scripts.inc b/data/scripts/field_move_scripts.inc index 024ffbf85..6eae55294 100644 --- a/data/scripts/field_move_scripts.inc +++ b/data/scripts/field_move_scripts.inc @@ -1,221 +1,189 @@ -PetalburgWoods_EventScript_2906BB:: @ 82906BB -Route103_EventScript_2906BB:: @ 82906BB -Route104_EventScript_2906BB:: @ 82906BB -Route110_TrickHousePuzzle1_EventScript_2906BB:: @ 82906BB -Route111_EventScript_2906BB:: @ 82906BB -Route116_EventScript_2906BB:: @ 82906BB -Route117_EventScript_2906BB:: @ 82906BB -Route118_EventScript_2906BB:: @ 82906BB -Route120_EventScript_2906BB:: @ 82906BB -Route121_EventScript_2906BB:: @ 82906BB -Route123_EventScript_2906BB:: @ 82906BB + +EventScript_CutTree:: @ 82906BB lockall - goto_if_unset FLAG_BADGE01_GET, Route103_EventScript_290721 + goto_if_unset FLAG_BADGE01_GET, EventScript_CheckTreeCantCut checkpartymove MOVE_CUT compare VAR_RESULT, 6 - goto_if_eq Route103_EventScript_290721 + goto_if_eq EventScript_CheckTreeCantCut setfieldeffectargument 0, VAR_RESULT bufferpartymonnick 0, VAR_RESULT buffermovename 1, MOVE_CUT - msgbox Route103_Text_29072E, MSGBOX_YESNO + msgbox Text_WantToCut, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if_eq Route103_EventScript_29072B - msgbox Route103_Text_290771, MSGBOX_DEFAULT + goto_if_eq EventScript_CancelCut + msgbox Text_MonUsedHM, MSGBOX_DEFAULT closemessage - dofieldeffect 2 + dofieldeffect FLDEFF_USE_CUT_ON_TREE waitstate - goto Route103_EventScript_290710 + goto EventScript_CutTreeDown end -Route103_EventScript_290705:: @ 8290705 +EventScript_FldEffCut:: @ 8290705 lockall - dofieldeffect 2 + dofieldeffect FLDEFF_USE_CUT_ON_TREE waitstate - goto Route103_EventScript_290710 + goto EventScript_CutTreeDown end -Route103_EventScript_290710:: @ 8290710 - applymovement VAR_LAST_TALKED, Route103_Movement_29071F +EventScript_CutTreeDown:: @ 8290710 + applymovement VAR_LAST_TALKED, Movement_CutTreeDown waitmovement 0 removeobject VAR_LAST_TALKED releaseall end -Route103_Movement_29071F: @ 829071F +Movement_CutTreeDown: @ 829071F cut_tree step_end -Route103_EventScript_290721:: @ 8290721 - msgbox Route103_Text_29077D, MSGBOX_DEFAULT +EventScript_CheckTreeCantCut:: @ 8290721 + msgbox Text_CantCut, MSGBOX_DEFAULT releaseall end -Route103_EventScript_29072B:: @ 829072B +EventScript_CancelCut:: @ 829072B closemessage releaseall end -Route103_Text_29072E: @ 829072E +Text_WantToCut: @ 829072E .string "This tree looks like it can be\n" .string "CUT down!\p" .string "Would you like to CUT it?$" -Route103_Text_290771: @ 8290771 -Route111_Text_290771: @ 8290771 +Text_MonUsedHM: @ 8290771 .string "{STR_VAR_1} used {STR_VAR_2}!$" -Route103_Text_29077D: @ 829077D +Text_CantCut: @ 829077D .string "This tree looks like it can be\n" .string "CUT down!$" -GraniteCave_B2F_EventScript_2907A6:: @ 82907A6 -MirageTower_3F_EventScript_2907A6:: @ 82907A6 -MirageTower_4F_EventScript_2907A6:: @ 82907A6 -Route110_TrickHousePuzzle3_EventScript_2907A6:: @ 82907A6 -Route111_EventScript_2907A6:: @ 82907A6 -Route114_EventScript_2907A6:: @ 82907A6 -Route115_EventScript_2907A6:: @ 82907A6 -RusturfTunnel_EventScript_2907A6:: @ 82907A6 -SafariZone_North_EventScript_2907A6:: @ 82907A6 -SafariZone_Northeast_EventScript_2907A6:: @ 82907A6 -SeafloorCavern_Room1_EventScript_2907A6:: @ 82907A6 -SeafloorCavern_Room2_EventScript_2907A6:: @ 82907A6 -SeafloorCavern_Room5_EventScript_2907A6:: @ 82907A6 -VictoryRoad_B1F_EventScript_2907A6:: @ 82907A6 +EventScript_RockSmash:: @ 82907A6 lockall - goto_if_unset FLAG_BADGE03_GET, Route111_EventScript_29082D + goto_if_unset FLAG_BADGE03_GET, EventScript_CantSmashRock checkpartymove MOVE_ROCK_SMASH compare VAR_RESULT, 6 - goto_if_eq Route111_EventScript_29082D + goto_if_eq EventScript_CantSmashRock setfieldeffectargument 0, VAR_RESULT bufferpartymonnick 0, VAR_RESULT buffermovename 1, MOVE_ROCK_SMASH - msgbox Route111_Text_29083A, MSGBOX_YESNO + msgbox Text_WantToSmash, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if_eq Route111_EventScript_290837 - msgbox Route111_Text_290771, MSGBOX_DEFAULT + goto_if_eq EventScript_CancelSmash + msgbox Text_MonUsedHM, MSGBOX_DEFAULT closemessage - dofieldeffect 37 + dofieldeffect FLDEFF_USE_ROCK_SMASH waitstate - goto Route111_EventScript_2907FB + goto EventScript_SmashRock end -Route111_EventScript_2907F0:: @ 82907F0 +EventScript_FldEffRockSmash:: @ 82907F0 lockall - dofieldeffect 37 + dofieldeffect FLDEFF_USE_ROCK_SMASH waitstate - goto Route111_EventScript_2907FB + goto EventScript_SmashRock end -Route111_EventScript_2907FB:: @ 82907FB - applymovement VAR_LAST_TALKED, Route111_Movement_29082B +EventScript_SmashRock:: @ 82907FB + applymovement VAR_LAST_TALKED, Movement_SmashRock waitmovement 0 removeobject VAR_LAST_TALKED specialvar VAR_RESULT, TryUpdateRusturfTunnelState compare VAR_RESULT, 1 - goto_if_eq Route111_EventScript_290829 + goto_if_eq EventScript_EndSmash special RockSmashWildEncounter compare VAR_RESULT, 0 - goto_if_eq Route111_EventScript_290829 + goto_if_eq EventScript_EndSmash waitstate releaseall end -Route111_EventScript_290829:: @ 8290829 +EventScript_EndSmash:: @ 8290829 releaseall end -Route111_Movement_29082B: @ 829082B +Movement_SmashRock: @ 829082B rock_smash_break step_end -Route111_EventScript_29082D:: @ 829082D - msgbox Route111_Text_29087F, MSGBOX_DEFAULT +EventScript_CantSmashRock:: @ 829082D + msgbox Text_CantSmash, MSGBOX_DEFAULT releaseall end -Route111_EventScript_290837:: @ 8290837 +EventScript_CancelSmash:: @ 8290837 closemessage releaseall end -Route111_Text_29083A: @ 829083A +Text_WantToSmash: @ 829083A .string "This rock appears to be breakable.\n" .string "Would you like to use ROCK SMASH?$" -Route111_Text_29087F: @ 829087F +Text_CantSmash: @ 829087F .string "It's a rugged rock, but a POKéMON\n" .string "may be able to smash it.$" -FieryPath_EventScript_2908BA:: @ 82908BA -MagmaHideout_1F_EventScript_2908BA:: @ 82908BA -Route110_TrickHousePuzzle4_EventScript_2908BA:: @ 82908BA -SeafloorCavern_Room1_EventScript_2908BA:: @ 82908BA -SeafloorCavern_Room2_EventScript_2908BA:: @ 82908BA -SeafloorCavern_Room3_EventScript_2908BA:: @ 82908BA -SeafloorCavern_Room5_EventScript_2908BA:: @ 82908BA -SeafloorCavern_Room8_EventScript_2908BA:: @ 82908BA -ShoalCave_LowTideLowerRoom_EventScript_2908BA:: @ 82908BA -VictoryRoad_B1F_EventScript_2908BA:: @ 82908BA +EventScript_StrengthBoulder:: @ 82908BA lockall - goto_if_unset FLAG_BADGE04_GET, FieryPath_EventScript_290915 - goto_if_set FLAG_SYS_USE_STRENGTH, FieryPath_EventScript_29091F + goto_if_unset FLAG_BADGE04_GET, EventScript_CantStrength + goto_if_set FLAG_SYS_USE_STRENGTH, EventScript_CheckActivatedBoulder checkpartymove MOVE_STRENGTH compare VAR_RESULT, 6 - goto_if_eq FieryPath_EventScript_290915 + goto_if_eq EventScript_CantStrength setfieldeffectargument 0, VAR_RESULT - msgbox FieryPath_Text_29092C, MSGBOX_YESNO + msgbox Text_WantToStrength, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if_eq FieryPath_EventScript_290929 + goto_if_eq EventScript_CancelStrength closemessage - dofieldeffect 40 + dofieldeffect FLDEFF_USE_STRENGTH waitstate - goto FieryPath_EventScript_290908 + goto EventScript_ActivateStrength end -FieryPath_EventScript_2908FD:: @ 82908FD +EventScript_FldEffStrength:: @ 82908FD lockall - dofieldeffect 40 + dofieldeffect FLDEFF_USE_STRENGTH waitstate - goto FieryPath_EventScript_290908 + goto EventScript_ActivateStrength end -FieryPath_EventScript_290908:: @ 8290908 +EventScript_ActivateStrength:: @ 8290908 setflag FLAG_SYS_USE_STRENGTH - msgbox FieryPath_Text_29098C, MSGBOX_DEFAULT + msgbox Text_MonUsedStrength, MSGBOX_DEFAULT releaseall end -FieryPath_EventScript_290915:: @ 8290915 - msgbox FieryPath_Text_2909D6, MSGBOX_DEFAULT +EventScript_CantStrength:: @ 8290915 + msgbox Text_CantStrength, MSGBOX_DEFAULT releaseall end -FieryPath_EventScript_29091F:: @ 829091F - msgbox FieryPath_Text_290A16, MSGBOX_DEFAULT +EventScript_CheckActivatedBoulder:: @ 829091F + msgbox Text_StrengthActivated, MSGBOX_DEFAULT releaseall end -FieryPath_EventScript_290929:: @ 8290929 +EventScript_CancelStrength:: @ 8290929 closemessage releaseall end -FieryPath_Text_29092C: @ 829092C +Text_WantToStrength: @ 829092C .string "It's a big boulder, but a POKéMON\n" .string "may be able to push it aside.\p" .string "Would you like to use STRENGTH?$" -FieryPath_Text_29098C: @ 829098C +Text_MonUsedStrength: @ 829098C .string "{STR_VAR_1} used STRENGTH!\p" .string "{STR_VAR_1}'s STRENGTH made it\n" .string "possible to move boulders around!$" -FieryPath_Text_2909D6: @ 82909D6 +Text_CantStrength: @ 82909D6 .string "It's a big boulder, but a POKéMON\n" .string "may be able to push it aside.$" -FieryPath_Text_290A16: @ 8290A16 +Text_StrengthActivated: @ 8290A16 .string "STRENGTH made it possible to move\n" .string "boulders around.$" @@ -223,59 +191,59 @@ EventScript_UseWaterfall:: @ 8290A49 lockall checkpartymove MOVE_WATERFALL compare VAR_RESULT, 6 - goto_if_eq EventScript_290A84 + goto_if_eq EventScript_CantWaterfall bufferpartymonnick 0, VAR_RESULT setfieldeffectargument 0, VAR_RESULT - msgbox Text_290AC3, MSGBOX_YESNO + msgbox Text_WantToWaterfall, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if_eq EventScript_290A8C - msgbox Text_290AFC, MSGBOX_DEFAULT - dofieldeffect 43 - goto EventScript_290A8C + goto_if_eq EventScript_EndWaterfall + msgbox Text_MonUsedWaterfall, MSGBOX_DEFAULT + dofieldeffect FLDEFF_USE_WATERFALL + goto EventScript_EndWaterfall EventScript_CannotUseWaterfall:: @ 8290A83 lockall -EventScript_290A84:: @ 8290A84 - msgbox Text_290A8E, MSGBOX_DEFAULT +EventScript_CantWaterfall:: @ 8290A84 + msgbox Text_CantWaterfall, MSGBOX_DEFAULT -EventScript_290A8C:: @ 8290A8C +EventScript_EndWaterfall:: @ 8290A8C releaseall end -Text_290A8E: @ 8290A8E +Text_CantWaterfall: @ 8290A8E .string "A wall of water is crashing down with\n" .string "a mighty roar.$" -Text_290AC3: @ 8290AC3 +Text_WantToWaterfall: @ 8290AC3 .string "It's a large waterfall.\n" .string "Would you like to use WATERFALL?$" -Text_290AFC: @ 8290AFC +Text_MonUsedWaterfall: @ 8290AFC .string "{STR_VAR_1} used WATERFALL.$" EventScript_UseDive:: @ 8290B0F lockall checkpartymove MOVE_DIVE compare VAR_RESULT, 6 - goto_if_eq EventScript_290B4E + goto_if_eq EventScript_CantDive bufferpartymonnick 0, VAR_RESULT setfieldeffectargument 0, VAR_RESULT setfieldeffectargument 1, 1 - msgbox Text_290BE8, MSGBOX_YESNO + msgbox Text_WantToDive, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if_eq EventScript_290B58 - msgbox Text_290C1A, MSGBOX_DEFAULT - dofieldeffect 44 - goto EventScript_290B58 + goto_if_eq EventScript_EndDive + msgbox Text_MonUsedDive, MSGBOX_DEFAULT + dofieldeffect FLDEFF_USE_DIVE + goto EventScript_EndDive end -EventScript_290B4E:: @ 8290B4E - msgbox Text_290BAA, MSGBOX_DEFAULT +EventScript_CantDive:: @ 8290B4E + msgbox Text_CantDive, MSGBOX_DEFAULT releaseall end -EventScript_290B58:: @ 8290B58 +EventScript_EndDive:: @ 8290B58 releaseall end @@ -283,50 +251,50 @@ EventScript_UseDiveUnderwater:: @ 8290B5A lockall checkpartymove MOVE_DIVE compare VAR_RESULT, 6 - goto_if_eq EventScript_290B99 + goto_if_eq EventScript_CantSurface bufferpartymonnick 0, VAR_RESULT setfieldeffectargument 0, VAR_RESULT setfieldeffectargument 1, 1 - msgbox Text_290C6E, MSGBOX_YESNO + msgbox Text_WantToSurface, MSGBOX_YESNO compare VAR_RESULT, 0 - goto_if_eq EventScript_290BA8 - msgbox Text_290C1A, MSGBOX_DEFAULT - dofieldeffect 44 - goto EventScript_290BA8 + goto_if_eq EventScript_EndSurface + msgbox Text_MonUsedDive, MSGBOX_DEFAULT + dofieldeffect FLDEFF_USE_DIVE + goto EventScript_EndSurface end -EventScript_290B99:: @ 8290B99 +EventScript_CantSurface:: @ 8290B99 lockall - msgbox Text_290C28, MSGBOX_DEFAULT - goto EventScript_290BA8 + msgbox Text_CantSurface, MSGBOX_DEFAULT + goto EventScript_EndSurface end -EventScript_290BA8:: @ 8290BA8 +EventScript_EndSurface:: @ 8290BA8 releaseall end -Text_290BAA: @ 8290BAA +Text_CantDive: @ 8290BAA .string "The sea is deep here. A POKéMON\n" .string "may be able to go underwater.$" -Text_290BE8: @ 8290BE8 +Text_WantToDive: @ 8290BE8 .string "The sea is deep here.\n" .string "Would you like to use DIVE?$" -Text_290C1A: @ 8290C1A +Text_MonUsedDive: @ 8290C1A .string "{STR_VAR_1} used DIVE.$" -Text_290C28: @ 8290C28 +Text_CantSurface: @ 8290C28 .string "Light is filtering down from above.\n" .string "A POKéMON may be able to surface.$" -Text_290C6E: @ 8290C6E +Text_WantToSurface: @ 8290C6E .string "Light is filtering down from above.\n" .string "Would you like to use DIVE?$" -EventScript_290CAE:: @ 8290CAE - msgbox Text_290CB7, MSGBOX_SIGN +EventScript_FailSweetScent:: @ 8290CAE + msgbox Text_FailSweetScent, MSGBOX_SIGN end -Text_290CB7: @ 8290CB7 +Text_FailSweetScent: @ 8290CB7 .string "Looks like there's nothing here…$" diff --git a/data/scripts/secret_base.inc b/data/scripts/secret_base.inc index 347513636..81bd388f8 100644 --- a/data/scripts/secret_base.inc +++ b/data/scripts/secret_base.inc @@ -310,8 +310,8 @@ SecretBase_RedCave1_Text_275944: @ 8275944 .string "Are you speechless?$" EventScript_2759F1:: @ 82759F1 - special sub_80E8C98 - special sub_80E8BC8 + special GetSecretBaseTypeInFrontOfPlayer + special CheckPlayerHasSecretBase compare VAR_RESULT, 1 goto_if_eq EventScript_275BE8 checkpartymove MOVE_SECRET_POWER @@ -339,7 +339,7 @@ EventScript_275A50:: @ 8275A50 msgbox gText_23B704, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if_eq EventScript_275CDE - msgbox Route103_Text_290771, MSGBOX_DEFAULT + msgbox Text_MonUsedHM, MSGBOX_DEFAULT closemessage dofieldeffect FLDEFF_USE_SECRET_POWER_CAVE waitstate @@ -371,7 +371,7 @@ EventScript_275AA9:: @ 8275AA9 msgbox Text_274779, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if_eq EventScript_275CDE - msgbox Route103_Text_290771, MSGBOX_DEFAULT + msgbox Text_MonUsedHM, MSGBOX_DEFAULT closemessage dofieldeffect FLDEFF_USE_SECRET_POWER_TREE waitstate @@ -403,7 +403,7 @@ EventScript_275B02:: @ 8275B02 msgbox Text_274825, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if_eq EventScript_275CDE - msgbox Route103_Text_290771, MSGBOX_DEFAULT + msgbox Text_MonUsedHM, MSGBOX_DEFAULT closemessage dofieldeffect FLDEFF_USE_SECRET_POWER_SHRUB waitstate @@ -432,11 +432,11 @@ EventScript_275B5B:: @ 8275B5B playse SE_KAIDAN setvar VAR_INIT_SECRET_BASE, 0 setflag FLAG_DECORATION_0 - special sub_80E8E18 - special sub_80E9068 + special SetPlayerSecretBase + special EnterSecretBase setvar VAR_0x8004, 0 setvar VAR_0x8005, 0 - special sub_80E933C + special InitSecretBaseDecorationSprites setvar VAR_SECRET_BASE_INITIALIZED, 1 waitstate end @@ -450,13 +450,13 @@ SecretBase_RedCave1_EventScript_275B81:: @ 8275B81 goto_if_eq SecretBase_RedCave1_EventScript_275BAB closemessage playse SE_KAIDAN - special sub_80E9A90 + special ClearAndLeaveSecretBase end SecretBase_RedCave1_EventScript_275BAB:: @ 8275BAB closemessage setflag FLAG_RECEIVED_SECRET_POWER - special sub_80E91F8 + special EnterNewlyCreatedSecretBase waitstate end @@ -469,18 +469,18 @@ EventScript_275BB7:: @ 8275BB7 lockall setvar VAR_INIT_SECRET_BASE, 1 playse SE_KAIDAN - special sub_80E9744 + special IsCurSecretBaseOwnedByAnotherPlayer compare VAR_RESULT, 0 goto_if_eq EventScript_275BDB clearflag FLAG_DECORATION_0 - special sub_80E9068 + special EnterSecretBase setvar VAR_SECRET_BASE_INITIALIZED, 0 waitstate end EventScript_275BDB:: @ 8275BDB setflag FLAG_DECORATION_0 - special sub_80E9068 + special EnterSecretBase setvar VAR_SECRET_BASE_INITIALIZED, 0 waitstate end @@ -500,7 +500,7 @@ EventScript_275BE8:: @ 8275BE8 compare VAR_RESULT, 0 goto_if_eq EventScript_275CDE fadescreenswapbuffers 1 - special sub_80E9B70 + special MoveOutOfSecretBaseFromOutside closemessage fadescreenswapbuffers 0 msgbox Text_276A95, MSGBOX_YESNO @@ -508,7 +508,7 @@ EventScript_275BE8:: @ 8275BE8 goto_if_eq EventScript_275CDE bufferpartymonnick 0, VAR_0x8004 buffermovename 1, MOVE_SECRET_POWER - msgbox Route103_Text_290771, MSGBOX_DEFAULT + msgbox Text_MonUsedHM, MSGBOX_DEFAULT closemessage closemessage compare VAR_0x8007, 1 @@ -569,7 +569,7 @@ SecretBase_RedCave1_EventScript_275CE1:: @ 8275CE1 EventScript_275D0C:: @ 8275D0C setvar VAR_0x8004, 0 setvar VAR_0x8005, 0 - special sub_80E933C + special InitSecretBaseDecorationSprites setvar VAR_SECRET_BASE_INITIALIZED, 1 end @@ -626,7 +626,7 @@ SecretBase_YellowCave1_EventScript_275D64:: @ 8275D64 SecretBase_YellowCave2_EventScript_275D64:: @ 8275D64 SecretBase_YellowCave3_EventScript_275D64:: @ 8275D64 SecretBase_YellowCave4_EventScript_275D64:: @ 8275D64 - special sub_80EA354 + special GetSecretBaseOwnerInteractionState compare VAR_0x8004, 0 goto_if_eq SecretBase_RedCave1_EventScript_275DD6 compare VAR_0x8004, 1 @@ -1010,7 +1010,7 @@ SecretBase_RedCave1_EventScript_27627C:: @ 827627C end SecretBase_RedCave1_EventScript_276286:: @ 8276286 - special sub_80EA2E4 + special PrepSecretBaseBattleFlags setvar VAR_0x8004, SPECIAL_BATTLE_SECRET_BASE setvar VAR_0x8005, 0 special DoSpecialTrainerBattle @@ -1039,12 +1039,20 @@ SecretBase_RedCave1_EventScript_2762C5:: @ 82762C5 .include "data/scripts/secret_power_tm.inc" +SecretBase_EventScript_DollInteract:: @ 82766A2 + special sub_80EB290 + end + +SecretBase_EventScript_CushionInteract:: @ 82766A6 + special sub_80EB2C8 + end + Text_2766AA: @ 82766AA .string "All decorations and furniture in your\n" .string "SECRET BASE will be returned to your PC.\p" .string "Is that okay?$" -Text_276707: @ 8276707 +Text_WantToRegisterSecretBase: @ 8276707 .string "Do you want to register\n" .string "{STR_VAR_1}'s SECRET BASE?$" diff --git a/data/scripts/secret_power_tm.inc b/data/scripts/secret_power_tm.inc index ed7216357..647064829 100644 --- a/data/scripts/secret_power_tm.inc +++ b/data/scripts/secret_power_tm.inc @@ -103,11 +103,3 @@ Route111_Movement_276696: @ 8276696 walk_down walk_down step_end - -EventScript_SecretPower1:: @ 82766A2 - special sub_80EB290 - end - -EventScript_SecretPower2:: @ 82766A6 - special sub_80EB2C8 - end diff --git a/data/specials.inc b/data/specials.inc index e16b2753d..7a2b0f975 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -14,25 +14,25 @@ gSpecials:: @ 81DBA64 def_special sub_80AF9F8 def_special CleanupLinkRoomState def_special ExitLinkRoom - def_special sub_80E8E18 - def_special sub_80E8BC8 - def_special sub_80E9068 - def_special sub_80E9A90 - def_special sub_80E9AC0 - def_special sub_80E9744 - def_special sub_80E9BDC - def_special sub_80E9C2C - def_special sub_80E9C74 - def_special sub_80E9C88 - def_special sub_80EA2E4 - def_special sub_80EA354 - def_special sub_80E933C + def_special SetPlayerSecretBase + def_special CheckPlayerHasSecretBase + def_special EnterSecretBase + def_special ClearAndLeaveSecretBase + def_special MoveOutOfSecretBase + def_special IsCurSecretBaseOwnedByAnotherPlayer + def_special GetCurSecretBaseRegistrationValidity + def_special ToggleCurSecretBaseRegistry + def_special ShowSecretBaseDecorationMenu + def_special ShowSecretBaseRegistryMenu + def_special PrepSecretBaseBattleFlags + def_special GetSecretBaseOwnerInteractionState + def_special InitSecretBaseDecorationSprites def_special sub_8127E18 def_special sub_81297AC - def_special sub_80E8C98 - def_special sub_80E95D4 + def_special GetSecretBaseTypeInFrontOfPlayer + def_special SetSecretBaseOwnerGfxId def_special sub_8129708 - def_special sub_80E91F8 + def_special EnterNewlyCreatedSecretBase def_special sub_80EA30C def_special DoSecretBasePCTurnOffEffect def_special RecordMixingPlayerSpotTriggered @@ -313,7 +313,7 @@ gSpecials:: @ 81DBA64 def_special sub_80AFC60 def_special PutZigzagoonInPlayerParty def_special IsStarterInParty - def_special sub_80E980C + def_special CopyCurSecretBaseOwnerName_StrVar1 def_special ScriptCheckFreePokemonStorageSpace def_special DoSealedChamberShakingEffect1 def_special sub_8139B60 @@ -340,7 +340,7 @@ gSpecials:: @ 81DBA64 def_special ScriptGetPartyMonSpecies def_special sub_81B98DC def_special nullsub_54 - def_special sub_80E9B70 + def_special MoveOutOfSecretBaseFromOutside def_special LoadPlayerBag def_special sub_80B05B4 def_special SetPacifidlogTMReceivedDay @@ -361,17 +361,17 @@ gSpecials:: @ 81DBA64 def_special sub_80EED10 def_special sub_80EED34 def_special sub_80EB1AC - def_special sub_80EBE7C + def_special SetSecretBaseSecretsTvFlags_SandOrnament def_special sub_80EB300 def_special sub_80EB438 def_special sub_80EB368 def_special sub_80EB3D0 def_special sub_80EB290 def_special sub_80EB2C8 - def_special sub_80EB56C - def_special sub_80EB9E0 - def_special sub_80EBB28 - def_special sub_80EB498 + def_special SetSecretBaseSecretsTvFlags_MiscFurnature + def_special SetSecretBaseSecretsTvFlags_LargeDecorationSpot + def_special SetSecretBaseSecretsTvFlags_SmallDecorationSpot + def_special SetSecretBaseSecretsTvFlags_Poster def_special sub_818D9C0 def_special sub_818DAEC def_special sub_818DBE8 diff --git a/data/text/contest_strings.inc b/data/text/contest_strings.inc index 1406ba3cb..e332e16bb 100644 --- a/data/text/contest_strings.inc +++ b/data/text/contest_strings.inc @@ -633,7 +633,7 @@ gText_0827E6C4:: @ 827E6C4 .string "{STR_VAR_1} was\n" .string "unaffected.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$" -gText_0827E6E3:: @ 827E6E3 +gText_RepeatedAppeal:: @ 827E6E3 .string "{STR_VAR_1} disappointed\n" .string "by repeating an appeal.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$" |