fix merge

5 files changed, 7 insertions, 46 deletions

diff --git a/src/engine/fox_game.c b/src/engine/fox_game.c
index 6e522111..1af20305 100644
--- a/src/engine/fox_game.c
+++ b/src/engine/fox_game.c
@@ -377,11 +377,7 @@ void Game_Update(void) {
             case GSTATE_SHOW_LOGO:
                 RCP_SetupDL(&gMasterDisp, SETUPDL_76);
                 gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 255);
-<<<<<<< HEAD
                 Lib_TextureRect_IA8(&gMasterDisp, gNintendoLogo, 128, 74, 100.0f, 86.0f, 1.0f, 1.0f);
-=======
-                TextureRect_IA8(&gMasterDisp, gNintendoLogo, 128, 74, 100.0f, 86.0f, 1.0f, 1.0f);
->>>>>>> edd7dba2 (Fixed all remaining compilation issues)
                 gGameState++;
                 break;
 
@@ -401,11 +397,7 @@ void Game_Update(void) {
             case GSTATE_LOGO_WAIT:
                 RCP_SetupDL(&gMasterDisp, SETUPDL_76);
                 gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 255);
-<<<<<<< HEAD
                 Lib_TextureRect_IA8(&gMasterDisp, gNintendoLogo, 128, 74, 100.0f, 86.0f, 1.0f, 1.0f);
-=======
-                TextureRect_IA8(&gMasterDisp, gNintendoLogo, 128, 74, 100.0f, 86.0f, 1.0f, 1.0f);
->>>>>>> edd7dba2 (Fixed all remaining compilation issues)
                 break;
 
             case GSTATE_START:
diff --git a/src/engine/fox_hud.c b/src/engine/fox_hud.c
index c6d47f8f..65f35841 100644
--- a/src/engine/fox_hud.c
+++ b/src/engine/fox_hud.c
@@ -585,7 +585,8 @@ void HUD_VenomTitleCard_Draw(void) {
         RCP_SetupDL(&gMasterDisp, SETUPDL_76);
         gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
 
-        Lib_TextureRect_IA8(&gMasterDisp, D_800D1C9C[i], D_800D1CA4[i], 19, D_800D1CB4[i], D_800D1CBC[i] - 28.0f, 1.0f,
+        Lib_TextureRect_IA8(&gMasterDisp, sVenomTitleCardDLs[i], sVenomTitleCardWidths[i], 19, sVenomTitleCardWidths[i],
+                            sVenomTitleCardxPos[i] - 28.0f, 1.0f,
                          1.0f);
     }
 }
@@ -663,7 +664,8 @@ void HUD_TitleCard_Draw(f32 x, f32 y) {
         HUD_VenomTitleCard_Draw();
     }
 
-    Lib_TextureRect_IA8(&gMasterDisp, sLevelTitleCard[j].titleCardTex, sLevelTitleCard[j].titleCardWidth, sLevelTitleCard[j].titleCardHeight, x2, y2, 1.0f,
+    Lib_TextureRect_IA8(&gMasterDisp, sLevelTitleCard[levelIdx].titleCardTex, sLevelTitleCard[levelIdx].titleCardWidth,
+                        sLevelTitleCard[levelIdx].titleCardHeight, x2, y2, 1.0f,
                      1.0f);
 
     if ((gSavedObjectLoadIndex == 0) && (gAllRangeCheckpoint == 0) && (gCurrentLevel != LEVEL_VENOM_ANDROSS) &&
@@ -2699,7 +2701,7 @@ void HUD_VsModePortraitTex_Draw(f32 xPos, f32 yPos, f32 scale, s32 idx) {
     };
     s32 i;
 
-    Lib_TextureRect_RGBA16(&gMasterDisp, sVsModeFaceDL[arg3], 44, 44, xPos, yPos, scale, scale);
+    Lib_TextureRect_RGBA16(&gMasterDisp, sVsModeFaceDL[idx], 44, 44, xPos, yPos, scale, scale);
 }
 
 void HUD_EdgeArrows_Draw(s32 idx, bool arg1) {
diff --git a/src/engine/fox_load.c b/src/engine/fox_load.c
index 7c05f19c..63f36c6b 100644
--- a/src/engine/fox_load.c
+++ b/src/engine/fox_load.c
@@ -29,18 +29,11 @@ void Load_RomFile(void* vRomAddress, void* dest, ptrdiff_t size) {
 
     Lib_FillScreen(true);
     sFillTimer = 3;
-<<<<<<< HEAD
     gGameStandby = true;
 }
 
 u8 Load_SceneFiles(Scene* scene) {
-=======
-    // D_game_80161A39 = true;
-}
-
-u8 Load_SceneFiles(Scene* scene) {
 #if 1
->>>>>>> edd7dba2 (Fixed all remaining compilation issues)
     sCurrentScene = *scene;
     return true;
 #else
diff --git a/src/engine/fox_radio.c b/src/engine/fox_radio.c
index 72a5b989..48ddb59e 100644
--- a/src/engine/fox_radio.c
+++ b/src/engine/fox_radio.c
@@ -427,17 +427,10 @@ void func_radio_800BAAE8(void) {
         gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 255);
 
         if (mirror) {
-<<<<<<< HEAD
             Lib_TextureRect_RGBA16_MirX(&gMasterDisp, radioPortraitTex, 44, 44, gRadioPortraitPosX,
                                      gRadioPortraitPosY + 20.0f + sp38 + gRadioPortraitScaleY, 1.0f, gRadioPortraitScaleY);
         } else {
             Lib_TextureRect_RGBA16(&gMasterDisp, radioPortraitTex, 44, 44, gRadioPortraitPosX,
-=======
-            TextureRect_RGBA16_MirX(&gMasterDisp, radioPortraitTex, 44, 44, gRadioPortraitPosX,
-                                     gRadioPortraitPosY + 20.0f + sp38 + gRadioPortraitScaleY, 1.0f, gRadioPortraitScaleY);
-        } else {
-            TextureRect_RGBA16(&gMasterDisp, radioPortraitTex, 44, 44, gRadioPortraitPosX,
->>>>>>> edd7dba2 (Fixed all remaining compilation issues)
                                 gRadioPortraitPosY + 20.0f + sp38 + gRadioPortraitScaleY, 1.0f, gRadioPortraitScaleY);
         }
     }
diff --git a/src/engine/fox_std_lib.c b/src/engine/fox_std_lib.c
index 8270dc08..30857390 100644
--- a/src/engine/fox_std_lib.c
+++ b/src/engine/fox_std_lib.c
@@ -311,7 +311,7 @@ void Animation_FindBoundingBox(Gfx* dList, s32 len, Vec3f* min, Vec3f* max, s32*
                                           vtxCount, vtxList);
                 break;
             case G_VTX:
-                *vtxList = SEGMENTED_TO_VIRTUAL(*var_s0 & 0xFFFFFFFF);
+                // *vtxList = SEGMENTED_TO_VIRTUAL(*var_s0 & 0xFFFFFFFF);
                 *vtxCount = (*var_s0 >> 0x30) & 0xF;
                 break;
             case G_TRI1:
@@ -1176,28 +1176,9 @@ void Graphics_DisplaySmallText(s32 xPos, s32 yPos, f32 xScale, f32 yScale, char*
                     } else {
                         xPosCurrent += 8.0f * xScale;
                     }
-                    TextureRect_8bIA(&gMasterDisp, sSmallCharTex[var_t0], width, 8, xPosCurrent, yPos, xScale, yScale);
-                    if (1) {}
-                }
-                switch (text[0]) {
-                    case '!':
-                    case ':':
-                    case 'I':
-                        xPosCurrent += 4.0f * xScale;
-                        break;
-                    case '-':
-                        xPosCurrent += 6.0f * xScale;
-                        break;
-                    default:
-                        if (var_t0 > 29) {
-                            xPosCurrent += 9.0f * xScale;
-                        } else {
-                            xPosCurrent += 8.0f * xScale;
-                        }
-                }
             }
-            text++;
         }
+        text++;
     }
 }