diff options
Diffstat (limited to 'data/scripts/maps')
| -rw-r--r-- | data/scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc | 2 | ||||
| -rw-r--r-- | data/scripts/maps/BattleFrontier_BattlePyramidTop.inc | 2 | ||||
| -rw-r--r-- | data/scripts/maps/FortreeCity_Gym.inc | 2 | ||||
| -rw-r--r-- | data/scripts/maps/Route110_TrickHousePuzzle6.inc | 2 | ||||
| -rw-r--r-- | data/scripts/maps/Route119.inc | 4 | ||||
| -rw-r--r-- | data/scripts/maps/Route119_WeatherInstitute_1F.inc | 4 | ||||
| -rw-r--r-- | data/scripts/maps/Route119_WeatherInstitute_2F.inc | 6 |
7 files changed, 11 insertions, 11 deletions
diff --git a/data/scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc b/data/scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc index cff676124..c2b70944b 100644 --- a/data/scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc +++ b/data/scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc @@ -28,7 +28,7 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252A77:: @ 8252A77 end BattleFrontier_BattlePyramidEmptySquare_EventScript_252A8F:: @ 8252A8F - special AddMapNamePopUpWindowTask + special ShowMapNamePopup setvar VAR_0x400F, 0 end diff --git a/data/scripts/maps/BattleFrontier_BattlePyramidTop.inc b/data/scripts/maps/BattleFrontier_BattlePyramidTop.inc index 6c44e0044..3ba3a5a6a 100644 --- a/data/scripts/maps/BattleFrontier_BattlePyramidTop.inc +++ b/data/scripts/maps/BattleFrontier_BattlePyramidTop.inc @@ -64,7 +64,7 @@ BattleFrontier_BattlePyramidTop_EventScript_255180:: @ 8255180 end BattleFrontier_BattlePyramidTop_EventScript_25518A:: @ 825518A - special AddMapNamePopUpWindowTask + special ShowMapNamePopup setvar VAR_0x400F, 0 end diff --git a/data/scripts/maps/FortreeCity_Gym.inc b/data/scripts/maps/FortreeCity_Gym.inc index fc069a8ee..01ce60717 100644 --- a/data/scripts/maps/FortreeCity_Gym.inc +++ b/data/scripts/maps/FortreeCity_Gym.inc @@ -12,7 +12,7 @@ FortreeCity_Gym_MapScript2_2165BA: @ 82165BA .2byte 0 FortreeCity_Gym_EventScript_2165C4:: @ 82165C4 - special sub_80FBED0 + special RotatingGate_InitPuzzleAndGraphics end FortreeCity_Gym_EventScript_2165C8:: @ 82165C8 diff --git a/data/scripts/maps/Route110_TrickHousePuzzle6.inc b/data/scripts/maps/Route110_TrickHousePuzzle6.inc index a043b2ec4..6b13cf8cb 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle6.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle6.inc @@ -12,7 +12,7 @@ Route110_TrickHousePuzzle6_MapScript2_26DDB6: @ 826DDB6 .2byte 0 Route110_TrickHousePuzzle6_EventScript_26DDC0:: @ 826DDC0 - special sub_80FBED0 + special RotatingGate_InitPuzzleAndGraphics end Route110_TrickHousePuzzle6_EventScript_26DDC4:: @ 826DDC4 diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc index 72707186b..2f99f7c4e 100644 --- a/data/scripts/maps/Route119.inc +++ b/data/scripts/maps/Route119.inc @@ -18,7 +18,7 @@ Route119_EventScript_1F4439:: @ 81F4439 Route119_MapScript1_1F444D: @ 81F444D call Route119_EventScript_271ED7 call Route119_EventScript_271EFB - compare VAR_0x40B3, 1 + compare VAR_WEATHER_INSTITUTE_STATE, 1 call_if 1, Route119_EventScript_1F4466 special SetRoute119Weather end @@ -26,7 +26,7 @@ Route119_MapScript1_1F444D: @ 81F444D Route119_EventScript_1F4466:: @ 81F4466 setflag FLAG_0x37D clearflag FLAG_0x37C - setvar VAR_0x40B3, 2 + setvar VAR_WEATHER_INSTITUTE_STATE, 2 return Route119_EventScript_1F4472:: @ 81F4472 diff --git a/data/scripts/maps/Route119_WeatherInstitute_1F.inc b/data/scripts/maps/Route119_WeatherInstitute_1F.inc index 399692db3..b008f52c0 100644 --- a/data/scripts/maps/Route119_WeatherInstitute_1F.inc +++ b/data/scripts/maps/Route119_WeatherInstitute_1F.inc @@ -3,7 +3,7 @@ Route119_WeatherInstitute_1F_MapScripts:: @ 826FA86 .byte 0 Route119_WeatherInstitute_1F_MapScript1_26FA8C: @ 826FA8C - compare VAR_0x40B3, 0 + compare VAR_WEATHER_INSTITUTE_STATE, 0 call_if 1, Route119_WeatherInstitute_1F_EventScript_26FA98 end @@ -16,7 +16,7 @@ Route119_WeatherInstitute_1F_EventScript_26FAA4:: @ 826FAA4 lock faceplayer special GetPlayerBigGuyGirlString - compare VAR_0x40B3, 0 + compare VAR_WEATHER_INSTITUTE_STATE, 0 goto_eq Route119_WeatherInstitute_1F_EventScript_26FABE msgbox Route119_WeatherInstitute_1F_Text_26FCE5, 4 release diff --git a/data/scripts/maps/Route119_WeatherInstitute_2F.inc b/data/scripts/maps/Route119_WeatherInstitute_2F.inc index 38f79763d..c8f24f33d 100644 --- a/data/scripts/maps/Route119_WeatherInstitute_2F.inc +++ b/data/scripts/maps/Route119_WeatherInstitute_2F.inc @@ -3,9 +3,9 @@ Route119_WeatherInstitute_2F_MapScripts:: @ 826FF1E .byte 0 Route119_WeatherInstitute_2F_MapScript1_26FF24: @ 826FF24 - compare VAR_0x40B3, 0 + compare VAR_WEATHER_INSTITUTE_STATE, 0 call_if 1, Route119_WeatherInstitute_2F_EventScript_26FF44 - compare VAR_0x40B3, 1 + compare VAR_WEATHER_INSTITUTE_STATE, 1 call_if 1, Route119_WeatherInstitute_2F_EventScript_26FF50 checkflag FLAG_SYS_GAME_CLEAR call_if 1, Route119_WeatherInstitute_2F_EventScript_26FF5C @@ -62,7 +62,7 @@ Route119_WeatherInstitute_2F_EventScript_26FFC8:: @ 826FFC8 waitmovement 0 msgbox Route119_WeatherInstitute_2F_Text_2705DD, 4 closemessage - setvar VAR_0x40B3, 1 + setvar VAR_WEATHER_INSTITUTE_STATE, 1 clearflag FLAG_0x37D fadedefaultbgm fadescreen 1 |