Use more WRAM sections

This commit is contained in:
Rangi 2021-05-31 17:17:03 -04:00
parent f3dbec09a8
commit 234aa7d409
2 changed files with 23 additions and 2 deletions

View file

@ -178,10 +178,16 @@ ROMX $2B
ROMX $2C ROMX $2C
"Move Names" "Move Names"
WRAM0 WRAM0
"WRAM" "Audio RAM"
org $c100 org $c100
"Sprite State Data" "Sprite State Data"
"OAM Buffer" "OAM Buffer"
"Tilemap"
"Overworld Map"
"WRAM"
"Party Data"
"Main Data"
"Current Box Data"
org $df00 org $df00
"Stack" "Stack"
VRAM VRAM

View file

@ -6,7 +6,7 @@ INCLUDE "macros/wram.asm"
INCLUDE "vram.asm" INCLUDE "vram.asm"
SECTION "WRAM", WRAM0 SECTION "Audio RAM", WRAM0
wUnusedC000:: db wUnusedC000:: db
@ -153,6 +153,9 @@ wOAMBufferSprite{02d:n}:: sprite_oam_struct wOAMBufferSprite{02d:n}
ENDR ENDR
wOAMBufferEnd:: wOAMBufferEnd::
SECTION "Tilemap", WRAM0
; buffer for tiles that are visible on screen (20 columns by 18 rows) ; buffer for tiles that are visible on screen (20 columns by 18 rows)
wTileMap:: ds SCREEN_WIDTH * SCREEN_HEIGHT wTileMap:: ds SCREEN_WIDTH * SCREEN_HEIGHT
@ -171,6 +174,9 @@ ENDU
ds 80 ds 80
SECTION "Overworld Map", WRAM0
UNION UNION
wOverworldMap:: ds 1300 wOverworldMap:: ds 1300
wOverworldMapEnd:: wOverworldMapEnd::
@ -179,6 +185,9 @@ NEXTU
wTempPic:: ds 7 * 7 tiles wTempPic:: ds 7 * 7 tiles
ENDU ENDU
SECTION "WRAM", WRAM0
; the tiles of the row or column to be redrawn by RedrawRowOrColumn ; the tiles of the row or column to be redrawn by RedrawRowOrColumn
wRedrawRowOrColumnSrcTiles:: ds SCREEN_WIDTH * 2 wRedrawRowOrColumnSrcTiles:: ds SCREEN_WIDTH * 2
@ -1633,6 +1642,8 @@ wSavedNPCMovementDirections2Index:: db
wPlayerName:: ds NAME_LENGTH wPlayerName:: ds NAME_LENGTH
SECTION "Party Data", WRAM0
wPartyDataStart:: wPartyDataStart::
wPartyCount:: db wPartyCount:: db
@ -1660,6 +1671,8 @@ wPartyMonNicksEnd::
wPartyDataEnd:: wPartyDataEnd::
SECTION "Main Data", WRAM0
wMainDataStart:: wMainDataStart::
wPokedexOwned:: flag_array NUM_POKEMON wPokedexOwned:: flag_array NUM_POKEMON
@ -2225,6 +2238,8 @@ wDayCareMon:: box_struct wDayCareMon
wMainDataEnd:: wMainDataEnd::
SECTION "Current Box Data", WRAM0
wBoxDataStart:: wBoxDataStart::
wBoxCount:: db wBoxCount:: db