summaryrefslogtreecommitdiff
path: root/maps/TeamRocketBaseB2F.asm
diff options
context:
space:
mode:
authorentrpntr <entrpntr@gmail.com>2020-05-15 09:51:36 -0400
committerentrpntr <entrpntr@gmail.com>2020-05-15 09:57:37 -0400
commit05b591cd95f3fd62e84b33eb56d25f197b17a96c (patch)
tree57635b441bb8b2a208a359126c5dc9b8df7abfa6 /maps/TeamRocketBaseB2F.asm
parent82c33aacb036428bf9861e7f97914c7bb675fa07 (diff)
Remove remaining legacy macros from current code.
Diffstat (limited to 'maps/TeamRocketBaseB2F.asm')
-rw-r--r--maps/TeamRocketBaseB2F.asm12
1 files changed, 6 insertions, 6 deletions
diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm
index 63a0ecfa..9dbc2820 100644
--- a/maps/TeamRocketBaseB2F.asm
+++ b/maps/TeamRocketBaseB2F.asm
@@ -47,7 +47,7 @@ TeamRocketBaseB2F_MapScripts:
RocketBaseBossFLeft:
moveobject TEAMROCKETBASEB2F_LANCE, 9, 13
- jump RocketBaseBossFScript
+ sjump RocketBaseBossFScript
RocketBaseBossFRight:
moveobject TEAMROCKETBASEB2F_ROCKET_GIRL, 21, 16
@@ -154,7 +154,7 @@ RocketBaseLancesSideScript:
LanceHealsScript1:
turnobject PLAYER, UP
- jump LanceHealsCommon
+ sjump LanceHealsCommon
LanceHealsScript2:
turnobject PLAYER, RIGHT
@@ -174,7 +174,7 @@ LanceHealsCommon:
closetext
setscene SCENE_TEAMROCKETBASEB2F_ROCKET_BOSS
setevent EVENT_LANCE_HEALED_YOU_IN_TEAM_ROCKET_BASE
- checkcode VAR_FACING
+ readvar VAR_FACING
ifequal RIGHT, .FacingRight
applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d212
disappear TEAMROCKETBASEB2F_LANCE
@@ -234,7 +234,7 @@ RocketElectrode1:
reloadmapafterbattle
special PlayMapMusic
applymovement PLAYER, MovementData_0x6d28c
- jump RocketBaseElectrodeScript
+ sjump RocketBaseElectrodeScript
RocketElectrode2:
cry ELECTRODE
@@ -252,7 +252,7 @@ RocketElectrode2:
reloadmapafterbattle
special PlayMapMusic
applymovement PLAYER, MovementData_0x6d299
- jump RocketBaseElectrodeScript
+ sjump RocketBaseElectrodeScript
RocketElectrode3:
cry ELECTRODE
@@ -270,7 +270,7 @@ RocketElectrode3:
reloadmapafterbattle
special PlayMapMusic
applymovement PLAYER, MovementData_0x6d2a4
- jump RocketBaseElectrodeScript
+ sjump RocketBaseElectrodeScript
TeamRocketBaseB2FReloadMap:
reloadmapafterbattle