summaryrefslogtreecommitdiff
path: root/maps/TeamRocketBaseB2F.asm
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@gmail.com>2015-12-26 18:11:55 -0500
committerPikalaxALT <PikalaxALT@gmail.com>2015-12-26 19:22:27 -0500
commit2bd45ca574aab251b91c24837b102c9c2a5e76a0 (patch)
treebd8c568b9e43f7467ff4822080c6228c29bca2b9 /maps/TeamRocketBaseB2F.asm
parentf485a45cda5f84e6909997147b1e6c9a9a538d9b (diff)
Move effects; no more reloadmapmusic, returnafterbattle
Diffstat (limited to 'maps/TeamRocketBaseB2F.asm')
-rw-r--r--maps/TeamRocketBaseB2F.asm10
1 files changed, 5 insertions, 5 deletions
diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm
index 36377d5ea..3a675f92e 100644
--- a/maps/TeamRocketBaseB2F.asm
+++ b/maps/TeamRocketBaseB2F.asm
@@ -108,7 +108,7 @@ UnknownScript_0x6cfac:
setevent EVENT_TEAM_ROCKET_BASE_B2F_EXECUTIVE
setevent EVENT_TEAM_ROCKET_BASE_B2F_GRUNT_WITH_EXECUTIVE
setevent EVENT_TEAM_ROCKET_BASE_B2F_LANCE
- returnafterbattle
+ reloadmapafterbattle
setevent EVENT_BEAT_ROCKET_EXECUTIVEF_2
opentext
writetext UnknownText_0x6d4c6
@@ -239,7 +239,7 @@ VoltorbScript_0x6d101:
iffalse UnknownScript_0x6d182
checkevent EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_3
iffalse UnknownScript_0x6d182
- returnafterbattle
+ reloadmapafterbattle
special PlayMapMusic
applymovement PLAYER, MovementData_0x6d28c
jump UnknownScript_0x6d184
@@ -257,7 +257,7 @@ VoltorbScript_0x6d12c:
iffalse UnknownScript_0x6d182
checkevent EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_3
iffalse UnknownScript_0x6d182
- returnafterbattle
+ reloadmapafterbattle
special PlayMapMusic
applymovement PLAYER, MovementData_0x6d299
jump UnknownScript_0x6d184
@@ -275,13 +275,13 @@ VoltorbScript_0x6d157:
iffalse UnknownScript_0x6d182
checkevent EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_3
iffalse UnknownScript_0x6d182
- returnafterbattle
+ reloadmapafterbattle
special PlayMapMusic
applymovement PLAYER, MovementData_0x6d2a4
jump UnknownScript_0x6d184
UnknownScript_0x6d182:
- returnafterbattle
+ reloadmapafterbattle
end
UnknownScript_0x6d184: