summaryrefslogtreecommitdiff
path: root/maps/Route43.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/Route43.asm
parentf485a45cda5f84e6909997147b1e6c9a9a538d9b (diff)
Move effects; no more reloadmapmusic, returnafterbattle
Diffstat (limited to 'maps/Route43.asm')
-rw-r--r--maps/Route43.asm16
1 files changed, 8 insertions, 8 deletions
diff --git a/maps/Route43.asm b/maps/Route43.asm
index bb68bd59d..ddc2bfa1c 100644
--- a/maps/Route43.asm
+++ b/maps/Route43.asm
@@ -100,7 +100,7 @@ UnknownScript_0x19d0cf:
.LoadFight0
loadtrainer POKEMANIAC, BRENT1
startbattle
- returnafterbattle
+ reloadmapafterbattle
loadvar wBrentFightCount, 1
clearflag ENGINE_BRENT
end
@@ -108,7 +108,7 @@ UnknownScript_0x19d0cf:
.LoadFight1
loadtrainer POKEMANIAC, BRENT2
startbattle
- returnafterbattle
+ reloadmapafterbattle
loadvar wBrentFightCount, 2
clearflag ENGINE_BRENT
end
@@ -116,7 +116,7 @@ UnknownScript_0x19d0cf:
.LoadFight2
loadtrainer POKEMANIAC, BRENT3
startbattle
- returnafterbattle
+ reloadmapafterbattle
loadvar wBrentFightCount, 3
clearflag ENGINE_BRENT
end
@@ -124,7 +124,7 @@ UnknownScript_0x19d0cf:
.LoadFight3
loadtrainer POKEMANIAC, BRENT4
startbattle
- returnafterbattle
+ reloadmapafterbattle
clearflag ENGINE_BRENT
end
@@ -231,7 +231,7 @@ UnknownScript_0x19d1c1:
.LoadFight0
loadtrainer PICNICKER, TIFFANY3
startbattle
- returnafterbattle
+ reloadmapafterbattle
loadvar wTiffanyFightCount, 1
clearflag ENGINE_TIFFANY
end
@@ -239,7 +239,7 @@ UnknownScript_0x19d1c1:
.LoadFight1
loadtrainer PICNICKER, TIFFANY1
startbattle
- returnafterbattle
+ reloadmapafterbattle
loadvar wTiffanyFightCount, 2
clearflag ENGINE_TIFFANY
end
@@ -247,7 +247,7 @@ UnknownScript_0x19d1c1:
.LoadFight2
loadtrainer PICNICKER, TIFFANY2
startbattle
- returnafterbattle
+ reloadmapafterbattle
loadvar wTiffanyFightCount, 3
clearflag ENGINE_TIFFANY
end
@@ -255,7 +255,7 @@ UnknownScript_0x19d1c1:
.LoadFight3
loadtrainer PICNICKER, TIFFANY4
startbattle
- returnafterbattle
+ reloadmapafterbattle
clearflag ENGINE_TIFFANY
end