From 38fdbb6ec3c395c2f1181b5ce0e873e6cc68f7d1 Mon Sep 17 00:00:00 2001
From: Arceveti <73617174+Arceveti@users.noreply.github.com>
Date: Fri, 17 Sep 2021 17:32:11 -0700
Subject: [PATCH] Add F3DEX2_Rej

---
 lib/rsp.s                       | 14 ++++++++++++--
 src/game/rendering_graph_node.c |  8 ++++++--
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/lib/rsp.s b/lib/rsp.s
index a90f2a1c..7afe22e6 100644
--- a/lib/rsp.s
+++ b/lib/rsp.s
@@ -43,6 +43,11 @@ glabel gspF3DZEX2_PosLight_fifoTextStart
 	.incbin "lib/PR/f3dzex/F3DZEX.bin"
 glabel gspF3DZEX2_PosLight_fifoTextEnd
 
+.balign 16
+glabel gspF3DEX2_Rej_fifoTextStart
+	.incbin "lib/PR/f3dex2/F3DEX2_Rej.bin"
+glabel gspF3DEX2_Rej_fifoTextEnd
+
 .balign 16
 glabel gspF3DLX2_Rej_fifoTextStart
 	.incbin "lib/PR/f3dex2/F3DLX2_Rej.bin"
@@ -192,12 +197,17 @@ glabel gspFast3D_fifoDataEnd
 glabel gspF3DEX2_fifoDataStart
 	.incbin "lib/PR/f3dex2/F3DEX2_data.bin"
 glabel gspF3DEX2_fifoDataEnd
-	
+
 .balign 16
 glabel gspF3DZEX2_PosLight_fifoDataStart
 	.incbin "lib/PR/f3dzex/F3DZEX_data.bin"
 glabel gspF3DZEX2_PosLight_fifoDataEnd
-	
+
+.balign 16
+glabel gspF3DEX2_Rej_fifoDataStart
+	.incbin "lib/PR/f3dex2/F3DEX2_Rej_data.bin"
+glabel gspF3DEX2_Rej_fifoDataEnd
+
 .balign 16
 glabel gspF3DLX2_Rej_fifoDataStart
 	.incbin "lib/PR/f3dex2/F3DLX2_Rej_data.bin"
diff --git a/src/game/rendering_graph_node.c b/src/game/rendering_graph_node.c
index 7d8afe7c..84dd7be9 100644
--- a/src/game/rendering_graph_node.c
+++ b/src/game/rendering_graph_node.c
@@ -168,7 +168,11 @@ static void geo_process_master_list_sub(struct GraphNodeMasterList *node) {
     //Load rejection on pass 2. ZEX is loaded afterwards.
     if (renderPhase == 0 || renderPhase == 2)
     {
-        gSPLoadUcodeL(gDisplayListHead++, gspF3DLX2_Rej_fifo);
+        if (gIsConsole) {
+            gSPLoadUcodeL(gDisplayListHead++, gspF3DLX2_Rej_fifo);
+        } else {
+            gSPLoadUcodeL(gDisplayListHead++, gspF3DEX2_Rej_fifo);
+        }
         init_rcp(KEEP_ZBUFFER);
         gSPClipRatio(gDisplayListHead++, FRUSTRATIO_2);
     }
@@ -213,7 +217,7 @@ static void geo_process_master_list_sub(struct GraphNodeMasterList *node) {
     switch (renderPhase)
     {
     case 0: renderPhase++; j = 0; i = 0; goto loopBegin;
-    case 1: renderPhase++; j = 1;  i = 5; goto loopBegin;
+    case 1: renderPhase++; j = 1; i = 5; goto loopBegin;
     }
     if (enableZBuffer != 0)
     {