diff options
| author | Sonic Dreamcaster <alejandro.asenjo88@gmail.com> | 2024-09-17 21:07:20 -0300 |
|---|---|---|
| committer | Sonic Dreamcaster <alejandro.asenjo88@gmail.com> | 2024-09-17 21:07:20 -0300 |
| commit | 684f17c27fef32046246888293e258feffeea293 (patch) | |
| tree | aeece4e117884b7f8f50887e0f0340a837f0a390 /src/engine/fox_game.c | |
| parent | 63254ffc5e2693e727617af7a20e16e22e95bb22 (diff) | |
fix merge
Diffstat (limited to 'src/engine/fox_game.c')
| -rw-r--r-- | src/engine/fox_game.c | 8 |
1 files changed, 0 insertions, 8 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: |