pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-01-23 09:16:20 -08:00
Code Issues Packages Projects Releases Wiki Activity

Buena local labels

Browse Source
This commit is contained in:
PikalaxALT 2015-11-01 12:44:30 -05:00
parent 3b4805ee98
commit 31c407bb3d
13 changed files with 139 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engine/events.asm
View File

@ -947,11 +947,11 @@ SelectMenuCallback: ; 96b66
; 96b72 ; 96b72
.Script ; 96b72 .Script ; 96b72
ptjump wd0e8 ptjump wQueuedScriptBank
; 96b75 ; 96b75
.Asm ; 96b75 .Asm ; 96b75
ptcallasm wd0e8 ptcallasm wQueuedScriptBank
end end
; 96b79 ; 96b79

18
engine/pack.asm
View File

@ -64,7 +64,7 @@ Function10067: ; 10067 (4:4067)
ld hl, MenuDataHeader_0x10a4f ld hl, MenuDataHeader_0x10a4f
call CopyMenuDataHeader call CopyMenuDataHeader
ld a, [wItemsPocketCursor] ld a, [wItemsPocketCursor]
ld [wPocketCursorBuffer], a ld [wMenuCursorBuffer], a
ld a, [wd0df] ld a, [wd0df]
ld [wd0e4], a ld [wd0e4], a
call Function350c call Function350c
@ -92,7 +92,7 @@ Function100a6: ; 100a6 (4:40a6)
ld hl, MenuDataHeader_0x10a7f ld hl, MenuDataHeader_0x10a7f
call CopyMenuDataHeader call CopyMenuDataHeader
ld a, [wKeyItemsPocketCursor] ld a, [wKeyItemsPocketCursor]
ld [wPocketCursorBuffer], a ld [wMenuCursorBuffer], a
ld a, [wd0e0] ld a, [wd0e0]
ld [wd0e4], a ld [wd0e4], a
call Function350c call Function350c
@ -222,7 +222,7 @@ Function10198: ; 10198 (4:4198)
ld hl, MenuDataHeader_0x10aaf ld hl, MenuDataHeader_0x10aaf
call CopyMenuDataHeader call CopyMenuDataHeader
ld a, [wBallsPocketCursor] ld a, [wBallsPocketCursor]
ld [wPocketCursorBuffer], a ld [wMenuCursorBuffer], a
ld a, [wd0e1] ld a, [wd0e1]
ld [wd0e4], a ld [wd0e4], a
call Function350c call Function350c
@ -719,7 +719,7 @@ Function104fa: ; 104fa (4:44fa)
ld hl, MenuDataHeader_0x10a4f ld hl, MenuDataHeader_0x10a4f
call CopyMenuDataHeader call CopyMenuDataHeader
ld a, [wItemsPocketCursor] ld a, [wItemsPocketCursor]
ld [wPocketCursorBuffer], a ld [wMenuCursorBuffer], a
ld a, [wd0df] ld a, [wd0df]
ld [wd0e4], a ld [wd0e4], a
call Function350c call Function350c
@ -747,7 +747,7 @@ Function10539: ; 10539 (4:4539)
ld hl, MenuDataHeader_0x10a7f ld hl, MenuDataHeader_0x10a7f
call CopyMenuDataHeader call CopyMenuDataHeader
ld a, [wKeyItemsPocketCursor] ld a, [wKeyItemsPocketCursor]
ld [wPocketCursorBuffer], a ld [wMenuCursorBuffer], a
ld a, [wd0e0] ld a, [wd0e0]
ld [wd0e4], a ld [wd0e4], a
call Function350c call Function350c
@ -798,7 +798,7 @@ Function105a6: ; 105a6 (4:45a6)
ld hl, MenuDataHeader_0x10aaf ld hl, MenuDataHeader_0x10aaf
call CopyMenuDataHeader call CopyMenuDataHeader
ld a, [wBallsPocketCursor] ld a, [wBallsPocketCursor]
ld [wPocketCursorBuffer], a ld [wMenuCursorBuffer], a
ld a, [wd0e1] ld a, [wd0e1]
ld [wd0e4], a ld [wd0e4], a
call Function350c call Function350c
@ -1004,7 +1004,7 @@ Jumptable_106d1: ; 106d1 (4:46d1)
ld hl, MenuDataHeader_0x10a67 ld hl, MenuDataHeader_0x10a67
call CopyMenuDataHeader call CopyMenuDataHeader
ld a, [wItemsPocketCursor] ld a, [wItemsPocketCursor]
ld [wPocketCursorBuffer], a ld [wMenuCursorBuffer], a
ld a, [wd0df] ld a, [wd0df]
ld [wd0e4], a ld [wd0e4], a
call Function350c call Function350c
@ -1020,7 +1020,7 @@ Jumptable_106d1: ; 106d1 (4:46d1)
ld hl, MenuDataHeader_0x10a97 ld hl, MenuDataHeader_0x10a97
call CopyMenuDataHeader call CopyMenuDataHeader
ld a, [wKeyItemsPocketCursor] ld a, [wKeyItemsPocketCursor]
ld [wPocketCursorBuffer], a ld [wMenuCursorBuffer], a
ld a, [wd0e0] ld a, [wd0e0]
ld [wd0e4], a ld [wd0e4], a
call Function350c call Function350c
@ -1045,7 +1045,7 @@ Jumptable_106d1: ; 106d1 (4:46d1)
ld hl, MenuDataHeader_0x10ac7 ld hl, MenuDataHeader_0x10ac7
call CopyMenuDataHeader call CopyMenuDataHeader
ld a, [wBallsPocketCursor] ld a, [wBallsPocketCursor]
ld [wPocketCursorBuffer], a ld [wMenuCursorBuffer], a
ld a, [wd0e1] ld a, [wd0e1]
ld [wd0e4], a ld [wd0e4], a
call Function350c call Function350c

