ref: c959f7a2ea7dbe044489eb2ba6dc963a40717535
parent: e668b6cf3a7760303edd181baa69901a94a7d653
author: surskitty <[email protected]>
date: Sat Feb 3 17:37:08 EST 2018
Labelling, once again.
--- a/maps/BattleTower1F.asm
+++ b/maps/BattleTower1F.asm
@@ -46,10 +46,10 @@
opentext
writetext Text_ReadBattleTowerRules
yesorno
- iffalse UnknownScript_0x9e3e0
+ iffalse .skip
writetext Text_BattleTowerRules
waitbutton
-UnknownScript_0x9e3e0:
+.skip:
closetext
end
--- a/maps/TeamRocketBaseB3F.asm
+++ b/maps/TeamRocketBaseB3F.asm
@@ -98,11 +98,11 @@
playmusic MUSIC_ROCKET_ENCOUNTER
spriteface TEAMROCKETBASEB3F_ROCKET1, DOWN
opentext
- writetext UnknownText_0x6e400
+ writetext ExecutiveM4BeforeText
waitbutton
closetext
applymovement TEAMROCKETBASEB3F_ROCKET1, MovementData_0x6e142
- winlosstext UnknownText_0x6e511, 0
+ winlosstext ExecutiveM4BeatenText, 0
setlasttalked TEAMROCKETBASEB3F_ROCKET1
loadtrainer EXECUTIVEM, EXECUTIVEM_4
startbattle
@@ -109,7 +109,7 @@
reloadmapafterbattle
setevent EVENT_BEAT_ROCKET_EXECUTIVEM_4
opentext
- writetext UnknownText_0x6e548
+ writetext ExecutiveM4AfterText
waitbutton
closetext
applymovement TEAMROCKETBASEB3F_ROCKET1, MovementData_0x6e144
@@ -385,7 +385,7 @@
cont "the likes of you!"
done
-UnknownText_0x6e400:
+ExecutiveM4BeforeText:
text "What? Who are you?"
line "This is the office"
@@ -412,7 +412,7 @@
cont "place!"
done
-UnknownText_0x6e511:
+ExecutiveM4BeatenText:
text "I… I couldn't do a"
line "thing…"
@@ -420,7 +420,7 @@
line "forgive me…"
done
-UnknownText_0x6e548:
+ExecutiveM4AfterText:
text "No, I can't let"
line "this affect me."
--- a/maps/VermilionPort.asm
+++ b/maps/VermilionPort.asm
@@ -37,11 +37,11 @@
blackoutmod VERMILION_CITY
end
-SailorScript_0x74dc4:
+VermilionPortSailorAtGangway:
faceplayer
opentext
checkevent EVENT_GAVE_KURT_APRICORNS
- iftrue UnknownScript_0x74e1a
+ iftrue VermilionPortAlreadyRodeScript
writetext UnknownText_0x74f06
waitbutton
closetext
@@ -72,41 +72,41 @@
warp FAST_SHIP_1F, 25, 1
end
-UnknownScript_0x74e1a:
+VermilionPortAlreadyRodeScript:
writetext UnknownText_0x74f31
waitbutton
closetext
end
-UnknownScript_0x74e20:
+VermilionPortWalkUpToShipScript:
spriteface VERMILIONPORT_SAILOR2, RIGHT
checkevent EVENT_GAVE_KURT_APRICORNS
- iftrue UnknownScript_0x74e86
+ iftrue .skip
checkevent EVENT_RECEIVED_BALLS_FROM_KURT
- iftrue UnknownScript_0x74e86
+ iftrue .skip
spriteface PLAYER, LEFT
opentext
checkcode VAR_WEEKDAY
- if_equal MONDAY, UnknownScript_0x74e72
- if_equal TUESDAY, UnknownScript_0x74e72
- if_equal THURSDAY, UnknownScript_0x74e7c
- if_equal FRIDAY, UnknownScript_0x74e7c
- if_equal SATURDAY, UnknownScript_0x74e7c
+ if_equal MONDAY, .NextShipWednesday
+ if_equal TUESDAY, .NextShipWednesday
+ if_equal THURSDAY, .NextShipSunday
+ if_equal FRIDAY, .NextShipSunday
+ if_equal SATURDAY, .NextShipSunday
writetext UnknownText_0x74f4d
yesorno
- iffalse UnknownScript_0x74e8d
+ iffalse VermilionPortNotRidingMoveAwayScript
writetext UnknownText_0x74f8b
buttonsound
checkitem S_S_TICKET
- iffalse UnknownScript_0x74e68
- writetext UnknownText_0x74fc2
+ iffalse .NoTicket
+ writetext VermilionPortSSTicketText
waitbutton
closetext
setevent EVENT_RECEIVED_BALLS_FROM_KURT
applymovement PLAYER, MovementData_0x74ef8
- jump SailorScript_0x74dc4
+ jump VermilionPortSailorAtGangway
-UnknownScript_0x74e68:
+.NoTicket:
writetext UnknownText_0x74ff2
waitbutton
closetext
@@ -113,7 +113,7 @@
applymovement PLAYER, MovementData_0x74ef5
end
-UnknownScript_0x74e72:
+.NextShipWednesday:
writetext UnknownText_0x75059
waitbutton
closetext
@@ -120,7 +120,7 @@
applymovement PLAYER, MovementData_0x74ef5
end
-UnknownScript_0x74e7c:
+.NextShipSunday:
writetext UnknownText_0x75080
waitbutton
closetext
@@ -127,16 +127,16 @@
applymovement PLAYER, MovementData_0x74ef5
end
-UnknownScript_0x74e86:
+.skip:
end
-UnknownScript_0x74e87:
+VermilionPortNotRidingScript:
writetext UnknownText_0x74fa7
waitbutton
closetext
end
-UnknownScript_0x74e8d:
+VermilionPortNotRidingMoveAwayScript:
writetext UnknownText_0x74fa7
waitbutton
closetext
@@ -147,7 +147,7 @@
faceplayer
opentext
checkevent EVENT_GAVE_KURT_APRICORNS
- iftrue UnknownScript_0x74e1a
+ iftrue VermilionPortAlreadyRodeScript
checkcode VAR_WEEKDAY
if_equal MONDAY, .NextShipWednesday
if_equal TUESDAY, .NextShipWednesday
@@ -156,17 +156,17 @@
if_equal SATURDAY, .NextShipSunday
writetext UnknownText_0x74f4d
yesorno
- iffalse UnknownScript_0x74e87
+ iffalse VermilionPortNotRidingScript
writetext UnknownText_0x74f8b
buttonsound
checkitem S_S_TICKET
iffalse .NoTicket
- writetext UnknownText_0x74fc2
+ writetext VermilionPortSSTicketText
waitbutton
closetext
setevent EVENT_RECEIVED_BALLS_FROM_KURT
applymovement PLAYER, MovementData_0x74efe
- jump SailorScript_0x74dc4
+ jump VermilionPortSailorAtGangway
.NoTicket:
writetext UnknownText_0x74ff2
@@ -257,7 +257,7 @@
line "again!"
done
-UnknownText_0x74fc2:
+VermilionPortSSTicketText:
text "<PLAYER> flashed"
line "the S.S.TICKET."
@@ -309,7 +309,7 @@
.CoordEvents:
db 1
- coord_event 7, 11, 0, UnknownScript_0x74e20
+ coord_event 7, 11, 0, VermilionPortWalkUpToShipScript
.BGEvents:
db 1
@@ -317,6 +317,6 @@
.ObjectEvents:
db 3
- object_event 7, 17, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x74dc4, EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY
+ object_event 7, 17, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, VermilionPortSailorAtGangway, EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY
object_event 6, 11, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SailorScript_0x74e97, -1
object_event 11, 11, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SuperNerdScript_0x74ee6, -1