summaryrefslogtreecommitdiff
path: root/wram.asm
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2016-03-26 15:12:38 -0700
committerYamaArashi <shadow962@live.com>2016-03-26 15:12:38 -0700
commit268c5e5bdaf2dc11f66ef4cf87d88eb1dbad44e9 (patch)
treed060f3f19878ebe592af6103d5ec5241a206bffd /wram.asm
parent48426f71c39c4b89ff5fc4d1cab9f271bdfe8230 (diff)
parentd8975211f543432565270379a0b4ebf277318b38 (diff)
Merge pull request #7 from YamaArashi/master
GBC palette code
Diffstat (limited to 'wram.asm')
-rwxr-xr-xwram.asm12
1 files changed, 3 insertions, 9 deletions
diff --git a/wram.asm b/wram.asm
index a2e03ab6..6db19111 100755
--- a/wram.asm
+++ b/wram.asm
@@ -3299,19 +3299,13 @@ wBoxMonNicks:: ds NAME_LENGTH * MONS_PER_BOX ; de06
wBoxMonNicksEnd:: ; dee1
wBoxDataEnd::
-wPalDataPointer1:: ds 2 ; dee1
-wPalDataPointer2:: ds 2 ; dee3
-wPalDataPointer3:: ds 2 ; dee5
-wPalDataPointer4:: ds 2 ; dee7
-wPalDataBuffer1:: ds 2 ; dee9
-wPalDataBuffer2:: ds 2 ; deeb
-wPalDataBuffer3:: ds 2 ; deed
-wPalDataBuffer4:: ds 2 ; deef
+wGBCBasePalPointers:: ds NUM_ACTIVE_PALS * 2 ; dee1
+wGBCPal:: ds PAL_SIZE ; dee9
wLastBGP:: ds 1 ; def1
wLastOBP0:: ds 1 ; def2
wLastOBP1:: ds 1 ; def3
wdef5:: ds 1 ; def4
-wStoredBGPPalettes:: ds 1 ; def5
+wBGPPalsBuffer:: ds NUM_ACTIVE_PALS * PAL_SIZE ; def5
SECTION "Stack", WRAMX[$dfff], BANK[1]
wStack:: ; dfff