summaryrefslogtreecommitdiff
path: root/maps/MountMoon.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/MountMoon.asm
parentf485a45cda5f84e6909997147b1e6c9a9a538d9b (diff)
Move effects; no more reloadmapmusic, returnafterbattle
Diffstat (limited to 'maps/MountMoon.asm')
-rw-r--r--maps/MountMoon.asm12
1 files changed, 6 insertions, 6 deletions
diff --git a/maps/MountMoon.asm b/maps/MountMoon.asm
index f633b9dce..5c1fdb985 100644
--- a/maps/MountMoon.asm
+++ b/maps/MountMoon.asm
@@ -38,8 +38,8 @@ MountMoon_MapScriptHeader:
setlasttalked MOUNTMOON_SILVER
loadtrainer RIVAL2, 3
startbattle
- reloadmapmusic
- returnafterbattle
+ dontrestartmapmusic
+ reloadmapafterbattle
jump .FinishBattle
.Totodile:
@@ -47,8 +47,8 @@ MountMoon_MapScriptHeader:
setlasttalked MOUNTMOON_SILVER
loadtrainer RIVAL2, 1
startbattle
- reloadmapmusic
- returnafterbattle
+ dontrestartmapmusic
+ reloadmapafterbattle
jump .FinishBattle
.Chikorita:
@@ -56,8 +56,8 @@ MountMoon_MapScriptHeader:
setlasttalked MOUNTMOON_SILVER
loadtrainer RIVAL2, 2
startbattle
- reloadmapmusic
- returnafterbattle
+ dontrestartmapmusic
+ reloadmapafterbattle
jump .FinishBattle
.FinishBattle: