Use more WRAM sections

wrulfy · May 31, 2021 · 234aa7d · 234aa7d
1 parent f3dbec0
commit 234aa7d
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 2 deletions.
diff --git a/layout.link b/layout.link
@@ -178,10 +178,16 @@ ROMX $2B
 ROMX $2C
  "Move Names"
 WRAM0
- "WRAM"
+ "Audio RAM"
  org $c100
  "Sprite State Data"
  "OAM Buffer"
+ "Tilemap"
+ "Overworld Map"
+ "WRAM"
+ "Party Data"
+ "Main Data"
+ "Current Box Data"
  org $df00
  "Stack"
 VRAM

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