ref: 96dcc3c0caa854734e849ce11d54bfc4841e2af1
parent: 55c69c487121978ab9431b1339d148d3f3ebaced
author: surskitty <surskitty@gmail.com>
date: Wed Mar 7 17:27:03 EST 2018
Labels, labels.
--- a/maps/PowerPlant.asm
+++ b/maps/PowerPlant.asm
@@ -47,21 +47,21 @@
faceplayer
opentext
checkevent EVENT_RETURNED_MACHINE_PART
- iftrue UnknownScript_0x188e0f
+ iftrue .ReturnedPart
checkevent EVENT_MET_MANAGER_AT_POWER_PLANT
- iftrue UnknownScript_0x188e09
+ iftrue .MetManager
writetext UnknownText_0x188ee0
waitbutton
closetext
end
-UnknownScript_0x188e09:
+.MetManager:
writetext UnknownText_0x188f7f
waitbutton
closetext
end
-UnknownScript_0x188e0f:
+.ReturnedPart:
writetext UnknownText_0x188fa2
waitbutton
closetext
@@ -71,13 +71,13 @@
faceplayer
opentext
checkevent EVENT_RETURNED_MACHINE_PART
- iftrue UnknownScript_0x188e23
+ iftrue .ReturnedPart
writetext UnknownText_0x188fcf
waitbutton
closetext
end
-UnknownScript_0x188e23:
+.ReturnedPart:
writetext UnknownText_0x189038
waitbutton
closetext
@@ -87,13 +87,13 @@
faceplayer
opentext
checkevent EVENT_RETURNED_MACHINE_PART
- iftrue UnknownScript_0x188e37
+ iftrue .ReturnedPart
writetext UnknownText_0x189079
waitbutton
closetext
end
-UnknownScript_0x188e37:
+.ReturnedPart:
writetext UnknownText_0x1890ef
waitbutton
closetext
@@ -103,13 +103,13 @@
faceplayer
opentext
checkevent EVENT_RETURNED_MACHINE_PART
- iftrue UnknownScript_0x188e4b
+ iftrue .ReturnedPart
writetext UnknownText_0x18910e
waitbutton
closetext
end
-UnknownScript_0x188e4b:
+.ReturnedPart:
writetext UnknownText_0x18917f
waitbutton
closetext
@@ -119,13 +119,13 @@
faceplayer
opentext
checkevent EVENT_RETURNED_MACHINE_PART
- iftrue UnknownScript_0x188e5f
+ iftrue .ReturnedPart
writetext UnknownText_0x1891c2
waitbutton
closetext
end
-UnknownScript_0x188e5f:
+.ReturnedPart:
writetext UnknownText_0x189225
waitbutton
closetext
@@ -135,11 +135,11 @@
faceplayer
opentext
checkevent EVENT_RETURNED_MACHINE_PART
- iftrue UnknownScript_0x188eac
+ iftrue .ReturnedPart
checkitem MACHINE_PART
- iftrue UnknownScript_0x188e93
+ iftrue .HoldingPart
checkevent EVENT_MET_MANAGER_AT_POWER_PLANT
- iftrue UnknownScript_0x188e8d
+ iftrue .MetManager
writetext UnknownText_0x189264
waitbutton
closetext
@@ -150,13 +150,13 @@
setscene SCENE_POWERPLANT_GUARD_GETS_PHONE_CALL
end
-UnknownScript_0x188e8d:
+.MetManager:
writetext UnknownText_0x189308
waitbutton
closetext
end
-UnknownScript_0x188e93:
+.HoldingPart:
writetext UnknownText_0x18936e
buttonsound
takeitem MACHINE_PART
@@ -166,21 +166,21 @@
setevent EVENT_ROUTE_24_ROCKET
setevent EVENT_RESTORED_POWER_TO_KANTO
clearevent EVENT_GOLDENROD_TRAIN_STATION_GENTLEMAN
-UnknownScript_0x188eac:
+.ReturnedPart:
checkevent EVENT_GOT_TM07_ZAP_CANNON
- iftrue UnknownScript_0x188ec5
+ iftrue .GotTM
writetext UnknownText_0x1893c4
buttonsound
verbosegiveitem TM_ZAP_CANNON
- iffalse UnknownScript_0x188ec3
+ iffalse .NoRoom
setevent EVENT_GOT_TM07_ZAP_CANNON
writetext UnknownText_0x1893f4
waitbutton
-UnknownScript_0x188ec3:
+.NoRoom:
closetext
end
-UnknownScript_0x188ec5:
+.GotTM:
writetext UnknownText_0x189475
waitbutton
closetext
--- a/maps/TeamRocketBaseB1F.asm
+++ b/maps/TeamRocketBaseB1F.asm
@@ -500,17 +500,17 @@
closetext
end
-MapTeamRocketBaseB1FSignpost5Script:
+TeamRocketBaseB1FSecurityCameraScript:
jumptext SecurityCameraText
-MapTeamRocketBaseB1FSignpost7Script:
+TeamRocketBaseB1FRocketOathScript:
jumpstd teamrocketoath
-MapTeamRocketBaseB1FSignpost0Script:
+TeamRocketBaseB1FSwitchScript:
opentext
checkevent EVENT_TURNED_OFF_SECURITY_CAMERAS
- iftrue UnknownScript_0x6cabe
- writetext UnknownText_0x6cdad
+ iftrue .NoCameras
+ writetext TeamRocketBaseB1FSecretSwitchBetterPressText
playsound SFX_TALLY
waitbutton
closetext
@@ -522,8 +522,8 @@
setevent EVENT_SECURITY_CAMERA_5
end
-UnknownScript_0x6cabe:
- writetext UnknownText_0x6cdd0
+.NoCameras:
+ writetext TeamRocketBaseB1FSwitchIsOffText
waitbutton
closetext
end
@@ -714,12 +714,12 @@
line "shiny."
done
-UnknownText_0x6cdad:
+TeamRocketBaseB1FSecretSwitchBetterPressText:
text "A secret switch!"
line "Better press it."
done
-UnknownText_0x6cdd0:
+TeamRocketBaseB1FSwitchIsOffText:
text "The switch is"
line "turned off."
done
@@ -770,14 +770,14 @@
coord_event 5, 13, SCENE_DEFAULT, ExplodingTrap22
db 9 ; bg events
- bg_event 19, 11, BGEVENT_READ, MapTeamRocketBaseB1FSignpost0Script
- bg_event 24, 1, BGEVENT_UP, MapTeamRocketBaseB1FSignpost5Script
- bg_event 6, 1, BGEVENT_UP, MapTeamRocketBaseB1FSignpost5Script
- bg_event 8, 15, BGEVENT_UP, MapTeamRocketBaseB1FSignpost5Script
- bg_event 22, 15, BGEVENT_UP, MapTeamRocketBaseB1FSignpost5Script
- bg_event 24, 5, BGEVENT_UP, MapTeamRocketBaseB1FSignpost5Script
- bg_event 20, 11, BGEVENT_READ, MapTeamRocketBaseB1FSignpost7Script
- bg_event 21, 11, BGEVENT_READ, MapTeamRocketBaseB1FSignpost7Script
+ bg_event 19, 11, BGEVENT_READ, TeamRocketBaseB1FSwitchScript
+ bg_event 24, 1, BGEVENT_UP, TeamRocketBaseB1FSecurityCameraScript
+ bg_event 6, 1, BGEVENT_UP, TeamRocketBaseB1FSecurityCameraScript
+ bg_event 8, 15, BGEVENT_UP, TeamRocketBaseB1FSecurityCameraScript
+ bg_event 22, 15, BGEVENT_UP, TeamRocketBaseB1FSecurityCameraScript
+ bg_event 24, 5, BGEVENT_UP, TeamRocketBaseB1FSecurityCameraScript
+ bg_event 20, 11, BGEVENT_READ, TeamRocketBaseB1FRocketOathScript
+ bg_event 21, 11, BGEVENT_READ, TeamRocketBaseB1FRocketOathScript
bg_event 3, 11, BGEVENT_ITEM, TeamRocketBaseB1FHiddenRevive
db 6 ; object events