diff options
Diffstat (limited to 'event/buena.asm')
| -rw-r--r-- | event/buena.asm | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/event/buena.asm b/event/buena.asm index 76a378549..235f10686 100644 --- a/event/buena.asm +++ b/event/buena.asm @@ -1,6 +1,6 @@ SpecialBuenasPassword: ; 8af6b xor a - ld [wcf76], a + ld [wWhichIndexSet], a ld hl, .MenuDataHeader call CopyMenuDataHeader ld a, [wBuenasPassword] @@ -10,7 +10,7 @@ SpecialBuenasPassword: ; 8af6b add c add $2 ld [wMenuBorderRightCoord], a - call BackUpTiles + call PushWindow call DoNthMenu ; menu callba Buena_ExitMenu ld b, $0 @@ -69,8 +69,8 @@ SpecialBuenaPrize: ; 8afd4 ld [wMenuScrollPosition], a ld a, $1 ld [MenuSelection], a - call Function8b0d6 - call Function8b090 + call Buena_PlacePrizeMenuBox + call Buena_DisplayBlueCardBalance ld hl, .Text_AskWhichPrize call PrintText jr .okay @@ -82,20 +82,20 @@ SpecialBuenaPrize: ; 8afd4 .okay call DelayFrame call UpdateSprites - call Function8b097 - call Function8b0e2 + call PrintBlueCardBalance + call Buena_PrizeMenu jr z, .done - ld [wcf75], a + ld [MenuSelectionQuantity], a call Buena_getprize ld a, [hl] - ld [wd265], a + ld [wNamedObjectIndexBuffer], a call GetItemName ld hl, .Text_IsThatRight call BuenaPrintText call YesNoBox jr c, .loop - ld a, [wcf75] + ld a, [MenuSelectionQuantity] call Buena_getprize inc hl ld a, [hld] @@ -118,7 +118,7 @@ SpecialBuenaPrize: ; 8afd4 ld a, [wBlueCardBalance] sub c ld [wBlueCardBalance], a - call Function8b097 + call PrintBlueCardBalance jr .Purchase .InsufficientBalance @@ -183,35 +183,35 @@ SpecialBuenaPrize: ; 8afd4 db "@" ; 0x8b090 -Function8b090: ; 8b090 - ld hl, MenuDataHeader_0x8b0d1 +Buena_DisplayBlueCardBalance: ; 8b090 + ld hl, BlueCardBalanceMenuDataHeader call LoadMenuDataHeader ret ; 8b097 -Function8b097: ; 8b097 +PrintBlueCardBalance: ; 8b097 ld de, wBlueCardBalance - call Function8b09e + call .DrawBox ret ; 8b09e -Function8b09e: ; 8b09e +.DrawBox: ; 8b09e push de xor a ld [hBGMapMode], a - ld hl, MenuDataHeader_0x8b0d1 + ld hl, BlueCardBalanceMenuDataHeader call CopyMenuDataHeader call MenuBox call UpdateSprites call MenuBoxCoord2Tile - ld bc, $0015 + ld bc, SCREEN_WIDTH + 1 add hl, bc ld de, .Points_string call PlaceString ld h, b ld l, c inc hl - ld a, $7f + ld a, " " ld [hli], a ld [hld], a pop de @@ -224,13 +224,13 @@ Function8b09e: ; 8b09e db "Points@" ; 8b0d1 -MenuDataHeader_0x8b0d1: ; 0x8b0d1 +BlueCardBalanceMenuDataHeader: ; 0x8b0d1 db $40 ; flags db 11, 00 ; start coords db 13, 11 ; end coords ; 8b0d6 -Function8b0d6: ; 8b0d6 +Buena_PlacePrizeMenuBox: ; 8b0d6 ld hl, .menudataheader call LoadMenuDataHeader ret @@ -242,29 +242,29 @@ Function8b0d6: ; 8b0d6 db 11, 17 ; end coords ; 8b0e2 -Function8b0e2: ; 8b0e2 +Buena_PrizeMenu: ; 8b0e2 ld hl, .MenuDataHeader call CopyMenuDataHeader ld a, [MenuSelection] ld [wMenuCursorBuffer], a xor a - ld [wcf76], a + ld [wWhichIndexSet], a ld [hBGMapMode], a call InitScrollingMenu call UpdateSprites - call HandleScrollingMenu + call ScrollingMenu ld a, [MenuSelection] ld c, a - ld a, [MenuSelection2] + ld a, [wMenuCursorY] ld [MenuSelection], a - ld a, [wcf73] + ld a, [wMenuJoypad] cp $2 - jr z, .asm_8b111 + jr z, .cancel ld a, c and a ret nz -.asm_8b111 +.cancel xor a ret ; 8b113 @@ -281,8 +281,8 @@ Function8b0e2: ; 8b0e2 .MenuData2: ; 0x8b11c db $10 ; flags - db 4 ; items - db $d, $1 + db 4, 13 ; rows, columns + db 1 ; spacing dba .indices dba .prizeitem dba .prizepoints |