summaryrefslogtreecommitdiff
path: root/maps/Route30.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/Route30.asm
parentf485a45cda5f84e6909997147b1e6c9a9a538d9b (diff)
Move effects; no more reloadmapmusic, returnafterbattle
Diffstat (limited to 'maps/Route30.asm')
-rw-r--r--maps/Route30.asm10
1 files changed, 5 insertions, 5 deletions
diff --git a/maps/Route30.asm b/maps/Route30.asm
index 56f3cf298..e5ca13fe3 100644
--- a/maps/Route30.asm
+++ b/maps/Route30.asm
@@ -91,7 +91,7 @@ TrainerYoungsterJoey:
.LoadFight0
loadtrainer YOUNGSTER, JOEY1
startbattle
- returnafterbattle
+ reloadmapafterbattle
loadvar wJoeyFightCount, 1
clearflag ENGINE_JOEY
end
@@ -99,7 +99,7 @@ TrainerYoungsterJoey:
.LoadFight1
loadtrainer YOUNGSTER, JOEY2
startbattle
- returnafterbattle
+ reloadmapafterbattle
loadvar wJoeyFightCount, 2
clearflag ENGINE_JOEY
end
@@ -107,7 +107,7 @@ TrainerYoungsterJoey:
.LoadFight2
loadtrainer YOUNGSTER, JOEY3
startbattle
- returnafterbattle
+ reloadmapafterbattle
loadvar wJoeyFightCount, 3
clearflag ENGINE_JOEY
end
@@ -115,7 +115,7 @@ TrainerYoungsterJoey:
.LoadFight3
loadtrainer YOUNGSTER, JOEY4
startbattle
- returnafterbattle
+ reloadmapafterbattle
loadvar wJoeyFightCount, 4
clearflag ENGINE_JOEY
end
@@ -123,7 +123,7 @@ TrainerYoungsterJoey:
.LoadFight4
loadtrainer YOUNGSTER, JOEY5
startbattle
- returnafterbattle
+ reloadmapafterbattle
clearflag ENGINE_JOEY
checkevent EVENT_JOEY_HP_UP
iftrue .GiveHPUp