From 336e3d381456cd286750381269f740503072b4ba Mon Sep 17 00:00:00 2001 From: Prince Frizzy Date: Thu, 2 Feb 2023 11:47:05 -0500 Subject: [PATCH] Fix Bomb-Ombs inherting an incorrect geometry mode and a incorrect combine mode from other objects. --- actors/bobomb/model.inc.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/actors/bobomb/model.inc.c b/actors/bobomb/model.inc.c index 31af0eef..0b7f291e 100644 --- a/actors/bobomb/model.inc.c +++ b/actors/bobomb/model.inc.c @@ -279,6 +279,9 @@ static const Vtx bobomb_seg8_vertex_08023190[] = { // 0x08023270 - 0x08023378 const Gfx bobomb_seg8_dl_08023270[] = { + gsDPPipeSync(), + gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE), + gsSPSetGeometryMode(G_LIGHTING), gsSPLight(&bobomb_seg8_lights_08022DE8.l, 1), gsSPLight(&bobomb_seg8_lights_08022DE8.a, 2), gsSPVertex(bobomb_seg8_vertex_08022E30, 16, 0), @@ -302,6 +305,9 @@ const Gfx bobomb_seg8_dl_08023270[] = { // 0x08023378 - 0x08023480 const Gfx bobomb_seg8_dl_08023378[] = { + gsDPPipeSync(), + gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE), + gsSPSetGeometryMode(G_LIGHTING), gsSPLight(&bobomb_seg8_lights_08022DE8.l, 1), gsSPLight(&bobomb_seg8_lights_08022DE8.a, 2), gsSPVertex(bobomb_seg8_vertex_08022F70, 16, 0), @@ -325,6 +331,9 @@ const Gfx bobomb_seg8_dl_08023378[] = { // 0x08023480 - 0x08023528 const Gfx bobomb_seg8_dl_08023480[] = { + gsDPPipeSync(), + gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE), + gsSPSetGeometryMode(G_LIGHTING), gsSPLight(&bobomb_seg8_lights_08022E00.l, 1), gsSPLight(&bobomb_seg8_lights_08022E00.a, 2), gsSPVertex(bobomb_seg8_vertex_080230B0, 14, 0),