From eb2cf39bcf574f075853963a37bf0bfd2e89faed Mon Sep 17 00:00:00 2001
From: Tal Hayon <talhayon1@gmail.com>
Date: Wed, 29 Jun 2022 14:16:31 +0300
Subject: Match sub_080ADDD8

---
 src/vram.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/vram.c b/src/vram.c
index 916a90e7..77a4f325 100644
--- a/src/vram.c
+++ b/src/vram.c
@@ -64,18 +64,19 @@ void sub_080ADD70(void) {
     }
 }
 
-NONMATCH("asm/non_matching/vram/sub_080ADDD8.inc", void sub_080ADDD8(u32 index, u32 paletteIndex)) {
+void sub_080ADDD8(u32 index, u32 paletteIndex) {
     GfxSlot* slot = &gGFXSlots.slots[index];
+    u32 temp;
     slot->palettePointer = gGlobalGfxAndPalettes + (paletteIndex & 0xfffffc);
     if ((paletteIndex & 1) != 0) {
-        slot->paletteIndex = 0xffff;
+        temp = 0xffff;
     } else {
-        // TODO some cast here?
-        slot->paletteIndex = ((paletteIndex)&0x7f00) >> 4;
+        // @ TODO probably a bitfield
+        temp = ((paletteIndex)&0x7f000000) >> 0x14;
     }
+    slot->paletteIndex = temp;
     slot->vramStatus = GFX_VRAM_3;
 }
-END_NONMATCH
 
 void sub_080ADE24(void) {
     u32 index;
-- 
cgit v1.2.3