diff options
| author | yenatch <yenatch@gmail.com> | 2017-12-23 17:14:09 -0500 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2017-12-23 17:14:09 -0500 |
| commit | c51968f0de6b8420c141dde27339e82a42837c5b (patch) | |
| tree | 782f2b25f21adacb48fd516694b8a82864fe0b99 /maps/Route15FuchsiaGate.asm | |
| parent | c883ab4d34ecb4890010e808d6b6d533f5d8ad56 (diff) | |
| parent | 878092004956418bfd77bfdb9fc9dd7f640f80d2 (diff) | |
Merge remote-tracking branch 'origin/master' into master
Diffstat (limited to 'maps/Route15FuchsiaGate.asm')
| -rw-r--r-- | maps/Route15FuchsiaGate.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/maps/Route15FuchsiaGate.asm b/maps/Route15FuchsiaGate.asm index 920a07d97..855986895 100644 --- a/maps/Route15FuchsiaGate.asm +++ b/maps/Route15FuchsiaGate.asm @@ -8,10 +8,10 @@ Route15FuchsiaGate_MapScriptHeader: .MapCallbacks: db 0 -OfficerScript_0x19679e: - jumptextfaceplayer UnknownText_0x1967a1 +Route15FuchsiaGateOfficerScript: + jumptextfaceplayer Route15FuchsiaGateOfficerText -UnknownText_0x1967a1: +Route15FuchsiaGateOfficerText: text "You're working on" line "a #DEX? That's" @@ -38,4 +38,4 @@ Route15FuchsiaGate_MapEventHeader: .PersonEvents: db 1 - person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, OfficerScript_0x19679e, -1 + person_event SPRITE_OFFICER, 2, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, PERSONTYPE_SCRIPT, 0, Route15FuchsiaGateOfficerScript, -1 |