Address comments on PR 322

This commit is contained in:
PikalaxALT
2015-10-24 19:49:19 -04:00
parent 69ee070021
commit 4d17f6e1f6
28 changed files with 754 additions and 936 deletions

View File

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

View File

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

View File

@@ -1786,12 +1786,12 @@ Function100b12: ; 100b12
ld a, BANK(BattleMenuDataHeader)
ld [wcf94], a
ld a, [wd0d2]
ld [wPocketPointerLocationBuffer], a
ld [wPocketCursorBuffer], a
call Function100e72
call Function100b45
callba Function8e85
call Function100ed4
ld a, [wPocketPointerLocationBuffer]
ld a, [wPocketCursorBuffer]
ld [wd0d2], a
call ExitMenu
ret
@@ -1818,7 +1818,7 @@ Function100b45: ; 100b45
ld c, a
ld a, [wcfa3]
call SimpleMultiply
ld [wPocketPointerLocationBuffer], a
ld [wPocketCursorBuffer], a
and a
ret
; 100b7a
@@ -6612,12 +6612,12 @@ Function102c71: ; 102c71
; 102c87
Function102c87: ; 102c87
ld a, [wJumptableEntryIndexBuffer]
ld a, [wJumptableIndex]
push af
ld a, [wcf64]
push af
ld a, [wcd4c]
ld [wJumptableEntryIndexBuffer], a
ld [wJumptableIndex], a
ld a, [PartyCount]
ld [wcf64], a
ld a, $0
@@ -6632,7 +6632,7 @@ Function102c87: ; 102c87
ld bc, $011a
call Function102d3e
ld a, [wcd4d]
ld [wJumptableEntryIndexBuffer], a
ld [wJumptableIndex], a
ld a, [OTPartyCount]
ld [wcf64], a
ld a, $5
@@ -6649,18 +6649,18 @@ Function102c87: ; 102c87
pop af
ld [wcf64], a
pop af
ld [wJumptableEntryIndexBuffer], a
ld [wJumptableIndex], a
ret
; 102cee
Function102cee: ; 102cee
ld a, [wJumptableEntryIndexBuffer]
ld a, [wJumptableIndex]
dec a
call Function102d34
ld de, DefaultFlypoint
ld bc, $002f
call CopyBytes
ld a, [wJumptableEntryIndexBuffer]
ld a, [wJumptableIndex]
ld c, a
ld a, $6
sub c
@@ -6669,7 +6669,7 @@ Function102cee: ; 102cee
ld hl, $0000
call AddNTimes
push hl
ld a, [wJumptableEntryIndexBuffer]
ld a, [wJumptableIndex]
dec a
call Function102d34
ld d, h
@@ -7688,7 +7688,7 @@ Function103612: ; 103612
ld a, [wdc40]
and $f
jr z, .asm_103622
ld [wPocketPointerLocationBuffer], a
ld [wPocketCursorBuffer], a
.asm_103622
call InterpretMenu2

View File

@@ -124,7 +124,7 @@ Function108089: ; 108089
Function1080b7: ; 1080b7
xor a
ld [wJumptableEntryIndexBuffer], a
ld [wJumptableIndex], a
call WhiteBGMap
call ClearSprites
call ClearTileMap
@@ -187,7 +187,7 @@ Function1080b7: ; 1080b7
Function108157: ; 108157
xor a
ld [wJumptableEntryIndexBuffer], a
ld [wJumptableIndex], a
call WhiteBGMap
call ClearSprites
call ClearTileMap
@@ -310,7 +310,7 @@ Function108239: ; 108239
; 10824b
Function10824b: ; 10824b
ld a, [wJumptableEntryIndexBuffer]
ld a, [wJumptableIndex]
bit 7, a
jr nz, .asm_10825a
call Function10827b
@@ -335,7 +335,7 @@ Function10824b: ; 10824b
; 10827b
Function10827b: ; 10827b
ld a, [wJumptableEntryIndexBuffer]
ld a, [wJumptableIndex]
ld e, a
ld d, 0
ld hl, Jumptable_10828a
@@ -372,7 +372,7 @@ Jumptable_10828a: ; 10828a
; 1082b2
Function1082b2: ; 1082b2
ld hl, wJumptableEntryIndexBuffer
ld hl, wJumptableIndex
inc [hl]
ret
; 1082b7
@@ -383,7 +383,7 @@ Function1082b7: ; 1082b7
inc hl
ld d, [hl]
ld a, [de]
ld [wJumptableEntryIndexBuffer], a
ld [wJumptableIndex], a
inc de
ld [hl], d
dec hl
@@ -392,7 +392,7 @@ Function1082b7: ; 1082b7
; 1082c6
Function1082c6: ; 1082c6
ld hl, wJumptableEntryIndexBuffer
ld hl, wJumptableIndex
set 7, [hl]
ret
; 1082cc

File diff suppressed because it is too large Load Diff

View File

@@ -521,7 +521,7 @@ Function17d2b6: ; 17d2b6
Function17d2c0: ; 17d2c0
xor a
ld [wJumptableEntryIndexBuffer], a
ld [wJumptableIndex], a
ld [wcf64], a
ld [wcf65], a
ld [wcf66], a

View File

@@ -9,7 +9,7 @@ UnusedTitleScreen: ; 10c000
xor a
ld [hBGMapMode], a
ld hl, wJumptableEntryIndexBuffer
ld hl, wJumptableIndex
rept 3
ld [hli], a
endr