mirror of
https://github.com/izzy2lost/Starship.git
synced 2026-07-05 15:19:42 -07:00
names and namespaces cleaned up (#23)
* threads galore * something's up * try this * I don't even * who knows * I can't stop it * let's try data for fun * ok I think I've gone far enough * well maybe a little more * visual assets somewhat documented * just keeps going * forgot formatting * let 's try bss * too much? * one fix * even more things * one quick thing * oh come on * graph complete? * format and such * decomp and such * small cleanup * 6 and such * more overlay fixes * more of them * again * and done
This commit is contained in:
petrie911
Vendored
+4
-1
@@ -36,6 +36,9 @@
|
||||
"macros.h": "c",
|
||||
"random": "c",
|
||||
"limits": "c",
|
||||
"algorithm": "c"
|
||||
"algorithm": "c",
|
||||
"dfee30.h": "c",
|
||||
"df4260.h": "c",
|
||||
"symbol_addrs_overlays": "cpp"
|
||||
},
|
||||
}
|
||||
+52
-45
@@ -61,6 +61,7 @@ void Fault_ThreadEntry(void*);
|
||||
void func_80007FE4(FrameBuffer*, u16, u16);
|
||||
void Fault_Init(void);
|
||||
|
||||
|
||||
void func_80016A50(void);
|
||||
void func_800182F4(s32);
|
||||
void func_80019218(u32, f32*, u8, f32*, f32*, s8*);
|
||||
@@ -126,6 +127,8 @@ s64 __ull_div(s64, s64);
|
||||
s64 __ll_mul(s64, s64);
|
||||
s64 __ll_rshift(s64, s64);
|
||||
|
||||
void func_8002E3E0(Object_2F4 *arg0);
|
||||
|
||||
void func_8002E548(void);
|
||||
void func_8003DAF0(void);
|
||||
void func_80040CDC(void);
|
||||
@@ -135,11 +138,14 @@ void func_80059498(void);
|
||||
void func_8005980C(f32 arg0);
|
||||
void func_80057D00(void);
|
||||
|
||||
void func_80060FBC(u8*, f32*);
|
||||
void func_800612B8(UnkStruct_90A00_1C*, u16);
|
||||
void func_800613C4(UnkStruct_func_80090A00*);
|
||||
void func_80060FBC(Object*, f32*);
|
||||
void func_800612B8(ObjectStruct_1C*, u32);
|
||||
void func_800613C4(Object_2F4*);
|
||||
void func_80061474(Object_8C* arg0);
|
||||
void func_800660F0(Object_2F4*);
|
||||
void func_8006EEFC(s32, f32, f32, f32, f32, f32, f32, f32, f32, f32);
|
||||
|
||||
void func_80077240(f32, f32, f32, s32);
|
||||
void func_8007C120(f32, f32, f32, f32, f32, f32, f32, s32);
|
||||
void func_8007D10C(f32, f32, f32, f32);
|
||||
|
||||
@@ -164,12 +170,13 @@ void func_8008CA44(void);
|
||||
s32 func_8008CB8C(void);
|
||||
void func_8008D0DC(f32, f32, f32, f32, f32);
|
||||
void func_8008DE68(void);
|
||||
void func_8008E51C(s32* arg0, f32 arg1);
|
||||
void func_8008E9EC(f32 arg0, f32 arg1);
|
||||
void func_8008EA14(f32, f32);
|
||||
void func_8008FA84(void);
|
||||
void func_8008FFF0(UnkStruct_D_8016F110* arg0, s32);
|
||||
s32 func_8009092C(UnkStruct_func_80090A00*);
|
||||
s32 func_800915FC(UnkStruct_func_80090A00*);
|
||||
void func_8008FFF0(Object_408* arg0, s32);
|
||||
s32 func_8009092C(Object_2F4*);
|
||||
s32 func_800915FC(Object_2F4*);
|
||||
void func_80094D20(f32, f32);
|
||||
void func_8009F574(Gfx **, s32, s32, s32, s32, u8, u8, u8, u8);
|
||||
f32 func_8009BC2C(f32*, f32, f32, f32, f32);
|
||||
@@ -191,7 +198,7 @@ void func_800A1FB0(Gfx **, u8 , u8);
|
||||
void func_800A24DC(s32);
|
||||
void func_800A26C0(void);
|
||||
void func_800A25DC(void);
|
||||
UnkStruct_func_80090A00 *func_800A3608(s32 arg0);
|
||||
Object_2F4 *func_800A3608(s32 arg0);
|
||||
void func_800A3CA0(void);
|
||||
s32 func_800A3F50(s32);
|
||||
void func_800A5844(void);
|
||||
@@ -215,45 +222,45 @@ s32 func_800C2F30(u16*, s32);
|
||||
s32 func_800C3084(void);
|
||||
s32 func_800C3194(void);
|
||||
|
||||
void func_80187520_EFFA40(s32, void*);
|
||||
void func_8018A96C(void);
|
||||
void func_8018AAC4(void);
|
||||
void func_801988E0(void);
|
||||
void func_8019E8D0(void);
|
||||
void func_EFFA40_80187520(s32, void*);
|
||||
void func_EF0260_8018A96C(void);
|
||||
void func_EF0260_8018AAC4(void);
|
||||
void func_DF4260_801988E0(void);
|
||||
void func_EBFBE0_8019E8D0(void);
|
||||
|
||||
|
||||
void func_801877F0_EBFEB0(void);
|
||||
s32 func_80187ABC_EC017C(void);
|
||||
void func_80187B00_EC01C0(void);
|
||||
void func_80187E28_EC04E8(void);
|
||||
void func_801888E8_EC0FA8(void);
|
||||
void func_8018994C_EC200C(void);
|
||||
void func_8018A644_EC2D04(void);
|
||||
void func_8018ACEC_EC33AC(void);
|
||||
void func_8018B5C4_EC3C84(void);
|
||||
void func_8018C644_EC4D04(void);
|
||||
void func_80190E64_EC9524(void);
|
||||
void func_8019111C_EC97DC(void);
|
||||
void func_80187CA8_EC0368(void);
|
||||
void func_80188010_EC06D0(void);
|
||||
void func_80189208_EC18C8(void);
|
||||
void func_8018A2F8_EC29B8(void);
|
||||
void func_8018A990_EC3050(void);
|
||||
void func_8018B038_EC36F8(void);
|
||||
void func_8018C114_EC47D4(void);
|
||||
void func_8018CB90_EC5250(void);
|
||||
void func_8018F680_EC7D40(void);
|
||||
void func_8018F77C_EC7E3C(void);
|
||||
void func_8018F85C_EC7F1C(void);
|
||||
void func_8018F8E4_EC7FA4(void);
|
||||
void func_8018FC14_EC82D4(void);
|
||||
void func_8018FD08_EC83C8(void);
|
||||
void func_8018FF74_EC8634(void);
|
||||
void func_801906A0_EC8D60(void);
|
||||
void func_80190C9C_EC935C(void);
|
||||
void func_801918FC_EC9FBC(void);
|
||||
void func_8018D2B8_EC5978(s32);
|
||||
void func_8018EA78_EC7138(s32);
|
||||
void func_80191674_EC9D34(f32, f32, f32, f32*, f32*, f32*);
|
||||
void func_EBFBE0_801877F0(void);
|
||||
s32 func_EBFBE0_80187ABC(void);
|
||||
void func_EBFBE0_80187B00(void);
|
||||
void func_EBFBE0_80187E28(void);
|
||||
void func_EBFBE0_801888E8(void);
|
||||
void func_EBFBE0_8018994C(void);
|
||||
void func_EBFBE0_8018A644(void);
|
||||
void func_EBFBE0_8018ACEC(void);
|
||||
void func_EBFBE0_8018B5C4(void);
|
||||
void func_EBFBE0_8018C644(void);
|
||||
void func_EBFBE0_80190E64(void);
|
||||
void func_EBFBE0_8019111C(void);
|
||||
void func_EBFBE0_80187CA8(void);
|
||||
void func_EBFBE0_80188010(void);
|
||||
void func_EBFBE0_80189208(void);
|
||||
void func_EBFBE0_8018A2F8(void);
|
||||
void func_EBFBE0_8018A990(void);
|
||||
void func_EBFBE0_8018B038(void);
|
||||
void func_EBFBE0_8018C114(void);
|
||||
void func_EBFBE0_8018CB90(void);
|
||||
void func_EBFBE0_8018F680(void);
|
||||
void func_EBFBE0_8018F77C(void);
|
||||
void func_EBFBE0_8018F85C(void);
|
||||
void func_EBFBE0_8018F8E4(void);
|
||||
void func_EBFBE0_8018FC14(void);
|
||||
void func_EBFBE0_8018FD08(void);
|
||||
void func_EBFBE0_8018FF74(void);
|
||||
void func_EBFBE0_801906A0(void);
|
||||
void func_EBFBE0_80190C9C(void);
|
||||
void func_EBFBE0_801918FC(void);
|
||||
void func_EBFBE0_8018D2B8(s32);
|
||||
void func_EBFBE0_8018EA78(s32);
|
||||
void func_EBFBE0_80191674(f32, f32, f32, f32*, f32*, f32*);
|
||||
|
||||
#endif
|
||||
|
||||
+8
-8
@@ -32,16 +32,16 @@ void func_8008D7F4(void);
|
||||
void func_8008D984(void);
|
||||
void func_8008DC34(void);
|
||||
void func_8008E5E8(void);
|
||||
s32 func_80090E8C(UnkStruct_func_80090A00* arg0);
|
||||
s32 func_800910C0(UnkStruct_func_80090A00* arg0);
|
||||
s32 func_80090E8C(Object_2F4* arg0);
|
||||
s32 func_800910C0(Object_2F4* arg0);
|
||||
void func_8009C320(Gfx**, void*, void*, s32, s32, f32, f32, f32, f32);
|
||||
void func_8009D0BC(Gfx**, void*, void*, u32, u32, f32, f32, f32, f32);
|
||||
void func_8009E1E8(Gfx**, s32*, s32, s32, f32, f32, f32, f32);
|
||||
void func_8009E1E8(Gfx**, u16*, s32, s32, f32, f32, f32, f32);
|
||||
|
||||
// Weird addresses, assets maybe?
|
||||
extern s32 D_1000E80;
|
||||
extern s32 D_1002280;
|
||||
extern s32 D_10030D0;
|
||||
extern u16 D_1000E80[];
|
||||
extern u16 D_1002280[];
|
||||
extern u16 D_10030D0[];
|
||||
extern s32 D_1011280;
|
||||
extern s32 D_10116A0;
|
||||
extern s32 D_10116B0;
|
||||
@@ -60,8 +60,8 @@ extern s32 D_1013580;
|
||||
extern s32 D_1013700;
|
||||
extern s32 D_20031B0[];
|
||||
extern s32 D_2010A30[];
|
||||
extern s32 D_3000B20;
|
||||
extern s32 D_30013E0;
|
||||
extern u16 D_3000B20[];
|
||||
extern u16 D_30013E0[];
|
||||
|
||||
extern s32 D_80161690;
|
||||
extern s32 D_80161718;
|
||||
|
||||
@@ -4,9 +4,13 @@
|
||||
#define SCREEN_WIDTH 320
|
||||
#define SCREEN_HEIGHT 240
|
||||
|
||||
#define SEGMENTED_TO_VIRTUAL(segment) ((void*)OS_PHYSICAL_TO_K0(gSegments[((uintptr_t)(segment)<<4)>>0x1C]+(((uintptr_t)(segment))&0xFFFFFF)))
|
||||
|
||||
#define ARRAY_COUNT(arr) (s32)(sizeof(arr) / sizeof(arr[0]))
|
||||
#define SQ(x) ((x) * (x))
|
||||
|
||||
#define VEC3F_SQ(vec) (SQ((vec).x) + SQ((vec).y) + SQ((vec).z))
|
||||
|
||||
#define USEC_TO_CYCLES(n) (((u64)(n)*(osClockRate/15625LL))/(1000000LL/15625LL))
|
||||
#define MSEC_TO_CYCLES(n) (USEC_TO_CYCLES((n) * 1000LL))
|
||||
|
||||
|
||||
+183
-88
@@ -15,11 +15,11 @@ typedef struct {
|
||||
} SegmentOffset; // size = 0x8
|
||||
|
||||
typedef struct {
|
||||
/* 0x00 */ SegmentOffset unk_0;
|
||||
/* 0x08 */ SegmentOffset unk_8;
|
||||
/* 0x10 */ SegmentOffset unk_10;
|
||||
/* 0x18 */ SegmentOffset unk_18;
|
||||
/* 0x20 */ SegmentOffset unk_20[15];
|
||||
/* 0x00 */ SegmentOffset rom;
|
||||
/* 0x08 */ SegmentOffset bss;
|
||||
/* 0x10 */ SegmentOffset text;
|
||||
/* 0x18 */ SegmentOffset data;
|
||||
/* 0x20 */ SegmentOffset assets[15];
|
||||
} OverlayInit; // size = 0x98
|
||||
|
||||
typedef struct {
|
||||
@@ -85,110 +85,203 @@ typedef struct {
|
||||
/* 0x12D50 */ Gfx masterDL[0x1380];
|
||||
/* 0x1C950 */ Gfx unkDL2[0xD80];
|
||||
/* 0x23550 */ Lightsn lights[0x100];
|
||||
} GfxPool; // size = 0x2AD50
|
||||
} GfxPool; // size = 0x2AD50, 0x8 aligned
|
||||
|
||||
typedef struct UnkStruct_D_801B8350 {
|
||||
/* 0x00 */ Vec3f unk0;
|
||||
/* 0x0C */ char pad_0C[0x4C];
|
||||
/* 0x0C */ char pad0C[0x4C];
|
||||
/* 0x54 */ s32 unk_54;
|
||||
/* 0x58 */ s32 unk_58;
|
||||
} UnkStruct_D_801B8350;
|
||||
} UnkStruct_D_801B8350; // size = 0x5C
|
||||
|
||||
typedef struct {
|
||||
/* 0x00 */ u8 unk_00;
|
||||
/* 0x01 */ char pad_01;
|
||||
/* 0x02 */ u16 unk_02;
|
||||
/* 0x04 */ Vec3f pos;
|
||||
/* 0x10 */ Vec3f unk_10;
|
||||
} ElementType1; // size = 0x1C
|
||||
|
||||
typedef struct {
|
||||
/* 0x0 */ char pad_0[0x3];
|
||||
/* 0x0 */ u16 unk_0;
|
||||
/* 0x2 */ s8 unk_2;
|
||||
/* 0x3 */ s8 unk_3;
|
||||
} UnkStruct_D_8017797C;
|
||||
} UnkStruct_D_8017797C; // size = 0x4
|
||||
|
||||
typedef struct {
|
||||
/* 0x00 */ u8 unk_00;
|
||||
/* 0x01 */ char pad_01[0x1];
|
||||
/* 0x01 */ char pad01[0x1];
|
||||
/* 0x02 */ u16 unk_02;
|
||||
/* 0x04 */ Vec3f pos;
|
||||
/* 0x10 */ f32 unk_10;
|
||||
/* 0x14 */ char pad_14[0x14];
|
||||
/* 0x14 */ char pad14[0x14];
|
||||
} UnkStruct_D_80175A10; // size = 0x28
|
||||
|
||||
typedef struct UnkStruct_D_80178280 {
|
||||
/* 0x000 */ char pad_0[0xC];
|
||||
/* 0x000 */ char pad0[0xC];
|
||||
/* 0x00C */ f32 unk_00C;
|
||||
/* 0x010 */ char pad_010[0x48];
|
||||
/* 0x010 */ char pad10[0x30];
|
||||
/* 0x040 */ Vec3f unk_40;
|
||||
/* 0x04C */ char pad4C[0xC];
|
||||
/* 0x058 */ f32 unk_058;
|
||||
/* 0x05C */ f32 unk_05C;
|
||||
/* 0x060 */ char pad_060[0x14];
|
||||
/* 0x060 */ char pad060[0x14];
|
||||
/* 0x074 */ f32 unk_074;
|
||||
/* 0x078 */ f32 unk_078;
|
||||
/* 0x07C */ f32 unk_07C;
|
||||
/* 0x080 */ char pad_080[0x50];
|
||||
/* 0x080 */ char pad80[0x2C];
|
||||
/* 0x0AC */ f32 unk_0AC;
|
||||
/* 0x0B0 */ f32 unk_0B0;
|
||||
/* 0x0B4 */ char padB4[0xC];
|
||||
/* 0x0C0 */ f32 unk_0C0;
|
||||
/* 0x0C4 */ f32 unk_0C4;
|
||||
/* 0x0C8 */ char padC8[8];
|
||||
/* 0x0D0 */ f32 unk_0D0;
|
||||
/* 0x0D4 */ char pad_0D4[0x64];
|
||||
/* 0x0D4 */ char padD4[0x44];
|
||||
/* 0x118 */ f32 unk_118;
|
||||
/* 0x11C */ char pad11C[0x1C];
|
||||
/* 0x138 */ f32 unk_138;
|
||||
/* 0x13C */ char pad_13C[0x8C];
|
||||
/* 0x13C */ char pad13C[0x8C];
|
||||
/* 0x1C8 */ s32 unk_1C8;
|
||||
/* 0x1CC */ char pad_1CC[0x4];
|
||||
/* 0x1CC */ char pad1CC[0x4];
|
||||
/* 0x1D0 */ s32 unk_1D0;
|
||||
/* 0x1D4 */ char pad_1D4[0x3C];
|
||||
/* 0x1D4 */ char pad1D4[0x3C];
|
||||
/* 0x210 */ s32 unk_210;
|
||||
/* 0x214 */ char pad_214[0x10];
|
||||
/* 0x214 */ char pad214[0x10];
|
||||
/* 0x224 */ s32 unk_224;
|
||||
/* 0x228 */ s32 unk_228;
|
||||
/* 0x22C */ char pad_22C[0x38];
|
||||
/* 0x22C */ char pad22C[0x38];
|
||||
/* 0x264 */ s32 unk_264;
|
||||
/* 0x268 */ char pad_268[0x4];
|
||||
/* 0x268 */ char pad268[0x4];
|
||||
/* 0x26C */ s32 unk_26C;
|
||||
/* 0x270 */ char pad_270[0x44];
|
||||
/* 0x270 */ char pad270[0x44];
|
||||
/* 0x2B4 */ s32 unk_2B4;
|
||||
/* 0x2B8 */ char pad_2B8[0x4];
|
||||
/* 0x2B8 */ char pad2B8[0x4];
|
||||
/* 0x2BC */ f32 unk_2BC;
|
||||
/* 0x2C0 */ char pad_2C0[0x220];
|
||||
} UnkStruct_D_80178280; // size = 0x4E0
|
||||
|
||||
/**
|
||||
* func_800612B8 does a mem_cpy of size 0x24
|
||||
* sugesting this to be an individual
|
||||
* struct of that size
|
||||
*/
|
||||
typedef struct UnkStruct_90A00_1C {
|
||||
char unk0[0x24];
|
||||
} UnkStruct_90A00_1C; // size 0x24
|
||||
/* 0x2C0 */ char pad2C0[0x220];
|
||||
} UnkStruct_D_80178280; // size = 0x4E0 Might be Player
|
||||
|
||||
typedef struct {
|
||||
/* 0x000 */ ElementType1 unk_000;
|
||||
/* 0x01C */ char pad_01C[0x32];
|
||||
/* 0x00 */ f32 unk_0;
|
||||
/* 0x04 */ s16 unk_4;
|
||||
/* 0x06 */ s16 unk_6;
|
||||
/* 0x08 */ s16 unk_8;
|
||||
/* 0x0A */ s16 unk_A;
|
||||
/* 0x0C */ s16 unk_C;
|
||||
/* 0x0E */ s16 unk_E;
|
||||
/* 0x10 */ s16 unk_10;
|
||||
} ObjectInit; // size = 0x14
|
||||
|
||||
typedef struct {
|
||||
/* 0x00 */ u8 status;
|
||||
/* 0x02 */ u16 id;
|
||||
/* 0x04 */ Vec3f pos;
|
||||
/* 0x10 */ Vec3f rot;
|
||||
} Object; // size = 0x1C
|
||||
|
||||
typedef struct {
|
||||
/* 0x00 */ char unk0[0xC];
|
||||
/* 0x0C */ void* unk_C;
|
||||
/* 0x10 */ f32 unk_10;
|
||||
/* 0x14 */ char unk14[0x2];
|
||||
/* 0x16 */ s16 unk_16;
|
||||
/* 0x18 */ char unk18[0xC];
|
||||
} ObjectStruct_1C; // size = 0x24
|
||||
|
||||
typedef struct {
|
||||
/* 0x00 */ Object obj;
|
||||
/* 0x1C */ ObjectStruct_1C unk_1C;
|
||||
/* 0x40 */ char unk40[0x18];
|
||||
} Object_58; // size = 0x58
|
||||
|
||||
typedef struct {
|
||||
/* 0x00 */ Object obj;
|
||||
/* 0x1C */ ObjectStruct_1C unk_1C;
|
||||
/* 0x40 */ char unk_40[0x40];
|
||||
} Object_80; // size = 0x80
|
||||
|
||||
typedef struct {
|
||||
/* 0x00 */ Object obj;
|
||||
/* 0x1C */ ObjectStruct_1C unk_1C;
|
||||
/* 0x40 */ char pad40[5];
|
||||
/* 0x45 */ s8 unk_45;
|
||||
/* 0x46 */ s8 unk_46;
|
||||
/* 0x47 */ char pad47[5];
|
||||
} Object_4C; // size = 0x4C
|
||||
|
||||
typedef struct {
|
||||
/* 0x00 */ Object obj;
|
||||
/* 0x1C */ ObjectStruct_1C unk_1C;
|
||||
/* 0x40 */ char unk40[0x28];
|
||||
/* 0x68 */ f32 unk_68;
|
||||
} Object_6C; // size 0x6C
|
||||
|
||||
typedef struct {
|
||||
/* 0x00 */ Object obj;
|
||||
/* 0x1C */ ObjectStruct_1C unk_1C;
|
||||
/* 0x40 */ char pad40[0x4];
|
||||
/* 0x44 */ s16 unk_44;
|
||||
/* 0x46 */ s16 unk_46;
|
||||
/* 0x48 */ s16 unk_48;
|
||||
/* 0x4A */ s16 unk_4A;
|
||||
/* 0x4C */ char pad4C[0x2];
|
||||
/* 0x4E */ s16 unk_4E;
|
||||
/* 0x50 */ s16 unk_50;
|
||||
/* 0x50 */ char pad50[0x2];
|
||||
/* 0x54 */ f32 unk_54;
|
||||
/* 0x58 */ f32 unk_58;
|
||||
/* 0x5C */ f32 unk_5C;
|
||||
/* 0x60 */ char pad60[0xC];
|
||||
/* 0x6C */ f32 unk_6C;
|
||||
/* 0x70 */ f32 unk_70;
|
||||
/* 0x74 */ char pad74[0xC];
|
||||
/* 0x80 */ f32 unk_80[1]; // unknown size. Could be Vec3f
|
||||
/* 0x84 */ char pad84[0x8];
|
||||
} Object_8C; // size 0x8C
|
||||
|
||||
typedef struct {
|
||||
/* 0x000 */ Object obj;
|
||||
/* 0x01C */ ObjectStruct_1C unk_01C;
|
||||
/* 0x040 */ char pad40[0xE];
|
||||
/* 0x04E */ s16 unk_04E;
|
||||
/* 0x050 */ char pad_050[0x88];
|
||||
/* 0x0D8 */ f32 unk_0D8[50];
|
||||
/* 0x1A0 */ char pad_1A0[0x268];
|
||||
} UnkStruct_D_8016F110; // size = 0x408
|
||||
/* 0x050 */ char pad50[0x12];
|
||||
/* 0x062 */ s8 unk_062;
|
||||
/* 0x063 */ char pad63[0x79];
|
||||
/* 0x0DC */ f32 unk_0DC;
|
||||
/* 0x0E0 */ f32 unk_0E0;
|
||||
/* 0x0E4 */ char padE4[0x314];
|
||||
/* 0x3F8 */ f32 unk_3F8;
|
||||
/* 0x3FC */ char pad3FC[0xC];
|
||||
} Object_408; // size = 0x408
|
||||
|
||||
typedef struct {
|
||||
/* 0x000 */ ElementType1 unk_000;
|
||||
/* 0x01C */ UnkStruct_90A00_1C unk_01C;
|
||||
/* 0x000 */ Object obj;
|
||||
/* 0x01C */ ObjectStruct_1C unk_01C;
|
||||
/* 0x040 */ s32 unk_040;
|
||||
/* 0x044 */ char pad_044[0xC];
|
||||
/* 0x050 */ s32 unk_050[25];
|
||||
/* 0x0B4 */ char pad_0B4[0x2];
|
||||
/* 0x044 */ char pad044[0xC];
|
||||
/* 0x050 */ s32 unk_050;
|
||||
/* 0x054 */ s32 unk_054;
|
||||
/* 0x058 */ s32 unk_058;
|
||||
/* 0x05C */ s32 unk_05C;
|
||||
/* 0x060 */ s32 unk_060;
|
||||
/* 0x064 */ s32 unk_064;
|
||||
/* 0x068 */ s32 unk_068;
|
||||
/* 0x06C */ char pad6C[4];
|
||||
/* 0x070 */ s32 unk_070;
|
||||
/* 0x074 */ s32 unk_074;
|
||||
/* 0x078 */ s32 unk_078;
|
||||
/* 0x07C */ s32 unk_07C;
|
||||
/* 0x080 */ s32 unk_080;
|
||||
/* 0x084 */ char pad84[0x30];
|
||||
/* 0x0B4 */ s16 unk_0B4;
|
||||
/* 0x0B6 */ s16 unk_0B6;
|
||||
/* 0x0B8 */ s16 unk_0B8;
|
||||
/* 0x0BA */ char pad_0BA[0x2];
|
||||
/* 0x0BA */ char pad0BA[0x2];
|
||||
/* 0x0BC */ u16 unk_0BC;
|
||||
/* 0x0BC */ u16 unk_0BE;
|
||||
/* 0x0C0 */ char pad_0C0[0x6];
|
||||
/* 0x0C0 */ char padC0[2];
|
||||
/* 0x0C2 */ u16 unk_0C2;
|
||||
/* 0x0C4 */ char padC4[2];
|
||||
/* 0x0C6 */ u16 unk_0C6;
|
||||
/* 0x0C8 */ char pad_0C8[0x6];
|
||||
/* 0x0C8 */ char pad0C8[0x6];
|
||||
/* 0x0CE */ s16 unk_0CE;
|
||||
/* 0x0D0 */ s8 unk_0D0;
|
||||
/* 0x0D1 */ char pad_0D1[0x3];
|
||||
/* 0x0D1 */ s16 unk_0D2;
|
||||
/* 0x0D4 */ s16 unk_0D4;
|
||||
/* 0x0D6 */ u16 unk_0D6;
|
||||
/* 0x0D8 */ char pad_0D8[0xC];
|
||||
/* 0x0D8 */ Vec3f unk_0D8;
|
||||
/* 0x0E4 */ s16 unk_0E4;
|
||||
/* 0x0E6 */ s16 unk_0E6;
|
||||
/* 0x0E8 */ f32 unk_0E8;
|
||||
@@ -196,34 +289,36 @@ typedef struct {
|
||||
/* 0x0F0 */ f32 unk_0F0;
|
||||
/* 0x0F4 */ f32 unk_0F4;
|
||||
/* 0x0F8 */ f32 unk_0F8; // angle
|
||||
/* 0x0FC */ char pad_0FC[0x4];
|
||||
/* 0x100 */ f32 unk_100[3];
|
||||
/* 0x10C */ char pad_10C[0x4];
|
||||
/* 0x0FC */ f32 unk_0FC;
|
||||
/* 0x100 */ f32 unk_100[3]; // may be Vec3f
|
||||
/* 0x10C */ char pad10C[0x4];
|
||||
/* 0x110 */ f32 unk_110;
|
||||
/* 0x114 */ f32 unk_114[30];
|
||||
/* 0x18C */ Vec3f unk_18C[30];
|
||||
} UnkStruct_func_80090A00;
|
||||
|
||||
typedef struct {
|
||||
/* 0x00 */ ElementType1 unk_00;
|
||||
/* 0x1C */ UnkStruct_90A00_1C unk_1C;
|
||||
/* 0x40 */ char pad_40[0x4];
|
||||
/* 0x44 */ s16 unk_44;
|
||||
/* 0x46 */ s16 unk_46;
|
||||
/* 0x48 */ s16 unk_48;
|
||||
/* 0x4A */ s16 unk_4A;
|
||||
/* 0x4C */ char pad_4C[0x2];
|
||||
/* 0x4E */ s16 unk_4E;
|
||||
/* 0x50 */ char pad_50[0x4];
|
||||
/* 0x54 */ f32 unk_54;
|
||||
/* 0x58 */ f32 unk_58;
|
||||
/* 0x5C */ f32 unk_5C;
|
||||
/* 0x60 */ char pad_60[0xC];
|
||||
/* 0x6C */ f32 unk_6C;
|
||||
/* 0x70 */ f32 unk_70;
|
||||
/* 0x74 */ char pad_74[0xC];
|
||||
/* 0x80 */ f32 unk_80[1]; // unknown size
|
||||
/* 0x84 */ char pad_84[0x8];
|
||||
} UnkStruct_func_80094BBC; // size 0x8C
|
||||
/* 0x114 */ f32 unk_114;
|
||||
/* 0x118 */ f32 unk_118;
|
||||
/* 0x11C */ f32 unk_11C;
|
||||
/* 0x120 */ f32 unk_120;
|
||||
/* 0x124 */ Vec3f unk_124;
|
||||
/* 0x130 */ f32 unk_130;
|
||||
/* 0x134 */ f32 unk_134;
|
||||
/* 0x138 */ f32 unk_138;
|
||||
/* 0x13C */ f32 unk_13C;
|
||||
/* 0x140 */ char pad140[4];
|
||||
/* 0x144 */ f32 unk_144;
|
||||
/* 0x148 */ f32 unk_148;
|
||||
/* 0x14C */ f32 unk_14C;
|
||||
/* 0x150 */ f32 unk_150;
|
||||
/* 0x154 */ f32 unk_154;
|
||||
/* 0x158 */ char pad158[0x14];
|
||||
/* 0x16C */ f32 unk_16C;
|
||||
/* 0x170 */ char pad170[8];
|
||||
/* 0x178 */ f32 unk_178;
|
||||
/* 0x17C */ f32 unk_17C;
|
||||
/* 0x180 */ f32 unk_180;
|
||||
/* 0x184 */ char pad184[4];
|
||||
/* 0x188 */ f32 unk_188;
|
||||
/* 0x18C */ char pad18C[0x150];
|
||||
/* 0x2DC */ Vec3f unk_2DC;
|
||||
/* 0x2E8 */ Vec3f unk_2E8;
|
||||
} Object_2F4; // size = 0x2F4
|
||||
|
||||
#endif
|
||||
|
||||
+106
-55
@@ -159,7 +159,9 @@ extern OverlayInit D_800CBA44[2]; // E6A810
|
||||
extern OverlayInit D_800CBB74[1]; // DF4260
|
||||
extern OverlayInit D_800CBC0C[1]; // E08400
|
||||
extern OverlayInit D_800CBD3C[1]; // EFFA40
|
||||
extern UnkStruct_90A00_1C D_800CC124[400];
|
||||
extern ObjectStruct_1C D_800CC124[400];
|
||||
extern ObjectInit* D_800CFDA0[];
|
||||
extern f32 D_800CFE5C[];
|
||||
extern s32 D_800CFF90;
|
||||
extern f32 D_800D19AC[];
|
||||
extern f32 D_800D19E0[];
|
||||
@@ -189,6 +191,11 @@ extern Save D_800D4D10;
|
||||
|
||||
extern s32 D_8015F924;
|
||||
extern s32 D_8015F928;
|
||||
extern s32 D_8015F930[3];
|
||||
extern s32 D_8015F93C;
|
||||
extern s32 D_8015F940;
|
||||
extern f32 D_8015F944;
|
||||
extern s32 D_80161680;
|
||||
extern s32 D_80161690;
|
||||
extern f32 D_801616BC;
|
||||
extern f32 D_801616C0;
|
||||
@@ -225,13 +232,29 @@ extern u8 D_80161A39;
|
||||
extern f32 D_80161A3C;
|
||||
extern f32 D_80161A40;
|
||||
extern f32 D_80161A44;
|
||||
extern f32 D_80161A54;
|
||||
extern s32 D_80161A5C;
|
||||
extern u16 D_80161A62;
|
||||
extern u8 D_80161A90[];
|
||||
extern s32 D_80161A98;
|
||||
extern s16 D_80161AA0[];
|
||||
extern UnkStruct_func_80090A00 D_80163FE0[60];
|
||||
extern UnkStruct_D_8016F110 D_8016F110[];
|
||||
extern UnkStruct_func_80094BBC D_80173754[100]; // size intued by func_800933D8 loop
|
||||
extern UnkStruct_D_80175A10 D_80175A10[];
|
||||
extern Object_80 D_80161B00[50];
|
||||
extern Object_4C D_80163400[40];
|
||||
extern Object_2F4 D_80163FE0[60];
|
||||
extern Object_408 D_8016F110[4];
|
||||
extern Object_8C D_80170130[100];
|
||||
extern Object_6C D_801737E0[20];
|
||||
// extern size_70 D_80174050[16]
|
||||
// extern size_30 D_80174750[100]
|
||||
extern UnkStruct_D_80175A10 D_80175A10[64];
|
||||
extern UnkStruct_D_80175A10 D_80176410;
|
||||
// extern size_1C D_80176438[10]
|
||||
extern s32 D_80176550[2];
|
||||
extern f32 D_80176558[2][100];
|
||||
extern f32 D_80176878[2][100];
|
||||
extern f32 D_80176B98[2][100];
|
||||
extern f32 D_801771D8[2][100];
|
||||
extern f32 D_80176EB8[2][100];
|
||||
extern s32 D_801774F8;
|
||||
extern s32 D_80177820;
|
||||
extern s32 D_80177824;
|
||||
@@ -243,10 +266,12 @@ extern s32 D_8017783C;
|
||||
extern s32 D_80177840;
|
||||
extern s32 D_80177848;
|
||||
extern s32 D_8017784C;
|
||||
extern s32 D_80177850;
|
||||
extern s32 D_80177854;
|
||||
extern s32 D_80177858[];
|
||||
extern s32 D_80177868;
|
||||
extern s32 D_80177870[];
|
||||
extern s32 D_80177880;
|
||||
extern s32 D_80177898;
|
||||
extern s32 D_8017789C;
|
||||
extern s32 D_801778A0;
|
||||
@@ -271,15 +296,19 @@ extern f32 D_801779B8;
|
||||
extern f32 D_801779C0;
|
||||
extern s32 D_801779F8;
|
||||
extern s32 D_80177A80;
|
||||
extern s8 D_80177A98;
|
||||
extern s8 D_80177AB0;
|
||||
extern s32 D_80177AE0;
|
||||
extern s32 D_80177AF8;
|
||||
extern s32 D_80177B40;
|
||||
extern u16 D_80177C30[];
|
||||
extern s32 D_80177C50;
|
||||
extern u8 D_80177C74;
|
||||
extern s32 D_80177C80[];
|
||||
extern s32 D_80177C94;
|
||||
extern u8 D_80177C98;
|
||||
extern s32 D_80177C9C;
|
||||
extern s32 D_80177CA0;
|
||||
extern s32 D_80177CA4;
|
||||
extern s32 D_80177CAC;
|
||||
extern s32 D_80177CB4;
|
||||
@@ -291,15 +320,24 @@ extern f32 D_80177D50;
|
||||
extern f32 D_80177D68;
|
||||
extern s32 D_80177DA0[];
|
||||
extern s32 D_80177DB0;
|
||||
extern UnkStruct_D_80178280* D_80178280;
|
||||
extern s32 D_80177DC8;
|
||||
extern s32 D_80177E70;
|
||||
extern s32 D_80177E78;
|
||||
extern Vec3f D_80177E88;
|
||||
extern Vec3f D_80177F10;
|
||||
extern s32 D_8017812C;
|
||||
extern s32 D_80178234;
|
||||
extern s32 D_8017827C;
|
||||
extern UnkStruct_D_80178280* D_80178280;
|
||||
extern s32 D_8017829C;
|
||||
extern s32 D_801782A4;
|
||||
extern Object_58 *D_801782A8;
|
||||
extern s32 D_801782B8;
|
||||
extern s32 D_801782D8;
|
||||
extern s32 D_801782E8;
|
||||
extern s32 D_801782F8;
|
||||
extern u16* D_80178308;
|
||||
extern ObjectInit* D_80178310;
|
||||
extern s32 D_80178320;
|
||||
extern s32 D_80178328;
|
||||
extern s32 D_80178330;
|
||||
@@ -333,6 +371,7 @@ extern f32 D_8017873C;
|
||||
extern f32 D_80178740;
|
||||
extern s32 D_80178754;
|
||||
extern s32 D_80178758;
|
||||
extern s32 D_80178768[];
|
||||
extern SaveFile D_80178870;
|
||||
|
||||
extern u16 D_Tex_800D99F8[];
|
||||
@@ -341,7 +380,10 @@ extern Gfx D_Gfx_800DBAA0[];
|
||||
|
||||
extern DmaEntry gDmaTable[]; // 178A70
|
||||
extern u8 D_80179010[][16 * 13 / 2];
|
||||
extern UnkStruct_D_80185CBC D_80185CBC[];
|
||||
extern u16 D_80182544[];
|
||||
extern u16 D_80183CA8[];
|
||||
extern u16 D_80183CF0[];
|
||||
extern u16 D_80183D3C[];
|
||||
extern u16 D_80183630[];
|
||||
extern u16 D_8018366C[];
|
||||
extern u16 D_80183690[];
|
||||
@@ -354,53 +396,57 @@ extern u16 D_8018398C[];
|
||||
extern u16 D_801839B8[];
|
||||
extern u16 D_80183A08[];
|
||||
extern u16 D_80183A64[];
|
||||
extern UnkStruct_D_80185CBC D_80185CBC[];
|
||||
|
||||
extern f32 D_801B7BC8;
|
||||
extern f32 D_801B7BCC;
|
||||
extern s32 D_801B8220[];
|
||||
extern u8 D_801B8248[][4];
|
||||
extern s32 D_801B827C;
|
||||
extern s32 D_801B8280;
|
||||
extern s32 D_801B8284;
|
||||
extern s32 D_801B8288;
|
||||
extern s32 D_801B82A8;
|
||||
extern s32 D_801B82AC;
|
||||
extern s32 D_801B82BC;
|
||||
extern s32 D_801B82C0;
|
||||
extern s32 D_801B82C4;
|
||||
extern f32 D_801B82E0;
|
||||
extern f32 D_801B82E4;
|
||||
extern f32 D_801B82E8;
|
||||
extern s32 D_801B82F8;
|
||||
extern s32 D_801B82FC;
|
||||
extern s32 D_801B8300;
|
||||
extern f32 D_801B8304;
|
||||
extern f32 D_801B8308;
|
||||
extern f32 D_801B830C;
|
||||
extern s32 D_801B8310;
|
||||
extern s32 D_801B8314;
|
||||
extern s32 D_801B8318;
|
||||
extern s32 D_801B831C;
|
||||
extern s32 D_801B8320;
|
||||
extern s32 D_801B8324;
|
||||
extern f32 D_801B833C;
|
||||
extern s32 D_801B8344;
|
||||
extern s32 D_801B8348;
|
||||
extern s32 D_801B86A4;
|
||||
extern f32 D_801B86C8;
|
||||
extern f32 D_801B86CC;
|
||||
extern f32 D_801B86D0;
|
||||
extern f32 D_801B86D4;
|
||||
extern f32 D_801B86D8;
|
||||
extern f32 D_801B86DC;
|
||||
extern s32 D_801B9040;
|
||||
extern f32 D_801B905C;
|
||||
extern f32 D_801B9060;
|
||||
extern f32 D_801B9064;
|
||||
extern f32 D_E9F1D0_801A7F60;
|
||||
extern f32 D_E9F1D0_801A7F78;
|
||||
extern f32 D_EBFBE0_801B7BC8;
|
||||
extern f32 D_EBFBE0_801B7BCC;
|
||||
extern s32 D_EBFBE0_801B8220[];
|
||||
extern u8 D_EBFBE0_801B8248[][4];
|
||||
extern s32 D_EBFBE0_801B827C;
|
||||
extern s32 D_EBFBE0_801B8280;
|
||||
extern s32 D_EBFBE0_801B8284;
|
||||
extern s32 D_EBFBE0_801B8288;
|
||||
extern s32 D_EBFBE0_801B82A8;
|
||||
extern s32 D_EBFBE0_801B82AC;
|
||||
extern s32 D_EBFBE0_801B82BC;
|
||||
extern s32 D_EBFBE0_801B82C0;
|
||||
extern s32 D_EBFBE0_801B82C4;
|
||||
extern f32 D_EBFBE0_801B82E0;
|
||||
extern f32 D_EBFBE0_801B82E4;
|
||||
extern f32 D_EBFBE0_801B82E8;
|
||||
extern s32 D_EBFBE0_801B82F8;
|
||||
extern s32 D_EBFBE0_801B82FC;
|
||||
extern s32 D_EBFBE0_801B8300;
|
||||
extern f32 D_EBFBE0_801B8304;
|
||||
extern f32 D_EBFBE0_801B8308;
|
||||
extern f32 D_EBFBE0_801B830C;
|
||||
extern s32 D_EBFBE0_801B8310;
|
||||
extern s32 D_EBFBE0_801B8314;
|
||||
extern s32 D_EBFBE0_801B8318;
|
||||
extern s32 D_EBFBE0_801B831C;
|
||||
extern s32 D_EBFBE0_801B8320;
|
||||
extern s32 D_EBFBE0_801B8324;
|
||||
extern f32 D_EBFBE0_801B833C;
|
||||
extern s32 D_EBFBE0_801B8344;
|
||||
extern s32 D_EBFBE0_801B8348;
|
||||
extern s32 D_EBFBE0_801B86A4;
|
||||
extern f32 D_EBFBE0_801B86C8;
|
||||
extern f32 D_EBFBE0_801B86CC;
|
||||
extern f32 D_EBFBE0_801B86D0;
|
||||
extern f32 D_EBFBE0_801B86D4;
|
||||
extern f32 D_EBFBE0_801B86D8;
|
||||
extern f32 D_EBFBE0_801B86DC;
|
||||
extern s32 D_EBFBE0_801B9040;
|
||||
extern f32 D_EBFBE0_801B905C;
|
||||
extern f32 D_EBFBE0_801B9060;
|
||||
extern f32 D_EBFBE0_801B9064;
|
||||
extern s8 D_E6A810_801BA1E8;
|
||||
|
||||
extern char D_801ADA44_EE6104[];
|
||||
extern s32 D_801ADA84_EE6144[];
|
||||
extern s32 D_801ADA94_EE6154;
|
||||
extern char D_EBFBE0_801ADA44[];
|
||||
extern s32 D_EBFBE0_801ADA84[];
|
||||
extern s32 D_EBFEB0_801ADA94;
|
||||
|
||||
extern u8 D_80281000[0x400];
|
||||
extern u8 D_80281400[0xC00];
|
||||
@@ -479,13 +525,13 @@ extern u8 D_5000000[];
|
||||
extern u8 D_5000080[];
|
||||
extern u8 D_5000100[];
|
||||
extern u8 D_5000180[];
|
||||
extern u8 D_5000200[];
|
||||
extern u16 D_5000200[];
|
||||
extern u8 D_5000280[];
|
||||
extern u8 D_5000300[];
|
||||
extern u16 D_5000300[];
|
||||
extern u8 D_5000380[];
|
||||
extern u8 D_5000400[];
|
||||
extern u8 D_5000480[];
|
||||
extern s32 D_50077B0;
|
||||
extern u16 D_50077B0[];
|
||||
extern u8 D_5009F60[];
|
||||
extern u8 D_500A050[];
|
||||
extern u8 D_500A140[];
|
||||
@@ -497,6 +543,11 @@ extern u8 D_500A5F0[];
|
||||
extern u8 D_500A6E0[];
|
||||
extern u8 D_500A7D0[];
|
||||
|
||||
extern ObjectInit* D_6010088[];
|
||||
extern ObjectInit* D_602B148[];
|
||||
extern ObjectInit* D_602F18C[];
|
||||
extern ObjectInit* D_C0356A4[];
|
||||
|
||||
extern Gfx D_6004570[];
|
||||
extern Gfx D_D0098B0[];
|
||||
extern Gfx D_F014180[];
|
||||
|
||||
@@ -118,6 +118,8 @@ D_800E1FB8 = 0x800E1FB8;
|
||||
D_800E1FC0 = 0x800E1FC0;
|
||||
D_800E1FC8 = 0x800E1FC8;
|
||||
|
||||
D_800CBD3C = 0x800CBD3C;
|
||||
|
||||
gPiMgrCmdQueue = 0x800E2010;
|
||||
sPiMgrCmdBuff = 0x800E2028;
|
||||
sIdleThread = 0x80138E90;
|
||||
@@ -142,6 +144,8 @@ gFrameBuffers = 0x8038F800;
|
||||
D_8013C3D0 = 0x8013C3D0; // size:0x8800
|
||||
gFaultMgr = 0x80145360; // size:0x9D8
|
||||
|
||||
D_80177E88 = 0x80177E88; // size:0xC
|
||||
|
||||
Mio0_Decompress = 0x8001EE70;
|
||||
RdRam_CheckIPL3 = 0x8001EF10;
|
||||
|
||||
@@ -155,18 +159,17 @@ D_800D8570 = 0x800D8570; // force_migration:True
|
||||
D_800D8594 = 0x800D8594; // force_migration:True
|
||||
D_800C93EC = 0x800C93EC; // force_migration:True
|
||||
|
||||
D_8019B1EC_E07F2C = 0x8019B1EC; // force_migration:True segment:segment_DF4260
|
||||
D_801C171C_E50E4C = 0x801C171C; // force_migration:True segment:segment_E16C50
|
||||
D_801C1728_E50E58 = 0x801C1728; // force_migration:True segment:segment_E16C50
|
||||
D_801C1730_E50E60 = 0x801C1730; // force_migration:True segment:segment_E16C50
|
||||
D_801C1758_E50E88 = 0x801C1758; // force_migration:True segment:segment_E16C50
|
||||
D_801BB83C_E9EB2C = 0x801BB83C; // force_migration:True segment:segment_E6A810
|
||||
D_801BB808_E9EAF8 = 0x801BB808; // force_migration:True segment:segment_E6A810
|
||||
D_801BBAD0_E9EDC0 = 0x801BBAD0; // force_migration:True segment:segment_E6A810
|
||||
D_801BBAE0_E9EDD4 = 0x801BBAE4; // force_migration:True segment:segment_E6A810
|
||||
D_80196BF4_EFF934 = 0x80196BF4; // force_migration:True segment:segment_EF0260
|
||||
D_8019FE74_E6A2C4 = 0x8019FE74; // force_migration:True segment:segment_E51970
|
||||
D_8019FEFC_E6A34C = 0x8019FEFC; // force_migration:True segment:segment_E51970
|
||||
D_801A7560_EBF210 = 0x801A7560; // force_migration:True segment:segment_E9F1D0
|
||||
D_801A792C_EBF5DC = 0x801A792C; // force_migration:True segment:segment_E9F1D0
|
||||
D_801B6E50_EEF510 = 0x801B6E50; // force_migration:True segment:segment_EBFBE0
|
||||
D_DF4260_8019B1EC = 0x8019B1EC; // force_migration:True segment:ovl_DF4260
|
||||
D_E16C50_801C171C = 0x801C171C; // force_migration:True segment:ovl_E16C50
|
||||
D_E16C50_801C1728 = 0x801C1728; // force_migration:True segment:ovl_E16C50
|
||||
D_E16C50_801C1730 = 0x801C1730; // force_migration:True segment:ovl_E16C50
|
||||
D_E16C50_801C1758 = 0x801C1758; // force_migration:True segment:ovl_E16C50
|
||||
D_E6A810_801BB83C = 0x801BB83C; // force_migration:True segment:ovl_E6A810
|
||||
D_E6A810_801BB808 = 0x801BB808; // force_migration:True segment:ovl_E6A810
|
||||
D_E6A810_801BBAD0 = 0x801BBAD0; // force_migration:True segment:ovl_E6A810
|
||||
D_E6A810_801BBAE4 = 0x801BBAE4; // force_migration:True segment:ovl_E6A810
|
||||
D_EF0260_80196BF4 = 0x80196BF4; // force_migration:True segment:ovl_EF0260
|
||||
D_E51970_8019FE74 = 0x8019FE74; // force_migration:True segment:ovl_E51970
|
||||
D_E51970_8019FEFC = 0x8019FEFC; // force_migration:True segment:ovl_E51970
|
||||
D_E9F1D0_801A7560 = 0x801A7560; // force_migration:True segment:ovl_E9F1D0
|
||||
D_E9F1D0_801A792C = 0x801A792C; // force_migration:True segment:ovl_E9F1D0
|
||||
|
||||
@@ -0,0 +1,103 @@
|
||||
D_EBFBE0_801B6E50 = 0x801B6E50; // force_migration:True segment:ovl_EBFBE0
|
||||
|
||||
D_EBFBE0_801B7BA0 = 0x801B7BA0;
|
||||
D_EBFBE0_801B827C = 0x801B827C;
|
||||
D_EBFBE0_801B9710 = 0x801B9710;
|
||||
D_EBFBE0_801B9A10 = 0x801B9A10;
|
||||
D_EBFBE0_801B9D10 = 0x801B9D10;
|
||||
D_EBFBE0_801BA010 = 0x801BA010;
|
||||
D_EBFBE0_801BA310 = 0x801BA310;
|
||||
D_EBFBE0_801BA610 = 0x801BA610;
|
||||
D_EBFBE0_801BA910 = 0x801BA910;
|
||||
D_EBFBE0_801BAC10 = 0x801BAC10;
|
||||
D_EBFBE0_801BAF10 = 0x801BAF10;
|
||||
D_EBFBE0_801BB210 = 0x801BB210;
|
||||
D_EBFBE0_801BB510 = 0x801BB510;
|
||||
D_EBFBE0_801BBB10 = 0x801BBB10;
|
||||
D_EBFBE0_801BBE10 = 0x801BBE10;
|
||||
D_EBFBE0_801BC110 = 0x801BC110;
|
||||
D_EBFBE0_801BC410 = 0x801BC410;
|
||||
D_EBFBE0_801BC710 = 0x801BC710;
|
||||
D_EBFBE0_801BCA10 = 0x801BCA10;
|
||||
D_EBFBE0_801BCD10 = 0x801BCD10;
|
||||
D_EBFBE0_801BD010 = 0x801BD010;
|
||||
D_EBFBE0_801BD310 = 0x801BD310;
|
||||
D_EBFBE0_801BD610 = 0x801BD610;
|
||||
D_EBFBE0_801BD910 = 0x801BD910;
|
||||
D_EBFBE0_801BDF10 = 0x801BDF10;
|
||||
D_EBFBE0_801BE210 = 0x801BE210;
|
||||
D_EBFBE0_801BE510 = 0x801BE510;
|
||||
D_EBFBE0_801BE810 = 0x801BE810;
|
||||
D_EBFBE0_801BEB10 = 0x801BEB10;
|
||||
D_EBFBE0_801BEE10 = 0x801BEE10;
|
||||
D_EBFBE0_801BF110 = 0x801BF110;
|
||||
D_EBFBE0_801BF410 = 0x801BF410;
|
||||
D_EBFBE0_801BF710 = 0x801BF710;
|
||||
D_EBFBE0_801BFA10 = 0x801BFA10;
|
||||
D_EBFBE0_801BFD10 = 0x801BFD10;
|
||||
D_EBFBE0_801C0310 = 0x801C0310;
|
||||
D_EBFBE0_801C0610 = 0x801C0610;
|
||||
D_EBFBE0_801C0910 = 0x801C0910;
|
||||
D_EBFBE0_801C0C10 = 0x801C0C10;
|
||||
D_EBFBE0_801C0F10 = 0x801C0F10;
|
||||
D_EBFBE0_801C1210 = 0x801C1210;
|
||||
D_EBFBE0_801C1510 = 0x801C1510;
|
||||
D_EBFBE0_801C1810 = 0x801C1810;
|
||||
D_EBFBE0_801C1B10 = 0x801C1B10;
|
||||
D_EBFBE0_801C1E10 = 0x801C1E10;
|
||||
D_EBFBE0_801C2110 = 0x801C2110;
|
||||
D_EBFBE0_801C2710 = 0x801C2710;
|
||||
D_EBFBE0_801C2A10 = 0x801C2A10;
|
||||
D_EBFBE0_801C2D10 = 0x801C2D10;
|
||||
D_EBFBE0_801C3010 = 0x801C3010;
|
||||
D_EBFBE0_801C3310 = 0x801C3310;
|
||||
D_EBFBE0_801C3610 = 0x801C3610;
|
||||
D_EBFBE0_801C3910 = 0x801C3910;
|
||||
D_EBFBE0_801C3C10 = 0x801C3C10;
|
||||
D_EBFBE0_801C3F10 = 0x801C3F10;
|
||||
D_EBFBE0_801C4210 = 0x801C4210;
|
||||
D_EBFBE0_801C4510 = 0x801C4510;
|
||||
D_EBFBE0_801C4B10 = 0x801C4B10;
|
||||
D_EBFBE0_801C4E10 = 0x801C4E10;
|
||||
D_EBFBE0_801C5110 = 0x801C5110;
|
||||
D_EBFBE0_801C5410 = 0x801C5410;
|
||||
D_EBFBE0_801C5710 = 0x801C5710;
|
||||
D_EBFBE0_801C5A10 = 0x801C5A10;
|
||||
D_EBFBE0_801C5D10 = 0x801C5D10;
|
||||
D_EBFBE0_801C6010 = 0x801C6010;
|
||||
D_EBFBE0_801C6310 = 0x801C6310;
|
||||
D_EBFBE0_801C6610 = 0x801C6610;
|
||||
D_EBFBE0_801C6910 = 0x801C6910;
|
||||
D_EBFBE0_801C6F10 = 0x801C6F10;
|
||||
D_EBFBE0_801C7210 = 0x801C7210;
|
||||
D_EBFBE0_801C7510 = 0x801C7510;
|
||||
D_EBFBE0_801C7810 = 0x801C7810;
|
||||
D_EBFBE0_801C7B10 = 0x801C7B10;
|
||||
D_EBFBE0_801C7E10 = 0x801C7E10;
|
||||
D_EBFBE0_801C8110 = 0x801C8110;
|
||||
D_EBFBE0_801C8410 = 0x801C8410;
|
||||
D_EBFBE0_801C8710 = 0x801C8710;
|
||||
D_EBFBE0_801C8A10 = 0x801C8A10;
|
||||
D_EBFBE0_801C8D10 = 0x801C8D10;
|
||||
D_EBFBE0_801C9310 = 0x801C9310;
|
||||
D_EBFBE0_801C9610 = 0x801C9610;
|
||||
D_EBFBE0_801C9910 = 0x801C9910;
|
||||
D_EBFBE0_801C9C10 = 0x801C9C10;
|
||||
D_EBFBE0_801C9F10 = 0x801C9F10;
|
||||
D_EBFBE0_801CA210 = 0x801CA210;
|
||||
D_EBFBE0_801CA510 = 0x801CA510;
|
||||
D_EBFBE0_801CA810 = 0x801CA810;
|
||||
D_EBFBE0_801CAB10 = 0x801CAB10;
|
||||
D_EBFBE0_801CAE10 = 0x801CAE10;
|
||||
D_EBFBE0_801CB110 = 0x801CB110;
|
||||
D_EBFBE0_801CB710 = 0x801CB710;
|
||||
D_EBFBE0_801CBA10 = 0x801CBA10;
|
||||
D_EBFBE0_801CBD10 = 0x801CBD10;
|
||||
D_EBFBE0_801CC010 = 0x801CC010;
|
||||
D_EBFBE0_801CC310 = 0x801CC310;
|
||||
D_EBFBE0_801CC610 = 0x801CC610;
|
||||
D_EBFBE0_801CC910 = 0x801CC910;
|
||||
D_EBFBE0_801CCC10 = 0x801CCC10;
|
||||
D_EBFBE0_801CCF10 = 0x801CCF10;
|
||||
D_EBFBE0_801CD210 = 0x801CD210;
|
||||
D_EBFBE0_801CD510 = 0x801CD510;
|
||||
@@ -0,0 +1,36 @@
|
||||
D_DF4260_8019B6C0 = 0x8019B6C0;
|
||||
D_E08400_80195D70 = 0x80195D70;
|
||||
D_E16C50_801C2240 = 0x801C2240;
|
||||
D_E51970_801A03C0 = 0x801A03C0;
|
||||
D_E6A810_801BBEE0 = 0x801BBEE0;
|
||||
D_E9F1D0_801A7F30 = 0x801A7F30;
|
||||
D_EFFA40_801875C0 = 0x801875C0;
|
||||
|
||||
D_E6A810_801BA1E8 = 0x801BA1E8;
|
||||
D_E51970_8019EE80 = 0x8019EE80;
|
||||
|
||||
D_E51970_801A03DC = 0x801A03DC;
|
||||
|
||||
D_E16C50_801C4188 = 0x801C4188;
|
||||
|
||||
D_E9F1D0_801A7F58 = 0x801A7F58;
|
||||
D_E9F1D0_801A7F60 = 0x801A7F60;
|
||||
D_E9F1D0_801A7F68 = 0x801A7F68;
|
||||
D_E9F1D0_801A7F70 = 0x801A7F70;
|
||||
D_E9F1D0_801A7F78 = 0x801A7F78;
|
||||
|
||||
D_DF4260_8019A008 = 0x8019A008;
|
||||
|
||||
D_E6A810_801B7584 = 0x801B7584;
|
||||
D_E6A810_801B7608 = 0x801B7608;
|
||||
D_E6A810_801B769C = 0x801B769C;
|
||||
|
||||
D_E6A810_801BE250 = 0x801BE250;
|
||||
D_E6A810_801BE258 = 0x801BE258;
|
||||
D_E6A810_801BE25C = 0x801BE25C;
|
||||
D_E6A810_801BE274 = 0x801BE274;
|
||||
D_E6A810_801BE280 = 0x801BE280;
|
||||
D_E6A810_801BE284 = 0x801BE284;
|
||||
D_E6A810_801BE29C = 0x801BE29C;
|
||||
D_E6A810_801BE2FA = 0x801BE2FA;
|
||||
D_E6A810_801BE2A4 = 0x801BE2A4;
|
||||
+65
-11
@@ -1,9 +1,38 @@
|
||||
#include "global.h"
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_2EFE0/func_8002E3E0.s")
|
||||
void func_80187520(s32, void*);
|
||||
|
||||
void func_8002E3E0(Object_2F4* arg0) {
|
||||
s32 var_a3 = 0;
|
||||
|
||||
if (D_80178234 == 0x13) {
|
||||
if (D_8015F940 < 0xF00) {
|
||||
var_a3 = 0x32;
|
||||
} else if (D_8015F940 < 0x1680) {
|
||||
var_a3 = 0x1E;
|
||||
} else if (D_8015F940 < 0x1E00) {
|
||||
var_a3 = 0x14;
|
||||
} else if (D_8015F940 < 0x2580) {
|
||||
var_a3 = 0xA;
|
||||
}
|
||||
} else if (D_8015F940 < 0xF00) {
|
||||
var_a3 = 0xA;
|
||||
} else if (D_8015F940 < 0x1680) {
|
||||
var_a3 = 5;
|
||||
} else if (D_8015F940 < 0x1E00) {
|
||||
var_a3 = 2;
|
||||
} else if (D_8015F940 < 0x2580) {
|
||||
var_a3 = 1;
|
||||
}
|
||||
if (var_a3 != 0) {
|
||||
func_80077240(arg0->obj.pos.x, arg0->obj.pos.y, arg0->obj.pos.z, var_a3);
|
||||
}
|
||||
D_80161A98 += var_a3;
|
||||
D_80177850 = 0xF;
|
||||
}
|
||||
|
||||
s32 func_8002E4F8(u16* arg0, s32 arg1) {
|
||||
if ((D_8017829C == 0) && (D_80178280->unk_1C8 != 0)) {
|
||||
if ((D_8017829C == 0) && (D_80178280[0].unk_1C8 != 0)) {
|
||||
func_800BA808(arg0, arg1);
|
||||
return 1;
|
||||
} else {
|
||||
@@ -11,20 +40,45 @@ s32 func_8002E4F8(u16* arg0, s32 arg1) {
|
||||
}
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_2EFE0/func_8002E548.s")
|
||||
void func_8002E548(void) {
|
||||
if (D_8015F93C != 0) {
|
||||
s32 sp24 = D_8015F930[1];
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_2EFE0/func_8002E5E0.s")
|
||||
func_8008E51C(D_8015F930, D_8015F944);
|
||||
if ((D_8015F930[0] == 0) && (sp24 != D_8015F930[1]) && (D_8015F930[1] < 15)) {
|
||||
func_80019218(0x4900C02A, D_800C5D28, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_2EFE0/func_8002E604.s")
|
||||
void func_8002E5E0(void* arg0) {
|
||||
func_80187520(0x5B, arg0);
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_2EFE0/func_8002E628.s")
|
||||
void func_8002E604(void* arg0) {
|
||||
func_80187520(0x5C, arg0);
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_2EFE0/func_8002E64C.s")
|
||||
void func_8002E628(void* arg0) {
|
||||
func_80187520(0x5D, arg0);
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_2EFE0/func_8002E670.s")
|
||||
void func_8002E64C(void* arg0) {
|
||||
func_80187520(0x5E, arg0);
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_2EFE0/func_8002E694.s")
|
||||
void func_8002E670(void* arg0) {
|
||||
func_80187520(0x5F, arg0);
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_2EFE0/func_8002E6B8.s")
|
||||
void func_8002E694(void* arg0) {
|
||||
func_80187520(0x60, arg0);
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_2EFE0/func_8002E6DC.s")
|
||||
void func_8002E6B8(void* arg0) {
|
||||
func_80187520(0x61, arg0);
|
||||
}
|
||||
|
||||
void func_8002E6DC(void* arg0) {
|
||||
func_80187520(0x62, arg0);
|
||||
}
|
||||
|
||||
+31
-32
@@ -1,7 +1,6 @@
|
||||
#include "global.h"
|
||||
|
||||
#define SEGMENT_SIZE(segment) ((ptrdiff_t) ((uintptr_t) (segment).end - (uintptr_t) (segment).start))
|
||||
#define PHYS_ADDR(ptr) ((uintptr_t) (ptr) &0x1FFFFFFF)
|
||||
|
||||
extern u8 func_80187520[];
|
||||
extern OverlayInit D_800CBDD4;
|
||||
@@ -25,42 +24,42 @@ void func_80058B80(void* arg0, void* arg1, ptrdiff_t arg2) {
|
||||
}
|
||||
}
|
||||
|
||||
u8 func_80058C48(OverlayInit* segment) {
|
||||
u8* var_s2 = func_80187520;
|
||||
u8 var_s1;
|
||||
u8 sp42 = 0;
|
||||
u8 func_80058C48(OverlayInit* ovlInit) {
|
||||
u8* ramPtr = func_80187520;
|
||||
u8 segment;
|
||||
u8 startLoad = false;
|
||||
|
||||
if (segment->unk_0.start == (0, D_800CBDD4.unk_0.start)) { // fake because D_800CBDD4 is probably 2D array
|
||||
var_s2 = var_s2 + SEGMENT_SIZE(segment->unk_0);
|
||||
var_s2 = var_s2 + SEGMENT_SIZE(segment->unk_8);
|
||||
if (ovlInit->rom.start == (0, D_800CBDD4.rom.start)) { // fake because D_800CBDD4 is probably 2D array
|
||||
ramPtr = ramPtr + SEGMENT_SIZE(ovlInit->rom);
|
||||
ramPtr = ramPtr + SEGMENT_SIZE(ovlInit->bss);
|
||||
} else {
|
||||
D_800CBDD4.unk_0.start = segment->unk_0.start;
|
||||
D_800CBDD4.unk_0.end = var_s2;
|
||||
if (segment->unk_0.start != 0) {
|
||||
sp42 = 1;
|
||||
func_80058B80(segment->unk_0.start, var_s2, SEGMENT_SIZE(segment->unk_0));
|
||||
var_s2 = var_s2 + SEGMENT_SIZE(segment->unk_0);
|
||||
bzero(segment->unk_8.start, SEGMENT_SIZE(segment->unk_8));
|
||||
var_s2 = var_s2 + SEGMENT_SIZE(segment->unk_8);
|
||||
D_800CBDD4.rom.start = ovlInit->rom.start;
|
||||
D_800CBDD4.rom.end = ramPtr;
|
||||
if (ovlInit->rom.start != 0) {
|
||||
startLoad = true;
|
||||
func_80058B80(ovlInit->rom.start, ramPtr, SEGMENT_SIZE(ovlInit->rom));
|
||||
ramPtr = ramPtr + SEGMENT_SIZE(ovlInit->rom);
|
||||
bzero(ovlInit->bss.start, SEGMENT_SIZE(ovlInit->bss));
|
||||
ramPtr = ramPtr + SEGMENT_SIZE(ovlInit->bss);
|
||||
}
|
||||
}
|
||||
var_s1 = 0;
|
||||
while ((var_s1 < 15) && (segment->unk_20[var_s1].start == D_800CBDD4.unk_20[var_s1].start) && (sp42 == 0)) {
|
||||
if (segment->unk_20[var_s1].start != 0) {
|
||||
gSegments[var_s1 + 1] = PHYS_ADDR(var_s2);
|
||||
gSPSegment(gUnkDisp1++, var_s1 + 1, PHYS_ADDR(var_s2));
|
||||
var_s2 = var_s2 + SEGMENT_SIZE(segment->unk_20[var_s1]);
|
||||
segment = 0;
|
||||
while ((segment < 15) && (ovlInit->assets[segment].start == D_800CBDD4.assets[segment].start) && (startLoad == 0)) {
|
||||
if (ovlInit->assets[segment].start != 0) {
|
||||
gSegments[segment + 1] = K0_TO_PHYS(ramPtr);
|
||||
gSPSegment(gUnkDisp1++, segment + 1, K0_TO_PHYS(ramPtr));
|
||||
ramPtr = ramPtr + SEGMENT_SIZE(ovlInit->assets[segment]);
|
||||
}
|
||||
var_s1 += 1;
|
||||
segment += 1;
|
||||
}
|
||||
for (var_s1; var_s1 < 15; var_s1 += 1) {
|
||||
D_800CBDD4.unk_20[var_s1].start = segment->unk_20[var_s1].start;
|
||||
D_800CBDD4.unk_20[var_s1].end = var_s2;
|
||||
if (segment->unk_20[var_s1].start != 0) {
|
||||
gSegments[var_s1 + 1] = PHYS_ADDR(var_s2);
|
||||
gSPSegment(gUnkDisp1++, var_s1 + 1, PHYS_ADDR(var_s2));
|
||||
func_80058B80(segment->unk_20[var_s1].start, var_s2, SEGMENT_SIZE(segment->unk_20[var_s1]));
|
||||
var_s2 = var_s2 + SEGMENT_SIZE(segment->unk_20[var_s1]);
|
||||
for (segment; segment < 15; segment += 1) {
|
||||
D_800CBDD4.assets[segment].start = ovlInit->assets[segment].start;
|
||||
D_800CBDD4.assets[segment].end = ramPtr;
|
||||
if (ovlInit->assets[segment].start != 0) {
|
||||
gSegments[segment + 1] = K0_TO_PHYS(ramPtr);
|
||||
gSPSegment(gUnkDisp1++, segment + 1, K0_TO_PHYS(ramPtr));
|
||||
func_80058B80(ovlInit->assets[segment].start, ramPtr, SEGMENT_SIZE(ovlInit->assets[segment]));
|
||||
ramPtr = ramPtr + SEGMENT_SIZE(ovlInit->assets[segment]);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -69,7 +68,7 @@ u8 func_80058C48(OverlayInit* segment) {
|
||||
} else if (D_80137E80 == 0) {
|
||||
func_800034E8(0);
|
||||
}
|
||||
return sp42;
|
||||
return startLoad;
|
||||
}
|
||||
|
||||
u8 func_80058F14(u8 arg0, u8 arg1) {
|
||||
|
||||
+874
-37
File diff suppressed because it is too large
Load Diff
+9
-9
@@ -235,7 +235,7 @@ void func_800A24DC(s32 arg0) {
|
||||
case 8:
|
||||
func_8003DAF0();
|
||||
D_801778A0 = arg0;
|
||||
func_8018AAC4();
|
||||
func_EF0260_8018AAC4();
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -408,7 +408,7 @@ void func_800A26C0(void) {
|
||||
func_80187520(0x6B, NULL);
|
||||
break;
|
||||
case 0x4:
|
||||
func_8019E8D0();
|
||||
func_EBFBE0_8019E8D0();
|
||||
break;
|
||||
case 0x6:
|
||||
func_800C20B0();
|
||||
@@ -421,7 +421,7 @@ void func_800A26C0(void) {
|
||||
break;
|
||||
case 0x8:
|
||||
D_80177898 = 8;
|
||||
func_8018A96C();
|
||||
func_EF0260_8018A96C();
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
@@ -498,16 +498,16 @@ void func_800A26C0(void) {
|
||||
}
|
||||
}
|
||||
|
||||
UnkStruct_func_80090A00* func_800A3608(s32 arg0) {
|
||||
UnkStruct_func_80090A00* var_a2 = D_80163FE0;
|
||||
Object_2F4* func_800A3608(s32 arg0) {
|
||||
Object_2F4* var_a2 = D_80163FE0;
|
||||
s32 i;
|
||||
|
||||
for (i = 0; i < 60; i++, var_a2++) {
|
||||
if (var_a2->unk_000.unk_00 == 0) {
|
||||
if (var_a2->obj.status == 0) {
|
||||
func_800613C4(var_a2);
|
||||
var_a2->unk_000.unk_00 = 1;
|
||||
var_a2->unk_000.unk_02 = arg0;
|
||||
func_800612B8(&var_a2->unk_01C, var_a2->unk_000.unk_02);
|
||||
var_a2->obj.status = 1;
|
||||
var_a2->obj.id = arg0;
|
||||
func_800612B8(&var_a2->unk_01C, var_a2->obj.id);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
+248
-253
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,146 @@
|
||||
#include "global.h"
|
||||
#include "DF4260.h"
|
||||
|
||||
void func_DF4260_80187520(s32 arg0, s32 arg1) {
|
||||
}
|
||||
|
||||
void func_DF4260_80187530(s32 arg0) {
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DF4260/func_DF4260_8018753C.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DF4260/func_DF4260_801875A4.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DF4260/func_DF4260_80187670.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DF4260/func_DF4260_80187710.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DF4260/func_DF4260_801877A0.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DF4260/func_DF4260_80187838.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DF4260/func_DF4260_801878D8.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DF4260/func_DF4260_8018798C.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DF4260/func_DF4260_801879F0.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DF4260/func_DF4260_80187A38.s")
|
||||
|
||||
f32 func_DF4260_80187A88(s32 arg0) {
|
||||
f32 ret = (f32) arg0 * 0.5f;
|
||||
|
||||
if (ret > 8.0f) {
|
||||
ret = 8.0f;
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DF4260/func_DF4260_80187AC8.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DF4260/func_DF4260_80188750.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DF4260/func_DF4260_801887AC.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DF4260/func_DF4260_80188A18.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DF4260/func_DF4260_80188C7C.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DF4260/func_DF4260_80188D50.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DF4260/func_DF4260_80189058.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DF4260/func_DF4260_8018A434.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DF4260/func_DF4260_8018A730.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DF4260/func_DF4260_8018AA74.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DF4260/func_DF4260_8018AB08.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DF4260/func_DF4260_8018AB64.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DF4260/func_DF4260_8018ACE0.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DF4260/func_DF4260_8018AED0.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DF4260/func_DF4260_8018B0B4.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DF4260/func_DF4260_8018B15C.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DF4260/func_DF4260_8018B418.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DF4260/func_DF4260_8018B58C.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DF4260/func_DF4260_8018BAAC.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DF4260/func_DF4260_8018BAFC.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DF4260/func_DF4260_8018BBA4.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DF4260/func_DF4260_8018BBF8.s")
|
||||
|
||||
s32 func_DF4260_8018BC50(s32 arg0, s32* arg1, s32 arg2, s32 arg3, UnkStruct_func_DF4260_8018BC50* arg4) {
|
||||
if ((arg4->unkB8 == 0x65) && (arg0 != 8)) {
|
||||
*arg1 = 0;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DF4260/func_DF4260_8018BC84.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DF4260/func_DF4260_8018BD7C.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DF4260/func_DF4260_8018BDD4.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DF4260/func_DF4260_8018BE7C.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DF4260/func_DF4260_8018C0B0.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DF4260/func_DF4260_8018C19C.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DF4260/func_DF4260_8018DDAC.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DF4260/func_DF4260_8018E290.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DF4260/func_DF4260_8018E76C.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DF4260/func_DF4260_8018EC54.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DF4260/func_DF4260_8018ECAC.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DF4260/func_DF4260_8018ED1C.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DF4260/func_DF4260_8018ED78.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DF4260/func_DF4260_8018EE2C.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DF4260/func_DF4260_8018EE84.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DF4260/func_DF4260_8018EF38.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DF4260/func_DF4260_8018EF90.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DF4260/func_DF4260_8018F044.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DF4260/func_DF4260_8018F1C8.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DF4260/func_DF4260_8018F31C.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DF4260/func_DF4260_8018F3BC.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DF4260/func_DF4260_8018F4A4.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DF4260/func_DF4260_8018F55C.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DF4260/func_DF4260_8018F678.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DF4260/func_DF4260_8018F6F8.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DF4260/func_DF4260_8018F880.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DF4260/func_DF4260_80190F74.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DF4260/func_DF4260_80191160.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DF4260/D_DF4260_8019AEF0.s")
|
||||
@@ -6,13 +6,13 @@
|
||||
typedef struct {
|
||||
/* 0x00 */ char pad_0[0xB8];
|
||||
/* 0xB8 */ s16 unkB8;
|
||||
} UnkStruct_func_8018BC50_DF8990;
|
||||
} UnkStruct_func_DF4260_8018BC50;
|
||||
|
||||
typedef struct {
|
||||
/* 0x00 */ char pad_0[0x6C];
|
||||
/* 0x6C */ f32 unk6C;
|
||||
/* 0x70 */ f32 unk70;
|
||||
/* 0x74 */ f32 unk74;
|
||||
} UnkStruct_func_80187A38_DF4778;
|
||||
} UnkStruct_func_DF4260_80187A38;
|
||||
|
||||
#endif
|
||||
@@ -0,0 +1,75 @@
|
||||
#include "global.h"
|
||||
#include "DFEE30.h"
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DFEE30/func_DF4260_801920F0.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DFEE30/func_DF4260_801922DC.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DFEE30/func_DF4260_80192358.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DFEE30/func_DF4260_801923C0.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DFEE30/func_DF4260_8019243C.s")
|
||||
|
||||
void func_DF4260_801924A8(UnkStruct_func_DF4260_801924A8* arg0) {
|
||||
switch (arg0->unk48) {
|
||||
case 0:
|
||||
if (D_80178280[0].unk_07C < arg0->unkC) {
|
||||
D_80177AB0 = 0;
|
||||
D_80177A98 = 0;
|
||||
arg0->unk48++;
|
||||
}
|
||||
|
||||
case 1:
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DFEE30/func_DF4260_8019250C.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DFEE30/func_DF4260_80192518.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DFEE30/func_DF4260_80192AA4.s")
|
||||
|
||||
void func_DF4260_80192CB0(UnkStruct_func_DF4260_80192CB0* arg0) {
|
||||
arg0->unk50 = arg0->unk10;
|
||||
arg0->unk10 = 0.0f;
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DFEE30/func_DF4260_80192CD4.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DFEE30/func_DF4260_80192E2C.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DFEE30/func_DF4260_80192EA4.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DFEE30/func_DF4260_80192EB0.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DFEE30/func_DF4260_801933B4.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DFEE30/func_DF4260_801933DC.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DFEE30/func_DF4260_801934D0.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DFEE30/func_DF4260_80193540.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DFEE30/func_DF4260_801935CC.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DFEE30/func_DF4260_801937F4.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DFEE30/func_DF4260_80193D64.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DFEE30/func_DF4260_80194398.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DFEE30/func_DF4260_80198310.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DFEE30/func_DF4260_80198414.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DFEE30/func_DF4260_80198594.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DFEE30/func_DF4260_801985E4.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DFEE30/func_DF4260_8019864C.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DFEE30/func_DF4260_801988B8.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DFEE30/D_DF4260_8019B2B0.s")
|
||||
@@ -8,16 +8,13 @@ typedef struct {
|
||||
/* 0x0C */ f32 unkC;
|
||||
/* 0x10 */ char pad_10[0x38];
|
||||
/* 0x48 */ s32 unk48;
|
||||
} UnkStruct_func_801924A8_DFF1E8;
|
||||
} UnkStruct_func_DF4260_801924A8;
|
||||
|
||||
typedef struct {
|
||||
/* 0x00 */ char pad_0[0x10];
|
||||
/* 0x10 */ f32 unk10;
|
||||
/* 0x14 */ char pad_14[0x3C];
|
||||
/* 0x50 */ s32 unk50;
|
||||
} UnkStruct_func_80192CB0_DFF9F0;
|
||||
|
||||
extern s8 D_80177A98;
|
||||
extern s8 D_80177AB0;
|
||||
} UnkStruct_func_DF4260_80192CB0;
|
||||
|
||||
#endif
|
||||
@@ -0,0 +1,7 @@
|
||||
#include "common.h"
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/E05620/func_DF4260_801988E0.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/E05620/func_DF4260_80198968.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/E05620/D_DF4260_8019B640.s")
|
||||
@@ -0,0 +1,9 @@
|
||||
#include "common.h"
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/E05990/func_DF4260_80198C50.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/E05990/func_DF4260_80198DCC.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/E05990/func_DF4260_80199024.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/E05990/func_DF4260_8019949C.s")
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user