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
+4 -5
View File
@@ -3,15 +3,14 @@ SilphCo_10F_MapScripts:: @ 8161D86
.byte 0
SilphCo_10F_OnLoad:: @ 8161D8C
checkflag FLAG_SILPH_10F_DOOR
call_if FALSE, EventScript_Close10FDoor
call_if_unset FLAG_SILPH_10F_DOOR, EventScript_Close10FDoor
end
SilphCo_10F_EventScript_161D96:: @ 8161D96
lock
faceplayer
compare VAR_MAP_SCENE_SILPH_CO_11F, 1
goto_if ge, EventScript_161DAD
goto_if_ge EventScript_161DAD
msgbox gUnknown_8176DBA
release
end
@@ -26,11 +25,11 @@ SilphCo_10F_EventScript_161DB7:: @ 8161DB7
end
SilphCo_10F_EventScript_161DC0:: @ 8161DC0
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_SCIENTIST_TRAVIS, 0, Text_176D57, Text_176D73
trainerbattle_single TRAINER_SCIENTIST_TRAVIS, Text_176D57, Text_176D73
msgbox gUnknown_8176D86, 6
end
SilphCo_10F_EventScript_161DD7:: @ 8161DD7
trainerbattle TRAINER_BATTLE_SINGLE, TRAINER_TEAM_ROCKET_GRUNT_39, 0, Text_176CED, Text_176D18
trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_39, Text_176CED, Text_176D18
msgbox gUnknown_8176D25, 6
end