summaryrefslogtreecommitdiff
path: root/maps/Route35.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/Route35.asm
parentf485a45cda5f84e6909997147b1e6c9a9a538d9b (diff)
Move effects; no more reloadmapmusic, returnafterbattle
Diffstat (limited to 'maps/Route35.asm')
-rw-r--r--maps/Route35.asm12
1 files changed, 6 insertions, 6 deletions
diff --git a/maps/Route35.asm b/maps/Route35.asm
index d0e37ef8a..68f00f694 100644
--- a/maps/Route35.asm
+++ b/maps/Route35.asm
@@ -183,7 +183,7 @@ UnknownScript_0x19c9bb:
.LoadFight0
loadtrainer BUG_CATCHER, ARNIE1
startbattle
- returnafterbattle
+ reloadmapafterbattle
loadvar wArnieFightCount, 1
clearflag ENGINE_ARNIE
end
@@ -191,7 +191,7 @@ UnknownScript_0x19c9bb:
.LoadFight1
loadtrainer BUG_CATCHER, ARNIE2
startbattle
- returnafterbattle
+ reloadmapafterbattle
loadvar wArnieFightCount, 2
clearflag ENGINE_ARNIE
end
@@ -199,7 +199,7 @@ UnknownScript_0x19c9bb:
.LoadFight2
loadtrainer BUG_CATCHER, ARNIE3
startbattle
- returnafterbattle
+ reloadmapafterbattle
loadvar wArnieFightCount, 3
clearflag ENGINE_ARNIE
end
@@ -207,7 +207,7 @@ UnknownScript_0x19c9bb:
.LoadFight3
loadtrainer BUG_CATCHER, ARNIE4
startbattle
- returnafterbattle
+ reloadmapafterbattle
loadvar wArnieFightCount, 4
clearflag ENGINE_ARNIE
end
@@ -215,7 +215,7 @@ UnknownScript_0x19c9bb:
.LoadFight4
loadtrainer BUG_CATCHER, ARNIE5
startbattle
- returnafterbattle
+ reloadmapafterbattle
clearflag ENGINE_ARNIE
end
@@ -250,7 +250,7 @@ OfficerScript_0x19ca49:
winlosstext UnknownText_0x19cf06, 0
loadtrainer OFFICER, DIRK
startbattle
- returnafterbattle
+ reloadmapafterbattle
setevent EVENT_BEAT_OFFICER_DIRK
closetext
end