2
engine/scripting.asm
View File

@ -529,7 +529,7 @@ Script_interpretmenu: ; 0x96f41
ld a, [ScriptBank] ld a, [ScriptBank]
ld hl, InterpretMenu ld hl, InterpretMenu
rst FarCall rst FarCall
ld a, [wPocketCursorBuffer] ld a, [wMenuCursorBuffer]
jr nc, .ok jr nc, .ok
xor a xor a
.ok .ok

4
engine/specials.asm
View File

@ -413,9 +413,9 @@ Special_DummyNonfunctionalGameCornerGame: ; c38d
; c39a ; c39a
Special_StartGameCornerGame: ; c39a Special_StartGameCornerGame: ; c39a
call Function31cf call FarQueueScript
call FadeToMenu call FadeToMenu
ld hl, wd0e8 ld hl, wQueuedScriptBank
ld a, [hli] ld a, [hli]
push af push af
ld a, [hli] ld a, [hli]

79
event/buena.asm
View File

@ -1,7 +1,7 @@
SpecialBuenasPassword: ; 8af6b SpecialBuenasPassword: ; 8af6b
xor a xor a
ld [wcf76], a ld [wcf76], a
ld hl, MenuDataHeader_0x8afa9 ld hl, .MenuDataHeader
call CopyMenuDataHeader call CopyMenuDataHeader
ld a, [wBuenasPassword] ld a, [wBuenasPassword]
ld c, a ld c, a
@ -11,7 +11,7 @@ SpecialBuenasPassword: ; 8af6b
add $2 add $2
ld [wMenuBorderRightCoord], a ld [wMenuBorderRightCoord], a
call BackUpTiles call BackUpTiles
call Function1e5d call Function1e5d ; menu
callba Function4ae5e callba Function4ae5e
ld b, $0 ld b, $0
ld a, [MenuSelection] ld a, [MenuSelection]
@ -19,38 +19,38 @@ SpecialBuenasPassword: ; 8af6b
ld a, [wBuenasPassword] ld a, [wBuenasPassword]
and $3 and $3
cp c cp c
jr nz, .asm_8afa4 jr nz, .wrong
ld b, $1 ld b, $1
.asm_8afa4 .wrong
ld a, b ld a, b
ld [ScriptVar], a ld [ScriptVar], a
ret ret
; 8afa9 ; 8afa9
MenuDataHeader_0x8afa9: ; 0x8afa9 .MenuDataHeader: ; 0x8afa9
db $40 ; flags db $40 ; flags
db 00, 00 ; start coords db 00, 00 ; start coords
db 07, 10 ; end coords db 07, 10 ; end coords
dw MenuData2_0x8afb2 dw .MenuData2
db 1 ; default option db 1 ; default option
; 0x8afb1 ; 0x8afb1
db 0 db 0
MenuData2_0x8afb2: ; 0x8afb2 .MenuData2: ; 0x8afb2
db $81 ; flags db $81 ; flags
db 0 ; items db 0 ; items
dw Unknown_8afb8 dw .PasswordIndices
dw Function8afbd dw .PlacePasswordChoices
; 0x8afb4 ; 0x8afb4
Unknown_8afb8: ; 8afb8 .PasswordIndices: ; 8afb8
db 3 db 3
db 0, 1, 2 db 0, 1, 2
db -1 db -1
Function8afbd: ; 8afbd .PlacePasswordChoices: ; 8afbd
push de push de
ld a, [wBuenasPassword] ld a, [wBuenasPassword]
and $f0 and $f0
@ -71,29 +71,29 @@ SpecialBuenaPrize: ; 8afd4
ld [MenuSelection], a ld [MenuSelection], a
call Function8b0d6 call Function8b0d6
call Function8b090 call Function8b090
ld hl, UnknownText_0x8b072 ld hl, .Text_AskWhichPrize
call PrintText call PrintText
jr .asm_8aff1 jr .okay
.asm_8afeb .loop
ld hl, UnknownText_0x8b072 ld hl, .Text_AskWhichPrize
call BuenaPrintText call BuenaPrintText
.asm_8aff1 .okay
call DelayFrame call DelayFrame
call UpdateSprites call UpdateSprites
call Function8b097 call Function8b097
call Function8b0e2 call Function8b0e2
jr z, .asm_8b05f jr z, .done
ld [wcf75], a ld [wcf75], a
call Buena_getprize call Buena_getprize
ld a, [hl] ld a, [hl]
ld [wd265], a ld [wd265], a
call GetItemName call GetItemName
ld hl, UnknownText_0x8b077 ld hl, .Text_IsThatRight
call BuenaPrintText call BuenaPrintText
call YesNoBox call YesNoBox
jr c, .asm_8afeb jr c, .loop
ld a, [wcf75] ld a, [wcf75]
call Buena_getprize call Buena_getprize
@ -112,73 +112,72 @@ SpecialBuenaPrize: ; 8afd4
ld hl, NumItems ld hl, NumItems
call ReceiveItem call ReceiveItem
pop hl pop hl
jr nc, .asm_8b04c jr nc, .BagFull
ld a, [hl] ld a, [hl]
ld c, a ld c, a
ld a, [wBlueCardBalance] ld a, [wBlueCardBalance]
sub c sub c
ld [wBlueCardBalance], a ld [wBlueCardBalance], a
call Function8b097 call Function8b097
jr .asm_8b051 jr .Purchase
.InsufficientBalance .InsufficientBalance
ld hl, UnknownText_0x8b081 ld hl, .Text_NotEnoughPoints
jr .asm_8b05a jr .print
.asm_8b04c .BagFull
ld hl, UnknownText_0x8b086 ld hl, .Text_NoRoom
jr .asm_8b05a jr .print
.asm_8b051 .Purchase
ld de, SFX_TRANSACTION ld de, SFX_TRANSACTION
call PlaySFX call PlaySFX
ld hl, UnknownText_0x8b07c ld hl, .Text_HereYouGo
.asm_8b05a .print
call BuenaPrintText call BuenaPrintText
jr .asm_8afeb jr .loop
.asm_8b05f .done
call WriteBackup call WriteBackup
call WriteBackup call WriteBackup
ld hl, UnknownText_0x8b08b ld hl, .Text_PleaseComeBackAgain
call PrintText call PrintText
call JoyWaitAorB call JoyWaitAorB
call PlayClickSFX call PlayClickSFX
ret ret
; 8b072 ; 8b072
UnknownText_0x8b072: ; 0x8b072 .Text_AskWhichPrize: ; 0x8b072
; Which prize would you like? ; Which prize would you like?
text_jump UnknownText_0x1c589f text_jump UnknownText_0x1c589f
db "@" db "@"
; 0x8b077 ; 0x8b077
UnknownText_0x8b077: ; 0x8b077 .Text_IsThatRight: ; 0x8b077
; ? Is that right? ; ? Is that right?
text_jump UnknownText_0x1c58bc text_jump UnknownText_0x1c58bc
db "@" db "@"
; 0x8b07c ; 0x8b07c
UnknownText_0x8b07c: ; 0x8b07c .Text_HereYouGo ; Here you go!
; Here you go!
text_jump UnknownText_0x1c58d1 text_jump UnknownText_0x1c58d1
db "@" db "@"
; 0x8b081 ; 0x8b081
UnknownText_0x8b081: ; 0x8b081 .Text_NotEnoughPoints: ; 0x8b081
; You don't have enough points. ; You don't have enough points.
text_jump UnknownText_0x1c58e0 text_jump UnknownText_0x1c58e0
db "@" db "@"
; 0x8b086 ; 0x8b086
UnknownText_0x8b086: ; 0x8b086 .Text_NoRoom: ; 0x8b086
; You have no room for it. ; You have no room for it.
text_jump UnknownText_0x1c58ff text_jump UnknownText_0x1c58ff
db "@" db "@"
; 0x8b08b ; 0x8b08b
UnknownText_0x8b08b: ; 0x8b08b .Text_PleaseComeBackAgain: ; 0x8b08b
; Oh. Please come back again! ; Oh. Please come back again!
text_jump UnknownText_0x1c591a text_jump UnknownText_0x1c591a
db "@" db "@"
@ -247,7 +246,7 @@ Function8b0e2: ; 8b0e2
ld hl, .MenuDataHeader ld hl, .MenuDataHeader
call CopyMenuDataHeader call CopyMenuDataHeader
ld a, [MenuSelection] ld a, [MenuSelection]
ld [wPocketCursorBuffer], a ld [wMenuCursorBuffer], a
xor a xor a
ld [wcf76], a ld [wcf76], a
ld [hBGMapMode], a ld [hBGMapMode], a

2
event/kurt.asm
View File

@ -62,7 +62,7 @@ Kurt_SelectApricorn: ; 88055
ld hl, .MenuDataHeader ld hl, .MenuDataHeader
call CopyMenuDataHeader call CopyMenuDataHeader
ld a, [MenuSelection] ld a, [MenuSelection]
ld [wPocketCursorBuffer], a ld [wMenuCursorBuffer], a
xor a xor a
ld [hBGMapMode], a ld [hBGMapMode], a
call Function352f call Function352f

14
home.asm
View File

@ -472,17 +472,17 @@ CallPointerAt:: ; 31be
; 31cd ; 31cd
ExitMenuCallScript:: ; 31cd QueueScript:: ; 31cd
; Push pointer hl in the current bank to wd0e8. ; Push pointer hl in the current bank to wQueuedScriptBank.
ld a, [hROMBank] ld a, [hROMBank]
Function31cf:: ; 31cf FarQueueScript:: ; 31cf
; Push pointer a:hl to wd0e8. ; Push pointer a:hl to wQueuedScriptBank.
ld [wd0e8], a ld [wQueuedScriptBank], a
ld a, l ld a, l
ld [wd0e9], a ld [wQueuedScriptAddr], a
ld a, h ld a, h
ld [wd0e9 + 1], a ld [wQueuedScriptAddr + 1], a
ret ret
; 31db ; 31db

10
home/menu.asm
View File

