diff options
| author | KiritoDv <kiritodev01@gmail.com> | 2024-05-20 22:29:23 -0600 |
|---|---|---|
| committer | Sonic Dreamcaster <alejandro.asenjo88@gmail.com> | 2024-09-17 20:20:36 -0300 |
| commit | be38e531769b03e50f5d06b2a9324864ad138e3a (patch) | |
| tree | 69112a9046e57ea7c6f13fe5144bc70b12d6e35f /src/engine/fox_game.c | |
| parent | 69cfe9b2c44c54a5a2beaf004fe6ee7190efe05f (diff) | |
Bump LUS
Diffstat (limited to 'src/engine/fox_game.c')
| -rw-r--r-- | src/engine/fox_game.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/engine/fox_game.c b/src/engine/fox_game.c index 5c55069d..adfcfa89 100644 --- a/src/engine/fox_game.c +++ b/src/engine/fox_game.c @@ -374,7 +374,11 @@ 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; @@ -394,7 +398,11 @@ 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: |