diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-06-08 20:35:04 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-06-08 20:35:04 -0400 |
| commit | e4d82e92d0ce9742278c67e9288e523ccfb24911 (patch) | |
| tree | e2d8e7c65f61c69bc230e1f364ba7ca5ed8c1dea /engine | |
| parent | 1f9e688b76c90403d14f1ab68b47b0e7d1df24c6 (diff) | |
Rename `prioritysjump` to `sdefer`
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 4118d0efd..ffbd01dee 100644 --- a/engine/overworld/events.asm +++ b/engine/overworld/events.asm @@ -436,11 +436,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 92ca71605..05e0f95e5 100644 --- a/engine/overworld/scripting.asm +++ b/engine/overworld/scripting.asm @@ -205,7 +205,7 @@ ScriptCommandTable: dw Script_newloadmap ; 8a dw Script_pause ; 8b dw Script_deactivatefacing ; 8c - dw Script_prioritysjump ; 8d + dw Script_sdefer ; 8d dw Script_warpcheck ; 8e dw Script_stopandsjump ; 8f dw Script_endcallback ; 90 @@ -1388,13 +1388,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 |