Sync event macros

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
+5 -7
View File
@@ -3,17 +3,15 @@ SilphCo_3F_MapScripts:: @ 81616C5
.byte 0
SilphCo_3F_OnLoad:: @ 81616CB
checkflag FLAG_SILPH_3F_DOOR_1
call_if FALSE, EventScript_Close3FDoor1
checkflag FLAG_SILPH_3F_DOOR_2
call_if FALSE, EventScript_Close3FDoor2
call_if_unset FLAG_SILPH_3F_DOOR_1, EventScript_Close3FDoor1
call_if_unset FLAG_SILPH_3F_DOOR_2, EventScript_Close3FDoor2
end
SilphCo_3F_EventScript_1616DE:: @ 81616DE
lock
faceplayer
compare VAR_MAP_SCENE_SILPH_CO_11F, 1
goto_if ge, EventScript_1616F5
goto_if_ge EventScript_1616F5
msgbox gUnknown_81758AD
release
end
@@ -28,11 +26,11 @@ SilphCo_3F_EventScript_1616FF:: @ 81616FF
end
SilphCo_3F_EventScript_161708:: @ 8161708
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SCIENTIST_JOSE, 0, Text_175948, Text_17597D
trainerbattle_single TRAINER_SCIENTIST_JOSE, Text_175948, Text_17597D
msgbox gUnknown_8175990, 6
end
SilphCo_3F_EventScript_16171F:: @ 816171F
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_25, 0, Text_1758F6, Text_175911
trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_25, Text_1758F6, Text_175911
msgbox gUnknown_817591C, 6
end