summaryrefslogtreecommitdiff
path: root/maps/TeamRocketBaseB3F.asm
diff options
context:
space:
mode:
authorentrpntr <entrpntr@gmail.com>2020-06-19 07:32:01 -0400
committerentrpntr <entrpntr@gmail.com>2020-06-19 07:35:14 -0400
commit9d0c8dbf8e57fa2832f71fae94de7552e270d367 (patch)
treef00d94c0f03ebbe4358a6ff794c323ac7cc6ea45 /maps/TeamRocketBaseB3F.asm
parente87159ed7bbff17f2e3c0a074860c0eaa54f9cbb (diff)
Rename labels to stop cheating the unnamed.py script.
Diffstat (limited to 'maps/TeamRocketBaseB3F.asm')
-rw-r--r--maps/TeamRocketBaseB3F.asm28
1 files changed, 14 insertions, 14 deletions
diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm
index f9cd0354..209f0057 100644
--- a/maps/TeamRocketBaseB3F.asm
+++ b/maps/TeamRocketBaseB3F.asm
@@ -50,12 +50,12 @@ LanceGetPasswordScript:
pause 5
turnobject TEAMROCKETBASEB3F_MOLTRES, RIGHT
pause 20
- applymovement TEAMROCKETBASEB3F_LANCE, MovementData_0x6e12a
+ applymovement TEAMROCKETBASEB3F_LANCE, MovementData_0x115de0
opentext
writetext LanceGetPasswordText
waitbutton
closetext
- applymovement TEAMROCKETBASEB3F_LANCE, MovementData_0x6e12c
+ applymovement TEAMROCKETBASEB3F_LANCE, MovementData_0x115de2
disappear TEAMROCKETBASEB3F_LANCE
setscene SCENE_TEAMROCKETBASEB3F_RIVAL_ENCOUNTER
end
@@ -84,11 +84,11 @@ TeamRocketBaseB3FRocketScript:
jumptextfaceplayer TeamRocketBaseB3FRocketText
RocketBaseBossLeft:
- applymovement PLAYER, MovementData_0x6e133
+ applymovement PLAYER, MovementData_0x115de9
sjump RocketBaseBoss
RocketBaseBossRight:
- applymovement PLAYER, MovementData_0x6e13a
+ applymovement PLAYER, MovementData_0x115df0
RocketBaseBoss:
pause 30
showemote EMOTE_SHOCK, TEAMROCKETBASEB3F_ROCKET1, 15
@@ -98,7 +98,7 @@ RocketBaseBoss:
writetext ExecutiveM4BeforeText
waitbutton
closetext
- applymovement TEAMROCKETBASEB3F_ROCKET1, MovementData_0x6e142
+ applymovement TEAMROCKETBASEB3F_ROCKET1, MovementData_0x115df8
winlosstext ExecutiveM4BeatenText, 0
setlasttalked TEAMROCKETBASEB3F_ROCKET1
loadtrainer EXECUTIVEM, EXECUTIVEM_4
@@ -109,9 +109,9 @@ RocketBaseBoss:
writetext ExecutiveM4AfterText
waitbutton
closetext
- applymovement TEAMROCKETBASEB3F_ROCKET1, MovementData_0x6e144
+ applymovement TEAMROCKETBASEB3F_ROCKET1, MovementData_0x115dfa
playsound SFX_TACKLE
- applymovement TEAMROCKETBASEB3F_ROCKET1, MovementData_0x6e147
+ applymovement TEAMROCKETBASEB3F_ROCKET1, MovementData_0x115dfd
disappear TEAMROCKETBASEB3F_ROCKET1
setscene SCENE_TEAMROCKETBASEB3F_NOTHING
end
@@ -213,11 +213,11 @@ TeamRocketBaseB3FProtein:
TeamRocketBaseB3FIceHeal:
itemball ICE_HEAL
-MovementData_0x6e12a:
+MovementData_0x115de0:
step RIGHT
step_end
-MovementData_0x6e12c:
+MovementData_0x115de2:
step DOWN
step LEFT
step LEFT
@@ -226,7 +226,7 @@ MovementData_0x6e12c:
step LEFT
step_end
-MovementData_0x6e133:
+MovementData_0x115de9:
step UP
step UP
step UP
@@ -235,7 +235,7 @@ MovementData_0x6e133:
turn_head UP
step_end
-MovementData_0x6e13a:
+MovementData_0x115df0:
step UP
step UP
step LEFT
@@ -245,16 +245,16 @@ MovementData_0x6e13a:
turn_head UP
step_end
-MovementData_0x6e142:
+MovementData_0x115df8:
step DOWN
step_end
-MovementData_0x6e144:
+MovementData_0x115dfa:
big_step RIGHT
big_step RIGHT
step_end
-MovementData_0x6e147:
+MovementData_0x115dfd:
fix_facing
fast_jump_step LEFT
remove_fixed_facing