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

12D80

Browse Source
This commit is contained in:
Kelebek1
2024-09-20 15:30:26 +01:00
parent 5a9faab32d
commit a19801afa7
20 changed files with 1849 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

208
include/global.h
View File

@@ -84,7 +84,12 @@ typedef struct unk_D_86002F58_004_000_054 {
/* 0x04 */ unk_D_86002F58_004_000_054_004* unk_04;
/* 0x08 */ s16 unk_08;
/* 0x0A */ s16 unk_0A;
} unk_D_86002F58_004_000_054; // size >= 0xC
} unk_D_86002F58_004_000_054; // size = 0xC
typedef struct unk_D_86002F58_004_000_0A8 {
/* 0x00 */ u16 unk_00;
/* 0x04 */ Vec3f unk_04;
} unk_D_86002F58_004_000_0A8; // size = 0x10
typedef struct unk_D_86002F58_004_000 {
/* 0x000 */ unk_D_86002F58_004_000_000 unk_000;
@@ -95,18 +100,17 @@ typedef struct unk_D_86002F58_004_000 {
/* 0x01E */ Vec3s unk_01E;
/* 0x024 */ Vec3f unk_024;
/* 0x030 */ Vec3f unk_030;
/* 0x03C */ s32 unk_03C;
/* 0x03C */ Color_RGBA8_u32 unk_03C;
/* 0x040 */ unk_D_86002F58_004_000_040 unk_040;
/* 0x050 */ char pad050[2];
/* 0x052 */ s16 unk_052;
/* 0x054 */ unk_D_86002F58_004_000_054 unk_054;
/* 0x060 */ s32 unk_060;
/* 0x064 */ char pad064[0x3C];
/* 0x0A0 */ s32 unk_0A0;
/* 0x060 */ MtxF unk_060;
/* 0x0A0 */ Color_RGBA8_u32 unk_0A0;
/* 0x0A4 */ char pad0A4[2];
/* 0x0A6 */ u8 unk_0A6;
/* 0x0A7 */ char pad0A7[5];
/* 0x0AC */ Vec3f unk_0AC;
/* 0x0A7 */ u8 unk_0A7;
/* 0x0A8 */ unk_D_86002F58_004_000_0A8 unk_0A8[1];
/* 0x0B8 */ char pad0B8[0x24];
/* 0x0DC */ Vec3f unk_0DC;
/* 0x0E0 */ char pad0E0[0x4];
@@ -114,26 +118,182 @@ typedef struct unk_D_86002F58_004_000 {
/* 0x0F8 */ char pad0F8[0x70];
} unk_D_86002F58_004_000; // size = 0x168
typedef struct unk_D_86002F34_000 {
/* 0x00 */ u8 unk_00;
/* 0x01 */ u8 unk_01;
/* 0x02 */ u8 unk_02;
/* 0x03 */ u8 unk_03;
/* 0x04 */ char pad04[0x4];
/* 0x08 */ struct unk_D_86002F34_000* unk_08;
/* 0x0C */ struct unk_D_86002F34_000* unk_0C;
/* 0x10 */ s32 (*unk_10)(s32, struct unk_D_86002F34_000*);
/* 0x14 */ char unk14[0x4];
} unk_D_86002F34_000; // size >= 0x18
typedef struct unk_D_86002F34_00C_018 {
/* 0x00 */ Vp* vp;
/* 0x04 */ s16 x;
/* 0x06 */ s16 y;
/* 0x08 */ s16 width;
/* 0x0A */ s16 height;
} unk_D_86002F34_00C_018; // size = 0xC
typedef struct unk_D_86002F34_00C_024 {
/* 0x00 */ Mtx* mtx;
/* 0x04 */ u16 perspNorm;
/* 0x08 */ f32 fovy;
/* 0x0C */ f32 aspect;
/* 0x10 */ f32 near;
/* 0x14 */ f32 far;
/* 0x18 */ f32 scale;
} unk_D_86002F34_00C_024; // size = 0x1C
typedef struct unk_D_86002F34_00C_040 {
/* 0x00 */ Mtx* mtx;
/* 0x04 */ f32 l;
/* 0x08 */ f32 r;
/* 0x0C */ f32 b;
/* 0x10 */ f32 t;
/* 0x14 */ f32 n;
/* 0x18 */ f32 f;
/* 0x1C */ f32 scale;
} unk_D_86002F34_00C_040; // size = 0x20
typedef struct unk_D_86002F34_00C_060 {
/* 0x00 */ MtxF* p_mtxf;
/* 0x04 */ MtxF mtxf;
/* 0x44 */ LookAt* lookat;
/* 0x48 */ Vec3f eye;
/* 0x54 */ Vec3f at;
/* 0x60 */ Vec3f up;
} unk_D_86002F34_00C_060; // size >= 0x6C
typedef struct unk_D_86002F34_00C_0CC {
/* 0x00 */ u16 unk_00;
/* 0x02 */ u16 unk_02;
/* 0x04 */ Color_RGBA8_u32 color;
/* 0x08 */ u16 unk_08;
/* 0x0A */ u16 unk_0A;
/* 0x0C */ s16 unk_0C;
/* 0x0E */ s16 unk_0E;
/* 0x10 */ s16 unk_10;
/* 0x12 */ s16 unk_12;
/* 0x14 */ s16 unk_14;
/* 0x16 */ s16 unk_16;
/* 0x18 */ s16 unk_18;
/* 0x1A */ s16 unk_1A;
/* 0x1C */ u8* texture;
} unk_D_86002F34_00C_0CC; // size >= 0x20
typedef struct unk_D_86002F34_00C {
/* 0x00 */ char pad0[0x24];
/* 0x24 */ MtxF* unk_024;
/* 0x28 */ u16 unk_028;
/* 0x2C */ f32 unk_02C;
/* 0x30 */ char pad30[4];
/* 0x34 */ f32 unk_034;
/* 0x38 */ f32 unk_038;
/* 0x3C */ char pad3C[0x24];
/* 0x60 */ MtxF* unk_060;
/* 0x64 */ MtxF unk_064;
/* 0xA4 */ char padA4[0x4];
/* 0xA8 */ Vec3f unk_0A8;
/* 0xB4 */ Vec3f unk_0B4;
} unk_D_86002F34_00C; // size >= 0xC0
/* 0x00 */ unk_D_86002F34_000 unk_00;
/* 0x18 */ unk_D_86002F34_00C_018 unk_18;
/* 0x24 */ unk_D_86002F34_00C_024 unk_24;
/* 0x40 */ unk_D_86002F34_00C_040 unk_40;
/* 0x60 */ unk_D_86002F34_00C_060 unk_60;
/* 0xCC */ unk_D_86002F34_00C_0CC unk_CC;
} unk_D_86002F34_00C; // size >= 0xEC
typedef struct unk_D_86002F34_alt1 {
/* 0x00 */ unk_D_86002F34_000 unk_00;
/* 0x18 */ s16 unk_18;
/* 0x1A */ u16 unk_1A;
/* 0x1C */ s8 unk_1C;
/* 0x1D */ s8 unk_1D;
/* 0x20 */ s32 unk_20;
/* 0x24 */ Lights7* lights;
} unk_D_86002F34_alt1; // size >= 0x28
typedef struct unk_D_86002F34_alt2 {
/* 0x00 */ unk_D_86002F34_000 unk_00;
/* 0x18 */ u32 unk_18;
} unk_D_86002F34_alt2; // size >= 0x1C
typedef struct unk_D_86002F34_alt3 {
/* 0x00 */ unk_D_86002F34_000 unk_00;
/* 0x18 */ s16 unk_18;
/* 0x1A */ s16 unk_1A;
/* 0x1C */ s32 unk_1C;
} unk_D_86002F34_alt3; // size >= 0x20
typedef struct unk_D_86002F34_alt4 {
/* 0x00 */ unk_D_86002F34_000 unk_00;
/* 0x18 */ Color_RGBA8_u32 unk_18;
/* 0x1C */ u16 unk_1C;
/* 0x1E */ u16 unk_1E;
} unk_D_86002F34_alt4; // size >= 0x20
typedef struct unk_D_86002F34_alt5 {
/* 0x00 */ unk_D_86002F34_000 unk_00;
/* 0x18 */ Vec3f unk_18;
/* 0x24 */ Vec3s unk_24;
} unk_D_86002F34_alt5; // size >= 0x2C
typedef struct unk_D_86002F34_alt6 {
/* 0x00 */ unk_D_86002F34_000 unk_00;
/* 0x18 */ Vec3s unk_18;
/* 0x1E */ Vec3s unk_1E;
/* 0x24 */ Vec3f unk_24;
/* 0x30 */ u8 unk_30;
/* 0x31 */ u8 unk_31;
/* 0x32 */ s16 unk_32;
} unk_D_86002F34_alt6; // size >= 0x58
typedef struct unk_D_86002F34_alt7 {
/* 0x00 */ unk_D_86002F34_000 unk_00;
/* 0x18 */ Gfx* unk_18;
/* 0x1C */ s16 unk_1C;
} unk_D_86002F34_alt7; // size >= 0x20
typedef struct unk_D_86002F34_alt8 {
/* 0x00 */ unk_D_86002F34_000 unk_00;
/* 0x18 */ Gfx* unk_18;
/* 0x1C */ MtxF unk_1C;
} unk_D_86002F34_alt8; // size >= 0x5C
typedef struct unk_D_86002F34_alt9 {
/* 0x00 */ unk_D_86002F34_000 unk_00;
/* 0x18 */ Gfx* unk_18;
/* 0x1C */ Vec3f unk_1C;
/* 0x28 */ f32 unk_28;
} unk_D_86002F34_alt9; // size >= 0x2C
typedef struct unk_D_86002F34_alt10 {
/* 0x00 */ unk_D_86002F34_000 unk_00;
/* 0x18 */ s32 unk_18;
/* 0x1C */ s16 unk_1C;
/* 0x1E */ s16 unk_1E;
/* 0x20 */ s16 unk_20;
/* 0x22 */ u8 unk_22;
/* 0x24 */ Color_RGBA8_u32 unk_24;
} unk_D_86002F34_alt10; // size >= 0x28
typedef struct unk_D_86002F34_alt11_018 {
/* 0x00 */ u8 fmt;
/* 0x01 */ u8 unk_01;
/* 0x02 */ s16 unk_02;
/* 0x04 */ char unk04[0x4];
/* 0x08 */ u8* texture;
} unk_D_86002F34_alt11_018; // size >= 0xC
typedef struct unk_D_86002F34_alt11 {
/* 0x00 */ unk_D_86002F34_000 unk_00;
/* 0x18 */ unk_D_86002F34_alt11_018* unk_18;
/* 0x1C */ unk_D_86002F34_alt11_018* unk_1C;
} unk_D_86002F34_alt11; // size >= 0x20
typedef struct unk_D_86002F34_alt12 {
/* 0x00 */ unk_D_86002F34_000 unk_00;
/* 0x18 */ s16 unk_18;
/* 0x1A */ s16 unk_1A;
/* 0x1C */ s16 unk_1C;
/* 0x1E */ s16 unk_1E;
} unk_D_86002F34_alt12; // size >= 0x20
typedef struct unk_D_86002F34 {
/* 0x00 */ char pad00[0xC];
/* 0x0C */ unk_D_86002F34_00C* unk_0C;
} unk_D_86002F34; // size >= 0x10
/* 0x00 */ unk_D_86002F34_000 unk_00;
/* 0x18 */ unk_D_86002F34_000* unk_18;
} unk_D_86002F34; // size >= 0x1C
// Are unk_D_86002F30 and unk_D_800AC840 the same?
typedef struct unk_D_86002F30 {

9
include/variables.h
View File

@@ -51,7 +51,15 @@ extern u8 gPool[];
extern Gfx* gDisplayListHead;
extern u64 _binary_assets_us_F3DEX2_bin_start[];
extern f32 gSineTable[];
extern f32 gCosineTable[0x1000];
extern s16 gArctanTable[0x401];
extern u8 D_1000000[];
extern u8 D_1001800[];
extern Gfx D_1002480[];
extern Gfx D_1002508[];
extern Gfx D_1002590[];
extern u8 D_2000000[];
extern u8 D_3000000[];
extern u8 D_4000000[];
@@ -86,7 +94,6 @@ extern unk_D_80068BA0* D_80068BA8;
extern unk_D_80068BA0* D_80068BAC;
extern Gfx D_8006F518[];
extern Gfx D_8006F630[];
extern u8 D_82000000;
extern u8 D_81400000;
extern u8 D_86B00000;

4
lib/ultralib/include/PR/gbi.h
View File

@@ -3050,10 +3050,10 @@ _DW({ \
}
#define gsDPSetCombine(muxs0, muxs1) \
{{ \
{ \
_SHIFTL(G_SETCOMBINE, 24, 8) | _SHIFTL(muxs0, 0, 24), \
(unsigned int)(muxs1) \
}}
}
#define GCCc0w0(saRGB0, mRGB0, saA0, mA0) \
(_SHIFTL((saRGB0), 20, 4) | _SHIFTL((mRGB0), 15, 5) | \

4
linker_scripts/us/symbol_addrs.txt
View File

@@ -290,3 +290,7 @@ rspbootTextStart = 0x80065FC0;
aspMainTextStart = 0x80067420;
aspMainDataStart = 0x8007EA70;
audDMAMessageQ = 0x800FCAE0;
D_8006F010 = 0x8006F010; // size:0x40
D_8006F050 = 0x8006F050; // size:0xC
D_8006F05C = 0x8006F05C; // size:0x6
D_8006F064 = 0x8006F064; // size:0xC

4
src/11BA0.c
View File

@@ -82,8 +82,8 @@ unk_D_86002F58_004_000* func_80011938(MainPoolState* arg0, unk_D_86002F58_004_00
arg1->unk_01D = 0xFF;
arg1->unk_01C = 0;
arg1->unk_0A6 = 0;
arg1->unk_0A0 = -0x100;
arg1->unk_03C = -0x100;
arg1->unk_0A0.rgba = 0xFFFFFF00;
arg1->unk_03C.rgba = 0xFFFFFF00;
arg1->unk_040.unk_00 = 0;
arg1->unk_040.unk_04 = NULL;
arg1->unk_040.unk_08 = 0;

1519
src/12D80.c
View File

File diff suppressed because it is too large Load Diff

115
src/12D80.h
View File

@@ -3,9 +3,118 @@
#include "global.h"
void func_80015094(unk_D_86002F34*);
void func_80015348(void);
s32 func_80015390(unk_D_86002F58_004_000*, s16, Vec3f*);
typedef struct unk_D_800AB970 {
/* 0x000 */ Vec3f unk_000[1];
/* 0x00C */ char unk00C[0x174];
/* 0x180 */ s32 unk_180;
/* 0x184 */ char unk184[0xC];
} unk_D_800AB970; // size = 0x190?
typedef struct unk_D_800ABB00 {
/* 0x00 */ void* unk_00;
/* 0x04 */ void* unk_04;
/* 0x08 */ char unk08[0x8];
} unk_D_800ABB00; // size >= 0x10?
typedef struct unk_D_800ABB28 {
/* 0x00 */ s32 unk_00;
/* 0x04 */ Gfx* unk_04;
/* 0x08 */ Gfx* unk_08;
/* 0x0C */ MtxF* unk_0C;
/* 0x10 */ Color_RGBA8_u32 unk_10;
/* 0x14 */ Color_RGBA8_u32 unk_14;
/* 0x18 */ unk_D_86002F34_alt11_018* unk_18;
/* 0x1C */ struct unk_D_800ABB28* unk_1C;
/* 0x20 */ Gfx* unk_20;
/* 0x24 */ u8 unk_24;
/* 0x24 */ u8 unk_25;
/* 0x24 */ u8 unk_26;
/* 0x24 */ u8 unk_27;
} unk_D_800ABB28; // size = 0x28
typedef struct unk_D_800ABB10 {
/* 0x00 */ u8 unk_00;
/* 0x01 */ u8 unk_01;
/* 0x02 */ u8 unk_02;
/* 0x03 */ u8 unk_03;
/* 0x04 */ Color_RGBA8_u32 unk_04;
/* 0x08 */ Color_RGBA8_u32 unk_08;
/* 0x0C */ unk_D_86002F34_alt11_018* unk_0C;
/* 0x10 */ unk_D_800ABB28* unk_10;
/* 0x14 */ Gfx* unk_14;
} unk_D_800ABB10; // size = 0x18?
void func_80012180(void);
void func_800121C8(void);
void func_80012230(MtxF* arg0);
void func_800122B4(MtxF* arg0);
void func_80012344(Vec3f* arg0);
MtxF* func_800123D4(s32 arg0);
MtxF* func_80012400(s32 arg0);
void func_80012428(void);
void func_80012458(Vec3f* arg0);
Vtx* func_800124D4(unk_D_86002F34_00C_0CC* arg0, unk_D_86002F34_00C_040* arg1);
void func_80012768(unk_D_86002F34_00C_0CC* arg0, unk_D_86002F34_00C_040* arg1);
void func_80012870(Vtx* arg0, unk_D_86002F34_00C_0CC* arg1, s16 arg2, s16 arg3, s16 arg4, s16 arg5, s16 arg6, s16 arg7);
Vtx* func_80012960(unk_D_86002F34_00C_0CC* arg0);
void func_80012D88(unk_D_86002F34_00C_0CC* arg0, UNUSED unk_D_86002F34_00C_040* arg1);
void func_800131B4(unk_D_86002F34_00C_0CC* arg0, unk_D_86002F34_00C_040* arg1);
void func_80013330(unk_D_86002F34_000* arg0);
void func_800133D8(unk_D_86002F34_000* arg0);
void func_80013464(unk_D_86002F34_000* arg0);
void func_80013764(unk_D_86002F34_000* arg0);
void func_8001378C(unk_D_86002F34_000* arg0);
void func_800138F0(unk_D_86002F34_000* arg0);
void func_8001395C(unk_D_86002F34_000* arg0);
void func_800139E8(unk_D_86002F34_000* arg0);
void func_80013AF8(unk_D_86002F34_000* arg0);
void func_80013B8C(UNUSED unk_D_86002F34_000* arg0);
void func_80013C14(UNUSED unk_D_86002F34_000* arg0);
void func_80013C1C(unk_D_86002F34_000* arg0);
void func_80013D34(unk_D_86002F34_000* arg0);
void func_80013F7C(UNUSED unk_D_86002F34_000* arg0);
void func_80013F84(unk_D_86002F34_000* arg0);
void func_80014124(unk_D_86002F34_000* arg0);
void func_80014214(unk_D_86002F34_000* arg0);
void func_800142BC(unk_D_86002F34_000* arg0);
void func_80014334(unk_D_86002F34_000* arg0);
void func_80014384(unk_D_86002F34_000* arg0);
void func_800143C0(unk_D_86002F34_000* arg0);
void func_80014624(unk_D_86002F34_000* arg0);
void func_80014690(unk_D_86002F34_000* arg0);
void func_800148D8(unk_D_86002F34_000* arg0);
void func_80014980(unk_D_86002F34_000* arg0);
void func_80014A60(unk_D_86002F34_000* arg0);
void func_80014AEC(unk_D_86002F34_000* arg0);
void func_80014CB8(s32 arg0);
void func_80014D24(unk_D_86002F34_000* arg0);
void func_80014D50(unk_D_86002F34_000* arg0);
void func_80014D70(unk_D_86002F34_000* arg0);
void func_80015094(unk_D_86002F34_000* arg0);
void func_80015220(unk_D_86002F34_000* arg0, s32 arg1);
void func_8001533C(s32 arg0);
void func_80015348(void);
s32 func_80015360(void);
Vec3f* func_80015390(unk_D_86002F58_004_000* arg0, s16 arg1, Vec3f* arg2);
void func_80015400(Gfx* arg0, u8* arg1);
void func_8001550C(void);
void func_8001554C(void);
void func_80015684(void);
void func_8001587C(unk_D_800ABB10* arg0);
void func_80015948(UNUSED unk_D_800ABB10* arg0);
void func_80015984(unk_D_800ABB10* arg0);
void func_80015A44(unk_D_800ABB10* arg0);
void func_80015AC4(UNUSED unk_D_800ABB10* arg0);
void func_80015B20(unk_D_800ABB10* arg0);
void func_80015DD8(UNUSED unk_D_800ABB10* arg0);
void func_80015F64(s16 arg0);
void func_80016010(s16 arg0);
s16 func_80016060(s16 arg0);
void func_800160E0(s16 arg0, MtxF* arg1);
void func_80016274(Gfx* arg0, s32 arg1);
void func_80016344(Color_RGBA8_u32 arg0, u8 arg1, u32 arg2);
void func_80016364(s32 arg0, Color_RGBA8_u32 arg1, unk_D_86002F34_alt11_018* arg2, unk_D_86002F34_alt11_018* arg3, s32 arg4);
void func_8001638C(s32 arg0, s32 arg1);
void func_8001660C(void);
#endif // _12D80_H_

7
src/17300.h
View File

@@ -3,11 +3,18 @@
#include "global.h"
void func_80017080(void);
void func_80017090(unk_D_86002F58_004_000_040*, u16, s32);
void func_80017188(void);
void func_800171A8(Vec3f*, Vec3s*, Vec3f*, s32);
void func_800173CC(unk_D_86002F58_004_000* arg0);
s32 func_800173DC(unk_D_86002F58_004_000* arg0, s16 arg1, s32 arg2, s32 arg3);
void func_80017464(unk_D_86002F58_004_000* arg0, s16 arg1);
s32 func_80017484(unk_D_86002F58_004_000* arg0, s16 arg1);
void func_800174E4(unk_D_86002F58_004_000* arg0);
s32 func_80017514(unk_D_86002F58_004_000* arg0);
void func_800175D8(void);
void func_800175E8(unk_D_86002F58_004_000_054*, u16, s32);
void func_800176BC(void);
#endif // _17300_H_

1
src/18140.h
View File

@@ -3,6 +3,7 @@
#include "global.h"
void func_800176DC(unk_D_86002F34_alt11_018**, unk_D_86002F34_alt11_018*, s16);
void func_80017788(unk_D_86002F58_004_000* arg0);
s16 func_80017798(unk_D_86002F58_004_000* arg0, s16 arg1, s32 arg2);
void func_80017804(unk_D_86002F58_004_000* arg0, s16 arg1);

4
src/1C720.c
View File

@@ -43,8 +43,8 @@ void func_8001BC34(unk_D_86002F58_004_000* arg0, s16 arg1, s16 arg2, unk_D_86002
arg0->unk_000.unk_02 |= 0x40;
arg0->unk_000.unk_02 &= ~0x2;
arg0->unk_0A0 = -0x100;
arg0->unk_03C = -0x100;
arg0->unk_0A0.rgba = 0xFFFFFF00;
arg0->unk_03C.rgba = 0xFFFFFF00;
arg0->unk_040.unk_00 = -1;
arg0->unk_040.unk_04 = NULL;
arg0->unk_054.unk_00 = -1;

3
src/32D10.h
View File

@@ -6,6 +6,7 @@
void func_80032110(u8, s16);
void func_80032244(u8, s16);
void func_8003260C(unk_D_86002F58_004_000*);
void func_80032670(u8, u32);
void func_80032738(u8, u32);
#endif // _32D10_H_

14
src/E890.h
View File

@@ -6,10 +6,20 @@
void func_8000E840(Color_RGBA8*, u8, u8, u8, u8);
void func_8000E88C(Vec3f*, f32, f32, f32);
void func_8000EB70(Vec3s*, s16, s16, s16);
void func_8000ED98(s32*);
void func_8000F2C4(MtxF*, MtxF*, Vec3s*);
void func_8000E990(Vec3f*, Vec3s*);
void func_8000ED4C(MtxF*, MtxF*);
void func_8000ED98(MtxF*);
void func_8000F2C4(MtxF*, Vec3f*, Vec3s*);
void func_8000F3FC(MtxF*, Vec3f*, Vec3s*);
void func_8000F5A8(MtxF*, Vec3f*, Vec3s*, Vec3f*);
void func_8000F730(MtxF*, Vec3f*, Vec3s*, Vec3f*);
void func_8000F88C(MtxF*, MtxF*, MtxF*, Vec3f*, f32);
void func_8000FA94(MtxF*, Vec3f*, Vec3f*, s16);
void func_8000FBB0(MtxF*, MtxF*, MtxF*);
void func_8000FDE4(MtxF*, MtxF*, Vec3f*);
void func_8000FF04(MtxF*, Vec3f*);
void func_80010090(MtxF*, MtxF*);
void func_80010228(MtxF*, Vec3f*, Vec3s*, Vec3f*, MtxF*, MtxF*);
void func_80010354(Vec3f*, Vec3f*, f32, s16, s32);

14
src/fragments/10/fragment10.c
View File

@@ -350,7 +350,7 @@ void func_86400860(UNUSED s32 arg0) {
gSPEndDisplayList(temp_v0++);
D_864052C8->unk_190->unk_1C = D_864052C8->unk_028.unk_0AC;
D_864052C8->unk_190->unk_1C = D_864052C8->unk_028.unk_0A8[0].unk_04;
}
}
@@ -813,19 +813,19 @@ void func_86401EEC(void) {
}
void func_86401F74(void) {
D_87B000EC = D_87B000E8->unk_0C;
D_87B000EC = D_87B000E8->unk_00.unk_0C;
D_87B000F0 = 0x900;
D_87B000F2 = 0;
D_87B000F4 = 0x190;
D_87B000EC->unk_034 = 50.0f;
D_87B000EC->unk_038 = 6400.0f;
D_87B000EC->unk_02C = 27.5f;
D_87B000EC->unk_24.near = 50.0f;
D_87B000EC->unk_24.far = 6400.0f;
D_87B000EC->unk_24.fovy = 27.5f;
D_87B000EC->unk_0B4.y = 25.0f;
D_87B000EC->unk_60.at.y = 25.0f;
func_80010354(&D_87B000EC->unk_0B4, &D_87B000EC->unk_0A8, D_87B000F4, D_87B000F0, D_87B000F2);
func_80010354(&D_87B000EC->unk_60.at, &D_87B000EC->unk_60.eye, D_87B000F4, D_87B000F0, D_87B000F2);
}
void func_8640203C(void) {

13
src/fragments/11/fragment11.c
View File

@@ -712,18 +712,19 @@ void func_86501964(void) {
}
void func_865019E4(void) {
D_87B000EC = D_87B000E8->unk_0C;
D_87B000EC = D_87B000E8->unk_00.unk_0C;
D_87B000F0 = -0x200;
D_87B000F2 = 0;
D_87B000F4 = 0xBE;
D_87B000EC->unk_034 = 50.0f;
D_87B000EC->unk_038 = 6400.0f;
D_87B000EC->unk_02C = 40.0f;
D_87B000EC->unk_0B4.y = 51.0f;
D_87B000EC->unk_24.near = 50.0f;
D_87B000EC->unk_24.far = 6400.0f;
D_87B000EC->unk_24.fovy = 40.0f;
func_80010354(&D_87B000EC->unk_0B4, &D_87B000EC->unk_0A8, D_87B000F4, D_87B000F0, D_87B000F2);
D_87B000EC->unk_60.at.y = 51.0f;
func_80010354(&D_87B000EC->unk_60.at, &D_87B000EC->unk_60.eye, D_87B000F4, D_87B000F0, D_87B000F2);
}
void func_86501AAC(void) {

6
src/fragments/4/fragment4.c
View File

@@ -86,9 +86,9 @@ void func_87A00020(unk_D_86002F34_00C* arg0) {
}
Gfx* func_87A0002C(Gfx* arg0) {
gSPPerspNormalize(arg0++, D_87A01330->unk_028);
gSPMatrix(arg0++, (u32)D_87A01330->unk_024 & 0x1FFFFFFF, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION);
gSPMatrix(arg0++, (u32)D_87A01330->unk_060 & 0x1FFFFFFF, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_PROJECTION);
gSPPerspNormalize(arg0++, D_87A01330->unk_24.perspNorm);
gSPMatrix(arg0++, (u32)D_87A01330->unk_24.mtx & 0x1FFFFFFF, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION);
gSPMatrix(arg0++, (u32)D_87A01330->unk_60.p_mtxf & 0x1FFFFFFF, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_PROJECTION);
return arg0;
}

23
src/fragments/6/fragment6.c
View File

@@ -285,24 +285,25 @@ s32 func_86000410(void) {
}
void func_86000478(void) {
D_86002F38 = D_86002F34->unk_0C;
D_86002F38 = D_86002F34->unk_00.unk_0C;
func_87A00020(D_86002F38);
D_86002F3C = 0x600;
D_86002F3E = 0;
D_86002F40 = 1000;
D_86002F38->unk_034 = 100.0f;
D_86002F38->unk_038 = 12800.0f;
D_86002F38->unk_02C = 10.0f;
D_86002F38->unk_0B4.x = 0.0f;
D_86002F38->unk_0B4.y = 70.0f;
D_86002F38->unk_0B4.z = 0.0f;
D_86002F38->unk_24.near = 100.0f;
D_86002F38->unk_24.far = 12800.0f;
D_86002F38->unk_24.fovy = 10.0f;
func_80010354(&D_86002F38->unk_0B4, &D_86002F38->unk_0A8, D_86002F40, D_86002F3C, D_86002F3E);
D_86002F38->unk_60.at.x = 0.0f;
D_86002F38->unk_60.at.y = 70.0f;
D_86002F38->unk_60.at.z = 0.0f;
func_80010354(&D_86002F38->unk_60.at, &D_86002F38->unk_60.eye, D_86002F40, D_86002F3C, D_86002F3E);
}
void func_86000564(void) {
func_80010354(&D_86002F38->unk_0B4, &D_86002F38->unk_0A8, D_86002F40, D_86002F3C, D_86002F3E);
func_80010354(&D_86002F38->unk_60.at, &D_86002F38->unk_60.eye, D_86002F40, D_86002F3C, D_86002F3E);
}
#ifdef NON_MATCHING
@@ -496,8 +497,8 @@ void func_86000C18(void) {
for (i = 0; i < 4; i++) {
D_86003B60 = &D_86002F58[i].unk_004;
temp_f20 = (410.0f - D_86003B60->unk_000.unk_0AC.y) / 510.0f;
guTranslate(&sp100, D_86003B60->unk_000.unk_0AC.x, 0.0f, 0.0f);
temp_f20 = (410.0f - D_86003B60->unk_000.unk_0A8[0].unk_04.y) / 510.0f;
guTranslate(&sp100, D_86003B60->unk_000.unk_0A8[0].unk_04.x, 0.0f, 0.0f);
guScale(&spC0, temp_f20, temp_f20, temp_f20);
guMtxCatL(&spC0, &sp100, var_s1);

22
src/fragments/7/fragment7.c
View File

@@ -522,24 +522,24 @@ void func_86100AEC(void) {
}
void func_86100B48(void) {
D_86105488 = D_86105484->unk_0C;
D_86105488 = D_86105484->unk_00.unk_0C;
func_87A00020(D_86105488);
D_86105490 = 0x600;
D_86105492 = 0;
D_86105494 = 0xBB8;
D_86105488->unk_034 = 100.0f;
D_86105488->unk_038 = 12800.0f;
D_86105488->unk_02C = 30.0f;
D_86105488->unk_24.near = 100.0f;
D_86105488->unk_24.far = 12800.0f;
D_86105488->unk_24.fovy = 30.0f;
D_86105488->unk_0B4.x = 0.0f;
D_86105488->unk_0B4.y = 371.2f;
D_86105488->unk_0B4.z = -732.6f;
D_86105488->unk_60.at.x = 0.0f;
D_86105488->unk_60.at.y = 371.2f;
D_86105488->unk_60.at.z = -732.6f;
D_86105488->unk_0A8.x = 0.0f;
D_86105488->unk_0A8.y = 990.0f;
D_86105488->unk_0A8.z = 2659.0f;
D_86105488->unk_60.eye.x = 0.0f;
D_86105488->unk_60.eye.y = 990.0f;
D_86105488->unk_60.eye.z = 2659.0f;
}
void func_86100C28(void) {
@@ -1832,7 +1832,7 @@ void func_8610426C(void) {
func_80015094(D_86105484);
for (i = 0; i < 12; i++) {
if (func_80015390(&D_86105D38, i + 1, &sp48) != 0) {
if (func_80015390(&D_86105D38, (s16)(i + 1), &sp48) != 0) {
D_86105BC8 = &D_86106450[i].unk_004;
D_86105BC8->unk_024.x = sp48.x / 10.0f;
D_86105BC8->unk_024.y = sp48.y / 10.0f;

22
src/fragments/8/fragment8.c
View File

@@ -174,7 +174,7 @@ void func_86200034(void) {
s32 i;
UNUSED s32 pad2[1];
func_80031EF4(&spDC, &D_86203E3C->unk_064);
func_80031EF4(&spDC, &D_86203E3C->unk_60.mtxf);
guMtxF2L(spDC.mf, &sp98);
for (i = 0; i < 4; i++) {
@@ -269,20 +269,22 @@ void func_862004D8(void) {
void func_86200528(void) {
D_8620829C = 0;
D_86203E3C = D_86203E38->unk_0C;
D_86203E3C = D_86203E38->unk_00.unk_0C;
func_87A00020(D_86203E3C);
D_86203E40 = 0x1300;
D_86203E42 = -0x6700;
D_86203E44 = 0x14A;
D_86203E3C->unk_034 = 50.0f;
D_86203E3C->unk_038 = 6400.0f;
D_86203E3C->unk_02C = 30.0f;
D_86203E3C->unk_0B4.x = 0.0f;
D_86203E3C->unk_0B4.y = 0.0f;
D_86203E3C->unk_0B4.z = 5.0f;
D_86203E3C->unk_24.near = 50.0f;
D_86203E3C->unk_24.far = 6400.0f;
D_86203E3C->unk_24.fovy = 30.0f;
func_80010354(&D_86203E3C->unk_0B4, &D_86203E3C->unk_0A8, D_86203E44, D_86203E40, D_86203E42);
D_86203E3C->unk_60.at.x = 0.0f;
D_86203E3C->unk_60.at.y = 0.0f;
D_86203E3C->unk_60.at.z = 5.0f;
func_80010354(&D_86203E3C->unk_60.at, &D_86203E3C->unk_60.eye, D_86203E44, D_86203E40, D_86203E42);
}
void func_86200620(void) {
@@ -367,7 +369,7 @@ void func_86200620(void) {
D_86203E44 = 0x32;
}
func_80010354(&D_86203E3C->unk_0B4, &D_86203E3C->unk_0A8, D_86203E44, D_86203E40, D_86203E42);
func_80010354(&D_86203E3C->unk_60.at, &D_86203E3C->unk_60.eye, D_86203E44, D_86203E40, D_86203E42);
}
void func_86200938(void) {

16
src/fragments/9/fragment9.c
View File

@@ -107,21 +107,21 @@ void func_8630011C(void) {
}
void func_86300154(void) {
D_86301718 = D_86301714->unk_0C;
D_86301718 = D_86301714->unk_00.unk_0C;
D_8630171C = 0x600;
D_8630171E = 0;
D_86301720 = 0x15E;
D_86301718->unk_034 = 100.0f;
D_86301718->unk_038 = 12800.0f;
D_86301718->unk_02C = 30.0f;
D_86301718->unk_24.near = 100.0f;
D_86301718->unk_24.far = 12800.0f;
D_86301718->unk_24.fovy = 30.0f;
D_86301718->unk_0B4.x = 0.0f;
D_86301718->unk_0B4.y = 70.0f;
D_86301718->unk_0B4.z = 0.0f;
D_86301718->unk_60.at.x = 0.0f;
D_86301718->unk_60.at.y = 70.0f;
D_86301718->unk_60.at.z = 0.0f;
func_80010354(&D_86301718->unk_0B4, &D_86301718->unk_0A8, D_86301720, D_8630171C, D_8630171E);
func_80010354(&D_86301718->unk_60.at, &D_86301718->unk_60.eye, D_86301720, D_8630171C, D_8630171E);
}
void func_86300230(void) {

4
yamls/us/rom.yaml
View File

@@ -340,6 +340,8 @@
- [0x6A3E0, data, rom_data_6A3E0]
- [0x6A3F0, .data, math_util]
- [0x6FC00, data, rom_data_6FC00]
- [0x6FC80, .data, 12D80]
- [0x6FEB0, data, rom_data_6FEB0]
- [0x70070, .data, 20470]
- [0x703E0, data, rom_data_703E0]
- [0x76260, .data, 29BA0]
@@ -483,6 +485,8 @@
- {vram: 0x800A74C0, type: .bss, name: crash_screen}
- {vram: 0x800A7EA0, type: .bss, name: profiler}
- {vram: 0x800A8100, type: bss, name: unk_bss_2}
- {vram: 0x800AA6C0, type: .bss, name: 12D80}
- {vram: 0x800ABCC0, type: bss, name: unk_bss_13}
- {vram: 0x800AC880, type: .bss, name: 20330}
- {vram: 0x800AC890, type: bss, name: unk_bss_11}
- {vram: 0x800AE520, type: .bss, name: 29BA0}