diff options
Diffstat (limited to 'home/menu.asm')
| -rw-r--r-- | home/menu.asm | 115 |
1 files changed, 52 insertions, 63 deletions
diff --git a/home/menu.asm b/home/menu.asm index 4e7b7772b..b0d72c9f9 100644 --- a/home/menu.asm +++ b/home/menu.asm @@ -15,7 +15,7 @@ CopyMenuDataHeader:: ret ; 0x1d4b -Function1d4b:: ; 1d4b +StoreTo_wMenuCursorBuffer:: ; 1d4b ld [wMenuCursorBuffer], a ret ; 1d4f @@ -28,7 +28,8 @@ MenuTextBox:: ; 1d4f jp PrintText ; 1d57 -Function1d57:: ; 1d57 +ret_1d57:: ; 1d57 +; unreferenced ret ; 1d58 @@ -71,25 +72,26 @@ Call_ExitMenu:: ; 1d7d ret ; 1d81 -InterpretMenu2:: +VerticalMenu:: xor a ld [hBGMapMode], a call MenuBox call UpdateSprites - call Function1c89 + call PlaceVerticalMenuItems call ApplyTilemap call CopyMenuData2 ld a, [wMenuData2Flags] bit 7, a jr z, .cancel - call Function1c10 - call Function1bc9 - call Function1ff8 + call InitVerticalMenuCursor + call StaticMenuJoypad + call MenuClickSound bit 1, a jr z, .okay .cancel scf ret + .okay and a ret @@ -97,9 +99,9 @@ InterpretMenu2:: GetMenu2:: ; 1dab call LoadMenuDataHeader - call InterpretMenu2 + call VerticalMenu call WriteBackup - ld a, [MenuSelection2] + ld a, [wMenuCursorY] ret ; 1db8 @@ -161,14 +163,14 @@ _YesNoBox:: ; 1dd9 call BackUpTiles InterpretTwoOptionMenu:: ; 1dfe - call InterpretMenu2 + call VerticalMenu push af ld c, $f call DelayFrames call WriteBackup pop af jr c, .no - ld a, [MenuSelection2] + ld a, [wMenuCursorY] cp 2 ; no jr z, .no and a @@ -176,7 +178,7 @@ InterpretTwoOptionMenu:: ; 1dfe .no ld a, 2 - ld [MenuSelection2], a + ld [wMenuCursorY], a scf ret ; 1e1d @@ -232,8 +234,8 @@ DoNthMenu:: ; 1e5d call MenuWriteText call Function1eff call Function1f23 - call Function1bdd - call Function1ff8 + call GetMenuJoypad + call MenuClickSound ret ; 1e70 @@ -340,7 +342,7 @@ Function1efb:: ; 1efb ; 1eff Function1eff:: ; 1eff - call Function1c10 + call InitVerticalMenuCursor ld hl, wcfa8 ld a, [wMenuData2Flags] bit 3, a @@ -360,7 +362,7 @@ Function1eff:: ; 1eff Function1f1a:: ; 1f1a - call Function1bd3 + call ScrollingMenuJoypad ld hl, wcfa8 and [hl] jr Function1f2a @@ -368,8 +370,8 @@ Function1f1a:: ; 1f1a Function1f23:: ; 1f23 xor a - ld [wcf73], a - call Function1bc9 + ld [wMenuJoypad], a + call StaticMenuJoypad ; 1f2a Function1f2a:: ; 1f2a @@ -384,48 +386,48 @@ Function1f2a:: ; 1f2a bit 5, a jr nz, .asm_1f4b xor a - ld [wcf73], a + ld [wMenuJoypad], a jr .asm_1f57 .asm_1f44 ld a, $10 - ld [wcf73], a + ld [wMenuJoypad], a jr .asm_1f57 .asm_1f4b ld a, $20 - ld [wcf73], a + ld [wMenuJoypad], a jr .asm_1f57 .asm_1f52 ld a, $1 - ld [wcf73], a + ld [wMenuJoypad], a .asm_1f57 call Function1ebd - ld a, [MenuSelection2] + ld a, [wMenuCursorY] ld l, a ld h, $0 add hl, de ld a, [hl] ld [MenuSelection], a - ld a, [MenuSelection2] + ld a, [wMenuCursorY] ld [wMenuCursorBuffer], a and a ret .asm_1f6d ld a, $2 - ld [wcf73], a + ld [wMenuJoypad], a ld a, $ff ld [MenuSelection], a scf ret ; 1f79 -Function1f79:: ; 1f79 +PlaceMenuStrings:: ; 1f79 push de - ld hl, wcf97 + ld hl, wMenuData2PointerTableAddr ld a, [hli] ld h, [hl] ld l, a @@ -441,7 +443,7 @@ Function1f79:: ; 1f79 PlaceNthMenuStrings:: ; 1f8d push de ld a, [MenuSelection] - call Function1fb1 + call GetMenuDataPointerTableEntry rept 2 inc hl endr @@ -454,7 +456,8 @@ endr ; 1f9e Function1f9e:: ; 1f9e - call Function1fb1 +; unreferenced + call GetMenuDataPointerTableEntry rept 2 inc hl endr @@ -466,17 +469,17 @@ endr MenuJumptable:: ; 1fa7 ld a, [MenuSelection] - call Function1fb1 + call GetMenuDataPointerTableEntry ld a, [hli] ld h, [hl] ld l, a jp [hl] ; 1fb1 -Function1fb1:: ; 1fb1 +GetMenuDataPointerTableEntry:: ; 1fb1 ld e, a ld d, $0 - ld hl, wcf97 + ld hl, wMenuData2PointerTableAddr ld a, [hli] ld h, [hl] ld l, a @@ -487,7 +490,7 @@ endr ; 1fbf ResetTextRelatedRAM:: ; 1fbf - ld hl, wcf71 + ld hl, wWindowStackPointer call .bytefill ld hl, wMenuDataHeader call .bytefill @@ -502,14 +505,14 @@ ResetTextRelatedRAM:: ; 1fbf ld [rSVBK], a xor a - ld hl, w7_dfff + ld hl, wWindowStackBottom rept 2 ld [hld], a endr ld a, l - ld [wcf71], a + ld [wWindowStackPointer], a ld a, h - ld [wcf72], a + ld [wWindowStackPointer + 1], a pop af ld [rSVBK], a @@ -523,15 +526,14 @@ endr ret ; 1ff8 -Function1ff8:: ; 1ff8 +MenuClickSound:: ; 1ff8 push af - and $3 + and A_BUTTON | B_BUTTON jr z, .nosound ld hl, wMenuFlags bit 3, [hl] jr nz, .nosound call PlayClickSFX - .nosound pop af ret @@ -548,12 +550,12 @@ PlayClickSFX:: ; 2009 MenuTextBoxWaitButton:: ; 2012 call MenuTextBox - call CloseText + call WaitButton call ExitMenu ret ; 201c -Function201c:: ; 201c +Place2DMenuItemName:: ; 201c ld [hBuffer], a ld a, [hROMBank] push af @@ -567,39 +569,26 @@ Function201c:: ; 201c ret ; 202a -InterpretMenu:: ; 202a +_2DMenu:: ; 202a ld a, [hROMBank] - ld [wcf94], a - callba Function2400e + ld [wMenuData2_2DMenuItemStringsBank], a + callba _2DMenu_ ld a, [wMenuCursorBuffer] ret ; 2039 -Function2039:: ; 2039 +InterpretBattleMenu:: ; 2039 ld a, [hROMBank] - ld [wcf94], a - callba Function24022 + ld [wMenuData2_2DMenuItemStringsBank], a + callba _InterpretBattleMenu ld a, [wMenuCursorBuffer] ret ; 2048 -Function2048:: ; 2048 +InterpretMobileMenu:: ; 2048 ld a, [hROMBank] - ld [wcf94], a - callba Function2403c + ld [wMenuData2_2DMenuItemStringsBank], a + callba _InterpretMobileMenu ld a, [wMenuCursorBuffer] ret ; 2057 - -Function2057:: ; 2057 - ld a, [hROMBank] - push af - ld a, BANK(Function842db) - rst Bankswitch - - call Function842db - pop af - rst Bankswitch - - ret -; 2063 |