diff --git a/include/sprite_util.h b/include/sprite_util.h
index ffd771b5a4..bb3f065a5a 100644
--- a/include/sprite_util.h
+++ b/include/sprite_util.h
@@ -35,7 +35,7 @@ void SpriteResourcesHeader_Init(CellActorResourceData *resourceHeader,
     int animResourceID,
     int mcellResourceID,
     int manimResourceID,
-    int vramTransfer,
+    BOOL vramTransfer,
     int priority,
     SpriteResourceCollection *charResources,
     SpriteResourceCollection *plttResources,
diff --git a/src/render_oam.c b/src/render_oam.c
index 3d3d2874c3..d07fe8392d 100644
--- a/src/render_oam.c
+++ b/src/render_oam.c
@@ -9,6 +9,11 @@
 #include "heap.h"
 #include "render_view.h"
 
+#define NUM_HW_OAM_ATTR            128
+#define NUM_HW_OAM_ATTR_RESERVED   4
+#define NUM_HW_OAM_AFFINES         32
+#define NUM_HW_OAM_AFFINE_RESERVED 1
+
 typedef struct OamManager {
     NNSG2dOamManagerInstance mainScreenOam;
     NNSG2dOamManagerInstance subScreenOam;
@@ -31,11 +36,11 @@ void RenderOam_Init(int mainOamStart, int mainOamCount, int mainAffineOamStart,
     int trueMainAffineOamCount;
 
     // The first 4 OAM managers are reserved.
-    if (mainOamStart < 4) {
-        trueMainOamStart = 4;
+    if (mainOamStart < NUM_HW_OAM_ATTR_RESERVED) {
+        trueMainOamStart = NUM_HW_OAM_ATTR_RESERVED;
 
-        if (mainOamCount > 124) {
-            trueMainOamCount = mainOamCount - (4 - mainOamStart);
+        if (mainOamCount > NUM_HW_OAM_ATTR - NUM_HW_OAM_ATTR_RESERVED) {
+            trueMainOamCount = mainOamCount - (NUM_HW_OAM_ATTR_RESERVED - mainOamStart);
         } else {
             trueMainOamCount = mainOamCount;
         }
@@ -45,11 +50,11 @@ void RenderOam_Init(int mainOamStart, int mainOamCount, int mainAffineOamStart,
     }
 
     // The first affine-enabled manager is reserved.
-    if (mainAffineOamStart < 1) {
-        trueMainAffineOamStart = 1;
+    if (mainAffineOamStart < NUM_HW_OAM_AFFINE_RESERVED) {
+        trueMainAffineOamStart = NUM_HW_OAM_AFFINE_RESERVED;
 
-        if (mainAffineOamCount > 30) {
-            trueMainAffineOamCount = mainAffineOamCount - (1 - mainAffineOamStart);
+        if (mainAffineOamCount > NUM_HW_OAM_AFFINES - NUM_HW_OAM_AFFINE_RESERVED - 1) {
+            trueMainAffineOamCount = mainAffineOamCount - (NUM_HW_OAM_AFFINE_RESERVED - mainAffineOamStart);
         } else {
             trueMainAffineOamCount = mainAffineOamCount;
         }
diff --git a/src/render_view.c b/src/render_view.c
index 1035ef9da6..1c6f6e16f3 100644
--- a/src/render_view.c
+++ b/src/render_view.c
@@ -39,7 +39,7 @@ BOOL IsObjectInView(const NNSG2dCellData *cellData, const MtxFx32 *objectCoords,
     fx32 minX, maxX;
     fx32 tmp;
 
-    if (NNS_G2dCellHasBR(cellData) == 1) {
+    if (NNS_G2dCellHasBR(cellData) == TRUE) {
         minY = boundingRect->minY << FX32_SHIFT;
         maxY = boundingRect->maxY << FX32_SHIFT;
         minX = boundingRect->minX << FX32_SHIFT;
diff --git a/src/sprite_util.c b/src/sprite_util.c
index 9c8efaaef9..f1d57d28c7 100644
--- a/src/sprite_util.c
+++ b/src/sprite_util.c
@@ -15,7 +15,7 @@
 
 #define RESDAT_TABLE_TERMINATOR 0xFFFFFFFE
 
-void SpriteResourcesHeader_Init(CellActorResourceData *resourceHeader, int charResourceID, int plttResourceID, int cellResourceID, int animResourceID, int mcellResourceID, int manimResourceID, int vramTransfer, int priority, SpriteResourceCollection *charResources, SpriteResourceCollection *plttResources, SpriteResourceCollection *cellResources, SpriteResourceCollection *animResources, SpriteResourceCollection *mcellResources, SpriteResourceCollection *manimResources)
+void SpriteResourcesHeader_Init(CellActorResourceData *resourceHeader, int charResourceID, int plttResourceID, int cellResourceID, int animResourceID, int mcellResourceID, int manimResourceID, BOOL vramTransfer, int priority, SpriteResourceCollection *charResources, SpriteResourceCollection *plttResources, SpriteResourceCollection *cellResources, SpriteResourceCollection *animResources, SpriteResourceCollection *mcellResources, SpriteResourceCollection *manimResources)
 {
     SpriteResource *charResource;
     SpriteResource *plttResource;