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

Sync event macros

Browse Source
This commit is contained in:
GriffinR
2020-01-10 00:44:57 -05:00
parent 94fbc3ac48
commit 4a6f15ba24
220 changed files with 3209 additions and 3580 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/TwoIsland/scripts.inc
+21 -35
View File
@@ -9,38 +9,28 @@ TwoIsland_OnTransition:: @ 816756A
end
EventScript_167576:: @ 8167576
checkflag FLAG_SYS_CAN_LINK_WITH_RS
goto_if TRUE, EventScript_167597
checkflag FLAG_SYS_GAME_CLEAR
goto_if TRUE, EventScript_1675B8
checkflag FLAG_RESCUED_LOSTELLE
goto_if TRUE, EventScript_1675D9
goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_167597
goto_if_set FLAG_SYS_GAME_CLEAR, EventScript_1675B8
goto_if_set FLAG_RESCUED_LOSTELLE, EventScript_1675D9
goto EventScript_1675E8
end
EventScript_167597:: @ 8167597
checkflag FLAG_TWO_ISLAND_SHOP_INTRODUCED
goto_if FALSE, EventScript_1675EE
checkflag FLAG_TWO_ISLAND_SHOP_EXPANDED_1
goto_if FALSE, EventScript_1675F4
checkflag FLAG_TWO_ISLAND_SHOP_EXPANDED_2
goto_if FALSE, EventScript_1675FD
goto_if_unset FLAG_TWO_ISLAND_SHOP_INTRODUCED, EventScript_1675EE
goto_if_unset FLAG_TWO_ISLAND_SHOP_EXPANDED_1, EventScript_1675F4
goto_if_unset FLAG_TWO_ISLAND_SHOP_EXPANDED_2, EventScript_1675FD
goto EventScript_167606
end
EventScript_1675B8:: @ 81675B8
checkflag FLAG_TWO_ISLAND_SHOP_INTRODUCED
goto_if FALSE, EventScript_1675EE
checkflag FLAG_RESCUED_LOSTELLE
goto_if FALSE, EventScript_1675EE
checkflag FLAG_TWO_ISLAND_SHOP_EXPANDED_1
goto_if FALSE, EventScript_1675F4
goto_if_unset FLAG_TWO_ISLAND_SHOP_INTRODUCED, EventScript_1675EE
goto_if_unset FLAG_RESCUED_LOSTELLE, EventScript_1675EE
goto_if_unset FLAG_TWO_ISLAND_SHOP_EXPANDED_1, EventScript_1675F4
goto EventScript_1675FD
end
EventScript_1675D9:: @ 81675D9
checkflag FLAG_TWO_ISLAND_SHOP_INTRODUCED
goto_if FALSE, EventScript_1675EE
goto_if_unset FLAG_TWO_ISLAND_SHOP_INTRODUCED, EventScript_1675EE
goto EventScript_1675F4
end
@@ -70,21 +60,20 @@ EventScript_167606:: @ 8167606
TwoIsland_EventScript_16760F:: @ 816760F
special sub_8110AB4
compare VAR_RESULT, 2
goto_if eq, EventScript_1A7AE0
goto_if_eq EventScript_1A7AE0
lock
faceplayer
compare VAR_MAP_SCENE_TWO_ISLAND, 4
goto_if eq, EventScript_167646
goto_if_eq EventScript_167646
compare VAR_MAP_SCENE_TWO_ISLAND, 3
goto_if eq, EventScript_16765E
goto_if_eq EventScript_16765E
compare VAR_MAP_SCENE_TWO_ISLAND, 2
goto_if eq, EventScript_167676
goto_if_eq EventScript_167676
goto EventScript_16768E
end
EventScript_167646:: @ 8167646
checkflag FLAG_TWO_ISLAND_SHOP_EXPANDED_3
goto_if TRUE, EventScript_1676A6
goto_if_set FLAG_TWO_ISLAND_SHOP_EXPANDED_3, EventScript_1676A6
setflag FLAG_TWO_ISLAND_SHOP_EXPANDED_3
message Text_181CAE
waitmessage
@@ -92,8 +81,7 @@ EventScript_167646:: @ 8167646
end
EventScript_16765E:: @ 816765E
checkflag FLAG_TWO_ISLAND_SHOP_EXPANDED_2
goto_if TRUE, EventScript_1676A6
goto_if_set FLAG_TWO_ISLAND_SHOP_EXPANDED_2, EventScript_1676A6
setflag FLAG_TWO_ISLAND_SHOP_EXPANDED_2
message Text_181C77
waitmessage
@@ -101,8 +89,7 @@ EventScript_16765E:: @ 816765E
end
EventScript_167676:: @ 8167676
checkflag FLAG_TWO_ISLAND_SHOP_EXPANDED_1
goto_if TRUE, EventScript_1676A6
goto_if_set FLAG_TWO_ISLAND_SHOP_EXPANDED_1, EventScript_1676A6
setflag FLAG_TWO_ISLAND_SHOP_EXPANDED_1
message Text_181B7C
waitmessage
@@ -110,8 +97,7 @@ EventScript_167676:: @ 8167676
end
EventScript_16768E:: @ 816768E
checkflag FLAG_TWO_ISLAND_SHOP_INTRODUCED
goto_if TRUE, EventScript_1676A6
goto_if_set FLAG_TWO_ISLAND_SHOP_INTRODUCED, EventScript_1676A6
setflag FLAG_TWO_ISLAND_SHOP_INTRODUCED
message Text_181AFE
waitmessage
@@ -122,11 +108,11 @@ EventScript_1676A6:: @ 81676A6
message Text_MayIHelpYou
waitmessage
compare VAR_MAP_SCENE_TWO_ISLAND, 4
goto_if eq, EventScript_167728
goto_if_eq EventScript_167728
compare VAR_MAP_SCENE_TWO_ISLAND, 3
goto_if eq, EventScript_167708
goto_if_eq EventScript_167708
compare VAR_MAP_SCENE_TWO_ISLAND, 2
goto_if eq, EventScript_1676EC
goto_if_eq EventScript_1676EC
goto EventScript_1676D3
end