From f01ad3c1034aa1b4fda432a720093b1b7b82c25a Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Fri, 2 Oct 2020 17:35:28 +1000
Subject: [PATCH] Replace GBI magic numbers with constants

---
 src/game/game_1531a0.c | 13 +++++++------
 src/game/game_167ae0.c |  4 ++--
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/game/game_1531a0.c b/src/game/game_1531a0.c
index 86c88e543..16a644be6 100644
--- a/src/game/game_1531a0.c
+++ b/src/game/game_1531a0.c
@@ -294,9 +294,9 @@ glabel func0f153628
 Gfx *func0f153780(Gfx *gdl)
 {
 	gDPPipeSync(gdl++);
-	gDPSetColorDither(gdl++, 0x00000040);
-	gDPSetTexturePersp(gdl++, 0x00080000);
-	gDPSetTextureLOD(gdl++, 0x00010000);
+	gDPSetColorDither(gdl++, G_CD_BAYER);
+	gDPSetTexturePersp(gdl++, G_TP_PERSP);
+	gDPSetTextureLOD(gdl++, G_TL_LOD);
 
 	return gdl;
 }
@@ -304,8 +304,9 @@ Gfx *func0f153780(Gfx *gdl)
 Gfx *func0f1537dc(Gfx *gdl, u32 colour)
 {
 	gDPPipeSync(gdl++);
-	gDPSetRenderMode(gdl++, 0x00500000, 0x4240);
-	gDPSetCombine(gdl++, 0xffffff, 0xfffdf6fb);
+    gDPSetRenderMode(gdl++, G_RM_XLU_SURF, G_RM_XLU_SURF2);
+    gDPSetCombineMode(gdl++, G_CC_PRIMITIVE, G_CC_PRIMITIVE);
+
 	gDPSetPrimColor(gdl++, 0, 0, colour);
 
 	return gdl;
@@ -313,7 +314,7 @@ Gfx *func0f1537dc(Gfx *gdl, u32 colour)
 
 Gfx *func0f153838(Gfx *gdl)
 {
-	gDPSetCombine(gdl++, 0xff97ff, 0xff2dfeff);
+	gDPSetCombineLERP(gdl++, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0);
 
 	return gdl;
 }
diff --git a/src/game/game_167ae0.c b/src/game/game_167ae0.c
index fd446449a..74ee776c5 100644
--- a/src/game/game_167ae0.c
+++ b/src/game/game_167ae0.c
@@ -523,8 +523,8 @@ Gfx *fadeRender(Gfx *gdl)
 	}
 
 	gDPPipeSync(gdl++);
-	gDPSetRenderMode(gdl++, 0x500000, 0x4340);
-	gDPSetCombine(gdl++, 0xffffff, 0xfffdf6fb);
+	gDPSetRenderMode(gdl++, G_RM_CLD_SURF, G_RM_CLD_SURF2);
+    gDPSetCombineMode(gdl++, G_CC_PRIMITIVE, G_CC_PRIMITIVE);
 	gDPSetPrimColor(gdl++, 0, 0, colour);
 
 	gDPFillRectangle(gdl++,