dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use map_script constants, name unique map_script labels

Browse Source
This commit is contained in:
GriffinR
2020-01-08 19:16:45 -05:00
parent 31d31d3260
commit 2e5bf6c9ef
149 changed files with 481 additions and 481 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/TwoIsland_JoyfulGameCorner/scripts.inc
+7 -7
View File
@@ -1,11 +1,11 @@
TwoIsland_JoyfulGameCorner_MapScripts:: @ 81713D0
map_script 3, TwoIsland_JoyfulGameCorner_MapScript1_1713E5
map_script 4, TwoIsland_JoyfulGameCorner_MapScript2_171404
map_script 2, TwoIsland_JoyfulGameCorner_MapScript3_17141B
map_script 1, TwoIsland_JoyfulGameCorner_MapScript4_1BB237
map_script MAP_SCRIPT_ON_TRANSITION, TwoIsland_JoyfulGameCorner_OnTransition
map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, TwoIsland_JoyfulGameCorner_OnWarp
map_script MAP_SCRIPT_ON_FRAME_TABLE, TwoIsland_JoyfulGameCorner_OnFrame
map_script MAP_SCRIPT_ON_LOAD, TwoIsland_JoyfulGameCorner_MapScript4_1BB237
.byte 0
TwoIsland_JoyfulGameCorner_MapScript1_1713E5:: @ 81713E5
TwoIsland_JoyfulGameCorner_OnTransition:: @ 81713E5
checkflag FLAG_GOT_MOON_STONE_FROM_JOYFUL_GAME_CORNER
call_if TRUE, EventScript_1713EF
end
@@ -17,7 +17,7 @@ EventScript_1713EF:: @ 81713EF
setvar VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 4
return
TwoIsland_JoyfulGameCorner_MapScript2_171404:: @ 8171404
TwoIsland_JoyfulGameCorner_OnWarp:: @ 8171404
map_script_2 VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 2, EventScript_171416
map_script_2 VAR_0x406F, 8, EventScript_1BB227
.2byte 0
@@ -26,7 +26,7 @@ EventScript_171416:: @ 8171416
turnobject 255, 2
end
TwoIsland_JoyfulGameCorner_MapScript3_17141B:: @ 817141B
TwoIsland_JoyfulGameCorner_OnFrame:: @ 817141B
map_script_2 VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 0, EventScript_17145F
map_script_2 VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 2, EventScript_171435
map_script_2 VAR_0x406F, 8, EventScript_1BB2FD