summaryrefslogtreecommitdiff
path: root/macros
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 /macros
parentf485a45cda5f84e6909997147b1e6c9a9a538d9b (diff)
Move effects; no more reloadmapmusic, returnafterbattle
Diffstat (limited to 'macros')
-rw-r--r--macros/event.asm12
1 files changed, 6 insertions, 6 deletions
diff --git a/macros/event.asm b/macros/event.asm
index 8ef05b141..23fa9c034 100644
--- a/macros/event.asm
+++ b/macros/event.asm
@@ -618,9 +618,9 @@ startbattle: macro
db startbattle_command
endm
- enum returnafterbattle_command
-returnafterbattle: macro
- db returnafterbattle_command
+ enum reloadmapafterbattle_command
+reloadmapafterbattle: macro
+ db reloadmapafterbattle_command
endm
enum catchtutorial_command
@@ -833,9 +833,9 @@ playmapmusic: macro
db playmapmusic_command
endm
- enum reloadmapmusic_command
-reloadmapmusic: macro
- db reloadmapmusic_command
+ enum dontrestartmapmusic_command
+dontrestartmapmusic: macro
+ db dontrestartmapmusic_command
endm
enum cry_command