Menu

event/buena.asm

@@ -255,9 +255,9 @@ Function8b0e2: ; 8b0e2
 	call HandleScrollingMenu
 	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
 	ld a, c

event/elevator.asm

@@ -133,7 +133,7 @@ Function134dd: ; 134dd
 	ld [wMenuScrollPosition], a
 	call HandleScrollingMenu
 	call WriteBackup
-	ld a, [wcf73]
+	ld a, [wMenuJoypad]
 	cp $2
 	jr z, .asm_1350b
 	xor a

event/kurt.asm

@@ -40,7 +40,7 @@ Special_SelectApricornForKurt: ; 88018
 	and a
 	jr z, .done
 	ld [CurItem], a
-	ld a, [MenuSelection2]
+	ld a, [wMenuCursorY]
 	ld c, a
 	push bc
 	call Kurt_PrintTextHowMany
@@ -68,7 +68,7 @@ Kurt_SelectApricorn: ; 88055
 	call InitScrollingMenu
 	call UpdateSprites
 	call HandleScrollingMenu
-	ld a, [wcf73]
+	ld a, [wMenuJoypad]
 	cp $2
 	jr z, .nope
 	ld a, [MenuSelection]

event/mom.asm

@@ -106,10 +106,10 @@ endr
 	call LoadStandardMenuDataHeader
 	ld hl, MenuDataHeader_0x166b5
 	call CopyMenuDataHeader
-	call InterpretMenu2
+	call VerticalMenu
 	call WriteBackup
 	jr c, .cancel
-	ld a, [MenuSelection2]
+	ld a, [wMenuCursorY]
 	cp $1
 	jr z, .withdraw
 	cp $2

event/move_deleter.asm

@@ -25,7 +25,7 @@ MoveDeletion:
 	call Function2b74
 	pop af
 	jr c, .asm_2c5c3
-	ld a, [MenuSelection2]
+	ld a, [wMenuCursorY]
 	push af
 	ld a, [CurSpecies]
 	ld [wd265], a