From 669fff8759859306d6ca8ae71f40073a934a188f Mon Sep 17 00:00:00 2001 From: Alejandro Javier Asenjo Nitti Date: Thu, 15 Aug 2024 15:31:20 -0300 Subject: [PATCH] SzGreatFox --- include/sf64object.h | 8 ++++---- src/overlays/ovl_i4/fox_sz.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/sf64object.h b/include/sf64object.h index af326665..6b396c61 100644 --- a/include/sf64object.h +++ b/include/sf64object.h @@ -1111,9 +1111,9 @@ typedef Sprite Ve1BossTrigger2; typedef Sprite Ve1BossTrigger3; typedef Sprite Ve1BossTrigger4; typedef Sprite GfoxTarget; -typedef Actor CoGaruda1; -typedef Actor CoGaruda2; -typedef Actor CoGaruda3; +typedef Actor CoGaruda1; // Robot that pushes buildings. +typedef Actor CoGaruda2; // Robot that throws I-Beams. +typedef Actor CoGaruda3; // Robot that spins I-Beams. typedef Actor CoGarudaDestroy; typedef Actor MeMolarRock; typedef Actor MeMeteor1; @@ -1248,7 +1248,7 @@ typedef Boss BoBase; typedef Boss BoBaseShield; typedef Boss BoBaseCore; typedef Boss Ve2Base; -typedef Boss GreatFoxSZ; +typedef Boss SzGreatFox; typedef Boss SyShogun; typedef Boss SoVulkain; typedef Boss KaSaucerer; diff --git a/src/overlays/ovl_i4/fox_sz.c b/src/overlays/ovl_i4/fox_sz.c index 254a2ebc..2bcbf72a 100644 --- a/src/overlays/ovl_i4/fox_sz.c +++ b/src/overlays/ovl_i4/fox_sz.c @@ -1141,7 +1141,7 @@ void SectorZ_LevelComplete(Player* player) { ActorCutscene* falco = &gActors[1]; ActorCutscene* peppy = &gActors[2]; ActorCutscene* slippy = &gActors[3]; - GreatFoxSZ* greatFox = &gBosses[SZ_GREAT_FOX]; + SzGreatFox* greatFox = &gBosses[SZ_GREAT_FOX]; f32 direction; PRINTF("Enm->time0 %d\n"); @@ -1758,7 +1758,7 @@ Vec3f sFireSmokeOffsetPos[] = { { 612.0f, 409.0f, 386.0f }, { 1027.0f, 141.0f, 3 { 600.0f, 385.0f, 380.0f }, { 776.0f, 245.0f, 384.0f }, { 376.0f, 123.0f, 384.0f }, { 428.0f, 174.0f, 383.0f }, { 722.0f, 306.0f, 383.0f }, { 530.0f, 380.0f, 385.0f } }; -void SectorZ_SzGreatFox_Update(GreatFoxSZ* this) { +void SectorZ_SzGreatFox_Update(SzGreatFox* this) { s32 i; s32 j; f32 x; @@ -1834,7 +1834,7 @@ void SectorZ_SzGreatFox_Update(GreatFoxSZ* this) { } } -void SectorZ_SzGreatFox_Draw(GreatFoxSZ* this) { +void SectorZ_SzGreatFox_Draw(SzGreatFox* this) { gSPFogPosition(gMasterDisp++, gFogNear, 1005); Cutscene_DrawGreatFox(); } @@ -1844,7 +1844,7 @@ void SectorZ_LoadLevelObjects(void) { s32 j; Actor* actor; Scenery360* scenery360; - GreatFoxSZ* greatFox = &gBosses[SZ_GREAT_FOX]; + SzGreatFox* greatFox = &gBosses[SZ_GREAT_FOX]; gLevelObjects = SEGMENTED_TO_VIRTUAL(gLevelObjectInits[gCurrentLevel]);