Leahnaya/pokestadium
1
0
Fork 0
mirror of https://github.com/pret/pokestadium.git synced 2026-09-08 11:25:45 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

renaming

Browse Source
This commit is contained in:
shy
2025-07-25 01:03:12 -04:00
parent c24d6e6608
commit ffa4d77b89
5 changed files with 405 additions and 405 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -55,9 +55,9 @@ typedef struct actorOriginPosition {
/* 0x12 */ s16 unk_14;
} actorOriginPosition; // size = 0x18
static minigameActor minigameDigletActors[9];
static minigameActor minigameDiglettHoleActors[9];
static minigameActor minigameEkansActors[4];
static minigameActor miniDigletts[9];
static minigameActor miniDiglettHoles[9];
static minigameActor miniEkanses[4];
static unk_D_800AC870* D_86C12000;
static unk_D_86C12008 D_86C12008[3];
static s32 D_86C12034;
@@ -1493,9 +1493,9 @@ static u32 ekansShadowTexture[] = {
0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
};
static minigameActor* tempMinigameDigletActor = &minigameDigletActors[0];
static minigameActor* tempMinigameDiglettHoleActor = &minigameDiglettHoleActors[0];
static minigameActor* tempEkansPlayerActor = &minigameEkansActors[0];
static minigameActor* miniDiglettPtr = &miniDigletts[0];
static minigameActor* miniDiglettHolePtr = &miniDiglettHoles[0];
static minigameActor* miniEkansPtr = &miniEkanses[0];
static s16 D_86C0E054[] = {
0x0000, 0x0001, 0x0002, 0x0000, 0x0003, 0x0006, 0x0000, 0x0004, 0x0008, 0x0001, 0x0004, 0x0007,
@@ -1598,7 +1598,7 @@ s32 func_86C00020(minigameActor* arg0) {
void func_86C00090(s16 arg0, s32* arg1, s32* arg2) {
s16 temp_v0 = D_86C12008[arg0].unk_00;
if (minigameDigletActors[temp_v0].unk_29C != 0) {
if (miniDigletts[temp_v0].unk_29C != 0) {
*arg1 = 1;
} else {
*arg1 = 0;
@@ -1629,7 +1629,7 @@ void func_86C00110(s16 arg0, s16 arg1) {
case 3:
var_s0 = 0xA0003;
sp30 = arg1;
sp2C = func_86C00020(&minigameEkansActors[arg1]);
sp2C = func_86C00020(&miniEkanses[arg1]);
break;
case 4:
@@ -1722,7 +1722,7 @@ void func_86C00368(s16 arg0, s16 arg1) {
}
void func_86C003AC(minigameActor* arg0) {
s16 idx = arg0 - minigameEkansActors;
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;
@@ -1779,11 +1779,11 @@ void initEkans(minigameActor* ekans, s16 player) {
void initEkanses(void) {
s32 i;
tempEkansPlayerActor = minigameEkansActors;
miniEkansPtr = miniEkanses;
for (i = 0; i < 4; i++) {
initEkans(tempEkansPlayerActor, i);
tempEkansPlayerActor++;
initEkans(miniEkansPtr, i);
miniEkansPtr++;
}
}
@@ -1794,7 +1794,7 @@ f32 func_86C0063C(minigameActor* arg0) {
s16 func_86C00668(minigameActor* arg0, s16 arg1) {
s32 var_v1 = arg1 ^ 0;
switch (arg0 - minigameEkansActors) {
switch (arg0 - miniEkanses) {
case 0:
if (var_v1 < -0x1E00) {
var_v1 = -0x1E00;
@@ -1942,7 +1942,7 @@ void func_86C00770(minigameActor* ekans) {
}
void func_86C00AA4(void) {
minigameActor* ptr = minigameEkansActors;
minigameActor* ptr = miniEkanses;
s32 i;
for (i = 0; i < 4; i++) {
@@ -1958,9 +1958,9 @@ s32 func_86C00B0C(minigameActor* arg0) {
s32 idx = arg0->unk_266;
s32 i;
if ((minigameDigletActors[D_86C12008[idx].unk_00].unk_29C == 0) && (arg0->unk_2AE == 1)) {
if ((miniDigletts[D_86C12008[idx].unk_00].unk_29C == 0) && (arg0->unk_2AE == 1)) {
for (i = 0; i < 3; i++) {
if ((D_86C12008[i].unk_02 == 6) && (minigameDigletActors[D_86C12008[i].unk_00].unk_29C != 0)) {
if ((D_86C12008[i].unk_02 == 6) && (miniDigletts[D_86C12008[i].unk_00].unk_29C != 0)) {
ret = 1;
break;
}
@@ -2005,7 +2005,7 @@ s16 func_86C00C40(minigameActor* arg0) {
}
for (i = 0; i < 3; i++) {
if ((D_86C12008[i].unk_02 == 6) && (minigameDigletActors[D_86C12008[i].unk_00].unk_29C != 0)) {
if ((D_86C12008[i].unk_02 == 6) && (miniDigletts[D_86C12008[i].unk_00].unk_29C != 0)) {
sp1E = i;
sp18 = 1;
break;
@@ -2034,7 +2034,7 @@ s16 func_86C00D50(minigameActor* arg0) {
s32 sp1C;
s16 var_a0;
s32 var_v1;
minigameActor* var_v0 = minigameEkansActors;
minigameActor* var_v0 = miniEkanses;
sp1C = 1;
@@ -2050,7 +2050,7 @@ s16 func_86C00D50(minigameActor* arg0) {
for (i = 0; i < 3; i++) {
if (D_86C12008[var_a0].unk_02 == 6) {
if (sp1C == 0) {
var_v0 = minigameEkansActors;
var_v0 = miniEkanses;
var_v1 = 1;
for (j = 0; j < 4; j++, var_v0++) {
if ((var_v0 != arg0) && (var_v0->isHuman != 0) && (var_a0 == var_v0->unk_266)) {
@@ -2097,9 +2097,9 @@ s32 func_86C00EF8(minigameActor* arg0) {
return arg0->unk_266;
}
void func_86C00F70(minigameActor* arg0) {
void func_86C00F70(minigameActor* ekans) {
Vec3f sp3C;
minigameActor* temp_v0;
minigameActor* tempDiglett;
s16 sp36;
s16 sp34;
s16 sp32;
@@ -2128,14 +2128,14 @@ void func_86C00F70(minigameActor* arg0) {
break;
}
idx = D_86C12008[arg0->unk_266].unk_00;
temp_v0 = &minigameDigletActors[idx];
idx = D_86C12008[ekans->unk_266].unk_00;
tempDiglett = &miniDigletts[idx];
sp3C.x = temp_v0->unk_190.x - arg0->unk_190.x;
sp3C.z = temp_v0->unk_190.z - arg0->unk_190.z;
sp3C.x = tempDiglett->unk_190.x - ekans->unk_190.x;
sp3C.z = tempDiglett->unk_190.z - ekans->unk_190.z;
arg0->unk_222 = func_86C00668(arg0, func_81400BBC(sp3C) + func_81400B00(sp36) + 0x8000);
arg0->unk_22E = func_878001E8(sp32) + sp34;
ekans->unk_222 = func_86C00668(ekans, func_81400BBC(sp3C) + func_81400B00(sp36) + 0x8000);
ekans->unk_22E = func_878001E8(sp32) + sp34;
}
void func_86C01100(minigameActor* arg0) {
@@ -2234,56 +2234,56 @@ s16 func_86C014A0(void) {
return sp1E;
}
void func_86C01538(minigameActor* arg0) {
switch (arg0->unk_242) {
void func_86C01538(minigameActor* ekans) {
switch (ekans->unk_242) {
case 1:
if (func_86C00EF8(arg0) >= 0) {
func_86C00F70(arg0);
arg0->unk_242++;
if (func_86C00EF8(ekans) >= 0) {
func_86C00F70(ekans);
ekans->unk_242++;
}
break;
case 2:
if (func_86C00B0C(arg0) != 0) {
arg0->unk_242 = 1;
} else if (func_81400550(&arg0->unk_228, arg0->unk_222, arg0->unk_22E) != 0) {
arg0->unk_29E = func_86C01408();
arg0->unk_242++;
if (func_86C00B0C(ekans) != 0) {
ekans->unk_242 = 1;
} else if (func_81400550(&ekans->unk_228, ekans->unk_222, ekans->unk_22E) != 0) {
ekans->unk_29E = func_86C01408();
ekans->unk_242++;
}
break;
case 3:
if (func_86C00B0C(arg0) != 0) {
arg0->unk_242 = 1;
if (func_86C00B0C(ekans) != 0) {
ekans->unk_242 = 1;
} else {
arg0->unk_29E--;
if (arg0->unk_29E <= 0) {
func_86C01100(arg0);
arg0->unk_242++;
ekans->unk_29E--;
if (ekans->unk_29E <= 0) {
func_86C01100(ekans);
ekans->unk_242++;
}
}
break;
case 4:
if (func_81400760(&arg0->unk_274, arg0->unk_280, 8.0f) != 0) {
arg0->unk_1C0.z = arg0->unk_1C0.x = 0.0f;
arg0->unk_280 = 0;
arg0->unk_23E = 1;
arg0->unk_242++;
if (func_81400760(&ekans->unk_274, ekans->unk_280, 8.0f) != 0) {
ekans->unk_1C0.z = ekans->unk_1C0.x = 0.0f;
ekans->unk_280 = 0;
ekans->unk_23E = 1;
ekans->unk_242++;
}
break;
case 5:
if (arg0->unk_23E == 0) {
arg0->unk_29E = func_86C014A0();
arg0->unk_242++;
if (ekans->unk_23E == 0) {
ekans->unk_29E = func_86C014A0();
ekans->unk_242++;
}
break;
case 6:
arg0->unk_29E--;
if (arg0->unk_29E <= 0) {
arg0->unk_242 = 1;
ekans->unk_29E--;
if (ekans->unk_29E <= 0) {
ekans->unk_242 = 1;
}
break;
}
@@ -2291,9 +2291,9 @@ void func_86C01538(minigameActor* arg0) {
void func_86C016C8(minigameActor* ekans) {
ekans->unk_210 = 1.0f;
ekans->unk_1F8 = (SINS(ekans->unk_214.y) * (26.0f + ekans->unk_274)) / 10.0f;
ekans->unk_1F8 = (SINS(ekans->totalRot.y) * (26.0f + ekans->unk_274)) / 10.0f;
ekans->unk_1FC = (ekans->unk_274 + 70.0f) * 0.125f;
ekans->unk_200 = (COSS(ekans->unk_214.y) * (26.0f + ekans->unk_274)) / 10.0f;
ekans->unk_200 = (COSS(ekans->totalRot.y) * (26.0f + ekans->unk_274)) / 10.0f;
}
void func_86C01748(void) {
@@ -2345,7 +2345,7 @@ void func_86C018B8(minigameActor* ekans, s32 nPlayer) {
if ((ekans->unk_262 != 0) && (ekans->unk_260 < 2)) {
for (i = 0; i < 3; i++) {
if ((D_86C12008[i].unk_06 != 0) && (D_86C12008[i].unk_08 == 0)) {
func_80015390(&minigameDigletActors[D_86C12008[i].unk_00].unk_000, 0xA, &sp84);
func_80015390(&miniDigletts[D_86C12008[i].unk_00].unk_000, 0xA, &sp84);
distance2d = func_81400EF0(sp78, sp84);
xDist = sp78.x - sp84.x;
@@ -2375,25 +2375,25 @@ void func_86C01AF8(void) {
s32 i;
s32 j;
minigameActor* diglett;
minigameActor* ekans = minigameEkansActors;
minigameActor* ekans = miniEkanses;
for (i = 0; i < 4; i++, ekans++) {
if (ekans->unk_25E != 0) {
s32 idx = ekans->unk_266;
for (j = i + 1; j < 4; j++) {
if ((minigameEkansActors[j].unk_25E != 0) && (idx == minigameEkansActors[j].unk_266)) {
diglett = &minigameDigletActors[D_86C12008[idx].unk_00];
if ((miniEkanses[j].unk_25E != 0) && (idx == miniEkanses[j].unk_266)) {
diglett = &miniDigletts[D_86C12008[idx].unk_00];
func_80015390(&ekans->unk_000, 0xA, &sp7C);
func_80015390(&minigameEkansActors[j].unk_000, 0xA, &sp70);
func_80015390(&miniEkanses[j].unk_000, 0xA, &sp70);
func_80015390(&diglett->unk_000, 0xA, &sp88);
if (func_81400E8C(sp7C, sp88) > func_81400E8C(sp70, sp88)) {
ekans->unk_25E = 0;
break;
} else {
minigameEkansActors[j].unk_25E = 0;
miniEkanses[j].unk_25E = 0;
}
}
}
@@ -2423,7 +2423,7 @@ void func_86C01D2C(minigameActor* ekans, s32 arg1) {
idx = ekans->unk_266;
sp18 = &D_86C12008[idx];
diglett = &minigameDigletActors[sp18->unk_00];
diglett = &miniDigletts[sp18->unk_00];
func_80015390(&diglett->unk_000, 0xA, &sp3C);
@@ -2551,8 +2551,8 @@ void func_86C01FAC(minigameActor* ekans, s32 arg1) {
void func_86C021FC(minigameActor* ekans) {
if (ekans->unk_280 > 5.0f) {
func_81400760(&ekans->unk_1C0.x, (-SINS(ekans->unk_214.y) * ekans->unk_280) / 3.0f, 4.0f);
func_81400760(&ekans->unk_1C0.z, (-COSS(ekans->unk_214.y) * ekans->unk_280) / 3.0f, 4.0f);
func_81400760(&ekans->unk_1C0.x, (-SINS(ekans->totalRot.y) * ekans->unk_280) / 3.0f, 4.0f);
func_81400760(&ekans->unk_1C0.z, (-COSS(ekans->totalRot.y) * ekans->unk_280) / 3.0f, 4.0f);
} else {
ekans->unk_1C0.x = 0.0f;
ekans->unk_1C0.z = 0.0f;
@@ -2634,30 +2634,30 @@ void func_86C02514(void) {
s32 i;
tempControllerPtr = gPlayer1Controller;
tempEkansPlayerActor = minigameEkansActors;
miniEkansPtr = miniEkanses;
for (i = 0; i < 4; i++) {
func_86C022D8(tempEkansPlayerActor);
func_86C022D8(miniEkansPtr);
if (tempEkansPlayerActor->unk_262 != 0) {
func_879005C4(tempEkansPlayerActor);
func_86C018B8(tempEkansPlayerActor, i);
if (miniEkansPtr->unk_262 != 0) {
func_879005C4(miniEkansPtr);
func_86C018B8(miniEkansPtr, i);
}
tempEkansPlayerActor++;
miniEkansPtr++;
tempControllerPtr++;
}
func_86C01AF8();
tempEkansPlayerActor = minigameEkansActors;
miniEkansPtr = miniEkanses;
for (i = 0; i < 4; i++) {
func_86C02324(tempEkansPlayerActor, i);
func_879003A0(tempEkansPlayerActor);
func_87900770(tempEkansPlayerActor);
func_87900808(tempEkansPlayerActor);
func_86C02324(miniEkansPtr, i);
func_879003A0(miniEkansPtr);
func_87900770(miniEkansPtr);
func_87900808(miniEkansPtr);
tempEkansPlayerActor++;
miniEkansPtr++;
}
}
@@ -2734,17 +2734,17 @@ void func_86C027BC(void) {
void initDigletts(void) {
s32 i;
tempMinigameDigletActor = minigameDigletActors;
tempMinigameDiglettHoleActor = minigameDiglettHoleActors;
miniDiglettPtr = miniDigletts;
miniDiglettHolePtr = miniDiglettHoles;
for (i = 0; i < 9; i++) {
initDiglett(tempMinigameDigletActor, i);
func_87900770(tempMinigameDigletActor);
initDiglettHole(tempMinigameDiglettHoleActor, i);
func_87900770(tempMinigameDiglettHoleActor);
func_87900808(tempMinigameDiglettHoleActor);
tempMinigameDigletActor = &tempMinigameDigletActor[1];
tempMinigameDiglettHoleActor = &tempMinigameDiglettHoleActor[1];
initDiglett(miniDiglettPtr, i);
func_87900770(miniDiglettPtr);
initDiglettHole(miniDiglettHolePtr, i);
func_87900770(miniDiglettHolePtr);
func_87900808(miniDiglettHolePtr);
miniDiglettPtr = &miniDiglettPtr[1];
miniDiglettHolePtr = &miniDiglettHolePtr[1];
}
func_86C0276C();
@@ -2872,15 +2872,15 @@ void func_86C02C28(void) {
for (i = 0; i < 3; i++) {
switch (D_86C12008[i].unk_02) {
case 1:
tempMinigameDigletActor = &minigameDigletActors[D_86C12008[i].unk_00];
func_879002B8(tempMinigameDigletActor, 1, -1, 0);
miniDiglettPtr = &miniDigletts[D_86C12008[i].unk_00];
func_879002B8(miniDiglettPtr, 1, -1, 0);
D_86C12008[i].unk_02 = 2;
func_86C00368(6, i);
break;
case 2:
tempMinigameDigletActor = &minigameDigletActors[D_86C12008[i].unk_00];
if (func_87900384(tempMinigameDigletActor) != 0) {
miniDiglettPtr = &miniDigletts[D_86C12008[i].unk_00];
if (func_87900384(miniDiglettPtr) != 0) {
D_86C12008[i].unk_00 = -1;
D_86C12008[i].unk_02 = 0;
}
@@ -2897,11 +2897,11 @@ void func_86C02C28(void) {
D_86C12008[i].unk_02 = 5;
D_86C12008[i].unk_04 = 0xD;
D_86C12008[i].unk_00 = func_86C028C0(i);
tempMinigameDigletActor = &minigameDigletActors[D_86C12008[i].unk_00];
tempMinigameDigletActor->unk_000.unk_000.unk_01 |= 1;
miniDiglettPtr = &miniDigletts[D_86C12008[i].unk_00];
miniDiglettPtr->unk_000.unk_000.unk_01 |= 1;
func_86C00368(7, i);
func_86C02A1C(tempMinigameDigletActor);
func_87900344(tempMinigameDigletActor, 1, -1, 1);
func_86C02A1C(miniDiglettPtr);
func_87900344(miniDiglettPtr, 1, -1, 1);
}
break;
@@ -2915,9 +2915,9 @@ void func_86C02C28(void) {
case 6:
if (D_86C12008[i].unk_08 != 0) {
tempMinigameDigletActor = &minigameDigletActors[D_86C12008[i].unk_00];
func_879002B8(tempMinigameDigletActor, 2, -1, 0);
func_86C02B78(tempMinigameDigletActor, i);
miniDiglettPtr = &miniDigletts[D_86C12008[i].unk_00];
func_879002B8(miniDiglettPtr, 2, -1, 0);
func_86C02B78(miniDiglettPtr, i);
D_86C12008[i].unk_02 = 7;
D_86C12008[i].unk_06 = 0;
D_86C12008[i].unk_08 = 0;
@@ -2925,23 +2925,23 @@ void func_86C02C28(void) {
break;
case 7:
tempMinigameDigletActor = &minigameDigletActors[D_86C12008[i].unk_00];
if (func_87900384(tempMinigameDigletActor) != 0) {
func_8001BE34(&tempMinigameDigletActor->unk_000, 0xFF, 0xFF, 0xFF, 0);
func_879002B8(tempMinigameDigletActor, 1, -1, 0);
miniDiglettPtr = &miniDigletts[D_86C12008[i].unk_00];
if (func_87900384(miniDiglettPtr) != 0) {
func_8001BE34(&miniDiglettPtr->unk_000, 0xFF, 0xFF, 0xFF, 0);
func_879002B8(miniDiglettPtr, 1, -1, 0);
D_86C12008[i].unk_02 = 8;
func_86C00368(9, i);
}
break;
case 8:
tempMinigameDigletActor = &minigameDigletActors[D_86C12008[i].unk_00];
if (func_87900384(tempMinigameDigletActor) != 0) {
tempMinigameDigletActor->unk_000.unk_000.unk_01 &= ~1;
miniDiglettPtr = &miniDigletts[D_86C12008[i].unk_00];
if (func_87900384(miniDiglettPtr) != 0) {
miniDiglettPtr->unk_000.unk_000.unk_01 &= ~1;
D_86C12008[i].unk_04 = 1;
D_86C12008[i].unk_02 = 9;
tempMinigameDigletActor->unk_29C = 0;
tempMinigameDigletActor->unk_000.unk_01C = 0;
miniDiglettPtr->unk_29C = 0;
miniDiglettPtr->unk_000.unk_01C = 0;
}
break;
@@ -2960,13 +2960,13 @@ void func_86C03008(void) {
s32 i;
func_86C02C28();
tempMinigameDigletActor = minigameDigletActors;
miniDiglettPtr = miniDigletts;
for (i = 0; i < 9; i++) {
func_87900770(tempMinigameDigletActor);
func_87900808(tempMinigameDigletActor);
func_879003A0(tempMinigameDigletActor);
tempMinigameDigletActor++;
func_87900770(miniDiglettPtr);
func_87900808(miniDiglettPtr);
func_879003A0(miniDiglettPtr);
miniDiglettPtr++;
}
}
@@ -2984,7 +2984,7 @@ void ekansMinigameInitObjects(void) {
}
s32 func_86C030EC(void) {
minigameActor* ekans = minigameEkansActors;
minigameActor* ekans = miniEkanses;
s32 ret = 1;
s32 i;
@@ -3003,14 +3003,14 @@ void func_86C03128(void) {
minigameActor* ekans;
var_s2 = -1;
for (i = 0, ekans = minigameEkansActors; i < 4; i++, ekans++) {
for (i = 0, ekans = miniEkanses; i < 4; i++, ekans++) {
if (var_s2 < ekans->unk_2A2) {
var_s2 = ekans->unk_2A2;
}
}
if (var_s2 != 0) {
ekans = minigameEkansActors;
ekans = miniEkanses;
for (i = 0; i < 4; i++, ekans++) {
if (var_s2 == ekans->unk_2A2) {
func_87802F00(i);
@@ -3243,7 +3243,7 @@ void drawEkansMinigameCountdown(void) {
}
void fixSkansMinigameHUD(void) {
minigameActor* ekans = minigameEkansActors;
minigameActor* ekans = miniEkanses;
s32 i;
func_8001F3F4();
@@ -3271,7 +3271,7 @@ void fixSkansMinigameHUD(void) {
} else {
func_87801644(i, tmp, 0xCC, 0.75f);
}
func_8001F1E8(tmp + 0x14, 0xCC, " %d", minigameEkansActors[i].unk_2A2);
func_8001F1E8(tmp + 0x14, 0xCC, " %d", miniEkanses[i].unk_2A2);
}
gSPDisplayList(gDisplayListHead++, D_8006F630);
@@ -3297,7 +3297,7 @@ void func_86C03E8C(s32 arg0) {
}
void func_86C03ED4(void) {
minigameActor* ekans = minigameEkansActors;
minigameActor* ekans = miniEkanses;
s32 i;
Vec3f sp7C;
Vec3s sp74;
@@ -3448,40 +3448,40 @@ void func_86C044B4(void) {
func_8001BB20();
for (i = 0; i < 4; i++) {
func_8001BB58(&minigameEkansActors[i].unk_000);
func_8001BB58(&miniEkanses[i].unk_000);
}
for (i = 0; i < 9; i++) {
func_8001BB58(&minigameDigletActors[i].unk_000);
func_8001BB58(&miniDigletts[i].unk_000);
}
for (i = 0; i < 9; i++) {
func_8001BB58(&minigameDiglettHoleActors[i].unk_000);
func_8001BB58(&miniDiglettHoles[i].unk_000);
}
func_8001987C();
temp_s1 = func_80019D18(0x9F);
for (i = 0; i < 4; i++) {
minigameEkansActors[i].unk_23C = 0x9F;
minigameEkansActors[i].unk_168 = temp_s1;
func_8001BC34(&minigameEkansActors[i].unk_000, 0, minigameEkansActors[i].unk_23C, temp_s1->unk_08->unk_00[0]);
func_8001BD04(&minigameEkansActors[i].unk_000, 0);
miniEkanses[i].unk_23C = 0x9F;
miniEkanses[i].unk_168 = temp_s1;
func_8001BC34(&miniEkanses[i].unk_000, 0, miniEkanses[i].unk_23C, temp_s1->unk_08->unk_00[0]);
func_8001BD04(&miniEkanses[i].unk_000, 0);
}
temp_s1 = func_80019D18(0xA4);
for (i = 0; i < 9; i++) {
minigameDigletActors[i].unk_23C = 0xA4;
minigameDigletActors[i].unk_168 = temp_s1;
func_8001BC34(&minigameDigletActors[i].unk_000, 0, minigameDigletActors[i].unk_23C, temp_s1->unk_08->unk_00[0]);
minigameDigletActors[i].unk_000.unk_000.unk_01 &= ~1;
miniDigletts[i].unk_23C = 0xA4;
miniDigletts[i].unk_168 = temp_s1;
func_8001BC34(&miniDigletts[i].unk_000, 0, miniDigletts[i].unk_23C, temp_s1->unk_08->unk_00[0]);
miniDigletts[i].unk_000.unk_000.unk_01 &= ~1;
}
temp_s1 = func_80019D18(0xA3);
for (i = 0; i < 9; i++) {
minigameDiglettHoleActors[i].unk_23C = 0xA3;
minigameDiglettHoleActors[i].unk_168 = temp_s1;
func_8001BC34(&minigameDiglettHoleActors[i].unk_000, 0, minigameDiglettHoleActors[i].unk_23C, temp_s1->unk_08->unk_00[0]);
miniDiglettHoles[i].unk_23C = 0xA3;
miniDiglettHoles[i].unk_168 = temp_s1;
func_8001BC34(&miniDiglettHoles[i].unk_000, 0, miniDiglettHoles[i].unk_23C, temp_s1->unk_08->unk_00[0]);
}
}

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

@@ -37,8 +37,8 @@ typedef struct unk_D_86E04BFC {
/* 0x16 */ s16 unk_16;
} unk_D_86E04BFC; // size = 0x18
static minigameActor metadodPlayers[4];
static minigameActor metapodMinigameFallingRocks[20];
static minigameActor miniMetapods[4];
static minigameActor miniMetapodRocks[20];
static s16 D_86E08E40;
static unk_D_800AC870* D_86E08E44;
@@ -455,8 +455,8 @@ static u32 D_86E04AE0[] = {
static s16 D_86E04B20 = 0;
static s16 D_86E04B24 = 1;
static s16 D_86E04B28 = 0;
static minigameActor* tempMetadodPlayer = metadodPlayers;
static minigameActor* tempFallingRock = metapodMinigameFallingRocks;
static minigameActor* miniMetapodPtr = miniMetapods;
static minigameActor* miniMetapodRockPtr = miniMetapodRocks;
static u32 D_86E04B34[] = {
0x0C00FFFF, 0x05000000, 0x0B00001E, 0x00000000, 0x014000F0, 0xFFE20032, 0x00000000, 0x00000000,
0x05000000, 0x0D000000, 0x05000000, 0x14000000, 0x002B0012, 0xFFFFFF32, 0x16FFFFFF, 0x0F000003,
@@ -601,10 +601,10 @@ void func_86E001E4(minigameActor* metapod, s32 arg1) {
void initMetapodPlayers(void) {
s32 i;
tempMetadodPlayer = metadodPlayers;
miniMetapodPtr = miniMetapods;
for (i = 0; i < 4; i++) {
func_86E001E4(tempMetadodPlayer, i);
tempMetadodPlayer++;
func_86E001E4(miniMetapodPtr, i);
miniMetapodPtr++;
}
}
@@ -628,7 +628,7 @@ void func_86E0036C(minigameActor* arg0) {
case 1:
func_86E0034C(arg0);
func_879002B8(arg0, 1, -1, 1);
func_81407D48(1.0f, arg0->unk_190, arg0->unk_214, func_879029F0, &D_87903E40, 4);
func_81407D48(1.0f, arg0->unk_190, arg0->totalRot, func_879029F0, &D_87903E40, 4);
arg0->unk_23E++;
break;
@@ -807,15 +807,15 @@ void func_86E007CC(minigameActor* metapod, s32 player) {
sp20 = 0xC;
}
tempFallingRock = metapodMinigameFallingRocks;
miniMetapodRockPtr = miniMetapodRocks;
for (i = 0; i < 20; i++) {
if ((tempFallingRock->unk_270 != 0) && (player == tempFallingRock->unk_266)) {
if (tempFallingRock->unk_29E < sp20) {
if ((miniMetapodRockPtr->unk_270 != 0) && (player == miniMetapodRockPtr->unk_266)) {
if (miniMetapodRockPtr->unk_29E < sp20) {
var_t0 = 1;
sp20 = tempFallingRock->unk_29E;
sp20 = miniMetapodRockPtr->unk_29E;
}
}
tempFallingRock++;
miniMetapodRockPtr++;
}
sp20--;
@@ -857,7 +857,7 @@ void func_86E00924(minigameActor* metapod, s32 arg1) {
metapod->unk_23E = 1;
metapod->unk_272 = 4;
metapod->unk_242++;
func_81407D48(1.0f, metapod->unk_190, metapod->unk_214, func_879029F0, &D_87903E40, 4);
func_81407D48(1.0f, metapod->unk_190, metapod->totalRot, func_879029F0, &D_87903E40, 4);
} else {
metapod->unk_242 = 0x64;
}
@@ -897,106 +897,106 @@ void func_86E00AF4(void) {
s32 i;
tempControllerPtr = gPlayer1Controller;
tempMetadodPlayer = metadodPlayers;
miniMetapodPtr = miniMetapods;
for (i = 0; i < 4; i++) {
tempMetadodPlayer->unk_000.unk_01C = 0;
tempMetadodPlayer->unk_272 = 0;
miniMetapodPtr->unk_000.unk_01C = 0;
miniMetapodPtr->unk_272 = 0;
if (minigameInputLock != 0) {
if (tempMetadodPlayer->isHuman == 0) {
func_86E0036C(tempMetadodPlayer);
if (miniMetapodPtr->isHuman == 0) {
func_86E0036C(miniMetapodPtr);
} else {
func_86E00924(tempMetadodPlayer, i);
func_86E00924(miniMetapodPtr, i);
}
}
func_87900770(tempMetadodPlayer);
func_87900808(tempMetadodPlayer);
func_87900770(miniMetapodPtr);
func_87900808(miniMetapodPtr);
tempMetadodPlayer++;
miniMetapodPtr++;
tempControllerPtr++;
}
}
s32 metapodRockCollisionCheck_void(void) {
return metapodRockCollisionCheck(tempFallingRock, &metadodPlayers[tempFallingRock->unk_266]);
return metapodRockCollisionCheck(miniMetapodRockPtr, &miniMetapods[miniMetapodRockPtr->unk_266]);
}
s32 func_86E00C34(s32 arg0) {
s32 func_86E00C34(s32 nPlayer) {
s32 sp1C = 0;
if (metapodRockCollisionCheck_void() != 0) {
tempMetadodPlayer->unk_260 = 1;
if (tempMetadodPlayer->unk_272 != 0) { // if hardened ? colliding ?
func_86E001A0(7, arg0);
miniMetapodPtr->unk_260 = 1;
if (miniMetapodPtr->unk_272 != 0) { // if hardened ? colliding ?
func_86E001A0(7, nPlayer);
sp1C = 1;
} else {
tempMetadodPlayer->unk_240 = 1; // set the metapod's squashing animation
func_86E004FC(tempMetadodPlayer);
miniMetapodPtr->unk_240 = 1; // rock squashing
func_86E004FC(miniMetapodPtr);
sp1C = 2;
}
}
return sp1C;
}
void func_86E00CAC(minigameActor* arg0, s32 arg1) {
void func_86E00CAC(UNUSED minigameActor* metapod, s32 nPlayer) {
s32 i;
s32 colliding;
tempFallingRock = metapodMinigameFallingRocks;
miniMetapodRockPtr = miniMetapodRocks;
for (i = 0; i < 20; i++) {
if ((tempFallingRock->unk_270 != 0) && (arg1 == tempFallingRock->unk_266) && (tempFallingRock->unk_260 == 0)) {
colliding = func_86E00C34(arg1);
if ((miniMetapodRockPtr->unk_270 != 0) && (nPlayer == miniMetapodRockPtr->unk_266) && (miniMetapodRockPtr->unk_260 == 0)) {
colliding = func_86E00C34(nPlayer);
if (colliding != 0) {
tempFallingRock->unk_260 = 1;
miniMetapodRockPtr->unk_260 = 1;
if (colliding == 1) {
tempFallingRock->unk_272 = 1;
miniMetapodRockPtr->unk_272 = 1;
} else {
tempFallingRock->unk_272 = 0;
miniMetapodRockPtr->unk_272 = 0;
}
break;
}
}
tempFallingRock++;
miniMetapodRockPtr++;
}
}
void func_86E00D78(minigameActor* arg0, s32 arg1) {
if ((tempMetadodPlayer->unk_25A > 0) && (arg0->unk_2A8 == 0)) {
if (tempMetadodPlayer->unk_25A >= 0x28) {
tempMetadodPlayer->unk_258 -= tempMetadodPlayer->unk_25A;
tempMetadodPlayer->unk_25A = 0;
if ((miniMetapodPtr->unk_25A > 0) && (arg0->unk_2A8 == 0)) {
if (miniMetapodPtr->unk_25A >= 0x28) {
miniMetapodPtr->unk_258 -= miniMetapodPtr->unk_25A;
miniMetapodPtr->unk_25A = 0;
} else {
tempMetadodPlayer->unk_25A--;
tempMetadodPlayer->unk_258--;
miniMetapodPtr->unk_25A--;
miniMetapodPtr->unk_258--;
}
if (tempMetadodPlayer->unk_258 < 0) {
tempMetadodPlayer->unk_258 = 0;
if (miniMetapodPtr->unk_258 < 0) {
miniMetapodPtr->unk_258 = 0;
}
}
if (tempMetadodPlayer->unk_258 == 0) {
if (tempMetadodPlayer->unk_2A4 == 0) {
if (miniMetapodPtr->unk_258 == 0) {
if (miniMetapodPtr->unk_2A4 == 0) {
func_86E001A0(9, arg1);
func_879002B8(tempMetadodPlayer, 3, 1, 0);
tempMetadodPlayer->unk_2A4 = 1;
tempMetadodPlayer->unk_2AA = 1;
func_879002B8(miniMetapodPtr, 3, 1, 0);
miniMetapodPtr->unk_2A4 = 1;
miniMetapodPtr->unk_2AA = 1;
}
} else {
switch (tempMetadodPlayer->unk_240) {
switch (miniMetapodPtr->unk_240) {
case 1:
tempMetadodPlayer->unk_25A += 0x1E;
func_879002B8(tempMetadodPlayer, 2, 0, 1);
miniMetapodPtr->unk_25A += 0x1E;
func_879002B8(miniMetapodPtr, 2, 0, 1);
func_86E001A0(8, arg1);
tempMetadodPlayer->unk_240++;
miniMetapodPtr->unk_240++;
break;
case 2:
if (tempMetadodPlayer->unk_248 == 0) {
tempMetadodPlayer->unk_240 = 0;
if (miniMetapodPtr->unk_248 == 0) {
miniMetapodPtr->unk_240 = 0;
}
break;
}
@@ -1006,37 +1006,37 @@ void func_86E00D78(minigameActor* arg0, s32 arg1) {
void func_86E00ED0(void) {
s32 i;
tempMetadodPlayer = metadodPlayers;
miniMetapodPtr = miniMetapods;
for (i = 0; i < 4; i++) {
if (minigameInputLock != 0) {
func_86E00CAC(tempMetadodPlayer, i);
func_86E00D78(tempMetadodPlayer, i);
func_86E00CAC(miniMetapodPtr, i);
func_86E00D78(miniMetapodPtr, i);
}
tempMetadodPlayer++;
miniMetapodPtr++;
}
}
void func_86E00F60(void) {
func_879003A0(tempMetadodPlayer);
func_879003A0(miniMetapodPtr);
tempMetadodPlayer->unk_000.unk_024.x = tempMetadodPlayer->unk_190.x;
tempMetadodPlayer->unk_000.unk_024.y = tempMetadodPlayer->unk_190.y;
tempMetadodPlayer->unk_000.unk_024.z = tempMetadodPlayer->unk_190.z;
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;
tempMetadodPlayer->unk_000.unk_01E.x = tempMetadodPlayer->unk_214.x;
tempMetadodPlayer->unk_000.unk_01E.y = tempMetadodPlayer->unk_214.y;
tempMetadodPlayer->unk_000.unk_01E.z = tempMetadodPlayer->unk_214.z;
miniMetapodPtr->unk_000.unk_01E.x = miniMetapodPtr->totalRot.x;
miniMetapodPtr->unk_000.unk_01E.y = miniMetapodPtr->totalRot.y;
miniMetapodPtr->unk_000.unk_01E.z = miniMetapodPtr->totalRot.z;
}
void func_86E00FD8(void) {
s32 i;
tempMetadodPlayer = metadodPlayers;
miniMetapodPtr = miniMetapods;
for (i = 0; i < 4; i++) {
func_86E00F60();
tempMetadodPlayer++;
miniMetapodPtr++;
}
}
@@ -1065,12 +1065,12 @@ void initFallingRocks(void) {
s32 i;
s32 j;
tempFallingRock = metapodMinigameFallingRocks;
miniMetapodRockPtr = miniMetapodRocks;
for (i = 0; i < 4; i++) {
for (j = 0; j < 5; j++) {
func_86E0103C(tempFallingRock, i);
tempFallingRock++;
func_86E0103C(miniMetapodRockPtr, i);
miniMetapodRockPtr++;
}
}
@@ -1108,20 +1108,20 @@ void func_86E01188(void) {
break;
}
metapod = metadodPlayers;
metapod = miniMetapods;
for (i = 0; i < 4; i++, metapod++) {
if (metapod->unk_2AA == 0) {
var_s1 = 0;
tempFallingRock = &metapodMinigameFallingRocks[i * 5];
miniMetapodRockPtr = &miniMetapodRocks[i * 5];
for (j = 0; j < D_86E04B24; j++) {
func_86E0103C(tempFallingRock, i);
func_86E0103C(miniMetapodRockPtr, i);
tempFallingRock->unk_23E = 1;
tempFallingRock->unk_29E = var_s1;
miniMetapodRockPtr->unk_23E = 1;
miniMetapodRockPtr->unk_29E = var_s1;
var_s1 += var_s5;
tempFallingRock++;
miniMetapodRockPtr++;
}
}
}
@@ -1132,14 +1132,14 @@ void func_86E01310(minigameActor* rock) {
s16 temp_a1 = rock->unk_266;
rock->unk_29E = temp_v1 - 1;
rock->localOrigin.y += D_86E04BFC[temp_a1].unk_00.y + metadodPlayers[temp_a1].unk_28C;
rock->localOrigin.y += D_86E04BFC[temp_a1].unk_00.y + miniMetapods[temp_a1].unk_28C;
rock->unk_210 = 0.7f;
rock->unk_1F8 = 0.0f;
rock->unk_1FC = temp_v1 * rock->unk_210 * 0.5f;
rock->unk_200 =
((metadodPlayers[temp_a1].localOrigin.z + (metadodPlayers[temp_a1].unk_288 * 0.5f)) - rock->localOrigin.z) / temp_v1;
((miniMetapods[temp_a1].localOrigin.z + (miniMetapods[temp_a1].unk_288 * 0.5f)) - rock->localOrigin.z) / temp_v1;
rock->unk_270 = 1;
rock->unk_000.unk_000.unk_01 |= 1;
@@ -1156,7 +1156,7 @@ void func_86E01428(minigameActor* rock) {
s16 temp_a1 = rock->unk_266;
Vec3f sp3C;
if ((D_87903DA8 != 0) || (metadodPlayers[temp_a1].unk_258 == 0)) {
if ((D_87903DA8 != 0) || (miniMetapods[temp_a1].unk_258 == 0)) {
switch (rock->unk_23E) {
case 1:
rock->unk_23E = 0;
@@ -1191,7 +1191,7 @@ void func_86E01428(minigameActor* rock) {
rock->unk_1FC = 5.0f;
rock->unk_200 = 1.5f;
func_86E01414(rock);
func_81407D48(1.0f, rock->unk_190, rock->unk_214, func_87901F04, &D_87903E28, 4);
func_81407D48(1.0f, rock->unk_190, rock->totalRot, func_87901F04, &D_87903E28, 4);
} else {
rock->unk_23E++;
}
@@ -1206,7 +1206,7 @@ void func_86E01428(minigameActor* rock) {
sp3C.y = 0.0f;
sp3C.z = rock->unk_190.z;
func_81407D48(1.0f, sp3C, rock->unk_214, func_87902068, &D_87903E10, 4);
func_81407D48(1.0f, sp3C, rock->totalRot, func_87902068, &D_87903E10, 4);
rock->unk_23E++;
break;
@@ -1250,11 +1250,11 @@ void func_86E0172C(minigameActor* rock) {
void func_86E017C0(void) {
s32 i;
tempFallingRock = metapodMinigameFallingRocks;
miniMetapodRockPtr = miniMetapodRocks;
for (i = 0; i < 20; i++) {
func_86E01428(tempFallingRock);
func_86E0172C(tempFallingRock);
tempFallingRock++;
func_86E01428(miniMetapodRockPtr);
func_86E0172C(miniMetapodRockPtr);
miniMetapodRockPtr++;
}
}
@@ -1269,21 +1269,21 @@ void func_86E0182C(minigameActor* arg0) {
arg0->unk_000.unk_024.y = arg0->unk_190.y;
arg0->unk_000.unk_024.z = arg0->unk_190.z;
arg0->unk_000.unk_01E.x = arg0->unk_214.x;
arg0->unk_000.unk_01E.y = arg0->unk_214.y;
arg0->unk_000.unk_01E.z = arg0->unk_214.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) {
s32 var_s1;
tempFallingRock = metapodMinigameFallingRocks;
miniMetapodRockPtr = miniMetapodRocks;
var_s1 = 0;
do {
func_86E016EC(tempFallingRock);
func_86E0182C(tempFallingRock);
func_86E016EC(miniMetapodRockPtr);
func_86E0182C(miniMetapodRockPtr);
var_s1 += 1;
tempFallingRock = &tempFallingRock[1];
miniMetapodRockPtr = &miniMetapodRockPtr[1];
} while (var_s1 != 0x14);
}
@@ -1321,7 +1321,7 @@ void func_86E019F4(void) {
s32 i;
s32 var_a2;
tempFallingRock = metapodMinigameFallingRocks;
miniMetapodRockPtr = miniMetapodRocks;
switch (D_86E04B28) {
case 1:
func_86E01188();
@@ -1331,11 +1331,11 @@ void func_86E019F4(void) {
case 2:
var_a2 = 1;
for (i = 0; i < 20; i++) {
if (tempFallingRock->unk_23E != 0) {
if (miniMetapodRockPtr->unk_23E != 0) {
var_a2 = 0;
break;
}
tempFallingRock++;
miniMetapodRockPtr++;
}
if (var_a2 != 0) {
@@ -1366,33 +1366,33 @@ s32 func_86E01B08(void) {
s32 var_t3 = 0;
s32 var_v0_5;
tempMetadodPlayer = metadodPlayers;
miniMetapodPtr = miniMetapods;
for (i = 0; i < 4; i++) {
if (tempMetadodPlayer->unk_2A6 < var_a3) {
var_a3 = tempMetadodPlayer->unk_2A6;
if (miniMetapodPtr->unk_2A6 < var_a3) {
var_a3 = miniMetapodPtr->unk_2A6;
}
if (tempMetadodPlayer->unk_2A4 == 1) {
if (miniMetapodPtr->unk_2A4 == 1) {
var_t1++;
}
if (tempMetadodPlayer->unk_2A4 == 2) {
if (miniMetapodPtr->unk_2A4 == 2) {
var_t2++;
}
tempMetadodPlayer++;
miniMetapodPtr++;
}
if (var_t1 != 0) {
var_a3 -= var_t1;
tempMetadodPlayer = metadodPlayers;
miniMetapodPtr = miniMetapods;
for (i = 0; i < 4; i++) {
if (tempMetadodPlayer->unk_2A4 == 1) {
tempMetadodPlayer->unk_2A4 = 2;
tempMetadodPlayer->unk_2A6 = var_a3;
if (miniMetapodPtr->unk_2A4 == 1) {
miniMetapodPtr->unk_2A4 = 2;
miniMetapodPtr->unk_2A6 = var_a3;
}
tempMetadodPlayer++;
miniMetapodPtr++;
}
}
@@ -1406,40 +1406,40 @@ s32 func_86E01B08(void) {
var_v0_5 = 3;
}
tempMetadodPlayer = metadodPlayers;
miniMetapodPtr = miniMetapods;
switch (var_v0_5) {
case 1:
for (i = 0; i < 4; i++) {
if (tempMetadodPlayer->unk_2A6 == 5) {
tempMetadodPlayer->unk_2A8 = 1;
tempMetadodPlayer->unk_2AA = 1;
tempMetadodPlayer->unk_2A6 = 1;
if (miniMetapodPtr->unk_2A6 == 5) {
miniMetapodPtr->unk_2A8 = 1;
miniMetapodPtr->unk_2AA = 1;
miniMetapodPtr->unk_2A6 = 1;
var_t3 = 1;
func_87802F00(i);
break;
}
tempMetadodPlayer++;
miniMetapodPtr++;
}
break;
case 2:
var_t3 = 1;
for (i = 0; i < 4; i++) {
tempMetadodPlayer->unk_2AA = 1;
tempMetadodPlayer->unk_2A6 = 0;
tempMetadodPlayer++;
miniMetapodPtr->unk_2AA = 1;
miniMetapodPtr->unk_2A6 = 0;
miniMetapodPtr++;
}
break;
case 3:
for (i = 0; i < 4; i++) {
if (tempMetadodPlayer->unk_2A6 == 1) {
tempMetadodPlayer->unk_2AA = 1;
tempMetadodPlayer->unk_2A6 = 5;
if (miniMetapodPtr->unk_2A6 == 1) {
miniMetapodPtr->unk_2AA = 1;
miniMetapodPtr->unk_2A6 = 5;
var_t3 = 1;
}
tempMetadodPlayer++;
miniMetapodPtr++;
}
break;
}
@@ -1455,7 +1455,7 @@ s32 func_86E01E34(void) {
s32 var_s3 = 0;
minigameActor* var_s0;
for (i = 0, var_s0 = metadodPlayers; i < 4; i++, var_s0++) {
for (i = 0, var_s0 = miniMetapods; i < 4; i++, var_s0++) {
if (var_s0->unk_2A8 != 0) {
func_879002B8(var_s0, 4, -1, 0);
var_s3 = 1;
@@ -1468,11 +1468,11 @@ s32 func_86E01E34(void) {
void func_86E01EB0(void) {
s32 i;
tempMetadodPlayer = metadodPlayers;
miniMetapodPtr = miniMetapods;
for (i = 0; i < 4; i++) {
if (tempMetadodPlayer) {}
if (miniMetapodPtr) {}
tempMetadodPlayer++;
miniMetapodPtr++;
}
}
@@ -1497,7 +1497,7 @@ s32 func_86E01EE8(void) {
s32 func_86E01F50(void) {
s32 i;
s32 ret = 1;
minigameActor* var_v0 = metapodMinigameFallingRocks;
minigameActor* var_v0 = miniMetapodRocks;
for (i = 0; i < 20; i++, var_v0++) {
if (var_v0->unk_23E != 0) {
@@ -1578,7 +1578,7 @@ void func_86E02170(void) {
s32 i;
for (i = 0; i < 4; i++) {
func_8780024C(0x1A + i * 0x4A, 0xD0, 0x32, metadodPlayers[i].unk_258, metadodPlayers[i].unk_25C);
func_8780024C(0x1A + i * 0x4A, 0xD0, 0x32, miniMetapods[i].unk_258, miniMetapods[i].unk_25C);
}
}
@@ -1735,7 +1735,7 @@ void func_86E02974(void) {
}
void func_86E02A28(void) {
minigameActor* metapod = metadodPlayers;
minigameActor* metapod = miniMetapods;
if (BTN_IS_PRESSED(gPlayer1Controller, BTN_A) && (metapod->unk_23E == 0)) {
metapod->metapodInputLockTimer = 4;
@@ -1821,11 +1821,11 @@ void func_86E02C5C(void) {
func_8001BB20();
for (i = 0; i < 4; i++) {
func_8001BB58(&metadodPlayers[i].unk_000);
func_8001BB58(&miniMetapods[i].unk_000);
}
for (i = 0; i < 20; i++) {
func_8001BB58(&metapodMinigameFallingRocks[i].unk_000);
func_8001BB58(&miniMetapodRocks[i].unk_000);
}
func_8001987C();
@@ -1836,28 +1836,28 @@ void func_86E02C5C(void) {
var_v1 = func_878001E8(2);
}
metadodPlayers[i].unk_23C = D_86E04CB4[var_v1][0];
metadodPlayers[i].unk_168 = func_80019D18(metadodPlayers[i].unk_23C);
metadodPlayers[i].unk_288 = D_86E04CB4[var_v1][1];
metadodPlayers[i].unk_28C = D_86E04CB4[var_v1][2];
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];
func_8001BC34(&metadodPlayers[i].unk_000, 0, metadodPlayers[i].unk_23C,
metadodPlayers[i].unk_168->unk_08->unk_00[0]);
func_8001BD04(&metadodPlayers[i].unk_000, 0);
func_8001BC34(&miniMetapods[i].unk_000, 0, miniMetapods[i].unk_23C,
miniMetapods[i].unk_168->unk_08->unk_00[0]);
func_8001BD04(&miniMetapods[i].unk_000, 0);
if (metadodPlayers) {}
if (miniMetapods) {}
}
temp_s1_2 = func_80019D18(0x9C);
for (i = 0; i < 20; i++) {
metapodMinigameFallingRocks[i].unk_23C = 0x9C;
metapodMinigameFallingRocks[i].unk_168 = temp_s1_2;
miniMetapodRocks[i].unk_23C = 0x9C;
miniMetapodRocks[i].unk_168 = temp_s1_2;
func_8001BC34(&metapodMinigameFallingRocks[i].unk_000, 0, metapodMinigameFallingRocks[i].unk_23C,
func_8001BC34(&miniMetapodRocks[i].unk_000, 0, miniMetapodRocks[i].unk_23C,
temp_s1_2->unk_08->unk_00[0]);
func_8001BD04(&metapodMinigameFallingRocks[i].unk_000, 0);
func_8001BD04(&miniMetapodRocks[i].unk_000, 0);
metapodMinigameFallingRocks[i].unk_000.unk_000.unk_01 &= ~1;
miniMetapodRocks[i].unk_000.unk_000.unk_01 &= ~1;
}
}

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

@@ -31,9 +31,9 @@ extern u32 D_03049020[];
extern u32 D_030483A0[];
extern u32 D_03047720[];
static minigameActor sandshrewPlayers[4];
static minigameActor sandshrewHoles[4];
static minigameActor sandshrewWaterGeisers[4];
static minigameActor miniSandshrews[4];
static minigameActor miniSandshrewHoles[4];
static minigameActor miniSandshrewGeisers[4];
static s16 D_86F0D260;
static unk_D_800AC870* D_86F0D264;
@@ -1458,9 +1458,9 @@ static u32 D_86F0AFB8[] = {
0x000023D7, 0x000023D7, 0x05000000, 0x03000000, D_86F0ACE0, 0x06000000, 0x06000000, 0x01000000,
};
static minigameActor* tempSandshrewPlayer = sandshrewPlayers;
static minigameActor* tempSandshrewHole = sandshrewHoles;
static minigameActor* tempSandshrewWaterGeiser = sandshrewWaterGeisers;
static minigameActor* miniSandshrewPtr = miniSandshrews;
static minigameActor* miniSandshrewHolePtr = miniSandshrewHoles;
static minigameActor* miniSandshrewGeiserPtr = miniSandshrewGeisers;
static u32 D_86F0B004[] = {
0x0C00FFFF, 0x05000000, 0x0B00001E, 0x00000000, 0x014000F0, 0x0000000F, 0x00000000, 0x00000000,
@@ -1616,9 +1616,9 @@ void initSandshrew(minigameActor* sandshrew, s32 player) {
sandshrew->unk_274 = 0.0f;
sandshrew->unk_27C = 0.0f;
sandshrew->unk_214.x = sandshrew->unk_21A = 0;
sandshrew->unk_214.y = sandshrew->unk_21C = 0;
sandshrew->unk_214.z = sandshrew->unk_21E = 0;
sandshrew->totalRot.x = sandshrew->unk_21A = 0;
sandshrew->totalRot.y = sandshrew->unk_21C = 0;
sandshrew->totalRot.z = sandshrew->unk_21E = 0;
sandshrew->unk_258 = sandshrew->unk_25C = 0x64;
sandshrew->unk_238 = sandshrew->unk_23A = 0;
@@ -1635,10 +1635,10 @@ void initSandshrew(minigameActor* sandshrew, s32 player) {
void initSandshrews(void) {
s32 i;
tempSandshrewPlayer = sandshrewPlayers;
miniSandshrewPtr = miniSandshrews;
for (i = 0; i < 4; i++) {
initSandshrew(tempSandshrewPlayer, i);
tempSandshrewPlayer++;
initSandshrew(miniSandshrewPtr, i);
miniSandshrewPtr++;
}
}
@@ -1650,12 +1650,12 @@ void func_86F00370(void) {
s32 i;
tempControllerPtr = gPlayer1Controller;
tempSandshrewPlayer = sandshrewPlayers;
miniSandshrewPtr = miniSandshrews;
for (i = 0; i < 4; i++) {
func_86F0035C(tempSandshrewPlayer);
func_86F0035C(miniSandshrewPtr);
tempSandshrewPlayer++;
miniSandshrewPtr++;
tempControllerPtr++;
}
}
@@ -1817,12 +1817,12 @@ void func_86F00920(minigameActor* sandshrew) {
if (D_8140E6CC == 0) {
if (sandshrew->unk_190.y > -10.0f) {
func_81407D48(1.0f, sandshrew->unk_190, sandshrew->unk_214, func_87902224, &D_87903E10, 1); // particles
func_81407D48(1.0f, sandshrew->unk_190, sandshrew->totalRot, func_87902224, &D_87903E10, 1); // particles
} else {
sp48.x = sandshrew->unk_190.x;
sp48.y = -5.0f;
sp48.z = sandshrew->unk_190.z;
func_81407D48(1.0f, sp48, sandshrew->unk_214, func_879023EC, &D_87903E10, 1); // particles
func_81407D48(1.0f, sp48, sandshrew->totalRot, func_879023EC, &D_87903E10, 1); // particles
}
}
@@ -1833,7 +1833,7 @@ void func_86F00920(minigameActor* sandshrew) {
sandshrew->unk_1C0.y -= holeDeepeness;
}
func_86F00188(3, sandshrew - sandshrewPlayers);
func_86F00188(3, sandshrew - miniSandshrews);
if (func_800174E4(&sandshrew->unk_000) != 0) {
func_80017464(&sandshrew->unk_000, 0);
}
@@ -1843,7 +1843,7 @@ void func_86F00920(minigameActor* sandshrew) {
func_800173DC(&sandshrew->unk_000, 0, sandshrew->unk_000.unk_040.unk_04, 0x10000);
func_80017464(&sandshrew->unk_000, 0);
func_80017454(&sandshrew->unk_000, 0x10000);
func_86F00188(4, sandshrew - sandshrewPlayers);
func_86F00188(4, sandshrew - miniSandshrews);
sandshrew->unk_23E++;
}
break;
@@ -1866,7 +1866,7 @@ void func_86F00920(minigameActor* sandshrew) {
case 0x65:
minigameActorLocalOriginToZero(sandshrew);
func_80015390(&tempSandshrewWaterGeiser->unk_000, 0xA, &sandshrew->unk_1C0);
func_80015390(&miniSandshrewGeiserPtr->unk_000, 0xA, &sandshrew->unk_1C0);
break;
}
}
@@ -1876,26 +1876,26 @@ void func_86F00D04(void) {
tempControllerPtr = gPlayer1Controller;
tempSandshrewPlayer = sandshrewPlayers;
tempSandshrewHole = sandshrewHoles;
tempSandshrewWaterGeiser = sandshrewWaterGeisers;
miniSandshrewPtr = miniSandshrews;
miniSandshrewHolePtr = miniSandshrewHoles;
miniSandshrewGeiserPtr = miniSandshrewGeisers;
for (i = 0; i < 4; i++) {
if (minigameInputLock != false) {
if (tempSandshrewPlayer->isHuman == 0) {
sandshrewPlayerInput(tempSandshrewPlayer);
if (miniSandshrewPtr->isHuman == 0) {
sandshrewPlayerInput(miniSandshrewPtr);
} else {
sandshrewCompControls(tempSandshrewPlayer);
sandshrewCompControls(miniSandshrewPtr);
}
}
func_86F00920(tempSandshrewPlayer);
func_87900770(tempSandshrewPlayer);
func_87900808(tempSandshrewPlayer);
func_86F00920(miniSandshrewPtr);
func_87900770(miniSandshrewPtr);
func_87900808(miniSandshrewPtr);
tempSandshrewPlayer++;
tempSandshrewHole++;
tempSandshrewWaterGeiser++;
miniSandshrewPtr++;
miniSandshrewHolePtr++;
miniSandshrewGeiserPtr++;
tempControllerPtr++;
}
@@ -1912,11 +1912,11 @@ void initSandshrewHole(minigameActor* a0, s32 arg1) {
sandshrewHole->localOrigin.y = sandshrewPositions[arg1].y;
sandshrewHole->localOrigin.z = sandshrewPositions[arg1].z;
sandshrewHole->unk_214.x = sandshrewHole->unk_21A = sandshrewHole->unk_220 = sandshrewHole->unk_226 =
sandshrewHole->totalRot.x = sandshrewHole->unk_21A = sandshrewHole->unk_220 = sandshrewHole->unk_226 =
sandshrewHole->unk_22C = 0;
sandshrewHole->unk_214.y = sandshrewHole->unk_21C = sandshrewHole->unk_222 = sandshrewHole->unk_228 =
sandshrewHole->totalRot.y = sandshrewHole->unk_21C = sandshrewHole->unk_222 = sandshrewHole->unk_228 =
sandshrewHole->unk_22E = 0;
sandshrewHole->unk_214.z = sandshrewHole->unk_21E = sandshrewHole->unk_224 = sandshrewHole->unk_22A =
sandshrewHole->totalRot.z = sandshrewHole->unk_21E = sandshrewHole->unk_224 = sandshrewHole->unk_22A =
sandshrewHole->unk_230 = 0;
sandshrewHole->unk_1C0.x = 0.0f;
@@ -1936,10 +1936,10 @@ void initSandshrewHole(minigameActor* a0, s32 arg1) {
void initSandshrewHoles(void) {
s32 i;
tempSandshrewHole = sandshrewHoles;
miniSandshrewHolePtr = miniSandshrewHoles;
for (i = 0; i < 4; i++) {
initSandshrewHole(tempSandshrewHole, i);
tempSandshrewHole++;
initSandshrewHole(miniSandshrewHolePtr, i);
miniSandshrewHolePtr++;
}
}
@@ -1965,16 +1965,16 @@ void func_86F00F68(minigameActor* sandshrewHole, minigameActor* sandshrewPlayer)
void func_86F01014(void) {
s32 i;
tempSandshrewHole = sandshrewHoles;
tempSandshrewPlayer = sandshrewPlayers;
miniSandshrewHolePtr = miniSandshrewHoles;
miniSandshrewPtr = miniSandshrews;
for (i = 0; i < 4; i++) {
func_86F00F68(tempSandshrewHole, tempSandshrewPlayer);
func_87900770(tempSandshrewHole);
func_87900808(tempSandshrewHole);
func_86F00F68(miniSandshrewHolePtr, miniSandshrewPtr);
func_87900770(miniSandshrewHolePtr);
func_87900808(miniSandshrewHolePtr);
tempSandshrewHole++;
tempSandshrewPlayer++;
miniSandshrewHolePtr++;
miniSandshrewPtr++;
}
}
@@ -1993,9 +1993,9 @@ void initSandshrewWaterGeiser(minigameActor* arg0, s32 arg1) {
geiser->unk_22E = 0;
geiser->unk_230 = 0;
geiser->unk_214.x = geiser->unk_21A = geiser->unk_220 = geiser->unk_226 = geiser->unk_22C;
geiser->unk_214.y = geiser->unk_21C = geiser->unk_222 = geiser->unk_228 = geiser->unk_22E;
geiser->unk_214.z = geiser->unk_21E = geiser->unk_224 = geiser->unk_22A = geiser->unk_230;
geiser->totalRot.x = geiser->unk_21A = geiser->unk_220 = geiser->unk_226 = geiser->unk_22C;
geiser->totalRot.y = geiser->unk_21C = geiser->unk_222 = geiser->unk_228 = geiser->unk_22E;
geiser->totalRot.z = geiser->unk_21E = geiser->unk_224 = geiser->unk_22A = geiser->unk_230;
geiser->unk_1C0.x = 0.0f;
geiser->unk_1C0.y = 0.0f;
@@ -2014,11 +2014,11 @@ void initSandshrewWaterGeiser(minigameActor* arg0, s32 arg1) {
void initSandshrewWaterGeisers(void) {
s32 i;
tempSandshrewWaterGeiser = sandshrewWaterGeisers;
miniSandshrewGeiserPtr = miniSandshrewGeisers;
for (i = 0; i < 4; i++) {
initSandshrewWaterGeiser(tempSandshrewWaterGeiser, i);
tempSandshrewWaterGeiser++;
initSandshrewWaterGeiser(miniSandshrewGeiserPtr, i);
miniSandshrewGeiserPtr++;
}
}
@@ -2030,7 +2030,7 @@ void func_86F011E8(minigameActor* geiser) {
geiser->unk_23E++;
break;
case 2: // first geiser animation ends
if (func_80017514(&tempSandshrewWaterGeiser->unk_000) != 0) {
if (func_80017514(&miniSandshrewGeiserPtr->unk_000) != 0) {
func_86F003FC(geiser, 1);
geiser->unk_23E++;
}
@@ -2045,14 +2045,14 @@ void func_86F011E8(minigameActor* geiser) {
void func_86F012B8(void) {
s32 i;
tempSandshrewWaterGeiser = sandshrewWaterGeisers;
miniSandshrewGeiserPtr = miniSandshrewGeisers;
for (i = 0; i < 4; i++) {
func_86F011E8(tempSandshrewWaterGeiser);
func_87900770(tempSandshrewWaterGeiser);
func_87900808(tempSandshrewWaterGeiser);
func_86F011E8(miniSandshrewGeiserPtr);
func_87900770(miniSandshrewGeiserPtr);
func_87900808(miniSandshrewGeiserPtr);
tempSandshrewWaterGeiser++;
miniSandshrewGeiserPtr++;
}
}
@@ -2117,28 +2117,28 @@ s32 func_86F014F8(void) {
var_s7 = 0;
var_s4 = -1;
tempSandshrewPlayer = sandshrewPlayers;
miniSandshrewPtr = miniSandshrews;
for (i = 0; i < 4; i++) {
if (tempSandshrewPlayer->unk_190.y < var_fs0) {
var_fs0 = tempSandshrewPlayer->unk_190.y;
if (miniSandshrewPtr->unk_190.y < var_fs0) {
var_fs0 = miniSandshrewPtr->unk_190.y;
}
tempSandshrewPlayer++;
miniSandshrewPtr++;
}
tempSandshrewPlayer = sandshrewPlayers;
tempSandshrewWaterGeiser = sandshrewWaterGeisers;
miniSandshrewPtr = miniSandshrews;
miniSandshrewGeiserPtr = miniSandshrewGeisers;
for (i = 0; i < 4; i++) {
if (tempSandshrewPlayer->unk_190.y <= var_fs0) {
tempSandshrewPlayer->unk_2A8 = 1;
if (miniSandshrewPtr->unk_190.y <= var_fs0) {
miniSandshrewPtr->unk_2A8 = 1;
var_s7 = 1;
var_s4 += 1;
tempSandshrewPlayer->unk_23E = 0x64;
tempSandshrewWaterGeiser->unk_23E = 1;
miniSandshrewPtr->unk_23E = 0x64;
miniSandshrewGeiserPtr->unk_23E = 1;
func_86F00188(5, i);
func_87802F00(i);
}
tempSandshrewPlayer++;
tempSandshrewWaterGeiser++;
miniSandshrewPtr++;
miniSandshrewGeiserPtr++;
}
D_87903DD4 = var_s4;
@@ -2148,10 +2148,10 @@ s32 func_86F014F8(void) {
void func_86F0164C(void) {
s32 i;
tempSandshrewPlayer = sandshrewPlayers;
miniSandshrewPtr = miniSandshrews;
for (i = 0; i < 4; i++) {
tempSandshrewPlayer->unk_274 = tempSandshrewPlayer->unk_27C = 0.0f;
tempSandshrewPlayer++;
miniSandshrewPtr->unk_274 = miniSandshrewPtr->unk_27C = 0.0f;
miniSandshrewPtr++;
}
}
@@ -2292,7 +2292,7 @@ void func_86F01C40(void) {
if (D_87903DC4 == -2) {
func_8001EBE0(0x10, -2);
if (D_87903DD0 == 0x18) {
func_879033FC(sandshrewPlayers);
func_879033FC(miniSandshrews);
}
func_8001EBE0(4, -2);
}
@@ -2462,15 +2462,15 @@ void func_86F02320(void) {
func_8001BB20();
for (i = 0; i < 4; i++) {
func_8001BB58(&sandshrewPlayers[i].unk_000);
func_8001BB58(&miniSandshrews[i].unk_000);
}
for (i = 0; i < 4; i++) {
func_8001BB58(&sandshrewHoles[i].unk_000);
func_8001BB58(&miniSandshrewHoles[i].unk_000);
}
for (i = 0; i < 4; i++) {
func_8001BB58(&sandshrewWaterGeisers[i].unk_000);
func_8001BB58(&miniSandshrewGeisers[i].unk_000);
}
func_8001987C();
@@ -2478,29 +2478,29 @@ void func_86F02320(void) {
temp_s1 = func_80019D18(0xA1);
for (i = 0; i < 4; i++) {
sandshrewPlayers[i].unk_23C = 0xA1;
sandshrewPlayers[i].unk_168 = temp_s1;
func_8001BC34(&sandshrewPlayers[i].unk_000, 0, sandshrewPlayers[i].unk_23C, temp_s1->unk_08->unk_00[0]);
func_8001BD04(&sandshrewPlayers[i].unk_000, 0);
miniSandshrews[i].unk_23C = 0xA1;
miniSandshrews[i].unk_168 = temp_s1;
func_8001BC34(&miniSandshrews[i].unk_000, 0, miniSandshrews[i].unk_23C, temp_s1->unk_08->unk_00[0]);
func_8001BD04(&miniSandshrews[i].unk_000, 0);
}
temp_s1 = func_80019D18(0x9D);
for (i = 0; i < 4; i++) {
sandshrewHoles[i].unk_23C = 0x9D;
sandshrewHoles[i].unk_168 = temp_s1;
func_8001BC34(&sandshrewHoles[i].unk_000, 0, sandshrewHoles[i].unk_23C, temp_s1->unk_08->unk_00[0]);
func_8001BD04(&sandshrewHoles[i].unk_000, 0);
miniSandshrewHoles[i].unk_23C = 0x9D;
miniSandshrewHoles[i].unk_168 = temp_s1;
func_8001BC34(&miniSandshrewHoles[i].unk_000, 0, miniSandshrewHoles[i].unk_23C, temp_s1->unk_08->unk_00[0]);
func_8001BD04(&miniSandshrewHoles[i].unk_000, 0);
}
temp_s1 = func_80019D18(0xA2);
for (i = 0; i < 4; i++) {
sandshrewWaterGeisers[i].unk_23C = 0xA2;
sandshrewWaterGeisers[i].unk_168 = temp_s1;
func_8001BC34(&sandshrewWaterGeisers[i].unk_000, 0, sandshrewWaterGeisers[i].unk_23C,
miniSandshrewGeisers[i].unk_23C = 0xA2;
miniSandshrewGeisers[i].unk_168 = temp_s1;
func_8001BC34(&miniSandshrewGeisers[i].unk_000, 0, miniSandshrewGeisers[i].unk_23C,
temp_s1->unk_08->unk_00[0]);
func_8001BD04(&sandshrewWaterGeisers[i].unk_000, 0);
func_8001BD04(&miniSandshrewGeisers[i].unk_000, 0);
}
}

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

@@ -11,7 +11,7 @@ typedef struct minigameActor {
/* 0x168 */ unk_D_86002F30* unk_168;
/* 0x16C */ Vec3f scale;
/* 0x178 */ char unk178[0x18]; // unused ?
/* 0x190 */ Vec3f unk_190; // position ?
/* 0x190 */ Vec3f unk_190; // global position ?
/* 0x19C */ Vec3f unk_19C; // position ? ** metapod only
/* 0x1A8 */ Vec3f localOrigin; // origin position
/* 0x1B4 */ Vec3f unk_1B4; // related to angle ** ekans only
@@ -20,11 +20,11 @@ typedef struct minigameActor {
/* 0x1D0 */ f32 unk_1D0; // unused ?
/* 0x1D4 */ f32 unk_1D4; // ??? ** ekans only
/* 0x1D8 */ Vec3f unk_1D8; // also position on skans' minigame? never used
/* 0x1E4 */ f32 unk_1E4; // ??? half of 28C
/* 0x1E4 */ f32 unk_1E4; // botton of the hitbox ? half of 28C
/* 0x1E8 */ char unk1E8[0x4]; // unused ?
/* 0x1EC */ f32 unk_1EC; // zero, never used
/* 0x1F0 */ f32 unk_1F0; // zero, never used
/* 0x1F4 */ f32 unk_1F4; // zero, never used
/* 0x1EC */ f32 unk_1EC; // always zero
/* 0x1F0 */ f32 unk_1F0; // always zero
/* 0x1F4 */ f32 unk_1F4; // always zero
/* 0x1F8 */ f32 unk_1F8; // speed (x) on ekans and metapod
/* 0x1FC */ f32 unk_1FC; // speed (y) on ekans and metapod
/* 0x200 */ f32 unk_200; // speed (z) on ekans and metapod
@@ -32,33 +32,33 @@ typedef struct minigameActor {
/* 0x208 */ f32 unk_208; // y acceleration on metapod ** metapod only
/* 0x20C */ f32 unk_20C; // z acceleration on metapod ** metapod only
/* 0x210 */ f32 unk_210; // ekans max heght ? ; rock max height on metapod
/* 0x214 */ Vec3s unk_214; // rotation?
/* 0x21A */ s16 unk_21A;
/* 0x21C */ s16 unk_21C;
/* 0x21E */ s16 unk_21E;
/* 0x220 */ s16 unk_220;
/* 0x222 */ s16 unk_222;
/* 0x224 */ s16 unk_224;
/* 0x226 */ s16 unk_226;
/* 0x228 */ s16 unk_228; // y angle?
/* 0x22A */ s16 unk_22A;
/* 0x22C */ s16 unk_22C;
/* 0x22E */ s16 unk_22E; // spining speed on ekans ; and maybe sandsrew?
/* 0x230 */ s16 unk_230;
/* 0x232 */ s16 unk_232;
/* 0x234 */ s16 unk_234;
/* 0x236 */ s16 unk_236;
/* 0x238 */ s16 unk_238;
/* 0x23A */ s16 unk_23A;
/* 0x23C */ s16 unk_23C; // model id ?
/* 0x214 */ Vec3s totalRot; // total rotation
/* 0x21A */ s16 unk_21A; // x rotation ? always zero
/* 0x21C */ s16 unk_21C; // y rotation on ekans, zero elsewhere
/* 0x21E */ s16 unk_21E; // z rotation ? always zero
/* 0x220 */ s16 unk_220; // x something, always zero
/* 0x222 */ s16 unk_222; // y something, always zero
/* 0x224 */ s16 unk_224; // z something, always zero
/* 0x226 */ s16 unk_226; // x rotation ?
/* 0x228 */ s16 unk_228; // y rotation (throwing direction on ekans)
/* 0x22A */ s16 unk_22A; // z rotation ?
/* 0x22C */ s16 unk_22C; // x spinning speed ?
/* 0x22E */ s16 unk_22E; // spinning speed on ekans ; and maybe sandsrew?
/* 0x230 */ s16 unk_230; // z spinning speed ?
/* 0x232 */ s16 unk_232; // always zero
/* 0x234 */ s16 unk_234; // rotation
/* 0x236 */ s16 unk_236; // always zero
/* 0x238 */ s16 unk_238; // always zero
/* 0x23A */ s16 unk_23A; // always zero
/* 0x23C */ s16 unk_23C; // ???
/* 0x23E */ s16 unk_23E; // animation id or state ?
/* 0x240 */ s16 unk_240; //
/* 0x240 */ s16 unk_240; // metapod rock squashed
/* 0x242 */ s16 unk_242;
/* 0x244 */ s16 unk_244;
/* 0x246 */ char unk246[0x2];
/* 0x248 */ s16 unk_248; // 0,1,2 - colliding? visibility? animation id?
/* 0x24A */ s16 unk_24A; // some flag related to collisions
/* 0x24C */ s16 unk_24C; // some flag related to collisions
/* 0x24A */ s16 unk_24A; // animation id ?
/* 0x24C */ s16 unk_24C; //
/* 0x24E */ char unk24E[0x6];
/* 0x254 */ s32 unk_254;
/* 0x258 */ s16 unk_258;
@@ -81,7 +81,7 @@ typedef struct minigameActor {
/* 0x280 */ f32 unk_280; // intensity of rotation? stick magnitude on ekans?
/* 0x284 */ f32 unk_284;
/* 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 unk_28C; // top of the hitbox ? / bounding box ? ; double of 1E4
/* 0x290 */ s16 unk_290;
/* 0x292 */ s16 unk_292;
/* 0x294 */ s16 unk_294;

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

@@ -100,13 +100,13 @@ s32 metapodRockCollisionCheck(minigameActor* fallingRock, minigameActor* metapod
}
// change animation on ekans' and metapod's minigames ?
void func_879002B8(minigameActor* arg0, s16 arg1, s16 arg2, s16 arg3) {
arg0->unk_248 = 1; // animation flag ?
arg0->unk_24A = arg1;
arg0->unk_24C = arg2;
arg0->unk_26A = arg3;
arg0->unk_26C = 0; // animation flag ?
arg0->unk_26E = 0;
void func_879002B8(minigameActor* poke, s16 arg1, s16 arg2, s16 arg3) {
poke->unk_248 = 1; // animation flag ?
poke->unk_24A = arg1;
poke->unk_24C = arg2;
poke->unk_26A = arg3;
poke->unk_26C = 0; // animation flag ?
poke->unk_26E = 0;
}
void func_879002FC(minigameActor* arg0, s16 arg1, s16 arg2, s16 arg3, s16 arg4) {
@@ -223,7 +223,7 @@ void func_879005C4(minigameActor* ekans) {
}
void func_8790060C(minigameActor* actor) {
actor->unk_214.x = actor->unk_214.y = actor->unk_214.z = 0;
actor->totalRot.x = actor->totalRot.y = actor->totalRot.z = 0;
actor->unk_21A = actor->unk_21C = actor->unk_21E = 0;
actor->unk_220 = actor->unk_222 = actor->unk_224 = 0;
actor->unk_226 = actor->unk_228 = actor->unk_22A = 0;
@@ -285,9 +285,9 @@ void func_87900770(minigameActor* poke) {
poke->unk_19C.y = poke->unk_19C.y + poke->unk_1E4;
poke->unk_214.x = poke->unk_21A + poke->unk_226 + poke->unk_232;
poke->unk_214.y = poke->unk_21C + poke->unk_228 + poke->unk_234;
poke->unk_214.z = poke->unk_21E + poke->unk_22A + poke->unk_236;
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;
}
void func_87900808(minigameActor* arg0) {
@@ -299,9 +299,9 @@ void func_87900808(minigameActor* arg0) {
arg0->unk_000.unk_024.y = arg0->unk_190.y;
arg0->unk_000.unk_024.z = arg0->unk_190.z;
arg0->unk_000.unk_01E.x = arg0->unk_214.x;
arg0->unk_000.unk_01E.y = arg0->unk_214.y;
arg0->unk_000.unk_01E.z = arg0->unk_214.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_87900854(void) {