diff options
| author | dannye <33dannye@gmail.com> | 2021-05-31 17:01:33 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2021-05-31 17:01:33 -0500 |
| commit | 25b568cb984a3a115c957df45738472da6aeafa0 (patch) | |
| tree | 2980222de85eb7e0e2b79da46a68c83f54e5e6c5 | |
| parent | 7a23e2a635318754b56923824d5949bcff3815bf (diff) | |
| parent | 234aa7d4096ba1bd5ef7783f34ec2405e9c665a5 (diff) | |
Merge branch 'master' of https://github.com/pret/pokered
| -rw-r--r-- | layout.link | 8 | ||||
| -rw-r--r-- | wram.asm | 17 |
2 files changed, 23 insertions, 2 deletions
diff --git a/layout.link b/layout.link index 605425e0..e29a1f91 100644 --- a/layout.link +++ b/layout.link @@ -227,13 +227,19 @@ ROMX $3F "Overworld Pikachu" "NPC Sprites 3" WRAM0 - "WRAM" + "Audio RAM" org $c100 "Sprite State Data" org $c300 "OAM Buffer" + "Tilemap" + "Overworld Map" + "WRAM" WRAMX $1 "WRAM Bank 1" + "Party Data" + "Main Data" + "Current Box Data" org $df15 "Stack" VRAM $0 @@ -6,7 +6,7 @@ INCLUDE "macros/wram.asm" INCLUDE "vram.asm" -SECTION "WRAM", WRAM0 +SECTION "Audio RAM", WRAM0 wUnusedC000:: db @@ -157,6 +157,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 @@ -266,6 +269,9 @@ ENDU ds 80 + +SECTION "Overworld Map", WRAM0 + UNION wOverworldMap:: ds 1300 wOverworldMapEnd:: @@ -346,6 +352,9 @@ wcbec:: ds 16 ENDU + +SECTION "WRAM", WRAM0 + ; the tiles of the row or column to be redrawn by RedrawRowOrColumn wRedrawRowOrColumnSrcTiles:: ds SCREEN_WIDTH * 2 @@ -1865,6 +1874,8 @@ wSavedNPCMovementDirections2Index:: db wPlayerName:: ds NAME_LENGTH +SECTION "Party Data", WRAMX + wPartyDataStart:: wPartyCount:: db @@ -1892,6 +1903,8 @@ wPartyMonNicksEnd:: wPartyDataEnd:: +SECTION "Main Data", WRAMX + wMainDataStart:: wPokedexOwned:: flag_array NUM_POKEMON @@ -2548,6 +2561,8 @@ wDayCareMon:: box_struct wDayCareMon wMainDataEnd:: +SECTION "Current Box Data", WRAMX + wBoxDataStart:: wBoxCount:: db |