diff options
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/overworld/events.asm | 4 | ||||
| -rw-r--r-- | engine/overworld/scripting.asm | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/engine/overworld/events.asm b/engine/overworld/events.asm index b8110001..623638b4 100644 --- a/engine/overworld/events.asm +++ b/engine/overworld/events.asm @@ -423,11 +423,11 @@ endr bit 3, [hl] jr z, .nope - ld hl, wPriorityScriptAddr + ld hl, wDeferredScriptAddr ld a, [hli] ld h, [hl] ld l, a - ld a, [wPriorityScriptBank] + ld a, [wDeferredScriptBank] call CallScript scf ret diff --git a/engine/overworld/scripting.asm b/engine/overworld/scripting.asm index 50ebbb04..28506813 100644 --- a/engine/overworld/scripting.asm +++ b/engine/overworld/scripting.asm @@ -204,7 +204,7 @@ ScriptCommandTable: dw Script_newloadmap ; 89 dw Script_pause ; 8a dw Script_deactivatefacing ; 8b - dw Script_prioritysjump ; 8c + dw Script_sdefer ; 8c dw Script_warpcheck ; 8d dw Script_stopandsjump ; 8e dw Script_endcallback ; 8f @@ -1294,13 +1294,13 @@ ScriptJump: ld [wScriptPos + 1], a ret -Script_prioritysjump: +Script_sdefer: ld a, [wScriptBank] - ld [wPriorityScriptBank], a + ld [wDeferredScriptBank], a call GetScriptByte - ld [wPriorityScriptAddr], a + ld [wDeferredScriptAddr], a call GetScriptByte - ld [wPriorityScriptAddr + 1], a + ld [wDeferredScriptAddr + 1], a ld hl, wScriptFlags set 3, [hl] ret |