mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2024-09-09 09:51:34 -07:00
Label some more WRAM/SRAM things
This should be all of the memory locations that are actually used, and some more. Removal of all addresses when?
This commit is contained in:
parent
7111ae8e58
commit
f4907040c9
@ -957,6 +957,8 @@ CrystalIntroSequence:
|
|||||||
jr c, StartTitleScreen
|
jr c, StartTitleScreen
|
||||||
farcall CrystalIntro
|
farcall CrystalIntro
|
||||||
|
|
||||||
|
; fallthrough
|
||||||
|
|
||||||
StartTitleScreen:
|
StartTitleScreen:
|
||||||
ldh a, [rSVBK]
|
ldh a, [rSVBK]
|
||||||
push af
|
push af
|
||||||
|
@ -391,11 +391,10 @@ EraseHallOfFame:
|
|||||||
jp CloseSRAM
|
jp CloseSRAM
|
||||||
|
|
||||||
Unreferenced_Function14d18:
|
Unreferenced_Function14d18:
|
||||||
; copy .Data to SRA4:a007
|
ld a, BANK(s4_a007)
|
||||||
ld a, 4 ; MBC30 bank used by JP Crystal; inaccessible by MBC3
|
|
||||||
call GetSRAMBank
|
call GetSRAMBank
|
||||||
ld hl, .Data
|
ld hl, .Data
|
||||||
ld de, $a007 ; address of MBC30 bank
|
ld de, s4_a007
|
||||||
ld bc, .DataEnd - .Data
|
ld bc, .DataEnd - .Data
|
||||||
call CopyBytes
|
call CopyBytes
|
||||||
jp CloseSRAM
|
jp CloseSRAM
|
||||||
@ -833,9 +832,9 @@ _SaveData:
|
|||||||
|
|
||||||
ld hl, wd479
|
ld hl, wd479
|
||||||
ld a, [hli]
|
ld a, [hli]
|
||||||
ld [$a60e + 0], a
|
ld [s4_a60e + 0], a
|
||||||
ld a, [hli]
|
ld a, [hli]
|
||||||
ld [$a60e + 1], a
|
ld [s4_a60e + 1], a
|
||||||
|
|
||||||
jp CloseSRAM
|
jp CloseSRAM
|
||||||
|
|
||||||
@ -851,9 +850,9 @@ _LoadData:
|
|||||||
; (harmlessly) writes the aforementioned wEventFlags to the unused wd479.
|
; (harmlessly) writes the aforementioned wEventFlags to the unused wd479.
|
||||||
|
|
||||||
ld hl, wd479
|
ld hl, wd479
|
||||||
ld a, [$a60e + 0]
|
ld a, [s4_a60e + 0]
|
||||||
ld [hli], a
|
ld [hli], a
|
||||||
ld a, [$a60e + 1]
|
ld a, [s4_a60e + 1]
|
||||||
ld [hli], a
|
ld [hli], a
|
||||||
|
|
||||||
jp CloseSRAM
|
jp CloseSRAM
|
||||||
|
@ -2657,9 +2657,9 @@ LoadSelectedPartiesForColosseum:
|
|||||||
ret
|
ret
|
||||||
|
|
||||||
Function1011f1:
|
Function1011f1:
|
||||||
ld a, $04
|
ld a, BANK(s4_a60c)
|
||||||
call GetSRAMBank
|
call GetSRAMBank
|
||||||
ld a, [$a60c]
|
ld a, [s4_a60c]
|
||||||
ld [wdc41], a
|
ld [wdc41], a
|
||||||
call CloseSRAM
|
call CloseSRAM
|
||||||
ld hl, wdc41
|
ld hl, wdc41
|
||||||
@ -3456,7 +3456,7 @@ Function10174c:
|
|||||||
ld a, e
|
ld a, e
|
||||||
ld [wcd3b], a
|
ld [wcd3b], a
|
||||||
ld a, d
|
ld a, d
|
||||||
ld [wcd3c], a
|
ld [wBattleTowerRoomMenu2JumptableIndex], a
|
||||||
ld a, c
|
ld a, c
|
||||||
ld [wcd40], a
|
ld [wcd40], a
|
||||||
ld a, b
|
ld a, b
|
||||||
@ -6933,10 +6933,10 @@ Function103309:
|
|||||||
ld bc, 10
|
ld bc, 10
|
||||||
xor a
|
xor a
|
||||||
call ByteFill
|
call ByteFill
|
||||||
ld a, $04
|
ld a, BANK(s4_a60c)
|
||||||
call GetSRAMBank
|
call GetSRAMBank
|
||||||
ld a, [wdc41]
|
ld a, [wdc41]
|
||||||
ld [$a60c], a
|
ld [s4_a60c], a
|
||||||
ld [wBuffer1], a
|
ld [wBuffer1], a
|
||||||
call CloseSRAM
|
call CloseSRAM
|
||||||
call Function1035c6
|
call Function1035c6
|
||||||
@ -6985,10 +6985,10 @@ Function103362:
|
|||||||
ld hl, wBuffer2
|
ld hl, wBuffer2
|
||||||
bit 6, [hl]
|
bit 6, [hl]
|
||||||
jr z, .asm_103398
|
jr z, .asm_103398
|
||||||
ld a, $04
|
ld a, BANK(s4_a60c)
|
||||||
call GetSRAMBank
|
call GetSRAMBank
|
||||||
ld a, [wBuffer1]
|
ld a, [wBuffer1]
|
||||||
ld [$a60c], a
|
ld [s4_a60c], a
|
||||||
ld [wdc41], a
|
ld [wdc41], a
|
||||||
call CloseSRAM
|
call CloseSRAM
|
||||||
xor a
|
xor a
|
||||||
|
File diff suppressed because it is too large
Load Diff
@ -331,6 +331,7 @@ WRAMX 2
|
|||||||
WRAMX 3
|
WRAMX 3
|
||||||
"Battle Tower RAM"
|
"Battle Tower RAM"
|
||||||
WRAMX 5
|
WRAMX 5
|
||||||
|
align 8
|
||||||
"GBC Video"
|
"GBC Video"
|
||||||
org $d300
|
org $d300
|
||||||
"Battle Animations"
|
"Battle Animations"
|
||||||
@ -365,5 +366,7 @@ SRAM $04
|
|||||||
"SRAM Mobile 1"
|
"SRAM Mobile 1"
|
||||||
SRAM $05
|
SRAM $05
|
||||||
"SRAM Mobile 2"
|
"SRAM Mobile 2"
|
||||||
|
SRAM $06
|
||||||
|
"SRAM Mobile 3"
|
||||||
HRAM
|
HRAM
|
||||||
"HRAM"
|
"HRAM"
|
||||||
|
55
sram.asm
55
sram.asm
@ -239,12 +239,26 @@ sBox12:: box sBox12
|
|||||||
sBox13:: box sBox13
|
sBox13:: box sBox13
|
||||||
sBox14:: box sBox14
|
sBox14:: box sBox14
|
||||||
|
|
||||||
|
|
||||||
SECTION "SRAM Mobile 1", SRAM
|
SECTION "SRAM Mobile 1", SRAM
|
||||||
|
|
||||||
ds $13
|
ds $7
|
||||||
|
|
||||||
|
s4_a007:: ; struct size $30 ; a007
|
||||||
|
|
||||||
|
ds $c
|
||||||
|
|
||||||
s4_a013:: ds 36 ; a013
|
s4_a013:: ds 36 ; a013
|
||||||
|
|
||||||
|
ds $5d5
|
||||||
|
|
||||||
|
s4_a60c:: db ; a60c
|
||||||
|
|
||||||
|
ds $1
|
||||||
|
|
||||||
|
s4_a60e:: dw ; a60e
|
||||||
|
|
||||||
|
|
||||||
SECTION "SRAM Mobile 2", SRAM
|
SECTION "SRAM Mobile 2", SRAM
|
||||||
|
|
||||||
ds 1 ; former location for sMobileEventIndex, moved to 1:BE3C in English
|
ds 1 ; former location for sMobileEventIndex, moved to 1:BE3C in English
|
||||||
@ -328,7 +342,9 @@ s5_aa41:: ds 4 ; aa41
|
|||||||
s5_aa47:: db ; aa47
|
s5_aa47:: db ; aa47
|
||||||
s5_aa48:: db ; aa48
|
s5_aa48:: db ; aa48
|
||||||
|
|
||||||
ds $2
|
ds $1
|
||||||
|
|
||||||
|
s5_aa4a:: db ; aa4a
|
||||||
|
|
||||||
sMobileLoginPassword:: ds MOBILE_LOGIN_PASSWORD_LENGTH ; aa4b
|
sMobileLoginPassword:: ds MOBILE_LOGIN_PASSWORD_LENGTH ; aa4b
|
||||||
|
|
||||||
@ -336,7 +352,11 @@ sMobileLoginPassword:: ds MOBILE_LOGIN_PASSWORD_LENGTH ; aa4b
|
|||||||
|
|
||||||
s5_aa5d:: ds MOBILE_LOGIN_PASSWORD_LENGTH ; aa5d
|
s5_aa5d:: ds MOBILE_LOGIN_PASSWORD_LENGTH ; aa5d
|
||||||
|
|
||||||
ds $1d
|
ds $4
|
||||||
|
|
||||||
|
s5_aa72:: db ; aa72
|
||||||
|
s5_aa73:: ds 12 ; aa73
|
||||||
|
s5_aa7f:: ds 12 ; aa7f
|
||||||
|
|
||||||
s5_aa8b:: db ; aa8b
|
s5_aa8b:: db ; aa8b
|
||||||
s5_aa8c:: db ; aa8c
|
s5_aa8c:: db ; aa8c
|
||||||
@ -347,13 +367,27 @@ s5_aa8e:: ds 7 * $cc ; aa8e
|
|||||||
|
|
||||||
s5_b023:: ds 105 ; b023
|
s5_b023:: ds 105 ; b023
|
||||||
s5_b08c:: ds 4 ; b08c
|
s5_b08c:: ds 4 ; b08c
|
||||||
|
s5_b090:: db ; b090
|
||||||
|
s5_b091:: db ; b091
|
||||||
|
s5_b092:: ds 31 ; b092
|
||||||
|
|
||||||
ds $263
|
ds $100
|
||||||
|
|
||||||
|
s5_b1b1:: db ; b1b1
|
||||||
|
s5_b1b2:: db ; b1b2
|
||||||
|
s5_b1b3:: db ; b1b3
|
||||||
|
s5_b1b4:: db ; b1b4
|
||||||
|
|
||||||
|
ds $1e
|
||||||
|
|
||||||
|
s5_b1d3:: ; b1d3
|
||||||
|
|
||||||
|
ds $120
|
||||||
|
|
||||||
s5_b2f3:: db ; b2f3
|
s5_b2f3:: db ; b2f3
|
||||||
s5_b2f4:: db ; b2f4
|
s5_b2f4:: ds 4 ; b2f4
|
||||||
|
|
||||||
ds 4
|
ds $1
|
||||||
|
|
||||||
s5_b2f9:: db ; b2f9
|
s5_b2f9:: db ; b2f9
|
||||||
s5_b2fa:: db ; b2fa
|
s5_b2fa:: db ; b2fa
|
||||||
@ -363,3 +397,12 @@ s5_b2fb:: db ; b2fb
|
|||||||
|
|
||||||
s5_be45:: db ; be45
|
s5_be45:: db ; be45
|
||||||
s5_be46:: db ; be46
|
s5_be46:: db ; be46
|
||||||
|
|
||||||
|
ds $1b8
|
||||||
|
|
||||||
|
s5_bfff:: db ; bfff
|
||||||
|
|
||||||
|
|
||||||
|
SECTION "SRAM Mobile 3", SRAM
|
||||||
|
|
||||||
|
s6_a000:: ; a000
|
||||||
|
68
wram.asm
68
wram.asm
@ -255,7 +255,16 @@ wc310:: ds 1
|
|||||||
wc311:: ds 1
|
wc311:: ds 1
|
||||||
wc312:: ds 1
|
wc312:: ds 1
|
||||||
wc313:: ds 1
|
wc313:: ds 1
|
||||||
wc314:: ds 152
|
wc314:: ds 5
|
||||||
|
wc319:: db
|
||||||
|
wc31a:: db
|
||||||
|
wc31b:: db
|
||||||
|
wc31c:: db
|
||||||
|
wc31d:: db
|
||||||
|
wc31e:: db
|
||||||
|
wc31f:: db
|
||||||
|
wc320:: ds 38
|
||||||
|
wc346:: ds 102
|
||||||
wc3ac:: ds 8
|
wc3ac:: ds 8
|
||||||
ENDU ; c3b4
|
ENDU ; c3b4
|
||||||
|
|
||||||
@ -898,7 +907,8 @@ wc70e:: db
|
|||||||
wc70f:: db
|
wc70f:: db
|
||||||
wc710:: db
|
wc710:: db
|
||||||
wc711:: db
|
wc711:: db
|
||||||
wc712:: ds 60
|
wc712:: ds 7
|
||||||
|
wc719:: ds 53
|
||||||
wc74e:: ds 107
|
wc74e:: ds 107
|
||||||
wc7b9:: ds 1
|
wc7b9:: ds 1
|
||||||
wc7ba:: ds 1
|
wc7ba:: ds 1
|
||||||
@ -1206,7 +1216,7 @@ wcd38:: db ; secs
|
|||||||
wcd39:: ds 1
|
wcd39:: ds 1
|
||||||
wcd3a:: ds 1
|
wcd3a:: ds 1
|
||||||
wcd3b:: ds 1
|
wcd3b:: ds 1
|
||||||
wcd3c:: ds 1
|
wBattleTowerRoomMenu2JumptableIndex:: ds 1
|
||||||
wcd3d:: ds 1
|
wcd3d:: ds 1
|
||||||
wcd3e:: ds 1
|
wcd3e:: ds 1
|
||||||
wcd3f:: ds 1
|
wcd3f:: ds 1
|
||||||
@ -1418,6 +1428,11 @@ wHoldingUnownPuzzlePiece:: db
|
|||||||
wUnownPuzzleCursorPosition:: db
|
wUnownPuzzleCursorPosition:: db
|
||||||
wUnownPuzzleHeldPiece:: db
|
wUnownPuzzleHeldPiece:: db
|
||||||
|
|
||||||
|
NEXTU ; cf64
|
||||||
|
; battle tower
|
||||||
|
ds $2
|
||||||
|
wBattleTowerRoomMenuJumptableIndex:: db
|
||||||
|
|
||||||
NEXTU ; cf64
|
NEXTU ; cf64
|
||||||
; miscellaneous
|
; miscellaneous
|
||||||
wFrameCounter::
|
wFrameCounter::
|
||||||
@ -3013,33 +3028,46 @@ w3_d800:: ds BG_MAP_WIDTH * SCREEN_HEIGHT
|
|||||||
|
|
||||||
NEXTU ; d742
|
NEXTU ; d742
|
||||||
ds $be
|
ds $be
|
||||||
wBTChoiceOfLvlGroup:: db
|
wBTChoiceOfLvlGroup:: db ; d800
|
||||||
ds $68
|
ds $1
|
||||||
w3_d869:: ds $17
|
w3_d802:: ds 12 ; d802
|
||||||
w3_d880:: ds 1
|
w3_d80e:: db ; d80e
|
||||||
w3_d881:: ds 9
|
ds $1
|
||||||
w3_d88a:: ds 5
|
w3_d810:: ; d810
|
||||||
w3_d88f:: ds 5
|
ds $59
|
||||||
w3_d894:: ds 1
|
w3_d869:: ds $17 ; d869
|
||||||
w3_d895:: ds 11
|
w3_d880:: ds 1 ; d880
|
||||||
w3_d8a0:: ds 1
|
w3_d881:: ds 8 ; d881
|
||||||
w3_d8a1:: ds 1
|
w3_d889:: ds 1 ; d889
|
||||||
w3_d8a2:: ds 1
|
w3_d88a:: ds 4 ; d88a
|
||||||
w3_d8a3:: ds 1
|
w3_d88e:: ds 1 ; d88e
|
||||||
|
w3_d88f:: ds 4 ; d88f
|
||||||
|
w3_d893:: ds 1 ; d893
|
||||||
|
w3_d894:: ds 1 ; d894
|
||||||
|
w3_d895:: ds 11 ; d895
|
||||||
|
w3_d8a0:: ds 1 ; d8a0
|
||||||
|
w3_d8a1:: ds 1 ; d8a1
|
||||||
|
w3_d8a2:: ds 1 ; d8a2
|
||||||
|
w3_d8a3:: ds 1 ; d8a3
|
||||||
ENDU ; d8a4
|
ENDU ; d8a4
|
||||||
|
|
||||||
ds $1c0
|
ds $1c0
|
||||||
|
|
||||||
w3_dc00:: ds SCREEN_WIDTH * SCREEN_HEIGHT
|
w3_dc00:: ds SCREEN_WIDTH * SCREEN_HEIGHT
|
||||||
|
UNION ; dd68
|
||||||
w3_dd68:: ds SCREEN_WIDTH * SCREEN_HEIGHT
|
w3_dd68:: ds SCREEN_WIDTH * SCREEN_HEIGHT
|
||||||
|
|
||||||
ds $11c
|
ds $11c
|
||||||
|
|
||||||
w3_dfec:: ds $10
|
w3_dfec:: ds $10
|
||||||
w3_dffc:: ds 4
|
w3_dffc:: ds 4
|
||||||
|
NEXTU ; dd68
|
||||||
|
ds $98
|
||||||
|
w3_de00:: ds $200
|
||||||
|
ENDU ; e000
|
||||||
|
|
||||||
|
SECTION "GBC Video", WRAMX, ALIGN[8]
|
||||||
SECTION "GBC Video", WRAMX
|
; LCD expects wLYOverrides to have an alignment of $100
|
||||||
|
|
||||||
; eight 4-color palettes each
|
; eight 4-color palettes each
|
||||||
wGBCPalettes:: ; used only for BANK(wGBCPalettes)
|
wGBCPalettes:: ; used only for BANK(wGBCPalettes)
|
||||||
@ -3159,6 +3187,10 @@ wScratchAttrMap:: ds BG_MAP_WIDTH * BG_MAP_HEIGHT
|
|||||||
NEXTU ; d000
|
NEXTU ; d000
|
||||||
wDecompressScratch:: ds $80 tiles
|
wDecompressScratch:: ds $80 tiles
|
||||||
wDecompressEnemyFrontpic:: ds $80 tiles
|
wDecompressEnemyFrontpic:: ds $80 tiles
|
||||||
|
|
||||||
|
NEXTU ; d000
|
||||||
|
; unidentified uses
|
||||||
|
w6_d000:: ds $1000
|
||||||
ENDU ; e000
|
ENDU ; e000
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user