diff options
| -rw-r--r-- | maps/Route6SaffronGate.asm | 16 | ||||
| -rw-r--r-- | maps/Route7SaffronGate.asm | 16 |
2 files changed, 16 insertions, 16 deletions
diff --git a/maps/Route6SaffronGate.asm b/maps/Route6SaffronGate.asm index 713e1476e..b80e5f8e5 100644 --- a/maps/Route6SaffronGate.asm +++ b/maps/Route6SaffronGate.asm @@ -12,23 +12,23 @@ Route6SaffronGate_MapScriptHeader: .DummyScene: end -OfficerScript_0x1926ea: +Route6SaffronGuardScript: faceplayer opentext checkevent EVENT_RETURNED_MACHINE_PART - iftrue UnknownScript_0x1926f8 - writetext UnknownText_0x1926fe + iftrue .ReturnedPart + writetext Route6SaffronGuardWelcomeText waitbutton closetext end -UnknownScript_0x1926f8: - writetext UnknownText_0x1927cb +.ReturnedPart: + writetext Route6SaffronGuardMagnetTrainText waitbutton closetext end -UnknownText_0x1926fe: +Route6SaffronGuardWelcomeText: text "Welcome to SAFFRON" line "CITY, home of the" cont "MAGNET TRAIN!" @@ -49,7 +49,7 @@ UnknownText_0x1926fe: line "PLANT." done -UnknownText_0x1927cb: +Route6SaffronGuardMagnetTrainText: text "The MAGNET TRAIN" line "is the most famous" @@ -76,4 +76,4 @@ Route6SaffronGate_MapEventHeader: .ObjectEvents: db 1 - object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x1926ea, -1 + object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route6SaffronGuardScript, -1 diff --git a/maps/Route7SaffronGate.asm b/maps/Route7SaffronGate.asm index c72a3a571..2317e681b 100644 --- a/maps/Route7SaffronGate.asm +++ b/maps/Route7SaffronGate.asm @@ -8,23 +8,23 @@ Route7SaffronGate_MapScriptHeader: .MapCallbacks: db 0 -OfficerScript_0x73518: +Route7SaffronGuardScript: faceplayer opentext checkevent EVENT_RETURNED_MACHINE_PART - iftrue UnknownScript_0x73526 - writetext UnknownText_0x7352c + iftrue .ReturnedPart + writetext Route7SaffronGuardPowerPlantText waitbutton closetext end -UnknownScript_0x73526: - writetext UnknownText_0x73592 +.ReturnedPart: + writetext Route7SaffronGuardSeriousText waitbutton closetext end -UnknownText_0x7352c: +Route7SaffronGuardPowerPlantText: text "Did you hear about" line "the accident at" cont "the POWER PLANT?" @@ -34,7 +34,7 @@ UnknownText_0x7352c: cont "LAVENDER TOWN." done -UnknownText_0x73592: +Route7SaffronGuardSeriousText: text "I take my GUARD" line "job seriously." @@ -64,4 +64,4 @@ Route7SaffronGate_MapEventHeader: .ObjectEvents: db 1 - object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x73518, -1 + object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route7SaffronGuardScript, -1 |