Leahnaya/pokestadium
1
0
Fork 0
mirror of https://github.com/pret/pokestadium.git synced 2026-08-23 02:55:21 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

renaming

Browse Source
This commit is contained in:
shy
2025-08-01 02:46:36 -04:00
parent 9b216ad01c
commit a65d45bbcc
9 changed files with 239 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
linker_scripts/us/symbol_addrs_code.txt
View File

@@ -2787,8 +2787,8 @@ func_86D0037C = 0x86D0037C; // type:func
func_86D003EC = 0x86D003EC; // type:func
func_86E00020 = 0x86E00020; // type:func
func_86E001A0 = 0x86E001A0; // type:func
func_86E001E4 = 0x86E001E4; // type:func
initMetapodPlayers = 0x86E002E4; // type:func
miniInitMetapodPlayer = 0x86E001E4; // type:func
miniInitMetapodPlayers = 0x86E002E4; // type:func
func_86E0034C = 0x86E0034C; // type:func
miniMetapodHumanControls = 0x86E0036C; // type:func
func_86E004FC = 0x86E004FC; // type:func
@@ -2806,19 +2806,19 @@ miniMatapodChecks = 0x86E00D78; // type:func
miniMatapodMinigameChecks = 0x86E00ED0; // type:func
func_86E00F60 = 0x86E00F60; // type:func
func_86E00FD8 = 0x86E00FD8; // type:func
func_86E0103C = 0x86E0103C; // type:func
initFallingRocks = 0x86E010E8; // type:func
miniInitRock = 0x86E0103C; // type:func
miniInitRocks = 0x86E010E8; // type:func
func_86E01188 = 0x86E01188; // type:func
func_86E01310 = 0x86E01310; // type:func
func_86E01414 = 0x86E01414; // type:func
miniRockStateMachine = 0x86E01428; // type:func
func_86E016EC = 0x86E016EC; // type:func
miniRockUpdatePosition = 0x86E016EC; // type:func
miniUpdateRockTransform = 0x86E0172C; // type:func
miniUpdateRocks = 0x86E017C0; // type:func
func_86E0182C = 0x86E0182C; // type:func
func_86E01898 = 0x86E01898; // type:func
miniUpdateRocksPositions = 0x86E01898; // type:func
func_86E01904 = 0x86E01904; // type:func
func_86E01990 = 0x86E01990; // type:func
miniMetapodCameraControls = 0x86E01990; // type:func
initMetapodMinigameAssets = 0x86E019B8; // type:func
func_86E019F4 = 0x86E019F4; // type:func
func_86E01B08 = 0x86E01B08; // type:func

98
src/fragments/18/fragment18.c
View File

