Skip to content

Commit 234aa7d

Browse files
committedMay 31, 2021
Use more WRAM sections
1 parent f3dbec0 commit 234aa7d

File tree

2 files changed

+23
-2
lines changed

2 files changed

+23
-2
lines changed
 

‎layout.link

+7-1
Original file line numberDiff line numberDiff line change
@@ -178,10 +178,16 @@ ROMX $2B
178178
ROMX $2C
179179
"Move Names"
180180
WRAM0
181-
"WRAM"
181+
"Audio RAM"
182182
org $c100
183183
"Sprite State Data"
184184
"OAM Buffer"
185+
"Tilemap"
186+
"Overworld Map"
187+
"WRAM"
188+
"Party Data"
189+
"Main Data"
190+
"Current Box Data"
185191
org $df00
186192
"Stack"
187193
VRAM

‎wram.asm

+16-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ INCLUDE "macros/wram.asm"
66
INCLUDE "vram.asm"
77

88

9-
SECTION "WRAM", WRAM0
9+
SECTION "Audio RAM", WRAM0
1010

1111
wUnusedC000:: db
1212

@@ -153,6 +153,9 @@ wOAMBufferSprite{02d:n}:: sprite_oam_struct wOAMBufferSprite{02d:n}
153153
ENDR
154154
wOAMBufferEnd::
155155

156+
157+
SECTION "Tilemap", WRAM0
158+
156159
; buffer for tiles that are visible on screen (20 columns by 18 rows)
157160
wTileMap:: ds SCREEN_WIDTH * SCREEN_HEIGHT
158161

@@ -171,6 +174,9 @@ ENDU
171174

172175
ds 80
173176

177+
178+
SECTION "Overworld Map", WRAM0
179+
174180
UNION
175181
wOverworldMap:: ds 1300
176182
wOverworldMapEnd::
@@ -179,6 +185,9 @@ NEXTU
179185
wTempPic:: ds 7 * 7 tiles
180186
ENDU
181187

188+
189+
SECTION "WRAM", WRAM0
190+
182191
; the tiles of the row or column to be redrawn by RedrawRowOrColumn
183192
wRedrawRowOrColumnSrcTiles:: ds SCREEN_WIDTH * 2
184193

@@ -1633,6 +1642,8 @@ wSavedNPCMovementDirections2Index:: db
16331642
wPlayerName:: ds NAME_LENGTH
16341643

16351644

1645+
SECTION "Party Data", WRAM0
1646+
16361647
wPartyDataStart::
16371648

16381649
wPartyCount:: db
@@ -1660,6 +1671,8 @@ wPartyMonNicksEnd::
16601671
wPartyDataEnd::
16611672

16621673

1674+
SECTION "Main Data", WRAM0
1675+
16631676
wMainDataStart::
16641677

16651678
wPokedexOwned:: flag_array NUM_POKEMON
@@ -2225,6 +2238,8 @@ wDayCareMon:: box_struct wDayCareMon
22252238
wMainDataEnd::
22262239

22272240

2241+
SECTION "Current Box Data", WRAM0
2242+
22282243
wBoxDataStart::
22292244

22302245
wBoxCount:: db

0 commit comments

Comments
 (0)
Please sign in to comment.