mirror/Starship
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Starship synced 2026-06-07 12:17:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

export configuration for ast_andross (#189)

Browse Source 
* export configuration for ast_andross

* format

* assets yaml
This commit is contained in:
inspectredc
2024-04-01 02:53:09 +01:00
committed by GitHub
parent 8b4bb6d943
commit 2ef09bcf5d
13 changed files with 381 additions and 254 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/fox_bg.c
+2 -2
View File
@@ -391,7 +391,7 @@ void func_8003E1E8(void) {
Matrix_Scale(gGfxMatrix, 11.0f, 11.0f, 1.0f, 1);
Matrix_RotateZ(gGfxMatrix, (gPlayer[0].unk_034 + (gGameFrameCount * 1.5f)) * M_DTOR, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_C039208);
gSPDisplayList(gMasterDisp++, D_ANDROSS_C039208);
Matrix_Pop(&gGfxMatrix);
if (D_80177AB0 != 5) {
Matrix_Push(&gGfxMatrix);
@@ -399,7 +399,7 @@ void func_8003E1E8(void) {
Matrix_RotateZ(gGfxMatrix, (gPlayer[0].unk_034 + (gGameFrameCount * -1.3f)) * M_DTOR,
1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_C039208);
gSPDisplayList(gMasterDisp++, D_ANDROSS_C039208);
Matrix_Pop(&gGfxMatrix);
}
}
src/main/fox_edata_1C.c
+7 -7
View File
@@ -219,12 +219,12 @@ ObjectInfo D_800CC124[0x190] = {
/* OBJ_80_128 */ {(void*) D_VE1_9003F50, 0, (ObjectFunc) NULL, D_601B6C4, 3200.0f, 0, 0, 42, 0, 0.0f, 0 },
/* OBJ_80_129 */ {(void*) D_VE1_900F060, 0, (ObjectFunc) NULL, D_F32_601B710, 3200.0f, 0, 0, 42, 0, 0.0f, 0 },
/* OBJ_80_130 */ {(void*) D_VE1_900F1D0, 0, (ObjectFunc) NULL, D_601B75C, 3200.0f, 0, 0, 42, 0, 0.0f, 0 },
/* OBJ_80_131 */ {(void*) func_i6_801935D4, 1, (ObjectFunc) func_i6_8019356C, D_C038BD8, 500.0f, 0, 0, 41, 0, 0.0f, 0 },
/* OBJ_80_132 */ {(void*) func_i6_8019350C, 1, (ObjectFunc) func_i6_80193380, D_C038A48, 500.0f, 0, 0, 41, 0, 0.0f, 0 },
/* OBJ_80_131 */ {(void*) func_i6_801935D4, 1, (ObjectFunc) func_i6_8019356C, D_ANDROSS_C038BD8, 500.0f, 0, 0, 41, 0, 0.0f, 0 },
/* OBJ_80_132 */ {(void*) func_i6_8019350C, 1, (ObjectFunc) func_i6_80193380, D_ANDROSS_C038A48, 500.0f, 0, 0, 41, 0, 0.0f, 0 },
/* OBJ_80_133 */ {(void*) D_TR_60030F0, 0, (ObjectFunc) NULL, D_TR_6009CC4, 1000.0f, 0, 0, 20, 0, 0.0f, 0 },
/* OBJ_80_134 */ {(void*) D_6003000, 0, (ObjectFunc) NULL, D_C038BA4, 0.0f, 0, 0, 41, 1, 0.0f, 0 },
/* OBJ_80_135 */ {(void*) D_TI_6006890, 0, (ObjectFunc) NULL, D_C038B40, 0.0f, 0, 0, 41, 1, 0.0f, 0 },
/* OBJ_80_136 */ {(void*) D_6002990, 0, (ObjectFunc) NULL, D_C038B40, 0.0f, 0, 0, 41, 1, 0.0f, 0 },
/* OBJ_80_134 */ {(void*) D_6003000, 0, (ObjectFunc) NULL, D_ANDROSS_C038BA4, 0.0f, 0, 0, 41, 1, 0.0f, 0 },
/* OBJ_80_135 */ {(void*) D_TI_6006890, 0, (ObjectFunc) NULL, D_ANDROSS_C038B40, 0.0f, 0, 0, 41, 1, 0.0f, 0 },
/* OBJ_80_136 */ {(void*) D_6002990, 0, (ObjectFunc) NULL, D_ANDROSS_C038B40, 0.0f, 0, 0, 41, 1, 0.0f, 0 },
/* OBJ_80_137 */ {(void*) D_6004170, 0, (ObjectFunc) NULL, D_800CBF34, 0.0f, 0, 0, 0, 1, 0.0f, 0 },
/* OBJ_80_138 */ {(void*) D_versus_3017600, 0, (ObjectFunc) NULL, D_versus_302EE64, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_139 */ {(void*) D_versus_3017600, 0, (ObjectFunc) NULL, D_versus_302EE80, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
@@ -408,8 +408,8 @@ ObjectInfo D_800CC124[0x190] = {
/* OBJ_BOSS_317 */ {(void*) func_i4_80193B1C, 1, (ObjectFunc) func_i4_80193718, D_601115C, 0.0f, 0, 0, 40, 1, 0.0f, 10 },
/* OBJ_BOSS_AQ */ {(void*) func_i3_801B4D84, 2, (ObjectFunc) func_i3_801B134C, D_AQ_6030F74, 10000.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_319 */ {(void*) func_i1_801985E4, 1, (ObjectFunc) func_i1_80194398,D_i1_8019A9B8, 3000.0f, 0, 0, 40, 1, 0.0f, 10 },
/* OBJ_BOSS_320 */ {(void*) func_i6_801928C8, 2, (ObjectFunc) func_i6_8018DBF0, D_C038DC0, 10000.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_321 */ {(void*) func_i6_8018B8C0, 1, (ObjectFunc) func_i6_80189B70, D_C038F24, 10000.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_320 */ {(void*) func_i6_801928C8, 2, (ObjectFunc) func_i6_8018DBF0, D_ANDROSS_C038DC0, 10000.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_321 */ {(void*) func_i6_8018B8C0, 1, (ObjectFunc) func_i6_80189B70, D_ANDROSS_C038F24, 10000.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_ITEM_LASERS */ {(void*) func_8005CC9C, 1, (ObjectFunc) func_80067F6C, D_800CBFA8, 700.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_ITEM_CHECKPOINT */ {(void*) func_8005C5F0, 1, (ObjectFunc) func_80068914, D_800CBF38, 700.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_ITEM_SILVER_RING */ {(void*) func_8005C900, 1, (ObjectFunc) func_80068020, D_800CBF54, 700.0f, 0, 0, 0, 0, 0.0f, 0 },
src/main/fox_edisplay.c
+1 -1
View File
@@ -1791,7 +1791,7 @@ void TexturedLine_Draw(void) {
Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -200.0f, 1);
Matrix_RotateZ(gGfxMatrix, gGameFrameCount * 25.0f * M_DTOR, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_C017440);
gSPDisplayList(gMasterDisp++, D_ANDROSS_C017440);
}
} else {
Matrix_SetGfxMtx(&gMasterDisp);
src/main/fox_enmy.c
+4 -4
View File
@@ -22,9 +22,9 @@ u8 D_80161684;
#include "fox_enmy_assets.h"
ObjectInit* D_800CFDA0[] = {
D_CO_60371A4, D_ME_6026CC4, D_SX_602A164, D_A6_6023F64, D_A6_60287A4, D_SY_602E4F4, D_VE1_6007E74,
D_SO_601F234, D_ZO_6026714, D_C035154, D_TR_6006AA4, D_MA_6031000, D_TI_6006C60, D_AQ_602E5C8,
D_FO_600EAD4, NULL, D_KA_6011044, D_BO_600FF74, D_SZ_6006EB4, D_VE2_600FF74, D_versus_302DE3C,
D_CO_60371A4, D_ME_6026CC4, D_SX_602A164, D_A6_6023F64, D_A6_60287A4, D_SY_602E4F4, D_VE1_6007E74,
D_SO_601F234, D_ZO_6026714, D_ANDROSS_C035154, D_TR_6006AA4, D_MA_6031000, D_TI_6006C60, D_AQ_602E5C8,
D_FO_600EAD4, NULL, D_KA_6011044, D_BO_600FF74, D_SZ_6006EB4, D_VE2_600FF74, D_versus_302DE3C,
};
s32 D_800CFDF4[] = {
OBJ_80_0,
@@ -529,7 +529,7 @@ void func_80062664(void) {
} else if ((gCurrentLevel == LEVEL_SECTOR_X) && (D_8017827C == 1)) {
D_80178310 = SEGMENTED_TO_VIRTUAL(D_SX_602F18C);
} else if ((gCurrentLevel == LEVEL_VENOM_ANDROSS) && (D_8017827C == 1)) {
D_80178310 = SEGMENTED_TO_VIRTUAL(D_C0356A4);
D_80178310 = SEGMENTED_TO_VIRTUAL(D_ANDROSS_C0356A4);
} else if ((gCurrentLevel == LEVEL_VENOM_1) && (D_8017827C == 1)) {
D_80178310 = SEGMENTED_TO_VIRTUAL(D_6010088);
} else {
src/main/fox_enmy2.c
+1 -1
View File
@@ -994,7 +994,7 @@ void func_8006D36C(Actor* actor) {
switch (gCurrentLevel) {
case LEVEL_VENOM_ANDROSS:
var_v1 = SEGMENTED_TO_VIRTUAL(D_C037E3C);
var_v1 = SEGMENTED_TO_VIRTUAL(D_ANDROSS_C037E3C);
break;
case LEVEL_CORNERIA:
var_v1 = SEGMENTED_TO_VIRTUAL(D_CO_603D9E8);
src/main/fox_hud.c
+9 -9
View File
@@ -564,15 +564,15 @@ s32 func_800863C8(void) {
}
UnkStruct_D_800D1AEC D_800D1AEC[] = {
{ D_500A050, 16, 15, D_CO_6000000, 128, 28 }, { D_500A140, 16, 15, D_ME_6000000, 96, 28 },
{ D_500A140, 16, 15, D_SY_6000000, 176, 12 }, { D_500A230, 16, 15, D_FO_6000000, 168, 28 },
{ D_500A230, 16, 15, D_KA_6000000, 168, 28 }, { D_500A230, 16, 15, D_AQ_6000000, 96, 13 },
{ D_500A320, 16, 15, D_SX_6000000, 176, 12 }, { D_500A320, 16, 15, D_SO_6000000, 112, 13 },
{ D_500A320, 16, 15, D_ZO_6000000, 112, 28 }, { D_500A410, 16, 15, D_TI_6000000, 96, 28 },
{ D_500A410, 16, 15, D_MA_6000000, 160, 28 }, { D_500A410, 16, 15, D_SZ_6000000, 176, 12 },
{ D_500A500, 16, 15, D_BO_6000000, 168, 19 }, { D_500A500, 16, 15, D_A6_6000000, 104, 28 },
{ D_500A5F0, 16, 15, D_VE1_6000D80, 128, 28 }, { D_500A5F0, 16, 15, D_VE2_60012D0, 128, 28 },
{ D_500A5F0, 16, 15, D_C000A80, 128, 28 }, { D_5009F60, 16, 15, D_5000D50, 80, 12 },
{ D_500A050, 16, 15, D_CO_6000000, 128, 28 }, { D_500A140, 16, 15, D_ME_6000000, 96, 28 },
{ D_500A140, 16, 15, D_SY_6000000, 176, 12 }, { D_500A230, 16, 15, D_FO_6000000, 168, 28 },
{ D_500A230, 16, 15, D_KA_6000000, 168, 28 }, { D_500A230, 16, 15, D_AQ_6000000, 96, 13 },
{ D_500A320, 16, 15, D_SX_6000000, 176, 12 }, { D_500A320, 16, 15, D_SO_6000000, 112, 13 },
{ D_500A320, 16, 15, D_ZO_6000000, 112, 28 }, { D_500A410, 16, 15, D_TI_6000000, 96, 28 },
{ D_500A410, 16, 15, D_MA_6000000, 160, 28 }, { D_500A410, 16, 15, D_SZ_6000000, 176, 12 },
{ D_500A500, 16, 15, D_BO_6000000, 168, 19 }, { D_500A500, 16, 15, D_A6_6000000, 104, 28 },
{ D_500A5F0, 16, 15, D_VE1_6000D80, 128, 28 }, { D_500A5F0, 16, 15, D_VE2_60012D0, 128, 28 },
{ D_500A5F0, 16, 15, D_ANDROSS_C000A80, 128, 28 }, { D_5009F60, 16, 15, D_5000D50, 80, 12 },
};
void func_80086444(void) {
src/main/fox_play.c
+3 -3
View File
@@ -468,9 +468,9 @@ void func_800A5844(void) {
}
EnvSettings* D_800D2F98[21] = {
&D_CO_6037160, &D_ME_6026C80, &D_SX_602A120, &D_A6_6023F20, &D_A6_6028760, &D_SY_602E4B0, &D_VE1_6007E30,
&D_SO_601F1F0, &D_ZO_60266D0, &D_C035110, &D_TR_6006A60, &D_MA_6030E30, &D_TI_6005000, &D_AQ_602E540,
&D_FO_600EA90, NULL, &D_KA_6011000, &D_BO_600FF30, &D_SZ_6006E70, &D_VE2_6014D50, &D_versus_302DD70,
&D_CO_6037160, &D_ME_6026C80, &D_SX_602A120, &D_A6_6023F20, &D_A6_6028760, &D_SY_602E4B0, &D_VE1_6007E30,
&D_SO_601F1F0, &D_ZO_60266D0, &D_ANDROSS_C035110, &D_TR_6006A60, &D_MA_6030E30, &D_TI_6005000, &D_AQ_602E540,
&D_FO_600EA90, NULL, &D_KA_6011000, &D_BO_600FF30, &D_SZ_6006E70, &D_VE2_6014D50, &D_versus_302DD70,
};
void func_800A594C(void) {
src/overlays/ovl_i6/fox_andross.c
+76 -75
View File
@@ -34,8 +34,8 @@ Vec3f D_i6_801A7F80[100];
f32 D_i6_801A8430;
static f32* D_i6_801A6760[12] = {
D_C037FCC, D_C0380C0, D_C0381B4, D_C0382A8, D_C03839C, D_C038490,
D_C038584, D_C038678, D_C03876C, D_C038860, D_C038954, D_C038954,
D_ANDROSS_C037FCC, D_ANDROSS_C0380C0, D_ANDROSS_C0381B4, D_ANDROSS_C0382A8, D_ANDROSS_C03839C, D_ANDROSS_C038490,
D_ANDROSS_C038584, D_ANDROSS_C038678, D_ANDROSS_C03876C, D_ANDROSS_C038860, D_ANDROSS_C038954, D_ANDROSS_C038954,
};
void func_i6_80187530(Actor* actor) {
@@ -86,8 +86,8 @@ void func_i6_801876FC(void) {
s32 i;
s32 j;
var_s0 = SEGMENTED_TO_VIRTUAL(&D_C039290);
var_s3 = SEGMENTED_TO_VIRTUAL(&D_C03A290);
var_s0 = SEGMENTED_TO_VIRTUAL(&D_ANDROSS_C039290);
var_s3 = SEGMENTED_TO_VIRTUAL(&D_ANDROSS_C03A290);
for (i = 0; i < 32 * 32; i += 32) {
temp_ft3 = 4.0f * __sinf((s32) (((i / 32) + (gGameFrameCount / 2)) % 32U) * (2 * M_PI / 32));
@@ -104,7 +104,7 @@ void func_i6_801878A8() {
Object_58* obj58;
s32 i;
D_80178310 = SEGMENTED_TO_VIRTUAL(&D_C0356CC);
D_80178310 = SEGMENTED_TO_VIRTUAL(&D_ANDROSS_C0356CC);
for (obj58 = gObjects58, i = 0; i < 1000; i++) {
if (D_80178310[i].id < 0) {
@@ -122,7 +122,7 @@ void func_i6_801878A8() {
obj58->obj.rot.y = D_80178310[i].rot.y;
Object_SetInfo(&obj58->info, obj58->obj.id);
if (obj58->obj.id == OBJ_80_131) {
obj58->info.hitbox = SEGMENTED_TO_VIRTUAL(&D_C038CCC);
obj58->info.hitbox = SEGMENTED_TO_VIRTUAL(&D_ANDROSS_C038CCC);
}
obj58++;
}
@@ -173,14 +173,14 @@ void func_i6_80187C5C(void) {
switch (RAND_INT(2.9f)) {
case 0:
D_80178310 = SEGMENTED_TO_VIRTUAL(&D_C036310);
D_80178310 = SEGMENTED_TO_VIRTUAL(&D_ANDROSS_C036310);
break;
case 1:
D_80178310 = SEGMENTED_TO_VIRTUAL(&D_C036B6C);
D_80178310 = SEGMENTED_TO_VIRTUAL(&D_ANDROSS_C036B6C);
break;
default:
case 2:
D_80178310 = SEGMENTED_TO_VIRTUAL(&D_C03733C);
D_80178310 = SEGMENTED_TO_VIRTUAL(&D_ANDROSS_C03733C);
break;
}
@@ -203,7 +203,7 @@ void func_i6_80187C5C(void) {
}
Object_SetInfo(&obj58->info, obj58->obj.id);
if (obj58->obj.id == OBJ_80_131) {
obj58->info.hitbox = SEGMENTED_TO_VIRTUAL(&D_C038CCC);
obj58->info.hitbox = SEGMENTED_TO_VIRTUAL(&D_ANDROSS_C038CCC);
}
obj58++;
}
@@ -782,7 +782,7 @@ void func_i6_80189B70(Boss* boss) {
func_i6_80188A4C(boss);
func_i6_80188CB8(boss);
boss->info.hitbox = SEGMENTED_TO_VIRTUAL(&D_C038F24);
boss->info.hitbox = SEGMENTED_TO_VIRTUAL(&D_ANDROSS_C038F24);
Math_SmoothStepToF(&D_800C9C30, 255.0f, 1.0f, 4.0f, 0);
Math_SmoothStepToF(&boss->unk_3F8, 10.0f, 0.2f, 0.2f, 0);
if (!(gGameFrameCount & 0x10)) {
@@ -1274,8 +1274,8 @@ void func_i6_8018BDD8(void) {
Vtx* sp74;
Vtx* sp70;
sp74 = SEGMENTED_TO_VIRTUAL(D_C038FE8);
sp70 = SEGMENTED_TO_VIRTUAL(D_C017598);
sp74 = SEGMENTED_TO_VIRTUAL(D_ANDROSS_C038FE8);
sp70 = SEGMENTED_TO_VIRTUAL(D_ANDROSS_C017598);
for (i = 0; i < 17; i++) {
if (i == 0 || i == 16) {
@@ -1545,8 +1545,8 @@ void func_i6_8018CAD4(Effect* effect) {
}
static Gfx* D_i6_801A6790[10] = {
D_C001880, D_C001880, D_C001880, D_C001880, D_C001880,
D_C001880, D_C001880, D_C001880, D_arwing_3016660, D_arwing_3015D80,
D_ANDROSS_C001880, D_ANDROSS_C001880, D_ANDROSS_C001880, D_ANDROSS_C001880, D_ANDROSS_C001880,
D_ANDROSS_C001880, D_ANDROSS_C001880, D_ANDROSS_C001880, D_arwing_3016660, D_arwing_3015D80,
};
void func_i6_8018CF98(Effect* effect) {
@@ -1936,19 +1936,19 @@ void func_i6_8018DBF0(Boss* boss) {
Math_SmoothStepToF(&boss->fwork[7], 200.0f, 1.0f, 10.0f, 0);
if (boss->timer_052 == 0) {
boss->unk_04C++;
if (boss->unk_04C >= Animation_GetFrameCount(&D_C002B08)) {
if (boss->unk_04C >= Animation_GetFrameCount(&D_ANDROSS_C002B08)) {
boss->unk_04C = 0;
}
limbCount = Animation_GetFrameData(&D_C002B08, boss->unk_04C, spD0);
limbCount = Animation_GetFrameData(&D_ANDROSS_C002B08, boss->unk_04C, spD0);
Math_SmoothStepToVec3fArray(spD0, D_i6_801A7F80, 1, limbCount, boss->fwork[9], 100.0f, 0.0f);
} else {
if (boss->timer_052 < 16) {
boss->unk_04C++;
if (boss->unk_04C >= Animation_GetFrameCount(&D_C033D98)) {
boss->unk_04C = Animation_GetFrameCount(&D_C033D98) - 1;
if (boss->unk_04C >= Animation_GetFrameCount(&D_ANDROSS_C033D98)) {
boss->unk_04C = Animation_GetFrameCount(&D_ANDROSS_C033D98) - 1;
}
}
limbCount = Animation_GetFrameData(&D_C033D98, boss->unk_04C, spD0);
limbCount = Animation_GetFrameData(&D_ANDROSS_C033D98, boss->unk_04C, spD0);
Math_SmoothStepToVec3fArray(spD0, D_i6_801A7F80, 1, limbCount, boss->fwork[9], 100.0f, 0.0f);
if (boss->timer_052 == 1) {
boss->unk_04C = 0;
@@ -1974,10 +1974,10 @@ void func_i6_8018DBF0(Boss* boss) {
Math_SmoothStepToF(&boss->fwork[4], 10.0f, 1.0f, 0.5f, 0);
Math_SmoothStepToF(&boss->fwork[9], 0.7f, 1.0f, 0.005f, 0);
boss->unk_04C++;
if (boss->unk_04C >= Animation_GetFrameCount(&D_C033780)) {
if (boss->unk_04C >= Animation_GetFrameCount(&D_ANDROSS_C033780)) {
func_i6_8018D9C0(boss);
}
limbCount = Animation_GetFrameData(&D_C033780, boss->unk_04C, spD0);
limbCount = Animation_GetFrameData(&D_ANDROSS_C033780, boss->unk_04C, spD0);
Math_SmoothStepToVec3fArray(spD0, D_i6_801A7F80, 1, limbCount, boss->fwork[9], 100.0f, 0.0f);
break;
case 3:
@@ -2021,10 +2021,10 @@ void func_i6_8018DBF0(Boss* boss) {
}
Math_SmoothStepToF(&boss->fwork[9], 1.0f, 1.0f, 0.01f, 0);
boss->unk_04C++;
if (boss->unk_04C >= Animation_GetFrameCount(&D_C029F74)) {
if (boss->unk_04C >= Animation_GetFrameCount(&D_ANDROSS_C029F74)) {
func_i6_8018D9C0(boss);
}
limbCount = Animation_GetFrameData(&D_C029F74, boss->unk_04C, spD0);
limbCount = Animation_GetFrameData(&D_ANDROSS_C029F74, boss->unk_04C, spD0);
Math_SmoothStepToVec3fArray(spD0, D_i6_801A7F80, 1, limbCount, boss->fwork[9], 100.0f, 0.0f);
}
break;
@@ -2059,10 +2059,10 @@ void func_i6_8018DBF0(Boss* boss) {
}
Math_SmoothStepToF(&boss->fwork[9], 1.0f, 1.0f, 0.01f, 0);
boss->unk_04C++;
if (boss->unk_04C >= Animation_GetFrameCount(&D_C02E494)) {
if (boss->unk_04C >= Animation_GetFrameCount(&D_ANDROSS_C02E494)) {
func_i6_8018D9C0(boss);
}
limbCount = Animation_GetFrameData(&D_C02E494, boss->unk_04C, spD0);
limbCount = Animation_GetFrameData(&D_ANDROSS_C02E494, boss->unk_04C, spD0);
Math_SmoothStepToVec3fArray(spD0, D_i6_801A7F80, 1, limbCount, boss->fwork[9], 100.0f, 0.0f);
}
break;
@@ -2096,10 +2096,10 @@ void func_i6_8018DBF0(Boss* boss) {
boss->fwork[14] = 100.0f;
}
Math_SmoothStepToF(&boss->fwork[9], 1.0f, 1.0f, 0.01f, 0);
if (boss->unk_04C >= Animation_GetFrameCount(&D_C030244)) {
if (boss->unk_04C >= Animation_GetFrameCount(&D_ANDROSS_C030244)) {
func_i6_8018D9C0(boss);
}
limbCount = Animation_GetFrameData(&D_C030244, boss->unk_04C, spD0);
limbCount = Animation_GetFrameData(&D_ANDROSS_C030244, boss->unk_04C, spD0);
Math_SmoothStepToVec3fArray(spD0, D_i6_801A7F80, 1, limbCount, boss->fwork[9], 100.0f, 0.0f);
}
break;
@@ -2140,10 +2140,10 @@ void func_i6_8018DBF0(Boss* boss) {
}
}
Math_SmoothStepToF(&boss->fwork[9], 1.0f, 1.0f, 0.01f, 0);
if (boss->unk_04C >= Animation_GetFrameCount(&D_C02EDA0)) {
if (boss->unk_04C >= Animation_GetFrameCount(&D_ANDROSS_C02EDA0)) {
func_i6_8018D9C0(boss);
}
limbCount = Animation_GetFrameData(&D_C02EDA0, boss->unk_04C, spD0);
limbCount = Animation_GetFrameData(&D_ANDROSS_C02EDA0, boss->unk_04C, spD0);
Math_SmoothStepToVec3fArray(spD0, D_i6_801A7F80, 1, limbCount, boss->fwork[9], 100.0f, 0.0f);
}
break;
@@ -2184,13 +2184,13 @@ void func_i6_8018DBF0(Boss* boss) {
Math_SmoothStepToF(&boss->fwork[4], 5.0f, 1.0f, 2.0f, 0);
Math_SmoothStepToF(&boss->fwork[9], 1.0f, 1.0f, 0.01f, 0);
boss->unk_04C++;
if (boss->unk_04C >= Animation_GetFrameCount(&D_C018BC4)) {
boss->unk_04C = Animation_GetFrameCount(&D_C018BC4) - 1;
if (boss->unk_04C >= Animation_GetFrameCount(&D_ANDROSS_C018BC4)) {
boss->unk_04C = Animation_GetFrameCount(&D_ANDROSS_C018BC4) - 1;
if (boss->timer_050 == 0) {
func_i6_8018D9C0(boss);
}
}
limbCount = Animation_GetFrameData(&D_C018BC4, boss->unk_04C, spD0);
limbCount = Animation_GetFrameData(&D_ANDROSS_C018BC4, boss->unk_04C, spD0);
Math_SmoothStepToVec3fArray(spD0, D_i6_801A7F80, 1, limbCount, boss->fwork[9], 100.0f, 0.0f);
}
break;
@@ -2211,13 +2211,13 @@ void func_i6_8018DBF0(Boss* boss) {
boss->fwork[3] = player->pos.y;
Math_SmoothStepToF(&boss->fwork[9], 1.0f, 1.0f, 0.01f, 0);
boss->unk_04C++;
if (boss->unk_04C >= Animation_GetFrameCount(&D_C025C00)) {
boss->unk_04C = Animation_GetFrameCount(&D_C025C00) - 1;
if (boss->unk_04C >= Animation_GetFrameCount(&D_ANDROSS_C025C00)) {
boss->unk_04C = Animation_GetFrameCount(&D_ANDROSS_C025C00) - 1;
if (boss->timer_050 == 0) {
func_i6_8018D9C0(boss);
}
}
limbCount = Animation_GetFrameData(&D_C025C00, boss->unk_04C, spD0);
limbCount = Animation_GetFrameData(&D_ANDROSS_C025C00, boss->unk_04C, spD0);
Math_SmoothStepToVec3fArray(spD0, D_i6_801A7F80, 1, limbCount, boss->fwork[9], 100.0f, 0.0f);
}
break;
@@ -2238,13 +2238,13 @@ void func_i6_8018DBF0(Boss* boss) {
boss->fwork[3] = player->pos.y;
Math_SmoothStepToF(&boss->fwork[9], 1.0f, 1.0f, 0.01f, 0);
boss->unk_04C++;
if (boss->unk_04C >= Animation_GetFrameCount(&D_C006F08)) {
boss->unk_04C = Animation_GetFrameCount(&D_C006F08) - 1;
if (boss->unk_04C >= Animation_GetFrameCount(&D_ANDROSS_C006F08)) {
boss->unk_04C = Animation_GetFrameCount(&D_ANDROSS_C006F08) - 1;
if (boss->timer_050 == 0) {
func_i6_8018D9C0(boss);
}
}
limbCount = Animation_GetFrameData(&D_C006F08, boss->unk_04C, spD0);
limbCount = Animation_GetFrameData(&D_ANDROSS_C006F08, boss->unk_04C, spD0);
Math_SmoothStepToVec3fArray(spD0, D_i6_801A7F80, 1, limbCount, boss->fwork[9], 100.0f, 0.0f);
}
break;
@@ -2260,13 +2260,13 @@ void func_i6_8018DBF0(Boss* boss) {
boss->fwork[3] = player->pos.y;
Math_SmoothStepToF(&boss->fwork[9], 1.0f, 1.0f, 0.01f, 0);
boss->unk_04C++;
if (boss->unk_04C >= Animation_GetFrameCount(&D_C002654)) {
if (boss->unk_04C >= Animation_GetFrameCount(&D_ANDROSS_C002654)) {
boss->unk_04C = 0;
if (boss->timer_050 == 0) {
func_i6_8018D9C0(boss);
}
}
limbCount = Animation_GetFrameData(&D_C002654, boss->unk_04C, spD0);
limbCount = Animation_GetFrameData(&D_ANDROSS_C002654, boss->unk_04C, spD0);
Math_SmoothStepToVec3fArray(spD0, D_i6_801A7F80, 1, limbCount, boss->fwork[9], 100.0f, 0.0f);
break;
case 15:
@@ -2302,8 +2302,8 @@ void func_i6_8018DBF0(Boss* boss) {
}
}
boss->unk_04C++;
if (boss->unk_04C >= Animation_GetFrameCount(&D_C00DE48)) {
boss->unk_04C = Animation_GetFrameCount(&D_C00DE48) - 1;
if (boss->unk_04C >= Animation_GetFrameCount(&D_ANDROSS_C00DE48)) {
boss->unk_04C = Animation_GetFrameCount(&D_ANDROSS_C00DE48) - 1;
if (boss->timer_050 == 0) {
boss->state = 16;
boss->unk_04C = 0;
@@ -2311,7 +2311,7 @@ void func_i6_8018DBF0(Boss* boss) {
boss->fwork[9] = 0.0f;
}
}
limbCount = Animation_GetFrameData(&D_C00DE48, boss->unk_04C, spD0);
limbCount = Animation_GetFrameData(&D_ANDROSS_C00DE48, boss->unk_04C, spD0);
Math_SmoothStepToVec3fArray(spD0, D_i6_801A7F80, 1, limbCount, boss->fwork[9], 100.0f, 0.0f);
if ((boss->unk_04C == 45) && (boss->swork[8] == 2)) {
boss->state = 18;
@@ -2338,12 +2338,12 @@ void func_i6_8018DBF0(Boss* boss) {
Math_SmoothStepToF(&boss->fwork[9], 1.0f, 1.0f, 0.01f, 0);
if (boss->timer_050 == 0) {
boss->unk_04C++;
if (boss->unk_04C >= Animation_GetFrameCount(&D_C023B54)) {
boss->unk_04C = Animation_GetFrameCount(&D_C023B54) - 1;
if (boss->unk_04C >= Animation_GetFrameCount(&D_ANDROSS_C023B54)) {
boss->unk_04C = Animation_GetFrameCount(&D_ANDROSS_C023B54) - 1;
func_i6_8018D9C0(boss);
}
}
limbCount = Animation_GetFrameData(&D_C023B54, boss->unk_04C, spD0);
limbCount = Animation_GetFrameData(&D_ANDROSS_C023B54, boss->unk_04C, spD0);
Math_SmoothStepToVec3fArray(spD0, D_i6_801A7F80, 1, limbCount, boss->fwork[9], 100.0f, 0.0f);
if (boss->unk_04C == 10) {
AUDIO_PLAY_SFX(0x3140208A, boss->sfxSource, 4);
@@ -2456,7 +2456,7 @@ void func_i6_8018DBF0(Boss* boss) {
AUDIO_PLAY_SFX(0x31022087, boss->sfxSource, 4);
}
boss->unk_04C++;
if (boss->unk_04C >= Animation_GetFrameCount(&D_C0240D0)) {
if (boss->unk_04C >= Animation_GetFrameCount(&D_ANDROSS_C0240D0)) {
boss->unk_04C = 0;
if (boss->timer_050 == 0) {
boss->state = 15;
@@ -2464,7 +2464,7 @@ void func_i6_8018DBF0(Boss* boss) {
boss->fwork[9] = 0.0f;
}
}
limbCount = Animation_GetFrameData(&D_C0240D0, boss->unk_04C, spD0);
limbCount = Animation_GetFrameData(&D_ANDROSS_C0240D0, boss->unk_04C, spD0);
Math_SmoothStepToVec3fArray(spD0, D_i6_801A7F80, 1, limbCount, boss->fwork[9], 100.0f, 0.0f);
break;
@@ -2482,7 +2482,7 @@ void func_i6_8018DBF0(Boss* boss) {
switch (boss->unk_044) {
case 0:
if (boss->timer_050 != 0) {
limbCount = Animation_GetFrameData(&D_C00DE48, 45, spD0);
limbCount = Animation_GetFrameData(&D_ANDROSS_C00DE48, 45, spD0);
Math_SmoothStepToVec3fArray(spD0, D_i6_801A7F80, 1, limbCount, boss->fwork[9], 100.0f, 0.0f);
} else {
boss->unk_044 = 1;
@@ -2495,7 +2495,7 @@ void func_i6_8018DBF0(Boss* boss) {
break;
case 1:
if (boss->timer_050 != 0) {
limbCount = Animation_GetFrameData(&D_C017430, 0, spD0);
limbCount = Animation_GetFrameData(&D_ANDROSS_C017430, 0, spD0);
Math_SmoothStepToVec3fArray(spD0, D_i6_801A7F80, 1, limbCount, boss->fwork[9], 100.0f, 0.0f);
} else {
boss->unk_044 = 2;
@@ -2512,10 +2512,10 @@ void func_i6_8018DBF0(Boss* boss) {
func_i6_8018D9C0(boss);
}
boss->unk_04C++;
if (boss->unk_04C >= Animation_GetFrameCount(&D_C00E598)) {
if (boss->unk_04C >= Animation_GetFrameCount(&D_ANDROSS_C00E598)) {
boss->unk_04C = 0;
}
limbCount = Animation_GetFrameData(&D_C00E598, boss->unk_04C, spD0);
limbCount = Animation_GetFrameData(&D_ANDROSS_C00E598, boss->unk_04C, spD0);
Math_SmoothStepToVec3fArray(spD0, D_i6_801A7F80, 1, limbCount, boss->fwork[9], 100.0f, 0.0f);
break;
}
@@ -2530,10 +2530,10 @@ void func_i6_8018DBF0(Boss* boss) {
Math_SmoothStepToF(&boss->fwork[4], 50.0f, 1.0f, 5.0f, 0);
Math_SmoothStepToF(&boss->fwork[9], 1.0f, 1.0f, 0.05f, 0);
boss->unk_04C++;
if (boss->unk_04C >= Animation_GetFrameCount(&D_C017050)) {
if (boss->unk_04C >= Animation_GetFrameCount(&D_ANDROSS_C017050)) {
func_i6_8018D9C0(boss);
}
limbCount = Animation_GetFrameData(&D_C017050, boss->unk_04C, spD0);
limbCount = Animation_GetFrameData(&D_ANDROSS_C017050, boss->unk_04C, spD0);
Math_SmoothStepToVec3fArray(spD0, D_i6_801A7F80, 1, limbCount, boss->fwork[9], 100.0f, 0.0f);
break;
case 30:
@@ -2548,10 +2548,10 @@ void func_i6_8018DBF0(Boss* boss) {
boss->fwork[3] = 0.0f;
Math_SmoothStepToF(&boss->fwork[9], 1.0f, 1.0f, 0.05f, 0);
boss->unk_04C++;
if (boss->unk_04C >= Animation_GetFrameCount(&D_C017050)) {
if (boss->unk_04C >= Animation_GetFrameCount(&D_ANDROSS_C017050)) {
boss->unk_04C = 0;
}
limbCount = Animation_GetFrameData(&D_C017050, boss->unk_04C, spD0);
limbCount = Animation_GetFrameData(&D_ANDROSS_C017050, boss->unk_04C, spD0);
Math_SmoothStepToVec3fArray(spD0, D_i6_801A7F80, 1, limbCount, boss->fwork[9], 100.0f, 0.0f);
if (!(gGameFrameCount & 1)) {
func_8007C484(boss->obj.pos.x + RAND_FLOAT_CENTERED(1000.0f),
@@ -2614,10 +2614,10 @@ void func_i6_8018DBF0(Boss* boss) {
boss->fwork[3] = player->pos.y;
Math_SmoothStepToF(&boss->fwork[9], 1.0f, 1.0f, 0.05f, 0);
boss->unk_04C++;
if (boss->unk_04C >= Animation_GetFrameCount(&D_C00208C)) {
if (boss->unk_04C >= Animation_GetFrameCount(&D_ANDROSS_C00208C)) {
boss->unk_04C = 0;
}
limbCount = Animation_GetFrameData(&D_C00208C, boss->unk_04C, spD0);
limbCount = Animation_GetFrameData(&D_ANDROSS_C00208C, boss->unk_04C, spD0);
Math_SmoothStepToVec3fArray(spD0, D_i6_801A7F80, 1, limbCount, boss->fwork[9], 100.0f, 0.0f);
func_8007C484(boss->obj.pos.x + RAND_FLOAT_CENTERED(700.0f), boss->obj.pos.y + RAND_FLOAT_CENTERED(700.0f),
@@ -2629,10 +2629,10 @@ void func_i6_8018DBF0(Boss* boss) {
Math_SmoothStepToF(&boss->fwork[7], 60.0f, 1.0f, 3.0f, 0);
Math_SmoothStepToF(&boss->fwork[9], 1.0f, 1.0f, 0.05f, 0);
boss->unk_04C++;
if (boss->unk_04C >= Animation_GetFrameCount(&D_C00208C)) {
if (boss->unk_04C >= Animation_GetFrameCount(&D_ANDROSS_C00208C)) {
boss->unk_04C = 0;
}
limbCount = Animation_GetFrameData(&D_C00208C, boss->unk_04C, spD0);
limbCount = Animation_GetFrameData(&D_ANDROSS_C00208C, boss->unk_04C, spD0);
Math_SmoothStepToVec3fArray(spD0, D_i6_801A7F80, 1, limbCount, boss->fwork[9], 100.0f, 0.0f);
func_8007C484(boss->obj.pos.x + RAND_FLOAT_CENTERED(700.0f), boss->obj.pos.y + RAND_FLOAT_CENTERED(700.0f),
@@ -2675,10 +2675,10 @@ void func_i6_8018DBF0(Boss* boss) {
boss->fwork[3] = 0.0f;
Math_SmoothStepToF(&boss->fwork[9], 1.0f, 1.0f, 0.05f, 0);
boss->unk_04C++;
if (boss->unk_04C >= Animation_GetFrameCount(&D_C017050)) {
if (boss->unk_04C >= Animation_GetFrameCount(&D_ANDROSS_C017050)) {
boss->unk_04C = 0;
}
limbCount = Animation_GetFrameData(&D_C017050, boss->unk_04C, spD0);
limbCount = Animation_GetFrameData(&D_ANDROSS_C017050, boss->unk_04C, spD0);
Math_SmoothStepToVec3fArray(spD0, D_i6_801A7F80, 1, limbCount, boss->fwork[9], 100.0f, 0.0f);
if (!(gGameFrameCount & 1)) {
func_8007C484(boss->obj.pos.x + RAND_FLOAT_CENTERED(1000.0f),
@@ -2861,7 +2861,7 @@ s32 func_i6_801917F0(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* d
switch (limbIndex) {
case 59:
if (boss->swork[18] == 1) {
*dList = D_C004860;
*dList = D_ANDROSS_C004860;
}
if (boss->swork[18] == 2) {
*dList = NULL;
@@ -2875,7 +2875,7 @@ s32 func_i6_801917F0(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* d
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 0, 0, 255);
}
if (boss->swork[11] != 0) {
*dList = D_C0043D0;
*dList = D_ANDROSS_C0043D0;
RCP_SetupDL(&gMasterDisp, 0x15);
}
scale = boss->fwork[17];
@@ -2888,14 +2888,14 @@ s32 func_i6_801917F0(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* d
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 0, 0, 255);
}
if (boss->swork[12] != 0) {
*dList = D_C015740;
*dList = D_ANDROSS_C015740;
RCP_SetupDL(&gMasterDisp, 0x15);
}
scale = boss->fwork[17];
break;
case 5:
if (boss->swork[17] == 1) {
*dList = D_C002B20;
*dList = D_ANDROSS_C002B20;
}
if (boss->swork[17] == 2) {
*dList = NULL;
@@ -2904,7 +2904,7 @@ s32 func_i6_801917F0(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* d
break;
case 6:
if (boss->swork[19] == 1) {
*dList = D_C002F00;
*dList = D_ANDROSS_C002F00;
}
if (boss->swork[19] == 2) {
*dList = NULL;
@@ -2989,7 +2989,7 @@ s32 func_i6_801917F0(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* d
Matrix_RotateY(gGfxMatrix, D_i6_801A67EC * M_DTOR, 1);
Matrix_RotateX(gGfxMatrix, D_i6_801A67E8 * M_DTOR, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_C022520);
gSPDisplayList(gMasterDisp++, D_ANDROSS_C022520);
Matrix_Pop(&gGfxMatrix);
Matrix_Pop(&gCalcMatrix);
}
@@ -3028,7 +3028,7 @@ s32 func_i6_801917F0(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* d
Matrix_RotateY(gGfxMatrix, D_i6_801A67D4 * M_DTOR, 1);
Matrix_RotateX(gGfxMatrix, D_i6_801A67D0 * M_DTOR, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_C022520);
gSPDisplayList(gMasterDisp++, D_ANDROSS_C022520);
Matrix_Pop(&gGfxMatrix);
Matrix_Pop(&gCalcMatrix);
}
@@ -3147,7 +3147,8 @@ void func_i6_801928C8(Boss* boss) {
D_i6_801A7F74, D_i6_801A7F7C, D_i6_801A8430);
}
Matrix_Scale(gCalcMatrix, 10.0f, 10.0f, 10.0f, 1);
Animation_DrawSkeleton(2, D_C01CC3C, D_i6_801A7F80, func_i6_801917F0, func_i6_801924B4, boss, gCalcMatrix);
Animation_DrawSkeleton(2, D_ANDROSS_C01CC3C, D_i6_801A7F80, func_i6_801917F0, func_i6_801924B4, boss,
gCalcMatrix);
Matrix_Pop(&gGfxMatrix);
Matrix_Push(&gGfxMatrix);
if (boss->fwork[20] > 0.05f) {
@@ -3179,7 +3180,7 @@ void func_i6_801928C8(Boss* boss) {
Matrix_Scale(gGfxMatrix, 0.3f, 1.0f, 1.0f, 1);
Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, 200.0f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_C017440);
gSPDisplayList(gMasterDisp++, D_ANDROSS_C017440);
Matrix_Pop(&gGfxMatrix);
Matrix_Push(&gGfxMatrix);
Matrix_RotateZ(gGfxMatrix, 120.0f * M_DTOR, 1);
@@ -3187,7 +3188,7 @@ void func_i6_801928C8(Boss* boss) {
Matrix_Scale(gGfxMatrix, 0.3f, 1.0f, 1.0f, 1);
Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, 200.0f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_C017440);
gSPDisplayList(gMasterDisp++, D_ANDROSS_C017440);
Matrix_Pop(&gGfxMatrix);
Matrix_Push(&gGfxMatrix);
Matrix_RotateZ(gGfxMatrix, 240.0f * M_DTOR, 1);
@@ -3195,7 +3196,7 @@ void func_i6_801928C8(Boss* boss) {
Matrix_Scale(gGfxMatrix, 0.3f, 1.0f, 1.0f, 1);
Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, 200.0f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_C017440);
gSPDisplayList(gMasterDisp++, D_ANDROSS_C017440);
Matrix_Pop(&gGfxMatrix);
}
Lights_SetOneLight(&gMasterDisp, gLight1x, gLight1y, gLight1z, gLight1R, gLight1G, gLight1B, gAmbientR,
@@ -3294,7 +3295,7 @@ void func_i6_80193380(Object_80* obj80) {
case 0:
if (fabsf(obj80->obj.pos.z - gPlayer[0].unk_138) < 1800.0f) {
obj80->state = 1;
obj80->info.hitbox = SEGMENTED_TO_VIRTUAL(D_C038AC4);
obj80->info.hitbox = SEGMENTED_TO_VIRTUAL(D_ANDROSS_C038AC4);
}
break;
case 1:
src/overlays/ovl_unused/fox_unused.c
+4 -2
View File
@@ -4,8 +4,10 @@
UNK_TYPE D_unused_801875C0;
f32* D_unused_80187530[] = {
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, D_C038DC0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, D_ANDROSS_C038DC0,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
};
void func_unused_80187520(void) {