diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-10-18 12:49:59 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-10-18 12:49:59 -0400 |
| commit | 4f15cb02d29707bc30a57db725cbea09aec43eb8 (patch) | |
| tree | 00cf809c83a39ae20e08395e7be79c538f85df90 /data/maps/CinnabarIsland/scripts.inc | |
| parent | 9903f7a77a1836c269119dcf2766df5ab09df765 (diff) | |
Rename map scene vars and partially document Oak's lab
Diffstat (limited to 'data/maps/CinnabarIsland/scripts.inc')
| -rw-r--r-- | data/maps/CinnabarIsland/scripts.inc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/data/maps/CinnabarIsland/scripts.inc b/data/maps/CinnabarIsland/scripts.inc index 556fde4de..daecdc3aa 100644 --- a/data/maps/CinnabarIsland/scripts.inc +++ b/data/maps/CinnabarIsland/scripts.inc @@ -6,11 +6,11 @@ CinnabarIsland_MapScripts:: @ 8166ED6 CinnabarIsland_MapScript1_166EE1:: @ 8166EE1 setworldmapflag FLAG_WORLD_MAP_CINNABAR_ISLAND call EventScript_166F5E - compare_var_to_value VAR_0x4071, 1 + compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND, 1 call_if 1, EventScript_166F24 - compare_var_to_value VAR_0x4071, 3 + compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND, 3 call_if 1, EventScript_166F52 - compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND, 1 + compare_var_to_value VAR_MAP_SCENE_CINNABAR_ISLAND_2, 1 call_if 1, EventScript_166F0B end @@ -51,9 +51,9 @@ EventScript_166F68:: @ 8166F68 return CinnabarIsland_MapScript2_166F6E:: @ 8166F6E - map_script_2 VAR_MAP_SCENE_CINNABAR_ISLAND, 1, EventScript_166F88 - map_script_2 VAR_0x4071, 1, EventScript_166FCD - map_script_2 VAR_0x4071, 3, EventScript_166FA0 + map_script_2 VAR_MAP_SCENE_CINNABAR_ISLAND_2, 1, EventScript_166F88 + map_script_2 VAR_MAP_SCENE_CINNABAR_ISLAND, 1, EventScript_166FCD + map_script_2 VAR_MAP_SCENE_CINNABAR_ISLAND, 3, EventScript_166FA0 .2byte 0 EventScript_166F88:: @ 8166F88 @@ -61,7 +61,7 @@ EventScript_166F88:: @ 8166F88 clearflag FLAG_SPECIAL_FLAG_0x4001 savebgm MUS_DUMMY textcolor 0 - setvar VAR_MAP_SCENE_CINNABAR_ISLAND, 2 + setvar VAR_MAP_SCENE_CINNABAR_ISLAND_2, 2 delay 20 call EventScript_1670E6 releaseall @@ -75,7 +75,7 @@ EventScript_166FA0:: @ 8166FA0 applymovement 3, Movement_166FC6 waitmovement 0 removeobject 3 - setvar VAR_0x4071, 4 + setvar VAR_MAP_SCENE_CINNABAR_ISLAND, 4 setflag FLAG_0x075 clearflag FLAG_0x076 releaseall @@ -151,7 +151,7 @@ EventScript_167078:: @ 8167078 checkflag FLAG_0x002 call_if 1, EventScript_1670B3 removeobject 3 - setvar VAR_0x4071, 2 + setvar VAR_MAP_SCENE_CINNABAR_ISLAND, 2 clearflag FLAG_0x0A2 releaseall end @@ -214,7 +214,7 @@ EventScript_1670E6:: @ 81670E6 call_if 0, EventScript_167171 checkflag FLAG_0x002 call_if 1, EventScript_167183 - setvar VAR_0x4071, 2 + setvar VAR_MAP_SCENE_CINNABAR_ISLAND, 2 removeobject 3 delay 40 setflag FLAG_0x06B |