Add bit macros from SA3

include/gba/defines.h

@@ -37,8 +37,8 @@
 #define OAM_ENTRY_COUNT 128
 #if PORTABLE
 // NOTE: Used in gba/types.h, so they have to be defined before the #include
-#define DISPLAY_WIDTH  240
-#define DISPLAY_HEIGHT 160
+#define DISPLAY_WIDTH  426
+#define DISPLAY_HEIGHT 240
 
 //#include "gba/types.h"
 // TODO: Fix #define OAM_SIZE (OAM_ENTRY_COUNT*sizeof(OamData))

include/global.h

@@ -220,9 +220,49 @@ typedef void (*VoidFn)(void);
 
 #define RECT_DISTANCE(aXA, aYA, aXB, aYB) (ABS((aXA) - (aXB)) + ABS((aYA) - (aYB)))
 
-#define GetBit(x, y)   (((x) >> (y)) & 1)
-#define SetBit(x, y)   (x) |= (1 << (y))
-#define ClearBit(x, y) (x) &= ~(1 << (y))
+#define BitValue(y)      (1 << (y))
+#define CheckBit(x, y)   ((x) & (BitValue(y)))
+#define GetBit(x, y)     (((x) >> (y)) & 1)
+#define SetBit(x, y)     (x) |= BitValue(y)
+#define SetSoleBit(x, y) (x) = BitValue(y)
+#define ClearBit(x, y)   (x) &= ~BitValue(y)
+
+// TODO: Use instrinsics for these, on platforms that support it!
+// Like GetFirstSetBitIndex, but an external iterator can be passed.
+#define GetFirstSetBitIndexExt(value, max, it)                                                                                             \
+    ({                                                                                                                                     \
+        s32 res;                                                                                                                           \
+                                                                                                                                           \
+        for (it = 0; it < (max); it++) {                                                                                                   \
+            if (GetBit(value, it)) {                                                                                                       \
+                break;                                                                                                                     \
+            }                                                                                                                              \
+        }                                                                                                                                  \
+                                                                                                                                           \
+        res = it;                                                                                                                          \
+    })
+
+// Get the index to the first set bit in a given value.
+#define GetFirstSetBitIndex(value, max)                                                                                                    \
+    ({                                                                                                                                     \
+        s16 bit;                                                                                                                           \
+                                                                                                                                           \
+        bit = GetFirstSetBitIndexExt(value, max, bit);                                                                                     \
+    })
+
+// Like GetFirstSetBitIndex, but expects input value to only have 1 bit set.
+#define GetSoleSetBitIndex(value, max)                                                                                                     \
+    ({                                                                                                                                     \
+        s16 bit;                                                                                                                           \
+                                                                                                                                           \
+        for (bit = 0; bit < (max); bit++) {                                                                                                \
+            if ((value) == (1 << bit)) {                                                                                                   \
+                break;                                                                                                                     \
+            }                                                                                                                              \
+        }                                                                                                                                  \
+                                                                                                                                           \
+        bit;                                                                                                                               \
+    })
 
 // 60 is not exactly true as the GBA's FPS, but it's what they went
 // with for the calculation

src/game/stage/intro.c

@@ -786,7 +786,7 @@ static void Task_IntroColorAnimation(void)
         }
     }
 
-    gUnknown_03002A80 = 2;
+    gUnknown_03002A80 = 2 * sizeof(int_vcount);
     gUnknown_03002878 = (void *)&REG_WIN0H;
 
     gFlags |= FLAGS_4;