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
+9 -10
View File
@@ -3,15 +3,14 @@ SilphCo_6F_MapScripts:: @ 8161881
.byte 0
SilphCo_6F_OnLoad:: @ 8161887
checkflag FLAG_SILPH_6F_DOOR
call_if FALSE, EventScript_Close6FDoor
call_if_unset FLAG_SILPH_6F_DOOR, EventScript_Close6FDoor
end
SilphCo_6F_EventScript_161891:: @ 8161891
lock
faceplayer
compare VAR_MAP_SCENE_SILPH_CO_11F, 1
goto_if ge, EventScript_1618A8
goto_if_ge EventScript_1618A8
msgbox gUnknown_817607E
release
end
@@ -25,7 +24,7 @@ SilphCo_6F_EventScript_1618B2:: @ 81618B2
lock
faceplayer
compare VAR_MAP_SCENE_SILPH_CO_11F, 1
goto_if ge, EventScript_1618C9
goto_if_ge EventScript_1618C9
msgbox gUnknown_8175F24
release
end
@@ -39,7 +38,7 @@ SilphCo_6F_EventScript_1618D3:: @ 81618D3
lock
faceplayer
compare VAR_MAP_SCENE_SILPH_CO_11F, 1
goto_if ge, EventScript_1618EA
goto_if_ge EventScript_1618EA
msgbox gUnknown_8175F70
release
end
@@ -53,7 +52,7 @@ SilphCo_6F_EventScript_1618F4:: @ 81618F4
lock
faceplayer
compare VAR_MAP_SCENE_SILPH_CO_11F, 1
goto_if ge, EventScript_16190B
goto_if_ge EventScript_16190B
msgbox gUnknown_8175FAA
release
end
@@ -67,7 +66,7 @@ SilphCo_6F_EventScript_161915:: @ 8161915
lock
faceplayer
compare VAR_MAP_SCENE_SILPH_CO_11F, 1
goto_if ge, EventScript_16192C
goto_if_ge EventScript_16192C
msgbox gUnknown_8176012
release
end
@@ -82,16 +81,16 @@ SilphCo_6F_EventScript_161936:: @ 8161936
end
SilphCo_6F_EventScript_16193F:: @ 816193F
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SCIENTIST_TAYLOR, 0, Text_176136, Text_1761BD
trainerbattle_single TRAINER_SCIENTIST_TAYLOR, Text_176136, Text_1761BD
msgbox gUnknown_81761C4, 6
end
SilphCo_6F_EventScript_161956:: @ 8161956
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_30, 0, Text_1760DE, Text_176104
trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_30, Text_1760DE, Text_176104
msgbox gUnknown_817610F, 6
end
SilphCo_6F_EventScript_16196D:: @ 816196D
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_31, 0, Text_1761F1, Text_17620E
trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_31, Text_1761F1, Text_17620E
msgbox gUnknown_817621B, 6
end