Identify some more labels, mostly WRAM

This commit is contained in:
Rangi
2020-10-23 16:04:15 -04:00
parent 7991db972b
commit a2b6befd7d
4 changed files with 194 additions and 157 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -321,7 +321,7 @@ _CGB_BillsPC:
ldh [hCGBPalUpdate], a ldh [hCGBPalUpdate], a
ret ret
Function9009: Function9009: ; unreferenced
ld hl, BillsPCOrangePalette ld hl, BillsPCOrangePalette
call LoadHLPaletteIntoDE call LoadHLPaletteIntoDE
jr .GotPalette jr .GotPalette

View File

@@ -605,13 +605,14 @@ Function104d5e:
xor a xor a
ldh [rIF], a ldh [rIF], a
call Function104d96 call Function104d96
; runs for ~$40400 cycles
xor a xor a
ld b, a ld b, a
.asm_104d6d .busy_wait
inc a inc a
jr nz, .asm_104d6d jr nz, .busy_wait
inc b inc b
jr nz, .asm_104d6d jr nz, .busy_wait
ret ret
Function104d74: Function104d74:
@@ -846,9 +847,9 @@ Function104ed6:
ld b, a ld b, a
ld a, $f4 ld a, $f4
ldh [rTMA], a ldh [rTMA], a
.asm_104eee .main_loop
inc b inc b
jr z, .asm_104f2e jr z, .done
ld a, $8 ld a, $8
ldh [hPrintNumBuffer + 3], a ldh [hPrintNumBuffer + 3], a
ld a, [hli] ld a, [hli]
@@ -859,7 +860,7 @@ Function104ed6:
ldh a, [hPrintNumBuffer + 5] ldh a, [hPrintNumBuffer + 5]
adc 0 adc 0
ldh [hPrintNumBuffer + 5], a ldh [hPrintNumBuffer + 5], a
.asm_104f02 .inner_loop
xor a xor a
ldh [rIF], a ldh [rIF], a
halt halt
@@ -869,26 +870,27 @@ Function104ed6:
ld a, e ld a, e
rlca rlca
ld e, a ld e, a
jr nc, .asm_104f13 jr nc, .wait
inc d inc d
.asm_104f13 .wait
ldh a, [rTIMA] ldh a, [rTIMA]
cp $f8 cp $f8
jr c, .asm_104f13 jr c, .wait
ld a, $c0 ld a, $c0
ldh [rRP], a ldh [rRP], a
dec d dec d
jr z, .asm_104f25 jr z, .no_halt
xor a xor a
ldh [rIF], a ldh [rIF], a
halt halt
.asm_104f25 .no_halt
ldh a, [hPrintNumBuffer + 3] ldh a, [hPrintNumBuffer + 3]
dec a dec a
jr z, .asm_104eee jr z, .main_loop
ldh [hPrintNumBuffer + 3], a ldh [hPrintNumBuffer + 3], a
jr .asm_104f02 jr .inner_loop
.asm_104f2e
.done
ld a, $fe ld a, $fe
ldh [rTMA], a ldh [rTMA], a
xor a xor a
@@ -987,48 +989,50 @@ Function104faf:
xor a xor a
ldh [hMGPrevTIMA], a ldh [hMGPrevTIMA], a
call Function104d86 call Function104d86
.asm_104fd2 .main_loop
inc b inc b
jr z, .asm_10501a jr z, .done
ld a, $8 ld a, $8
ldh [hPrintNumBuffer + 3], a ldh [hPrintNumBuffer + 3], a
.asm_104fd9 .inner_loop
ld d, $0 ld d, $0
.asm_104fdb .wait_one
inc d inc d
jr z, .asm_104fe5 jr z, .got_one
ldh a, [c] ldh a, [c]
bit 1, a bit 1, a
jr z, .asm_104fdb jr z, .wait_one
ld d, $0 ld d, $0
.asm_104fe5 .got_one
.wait_zero
inc d inc d
jr z, .asm_104fed jr z, .got_zero
ldh a, [c] ldh a, [c]
bit 1, a bit 1, a
jr nz, .asm_104fe5 jr nz, .wait_zero
.asm_104fed .got_zero
ldh a, [hMGPrevTIMA] ldh a, [hMGPrevTIMA]
ld d, a ld d, a
ldh a, [rTIMA] ldh a, [rTIMA]
ldh [hMGPrevTIMA], a ldh [hMGPrevTIMA], a
sub d sub d
cp $12 cp $12
jr c, .asm_104ffd jr c, .zero
set 0, e set 0, e
jr .asm_104fff jr .ok
.asm_104ffd .zero
res 0, e res 0, e
.asm_104fff .ok
ldh a, [hPrintNumBuffer + 3] ldh a, [hPrintNumBuffer + 3]
dec a dec a
ldh [hPrintNumBuffer + 3], a ldh [hPrintNumBuffer + 3], a
jr z, .asm_10500b jr z, .continue
ld a, e ld a, e
rlca rlca
ld e, a ld e, a
jr .asm_104fd9 jr .inner_loop
.asm_10500b
.continue
ld a, e ld a, e
ld [hli], a ld [hli], a
ldh a, [hPrintNumBuffer + 4] ldh a, [hPrintNumBuffer + 4]
@@ -1037,8 +1041,9 @@ Function104faf:
ldh a, [hPrintNumBuffer + 5] ldh a, [hPrintNumBuffer + 5]
adc 0 adc 0
ldh [hPrintNumBuffer + 5], a ldh [hPrintNumBuffer + 5], a
jr .asm_104fd2 jr .main_loop
.asm_10501a
.done
call Function104d74 call Function104d74
xor a xor a
ldh [rIF], a ldh [rIF], a