@ -16,7 +16,7 @@ CopyMenuDataHeader::
; 0x1d4b ; 0x1d4b
Function1d4b:: ; 1d4b Function1d4b:: ; 1d4b
ld [wPocketCursorBuffer], a ld [wMenuCursorBuffer], a
ret ret
; 1d4f ; 1d4f
@ -410,7 +410,7 @@ Function1f2a:: ; 1f2a
ld a, [hl] ld a, [hl]
ld [MenuSelection], a ld [MenuSelection], a
ld a, [wcfa9] ld a, [wcfa9]
ld [wPocketCursorBuffer], a ld [wMenuCursorBuffer], a
and a and a
ret ret
@ -571,7 +571,7 @@ InterpretMenu:: ; 202a
ld a, [hROMBank] ld a, [hROMBank]
ld [wcf94], a ld [wcf94], a
callba Function2400e callba Function2400e
ld a, [wPocketCursorBuffer] ld a, [wMenuCursorBuffer]
ret ret
; 2039 ; 2039
@ -579,7 +579,7 @@ Function2039:: ; 2039
ld a, [hROMBank] ld a, [hROMBank]
ld [wcf94], a ld [wcf94], a
callba Function24022 callba Function24022
ld a, [wPocketCursorBuffer] ld a, [wMenuCursorBuffer]
ret ret
; 2048 ; 2048
@ -587,7 +587,7 @@ Function2048:: ; 2048
ld a, [hROMBank] ld a, [hROMBank]
ld [wcf94], a ld [wcf94], a
callba Function2403c callba Function2403c
ld a, [wPocketCursorBuffer] ld a, [wMenuCursorBuffer]
ret ret
; 2057 ; 2057

121
main.asm
View File

