ref: e8d651b79af1bed30c75022a06b314d3145f26b2
parent: 3e0cac29e3aa900761813ba3d3767666111d85da
author: surskitty <surskitty@gmail.com>
date: Mon Jan 15 16:32:31 EST 2018
Saffron City guard labels
--- a/maps/Route6SaffronGate.asm
+++ b/maps/Route6SaffronGate.asm
@@ -12,23 +12,23 @@
.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 @@
line "PLANT."
done
-UnknownText_0x1927cb:
+Route6SaffronGuardMagnetTrainText:
text "The MAGNET TRAIN"
line "is the most famous"
@@ -76,4 +76,4 @@
.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
--- a/maps/Route7SaffronGate.asm
+++ b/maps/Route7SaffronGate.asm
@@ -8,23 +8,23 @@
.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 @@
cont "LAVENDER TOWN."
done
-UnknownText_0x73592:
+Route7SaffronGuardSeriousText:
text "I take my GUARD"
line "job seriously."
@@ -64,4 +64,4 @@
.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