diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2016-07-21 07:58:36 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2016-07-21 07:58:36 -0400 |
| commit | 803c6081d7b458f1965c4b9e62be2714b73fcdf4 (patch) | |
| tree | 94632a90406f3b185d82cabee2beb834bd711215 /engine/scripting.asm | |
| parent | c33ba049a5a993fc678fd1698645039ce4974022 (diff) | |
| parent | a32b6ccbb5b9ad15befa3b9893659f2ceabd1ba0 (diff) | |
Merge github.com:pikalaxalt/pokecrystal
Diffstat (limited to 'engine/scripting.asm')
| -rw-r--r-- | engine/scripting.asm | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/engine/scripting.asm b/engine/scripting.asm index 078ce8931..745948a6f 100644 --- a/engine/scripting.asm +++ b/engine/scripting.asm @@ -1427,12 +1427,12 @@ ShowEmoteScript: ; 973b6 .Show: show_emote - step_sleep_1 + step_sleep 1 step_end .Hide: hide_emote - step_sleep_1 + step_sleep 1 step_end ; 973c7 @@ -1652,9 +1652,9 @@ ScriptCall: ; 974cb inc [hl] ld d, $0 ld hl, wScriptStack -rept 3 add hl, de -endr + add hl, de + add hl, de pop de ld a, [ScriptBank] ld [hli], a @@ -1825,9 +1825,9 @@ StdScript: ; 9757b call GetScriptByte ld d, a ld hl, StdScripts -rept 3 add hl, de -endr + add hl, de + add hl, de ld a, BANK(StdScripts) call GetFarByte ld b, a @@ -3054,7 +3054,7 @@ Script_loadbytec2cf: ; 97b27 Script_closetext: ; 97b2f ; script command 0x49 - call Function2e20 + call _OpenAndCloseMenu_HDMATransferTileMapAndAttrMap call CloseText ret ; 97b36 @@ -3160,9 +3160,9 @@ ExitScriptSubroutine: ; 97b9a ld e, [hl] ld d, $0 ld hl, wScriptStack -rept 3 add hl,de -endr + add hl,de + add hl,de ld a, [hli] ld b, a and " " |