@ -4699,7 +4699,7 @@ CutFunction: ; c785
.DoCut: ; c7b2 (3:47b2) .DoCut: ; c7b2 (3:47b2)
ld hl, Script_CutFromMenu ld hl, Script_CutFromMenu
call ExitMenuCallScript call QueueScript
ld a, $81 ld a, $81
ret ret
@ -4907,7 +4907,7 @@ Functionc8b5: ; c8b5
UseFlash: ; c8e0 UseFlash: ; c8e0
ld hl, Script_UseFlash ld hl, Script_UseFlash
jp ExitMenuCallScript jp QueueScript
; c8e6 ; c8e6
Script_UseFlash: ; 0xc8e6 Script_UseFlash: ; 0xc8e6
@ -4990,7 +4990,7 @@ SurfFunction: ; c909
ld [Buffer2], a ; wd1eb (aliases: MovementType) ld [Buffer2], a ; wd1eb (aliases: MovementType)
call GetPartyNick call GetPartyNick
ld hl, SurfFromMenuScript ld hl, SurfFromMenuScript
call ExitMenuCallScript call QueueScript
ld a, $81 ld a, $81
ret ret
@ -5228,7 +5228,7 @@ FlyFunction: ; ca3b
.DoFly: ; ca94 .DoFly: ; ca94
ld hl, .FlyScript ld hl, .FlyScript
call ExitMenuCallScript call QueueScript
ld a, $81 ld a, $81
ret ret
; ca9d ; ca9d
@ -5279,7 +5279,7 @@ AttemptToWaterfall: ; cae7
call CheckMapCanWaterfall call CheckMapCanWaterfall
jr c, .failed jr c, .failed
ld hl, Script_WaterfallFromMenu ld hl, Script_WaterfallFromMenu
call ExitMenuCallScript call QueueScript
ld a, $81 ld a, $81
ret ret
@ -5452,14 +5452,14 @@ dig_incave
cp $2 cp $2
jr nz, .escaperope jr nz, .escaperope
ld hl, UsedDigScript ld hl, UsedDigScript
call ExitMenuCallScript call QueueScript
ld a, $81 ld a, $81
ret ret
.escaperope .escaperope
callba SpecialKabutoChamber callba SpecialKabutoChamber
ld hl, UsedEscapeRopeScript ld hl, UsedEscapeRopeScript
call ExitMenuCallScript call QueueScript
ld a, $81 ld a, $81
ret ret
; cc06 ; cc06
@ -5578,7 +5578,7 @@ TeleportFunction: ; cc61
.DoTeleport: ; cc9c .DoTeleport: ; cc9c
call GetPartyNick call GetPartyNick
ld hl, Script_UsedTeleport ld hl, Script_UsedTeleport
call ExitMenuCallScript call QueueScript
ld a, $81 ld a, $81
ret ret
; cca8 ; cca8
@ -5664,7 +5664,7 @@ FailedStrength: ; cd06
StartToUseStrength: ; cd09 StartToUseStrength: ; cd09
ld hl, Script_StrengthFromMenu ld hl, Script_StrengthFromMenu
call ExitMenuCallScript call QueueScript
ld a, $81 ld a, $81
ret ret
; cd12 ; cd12
@ -5820,7 +5820,7 @@ Jumptable_cdae: ; cdae
.DoWhirlpool: ; cdca .DoWhirlpool: ; cdca
ld hl, Script_WhirlpoolFromMenu ld hl, Script_WhirlpoolFromMenu
call ExitMenuCallScript call QueueScript
ld a, $81 ld a, $81
ret ret
; cdd3 ; cdd3
@ -5958,7 +5958,7 @@ TryHeadbuttFromMenu: ; ce86
jr nz, .no_tree jr nz, .no_tree
ld hl, HeadbuttFromMenuScript ld hl, HeadbuttFromMenuScript
call ExitMenuCallScript call QueueScript
ld a, $81 ld a, $81
ret ret
@ -6053,7 +6053,7 @@ TryRockSmashFromMenu: ; cef4
jr nz, .no_rock jr nz, .no_rock
ld hl, RockSmashFromMenuScript ld hl, RockSmashFromMenuScript
call ExitMenuCallScript call QueueScript
ld a, $81 ld a, $81
ret ret
@ -6235,7 +6235,7 @@ FishFunction: ; cf8e
ld a, $1 ld a, $1
ld [wd1ef], a ld [wd1ef], a
ld hl, Script_GotABite ld hl, Script_GotABite
call ExitMenuCallScript call QueueScript
ld a, $81 ld a, $81
ret ret
; d002 ; d002
@ -6244,7 +6244,7 @@ FishFunction: ; cf8e
ld a, $2 ld a, $2
ld [wd1ef], a ld [wd1ef], a
ld hl, Script_NotEvenANibble ld hl, Script_NotEvenANibble
call ExitMenuCallScript call QueueScript
ld a, $81 ld a, $81
ret ret
; d010 ; d010
@ -6253,7 +6253,7 @@ FishFunction: ; cf8e
ld a, $0 ld a, $0
ld [wd1ef], a ld [wd1ef], a
ld hl, Script_NotEvenANibble2 ld hl, Script_NotEvenANibble2
call ExitMenuCallScript call QueueScript
ld a, $81 ld a, $81
ret ret
; d01e ; d01e
@ -6402,7 +6402,7 @@ BikeFunction: ; d0b3
ld hl, Script_GetOnBike ld hl, Script_GetOnBike
ld de, Script_GetOnBike_Register ld de, Script_GetOnBike_Register
call .CheckIfRegistered call .CheckIfRegistered
call ExitMenuCallScript call QueueScript
xor a xor a
ld [MusicFade], a ld [MusicFade], a
ld de, MUSIC_NONE ld de, MUSIC_NONE
@ -6435,7 +6435,7 @@ BikeFunction: ; d0b3
ret ret
.done .done
call ExitMenuCallScript call QueueScript
ld a, $1 ld a, $1
ret ret
; d119 ; d119
@ -9747,14 +9747,14 @@ Functione443: ; e443 (3:6443)
call LoadMenuDataHeader call LoadMenuDataHeader
ld a, $1 ld a, $1
.asm_e44b .asm_e44b
ld [wPocketCursorBuffer], a ld [wMenuCursorBuffer], a
call Function32f9 call Function32f9
xor a xor a
ld [wcf76], a ld [wcf76], a
ld [hBGMapMode], a ; $ff00+$d4 ld [hBGMapMode], a ; $ff00+$d4
call Function1e5d call Function1e5d
jr c, .asm_e46b jr c, .asm_e46b
ld a, [wPocketCursorBuffer] ld a, [wMenuCursorBuffer]
push af push af
ld a, [MenuSelection] ld a, [MenuSelection]
ld hl, Jumptable_e4ba ld hl, Jumptable_e4ba
@ -12371,7 +12371,7 @@ ItemFinder: ; 12580
ld hl, UnknownScript_0x125ad ld hl, UnknownScript_0x125ad
.asm_12590 .asm_12590
call ExitMenuCallScript call QueueScript
ld a, $1 ld a, $1
ld [wd0ec], a ld [wd0ec], a
ret ret
@ -12440,7 +12440,7 @@ StartMenu:: ; 125cd
call LoadMenuDataHeader call LoadMenuDataHeader
call .SetUpMenuItems call .SetUpMenuItems
ld a, [wd0d2] ld a, [wd0d2]
ld [wPocketCursorBuffer], a ld [wMenuCursorBuffer], a
call .DrawMenuAccount_ call .DrawMenuAccount_
call MenuFunc_1e7f call MenuFunc_1e7f
call .DrawBugContestStatusBox call .DrawBugContestStatusBox
@ -12456,13 +12456,13 @@ StartMenu:: ; 125cd
call UpdateTimePals call UpdateTimePals
call .SetUpMenuItems call .SetUpMenuItems
ld a, [wd0d2] ld a, [wd0d2]
ld [wPocketCursorBuffer], a ld [wMenuCursorBuffer], a
.Select .Select
call .GetInput call .GetInput
jr c, .Exit jr c, .Exit
call .DrawMenuAccount call .DrawMenuAccount
ld a, [wPocketCursorBuffer] ld a, [wMenuCursorBuffer]
ld [wd0d2], a ld [wd0d2], a
call PlayClickSFX call PlayClickSFX
call Function1bee call Function1bee
@ -12484,9 +12484,9 @@ endr
.MenuReturns .MenuReturns
dw .Reopen dw .Reopen
dw .Exit dw .Exit
dw .ReturnTwo dw .ExitMenuCallFuncLoadMoveSprites
dw .ReturnThree dw .ExitMenuRunScriptLoadMoveSprites
dw .ReturnFour dw .ExitMenuRunScript
dw .ReturnEnd dw .ReturnEnd
dw .ReturnRedraw dw .ReturnRedraw
@ -12531,27 +12531,27 @@ endr
ret ret
; 12691 ; 12691
.ReturnFour ; 12691 .ExitMenuRunScript ; 12691
call ExitMenu call ExitMenu
ld a, HMENURETURN_SCRIPT ld a, HMENURETURN_SCRIPT
ld [hMenuReturn], a ld [hMenuReturn], a
ret ret
; 12699 ; 12699
.ReturnThree ; 12699 .ExitMenuRunScriptLoadMoveSprites ; 12699
call ExitMenu call ExitMenu
ld a, HMENURETURN_SCRIPT ld a, HMENURETURN_SCRIPT
ld [hMenuReturn], a ld [hMenuReturn], a
jr .ReturnEnd2 jr .ReturnEnd2
; 126a2 ; 126a2
.ReturnTwo ; 126a2 .ExitMenuCallFuncLoadMoveSprites ; 126a2
call ExitMenu call ExitMenu
ld hl, wd0e9 ld hl, wQueuedScriptAddr
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
ld a, [wd0e8] ld a, [wQueuedScriptBank]
rst FarCall rst FarCall
jr .ReturnEnd2 jr .ReturnEnd2
; 126b1 ; 126b1
@ -12846,13 +12846,14 @@ StartMenu_Quit: ; 128f0
ld hl, .EndTheContestText ld hl, .EndTheContestText
call Function12cf5 call Function12cf5
jr c, .asm_12903 jr c, .DontEndContest
ld a, BANK(BugCatchingContestReturnToGateScript) ld a, BANK(BugCatchingContestReturnToGateScript)
ld hl, BugCatchingContestReturnToGateScript ld hl, BugCatchingContestReturnToGateScript
call Function31cf call FarQueueScript
ld a, 4 ld a, 4
ret ret
.asm_12903
.DontEndContest
ld a, 0 ld a, 0
ret ret
@ -18365,7 +18366,7 @@ Function15985: ; 0x15985
ld c, $12 ld c, $12
call TextBox call TextBox
ld a, [wd0d7] ld a, [wd0d7]
ld [wPocketCursorBuffer], a ld [wMenuCursorBuffer], a
ld a, [wd0dd] ld a, [wd0dd]
ld [wd0e4], a ld [wd0e4], a
call Function350c call Function350c
@ -18941,7 +18942,7 @@ Function15cef: ; 15cef
ld hl, MenuDataHeader_0x15e18 ld hl, MenuDataHeader_0x15e18
call CopyMenuDataHeader call CopyMenuDataHeader
ld a, [WalkingX] ld a, [WalkingX]
ld [wPocketCursorBuffer], a ld [wMenuCursorBuffer], a
ld a, [WalkingY] ld a, [WalkingY]
ld [wd0e4], a ld [wd0e4], a
call Function350c call Function350c
@ -22054,7 +22055,7 @@ Function2403c:: ; 2403c
ld c, a ld c, a
ld a, [wcfa3] ld a, [wcfa3]
call SimpleMultiply call SimpleMultiply
ld [wPocketCursorBuffer], a ld [wMenuCursorBuffer], a
and a and a
ret ret
; 24085 ; 24085
@ -22099,7 +22100,7 @@ Function24098: ; 24098
ld c, a ld c, a
ld a, [wcfaa] ld a, [wcfaa]
add c add c
ld [wPocketCursorBuffer], a ld [wMenuCursorBuffer], a
and a and a
ret ret
@ -22185,7 +22186,7 @@ Function2411a: ; 2411a (9:411a)
call Function24193 call Function24193
ld a, [wcfa4] ld a, [wcfa4]
ld e, a ld e, a
ld a, [wPocketCursorBuffer] ld a, [wMenuCursorBuffer]
ld b, a ld b, a
xor a xor a
ld d, $0 ld d, $0
@ -22819,7 +22820,7 @@ Function2446d:: ; 2446d
.asm_244a9 .asm_244a9
ld [hli], a ld [hli], a
ld a, [wPocketCursorBuffer] ld a, [wMenuCursorBuffer]
and a and a
jr z, .asm_244b7 jr z, .asm_244b7
ld c, a ld c, a
@ -23241,7 +23242,7 @@ Function2471a: ; 2471a
.skip .skip
ld a, [wd0e4] ld a, [wd0e4]
ld c, a ld c, a
ld a, [wPocketCursorBuffer] ld a, [wMenuCursorBuffer]
add c add c
ld b, a ld b, a
ld a, [wd144] ld a, [wd144]
@ -23254,7 +23255,7 @@ Function2471a: ; 2471a
xor a xor a
ld [wd0e4], a ld [wd0e4], a
ld a, $1 ld a, $1
ld [wPocketCursorBuffer], a ld [wMenuCursorBuffer], a
.asm_24763 .asm_24763
ret ret
@ -23312,7 +23313,7 @@ Function24764: ; 24764
ld [wcfa8], a ld [wcfa8], a
ld a, [wcfa3] ld a, [wcfa3]
ld b, a ld b, a
ld a, [wPocketCursorBuffer] ld a, [wMenuCursorBuffer]
and a and a
jr z, .asm_247c8 jr z, .asm_247c8
cp b cp b
@ -24430,9 +24431,9 @@ LoadBattleMenu: ; 24ef2
ld hl, BattleMenuDataHeader ld hl, BattleMenuDataHeader
call LoadMenuDataHeader call LoadMenuDataHeader
ld a, [wd0d2] ld a, [wd0d2]
ld [wPocketCursorBuffer], a ld [wMenuCursorBuffer], a
call Function2039 call Function2039
ld a, [wPocketCursorBuffer] ld a, [wMenuCursorBuffer]
ld [wd0d2], a ld [wd0d2], a
call ExitMenu call ExitMenu
ret ret
@ -24453,9 +24454,9 @@ ContestBattleMenu: ; 24f13
Function24f19: ; 24f19 Function24f19: ; 24f19
ld a, [wd0d2] ld a, [wd0d2]
ld [wPocketCursorBuffer], a ld [wMenuCursorBuffer], a
call InterpretMenu call InterpretMenu
ld a, [wPocketCursorBuffer] ld a, [wMenuCursorBuffer]
ld [wd0d2], a ld [wd0d2], a
call ExitMenu call ExitMenu
ret ret
@ -25695,7 +25696,7 @@ _KrisDecorationMenu: ; 0x2675c
ld [wd1ef], a ld [wd1ef], a
.asm_2676f .asm_2676f
ld a, [wd1ef] ld a, [wd1ef]
ld [wPocketCursorBuffer], a ld [wMenuCursorBuffer], a
call Function26806 call Function26806
call Function1e5d call Function1e5d
ld a, [wcfa9] ld a, [wcfa9]
@ -36568,7 +36569,7 @@ Function44806: ; 0x44806
call Function352f call Function352f
call UpdateSprites call UpdateSprites
ld a, [wd0f1] ld a, [wd0f1]
ld [wPocketCursorBuffer], a ld [wMenuCursorBuffer], a
ld a, [OBPals + 8 * 6] ld a, [OBPals + 8 * 6]
ld [wd0e4], a ld [wd0e4], a
call Function350c call Function350c
@ -37087,7 +37088,7 @@ asm_4828d: ; 4828d (12:428d)
call WaitBGMap call WaitBGMap
ld a, [PlayerGender] ld a, [PlayerGender]
inc a inc a
ld [wPocketCursorBuffer], a ld [wMenuCursorBuffer], a
call Function1bc9 call Function1bc9
call PlayClickSFX call PlayClickSFX
call ExitMenu call ExitMenu
@ -37131,7 +37132,7 @@ Function48304: ; 48304 (12:4304)
ld b, $c ld b, $c
ld c, $8 ld c, $8
call Function48cdc call Function48cdc
ld a, [wPocketCursorBuffer] ld a, [wMenuCursorBuffer]
ld b, a ld b, a
ld a, [wd0e4] ld a, [wd0e4]
ld c, a ld c, a
@ -37142,7 +37143,7 @@ Function48304: ; 48304 (12:4304)
jr c, .asm_4833f jr c, .asm_4833f
sub $29 sub $29
inc a inc a
ld [wPocketCursorBuffer], a ld [wMenuCursorBuffer], a
ld a, $29 ld a, $29
.asm_4833f .asm_4833f
ld [wd0e4], a ld [wd0e4], a
@ -37155,7 +37156,7 @@ Function48304: ; 48304 (12:4304)
ld d, a ld d, a
pop bc pop bc
ld a, b ld a, b
ld [wPocketCursorBuffer], a ld [wMenuCursorBuffer], a
ld a, c ld a, c
ld [wd0e4], a ld [wd0e4], a
ld a, d ld a, d
@ -37204,7 +37205,7 @@ Function48383: ; 48383 (12:4383)
.asm_483af .asm_483af
ld hl, wcfa9 ld hl, wcfa9
ld a, [hl] ld a, [hl]
ld [wPocketCursorBuffer], a ld [wMenuCursorBuffer], a
scf scf
.asm_483b7 .asm_483b7
pop bc pop bc
@ -42097,7 +42098,7 @@ Function4acaa: ; 4acaa
ld a, $b ld a, $b
ld [wMenuBorderLeftCoord], a ld [wMenuBorderLeftCoord], a
ld a, $1 ld a, $1
ld [wPocketCursorBuffer], a ld [wMenuCursorBuffer], a
call Function1c10 call Function1c10
ld hl, wcfa5 ld hl, wcfa5
set 6, [hl] set 6, [hl]
@ -47018,7 +47019,7 @@ PoisonWhiteOutText: ; 506b7
DoMovementFunctionc: ; 506bc DoMovementFunctionc: ; 506bc
ld hl, UnknownScript_0x506c8 ld hl, UnknownScript_0x506c8
call ExitMenuCallScript call QueueScript
ld a, $1 ld a, $1
ld [wd0ec], a ld [wd0ec], a
ret ret
@ -47095,7 +47096,7 @@ UnknownText_0x5072b: ; 0x5072b
_Squirtbottle: ; 50730 _Squirtbottle: ; 50730
ld hl, UnknownScript_0x5073c ld hl, UnknownScript_0x5073c
call ExitMenuCallScript call QueueScript
ld a, $1 ld a, $1
ld [wd0ec], a ld [wd0ec], a
ret ret
@ -47170,7 +47171,7 @@ _CardKey: ; 50779
jr nz, .nope jr nz, .nope
; Let's use the Card Key. ; Let's use the Card Key.
ld hl, .CardKeyScript ld hl, .CardKeyScript
call ExitMenuCallScript call QueueScript
ld a, $1 ld a, $1
ld [wd0ec], a ld [wd0ec], a
ret ret
@ -47206,7 +47207,7 @@ _BasementKey: ; 507b4
jr nz, .nope jr nz, .nope
; Let's use the Basement Key ; Let's use the Basement Key
ld hl, .BasementKeyScript ld hl, .BasementKeyScript
call ExitMenuCallScript call QueueScript
ld a, 1 ld a, 1
ld [wd0ec], a ld [wd0ec], a
ret ret
@ -47230,7 +47231,7 @@ _SacredAsh: ; 507e6
ret nc ret nc
ld hl, SacredAshScript ld hl, SacredAshScript
call ExitMenuCallScript call QueueScript
ld a, $1 ld a, $1
ld [wd0ec], a ld [wd0ec], a
ret ret

