summaryrefslogtreecommitdiff
path: root/sram.asm
diff options
context:
space:
mode:
authorentrpntr <12521136+entrpntr@users.noreply.github.com>2020-06-03 19:56:39 -0400
committerGitHub <noreply@github.com>2020-06-03 19:56:39 -0400
commit1210a5ef54141eeeebf79132a3124a8392c35c4e (patch)
tree954c9cf0cbfad8207399563d36fd64d02c6f16ce /sram.asm
parent3ceee7fd9ee3eccbe86652e24e9896dbeff52302 (diff)
parent7cc52fe23bac6ab9b2d58667e825aef62dd74e03 (diff)
Merge branch 'master' into bank23
Diffstat (limited to 'sram.asm')
-rwxr-xr-xsram.asm13
1 files changed, 7 insertions, 6 deletions
diff --git a/sram.asm b/sram.asm
index 529d088b..0e0f2f5a 100755
--- a/sram.asm
+++ b/sram.asm
@@ -1,14 +1,15 @@
SECTION "Scratch", SRAM
-UNION ; a000
-sScratchTilemap:: ds BG_MAP_WIDTH * BG_MAP_HEIGHT
-sScratchAttrmap:: ds $200
-
-NEXTU ; a000
sScratch::
+
+UNION ; a000
sDecompressScratch:: ds $188
sDecompressBuffer:: ds 7 * 7 tiles ; a188
-ENDU
+
+NEXTU ; a000
+sScratchTilemap:: ds BG_MAP_WIDTH * BG_MAP_HEIGHT
+sScratchAttrmap:: ds $200 ; a200
+ENDU ; a498
SECTION "SRAM Bank 0", SRAM