@@ -1724,13 +1724,13 @@ void func_86C00368(s16 arg0, s16 arg1) {
void func_86C003AC(MiniActor* arg0) {
s16 idx = arg0 - miniEkanses;
arg0->localOrigin.x = arg0->unk_1D8.x = skansActorInfo[idx].pos.x;
arg0->localOrigin.y = arg0->unk_1D8.y = skansActorInfo[idx].pos.y;
arg0->localOrigin.z = arg0->unk_1D8.z = skansActorInfo[idx].pos.z;
arg0->position_1.x = arg0->unk_1D8.x = skansActorInfo[idx].pos.x;
arg0->position_1.y = arg0->unk_1D8.y = skansActorInfo[idx].pos.y;
arg0->position_1.z = arg0->unk_1D8.z = skansActorInfo[idx].pos.z;
arg0->globalPos.x = 0.0f;
arg0->globalPos.y = -30.0f;
arg0->globalPos.z = 0.0f;
arg0->position_2.x = 0.0f;
arg0->position_2.y = -30.0f;
arg0->position_2.z = 0.0f;
}
void initEkans(MiniActor* ekans, s16 player) {
@@ -1741,15 +1741,15 @@ void initEkans(MiniActor* ekans, s16 player) {
ekans->scale.y = 1.0f;
ekans->scale.z = 1.0f;
ekans->localOrigin.x = ekans->unk_1D8.x = skansActorInfo[player].pos.x;
ekans->localOrigin.y = ekans->unk_1D8.y = skansActorInfo[player].pos.y;
ekans->localOrigin.z = ekans->unk_1D8.z = skansActorInfo[player].pos.z;
ekans->position_1.x = ekans->unk_1D8.x = skansActorInfo[player].pos.x;
ekans->position_1.y = ekans->unk_1D8.y = skansActorInfo[player].pos.y;
ekans->position_1.z = ekans->unk_1D8.z = skansActorInfo[player].pos.z;
ekans->globalPos.y = 10.0f;
ekans->position_2.y = 10.0f;
ekans->unk_288 = 50.0f;
ekans->unk_28C = 140.0f;
ekans->height = 140.0f;
ekans->unk_21C = -0x8000;
ekans->yRot_1 = -0x8000;
ekans->miniMaxHealth = 0x64;
ekans->miniHealth = ekans->miniMaxHealth;
@@ -1880,8 +1880,8 @@ void humanEkansControls(MiniActor* ekans) {
var_v1 = 0x1E0;
}
ekans->unk_228 += direction * (var_v1 + 0x180);
ekans->unk_228 = func_86C00668(ekans, ekans->unk_228);
ekans->yRot_2 += direction * (var_v1 + 0x180);
ekans->yRot_2 = func_86C00668(ekans, ekans->yRot_2);
}
if (stickY >= 0) {
@@ -1931,8 +1931,8 @@ void humanEkansControls(MiniActor* ekans) {
ekans->launchForce = var_ft4;
ekans->unk_22E = 0;
ekans->stickMagnitude1 = 0.0f;
ekans->globalPos.x = 0.0f;
ekans->globalPos.z = 0.0f;
ekans->position_2.x = 0.0f;
ekans->position_2.z = 0.0f;
ekans->mainState = 1;
}
@@ -2131,8 +2131,8 @@ void func_86C00F70(MiniActor* ekans) {
idx = activeDigletts[ekans->playerId].diglettId;
tempDiglett = &miniDigletts[idx];
sp3C.x = tempDiglett->unk_190.x - ekans->unk_190.x;
sp3C.z = tempDiglett->unk_190.z - ekans->unk_190.z;
sp3C.x = tempDiglett->totalPos.x - ekans->totalPos.x;
sp3C.z = tempDiglett->totalPos.z - ekans->totalPos.z;
ekans->unk_222 = func_86C00668(ekans, func_81400BBC(sp3C) + func_81400B00(sp36) + 0x8000);
ekans->unk_22E = func_878001E8(sp32) + sp34;
@@ -2246,7 +2246,7 @@ void compEkansControls(MiniActor* ekans) {
case 2: // comp L R
if (func_86C00B0C(ekans) != 0) {
ekans->compState = 1;
} else if (func_81400550(&ekans->unk_228, ekans->unk_222, ekans->unk_22E) != 0) {
} else if (func_81400550(&ekans->yRot_2, ekans->unk_222, ekans->unk_22E) != 0) {
ekans->unk_29E = func_86C01408();
ekans->compState++;
}
@@ -2266,7 +2266,7 @@ void compEkansControls(MiniActor* ekans) {
case 4: // comp launch (only y speed)
if (func_81400760(&ekans->launchForce, ekans->stickMagnitude1, 8.0f) != 0) {
ekans->globalPos.z = ekans->globalPos.x = 0.0f;
ekans->position_2.z = ekans->position_2.x = 0.0f;
ekans->stickMagnitude1 = 0;
ekans->mainState = 1;
ekans->compState++;
@@ -2322,7 +2322,7 @@ void ekansFixDirToDiglett(MiniActor* ekans, UNUSED s32 nPlayer, s32 nActiveDigle
ekans->unk_1FC = -ekans->unk_1FC * 0.75f;
}
ekans->globalPos.y += ekans->unk_1FC;
ekans->position_2.y += ekans->unk_1FC;
func_86C00368(5, nActiveDiglett);
@@ -2434,13 +2434,13 @@ void func_86C01D2C(MiniActor* ekans, s32 nPlayer) {
ekans->unk_1F8 = 0.0f;
ekans->unk_200 = 0.0f;
ekans->localOrigin.x = ekans->unk_190.x;
ekans->localOrigin.z = ekans->unk_190.z;
ekans->position_1.x = ekans->totalPos.x;
ekans->position_1.z = ekans->totalPos.z;
ekans->unk_1B4.x = diglettColl.x;
ekans->unk_1B4.z = diglettColl.z;
ekans->globalPos.x = ekans->globalPos.z = 0.0f;
ekans->position_2.x = ekans->position_2.z = 0.0f;
ekans->unk_22E = 0x2000;
ekans->unk_000.unk_000.unk_02 &= 0xFFDF;
@@ -2480,8 +2480,8 @@ void func_86C01D2C(MiniActor* ekans, s32 nPlayer) {
void func_86C01FAC(MiniActor* ekans, s32 nPlayer) {
if (ekans->midAirState == 3) {
func_81400760(&ekans->localOrigin.x, ekans->unk_1B4.x, ekans->dist2DiglettLevelX);
func_81400760(&ekans->localOrigin.z, ekans->unk_1B4.z, ekans->dist2DiglettLevelZ);
func_81400760(&ekans->position_1.x, ekans->unk_1B4.x, ekans->dist2DiglettLevelX);
func_81400760(&ekans->position_1.z, ekans->unk_1B4.z, ekans->dist2DiglettLevelZ);
}
if (ekans->unk_298 != 0) {
@@ -2492,8 +2492,8 @@ void func_86C01FAC(MiniActor* ekans, s32 nPlayer) {
}
if (ekans->midAirState < 5) {
if (ekans->globalPos.y <= -50.0f) {
ekans->globalPos.y = -50.0f;
if (ekans->position_2.y <= -50.0f) {
ekans->position_2.y = -50.0f;
ekans->unk_1F8 = 0.0f;
ekans->unk_200 = 0.0f;
if (ekans->midAirState == 3) {
@@ -2512,8 +2512,8 @@ void func_86C01FAC(MiniActor* ekans, s32 nPlayer) {
ekans->ekansDiglettHitScore = 0;
}
} else {
if ((ekans->globalPos.y <= -50.0f) && (ekans->midAirState >= 5)) {
ekans->globalPos.y = -50.0f;
if ((ekans->position_2.y <= -50.0f) && (ekans->midAirState >= 5)) {
ekans->position_2.y = -50.0f;
ekans->weight = 0.0f;
ekans->unk_1FC = 0.0f;
func_81400550(&ekans->unk_22E, 0, 0x100);
@@ -2539,7 +2539,7 @@ void func_86C01FAC(MiniActor* ekans, s32 nPlayer) {
ekans->unk_000.unk_000.unk_01 &= ~1;
ekans->unk_000.unk_01D = 0xFF;
ekans->unk_234 = 0;
ekans->yRot_3 = 0;
ekans->unk_22E = 0;
ekans->midAirState = 0;
ekans->ekansIsMidAir = 0;
@@ -2547,16 +2547,16 @@ void func_86C01FAC(MiniActor* ekans, s32 nPlayer) {
}
}
ekans->unk_234 += ekans->unk_22E;
ekans->yRot_3 += ekans->unk_22E;
}
void func_86C021FC(MiniActor* ekans) {
if (ekans->stickMagnitude1 > 5.0f) {
func_81400760(&ekans->globalPos.x, (-SINS(ekans->totalRot.y) * ekans->stickMagnitude1) / 3.0f, 4.0f);
func_81400760(&ekans->globalPos.z, (-COSS(ekans->totalRot.y) * ekans->stickMagnitude1) / 3.0f, 4.0f);
func_81400760(&ekans->position_2.x, (-SINS(ekans->totalRot.y) * ekans->stickMagnitude1) / 3.0f, 4.0f);
func_81400760(&ekans->position_2.z, (-COSS(ekans->totalRot.y) * ekans->stickMagnitude1) / 3.0f, 4.0f);
} else {
ekans->globalPos.x = 0.0f;
ekans->globalPos.z = 0.0f;
ekans->position_2.x = 0.0f;
ekans->position_2.z = 0.0f;
}
}
@@ -2606,15 +2606,15 @@ void miniEkansCompStateMachine(MiniActor* ekans, s32 nPlayer) {
break;
case 0x5:
if (func_81400760(&ekans->globalPos.y, 10.0f, 4.0f) != 0) {
if (func_81400760(&ekans->position_2.y, 10.0f, 4.0f) != 0) {
ekans->mainState = 0;
}
break;
case 0x64:
func_81400760(&ekans->globalPos.x, 0.0f, 4.0f);
func_81400760(&ekans->globalPos.z, 0.0f, 4.0f);
if (func_81400550(&ekans->unk_228, -0x8000, 0x400) != 0) {
func_81400760(&ekans->position_2.x, 0.0f, 4.0f);
func_81400760(&ekans->position_2.z, 0.0f, 4.0f);
if (func_81400550(&ekans->yRot_2, -0x8000, 0x400) != 0) {
ekans->mainState++;
func_8001BD04(&ekans->unk_000, 2);
}
@@ -2669,15 +2669,15 @@ void initDiglett(MiniActor* diglett, s32 nDiglett) {
diglett->scale.y = 1.0f;
diglett->scale.z = 1.0f;
diglett->localOrigin.x = diglettActorInfo[nDiglett].pos.x;
diglett->localOrigin.y = diglettActorInfo[nDiglett].pos.y;
diglett->localOrigin.z = diglettActorInfo[nDiglett].pos.z;
diglett->position_1.x = diglettActorInfo[nDiglett].pos.x;
diglett->position_1.y = diglettActorInfo[nDiglett].pos.y;
diglett->position_1.z = diglettActorInfo[nDiglett].pos.z;
diglett->unk_288 = diglettActorInfo[nDiglett].unk_12;
diglett->unk_28C = diglettActorInfo[nDiglett].unk_14;
diglett->height = diglettActorInfo[nDiglett].unk_14;
diglett->miniHealth = diglett->miniMaxHealth = 0x64;
diglett->unk_1E4 = diglett->unk_28C * 0.5f;
diglett->unk_1E4 = diglett->height * 0.5f;
func_8001BD04(&diglett->unk_000, 1);
func_879004F8(&diglett->unk_000);
@@ -2693,9 +2693,9 @@ void initDiglettHole(MiniActor* hole, s32 arg1) {
hole->scale.y = 1.0f;
hole->scale.z = 1.0f;
hole->localOrigin.x = diglettActorInfo[arg1].pos.x;
hole->localOrigin.y = diglettActorInfo[arg1].pos.y;
hole->localOrigin.z = diglettActorInfo[arg1].pos.z;
hole->position_1.x = diglettActorInfo[arg1].pos.x;
hole->position_1.y = diglettActorInfo[arg1].pos.y;
hole->position_1.z = diglettActorInfo[arg1].pos.z;
hole->unk_000.unk_000.unk_02 &= ~0x40;
}
@@ -3016,7 +3016,7 @@ void func_86C03128(void) {
for (i = 0; i < 4; i++, ekans++) {
if (var_s2 == ekans->ekansScore) {
func_87802F00(i);
ekans->unk_2A8 = 1;
ekans->isWinner = 1;
ekans->mainState = 0x64;
}
}

117
src/fragments/20/fragment20.c
View File

@@ -29,13 +29,13 @@ extern u8 D_03040580[];
extern u8 D_03040D80[];
extern u8 D_03040980[];
typedef struct unk_D_86E04BFC {
typedef struct MiniRockInfo {
/* 0x00 */ Vec3f unk_00;
/* 0x0C */ Vec3s unk_0C;
/* 0x12 */ s16 unk_12;
/* 0x14 */ s16 unk_14;
/* 0x16 */ s16 unk_16;
} unk_D_86E04BFC; // size = 0x18
} MiniRockInfo; // size = 0x18
static MiniActor miniMetapods[4];
static MiniActor miniMetapodRocks[20];
@@ -464,13 +464,13 @@ static u32 D_86E04B34[] = {
0x00000000, D_86E04AE0, 0x06000000, 0x06000000, 0x05000000, 0x0A000000, &D_800AC840, 0x06000000,
0x06000000, 0x06000000, 0x03000000, D_87806398, 0x06000000, 0x01000000,
};
static Vec3f minigameMetapodOriginPositions[] = {
static Vec3f miniMetapodInfo[] = {
{ -54.0f, 0.0f, 0.0f },
{ -18.0f, 0.0f, 0.0f },
{ 18.0f, 0.0f, 0.0f },
{ 54.0f, 0.0f, 0.0f },
};
static unk_D_86E04BFC D_86E04BFC[] = {
static MiniRockInfo miniRockInfos[] = {
{ { -54.0f, 0.0f, -300.0f }, { 0, 0, 0 }, 20, 40, 0 },
{ { -18.0f, 0.0f, -300.0f }, { 0, 0, 0 }, 20, 40, 0 },
{ { 18.0f, 0.0f, -300.0f }, { 0, 0, 0 }, 20, 40, 0 },
@@ -568,28 +568,28 @@ void func_86E001A0(s16 arg0, s16 arg1) {
}
}
void func_86E001E4(MiniActor* metapod, s32 arg1) {
void miniInitMetapodPlayer(MiniActor* metapod, s32 arg1) {
func_8790060C(metapod);
metapod->scale.x = 1.0f;
metapod->scale.y = 1.0f;
metapod->scale.z = 1.0f;
metapod->localOrigin.x = minigameMetapodOriginPositions[arg1].x;
metapod->localOrigin.y = minigameMetapodOriginPositions[arg1].y;
metapod->localOrigin.z = minigameMetapodOriginPositions[arg1].z;
metapod->position_1.x = miniMetapodInfo[arg1].x;
metapod->position_1.y = miniMetapodInfo[arg1].y;
metapod->position_1.z = miniMetapodInfo[arg1].z;
if (metapod->unk_23C == 0x9E) { // if poke is metapod (not weedle) move it slightly
metapod->localOrigin.z -= 10.0f;
metapod->position_1.z -= 10.0f;
}
metapod->unk_21A = 0;
metapod->unk_21C = 0;
metapod->unk_21E = 0;
metapod->xRot_1 = 0;
metapod->yRot_1 = 0;
metapod->zRot_1 = 0;
metapod->miniMaxHealth = 0x190;
metapod->miniHealth = metapod->miniMaxHealth;
metapod->unk_2A6 = 5;
metapod->unk_1E4 = metapod->unk_28C * 0.5f;
metapod->unk_1E4 = metapod->height * 0.5f;
func_8001BD04(&metapod->unk_000, 0);
func_80017788(&metapod->unk_000);
@@ -598,12 +598,12 @@ void func_86E001E4(MiniActor* metapod, s32 arg1) {
metapod->isComp = D_879060C4[arg1];
}
void initMetapodPlayers(void) {
void miniInitMetapodPlayers(void) {
s32 i;
miniMetapodPtr = miniMetapods;
for (i = 0; i < 4; i++) {
func_86E001E4(miniMetapodPtr, i);
miniInitMetapodPlayer(miniMetapodPtr, i);
miniMetapodPtr++;
}
}
@@ -628,7 +628,7 @@ void miniMetapodHumanControls(MiniActor* metapod) {
case 1: // start harden
func_86E0034C(metapod);
miniChangeActorAnim(metapod, 1, -1, 1);
func_81407D48(1.0f, metapod->unk_190, metapod->totalRot, func_879029F0, &D_87903E40, 4);
func_81407D48(1.0f, metapod->totalPos, metapod->totalRot, func_879029F0, &D_87903E40, 4);
metapod->mainState++;
break;
@@ -857,7 +857,7 @@ void miniMetapodCompControls(MiniActor* metapod, s32 nPlayer) {
metapod->mainState = 1;
metapod->unk_272 = 4;
metapod->compState++;
func_81407D48(1.0f, metapod->unk_190, metapod->totalRot, func_879029F0, &D_87903E40, 4);
func_81407D48(1.0f, metapod->totalPos, metapod->totalRot, func_879029F0, &D_87903E40, 4);
} else {
metapod->compState = 0x64;
}
@@ -964,7 +964,7 @@ void miniRockChecks(UNUSED MiniActor* metapod, s32 nPlayer) {
}
void miniMatapodChecks(MiniActor* metapod, s32 nPlayer) {
if ((miniMetapodPtr->damageTimer > 0) && (metapod->unk_2A8 == 0)) {
if ((miniMetapodPtr->damageTimer > 0) && (metapod->isWinner == 0)) {
if (miniMetapodPtr->damageTimer >= 0x28) {
miniMetapodPtr->miniHealth -= miniMetapodPtr->damageTimer;
miniMetapodPtr->damageTimer = 0;
@@ -1020,9 +1020,9 @@ void miniMatapodMinigameChecks(void) {
void func_86E00F60(void) {
func_879003A0(miniMetapodPtr);
miniMetapodPtr->unk_000.unk_024.x = miniMetapodPtr->unk_190.x;
miniMetapodPtr->unk_000.unk_024.y = miniMetapodPtr->unk_190.y;
miniMetapodPtr->unk_000.unk_024.z = miniMetapodPtr->unk_190.z;
miniMetapodPtr->unk_000.unk_024.x = miniMetapodPtr->totalPos.x;
miniMetapodPtr->unk_000.unk_024.y = miniMetapodPtr->totalPos.y;
miniMetapodPtr->unk_000.unk_024.z = miniMetapodPtr->totalPos.z;
miniMetapodPtr->unk_000.unk_01E.x = miniMetapodPtr->totalRot.x;
miniMetapodPtr->unk_000.unk_01E.y = miniMetapodPtr->totalRot.y;
@@ -1040,17 +1040,17 @@ void func_86E00FD8(void) {
}
}
void func_86E0103C(MiniActor* arg0, s32 arg1) {
void miniInitRock(MiniActor* arg0, s32 arg1) {
func_8790060C(arg0);
arg0->playerId = arg1;
arg0->localOrigin.x = D_86E04BFC[arg1].unk_00.x;
arg0->localOrigin.y = D_86E04BFC[arg1].unk_00.y;
arg0->localOrigin.z = D_86E04BFC[arg1].unk_00.z;
arg0->position_1.x = miniRockInfos[arg1].unk_00.x;
arg0->position_1.y = miniRockInfos[arg1].unk_00.y;
arg0->position_1.z = miniRockInfos[arg1].unk_00.z;
arg0->unk_270 = 0;
arg0->unk_288 = D_86E04BFC[arg1].unk_12;
arg0->unk_28C = D_86E04BFC[arg1].unk_14;
arg0->unk_288 = miniRockInfos[arg1].unk_12;
arg0->height = miniRockInfos[arg1].unk_14;
arg0->scale.x = 0.5f;
arg0->scale.y = 0.5f;
@@ -1061,7 +1061,7 @@ void func_86E0103C(MiniActor* arg0, s32 arg1) {
miniActorUpdateTransform(arg0);
}
void initFallingRocks(void) {
void miniInitRocks(void) {
s32 i;
s32 j;
@@ -1069,7 +1069,7 @@ void initFallingRocks(void) {
for (i = 0; i < 4; i++) {
for (j = 0; j < 5; j++) {
func_86E0103C(miniRockPtr, i);
miniInitRock(miniRockPtr, i);
miniRockPtr++;
}
}
@@ -1115,7 +1115,7 @@ void func_86E01188(void) {
miniRockPtr = &miniMetapodRocks[i * 5];
for (j = 0; j < D_86E04B24; j++) {
func_86E0103C(miniRockPtr, i);
miniInitRock(miniRockPtr, i);
miniRockPtr->mainState = 1;
miniRockPtr->unk_29E = var_s1;
@@ -1132,14 +1132,14 @@ void func_86E01310(MiniActor* rock) {
s16 temp_a1 = rock->playerId;
rock->unk_29E = temp_v1 - 1;
rock->localOrigin.y += D_86E04BFC[temp_a1].unk_00.y + miniMetapods[temp_a1].unk_28C;
rock->position_1.y += miniRockInfos[temp_a1].unk_00.y + miniMetapods[temp_a1].height;
rock->weight = 0.7f;
rock->unk_1F8 = 0.0f;
rock->unk_1FC = temp_v1 * rock->weight * 0.5f;
rock->unk_200 =
((miniMetapods[temp_a1].localOrigin.z + (miniMetapods[temp_a1].unk_288 * 0.5f)) - rock->localOrigin.z) / temp_v1;
((miniMetapods[temp_a1].position_1.z + (miniMetapods[temp_a1].unk_288 * 0.5f)) - rock->position_1.z) / temp_v1;
rock->unk_270 = 1;
rock->unk_000.unk_000.unk_01 |= 1;
@@ -1191,7 +1191,7 @@ void miniRockStateMachine(MiniActor* rock) {
rock->unk_1FC = 5.0f;
rock->unk_200 = 1.5f;
func_86E01414(rock);
func_81407D48(1.0f, rock->unk_190, rock->totalRot, func_87901F04, &D_87903E28, 4);
func_81407D48(1.0f, rock->totalPos, rock->totalRot, func_87901F04, &D_87903E28, 4);
} else {
rock->mainState++;
}
@@ -1202,16 +1202,16 @@ void miniRockStateMachine(MiniActor* rock) {
rock->unk_1FC = 7.0f;
rock->unk_200 = 3.0f;
sp3C.x = rock->unk_190.x;
sp3C.x = rock->totalPos.x;
sp3C.y = 0.0f;
sp3C.z = rock->unk_190.z;
sp3C.z = rock->totalPos.z;
func_81407D48(1.0f, sp3C, rock->totalRot, func_87902068, &D_87903E10, 4);
rock->mainState++;
break;
case 0x4:
if (rock->unk_190.y < -10.0f) {
if (rock->totalPos.y < -10.0f) {
func_86E01414(rock);
}
break;
@@ -1224,14 +1224,14 @@ void miniRockStateMachine(MiniActor* rock) {
}
}
void func_86E016EC(MiniActor* arg0) {
void miniRockUpdatePosition(MiniActor* rock) {
UNUSED f32 temp_fv0;
UNUSED f32 temp_fv0_2;
UNUSED f32 temp_fv0_3;
arg0->unk_190.x = arg0->unk_19C.x = arg0->localOrigin.x + arg0->globalPos.x;
arg0->unk_190.y = arg0->unk_19C.y = arg0->localOrigin.y + arg0->globalPos.y;
arg0->unk_190.z = arg0->unk_19C.z = arg0->localOrigin.z + arg0->globalPos.z;
rock->totalPos.x = rock->totalPos_alt.x = rock->position_1.x + rock->position_2.x;
rock->totalPos.y = rock->totalPos_alt.y = rock->position_1.y + rock->position_2.y;
rock->totalPos.z = rock->totalPos_alt.z = rock->position_1.z + rock->position_2.z;
}
void miniUpdateRockTransform(MiniActor* rock) {
@@ -1239,12 +1239,12 @@ void miniUpdateRockTransform(MiniActor* rock) {
rock->unk_1F8 += rock->xAccel;
rock->unk_1FC += rock->yAccel - rock->weight;
rock->unk_200 += rock->zAccel;
rock->globalPos.x += rock->unk_1F8;
rock->globalPos.y += rock->unk_1FC;
rock->globalPos.z += rock->unk_200;
rock->position_2.x += rock->unk_1F8;
rock->position_2.y += rock->unk_1FC;
rock->position_2.z += rock->unk_200;
}
func_86E016EC(rock);
miniRockUpdatePosition(rock);
}
void miniUpdateRocks(void) {
@@ -1258,6 +1258,7 @@ void miniUpdateRocks(void) {
}
}
// update model transform ?
void func_86E0182C(MiniActor* arg0) {
func_879003A0(arg0);
@@ -1265,21 +1266,21 @@ void func_86E0182C(MiniActor* arg0) {
arg0->unk_000.unk_030.y = arg0->scale.y;
arg0->unk_000.unk_030.z = arg0->scale.z;
arg0->unk_000.unk_024.x = arg0->unk_190.x;
arg0->unk_000.unk_024.y = arg0->unk_190.y;
arg0->unk_000.unk_024.z = arg0->unk_190.z;
arg0->unk_000.unk_024.x = arg0->totalPos.x;
arg0->unk_000.unk_024.y = arg0->totalPos.y;
arg0->unk_000.unk_024.z = arg0->totalPos.z;
arg0->unk_000.unk_01E.x = arg0->totalRot.x;
arg0->unk_000.unk_01E.y = arg0->totalRot.y;
arg0->unk_000.unk_01E.z = arg0->totalRot.z;
}
void func_86E01898(void) {
void miniUpdateRocksPositions(void) {
s32 i;
miniRockPtr = miniMetapodRocks;
for (i = 0; i < 20; ++i)
{
func_86E016EC(miniRockPtr);
miniRockUpdatePosition(miniRockPtr);
func_86E0182C(miniRockPtr);
miniRockPtr = &miniRockPtr[1];
}
@@ -1303,15 +1304,15 @@ void func_86E01904(void) {
miniUpdateCamera();
}
void func_86E01990(void) {
void miniMetapodCameraControls(void) {
minigameDebuggModeControl();
miniUpdateCamera();
}
void initMetapodMinigameAssets(void) {
func_87900854(); // minigame variables
initFallingRocks();
initMetapodPlayers();
miniInitRocks();
miniInitMetapodPlayers();
func_86E01904(); // camera
minigameInputLock = 0;
}
@@ -1411,7 +1412,7 @@ s32 func_86E01B08(void) {
case 1:
for (i = 0; i < 4; i++) {
if (miniMetapodPtr->unk_2A6 == 5) {
miniMetapodPtr->unk_2A8 = 1;
miniMetapodPtr->isWinner = 1;
miniMetapodPtr->unk_2AA = 1;
miniMetapodPtr->unk_2A6 = 1;
var_t3 = 1;
@@ -1455,7 +1456,7 @@ s32 func_86E01E34(void) {
MiniActor* var_s0;
for (i = 0, var_s0 = miniMetapods; i < 4; i++, var_s0++) {
if (var_s0->unk_2A8 != 0) {
if (var_s0->isWinner != 0) {
miniChangeActorAnim(var_s0, 4, -1, 0);
var_s3 = 1;
}
@@ -1767,10 +1768,10 @@ void func_86E02A64(void) {
miniUpdateMetapods();
miniUpdateRocks();
miniMatapodMinigameChecks();
func_86E01898();
func_86E00FD8();
miniUpdateRocksPositions();
func_86E00FD8(); // update metapod models?
func_86E02150();
func_86E01990();
miniMetapodCameraControls();
} else {
func_86E02A28();
}
@@ -1838,7 +1839,7 @@ void func_86E02C5C(void) {
miniMetapods[i].unk_23C = D_86E04CB4[var_v1][0];
miniMetapods[i].unk_168 = func_80019D18(miniMetapods[i].unk_23C);
miniMetapods[i].unk_288 = D_86E04CB4[var_v1][1];
miniMetapods[i].unk_28C = D_86E04CB4[var_v1][2];
miniMetapods[i].height = D_86E04CB4[var_v1][2];
func_8001BC34(&miniMetapods[i].unk_000, 0, miniMetapods[i].unk_23C,
miniMetapods[i].unk_168->unk_08->unk_00[0]);

14
src/fragments/20/fragment20.h
View File

@@ -6,8 +6,8 @@
void func_86E00020(s16 arg0, s16 arg1);
void func_86E001A0(s16 arg0, s16 arg1);
void func_86E001E4(MiniActor* arg0, s32 arg1);
void initMetapodPlayers(void);
void miniInitMetapodPlayer(MiniActor* arg0, s32 arg1);
void miniInitMetapodPlayers(void);
void func_86E0034C(MiniActor* arg0);
void miniMetapodHumanControls(MiniActor* arg0);
void func_86E004FC(MiniActor* metapod);
@@ -25,19 +25,19 @@ void miniMatapodChecks(MiniActor* arg0, s32 arg1);
void miniMatapodMinigameChecks(void);
void func_86E00F60(void);
void func_86E00FD8(void);
void func_86E0103C(MiniActor* arg0, s32 arg1);
void initFallingRocks(void);
void miniInitRock(MiniActor* arg0, s32 arg1);
void miniInitRocks(void);
void func_86E01188(void);
void func_86E01310(MiniActor* arg0);
void func_86E01414(MiniActor* arg0);
void miniRockStateMachine(MiniActor* arg0);
void func_86E016EC(MiniActor* arg0);
void miniRockUpdatePosition(MiniActor* arg0);
void miniUpdateRockTransform(MiniActor* arg0);
void miniUpdateRocks(void);
void func_86E0182C(MiniActor* arg0);
void func_86E01898(void);
void miniUpdateRocksPositions(void);
void func_86E01904(void);
void func_86E01990(void);
void miniMetapodCameraControls(void);
void initMetapodMinigameAssets(void);
void func_86E019F4(void);
s32 func_86E01B08(void);

84
src/fragments/21/fragment21.c
View File

@@ -1595,30 +1595,30 @@ void initSandshrew(MiniActor* sandshrew, s32 player) {
sandshrew->scale.y = 1.0f;
sandshrew->scale.z = 1.0f;
sandshrew->localOrigin.x = sandshrewPositions[player].x;
sandshrew->localOrigin.y = sandshrewPositions[player].y;
sandshrew->localOrigin.z = sandshrewPositions[player].z;
sandshrew->position_1.x = sandshrewPositions[player].x;
sandshrew->position_1.y = sandshrewPositions[player].y;
sandshrew->position_1.z = sandshrewPositions[player].z;
sandshrew->globalPos.x = 0.0f;
sandshrew->globalPos.y = 0.0f;
sandshrew->globalPos.z = 0.0f;
sandshrew->position_2.x = 0.0f;
sandshrew->position_2.y = 0.0f;
sandshrew->position_2.z = 0.0f;
if (true) {}
sandshrew->unk_220 = sandshrew->unk_226 = sandshrew->unk_22C = 0;
sandshrew->unk_222 = sandshrew->unk_228 = sandshrew->unk_22E = 0;
sandshrew->unk_224 = sandshrew->unk_22A = sandshrew->unk_230 = 0;
sandshrew->unk_220 = sandshrew->xRot_2 = sandshrew->unk_22C = 0;
sandshrew->unk_222 = sandshrew->yRot_2 = sandshrew->unk_22E = 0;
sandshrew->unk_224 = sandshrew->zRot_2 = sandshrew->unk_230 = 0;
sandshrew->unk_272 = 0;
sandshrew->unk_2A8 = 0;
sandshrew->isWinner = 0;
sandshrew->unk_2A4 = 0;
sandshrew->diggingSpeed = 0.0f;
sandshrew->diggingAccel2 = 0.0f;
sandshrew->totalRot.x = sandshrew->unk_21A = 0;
sandshrew->totalRot.y = sandshrew->unk_21C = 0;
sandshrew->totalRot.z = sandshrew->unk_21E = 0;
sandshrew->totalRot.x = sandshrew->xRot_1 = 0;
sandshrew->totalRot.y = sandshrew->yRot_1 = 0;
sandshrew->totalRot.z = sandshrew->zRot_1 = 0;
sandshrew->miniHealth = sandshrew->miniMaxHealth = 0x64;
sandshrew->unk_238 = sandshrew->unk_23A = 0;
@@ -1816,12 +1816,12 @@ void func_86F00920(MiniActor* sandshrew) {
}
if (D_8140E6CC == 0) {
if (sandshrew->unk_190.y > -10.0f) {
func_81407D48(1.0f, sandshrew->unk_190, sandshrew->totalRot, func_87902224, &D_87903E10, 1); // particles
if (sandshrew->totalPos.y > -10.0f) {
func_81407D48(1.0f, sandshrew->totalPos, sandshrew->totalRot, func_87902224, &D_87903E10, 1); // particles
} else {
sp48.x = sandshrew->unk_190.x;
sp48.x = sandshrew->totalPos.x;
sp48.y = -5.0f;
sp48.z = sandshrew->unk_190.z;
sp48.z = sandshrew->totalPos.z;
func_81407D48(1.0f, sp48, sandshrew->totalRot, func_879023EC, &D_87903E10, 1); // particles
}
}
@@ -1830,7 +1830,7 @@ void func_86F00920(MiniActor* sandshrew) {
holeDeepeness = sandshrew->diggingSpeed / 5000.0f;
if (holeDeepeness > 0.2f) {
sandshrew->globalPos.y -= holeDeepeness;
sandshrew->position_2.y -= holeDeepeness;
}
func_86F00188(3, sandshrew - miniSandshrews);
@@ -1861,12 +1861,12 @@ void func_86F00920(MiniActor* sandshrew) {
func_80017464(&sandshrew->unk_000, 0);
func_80017454(&sandshrew->unk_000, 0x10000);
sandshrew->mainState++;
sandshrew->globalPos.y += 15.0f;
sandshrew->position_2.y += 15.0f;
break;
case 0x65:
minigameActorLocalOriginToZero(sandshrew);
func_80015390(&miniSandshrewGeiserPtr->unk_000, 0xA, &sandshrew->globalPos);
func_80015390(&miniSandshrewGeiserPtr->unk_000, 0xA, &sandshrew->position_2);
break;
}
}
@@ -1908,20 +1908,20 @@ void initSandshrewHole(MiniActor* a0, s32 arg1) {
sandshrewHole->scale.y = 1.0f;
sandshrewHole->scale.z = 1.0f;
sandshrewHole->localOrigin.x = sandshrewPositions[arg1].x;
sandshrewHole->localOrigin.y = sandshrewPositions[arg1].y;
sandshrewHole->localOrigin.z = sandshrewPositions[arg1].z;
sandshrewHole->position_1.x = sandshrewPositions[arg1].x;
sandshrewHole->position_1.y = sandshrewPositions[arg1].y;
sandshrewHole->position_1.z = sandshrewPositions[arg1].z;
sandshrewHole->totalRot.x = sandshrewHole->unk_21A = sandshrewHole->unk_220 = sandshrewHole->unk_226 =
sandshrewHole->totalRot.x = sandshrewHole->xRot_1 = sandshrewHole->unk_220 = sandshrewHole->xRot_2 =
sandshrewHole->unk_22C = 0;
sandshrewHole->totalRot.y = sandshrewHole->unk_21C = sandshrewHole->unk_222 = sandshrewHole->unk_228 =
sandshrewHole->totalRot.y = sandshrewHole->yRot_1 = sandshrewHole->unk_222 = sandshrewHole->yRot_2 =
sandshrewHole->unk_22E = 0;
sandshrewHole->totalRot.z = sandshrewHole->unk_21E = sandshrewHole->unk_224 = sandshrewHole->unk_22A =
sandshrewHole->totalRot.z = sandshrewHole->zRot_1 = sandshrewHole->unk_224 = sandshrewHole->zRot_2 =
sandshrewHole->unk_230 = 0;
sandshrewHole->globalPos.x = 0.0f;
sandshrewHole->globalPos.y = 0.0f;
sandshrewHole->globalPos.z = 0.0f;
sandshrewHole->position_2.x = 0.0f;
sandshrewHole->position_2.y = 0.0f;
sandshrewHole->position_2.z = 0.0f;
sandshrewHole->miniHealth = sandshrewHole->miniMaxHealth = 0x64;
@@ -1985,17 +1985,17 @@ void initSandshrewWaterGeiser(MiniActor* arg0, s32 arg1) {
geiser->scale.y = 1.0f;
geiser->scale.z = 1.0f;
geiser->localOrigin.x = sandshrewPositions[arg1].x;
geiser->localOrigin.y = sandshrewPositions[arg1].y;
geiser->localOrigin.z = sandshrewPositions[arg1].z;
geiser->position_1.x = sandshrewPositions[arg1].x;
geiser->position_1.y = sandshrewPositions[arg1].y;
geiser->position_1.z = sandshrewPositions[arg1].z;
geiser->totalRot.x = geiser->unk_21A = geiser->unk_220 = geiser->unk_226 = geiser->unk_22C = 0;
geiser->totalRot.y = geiser->unk_21C = geiser->unk_222 = geiser->unk_228 = geiser->unk_22E = 0;
geiser->totalRot.z = geiser->unk_21E = geiser->unk_224 = geiser->unk_22A = geiser->unk_230 = 0;
geiser->totalRot.x = geiser->xRot_1 = geiser->unk_220 = geiser->xRot_2 = geiser->unk_22C = 0;
geiser->totalRot.y = geiser->yRot_1 = geiser->unk_222 = geiser->yRot_2 = geiser->unk_22E = 0;
geiser->totalRot.z = geiser->zRot_1 = geiser->unk_224 = geiser->zRot_2 = geiser->unk_230 = 0;
geiser->globalPos.x = 0.0f;
geiser->globalPos.y = 0.0f;
geiser->globalPos.z = 0.0f;
geiser->position_2.x = 0.0f;
geiser->position_2.y = 0.0f;
geiser->position_2.z = 0.0f;
geiser->miniHealth = geiser->miniMaxHealth = 0x64;
@@ -2115,8 +2115,8 @@ s32 func_86F014F8(void) {
miniSandshrewPtr = miniSandshrews;
for (i = 0; i < 4; i++) {
if (miniSandshrewPtr->unk_190.y < var_fs0) {
var_fs0 = miniSandshrewPtr->unk_190.y;
if (miniSandshrewPtr->totalPos.y < var_fs0) {
var_fs0 = miniSandshrewPtr->totalPos.y;
}
miniSandshrewPtr++;
}
@@ -2124,8 +2124,8 @@ s32 func_86F014F8(void) {
miniSandshrewPtr = miniSandshrews;
miniSandshrewGeiserPtr = miniSandshrewGeisers;
for (i = 0; i < 4; i++) {
if (miniSandshrewPtr->unk_190.y <= var_fs0) {
miniSandshrewPtr->unk_2A8 = 1;
if (miniSandshrewPtr->totalPos.y <= var_fs0) {
miniSandshrewPtr->isWinner = 1;
var_s7 = 1;
var_s4 += 1;
miniSandshrewPtr->mainState = 0x64;

46
src/fragments/3/fragment3.h
View File

@@ -10,17 +10,17 @@ typedef struct MiniActor {
/* 0x000 */ unk_D_86002F58_004_000 unk_000; // collider ? model ?
/* 0x168 */ unk_D_86002F30* unk_168;
/* 0x16C */ Vec3f scale;
/* 0x178 */ char unk178[0x18]; // unused ?
/* 0x190 */ Vec3f unk_190; // global position ?
/* 0x19C */ Vec3f unk_19C; // position ? ** metapod only
/* 0x1A8 */ Vec3f localOrigin; // origin position
/* 0x1B4 */ Vec3f unk_1B4; // ??? ** ekans only
/* 0x1C0 */ Vec3f globalPos;
/* 0x1CC */ f32 dist2DiglettLevelX; // 1,2,4 ** ekans only
/* 0x178 */ char unk178[0x18]; // unused
/* 0x190 */ Vec3f totalPos; // all positions
/* 0x19C */ Vec3f totalPos_alt; // all positions + height/2
/* 0x1A8 */ Vec3f position_1;
/* 0x1B4 */ Vec3f unk_1B4; // ??? ** ekans only
/* 0x1C0 */ Vec3f position_2;
/* 0x1CC */ f32 dist2DiglettLevelX; // ** ekans only
/* 0x1D0 */ f32 dist2DiglettLevelY; // unused
/* 0x1D4 */ f32 dist2DiglettLevelZ; // 1,2,4 ** ekans only
/* 0x1D8 */ Vec3f unk_1D8; // also position, never used
/* 0x1E4 */ f32 unk_1E4; // botton of the hitbox ? half of 28C
/* 0x1D4 */ f32 dist2DiglettLevelZ; // 1,2,4 ** ekans only
/* 0x1D8 */ Vec3f unk_1D8; // also position, never used
/* 0x1E4 */ f32 unk_1E4; // botton of the hitbox ? half of 28C
/* 0x1E8 */ char unk1E8[0x4]; // unused ?
/* 0x1EC */ f32 unk_1EC; // always zero
/* 0x1F0 */ f32 unk_1F0; // always zero
@@ -33,24 +33,24 @@ typedef struct MiniActor {
/* 0x20C */ f32 zAccel; // z acceleration on metapod ** metapod only
/* 0x210 */ f32 weight;
/* 0x214 */ Vec3s totalRot; // total rotation
/* 0x21A */ s16 unk_21A; // x rotation 1, always zero
/* 0x21C */ s16 unk_21C; // y rotation 1
/* 0x21E */ s16 unk_21E; // z rotation 1 ? always zero
/* 0x21A */ s16 xRot_1; // x rotation 1, always zero
/* 0x21C */ s16 yRot_1; // y rotation 1
/* 0x21E */ s16 zRot_1; // z rotation 1 ? always zero
/* 0x220 */ s16 unk_220; // x something
/* 0x222 */ s16 unk_222; // y something
/* 0x224 */ s16 unk_224; // z something
/* 0x226 */ s16 unk_226; // x rotation 2
/* 0x228 */ s16 unk_228; // y rotation 2 (throwing direction on ekans)
/* 0x22A */ s16 unk_22A; // z rotation 2
/* 0x226 */ s16 xRot_2; // x rotation 2
/* 0x228 */ s16 yRot_2; // y rotation 2 (throwing direction on ekans)
/* 0x22A */ s16 zRot_2; // z rotation 2
/* 0x22C */ s16 unk_22C; // x spinning speed ?
/* 0x22E */ s16 unk_22E; // y spinning speed on ekans ; and maybe sandsrew?
/* 0x22E */ s16 unk_22E; // y spinning speed on ekans ; and maybe sandsrew?
/* 0x230 */ s16 unk_230; // z spinning speed ?
/* 0x232 */ s16 unk_232; // x rotation 3
/* 0x234 */ s16 unk_234; // y rotation 3
/* 0x236 */ s16 unk_236; // z rotation 3 always zero
/* 0x232 */ s16 xRot_3; // x rotation 3
/* 0x234 */ s16 yRot_3; // y rotation 3
/* 0x236 */ s16 zRot_3; // z rotation 3 always zero
/* 0x238 */ s16 unk_238; // always zero
/* 0x23A */ s16 unk_23A; // always zero
/* 0x23C */ s16 unk_23C; // ??? some value to send to unk_000->unk_018
/* 0x23C */ s16 unk_23C; // ??? some value to send to unk_000->unk_018
/* 0x23E */ s16 mainState; // animation id or state
/* 0x240 */ union {
s16 unk_240;
@@ -92,7 +92,7 @@ typedef struct MiniActor {
};
/* 0x284 */ f32 stickMagnitude2; // launch forse on ekans
/* 0x288 */ f32 unk_288; // bottom of the hitbox / bounding box ?
/* 0x28C */ f32 unk_28C; // top of the hitbox ? / bounding box ? ; double of 1E4
/* 0x28C */ f32 height; // top of the hitbox ? / bounding box ? ; double of 1E4
/* 0x290 */ s16 unk_290; // always zero
/* 0x292 */ s16 unk_292; // always zero
/* 0x294 */ s16 unk_294; // always zero
@@ -110,7 +110,7 @@ typedef struct MiniActor {
/* 0x2A2 */ s16 ekansScore; // ** ekans only
/* 0x2A4 */ s16 unk_2A4;
/* 0x2A6 */ s16 unk_2A6; // metapod state ?
/* 0x2A8 */ s16 unk_2A8; // is winner ? is alive ?
/* 0x2A8 */ s16 isWinner;
/* 0x2AA */ s16 unk_2AA;
/* 0x2AC */ s16 isComp;
/* 0x2AE */ s16 unk_2AE;

90
src/fragments/3/fragment3_1189B0.c
View File

@@ -29,19 +29,19 @@ ret_func_80004454 func_87900020(void) {
// func_8790002C
float MinigameGetVec3Distance_2d(MiniActor* arg0, MiniActor* arg1) {
return sqrtf(SQ(arg1->unk_19C.x - arg0->unk_19C.x) + SQ(arg1->unk_19C.z - arg0->unk_19C.z));
return sqrtf(SQ(arg1->totalPos_alt.x - arg0->totalPos_alt.x) + SQ(arg1->totalPos_alt.z - arg0->totalPos_alt.z));
}
// func_87900070
void MinigameGetVec3Distance_3d(MiniActor* arg0, MiniActor* arg1) {
sqrtf(SQ(arg1->unk_19C.x - arg0->unk_19C.x) + SQ(arg1->unk_19C.y - arg0->unk_19C.y) +
SQ(arg1->unk_19C.z - arg0->unk_19C.z));
sqrtf(SQ(arg1->totalPos_alt.x - arg0->totalPos_alt.x) + SQ(arg1->totalPos_alt.y - arg0->totalPos_alt.y) +
SQ(arg1->totalPos_alt.z - arg0->totalPos_alt.z));
}
// unused,
s32 func_879000C4(MiniActor* arg0, MiniActor* arg1) {
f32 totalX = arg1->unk_19C.x - arg0->unk_19C.x;
f32 totalY = arg1->unk_19C.y - arg0->unk_19C.y;
f32 totalZ = arg1->unk_19C.z - arg0->unk_19C.z;
f32 totalX = arg1->totalPos_alt.x - arg0->totalPos_alt.x;
f32 totalY = arg1->totalPos_alt.y - arg0->totalPos_alt.y;
f32 totalZ = arg1->totalPos_alt.z - arg0->totalPos_alt.z;
f32 var_fa1 = (arg0->unk_288 * arg0->scale.y) + (arg1->unk_288 * arg1->scale.y);
s32 ret = FALSE;
@@ -77,13 +77,13 @@ s32 metapodRockCollisionCheck(MiniActor* fallingRock, MiniActor* metapod) {
f32 tmp;
s32 ret;
totalX = metapod->unk_19C.x - fallingRock->unk_19C.x;
totalY = metapod->unk_19C.y - fallingRock->unk_19C.y;
totalZ = metapod->unk_19C.z - fallingRock->unk_19C.z;
totalX = metapod->totalPos_alt.x - fallingRock->totalPos_alt.x;
totalY = metapod->totalPos_alt.y - fallingRock->totalPos_alt.y;
totalZ = metapod->totalPos_alt.z - fallingRock->totalPos_alt.z;
ret = 0;
var_fa1 = (fallingRock->unk_288 * fallingRock->scale.y) + (metapod->unk_288 * metapod->scale.y);
var_fs0 = ((fallingRock->unk_28C * fallingRock->scale.y) + (metapod->unk_28C * metapod->scale.y)) / 2.0f;
var_fs0 = ((fallingRock->height * fallingRock->scale.y) + (metapod->height * metapod->scale.y)) / 2.0f;
totalX = ABS(totalX);
totalY = ABS(totalY);
@@ -190,52 +190,52 @@ void hideMiniGameHUD(void) {
}
void func_87900564(MiniActor* actor) {
actor->globalPos.x = 0.0f;
actor->localOrigin.x = 0.0f;
actor->unk_190.x = 0.0f;
actor->position_2.x = 0.0f;
actor->position_1.x = 0.0f;
actor->totalPos.x = 0.0f;
actor->globalPos.y = 0.0f;
actor->localOrigin.y = 0.0f;
actor->unk_190.y = 0.0f;
actor->position_2.y = 0.0f;
actor->position_1.y = 0.0f;
actor->totalPos.y = 0.0f;
actor->globalPos.z = 0.0f;
actor->localOrigin.z = 0.0f;
actor->unk_190.z = 0.0f;
actor->position_2.z = 0.0f;
actor->position_1.z = 0.0f;
actor->totalPos.z = 0.0f;
}
void minigameActorLocalOriginToZero(MiniActor* arg0) {
arg0->localOrigin.x = 0.0f;
arg0->localOrigin.y = 0.0f;
arg0->localOrigin.z = 0.0f;
arg0->position_1.x = 0.0f;
arg0->position_1.y = 0.0f;
arg0->position_1.z = 0.0f;
}
void func_879005AC(MiniActor* arg0) {
arg0->globalPos.x = 0.0f;
arg0->globalPos.y = 0.0f;
arg0->globalPos.z = 0.0f;
arg0->position_2.x = 0.0f;
arg0->position_2.y = 0.0f;
arg0->position_2.z = 0.0f;
}
void func_879005C4(MiniActor* ekans) {
ekans->unk_1FC = ekans->unk_1FC - ekans->weight;
ekans->globalPos.x = ekans->globalPos.x + ekans->unk_1F8;
ekans->globalPos.y = ekans->globalPos.y + (ekans->unk_1FC - ekans->weight);
ekans->globalPos.z = ekans->globalPos.z + ekans->unk_200;
ekans->position_2.x = ekans->position_2.x + ekans->unk_1F8;
ekans->position_2.y = ekans->position_2.y + (ekans->unk_1FC - ekans->weight);
ekans->position_2.z = ekans->position_2.z + ekans->unk_200;
}
void func_8790060C(MiniActor* actor) {
actor->totalRot.x = actor->totalRot.y = actor->totalRot.z = 0;
actor->unk_21A = actor->unk_21C = actor->unk_21E = 0;
actor->xRot_1 = actor->yRot_1 = actor->zRot_1 = 0;
actor->unk_220 = actor->unk_222 = actor->unk_224 = 0;
actor->unk_226 = actor->unk_228 = actor->unk_22A = 0;
actor->xRot_2 = actor->yRot_2 = actor->zRot_2 = 0;
actor->unk_22C = actor->unk_22E = actor->unk_230 = 0;
actor->unk_232 = actor->unk_234 = actor->unk_236 = 0;
actor->xRot_3 = actor->yRot_3 = actor->zRot_3 = 0;
actor->mainState = actor->unk_240 = actor->compState = actor->isIdle = 0;
actor->unk_254 = 0;
actor->unk_272 = 0;
actor->unk_238 = 0;
actor->damageTimer = 0;
actor->unk_2A8 = 0;
actor->isWinner = 0;
actor->unk_2A4 = 0;
actor->ekansScore = 0;
actor->unk_29A = 0;
@@ -247,13 +247,13 @@ void func_8790060C(MiniActor* actor) {
actor->unk_298 = 0;
actor->scale.x = actor->scale.y = actor->scale.z = 1.0f;
actor->unk_190.x = actor->unk_190.y = actor->unk_190.z = 0.0f;
actor->localOrigin.x = actor->localOrigin.y = actor->localOrigin.z = 0.0f;
actor->totalPos.x = actor->totalPos.y = actor->totalPos.z = 0.0f;
actor->position_1.x = actor->position_1.y = actor->position_1.z = 0.0f;
actor->unk_1B4.z = 0.0f;
actor->unk_1B4.y = 0.0f;
actor->unk_1B4.x = 0.0f;
actor->globalPos.x = actor->globalPos.y = actor->globalPos.z = 0.0f;
actor->position_2.x = actor->position_2.y = actor->position_2.z = 0.0f;
actor->dist2DiglettLevelZ = 0.0f;
actor->dist2DiglettLevelY = 0.0f;
@@ -279,15 +279,15 @@ void func_8790060C(MiniActor* actor) {
}
void miniActorUpdateTransform(MiniActor* poke) {
poke->unk_190.x = poke->unk_19C.x = poke->localOrigin.x + poke->globalPos.x;
poke->unk_190.y = poke->unk_19C.y = poke->localOrigin.y + poke->globalPos.y;
poke->unk_190.z = poke->unk_19C.z = poke->localOrigin.z + poke->globalPos.z;
poke->totalPos.x = poke->totalPos_alt.x = poke->position_1.x + poke->position_2.x;
poke->totalPos.y = poke->totalPos_alt.y = poke->position_1.y + poke->position_2.y;
poke->totalPos.z = poke->totalPos_alt.z = poke->position_1.z + poke->position_2.z;
poke->unk_19C.y = poke->unk_19C.y + poke->unk_1E4;
poke->totalPos_alt.y = poke->totalPos_alt.y + poke->unk_1E4;
poke->totalRot.x = poke->unk_21A + poke->unk_226 + poke->unk_232;
poke->totalRot.y = poke->unk_21C + poke->unk_228 + poke->unk_234;
poke->totalRot.z = poke->unk_21E + poke->unk_22A + poke->unk_236;
poke->totalRot.x = poke->xRot_1 + poke->xRot_2 + poke->xRot_3;
poke->totalRot.y = poke->yRot_1 + poke->yRot_2 + poke->yRot_3;
poke->totalRot.z = poke->zRot_1 + poke->zRot_2 + poke->zRot_3;
}
// updates an object's collider ?
@@ -296,9 +296,9 @@ void func_87900808(MiniActor* arg0) {
arg0->unk_000.unk_030.y = arg0->scale.y;
arg0->unk_000.unk_030.z = arg0->scale.z;
arg0->unk_000.unk_024.x = arg0->unk_190.x;
arg0->unk_000.unk_024.y = arg0->unk_190.y;
arg0->unk_000.unk_024.z = arg0->unk_190.z;
arg0->unk_000.unk_024.x = arg0->totalPos.x;
arg0->unk_000.unk_024.y = arg0->totalPos.y;
arg0->unk_000.unk_024.z = arg0->totalPos.z;
arg0->unk_000.unk_01E.x = arg0->totalRot.x;
arg0->unk_000.unk_01E.y = arg0->totalRot.y;

2
src/fragments/3/fragment3_11BBF0.c
View File

@@ -369,7 +369,7 @@ void func_879033FC(MiniActor* arg0) {
var_s2 = 0;
for (i = 0; i < 4; i++) {
if (arg0[i].unk_2A8 != 0) {
if (arg0[i].isWinner != 0) {
temp_a2 = D_87903E60[D_87903DD4][var_s2];
if (arg0[i].isComp != 0) {
func_87801644(-1 - i, 0x78, temp_a2, 1.0f);

12
src/fragments/3/fragment3_11BF90.c
View File

@@ -51,12 +51,12 @@ void func_87903778(MiniActor* arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s16
arg0->scale.y = arg1;
arg0->scale.z = arg1;
arg0->localOrigin.x = arg2;
arg0->localOrigin.y = arg3;
arg0->localOrigin.z = arg4;
arg0->unk_21A = arg5;
arg0->unk_21C = arg6;
arg0->unk_21E = arg7;
arg0->position_1.x = arg2;
arg0->position_1.y = arg3;
arg0->position_1.z = arg4;
arg0->xRot_1 = arg5;
arg0->yRot_1 = arg6;
arg0->zRot_1 = arg7;
arg0->playerId = arg8;
arg0->mainState = 1;
}