diff options
| author | ultima-soul <akshayjhanji@hotmail.com> | 2020-03-13 00:32:04 -0700 |
|---|---|---|
| committer | ultima-soul <akshayjhanji@hotmail.com> | 2020-03-13 00:32:04 -0700 |
| commit | 99e4de062ae43aa978ad4f1a8cd70bc739c64c9d (patch) | |
| tree | 1164d31577e6ebddc1cb313d40bb69ce0d426170 /data/maps/SilphCo_10F/scripts.inc | |
| parent | 339c2914affc3c62ac9a5725aa1a0c7ccc3161ca (diff) | |
| parent | 6af8c04d8fa6aaeaeb6c8b919e7770a65b9a883d (diff) | |
Merge branch 'master' into event_object_movement
Diffstat (limited to 'data/maps/SilphCo_10F/scripts.inc')
| -rw-r--r-- | data/maps/SilphCo_10F/scripts.inc | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/data/maps/SilphCo_10F/scripts.inc b/data/maps/SilphCo_10F/scripts.inc index a0ab7219b..20d98d291 100644 --- a/data/maps/SilphCo_10F/scripts.inc +++ b/data/maps/SilphCo_10F/scripts.inc @@ -6,30 +6,30 @@ SilphCo_10F_OnLoad:: @ 8161D8C call_if_unset FLAG_SILPH_10F_DOOR, EventScript_Close10FDoor end -SilphCo_10F_EventScript_161D96:: @ 8161D96 +SilphCo_10F_EventScript_WorkerF:: @ 8161D96 lock faceplayer compare VAR_MAP_SCENE_SILPH_CO_11F, 1 - goto_if_ge EventScript_161DAD - msgbox gUnknown_8176DBA + goto_if_ge SilphCo_10F_EventScript_WorkerFRocketsGone + msgbox SilphCo_10F_Text_WaaaImScared release end -EventScript_161DAD:: @ 8161DAD - msgbox gUnknown_8176DCE +SilphCo_10F_EventScript_WorkerFRocketsGone:: @ 8161DAD + msgbox SilphCo_10F_Text_KeepMeCryingASecret release end -SilphCo_10F_EventScript_161DB7:: @ 8161DB7 - msgbox gUnknown_8176DF8, MSGBOX_SIGN +SilphCo_10F_EventScript_FloorSign:: @ 8161DB7 + msgbox SilphCo_10F_Text_FloorSign, MSGBOX_SIGN end -SilphCo_10F_EventScript_161DC0:: @ 8161DC0 - trainerbattle_single TRAINER_SCIENTIST_TRAVIS, Text_176D57, Text_176D73 - msgbox gUnknown_8176D86, MSGBOX_AUTOCLOSE +SilphCo_10F_EventScript_Travis:: @ 8161DC0 + trainerbattle_single TRAINER_SCIENTIST_TRAVIS, SilphCo_10F_Text_TravisIntro, SilphCo_10F_Text_TravisDefeat + msgbox SilphCo_10F_Text_TravisPostBattle, MSGBOX_AUTOCLOSE end -SilphCo_10F_EventScript_161DD7:: @ 8161DD7 - trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_39, Text_176CED, Text_176D18 - msgbox gUnknown_8176D25, MSGBOX_AUTOCLOSE +SilphCo_10F_EventScript_Grunt:: @ 8161DD7 + trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_39, SilphCo_10F_Text_GruntIntro, SilphCo_10F_Text_GruntDefeat + msgbox SilphCo_10F_Text_GruntPostBattle, MSGBOX_AUTOCLOSE end |