summaryrefslogtreecommitdiff
path: root/data/maps/FourIsland/scripts.inc
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2020-01-08 19:16:45 -0500
committerGriffinR <griffin.g.richards@gmail.com>2020-01-08 19:16:57 -0500
commit2e5bf6c9ef4f4406b1dd725e91a88cbdd10ad5c2 (patch)
treeefaa59d9de2fa1df7621d859b6c0f2ebc91ebd8b /data/maps/FourIsland/scripts.inc
parent31d31d326034fde26dedaf2dadb1c608e00fb92f (diff)
Use map_script constants, name unique map_script labels
Diffstat (limited to 'data/maps/FourIsland/scripts.inc')
-rw-r--r--data/maps/FourIsland/scripts.inc8
1 files changed, 4 insertions, 4 deletions
diff --git a/data/maps/FourIsland/scripts.inc b/data/maps/FourIsland/scripts.inc
index 0515c29b5..bb2bbf330 100644
--- a/data/maps/FourIsland/scripts.inc
+++ b/data/maps/FourIsland/scripts.inc
@@ -1,9 +1,9 @@
FourIsland_MapScripts:: @ 8167CAE
- map_script 3, FourIsland_MapScript1_167CB9
- map_script 2, FourIsland_MapScript2_167CE2
+ map_script MAP_SCRIPT_ON_TRANSITION, FourIsland_OnTransition
+ map_script MAP_SCRIPT_ON_FRAME_TABLE, FourIsland_OnFrame
.byte 0
-FourIsland_MapScript1_167CB9:: @ 8167CB9
+FourIsland_OnTransition:: @ 8167CB9
setworldmapflag FLAG_WORLD_MAP_FOUR_ISLAND
compare VAR_MAP_SCENE_FOUR_ISLAND, 0
call_if eq, EventScript_167CCD
@@ -22,7 +22,7 @@ EventScript_167CD1:: @ 8167CD1
EventScript_167CE1:: @ 8167CE1
return
-FourIsland_MapScript2_167CE2:: @ 8167CE2
+FourIsland_OnFrame:: @ 8167CE2
map_script_2 VAR_MAP_SCENE_FOUR_ISLAND, 0, EventScript_167CEC
.2byte 0