6
misc/mobile_22.asm
View File

@ -247,7 +247,7 @@ Function89261: ; 89261
add $5 add $5
ld [hl], a ld [hl], a
pop af pop af
ld [wPocketCursorBuffer], a ld [wMenuCursorBuffer], a
call BackUpTiles call BackUpTiles
call Function8923c call Function8923c
call Function89209 call Function89209
@ -2194,7 +2194,7 @@ Function89d5e: ; 89d5e (22:5d5e)
push af push af
call CopyMenuDataHeader call CopyMenuDataHeader
pop af pop af
ld [wPocketCursorBuffer], a ld [wMenuCursorBuffer], a
call Function8923c call Function8923c
call Function1c89 call Function1c89
call Function1c10 call Function1c10
@ -3050,7 +3050,7 @@ Function8a31c: ; 8a31c (22:631c)
call Function8a3b2 call Function8a3b2
pop bc pop bc
ld a, c ld a, c
ld [wPocketCursorBuffer], a ld [wMenuCursorBuffer], a
ld [MenuSelection], a ld [MenuSelection], a
call Function1c89 call Function1c89
call Function1c10 call Function1c10

4
misc/mobile_22_2.asm
View File

@ -803,7 +803,7 @@ Function8b7bd: ; 8b7bd
ld hl, MenuDataHeader_0x8b867 ld hl, MenuDataHeader_0x8b867
call CopyMenuDataHeader call CopyMenuDataHeader
ld a, [wd030] ld a, [wd030]
ld [wPocketCursorBuffer], a ld [wMenuCursorBuffer], a
ld a, [wd031] ld a, [wd031]
ld [wd0e4], a ld [wd0e4], a
ld a, [wd032] ld a, [wd032]
@ -881,7 +881,7 @@ Function8b83e: ; 8b83e
Function8b84b: ; 8b84b Function8b84b: ; 8b84b
ld [wd0e4], a ld [wd0e4], a
ld a, [wcfa9] ld a, [wcfa9]
ld [wPocketCursorBuffer], a ld [wMenuCursorBuffer], a
ret ret
; 8b855 ; 8b855

