summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--engine/events.asm4
-rw-r--r--engine/pack.asm18
-rw-r--r--engine/scripting.asm2
-rw-r--r--engine/specials.asm4
-rw-r--r--event/buena.asm79
-rw-r--r--event/kurt.asm2
-rw-r--r--home.asm14
-rw-r--r--home/menu.asm10
-rw-r--r--main.asm121
-rw-r--r--misc/mobile_22.asm6
-rw-r--r--misc/mobile_22_2.asm4
-rw-r--r--misc/mobile_40.asm8
-rw-r--r--wram.asm6
13 files changed, 139 insertions, 139 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]
diff --git a/event/buena.asm b/event/buena.asm
index d4ceeffcf..c82c61364 100644
--- a/event/buena.asm
+++ b/event/buena.asm
@@ -1,7 +1,7 @@
SpecialBuenasPassword: ; 8af6b
xor a
ld [wcf76], a
- ld hl, MenuDataHeader_0x8afa9
+ ld hl, .MenuDataHeader
call CopyMenuDataHeader
ld a, [wBuenasPassword]
ld c, a
@@ -11,7 +11,7 @@ SpecialBuenasPassword: ; 8af6b
add $2
ld [wMenuBorderRightCoord], a
call BackUpTiles
- call Function1e5d
+ call Function1e5d ; menu
callba Function4ae5e
ld b, $0
ld a, [MenuSelection]
@@ -19,38 +19,38 @@ SpecialBuenasPassword: ; 8af6b
ld a, [wBuenasPassword]
and $3
cp c
- jr nz, .asm_8afa4
+ jr nz, .wrong
ld b, $1
-.asm_8afa4
+.wrong
ld a, b
ld [ScriptVar], a
ret
; 8afa9
-MenuDataHeader_0x8afa9: ; 0x8afa9
+.MenuDataHeader: ; 0x8afa9
db $40 ; flags
db 00, 00 ; start coords
db 07, 10 ; end coords
- dw MenuData2_0x8afb2
+ dw .MenuData2
db 1 ; default option
; 0x8afb1
db 0
-MenuData2_0x8afb2: ; 0x8afb2
+.MenuData2: ; 0x8afb2
db $81 ; flags
db 0 ; items
- dw Unknown_8afb8
- dw Function8afbd
+ dw .PasswordIndices
+ dw .PlacePasswordChoices
; 0x8afb4
-Unknown_8afb8: ; 8afb8
+.PasswordIndices: ; 8afb8
db 3
db 0, 1, 2
db -1
-Function8afbd: ; 8afbd
+.PlacePasswordChoices: ; 8afbd
push de
ld a, [wBuenasPassword]
and $f0
@@ -71,29 +71,29 @@ SpecialBuenaPrize: ; 8afd4
ld [MenuSelection], a
call Function8b0d6
call Function8b090
- ld hl, UnknownText_0x8b072
+ ld hl, .Text_AskWhichPrize
call PrintText
- jr .asm_8aff1
+ jr .okay
-.asm_8afeb
- ld hl, UnknownText_0x8b072
+.loop
+ ld hl, .Text_AskWhichPrize
call BuenaPrintText
-.asm_8aff1
+.okay
call DelayFrame
call UpdateSprites
call Function8b097
call Function8b0e2
- jr z, .asm_8b05f
+ jr z, .done
ld [wcf75], a
call Buena_getprize
ld a, [hl]
ld [wd265], a
call GetItemName
- ld hl, UnknownText_0x8b077
+ ld hl, .Text_IsThatRight
call BuenaPrintText
call YesNoBox
- jr c, .asm_8afeb
+ jr c, .loop
ld a, [wcf75]
call Buena_getprize
@@ -112,73 +112,72 @@ SpecialBuenaPrize: ; 8afd4
ld hl, NumItems
call ReceiveItem
pop hl
- jr nc, .asm_8b04c
+ jr nc, .BagFull
ld a, [hl]
ld c, a
ld a, [wBlueCardBalance]
sub c
ld [wBlueCardBalance], a
call Function8b097
- jr .asm_8b051
+ jr .Purchase
.InsufficientBalance
- ld hl, UnknownText_0x8b081
- jr .asm_8b05a
+ ld hl, .Text_NotEnoughPoints
+ jr .print
-.asm_8b04c
- ld hl, UnknownText_0x8b086
- jr .asm_8b05a
+.BagFull
+ ld hl, .Text_NoRoom
+ jr .print
-.asm_8b051
+.Purchase
ld de, SFX_TRANSACTION
call PlaySFX
- ld hl, UnknownText_0x8b07c
+ ld hl, .Text_HereYouGo
-.asm_8b05a
+.print
call BuenaPrintText
- jr .asm_8afeb
+ jr .loop
-.asm_8b05f
+.done
call WriteBackup
call WriteBackup
- ld hl, UnknownText_0x8b08b
+ ld hl, .Text_PleaseComeBackAgain
call PrintText
call JoyWaitAorB
call PlayClickSFX
ret
; 8b072
-UnknownText_0x8b072: ; 0x8b072
+.Text_AskWhichPrize: ; 0x8b072
; Which prize would you like?
text_jump UnknownText_0x1c589f
db "@"
; 0x8b077
-UnknownText_0x8b077: ; 0x8b077
+.Text_IsThatRight: ; 0x8b077
; ? Is that right?
text_jump UnknownText_0x1c58bc
db "@"
; 0x8b07c
-UnknownText_0x8b07c: ; 0x8b07c
- ; Here you go!
+.Text_HereYouGo ; Here you go!
text_jump UnknownText_0x1c58d1
db "@"
; 0x8b081
-UnknownText_0x8b081: ; 0x8b081
+.Text_NotEnoughPoints: ; 0x8b081
; You don't have enough points.
text_jump UnknownText_0x1c58e0
db "@"
; 0x8b086
-UnknownText_0x8b086: ; 0x8b086
+.Text_NoRoom: ; 0x8b086
; You have no room for it.
text_jump UnknownText_0x1c58ff
db "@"
; 0x8b08b
-UnknownText_0x8b08b: ; 0x8b08b
+.Text_PleaseComeBackAgain: ; 0x8b08b
; Oh. Please come back again!
text_jump UnknownText_0x1c591a
db "@"
@@ -247,7 +246,7 @@ Function8b0e2: ; 8b0e2
ld hl, .MenuDataHeader
call CopyMenuDataHeader
ld a, [MenuSelection]
- ld [wPocketCursorBuffer], a
+ ld [wMenuCursorBuffer], a
xor a
ld [wcf76], a
ld [hBGMapMode], a
diff --git a/event/kurt.asm b/event/kurt.asm
index 98c276e52..8ed0eeb12 100644
--- a/event/kurt.asm
+++ b/event/kurt.asm
@@ -62,7 +62,7 @@ Kurt_SelectApricorn: ; 88055
ld hl, .MenuDataHeader
call CopyMenuDataHeader
ld a, [MenuSelection]
- ld [wPocketCursorBuffer], a
+ ld [wMenuCursorBuffer], a
xor a
ld [hBGMapMode], a
call Function352f
diff --git a/home.asm b/home.asm
index eef727909..fca23f9f7 100644
--- a/home.asm
+++ b/home.asm
@@ -472,17 +472,17 @@ CallPointerAt:: ; 31be
; 31cd
-ExitMenuCallScript:: ; 31cd
-; Push pointer hl in the current bank to wd0e8.
+QueueScript:: ; 31cd
+; Push pointer hl in the current bank to wQueuedScriptBank.
ld a, [hROMBank]
-Function31cf:: ; 31cf
-; Push pointer a:hl to wd0e8.
- ld [wd0e8], a
+FarQueueScript:: ; 31cf
+; Push pointer a:hl to wQueuedScriptBank.
+ ld [wQueuedScriptBank], a
ld a, l
- ld [wd0e9], a
+ ld [wQueuedScriptAddr], a
ld a, h
- ld [wd0e9 + 1], a
+ ld [wQueuedScriptAddr + 1], a
ret
; 31db
diff --git a/home/menu.asm b/home/menu.asm
index a63f74c08..c5aca06fe 100644
--- a/home/menu.asm
+++ b/home/menu.asm
@@ -16,7 +16,7 @@ CopyMenuDataHeader::
; 0x1d4b
Function1d4b:: ; 1d4b
- ld [wPocketCursorBuffer], a
+ ld [wMenuCursorBuffer], a
ret
; 1d4f
@@ -410,7 +410,7 @@ Function1f2a:: ; 1f2a
ld a, [hl]
ld [MenuSelection], a
ld a, [wcfa9]
- ld [wPocketCursorBuffer], a
+ ld [wMenuCursorBuffer], a
and a
ret
@@ -571,7 +571,7 @@ InterpretMenu:: ; 202a
ld a, [hROMBank]
ld [wcf94], a
callba Function2400e
- ld a, [wPocketCursorBuffer]
+ ld a, [wMenuCursorBuffer]
ret
; 2039
@@ -579,7 +579,7 @@ Function2039:: ; 2039
ld a, [hROMBank]
ld [wcf94], a
callba Function24022
- ld a, [wPocketCursorBuffer]
+ ld a, [wMenuCursorBuffer]
ret
; 2048
@@ -587,7 +587,7 @@ Function2048:: ; 2048
ld a, [hROMBank]
ld [wcf94], a
callba Function2403c
- ld a, [wPocketCursorBuffer]
+ ld a, [wMenuCursorBuffer]
ret
; 2057
diff --git a/main.asm b/main.asm
index 16dfa31a6..ea861eb53 100644
--- a/main.asm
+++ b/main.asm
@@ -4699,7 +4699,7 @@ CutFunction: ; c785
.DoCut: ; c7b2 (3:47b2)
ld hl, Script_CutFromMenu
- call ExitMenuCallScript
+ call QueueScript
ld a, $81
ret
@@ -4907,7 +4907,7 @@ Functionc8b5: ; c8b5
UseFlash: ; c8e0
ld hl, Script_UseFlash
- jp ExitMenuCallScript
+ jp QueueScript
; c8e6
Script_UseFlash: ; 0xc8e6
@@ -4990,7 +4990,7 @@ SurfFunction: ; c909
ld [Buffer2], a ; wd1eb (aliases: MovementType)
call GetPartyNick
ld hl, SurfFromMenuScript
- call ExitMenuCallScript
+ call QueueScript
ld a, $81
ret
@@ -5228,7 +5228,7 @@ FlyFunction: ; ca3b
.DoFly: ; ca94
ld hl, .FlyScript
- call ExitMenuCallScript
+ call QueueScript
ld a, $81
ret
; ca9d
@@ -5279,7 +5279,7 @@ AttemptToWaterfall: ; cae7
call CheckMapCanWaterfall
jr c, .failed
ld hl, Script_WaterfallFromMenu
- call ExitMenuCallScript
+ call QueueScript
ld a, $81
ret
@@ -5452,14 +5452,14 @@ dig_incave
cp $2
jr nz, .escaperope
ld hl, UsedDigScript
- call ExitMenuCallScript
+ call QueueScript
ld a, $81
ret
.escaperope
callba SpecialKabutoChamber
ld hl, UsedEscapeRopeScript
- call ExitMenuCallScript
+ call QueueScript
ld a, $81
ret
; cc06
@@ -5578,7 +5578,7 @@ TeleportFunction: ; cc61
.DoTeleport: ; cc9c
call GetPartyNick
ld hl, Script_UsedTeleport
- call ExitMenuCallScript
+ call QueueScript
ld a, $81
ret
; cca8
@@ -5664,7 +5664,7 @@ FailedStrength: ; cd06
StartToUseStrength: ; cd09
ld hl, Script_StrengthFromMenu
- call ExitMenuCallScript
+ call QueueScript
ld a, $81
ret
; cd12
@@ -5820,7 +5820,7 @@ Jumptable_cdae: ; cdae
.DoWhirlpool: ; cdca
ld hl, Script_WhirlpoolFromMenu
- call ExitMenuCallScript
+ call QueueScript
ld a, $81
ret
; cdd3
@@ -5958,7 +5958,7 @@ TryHeadbuttFromMenu: ; ce86
jr nz, .no_tree
ld hl, HeadbuttFromMenuScript
- call ExitMenuCallScript
+ call QueueScript
ld a, $81
ret
@@ -6053,7 +6053,7 @@ TryRockSmashFromMenu: ; cef4
jr nz, .no_rock
ld hl, RockSmashFromMenuScript
- call ExitMenuCallScript
+ call QueueScript
ld a, $81
ret
@@ -6235,7 +6235,7 @@ FishFunction: ; cf8e
ld a, $1
ld [wd1ef], a
ld hl, Script_GotABite
- call ExitMenuCallScript
+ call QueueScript
ld a, $81
ret
; d002
@@ -6244,7 +6244,7 @@ FishFunction: ; cf8e
ld a, $2
ld [wd1ef], a
ld hl, Script_NotEvenANibble
- call ExitMenuCallScript
+ call QueueScript
ld a, $81
ret
; d010
@@ -6253,7 +6253,7 @@ FishFunction: ; cf8e
ld a, $0
ld [wd1ef], a
ld hl, Script_NotEvenANibble2
- call ExitMenuCallScript
+ call QueueScript
ld a, $81
ret
; d01e
@@ -6402,7 +6402,7 @@ BikeFunction: ; d0b3
ld hl, Script_GetOnBike
ld de, Script_GetOnBike_Register
call .CheckIfRegistered
- call ExitMenuCallScript
+ call QueueScript
xor a
ld [MusicFade], a
ld de, MUSIC_NONE
@@ -6435,7 +6435,7 @@ BikeFunction: ; d0b3
ret
.done
- call ExitMenuCallScript
+ call QueueScript
ld a, $1
ret
; d119
@@ -9747,14 +9747,14 @@ Functione443: ; e443 (3:6443)
call LoadMenuDataHeader
ld a, $1
.asm_e44b
- ld [wPocketCursorBuffer], a
+ ld [wMenuCursorBuffer], a
call Function32f9
xor a
ld [wcf76], a
ld [hBGMapMode], a ; $ff00+$d4
call Function1e5d
jr c, .asm_e46b
- ld a, [wPocketCursorBuffer]
+ ld a, [wMenuCursorBuffer]
push af
ld a, [MenuSelection]
ld hl, Jumptable_e4ba
@@ -12371,7 +12371,7 @@ ItemFinder: ; 12580
ld hl, UnknownScript_0x125ad
.asm_12590
- call ExitMenuCallScript
+ call QueueScript
ld a, $1
ld [wd0ec], a
ret
@@ -12440,7 +12440,7 @@ StartMenu:: ; 125cd
call LoadMenuDataHeader
call .SetUpMenuItems
ld a, [wd0d2]
- ld [wPocketCursorBuffer], a
+ ld [wMenuCursorBuffer], a
call .DrawMenuAccount_
call MenuFunc_1e7f
call .DrawBugContestStatusBox
@@ -12456,13 +12456,13 @@ StartMenu:: ; 125cd
call UpdateTimePals
call .SetUpMenuItems
ld a, [wd0d2]
- ld [wPocketCursorBuffer], a
+ ld [wMenuCursorBuffer], a
.Select
call .GetInput
jr c, .Exit
call .DrawMenuAccount
- ld a, [wPocketCursorBuffer]
+ ld a, [wMenuCursorBuffer]
ld [wd0d2], a
call PlayClickSFX
call Function1bee
@@ -12484,9 +12484,9 @@ endr
.MenuReturns
dw .Reopen
dw .Exit
- dw .ReturnTwo
- dw .ReturnThree
- dw .ReturnFour
+ dw .ExitMenuCallFuncLoadMoveSprites
+ dw .ExitMenuRunScriptLoadMoveSprites
+ dw .ExitMenuRunScript
dw .ReturnEnd
dw .ReturnRedraw
@@ -12531,27 +12531,27 @@ endr
ret
; 12691
-.ReturnFour ; 12691
+.ExitMenuRunScript ; 12691
call ExitMenu
ld a, HMENURETURN_SCRIPT
ld [hMenuReturn], a
ret
; 12699
-.ReturnThree ; 12699
+.ExitMenuRunScriptLoadMoveSprites ; 12699
call ExitMenu
ld a, HMENURETURN_SCRIPT
ld [hMenuReturn], a
jr .ReturnEnd2
; 126a2
-.ReturnTwo ; 126a2
+.ExitMenuCallFuncLoadMoveSprites ; 126a2
call ExitMenu
- ld hl, wd0e9
+ ld hl, wQueuedScriptAddr
ld a, [hli]
ld h, [hl]
ld l, a
- ld a, [wd0e8]
+ ld a, [wQueuedScriptBank]
rst FarCall
jr .ReturnEnd2
; 126b1
@@ -12846,13 +12846,14 @@ StartMenu_Quit: ; 128f0
ld hl, .EndTheContestText
call Function12cf5
- jr c, .asm_12903
+ jr c, .DontEndContest
ld a, BANK(BugCatchingContestReturnToGateScript)
ld hl, BugCatchingContestReturnToGateScript
- call Function31cf
+ call FarQueueScript
ld a, 4
ret
-.asm_12903
+
+.DontEndContest
ld a, 0
ret
@@ -18365,7 +18366,7 @@ Function15985: ; 0x15985
ld c, $12
call TextBox
ld a, [wd0d7]
- ld [wPocketCursorBuffer], a
+ ld [wMenuCursorBuffer], a
ld a, [wd0dd]
ld [wd0e4], a
call Function350c
@@ -18941,7 +18942,7 @@ Function15cef: ; 15cef
ld hl, MenuDataHeader_0x15e18
call CopyMenuDataHeader
ld a, [WalkingX]
- ld [wPocketCursorBuffer], a
+ ld [wMenuCursorBuffer], a
ld a, [WalkingY]
ld [wd0e4], a
call Function350c
@@ -22054,7 +22055,7 @@ Function2403c:: ; 2403c
ld c, a
ld a, [wcfa3]
call SimpleMultiply
- ld [wPocketCursorBuffer], a
+ ld [wMenuCursorBuffer], a
and a
ret
; 24085
@@ -22099,7 +22100,7 @@ Function24098: ; 24098
ld c, a
ld a, [wcfaa]
add c
- ld [wPocketCursorBuffer], a
+ ld [wMenuCursorBuffer], a
and a
ret
@@ -22185,7 +22186,7 @@ Function2411a: ; 2411a (9:411a)
call Function24193
ld a, [wcfa4]
ld e, a
- ld a, [wPocketCursorBuffer]
+ ld a, [wMenuCursorBuffer]
ld b, a
xor a
ld d, $0
@@ -22819,7 +22820,7 @@ Function2446d:: ; 2446d
.asm_244a9
ld [hli], a
- ld a, [wPocketCursorBuffer]
+ ld a, [wMenuCursorBuffer]
and a
jr z, .asm_244b7
ld c, a
@@ -23241,7 +23242,7 @@ Function2471a: ; 2471a
.skip
ld a, [wd0e4]
ld c, a
- ld a, [wPocketCursorBuffer]
+ ld a, [wMenuCursorBuffer]
add c
ld b, a
ld a, [wd144]
@@ -23254,7 +23255,7 @@ Function2471a: ; 2471a
xor a
ld [wd0e4], a
ld a, $1
- ld [wPocketCursorBuffer], a
+ ld [wMenuCursorBuffer], a
.asm_24763
ret
@@ -23312,7 +23313,7 @@ Function24764: ; 24764
ld [wcfa8], a
ld a, [wcfa3]
ld b, a
- ld a, [wPocketCursorBuffer]
+ ld a, [wMenuCursorBuffer]
and a
jr z, .asm_247c8
cp b
@@ -24430,9 +24431,9 @@ LoadBattleMenu: ; 24ef2
ld hl, BattleMenuDataHeader
call LoadMenuDataHeader
ld a, [wd0d2]
- ld [wPocketCursorBuffer], a
+ ld [wMenuCursorBuffer], a
call Function2039
- ld a, [wPocketCursorBuffer]
+ ld a, [wMenuCursorBuffer]
ld [wd0d2], a
call ExitMenu
ret
@@ -24453,9 +24454,9 @@ ContestBattleMenu: ; 24f13
Function24f19: ; 24f19
ld a, [wd0d2]
- ld [wPocketCursorBuffer], a
+ ld [wMenuCursorBuffer], a
call InterpretMenu
- ld a, [wPocketCursorBuffer]
+ ld a, [wMenuCursorBuffer]
ld [wd0d2], a
call ExitMenu
ret
@@ -25695,7 +25696,7 @@ _KrisDecorationMenu: ; 0x2675c
ld [wd1ef], a
.asm_2676f
ld a, [wd1ef]
- ld [wPocketCursorBuffer], a
+ ld [wMenuCursorBuffer], a
call Function26806
call Function1e5d
ld a, [wcfa9]
@@ -36568,7 +36569,7 @@ Function44806: ; 0x44806
call Function352f
call UpdateSprites
ld a, [wd0f1]
- ld [wPocketCursorBuffer], a
+ ld [wMenuCursorBuffer], a
ld a, [OBPals + 8 * 6]
ld [wd0e4], a
call Function350c
@@ -37087,7 +37088,7 @@ asm_4828d: ; 4828d (12:428d)
call WaitBGMap
ld a, [PlayerGender]
inc a
- ld [wPocketCursorBuffer], a
+ ld [wMenuCursorBuffer], a
call Function1bc9
call PlayClickSFX
call ExitMenu
@@ -37131,7 +37132,7 @@ Function48304: ; 48304 (12:4304)
ld b, $c
ld c, $8
call Function48cdc
- ld a, [wPocketCursorBuffer]
+ ld a, [wMenuCursorBuffer]
ld b, a
ld a, [wd0e4]
ld c, a
@@ -37142,7 +37143,7 @@ Function48304: ; 48304 (12:4304)
jr c, .asm_4833f
sub $29
inc a
- ld [wPocketCursorBuffer], a
+ ld [wMenuCursorBuffer], a
ld a, $29
.asm_4833f
ld [wd0e4], a
@@ -37155,7 +37156,7 @@ Function48304: ; 48304 (12:4304)
ld d, a
pop bc
ld a, b
- ld [wPocketCursorBuffer], a
+ ld [wMenuCursorBuffer], a
ld a, c
ld [wd0e4], a
ld a, d
@@ -37204,7 +37205,7 @@ Function48383: ; 48383 (12:4383)
.asm_483af
ld hl, wcfa9
ld a, [hl]
- ld [wPocketCursorBuffer], a
+ ld [wMenuCursorBuffer], a
scf
.asm_483b7
pop bc
@@ -42097,7 +42098,7 @@ Function4acaa: ; 4acaa
ld a, $b
ld [wMenuBorderLeftCoord], a
ld a, $1
- ld [wPocketCursorBuffer], a
+ ld [wMenuCursorBuffer], a
call Function1c10
ld hl, wcfa5
set 6, [hl]
@@ -47018,7 +47019,7 @@ PoisonWhiteOutText: ; 506b7
DoMovementFunctionc: ; 506bc
ld hl, UnknownScript_0x506c8
- call ExitMenuCallScript
+ call QueueScript
ld a, $1
ld [wd0ec], a
ret
@@ -47095,7 +47096,7 @@ UnknownText_0x5072b: ; 0x5072b
_Squirtbottle: ; 50730
ld hl, UnknownScript_0x5073c
- call ExitMenuCallScript
+ call QueueScript
ld a, $1
ld [wd0ec], a
ret
@@ -47170,7 +47171,7 @@ _CardKey: ; 50779
jr nz, .nope
; Let's use the Card Key.
ld hl, .CardKeyScript
- call ExitMenuCallScript
+ call QueueScript
ld a, $1
ld [wd0ec], a
ret
@@ -47206,7 +47207,7 @@ _BasementKey: ; 507b4
jr nz, .nope
; Let's use the Basement Key
ld hl, .BasementKeyScript
- call ExitMenuCallScript
+ call QueueScript
ld a, 1
ld [wd0ec], a
ret
@@ -47230,7 +47231,7 @@ _SacredAsh: ; 507e6
ret nc
ld hl, SacredAshScript
- call ExitMenuCallScript
+ call QueueScript
ld a, $1
ld [wd0ec], a
ret
diff --git a/misc/mobile_22.asm b/misc/mobile_22.asm
index 1991580c5..796fd9d6f 100644
--- a/misc/mobile_22.asm
+++ b/misc/mobile_22.asm
@@ -247,7 +247,7 @@ Function89261: ; 89261
add $5
ld [hl], a
pop af
- ld [wPocketCursorBuffer], a
+ ld [wMenuCursorBuffer], a
call BackUpTiles
call Function8923c
call Function89209
@@ -2194,7 +2194,7 @@ Function89d5e: ; 89d5e (22:5d5e)
push af
call CopyMenuDataHeader
pop af
- ld [wPocketCursorBuffer], a
+ ld [wMenuCursorBuffer], a
call Function8923c
call Function1c89
call Function1c10
@@ -3050,7 +3050,7 @@ Function8a31c: ; 8a31c (22:631c)
call Function8a3b2
pop bc
ld a, c
- ld [wPocketCursorBuffer], a
+ ld [wMenuCursorBuffer], a
ld [MenuSelection], a
call Function1c89
call Function1c10
diff --git a/misc/mobile_22_2.asm b/misc/mobile_22_2.asm
index b6c61eef9..685de8af3 100644
--- a/misc/mobile_22_2.asm
+++ b/misc/mobile_22_2.asm
@@ -803,7 +803,7 @@ Function8b7bd: ; 8b7bd
ld hl, MenuDataHeader_0x8b867
call CopyMenuDataHeader
ld a, [wd030]
- ld [wPocketCursorBuffer], a
+ ld [wMenuCursorBuffer], a
ld a, [wd031]
ld [wd0e4], a
ld a, [wd032]
@@ -881,7 +881,7 @@ Function8b83e: ; 8b83e
Function8b84b: ; 8b84b
ld [wd0e4], a
ld a, [wcfa9]
- ld [wPocketCursorBuffer], a
+ ld [wMenuCursorBuffer], a
ret
; 8b855
diff --git a/misc/mobile_40.asm b/misc/mobile_40.asm
index 0de6c5c18..8e9c9481e 100644
--- a/misc/mobile_40.asm
+++ b/misc/mobile_40.asm
@@ -1786,12 +1786,12 @@ Function100b12: ; 100b12
ld a, BANK(BattleMenuDataHeader)
ld [wcf94], a
ld a, [wd0d2]
- ld [wPocketCursorBuffer], a
+ ld [wMenuCursorBuffer], a
call Function100e72
call Function100b45
callba Function8e85
call Function100ed4
- ld a, [wPocketCursorBuffer]
+ ld a, [wMenuCursorBuffer]
ld [wd0d2], a
call ExitMenu
ret
@@ -1818,7 +1818,7 @@ Function100b45: ; 100b45
ld c, a
ld a, [wcfa3]
call SimpleMultiply
- ld [wPocketCursorBuffer], a
+ ld [wMenuCursorBuffer], a
and a
ret
; 100b7a
@@ -7688,7 +7688,7 @@ Function103612: ; 103612
ld a, [wdc40]
and $f
jr z, .asm_103622
- ld [wPocketCursorBuffer], a
+ ld [wMenuCursorBuffer], a
.asm_103622
call InterpretMenu2
diff --git a/wram.asm b/wram.asm
index 2444c8f00..df4ff2286 100644
--- a/wram.asm
+++ b/wram.asm
@@ -1235,7 +1235,7 @@ wMenuBorderRightCoord:: ds 1
wcf86:: ds 1
wcf87:: ds 1
-wPocketCursorBuffer:: ds 2
+wMenuCursorBuffer:: ds 2
wcf8a:: ds 7 ; menu data 2 bank?
wcf91:: ds 1
@@ -1511,8 +1511,8 @@ wd0e1:: ds 1
wd0e2:: ds 1
wd0e3:: ds 1
wd0e4:: ds 4
-wd0e8:: ds 1
-wd0e9:: ds 2
+wQueuedScriptBank:: ds 1
+wQueuedScriptAddr:: ds 2
wd0eb:: ds 1
wd0ec:: ds 1
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-16 22:25:10 +0000