View File

@@ -773,6 +773,24 @@ wOddEgg:: party_struct wOddEgg
wOddEggName:: ds MON_NAME_LENGTH wOddEggName:: ds MON_NAME_LENGTH
wOddEggOTName:: ds NAME_LENGTH wOddEggOTName:: ds NAME_LENGTH
NEXTU
; debug mon color picker
wDebugMiddleColors::
wDebugLightColor:: ds 2
wDebugDarkColor:: ds 2
ds 6
wDebugRedChannel:: db
wDebugGreenChannel:: db
wDebugBlueChannel:: db
NEXTU
; debug tileset color picker
wDebugPalette::
wDebugWhiteTileColor:: ds 2
wDebugLightTileColor:: ds 2
wDebugDarkTileColor:: ds 2
wDebugBlackTileColor:: ds 2
NEXTU NEXTU
wc608:: ds 16 wc608:: ds 16
wc618:: ds 37 wc618:: ds 37
@@ -1015,6 +1033,10 @@ NEXTU
; Hall of Fame data ; Hall of Fame data
wHallOfFamePokemonList:: hall_of_fame wHallOfFamePokemonList wHallOfFamePokemonList:: hall_of_fame wHallOfFamePokemonList
NEXTU
; debug color picker
wDebugOriginalColors:: ds 256 * 4
NEXTU NEXTU
; raw link data ; raw link data
wLinkData:: ds $514 wLinkData:: ds $514
@@ -1501,6 +1523,18 @@ wHoldingUnownPuzzlePiece:: db
wUnownPuzzleCursorPosition:: db wUnownPuzzleCursorPosition:: db
wUnownPuzzleHeldPiece:: db wUnownPuzzleHeldPiece:: db
NEXTU
; debug mon color picker
wDebugColorRGBJumptableIndex:: db
wDebugColorCurColor:: db
wDebugColorCurMon:: db
NEXTU
; debug tileset color picker
wDebugTilesetCurPalette:: db
wDebugTilesetRGBJumptableIndex:: db
wDebugTilesetCurColor:: db
NEXTU NEXTU
; battle tower ; battle tower
ds $2 ds $2
@@ -1835,6 +1869,12 @@ wSuicuneFrame::
wStartFlypoint:: db wStartFlypoint:: db
wEndFlypoint:: db wEndFlypoint:: db
NEXTU
; debug color picker
wDebugColorIsTrainer:: db
wDebugColorIsShiny:: db
wDebugColorCurTMHM:: db
NEXTU NEXTU
; link battle record data ; link battle record data
wLinkBattleRecordName:: ds NAME_LENGTH wLinkBattleRecordName:: ds NAME_LENGTH