diff options
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/events.asm | 4 | ||||
| -rw-r--r-- | engine/pack.asm | 18 | ||||
| -rw-r--r-- | engine/scripting.asm | 2 | ||||
| -rw-r--r-- | engine/specials.asm | 4 |
4 files changed, 14 insertions, 14 deletions
diff --git a/engine/events.asm b/engine/events.asm index e60f08b9a..1b937dcf0 100644 --- a/engine/events.asm +++ b/engine/events.asm @@ -947,11 +947,11 @@ SelectMenuCallback: ; 96b66 ; 96b72 .Script ; 96b72 - ptjump wd0e8 + ptjump wQueuedScriptBank ; 96b75 .Asm ; 96b75 - ptcallasm wd0e8 + ptcallasm wQueuedScriptBank end ; 96b79 diff --git a/engine/pack.asm b/engine/pack.asm index a414ecf49..0365dcfc7 100644 --- a/engine/pack.asm +++ b/engine/pack.asm @@ -64,7 +64,7 @@ Function10067: ; 10067 (4:4067) ld hl, MenuDataHeader_0x10a4f call CopyMenuDataHeader ld a, [wItemsPocketCursor] - ld [wPocketCursorBuffer], a + ld [wMenuCursorBuffer], a ld a, [wd0df] ld [wd0e4], a call Function350c @@ -92,7 +92,7 @@ Function100a6: ; 100a6 (4:40a6) ld hl, MenuDataHeader_0x10a7f call CopyMenuDataHeader ld a, [wKeyItemsPocketCursor] - ld [wPocketCursorBuffer], a + ld [wMenuCursorBuffer], a ld a, [wd0e0] ld [wd0e4], a call Function350c @@ -222,7 +222,7 @@ Function10198: ; 10198 (4:4198) ld hl, MenuDataHeader_0x10aaf call CopyMenuDataHeader ld a, [wBallsPocketCursor] - ld [wPocketCursorBuffer], a + ld [wMenuCursorBuffer], a ld a, [wd0e1] ld [wd0e4], a call Function350c @@ -719,7 +719,7 @@ Function104fa: ; 104fa (4:44fa) ld hl, MenuDataHeader_0x10a4f call CopyMenuDataHeader ld a, [wItemsPocketCursor] - ld [wPocketCursorBuffer], a + ld [wMenuCursorBuffer], a ld a, [wd0df] ld [wd0e4], a call Function350c @@ -747,7 +747,7 @@ Function10539: ; 10539 (4:4539) ld hl, MenuDataHeader_0x10a7f call CopyMenuDataHeader ld a, [wKeyItemsPocketCursor] - ld [wPocketCursorBuffer], a + ld [wMenuCursorBuffer], a ld a, [wd0e0] ld [wd0e4], a call Function350c @@ -798,7 +798,7 @@ Function105a6: ; 105a6 (4:45a6) ld hl, MenuDataHeader_0x10aaf call CopyMenuDataHeader ld a, [wBallsPocketCursor] - ld [wPocketCursorBuffer], a + ld [wMenuCursorBuffer], a ld a, [wd0e1] ld [wd0e4], a call Function350c @@ -1004,7 +1004,7 @@ Jumptable_106d1: ; 106d1 (4:46d1) ld hl, MenuDataHeader_0x10a67 call CopyMenuDataHeader ld a, [wItemsPocketCursor] - ld [wPocketCursorBuffer], a + ld [wMenuCursorBuffer], a ld a, [wd0df] ld [wd0e4], a call Function350c @@ -1020,7 +1020,7 @@ Jumptable_106d1: ; 106d1 (4:46d1) ld hl, MenuDataHeader_0x10a97 call CopyMenuDataHeader ld a, [wKeyItemsPocketCursor] - ld [wPocketCursorBuffer], a + ld [wMenuCursorBuffer], a ld a, [wd0e0] ld [wd0e4], a call Function350c @@ -1045,7 +1045,7 @@ Jumptable_106d1: ; 106d1 (4:46d1) ld hl, MenuDataHeader_0x10ac7 call CopyMenuDataHeader ld a, [wBallsPocketCursor] - ld [wPocketCursorBuffer], a + ld [wMenuCursorBuffer], a ld a, [wd0e1] ld [wd0e4], a call Function350c diff --git a/engine/scripting.asm b/engine/scripting.asm index df430f4ad..a6b0b074c 100644 --- a/engine/scripting.asm +++ b/engine/scripting.asm @@ -529,7 +529,7 @@ Script_interpretmenu: ; 0x96f41 ld a, [ScriptBank] ld hl, InterpretMenu rst FarCall - ld a, [wPocketCursorBuffer] + ld a, [wMenuCursorBuffer] jr nc, .ok xor a .ok diff --git a/engine/specials.asm b/engine/specials.asm index adfb115ff..d283a88de 100644 --- a/engine/specials.asm +++ b/engine/specials.asm @@ -413,9 +413,9 @@ Special_DummyNonfunctionalGameCornerGame: ; c38d ; c39a Special_StartGameCornerGame: ; c39a - call Function31cf + call FarQueueScript call FadeToMenu - ld hl, wd0e8 + ld hl, wQueuedScriptBank ld a, [hli] push af ld a, [hli] |