From a613ed915c32d3befec54a98dae98e21649e19ce Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Wed, 4 May 2016 22:34:09 -0400 Subject: HDMA transfer functions --- engine/scripting.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engine/scripting.asm') diff --git a/engine/scripting.asm b/engine/scripting.asm index 078ce8931..d068d8044 100644 --- a/engine/scripting.asm +++ b/engine/scripting.asm @@ -3054,7 +3054,7 @@ Script_loadbytec2cf: ; 97b27 Script_closetext: ; 97b2f ; script command 0x49 - call Function2e20 + call _OpenAndCloseMenu_HDMATransferTileMapAndAttrMap call CloseText ret ; 97b36 -- cgit v1.2.3 From ae36ef2c7fb722b7480d73c7a95a5d1e2ece7831 Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Tue, 10 May 2016 12:31:49 -0400 Subject: Labeled every function in ROM0 that's referenced in the source --- engine/scripting.asm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'engine/scripting.asm') diff --git a/engine/scripting.asm b/engine/scripting.asm index d068d8044..076ca3b79 100644 --- a/engine/scripting.asm +++ b/engine/scripting.asm @@ -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 @@ -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 " " -- cgit v1.2.3 From 3108c9fa6a265a7ecbac6fa2aaa458025f5aeead Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Sat, 14 May 2016 12:28:00 -0400 Subject: Unify step_sleep macro --- engine/scripting.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'engine/scripting.asm') diff --git a/engine/scripting.asm b/engine/scripting.asm index 076ca3b79..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 -- cgit v1.2.3