diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2015-12-26 18:11:55 -0500 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-12-26 19:22:27 -0500 |
| commit | 2bd45ca574aab251b91c24837b102c9c2a5e76a0 (patch) | |
| tree | bd8c568b9e43f7467ff4822080c6228c29bca2b9 /engine/scripting.asm | |
| parent | f485a45cda5f84e6909997147b1e6c9a9a538d9b (diff) | |
Move effects; no more reloadmapmusic, returnafterbattle
Diffstat (limited to 'engine/scripting.asm')
| -rw-r--r-- | engine/scripting.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engine/scripting.asm b/engine/scripting.asm index 5de990006..de6644fbe 100644 --- a/engine/scripting.asm +++ b/engine/scripting.asm @@ -168,7 +168,7 @@ ENDC dw Script_loadwildmon ; 5d dw Script_loadtrainer ; 5e dw Script_startbattle ; 5f - dw Script_returnafterbattle ; 60 + dw Script_reloadmapafterbattle ; 60 dw Script_catchtutorial ; 61 dw Script_trainertext ; 62 dw Script_trainerflagaction ; 63 @@ -203,7 +203,7 @@ ENDC dw Script_encountermusic ; 80 dw Script_musicfadeout ; 81 dw Script_playmapmusic ; 82 - dw Script_reloadmapmusic ; 83 + dw Script_dontrestartmapmusic ; 83 dw Script_cry ; 84 dw Script_playsound ; 85 dw Script_waitsfx ; 86 @@ -1555,7 +1555,7 @@ Script_catchtutorial: ; 97447 jp Script_reloadmap ; 97459 -Script_returnafterbattle: ; 97459 +Script_reloadmapafterbattle: ; 97459 ; script command 0x60 ld hl, wBattleScriptFlags @@ -2905,11 +2905,11 @@ Script_blackoutmod: ; 97a78 ret ; 97a85 -Script_reloadmapmusic: ; 97a85 +Script_dontrestartmapmusic: ; 97a85 ; script command 0x83 ld a, 1 - ld [wc2c1], a + ld [wDontPlayMapMusicOnReload], a ret ; 97a8b |