8
misc/mobile_40.asm
View File

@ -1786,12 +1786,12 @@ Function100b12: ; 100b12
ld a, BANK(BattleMenuDataHeader) ld a, BANK(BattleMenuDataHeader)
ld [wcf94], a ld [wcf94], a
ld a, [wd0d2] ld a, [wd0d2]
ld [wPocketCursorBuffer], a ld [wMenuCursorBuffer], a
call Function100e72 call Function100e72
call Function100b45 call Function100b45
callba Function8e85 callba Function8e85
call Function100ed4 call Function100ed4
ld a, [wPocketCursorBuffer] ld a, [wMenuCursorBuffer]
ld [wd0d2], a ld [wd0d2], a
call ExitMenu call ExitMenu
ret ret
@ -1818,7 +1818,7 @@ Function100b45: ; 100b45
ld c, a ld c, a
ld a, [wcfa3] ld a, [wcfa3]
call SimpleMultiply call SimpleMultiply
ld [wPocketCursorBuffer], a ld [wMenuCursorBuffer], a
and a and a
ret ret
; 100b7a ; 100b7a
@ -7688,7 +7688,7 @@ Function103612: ; 103612
ld a, [wdc40] ld a, [wdc40]
and $f and $f
jr z, .asm_103622 jr z, .asm_103622
ld [wPocketCursorBuffer], a ld [wMenuCursorBuffer], a
.asm_103622 .asm_103622
call InterpretMenu2 call InterpretMenu2

6
wram.asm
View File

@ -1235,7 +1235,7 @@ wMenuBorderRightCoord:: ds 1
wcf86:: ds 1 wcf86:: ds 1
wcf87:: ds 1 wcf87:: ds 1
wPocketCursorBuffer:: ds 2 wMenuCursorBuffer:: ds 2
wcf8a:: ds 7 ; menu data 2 bank? wcf8a:: ds 7 ; menu data 2 bank?
wcf91:: ds 1 wcf91:: ds 1
@ -1511,8 +1511,8 @@ wd0e1:: ds 1
wd0e2:: ds 1 wd0e2:: ds 1
wd0e3:: ds 1 wd0e3:: ds 1
wd0e4:: ds 4 wd0e4:: ds 4
wd0e8:: ds 1 wQueuedScriptBank:: ds 1
wd0e9:: ds 2 wQueuedScriptAddr:: ds 2
wd0eb:: ds 1 wd0eb:: ds 1
wd0ec:: ds 1 wd0ec:: ds 1