summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--maps/TeamRocketBaseB2F.asm34
1 files changed, 17 insertions, 17 deletions
diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm
index abfd227a1..f31110476 100644
--- a/maps/TeamRocketBaseB2F.asm
+++ b/maps/TeamRocketBaseB2F.asm
@@ -178,12 +178,12 @@ LanceHealsCommon:
setscene 1
setevent EVENT_LANCE_HEALED_YOU_IN_TEAM_ROCKET_BASE
checkcode VAR_FACING
- if_equal RIGHT, UnknownScript_0x6d0be
+ if_equal RIGHT, .FacingRight
applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d212
disappear TEAMROCKETBASEB2F_LANCE
end
-UnknownScript_0x6d0be:
+.FacingRight:
applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d219
disappear TEAMROCKETBASEB2F_LANCE
end
@@ -225,15 +225,15 @@ RocketElectrode1:
cry ELECTRODE
loadwildmon ELECTRODE, 23
startbattle
- iftrue UnknownScript_0x6d182
+ iftrue TeamRocketBaseB2FReloadMap
disappear TEAMROCKETBASEB2F_ELECTRODE1
disappear TEAMROCKETBASEB2F_ELECTRODE4
checkevent EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_1
- iffalse UnknownScript_0x6d182
+ iffalse TeamRocketBaseB2FReloadMap
checkevent EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_2
- iffalse UnknownScript_0x6d182
+ iffalse TeamRocketBaseB2FReloadMap
checkevent EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_3
- iffalse UnknownScript_0x6d182
+ iffalse TeamRocketBaseB2FReloadMap
reloadmapafterbattle
special PlayMapMusic
applymovement PLAYER, MovementData_0x6d28c
@@ -243,15 +243,15 @@ RocketElectrode2:
cry ELECTRODE
loadwildmon ELECTRODE, 23
startbattle
- iftrue UnknownScript_0x6d182
+ iftrue TeamRocketBaseB2FReloadMap
disappear TEAMROCKETBASEB2F_ELECTRODE2
disappear TEAMROCKETBASEB2F_ELECTRODE5
checkevent EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_1
- iffalse UnknownScript_0x6d182
+ iffalse TeamRocketBaseB2FReloadMap
checkevent EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_2
- iffalse UnknownScript_0x6d182
+ iffalse TeamRocketBaseB2FReloadMap
checkevent EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_3
- iffalse UnknownScript_0x6d182
+ iffalse TeamRocketBaseB2FReloadMap
reloadmapafterbattle
special PlayMapMusic
applymovement PLAYER, MovementData_0x6d299
@@ -261,21 +261,21 @@ RocketElectrode3:
cry ELECTRODE
loadwildmon ELECTRODE, 23
startbattle
- iftrue UnknownScript_0x6d182
+ iftrue TeamRocketBaseB2FReloadMap
disappear TEAMROCKETBASEB2F_ELECTRODE3
disappear TEAMROCKETBASEB2F_ELECTRODE6
checkevent EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_1
- iffalse UnknownScript_0x6d182
+ iffalse TeamRocketBaseB2FReloadMap
checkevent EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_2
- iffalse UnknownScript_0x6d182
+ iffalse TeamRocketBaseB2FReloadMap
checkevent EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_3
- iffalse UnknownScript_0x6d182
+ iffalse TeamRocketBaseB2FReloadMap
reloadmapafterbattle
special PlayMapMusic
applymovement PLAYER, MovementData_0x6d2a4
jump UnknownScript_0x6d184
-UnknownScript_0x6d182:
+TeamRocketBaseB2FReloadMap:
reloadmapafterbattle
end
@@ -320,13 +320,13 @@ TeamRocketBaseB2FLockedDoor:
.Script:
opentext
checkevent EVENT_LEARNED_HAIL_GIOVANNI
- iftrue UnknownScript_0x6d1e8
+ iftrue .KnowsPassword
writetext UnknownText_0x6dd39
waitbutton
closetext
end
-UnknownScript_0x6d1e8:
+.KnowsPassword:
writetext UnknownText_0x6dd6b
waitbutton
playsound SFX_ENTER_DOOR