More menu stuff

This commit is contained in:
PikalaxALT
2015-12-17 22:31:16 -05:00
parent fe4ef4e595
commit d644406f61
39 changed files with 764 additions and 763 deletions

View File

@@ -1401,7 +1401,7 @@ endr
ld a, 1
ld [wItemQuantityChangeBuffer], a
ld a, -1
ld [ItemCountBuffer], a
ld [CurItemQuantity], a
ld hl, NumItems
call TossItem
ld a, $1

View File

@@ -214,7 +214,7 @@ String_48202: ; 48202
; 4820d
Function4820d: ; 4820d (12:420d)
call Function1bee
call PlaceHollowCursor
ld hl, wMenuCursorY
ld a, [hl]
push af
@@ -361,7 +361,7 @@ Function48304: ; 48304 (12:4304)
ld [wMenuScrollPosition], a
callba Function104148
.asm_48348
call HandleScrollingMenu
call ScrollingMenu
ld de, $629
call Function48383
jr c, .asm_48348

View File

@@ -499,7 +499,7 @@ Function4ab1a: ; 4ab1a
jr c, .asm_4ab1a
push af
call Function4ab99
call nc, Function1bee
call nc, PlaceHollowCursor
pop af
bit 1, a
jr nz, .asm_4ab6d

View File

@@ -2258,7 +2258,7 @@ Function89dab: ; 89dab (22:5dab)
ld a, [wMenuCursorY]
cp c
jr z, .asm_89dd9
call Function1bee
call PlaceHollowCursor
scf
ret
.asm_89dd9
@@ -3076,7 +3076,7 @@ Function8a31c: ; 8a31c (22:631c)
ret
.asm_8a370
call Function89448
call Function1bee
call PlaceHollowCursor
call Function8a3a2
ld a, [MenuSelection]
cp $ff

View File

@@ -828,7 +828,7 @@ Function8b7bd: ; 8b7bd
call Function8b75d
call UpdateSprites
call Function89209
call HandleScrollingMenu
call ScrollingMenu
call Function8920f
ld a, [wMenuJoypad]
cp $2

View File

@@ -2024,7 +2024,7 @@ Function100cb5: ; 100cb5
ld a, [wcfa8]
and c
jr z, .asm_100cc0
call Function1bee
call PlaceHollowCursor
ld a, [PartyCount]
inc a
ld b, a
@@ -5569,7 +5569,7 @@ Function1024de: ; 1024de
; 1024f6
Function1024f6: ; 1024f6
call Function1bee
call PlaceHollowCursor
ld hl, wcd4b
set 1, [hl]
ld a, [wcd4c]
@@ -5746,7 +5746,7 @@ Function1025ff: ; 1025ff
ld a, [OTPartyCount]
cp b
ret nz
call Function1bf7
call HideCursor
ld a, [PartyCount]
ld [wMenuCursorY], a
ld a, $1d
@@ -5806,7 +5806,7 @@ Function10266b: ; 10266b
ld a, [wMenuCursorY]
dec a
ret nz
call Function1bf7
call HideCursor
ld a, $1f
ld [wcd49], a
ret
@@ -5847,7 +5847,7 @@ Jumptable_1026da: ; 1026da
; 1026de
Function1026de: ; 1026de
call Function1bf7
call HideCursor
hlcoord 9, 17
ld [hl], $ed
ld a, [wcd4a]
@@ -5901,7 +5901,7 @@ Function1026f3: ; 1026f3
Function102738: ; 102738
ld hl, wcd4b
set 6, [hl]
call Function1bee
call PlaceHollowCursor
call Function1027eb
ld hl, wcd4b
set 1, [hl]
@@ -7796,7 +7796,7 @@ Mobile_SelectThreeMons: ; 10366e
call PrintText
call YesNoBox
jr c, .asm_103696
callba Function8b1e1
callba CheckForMobileBattleRules
jr nc, .asm_103690
call JoyWaitAorB
jr .asm_103696
@@ -7841,7 +7841,7 @@ Mobile_SelectThreeMons: ; 10366e
jr .asm_1036b5
.asm_1036d9
callba Function8b1e1
callba CheckForMobileBattleRules
jr nc, .asm_1036e6
call JoyWaitAorB
jr .asm_1036f4