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

3055E0

Browse Source
This commit is contained in:
Kelebek1
2025-05-25 05:31:31 +01:00
parent 9b62d6d899
commit 39ffd7308b
6 changed files with 1782 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
linker_scripts/us/symbol_addrs.txt
View File

@@ -1078,4 +1078,5 @@ D_3006D10 = 0x3006D10;
D_3007010 = 0x3007010;
D_3007310 = 0x3007310;
D_3007610 = 0x3007610;
D_843901B0 = 0x843901B0; // size:0x40
D_843901B0 = 0x843901B0; // size:0x40
D_84385B54 = 0x84385B54; // type:asciz

175
src/fragments/62/fragment62.h
View File

@@ -100,7 +100,10 @@ typedef struct unk_D_84390010_728_0168 {
/* 0x30 */ char unk30[0x4];
/* 0x34 */ f32 unk_34;
/* 0x38 */ f32 unk_38;
} unk_D_84390010_728_0168; // size >= 0x3C
/* 0x3C */ char unk3C[0x6C];
/* 0xA8 */ Vec3f unk_A8;
/* 0xB4 */ Vec3f unk_B4;
} unk_D_84390010_728_0168; // size >= 0xC0
typedef struct unk_D_84390010_728 {
/* 0x000 */ unk_D_86002F58_004_000 unk_000;
@@ -145,14 +148,21 @@ typedef struct unk_D_84390048 {
/* 0x1C */ char unk1C[4];
} unk_D_84390048; // size = 0x20
typedef struct unk_D_84390010_448 {
/* 0x00 */ Vec3f unk_00;
/* 0x0C */ Vec3f unk_0C;
/* 0x18 */ Vec3f unk_18;
/* 0x24 */ unk_D_84390048 unk_24;
/* 0x44 */ s16 unk_44;
/* 0x46 */ s16 unk_46;
/* 0x48 */ char unk48[0x4];
/* 0x4C */ f32 unk_4C;
} unk_D_84390010_448; // size >= 0x50
typedef struct unk_D_84390010 {
/* 0x000 */ unk_D_86002F58_004_000 unk_000;
/* 0x168 */ unk_D_84390010_168 unk_168[2];
/* 0x448 */ Vec3f unk_448;
/* 0x454 */ Vec3f unk_454;
/* 0x460 */ char unk460[0xC];
/* 0x46C */ unk_D_84390048 unk_46C;
/* 0x48C */ char unk48C[0xC];
/* 0x448 */ unk_D_84390010_448 unk_448;
/* 0x498 */ f32 unk_498;
/* 0x49C */ f32 unk_49C;
/* 0x4A0 */ f32 unk_4A0;
@@ -227,22 +237,39 @@ typedef struct unk_D_84390240_000_0DC {
typedef struct unk_D_84390240_000 {
/* 0x00 */ char unk00[0xC];
/* 0x0C */ s32 unk_0C;
/* 0x10 */ char unk10[0x4];
/* 0x10 */ s32 unk_10;
/* 0x14 */ s32 unk_14;
/* 0x18 */ char unk18[0x4];
/* 0x18 */ u16 unk_18;
/* 0x1C */ s32 unk_1C;
/* 0x20 */ s32 unk_20;
/* 0x24 */ char unk24[0x8];
/* 0x24 */ char unk24[0x6];
/* 0x2A */ u16 unk_2A;
/* 0x2C */ u16 unk_2C;
/* 0x2E */ char unk2E[0x2];
/* 0x2E */ u16 unk_2E;
/* 0x30 */ s32 unk_30;
/* 0x34 */ char unk34[0xC];
/* 0x40 */ s32 unk_40;
/* 0x44 */ char unk44[0x4];
/* 0x44 */ s32 unk_44;
/* 0x48 */ s32 unk_48;
/* 0x4C */ char unk4C[0x8];
/* 0x54 */ u8 unk_54;
/* 0x55 */ char unk55[0x7B];
/* 0x56 */ s16 unk_56;
/* 0x58 */ s16 unk_58;
/* 0x5A */ char unk5A[0x2];
/* 0x5C */ f32 unk_5C;
/* 0x60 */ char unk60[0x8];
/* 0x68 */ f32 unk_68;
/* 0x6C */ f32 unk_6C;
/* 0x70 */ f32 unk_70;
/* 0x74 */ f32 unk_74;
/* 0x78 */ char unk78[0x2];
/* 0x7A */ s16 unk_7A;
/* 0x7C */ char unk7C[0x18];
/* 0x94 */ Vec3f unk_94;
/* 0xA0 */ Vec3f unk_A0;
/* 0xAC */ char unkAC[0xC];
/* 0xB8 */ Vec3f unk_B8;
/* 0xC4 */ Vec3f unk_C4;
/* 0xD0 */ Vec3f unk_D0;
/* 0xDC */ unk_D_84390240_000_0DC* unk_DC;
} unk_D_84390240_000; // size >= 0xE0
@@ -322,7 +349,23 @@ typedef struct unk_D_843847BC {
typedef struct unk_D_843901B0 {
/* 0x00 */Vec3f unk_00;
/* 0x34 */char unk0C[0x34];
/* 0x0C */s16 unk_0C;
/* 0x0E */s16 unk_0E;
/* 0x10 */char unk10[0x2];
/* 0x12 */s16 unk_12;
/* 0x14 */s16 unk_14;
/* 0x18 */f32 unk_18;
/* 0x1C */f32 unk_1C;
/* 0x20 */s16 unk_20;
/* 0x22 */s16 unk_22;
/* 0x24 */char unk24[0x2];
/* 0x26 */s16 unk_26;
/* 0x28 */s16 unk_28;
/* 0x2C */f32 unk_2C;
/* 0x30 */f32 unk_30;
/* 0x34 */f32 unk_34;
/* 0x38 */f32 unk_38;
/* 0x3C */f32 unk_3C;
} unk_D_843901B0; // size >= 0x40
typedef struct unk_D_843901A0_4C8 {
@@ -386,9 +429,9 @@ extern u32 D_843848F0[];
extern u32 D_84384924[];
extern u32 D_84384958[];
extern u32 D_8438498C[];
extern u32 D_843849C0[];
extern unk_D_86B0C160 D_843849C0[];
extern u32 D_84384AF8[];
extern u32 D_84384B2C[];
extern unk_D_86B0C160 D_84384B2C[];
extern Vec3f D_84384C30[];
extern unk_D_84385384_func D_84385380;
extern unk_D_84385384 D_84385384[];
@@ -923,29 +966,89 @@ void func_8431AAAC(unk_D_86002F34_00C* arg0);
void func_8431AAFC(unk_D_86002F34_00C* arg0);
s32 func_8431ADAC(s32);
void func_8431AE4C(s32);
f32 func_8431AD20(unk_D_84390010* arg0, f32 arg1, f32 arg2);
s32 func_8431AD68(s32 arg0);
s32 func_8431ADAC(s32 arg0);
s32 func_8431ADF0(s32 arg0);
s32 func_8431AE20(s32 arg0);
void func_8431AE4C(s32 arg0);
void func_8431AE5C(void);
void func_8431AE7C(unk_D_84390010_728_0168*, f32, f32, f32, f32, s16, s16);
void func_8431AFB4(s32, s32);
void func_8431AFD0(unk_D_86002F34_00C*, f32, f32);
void func_8431B290(unk_D_84390010*, unk_D_84390010_654_038*);
s32 func_8431B34C(unk_D_86002F34_00C*, s32, s32);
void func_8431B500(unk_D_86002F34_00C*, s32);
void func_8431B858(unk_D_84390010*, unk_D_86002F34_00C*);
void func_8431AE6C(void);
void func_8431AE7C(unk_D_86002F34_00C* arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s16 arg5, s16 arg6);
void func_8431AED8(unk_D_84390010* arg0, Vec3f* arg1);
void func_8431AF58(unk_D_84390010* arg0, Vec3f* arg1, s32 arg2);
void func_8431AFB4(s32 arg0, s32 arg1);
void func_8431AFD0(unk_D_86002F34_00C* arg0, f32 arg1, f32 arg2);
void func_8431AFE4(s32 arg0, u16 arg1);
void func_8431B004(void);
void func_8431B078(unk_D_84390010* arg0);
void func_8431B174(unk_D_86002F34_00C* arg0);
void func_8431B290(UNUSED unk_D_84390010* arg0);
s32 func_8431B2B8(s16 arg0, s16 arg1);
s32 func_8431B34C(unk_D_86002F34_00C* arg0, s16 arg1, s16 arg2);
s32 func_8431B42C(UNUSED unk_D_86002F34_00C* arg0, s16 arg1, s16 arg2);
void func_8431B4C0(s16 arg0, s16 arg1, f32 arg2);
void func_8431B500(unk_D_86002F34_00C* arg0, s32 arg1);
void func_8431B830(unk_D_86002F34_00C* arg0);
void func_8431B858(unk_D_84390010* arg0, unk_D_86002F34_00C* arg1);
void func_8431BA5C(void);
void func_8431BAB4(unk_D_84390010*, unk_D_86002F34_00C*, Vec3f, s32, s32, f32, f32);
void func_8431BB24(unk_D_86002F34_00C*, Vec3f, s32, s32, f32, f32);
void func_8431BB80(unk_D_86002F34_00C*, Vec3f, s32, s32, f32, f32);
void func_8431BC38(unk_D_86002F34_00C*, Vec3f, s32, s32, f32, f32);
void func_8431C784(unk_D_86002F34_00C*, unk_D_84390010*);
s32 func_8431D118(unk_D_86002F34_00C*, unk_D_84390010*, s32, s32);
void func_8431D5C8(unk_D_86002F34_00C*);
void func_8431D5D0(unk_D_86002F34_00C*, unk_D_84390010*, s32);
void func_8431D7D8(unk_D_86B0C160*, unk_D_86002F34_00C*, unk_D_84390010*);
void func_8431DC78(unk_D_86002F34_00C*, u16);
s32 func_8431DBEC(unk_D_86002F34_00C*);
s32 func_8431DE30(unk_D_86002F34_00C*, u16);
void func_8431BAB4(unk_D_84390010* arg0, unk_D_86002F34_00C* arg1, Vec3f arg2, s16 arg3, s16 arg4, f32 arg5, f32 arg6);
void func_8431BB24(unk_D_86002F34_00C* arg0, Vec3f arg1, s16 arg2, s16 arg3, f32 arg4, f32 arg5);
void func_8431BB80(unk_D_86002F34_00C* arg0, Vec3f arg1, s16 arg2, s16 arg3, f32 arg4, f32 arg5);
void func_8431BBDC(unk_D_86002F34_00C* arg0, s16 arg1, s16 arg2, f32 arg3, f32 arg4);
void func_8431BC38(unk_D_86002F34_00C* arg0, Vec3f arg1, s16 arg2, s16 arg3, f32 arg4, f32 arg5);
void func_8431BCA4(unk_D_86002F34_00C* arg0, s16 arg1, s16 arg2, f32 arg3, f32 arg4);
void func_8431BD10(UNUSED unk_D_86002F34_00C* arg0);
void func_8431BD18(f32* arg0, f32* arg1);
void func_8431BD94(unk_D_86002F34_00C* arg0, unk_D_84390010* arg1, UNUSED f32 arg2);
void func_8431C594(unk_D_86002F34_00C* arg0, unk_D_84390010* arg1);
void func_8431C71C(unk_D_86002F34_00C* arg0, unk_D_84390010* arg1);
void func_8431C750(unk_D_86002F34_00C* arg0, unk_D_84390010* arg1);
void func_8431C784(unk_D_86002F34_00C* arg0, unk_D_84390010* arg1);
void func_8431C7A4(unk_D_86002F34_00C* arg0, unk_D_84390010* arg1);
s32 func_8431C8E0(unk_D_86002F34_00C* arg0, unk_D_84390010* arg1);
void func_8431CB54(unk_D_86002F34_00C* arg0, unk_D_84390010* arg1);
void func_8431CC38(unk_D_86002F34_00C* arg0, unk_D_84390010* arg1);
void func_8431CCFC(unk_D_86002F34_00C* arg0, unk_D_84390010* arg1);
void func_8431CEF0(unk_D_86002F34_00C* arg0, unk_D_84390010* arg1, UNUSED s32 arg2);
void func_8431CFA4(unk_D_86002F34_00C* arg0, unk_D_84390010* arg1);
s32 func_8431D048(unk_D_86002F34_00C* arg0, unk_D_84390010* arg1);
s32 func_8431D118(unk_D_86002F34_00C* arg0, unk_D_84390010* arg1, s32 arg2, s32 arg3);
s32 func_8431D318(unk_D_86002F34_00C* arg0, unk_D_84390010* arg1);
void func_8431D5C8(UNUSED unk_D_86002F34_00C* arg0);
void func_8431D5D0(unk_D_86002F34_00C* arg0, unk_D_84390010* arg1, s32 arg2);
void func_8431D704(s16 arg0, s16 arg1, s16 arg2, s16 arg3);
void func_8431D750(f32 arg0, f32 arg1);
void func_8431D764(s16 arg0, s16 arg1, s16 arg2, s16 arg3);
void func_8431D7B0(f32 arg0, f32 arg1);
void func_8431D7C4(f32 arg0, f32 arg1);
void func_8431D7D8(unk_D_86B0C160* arg0, unk_D_86002F34_00C* arg1, unk_D_84390010* arg2);
void func_8431D968(unk_D_86B0C160* arg0, unk_D_86002F34_00C* arg1);
s32 func_8431DA38(unk_D_86002F34_00C* arg0, unk_D_84390010* arg1);
s32 func_8431DBEC(UNUSED unk_D_86002F34_00C* arg0);
void func_8431DC78(unk_D_86002F34_00C* arg0, s32 arg1);
s32 func_8431DE30(unk_D_86002F34_00C* arg0, s32 arg1);
void func_8431DF98(unk_D_86002F34_00C* arg0, unk_D_84390010* arg1);
void func_8431E118(unk_D_86002F34_00C* arg0, unk_D_84390010* arg1);
void func_8431E1DC(unk_D_86002F34_00C* arg0, unk_D_84390010* arg1, s32 arg2);
void func_8431E368(unk_D_86002F34_00C* arg0, unk_D_84390010* arg1, s32 arg2);
void func_8431E4DC(unk_D_86002F34_00C* arg0, unk_D_84390010* arg1, s32 arg2);
void func_8431E63C(unk_D_86002F34_00C* arg0, unk_D_84390010* arg1, s32 arg2);
void func_8431E7D0(unk_D_86002F34_00C* arg0, unk_D_84390010* arg1, s32 arg2);
void func_8431E90C(unk_D_86002F34_00C* arg0, unk_D_84390010* arg1, s32 arg2);
void func_8431EA1C(unk_D_86002F34_00C* arg0, unk_D_84390010* arg1, s32 arg2, s32 arg3);
void func_8431EAB8(unk_D_86002F34_00C* arg0, unk_D_84390010* arg1);
void func_8431EBD0(unk_D_86002F34_00C* arg0, unk_D_84390010* arg1);
void func_8431ECEC(unk_D_86002F34_00C* arg0, unk_D_84390010* arg1);
void func_8431EE08(unk_D_86002F34_00C* arg0, unk_D_84390010* arg1);
void func_8431EF54(unk_D_86002F34_00C* arg0, unk_D_84390010* arg1);
void func_8431F050(unk_D_86002F34_00C* arg0, unk_D_84390010* arg1, s32 arg2);
void func_8431F194(unk_D_86002F34_00C* arg0, unk_D_84390010* arg1);
void func_8431F290(unk_D_84390010* arg0, unk_D_86002F34_00C* arg1, u32 arg2, s32 arg3);
void func_8431F420(unk_D_84390010* arg0, unk_D_86002F34_00C* arg1, s32 arg2);
void func_8431F500(unk_D_84390010* arg0, unk_D_86002F34_00C* arg1, s32 arg2);
void func_84320108(void);
void func_843202A0(void);
s32 func_8432AEE4(s32, unk_D_86002F34_00C*);

20
src/fragments/62/fragment62_2EC3C0.c
View File

@@ -393,15 +393,15 @@ void func_84302658(unk_D_84390010* arg0, s32 arg1) {
var_a1 = (u32)_70D3A0_ROM_START + ((u32)(D_70B10 + (sp66 * 0x20)) & 0xFFFFFF);
func_80003B30(&D_84390048, var_a1, var_a1 + 0x20, 0);
func_8430C1E4(&arg0->unk_46C.unk_00, &D_84390048.unk_00);
func_8430C1E4(&arg0->unk_46C.unk_0C, &D_84390048.unk_0C);
func_8430C1E4(&arg0->unk_448.unk_24.unk_00, &D_84390048.unk_00);
func_8430C1E4(&arg0->unk_448.unk_24.unk_0C, &D_84390048.unk_0C);
arg0->unk_46C.unk_18 = D_84390048.unk_18;
arg0->unk_46C.unk_19 = D_84390048.unk_19;
arg0->unk_46C.unk_1A = D_84390048.unk_1A;
arg0->unk_46C.unk_1B = D_84390048.unk_1B;
arg0->unk_46C.unk_00.x *= arg0->unk_4B0;
arg0->unk_46C.unk_0C.x *= arg0->unk_4B0;
arg0->unk_448.unk_24.unk_18 = D_84390048.unk_18;
arg0->unk_448.unk_24.unk_19 = D_84390048.unk_19;
arg0->unk_448.unk_24.unk_1A = D_84390048.unk_1A;
arg0->unk_448.unk_24.unk_1B = D_84390048.unk_1B;
arg0->unk_448.unk_24.unk_00.x *= arg0->unk_4B0;
arg0->unk_448.unk_24.unk_0C.x *= arg0->unk_4B0;
var_a1 = (u32)_70D3A0_ROM_START + ((u32)(D_70110 + (sp66 << 4)) & 0xFFFFFF);
func_80003B30(&D_84390028[sp68], var_a1, var_a1 + 0x10, 0);
@@ -556,7 +556,7 @@ void func_84302EF0(unk_D_84390010* arg0) {
func_8432B5B8(arg0, sp24, 2);
} else {
if ((sp24->unk_5A == 0x2D) || (sp24->unk_5A == 0x2E) || (sp24->unk_5A == 0x59)) {
func_8431B290(arg0, sp24);
func_8431B290(arg0);
}
func_8432B5B8(arg0, sp24, 0);
func_843031A0(arg0);
@@ -2102,7 +2102,7 @@ void func_84307078(unk_D_800AE540_1194* arg0) {
void func_843071B8(unk_D_84390010* arg0, unk_D_84390010* arg1, s32 arg2) {
func_8000E88C(&arg1->unk_448, 0.0f, 0.0f, 0.0f);
func_8000E88C(&arg1->unk_454, 0.0f, 0.0f, 0.0f);
func_8000E88C(&arg1->unk_448.unk_0C, 0.0f, 0.0f, 0.0f);
arg1->unk_4B0 = arg2;
}

290
src/fragments/62/fragment62_2F3CB0.c
View File

@@ -7,8 +7,8 @@ static f32 D_84384600[] = { 1.0f, 2.0f };
void func_843093F0(unk_D_84390010* arg0, f32 arg1, s16 arg2) {
arg0->unk_498 = arg1;
arg0->unk_454.z = COSS(arg2) * arg1;
arg0->unk_454.y = SINS(arg2) * arg1;
arg0->unk_448.unk_0C.z = COSS(arg2) * arg1;
arg0->unk_448.unk_0C.y = SINS(arg2) * arg1;
arg0->unk_49C = 0.01f;
}
@@ -30,23 +30,23 @@ void func_84309448(unk_D_84390010* arg0, unk_D_84390010* arg1, f32 arg2, f32 arg
var_fa0 = arg1->unk_498;
if (arg2 <= var_fa0) {
if (&arg1->unk_454) {}
if (&arg1->unk_448.unk_0C) {}
var_fa0 = 0.0f;
}
sp3C.z = COSS(arg4) * var_fa0;
sp3C.y = SINS(arg4) * var_fa0;
temp_fa1 = -sp54 * ((sp50 * arg1->unk_454.z) + sp3C.z);
temp_fa2 = -sp4C - (sp54 * ((sp50 * arg1->unk_454.y) + sp3C.y));
temp_fa1 = -sp54 * ((sp50 * arg1->unk_448.unk_0C.z) + sp3C.z);
temp_fa2 = -sp4C - (sp54 * ((sp50 * arg1->unk_448.unk_0C.y) + sp3C.y));
arg1->unk_454.z = (arg1->unk_454.z + sp3C.z + (temp_fa1 * 0.05f));
arg1->unk_454.y = (arg1->unk_454.y + sp3C.y + (temp_fa2 * 0.05f));
arg1->unk_448.unk_0C.z = (arg1->unk_448.unk_0C.z + sp3C.z + (temp_fa1 * 0.05f));
arg1->unk_448.unk_0C.y = (arg1->unk_448.unk_0C.y + sp3C.y + (temp_fa2 * 0.05f));
sp3C.y = arg1->unk_454.y;
arg1->unk_454.x = 0.0f;
sp3C.y = arg1->unk_448.unk_0C.y;
arg1->unk_448.unk_0C.x = 0.0f;
func_8430C19C(&sp3C, arg1->unk_454.z, arg0->unk_000.unk_01E.y + 0x4000);
func_8430C19C(&sp3C, arg1->unk_448.unk_0C.z, arg0->unk_000.unk_01E.y + 0x4000);
func_8000E8B0(&arg0->unk_000.unk_024, &sp3C);
}
@@ -68,22 +68,22 @@ void func_843095A4(UNUSED unk_D_84390010* arg0, unk_D_84390010* arg1, f32 arg2,
var_fa0 = arg1->unk_498;
if (arg2 <= var_fa0) {
if (&arg1->unk_454) {}
if (&arg1->unk_448.unk_0C) {}
var_fa0 = 0.0f;
}
sp3C.z = COSS(arg4) * var_fa0;
sp3C.y = SINS(arg4) * var_fa0;
temp_fa1 = -sp54 * ((sp50 * arg1->unk_454.z) + sp3C.z);
temp_fa2 = -sp4C - (sp54 * ((sp50 * arg1->unk_454.y) + sp3C.y));
temp_fa1 = -sp54 * ((sp50 * arg1->unk_448.unk_0C.z) + sp3C.z);
temp_fa2 = -sp4C - (sp54 * ((sp50 * arg1->unk_448.unk_0C.y) + sp3C.y));
arg1->unk_454.z = (arg1->unk_454.z + sp3C.z + (temp_fa1 * 0.05f));
arg1->unk_454.y = (arg1->unk_454.y + sp3C.y + (temp_fa2 * 0.05f));
sp3C.y = arg1->unk_454.y;
arg1->unk_454.x = 0.0f;
arg1->unk_448.unk_0C.z = (arg1->unk_448.unk_0C.z + sp3C.z + (temp_fa1 * 0.05f));
arg1->unk_448.unk_0C.y = (arg1->unk_448.unk_0C.y + sp3C.y + (temp_fa2 * 0.05f));
sp3C.y = arg1->unk_448.unk_0C.y;
arg1->unk_448.unk_0C.x = 0.0f;
func_8430C19C(&sp3C, arg1->unk_454.z, arg5);
func_8430C19C(&sp3C, arg1->unk_448.unk_0C.z, arg5);
func_8000E8B0(&arg1->unk_4EC.unk_024, &sp3C);
}
@@ -238,7 +238,7 @@ void func_84309FD4(unk_D_84390010* arg0, unk_D_84390010* arg1) {
if (arg1->unk_4EC.unk_024.y < 0) {
arg1->unk_4EC.unk_000.unk_01 &= ~1;
arg1->unk_4EC.unk_024.y = 0.0f;
arg1->unk_454.y = 0.0f;
arg1->unk_448.unk_0C.y = 0.0f;
func_84309F0C(arg1);
}
}
@@ -277,7 +277,7 @@ void func_8430A17C(unk_D_84390010* arg0, unk_D_84390010* arg1) {
} else {
arg1->unk_4EC.unk_01E.y = -0x4000;
}
arg1->unk_454.y = 0.0f;
arg1->unk_448.unk_0C.y = 0.0f;
arg1->unk_4EC.unk_024.y = 2.5f;
func_84309F0C(arg1);
}
@@ -296,7 +296,7 @@ void func_8430A22C(unk_D_84390010* arg0, unk_D_84390010* arg1) {
void func_8430A280(UNUSED unk_D_84390010* arg0, unk_D_84390010* arg1) {
func_8000E88C(&arg1->unk_448, 0.0f, 0.0f, 0.0f);
func_8000E88C(&arg1->unk_454, 0.0f, 0.0f, 0.0f);
func_8000E88C(&arg1->unk_448.unk_0C, 0.0f, 0.0f, 0.0f);
func_843093F0(arg1, D_84384600[0], 0x4000);
func_84309C50(arg1);
arg1->unk_4B8++;
@@ -306,7 +306,7 @@ void func_8430A308(unk_D_84390010* arg0, unk_D_84390010* arg1) {
func_84309448(arg0, arg1, 1.45f, 0.015f, 0x4000);
func_84309D78(arg1, 0);
if (arg0->unk_000.unk_024.y >= 200.0f) {
arg1->unk_454.y = 0.0f;
arg1->unk_448.unk_0C.y = 0.0f;
func_84309F0C(arg1);
func_843096EC(arg1);
}
@@ -325,7 +325,7 @@ void func_8430A390(unk_D_84390010* arg0, unk_D_84390010* arg1) {
void func_8430A3E4(UNUSED unk_D_84390010* arg0, unk_D_84390010* arg1) {
func_8000E88C(&arg1->unk_448, 0.0f, 0.0f, 0.0f);
func_8000E88C(&arg1->unk_454, 0.0f, 0.0f, 0.0f);
func_8000E88C(&arg1->unk_448.unk_0C, 0.0f, 0.0f, 0.0f);
func_843093F0(arg1, D_84384600[0], 0x4000);
arg1->unk_4B8++;
}
@@ -334,7 +334,7 @@ void func_8430A464(unk_D_84390010* arg0, unk_D_84390010* arg1) {
func_84309448(arg0, arg1, 2.0f, 0.002f, 0x4000);
if ((arg0->unk_000.unk_024.y - func_84307BAC(arg1)) >= 90.0f) {
arg1->unk_4B8++;
arg1->unk_454.y = 0.0f;
arg1->unk_448.unk_0C.y = 0.0f;
}
}
@@ -722,9 +722,9 @@ void func_8430B3C8(unk_D_84390010* arg0, unk_D_84390010* arg1) {
arg1->unk_4A6 = 0;
arg1->unk_4A8 = 0;
arg1->unk_4A0 = 0.4f;
arg1->unk_454.x = arg0->unk_000.unk_030.x;
arg1->unk_454.y = arg0->unk_000.unk_030.y;
arg1->unk_454.z = arg0->unk_000.unk_030.z;
arg1->unk_448.unk_0C.x = arg0->unk_000.unk_030.x;
arg1->unk_448.unk_0C.y = arg0->unk_000.unk_030.y;
arg1->unk_448.unk_0C.z = arg0->unk_000.unk_030.z;
arg1->unk_4B8++;
}
@@ -806,9 +806,9 @@ void func_8430B68C(unk_D_84390010* arg0, unk_D_84390010* arg1) {
void func_8430B6F8(unk_D_84390010* arg0, unk_D_84390010* arg1) {
arg1->unk_4A8 = 0x71C;
arg1->unk_4A0 = 0.4f;
arg1->unk_454.x = arg0->unk_000.unk_030.x;
arg1->unk_454.y = arg0->unk_000.unk_030.y;
arg1->unk_454.z = arg0->unk_000.unk_030.z;
arg1->unk_448.unk_0C.x = arg0->unk_000.unk_030.x;
arg1->unk_448.unk_0C.y = arg0->unk_000.unk_030.y;
arg1->unk_448.unk_0C.z = arg0->unk_000.unk_030.z;
arg1->unk_4B8++;
}
@@ -1227,16 +1227,121 @@ u32 D_8438498C[] = {
0x00000000, 0x00000000, 0x40600000, 0x3E4CCCCD, 0x3D75C28F, 0x43480000,
};
u32 D_843849C0[] = {
0x00000000, 0x00000000, 0x38E30000, 0x3F800000, 0x40900000, 0x00000000, 0x0000238E, 0x00000000, 0x00000000,
0x41080000, 0x3DCCCCCD, 0x3CA3D70A, 0x43480000, 0x00000000, 0x00002AAA, 0x00000000, 0x00000000, 0x41080000,
0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x40800000, 0x3E800000, 0x3CA3D70A, 0x43480000, 0x00000000,
0x00000000, 0x38E30000, 0x00000000, 0x40600000, 0x00000000, 0x0000238E, 0x1C710000, 0x00000000, 0x41080000,
0x3E19999A, 0x3CA3D70A, 0x43480000, 0x00000000, 0x00000000, 0x38E30000, 0x00000000, 0x40D00000, 0x00000000,
0x00000000, 0x00000000, 0x00000000, 0x40800000, 0x3E4CCCCD, 0x3CA3D70A, 0x43480000, 0x00000000, 0x00001C71,
0x40000000, 0x00000000, 0x40F00000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x40600000, 0x3E4CCCCD,
0x3CA3D70A, 0x43480000, 0x00000000, 0x0000F8E4, 0x40000000, 0x00000000, 0x40900000, 0x00000000, 0x0000071C,
0x00000000, 0x00000000, 0x40600000, 0x3E4CCCCD, 0x3CA3D70A, 0x43480000,
unk_D_86B0C160 D_843849C0[] = {
{
0,
0,
0,
0,
14563,
1.0f,
4.5f,
0,
0,
0,
9102,
0,
0.0f,
8.5f,
0.10000000149011612f,
0.019999999552965164f,
200.0f,
},
{
0,
0,
0,
10922,
0,
0.0f,
8.5f,
0,
0,
0,
0,
0,
0.0f,
4.0f,
0.25f,
0.019999999552965164f,
200.0f,
},
{
0,
0,
0,
0,
14563,
0.0f,
3.5f,
0,
0,
0,
9102,
7281,
0.0f,
8.5f,
0.15000000596046448f,
0.019999999552965164f,
200.0f,
},
{
0,
0,
0,
0,
14563,
0.0f,
6.5f,
0,
0,
0,
0,
0,
0.0f,
4.0f,
0.20000000298023224f,
0.019999999552965164f,
200.0f,
},
{
0,
0,
0,
7281,
16384,
0.0f,
7.5f,
0,
0,
0,
0,
0,
0.0f,
3.5f,
0.20000000298023224f,
0.019999999552965164f,
200.0f,
},
{
0,
0,
0,
-1820,
16384,
0.0f,
4.5f,
0,
0,
0,
1820,
0,
0.0f,
3.5f,
0.20000000298023224f,
0.019999999552965164f,
200.0f,
},
};
u32 D_84384AF8[] = {
@@ -1244,15 +1349,102 @@ u32 D_84384AF8[] = {
0x00000000, 0x00000000, 0x40000000, 0x3E4CCCCD, 0x3C75C28F, 0x42480000,
};
u32 D_84384B2C[] = {
0x00000000, 0x00002AAA, 0x00000000, 0x00000000, 0x44160000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
0x44098000, 0x3E4CCCCD, 0x3D23D70A, 0x42200000, 0x00000000, 0x00002AAA, 0x31C70000, 0x00000000, 0x441C4000,
0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x43E10000, 0x3E4CCCCD, 0x3CF5C28F, 0x42200000, 0x00000000,
0x0000FDDE, 0x00000000, 0x00000000, 0x43E10000, 0x00000000, 0x00002AAA, 0x00000000, 0x00000000, 0x43FA0000,
0x3E4CCCCD, 0x3CCCCCCD, 0x42200000, 0x00000000, 0x00000000, 0xCE390000, 0x00000000, 0x443B8000, 0x00000000,
0x00000000, 0x00000000, 0x00000000, 0x43E10000, 0x3E4CCCCD, 0x3D23D70A, 0x42200000, 0x00000000, 0x0000FDDE,
0x00000000, 0x00000000, 0x42480000, 0x00000000, 0x0000FDDE, 0x00000000, 0x00000000, 0x43C80000, 0x3E4CCCCD,
0x3CF5C28F, 0x42A00000,
unk_D_86B0C160 D_84384B2C[] = {
{
0,
0,
0,
10922,
0,
0.0f,
600.0f,
0,
0,
0,
0,
0,
0.0f,
550.0f,
0.20000000298023224f,
0.03999999910593033f,
40.0f,
},
{
0,
0,
0,
10922,
12743,
0.0f,
625.0f,
0,
0,
0,
0,
0,
0.0f,
450.0f,
0.20000000298023224f,
0.029999999329447746f,
40.0f,
},
{
0,
0,
0,
-546,
0,
0.0f,
450.0f,
0,
0,
0,
10922,
0,
0.0f,
500.0f,
0.20000000298023224f,
0.02500000037252903f,
40.0f,
},
{
0,
0,
0,
0,
-12743,
0.0f,
750.0f,
0,
0,
0,
0,
0,
0.0f,
450.0f,
0.20000000298023224f,
0.03999999910593033f,
40.0f,
},
{
0,
0,
0,
-546,
0,
0.0f,
50.0f,
0,
0,
0,
-546,
0,
0.0f,
400.0f,
0.20000000298023224f,
0.029999999329447746f,
80.0f,
},
};
Vec3f D_84384C30[] = {

1514
src/fragments/62/fragment62_3055E0.c
View File

File diff suppressed because it is too large Load Diff

9
yamls/us/rom.yaml
View File

@@ -2190,7 +2190,8 @@
- [0x370050, .data, fragments/62/fragment62_2FA4D0]
- [0x370250, .data, fragments/62/fragment62_3020D0]
- [0x3702A0, .data, fragments/62/fragment62_304060]
- [0x370410, data, fragments/62/fragment62_data]
- [0x370410, .data, fragments/62/fragment62_3055E0]
- [0x370430, data, fragments/62/fragment62_data]
- [0x3759C0, .rodata, fragments/62/fragment62_2EC3C0]
- [0x375A60, .rodata, fragments/62/fragment62_2F3CB0]
@@ -2199,7 +2200,8 @@
- [0x375BB0, .rodata, fragments/62/fragment62_2FA4D0]
- [0x375C50, .rodata, fragments/62/fragment62_3020D0]
- [0x375D50, .rodata, fragments/62/fragment62_304060]
- [0x375EA0, rodata, fragments/62/fragment62_rodata_375EA0]
- [0x375EA0, .rodata, fragments/62/fragment62_3055E0]
- [0x376100, rodata, fragments/62/fragment62_rodata_376100]
- [0x3764E0, rodata, fragments/62/fragment62_rodata_3764E0]
- [0x376650, rodata, fragments/62/fragment62_rodata_376650]
- [0x3768B0, rodata, fragments/62/fragment62_rodata_3768B0]
@@ -2233,7 +2235,8 @@
- {vram: 0x84390120, type: .bss, name: fragments/62/fragment62_2F74E0}
- {vram: 0x84390190, type: .bss, name: fragments/62/fragment62_2FA4D0}
- {vram: 0x843901A0, type: .bss, name: fragments/62/fragment62_3020D0}
- {vram: 0x843901B0, type: bss, name: fragments/62/fragment62_bss2}
- {vram: 0x843901B0, type: .bss, name: fragments/62/fragment62_3055E0}
- {vram: 0x84390200, type: bss, name: fragments/62/fragment62_bss2}
- name: fragment62_relocs
type: code