mirror of
https://github.com/HarbourMasters/Starship
synced 2026-08-05 17:53:47 -04:00
Area 6 decomp, Object_408 -> boss, more overlay symbols in main (#70)
* 408 * more stuff * brutal matches * data and such * gPlayer * names and boss and such * cat * forgot something
This commit is contained in:
petrie911
+335
-34
@@ -95,12 +95,13 @@ void Mio0_Decompress(void* header, u8* dst);
|
||||
s32 vsprintf(char* dst, const char* fmt, va_list args);
|
||||
|
||||
// fox_360
|
||||
void func_8002ED60(Player*);
|
||||
void func_8002E3E0(Object_2F4*);
|
||||
void func_8002E548(void);
|
||||
void func_8002E5E0(Object_408*);
|
||||
void func_8002E604(Object_408*);
|
||||
void func_8002E628(Object_408*);
|
||||
void func_8002E64C(Object_408*);
|
||||
void func_8002E5E0(Boss*);
|
||||
void func_8002E604(Boss*);
|
||||
void func_8002E628(Boss*);
|
||||
void func_8002E64C(Boss*);
|
||||
void func_8002E670(Object_2F4*);
|
||||
void func_8002E694(Object_2F4*);
|
||||
void func_8002E6B8(Object_2F4*);
|
||||
@@ -129,19 +130,23 @@ void func_80040CE4(void);
|
||||
void func_80042D38(void);
|
||||
|
||||
// fox_43AC0
|
||||
void func_80042FAC(Object_408 *);
|
||||
void func_80042FB8(Object_408*);
|
||||
void func_80042FC4(Object_408*);
|
||||
void func_80042FD0(Object_408 *);
|
||||
void func_80042FDC(Object_408*);
|
||||
void func_80042FE8(Object_408*);
|
||||
void func_8004319C(Player* player, f32 arg1, f32 arg2, f32 arg3);
|
||||
void func_80042EC0(Boss* boss);
|
||||
void func_80042FAC(Boss* boss);
|
||||
void func_80042FB8(Boss* boss);
|
||||
void func_80042FC4(Boss* boss);
|
||||
void func_80042FD0(Boss* boss);
|
||||
void func_80042FDC(Boss* boss);
|
||||
void func_80042FE8(Boss* boss);
|
||||
|
||||
// fox_43E80
|
||||
void func_80043468(Player* player);
|
||||
void func_800444BC(Player * player);
|
||||
void func_80047504(Player * player);
|
||||
void func_80046358(Player*);
|
||||
|
||||
// sf_496E0
|
||||
void func_80048AC0(s32 teamId);
|
||||
void func_80049C0C(Player *);
|
||||
void func_8004A52C(Player *);
|
||||
void func_8004AAF4(Player *);
|
||||
@@ -213,7 +218,7 @@ void Object_SetInfo(ObjectInfo*, u32);
|
||||
void Object_80_Initialize(Object_80*);
|
||||
void Object_4C_Initialize(Object_4C*);
|
||||
void Object_2F4_Initialize(Object_2F4*);
|
||||
void Object_408_Initialize(Object_408*);
|
||||
void Boss_Initialize(Boss*);
|
||||
void Item_Initialize(Item*);
|
||||
void Object_8C_Initialize(Object_8C*);
|
||||
void func_80061B68(void);
|
||||
@@ -261,12 +266,12 @@ void func_80068FE0(Object_4C*);
|
||||
void func_800690D0(s32, ObjectId);
|
||||
void func_80069924(Object_8C *);
|
||||
void func_800693E8(Object_2F4 *);
|
||||
void func_80069658(Object_408 *);
|
||||
void func_80069658(Boss *);
|
||||
void func_800696F8(Object_80 *);
|
||||
void func_80069858(Object_4C *);
|
||||
void func_80069A10(Item *);
|
||||
void Object_2F4_Update(Object_2F4*);
|
||||
void Object_408_Update(Object_408 *);
|
||||
void Boss_Update(Boss *);
|
||||
void Object_80_Update(Object_80 *);
|
||||
void Object_4C_Update(Object_4C *);
|
||||
void Item_Update(Item *);
|
||||
@@ -433,6 +438,7 @@ void func_80084488(s32);
|
||||
void func_80084688(s32, s32);
|
||||
|
||||
// fox_hud
|
||||
|
||||
void func_80084B94(s32);
|
||||
void func_800857DC(f32, f32, f32, f32);
|
||||
void func_80085890(f32, f32, f32, f32);
|
||||
@@ -440,6 +446,7 @@ void func_80086110(f32, f32, s32);
|
||||
void func_80086664(f32, f32);
|
||||
void func_800869A0(f32, f32, s32, f32, s32, s32);
|
||||
void func_80087530(f32, f32, s32);
|
||||
void func_80088564(void);
|
||||
void func_8008865C(void);
|
||||
void func_8008AD94(void);
|
||||
void func_8008B5B0(f32 x, f32 y);
|
||||
@@ -458,13 +465,16 @@ void func_8008E51C(s32* , f32);
|
||||
void func_8008E9EC(f32, f32);
|
||||
void func_8008EA14(f32, f32);
|
||||
void func_8008FA84(void);
|
||||
void func_8008FE78(Object_408*);
|
||||
void func_8008FFF0(Object_408*, s32);
|
||||
void func_8008FE78(Boss*);
|
||||
void func_8008FFF0(Boss*, s32);
|
||||
bool func_8009092C(Object_2F4*);
|
||||
void func_800907C4(Object_408*);
|
||||
void func_800907C4(Boss*);
|
||||
s32 func_800915FC(Object_2F4*);
|
||||
void func_80092D48(Object_2F4 *);
|
||||
void func_80092EC0(Object_2F4*);
|
||||
void func_80093164(Object_2F4*);
|
||||
void func_800935E8(Player*);
|
||||
void func_80095604(Player*);
|
||||
void func_80094954(Object_8C*);
|
||||
void func_80094BBC(Object_8C*);
|
||||
void func_80094D20(f32, f32);
|
||||
@@ -496,6 +506,7 @@ void func_800A3CA0(void);
|
||||
// fox_play
|
||||
s32 Play_CheckMedalStatus(u16);
|
||||
s32 Play_GetMaxShields(void);
|
||||
void func_800A6028(Vec3f*, u32);
|
||||
void func_800A5844(void);
|
||||
void func_800A5D6C(void);
|
||||
void func_800A5FA0(Vec3f* , u32 , s32 );
|
||||
@@ -510,6 +521,10 @@ void func_800AA800(Player *player);
|
||||
void func_800ACDC0(Player *, PlayerShot *, PlayerShotId );
|
||||
void func_800B0F50(Player *);
|
||||
void func_800B44C4(Player *);
|
||||
void func_800AB334(void);
|
||||
void func_800AE278(Player*);
|
||||
void func_800B2130(Player*);
|
||||
void func_800B2574(Player*);
|
||||
void func_800B5FBC(Player *, s32 , s32 );
|
||||
void func_800B63BC(Player *, s32);
|
||||
void func_800B6848(Player *, s32 );
|
||||
@@ -554,72 +569,173 @@ s32 Save_Read(void);
|
||||
|
||||
void func_EFFA40_80187520(s32, void*);
|
||||
|
||||
void func_DF4260_80187520(s32, void*);
|
||||
void func_DF4260_80187530(Object_80*);
|
||||
void func_DF4260_8018753C(Object_80*);
|
||||
void func_DF4260_801878D8(Object_408 *);
|
||||
void func_DF4260_801878D8(Boss *);
|
||||
void func_DF4260_8018B0B4(Object_2F4 *);
|
||||
void func_DF4260_8018BE7C(Object_408 *);
|
||||
void func_DF4260_8018ED78(Object_408*);
|
||||
void func_DF4260_8018BE7C(Boss *);
|
||||
void func_DF4260_8018ED78(Boss*);
|
||||
void func_DF4260_801924A8(Object_80* );
|
||||
void func_DF4260_8019250C(Object_2F4 *);
|
||||
void func_DF4260_80192CB0(Object_2F4 *);
|
||||
void func_DF4260_80192EA4(Object_2F4 *);
|
||||
void func_DF4260_801933B4(Object_2F4 *);
|
||||
void func_DF4260_801935CC(Object_408 *);
|
||||
void func_DF4260_80198310(Object_408 *);
|
||||
void func_DF4260_80198594(Object_408 *);
|
||||
void func_DF4260_801935CC(Boss *);
|
||||
void func_DF4260_80198310(Boss *);
|
||||
void func_DF4260_80198594(Boss *);
|
||||
void func_DF4260_801988E0(void);
|
||||
void func_DF4260_80198C50(void);
|
||||
void func_DF4260_8019949C(void);
|
||||
void func_DF4260_8019864C(PlayerShot*);
|
||||
|
||||
|
||||
void func_E08400_80187520(s32, void*);
|
||||
void func_E08400_80187B08(Object_2F4 *);
|
||||
void func_E08400_80188A40(Object_408 *);
|
||||
void func_E08400_80188A40(Boss *);
|
||||
void func_E08400_8018CCF8(Object_2F4 *);
|
||||
|
||||
void func_E16C50_801ABA40(PlayerShot*);
|
||||
void func_E16C50_801AC8A8(f32, f32, f32, f32, s32);
|
||||
void func_E16C50_80187754(Object_408 *);
|
||||
void func_E16C50_80187520(s32, void*);
|
||||
void func_E16C50_80187754(Boss *);
|
||||
void func_E16C50_80187944(Boss*);
|
||||
void func_E16C50_8018C54C(Boss*);
|
||||
void func_E16C50_8018DF74(Player *player);
|
||||
void func_E16C50_8018ED78(Player*);
|
||||
|
||||
void func_E16C50_801900FC(Vec3f*, Vec3f*, f32, f32, f32, s32, f32, s32, s32);
|
||||
void func_E16C50_80190430(Object_2F4 *);
|
||||
void func_E16C50_801904CC(Object_2F4*);
|
||||
void func_E16C50_80190A00(Object_2F4*);
|
||||
void func_E16C50_80190F08(Object_2F4 *);
|
||||
void func_E16C50_80191010(Object_2F4*);
|
||||
void func_E16C50_801914C4(Object_2F4*);
|
||||
void func_E16C50_801915A4(Object_2F4 *);
|
||||
void func_E16C50_80191680(Object_2F4*);
|
||||
void func_E16C50_80191B4C(Object_2F4*);
|
||||
void func_E16C50_80191BB8(Object_2F4 *);
|
||||
void func_E16C50_80191BC4(Object_2F4*);
|
||||
void func_E16C50_80191DB0(Object_2F4*);
|
||||
void func_E16C50_801932AC(Object_408 *);
|
||||
void func_E16C50_80191DB0(Object_2F4*);
|
||||
void func_E16C50_80191FFC(Object_2F4*);
|
||||
void func_E16C50_80192094(Object_2F4*);
|
||||
void func_E16C50_80192834(Object_2F4*);
|
||||
void func_E16C50_80192C18(Object_2F4*);
|
||||
void func_E16C50_80192E64(Object_2F4*);
|
||||
void func_E16C50_80193240(Object_2F4*);
|
||||
void func_E16C50_801932AC(Boss*);
|
||||
void func_E16C50_801949DC(Boss*);
|
||||
void func_E16C50_80194A84(Boss*);
|
||||
void func_E16C50_8019969C(Object_2F4*);
|
||||
void func_E16C50_8019983C(Object_2F4*);
|
||||
void func_E16C50_80199A28(Object_2F4*);
|
||||
void func_E16C50_80199E24(Object_2F4*);
|
||||
void func_E16C50_80199F10(Object_2F4*);
|
||||
void func_E16C50_8019A1FC(Object_2F4*);
|
||||
void func_E16C50_8019A5D4(Object_2F4*);
|
||||
void func_E16C50_8019ACCC(Object_2F4*);
|
||||
void func_E16C50_8019B1F0(Object_2F4 *);
|
||||
void func_E16C50_8019B548(Object_2F4*);
|
||||
void func_E16C50_8019B7DC(Object_2F4*);
|
||||
void func_E16C50_8019B810(Object_2F4 *);
|
||||
void func_E16C50_8019B854(Object_2F4*);
|
||||
void func_E16C50_8019BDE0(Object_2F4*);
|
||||
void func_E16C50_8019BE48(Object_2F4*);
|
||||
void func_E16C50_8019C1CC(Object_2F4*);
|
||||
void func_E16C50_8019C200(Object_2F4 *);
|
||||
void func_E16C50_8019C454(Object_2F4*);
|
||||
void func_E16C50_8019C83C(Object_2F4*);
|
||||
void func_E16C50_8019CBEC(Object_2F4*);
|
||||
void func_E16C50_8019CE58(Object_2F4*);
|
||||
void func_E16C50_8019D060(Object_2F4 *);
|
||||
void func_E16C50_8019D15C(Object_2F4*);
|
||||
void func_E16C50_8019D3C4(Object_2F4*);
|
||||
void func_E16C50_8019D428(Player* player);
|
||||
void func_E16C50_8019D76C(Player* player);
|
||||
|
||||
void func_E16C50_8019E8B8(f32, f32, f32, f32);
|
||||
void func_E16C50_8019E9F4(f32, f32, f32, f32, f32, f32, f32, s32);
|
||||
void func_E16C50_8019EA7C(Object_2F4*);
|
||||
void func_E16C50_8019F20C(Object_2F4*);
|
||||
void func_E16C50_8019F7AC(Object_2F4*);
|
||||
void func_E16C50_801A003C(Object_2F4*);
|
||||
void func_E16C50_801A0120(Object_8C*);
|
||||
void func_E16C50_801A0AF0(Object_8C*);
|
||||
void func_E16C50_801A10F4(Player* player);
|
||||
void func_E16C50_801A5B3C(Boss*);
|
||||
void func_E16C50_801A71B8(Boss*);
|
||||
void func_E16C50_801A8BE8(Player* player);
|
||||
void func_E16C50_801A7930(Player* player);
|
||||
|
||||
void func_E16C50_801A9824(void);
|
||||
void func_E16C50_801AA20C(void);
|
||||
void func_E16C50_801AA8E8(Player*);
|
||||
void func_E16C50_801AACF8(Player*);
|
||||
void func_E16C50_801ABA40(PlayerShot*);
|
||||
void func_E16C50_801AC274(Player*);
|
||||
void func_E16C50_801AC8A8(f32, f32, f32, f32, s32);
|
||||
void func_E16C50_801AC8A8(f32, f32, f32, f32, s32);
|
||||
void func_E16C50_801AC918(Object_8C*);
|
||||
void func_E16C50_801ACBB4(void);
|
||||
void func_E16C50_801ACE50(Player*);
|
||||
void func_E16C50_801AD328(Player*);
|
||||
void func_E16C50_801AD688(Object_2F4 *);
|
||||
void func_E16C50_801AD6C0(Object_2F4*);
|
||||
void func_E16C50_801AE168(Object_2F4*);
|
||||
void func_E16C50_801AE3AC(Object_2F4 *);
|
||||
void func_E16C50_801AE3D8(Object_2F4*);
|
||||
void func_E16C50_801AEB44(Object_2F4*);
|
||||
void func_E16C50_801AF9FC(Object_2F4 *);
|
||||
void func_E16C50_801B10F8(Object_408 *);
|
||||
void func_E16C50_801AFA5C(Object_2F4*);
|
||||
void func_E16C50_801B099C(Object_2F4*);
|
||||
void func_E16C50_801B0B60(Object_2F4*);
|
||||
void func_E16C50_801B0EC0(Object_2F4*);
|
||||
void func_E16C50_801B10F8(Boss*);
|
||||
void func_E16C50_801B134C(Boss*);
|
||||
void func_E16C50_801B4D84(Boss*);
|
||||
void func_E16C50_801B504C(Object_2F4*);
|
||||
void func_E16C50_801B50E8(Object_2F4*);
|
||||
void func_E16C50_801B619C(Object_2F4*);
|
||||
void func_E16C50_801B6344(Object_2F4 *);
|
||||
void func_E16C50_801B638C(Object_2F4*);
|
||||
void func_E16C50_801B6E54(Object_2F4 *);
|
||||
void func_E16C50_801B6FF8(Object_2F4*);
|
||||
void func_E16C50_801B7A24(Object_2F4*);
|
||||
void func_E16C50_801B7AF0(Object_2F4 *);
|
||||
void func_E16C50_801B7C78(Object_2F4*);
|
||||
void func_E16C50_801B90DC(Object_2F4*);
|
||||
void func_E16C50_801B91A4(Object_2F4*);
|
||||
void func_E16C50_801BA108(Object_2F4*);
|
||||
void func_E16C50_801BA26C(Object_2F4*);
|
||||
void func_E16C50_801BA4E4(Object_2F4*);
|
||||
void func_E16C50_801BA57C(Object_2F4 *);
|
||||
void func_E16C50_801BA6A4(Object_2F4*);
|
||||
void func_E16C50_801BAD7C(Object_2F4*);
|
||||
void func_E16C50_801BADF8(Object_2F4*);
|
||||
void func_E16C50_801BB204(Object_2F4*);
|
||||
void func_E16C50_801BB26C(Object_2F4 *);
|
||||
void func_E16C50_801BB79C(Object_2F4*);
|
||||
void func_E16C50_801BC930(Object_2F4*);
|
||||
void func_E16C50_801BC9A0(Object_2F4*);
|
||||
void func_E16C50_801BD264(Object_2F4*);
|
||||
void func_E16C50_801BD54C(Object_2F4*);
|
||||
void func_E16C50_801BDE6C(Object_2F4*);
|
||||
void func_E16C50_801BE1FC(Object_80*);
|
||||
void func_E16C50_801BE3F8(Object_2F4*);
|
||||
void func_E16C50_801BEB1C(Object_2F4*);
|
||||
void func_E16C50_801BEC50(Boss*);
|
||||
void func_E16C50_801BEC5C(Boss*);
|
||||
void func_E16C50_801BEC68(Object_2F4*);
|
||||
void func_E16C50_801BEC74(Object_2F4*);
|
||||
void func_E16C50_801BEC80(Player*);
|
||||
|
||||
|
||||
void func_E51970_80187520(s32, void*);
|
||||
void func_E51970_80187960(Object_2F4*);
|
||||
void func_E51970_8018BA2C(Object_58**);
|
||||
void func_E51970_8018C158(Object_2F4*);
|
||||
void func_E51970_80191ED8(Object_58**);
|
||||
void func_E51970_80192264(void);
|
||||
void func_E51970_80193CA4(Object_408 *);
|
||||
void func_E51970_80193CA4(Boss *);
|
||||
void func_E51970_80198594(Object_2F4*);
|
||||
void func_E51970_80198930(Object_58**);
|
||||
void func_E51970_80199900(Object_2F4 *, s32);
|
||||
@@ -627,7 +743,9 @@ void func_E51970_80199C60(Object_2F4*);
|
||||
void func_E51970_8019AB8C(Object_2F4*);
|
||||
void func_E51970_8019EA68(Object_58**);
|
||||
|
||||
void func_E6A810_8018769C(Object_2F4 *);
|
||||
|
||||
void func_E6A810_80187520(s32, void*);
|
||||
void func_E6A810_8018769C(Player *);
|
||||
void func_E6A810_80188F30(void);
|
||||
void func_E6A810_80189B80(Object_2F4 *);
|
||||
void func_E6A810_8018ADC4(Object_2F4 *);
|
||||
@@ -639,8 +757,8 @@ void func_E6A810_8018E3CC(Object_2F4 *);
|
||||
void func_E6A810_8018E5E8(Object_2F4 *);
|
||||
void func_E6A810_8018EFF0(Object_4C *);
|
||||
void func_E6A810_8018F0D8(Object_80 *);
|
||||
void func_E6A810_8018FA48(Object_408 *);
|
||||
void func_E6A810_801990DC(Object_408 *);
|
||||
void func_E6A810_8018FA48(Boss *);
|
||||
void func_E6A810_801990DC(Boss *);
|
||||
void func_E6A810_80199920(void);
|
||||
void func_E6A810_80199F8C(Object_2F4 *);
|
||||
void func_E6A810_801A3E70(Object_2F4 *);
|
||||
@@ -657,24 +775,207 @@ void func_E6A810_801B58AC(Gfx **, f32);
|
||||
bool func_E6A810_801B6AEC(f32, f32, f32);
|
||||
void func_E6A810_801B6E20(f32, f32, f32 *, f32 *, f32 *);
|
||||
void func_E6A810_801AD144(PlayerShot*);
|
||||
void func_E6A810_80189120(f32 x, f32 y, f32 z, f32, f32);
|
||||
bool func_E6A810_801A3C20(f32);
|
||||
s32 func_E6A810_801A3300(Player*, f32, f32);
|
||||
s32 func_E6A810_801A3790(Player*, f32, f32);
|
||||
|
||||
void func_E9F1D0_8018769C(Object_2F4*);
|
||||
void func_E9F1D0_80187520(s32, void*);
|
||||
void func_E9F1D0_801878A8(Object_58**);
|
||||
void func_E9F1D0_801888F4(Object_2F4 *);
|
||||
void func_E9F1D0_80189214(void);
|
||||
void func_E9F1D0_8018BDD8(void);
|
||||
void func_E9F1D0_8018C390(Player*);
|
||||
void func_E9F1D0_8018D16C(Object_408 *);
|
||||
void func_E9F1D0_8018D16C(Boss *);
|
||||
void func_E9F1D0_801961AC(Object_58**);
|
||||
void func_E9F1D0_80196314(Object_2F4*);
|
||||
void func_E9F1D0_80196968(Object_58**);
|
||||
void func_E9F1D0_80197CC4(Object_408 *);
|
||||
void func_E9F1D0_80197CC4(Boss *);
|
||||
void func_E9F1D0_801A3BD4(Object_2F4*);
|
||||
void func_E9F1D0_801A4CB0(Object_2F4*);
|
||||
void func_E9F1D0_801A5AD4(Player*);
|
||||
void func_E9F1D0_801A5FC0(Player*);
|
||||
void func_E9F1D0_801A6164(Player *);
|
||||
|
||||
void func_EBFBE0_80187520(s32, void*);
|
||||
|
||||
void func_EF0260_8018A96C(void);
|
||||
void func_EF0260_8018AAC4(void);
|
||||
|
||||
// void func_DF4260_801875A4(Object*);
|
||||
// void func_DF4260_80189058(Object*);
|
||||
// void func_DF4260_8018AA74(Object*);
|
||||
// void func_DF4260_8018AED0(Object*);
|
||||
// void func_DF4260_8018B15C(Object*);
|
||||
// void func_DF4260_8018B418(Object*);
|
||||
// void func_DF4260_8018B58C(Object*);
|
||||
// void func_DF4260_8018BAAC(Object*);
|
||||
// void func_DF4260_8018BBA4(Object*);
|
||||
// void func_DF4260_8018BBF8(Object*);
|
||||
// void func_DF4260_8018BD7C(Object*);
|
||||
// void func_DF4260_8018C19C(Object*);
|
||||
// void func_DF4260_8018DDAC(Object*);
|
||||
// void func_DF4260_8018E290(Object*);
|
||||
// void func_DF4260_8018E76C(Object*);
|
||||
// void func_DF4260_8018ECAC(Object*);
|
||||
// void func_DF4260_8018ED78(Object*);
|
||||
// void func_DF4260_8018EE84(Object*);
|
||||
// void func_DF4260_8018EF90(Object*);
|
||||
// void func_DF4260_8018F044(Object*);
|
||||
// void func_DF4260_8018F31C(Object*);
|
||||
// void func_DF4260_801922DC(Object*);
|
||||
// void func_DF4260_80192358(Object*);
|
||||
// void func_DF4260_801923C0(Object*);
|
||||
// void func_DF4260_8019243C(Object*);
|
||||
// void func_DF4260_80192518(Object*);
|
||||
// void func_DF4260_80192CD4(Object*);
|
||||
// void func_DF4260_80192E2C(Object*);
|
||||
// void func_DF4260_80192EB0(Object*);
|
||||
// void func_DF4260_801933DC(Object*);
|
||||
// void func_DF4260_801934D0(Object*);
|
||||
// void func_DF4260_80193540(Object*);
|
||||
// void func_DF4260_80194398(Object*);
|
||||
// void func_DF4260_801985E4(Object*);
|
||||
// void func_DF4260_80198968(Object*);
|
||||
// void func_E08400_8018756C(Object*);
|
||||
// void func_E08400_80187650(Object*);
|
||||
// void func_E08400_801877C4(Object*);
|
||||
// void func_E08400_8018795C(Object*);
|
||||
// void func_E08400_80188344(Object*);
|
||||
// void func_E08400_801887D0(Object*);
|
||||
// void func_E08400_80188CAC(Object*);
|
||||
// void func_E08400_80188FAC(Object*);
|
||||
// void func_E08400_80189114(Object*);
|
||||
// void func_E08400_8018978C(Object*);
|
||||
// void func_E08400_8018BACC(Object*);
|
||||
// void func_E08400_8018D9EC(Object*);
|
||||
// void func_E08400_8018DA6C(Object*);
|
||||
// void func_E08400_8018DAEC(Object*);
|
||||
// void func_E08400_8018DB6C(Object*);
|
||||
// void func_E08400_8018DBEC(Object*);
|
||||
// void func_E08400_8018DCE4(Object*);
|
||||
// void func_E08400_8018DE14(Object*);
|
||||
// void func_E08400_8018F330(Object*);
|
||||
// void func_E08400_8018F884(Object*);
|
||||
// void func_E08400_8018FE38(Object*);
|
||||
// void func_E08400_8018FF20(Object*);
|
||||
// void func_E08400_8018FF84(Object*);
|
||||
// void func_E08400_80190020(Object*);
|
||||
// void func_E08400_80190078(Object*);
|
||||
// void func_E08400_80193434(Object*);
|
||||
// void func_E51970_80188AD0(Object*);
|
||||
// void func_E51970_80188FE4(Object*);
|
||||
// void func_E51970_80191054(Object*);
|
||||
// void func_E51970_80191180(Object*);
|
||||
// void func_E51970_801912FC(Object*);
|
||||
// void func_E51970_80191AFC(Object*);
|
||||
// void func_E51970_80192984(Object*);
|
||||
// void func_E51970_80192A68(Object*);
|
||||
// void func_E51970_80193718(Object*);
|
||||
// void func_E51970_80193B1C(Object*);
|
||||
// void func_E51970_801946C4(Object*);
|
||||
// void func_E51970_801968F4(Object*);
|
||||
// void func_E51970_8019E234(Object*);
|
||||
// void func_E51970_8019E3A8(Object*);
|
||||
// void func_E51970_8019E454(Object*);
|
||||
// void func_E51970_8019E98C(Object*);
|
||||
// void func_E6A810_80188F60(Object*);
|
||||
// void func_E6A810_80188FA8(Object*);
|
||||
// void func_E6A810_80189194(Object*);
|
||||
// void func_E6A810_801895B8(Object*);
|
||||
// void func_E6A810_80189AFC(Object*);
|
||||
// void func_E6A810_80189CC8(Object*);
|
||||
// void func_E6A810_8018A1C0(Object*);
|
||||
// void func_E6A810_8018A544(Object*);
|
||||
// void func_E6A810_8018AABC(Object*);
|
||||
// void func_E6A810_8018AB44(Object*);
|
||||
// void func_E6A810_8018B268(Object*);
|
||||
// void func_E6A810_8018B6AC(Object*);
|
||||
// void func_E6A810_8018B9D0(Object*);
|
||||
// void func_E6A810_8018BE84(Object*);
|
||||
// void func_E6A810_8018C8A8(Object*);
|
||||
// void func_E6A810_8018E2D8(Object*);
|
||||
// void func_E6A810_8018E54C(Object*);
|
||||
// void func_E6A810_8018E5B4(Object*);
|
||||
// void func_E6A810_8018E5F8(Object*);
|
||||
// void func_E6A810_8018EF14(Object*);
|
||||
// void func_E6A810_8018F038(Object*);
|
||||
// void func_E6A810_8018F4D8(Object*);
|
||||
// void func_E6A810_8018F8B8(Object*);
|
||||
// void func_E6A810_80197A94(Object*);
|
||||
// void func_E6A810_801982A8(Object*);
|
||||
// void func_E6A810_8019C778(Object*);
|
||||
// void func_E6A810_8019CE88(Object*);
|
||||
// void func_E6A810_8019D700(Object*);
|
||||
// void func_E6A810_8019E410(Object*);
|
||||
// void func_E6A810_8019EA60(Object*);
|
||||
// void func_E6A810_8019EE68(Object*);
|
||||
// void func_E6A810_8019FF9C(Object*);
|
||||
// void func_E6A810_801A0BD8(Object*);
|
||||
// void func_E6A810_801A12C4(Object*);
|
||||
// void func_E6A810_801A23AC(Object*);
|
||||
// void func_E6A810_801A2A78(Object*);
|
||||
// void func_E6A810_801A2B24(Object*);
|
||||
// void func_E6A810_801A2DD8(Object*);
|
||||
// void func_E6A810_801A3240(Object*);
|
||||
// void func_E6A810_801A3E98(Object*);
|
||||
// void func_E6A810_801A43BC(Object*);
|
||||
// void func_E6A810_801A46A0(Object*);
|
||||
// void func_E6A810_801A4A64(Object*);
|
||||
// void func_E6A810_801A4B24(Object*);
|
||||
// void func_E6A810_801A54E8(Object*);
|
||||
// void func_E6A810_801A57D0(Object*);
|
||||
// void func_E6A810_801A5AF0(Object*);
|
||||
// void func_E6A810_801A5B4C(Object*);
|
||||
// void func_E6A810_801A5D68(Object*);
|
||||
// void func_E6A810_801A5E54(Object*);
|
||||
// void func_E6A810_801A5F90(Object*);
|
||||
// void func_E6A810_801A5FD0(Object*);
|
||||
// void func_E6A810_801A6100(Object*);
|
||||
// void func_E6A810_801A6144(Object*);
|
||||
// void func_E6A810_801A6540(Object*);
|
||||
// void func_E6A810_801A6608(Object*);
|
||||
// void func_E6A810_801A67C8(Object*);
|
||||
// void func_E6A810_801A68EC(Object*);
|
||||
// void func_E6A810_801A7E7C(Object*);
|
||||
// void func_E6A810_801AC294(Object*);
|
||||
// void func_E6A810_801AC438(Object*);
|
||||
// void func_E6A810_801AD6F0(Object*);
|
||||
// void func_E6A810_801ADAC8(Object*);
|
||||
// void func_E6A810_801ADD68(Object*);
|
||||
// void func_E6A810_801AE2C0(Object*);
|
||||
// void func_E6A810_801AE87C(Object*);
|
||||
// void func_E6A810_801AEAA0(Object*);
|
||||
// void func_E6A810_801AEC04(Object*);
|
||||
// void func_E6A810_801AEEFC(Object*);
|
||||
// void func_E9F1D0_801880E4(Object*);
|
||||
// void func_E9F1D0_80188448(Object*);
|
||||
// void func_E9F1D0_80188528(Object*);
|
||||
// void func_E9F1D0_80188660(Object*);
|
||||
// void func_E9F1D0_8018933C(Object*);
|
||||
// void func_E9F1D0_801893B8(Object*);
|
||||
// void func_E9F1D0_80189470(Object*);
|
||||
// void func_E9F1D0_80189724(Object*);
|
||||
// void func_E9F1D0_80189B70(Object*);
|
||||
// void func_E9F1D0_8018B8C0(Object*);
|
||||
// void func_E9F1D0_8018CAD4(Object*);
|
||||
// void func_E9F1D0_8018CF98(Object*);
|
||||
// void func_E9F1D0_8018DBF0(Object*);
|
||||
// void func_E9F1D0_801928C8(Object*);
|
||||
// void func_E9F1D0_80192E94(Object*);
|
||||
// void func_E9F1D0_80193244(Object*);
|
||||
// void func_E9F1D0_80193380(Object*);
|
||||
// void func_E9F1D0_8019350C(Object*);
|
||||
// void func_E9F1D0_8019356C(Object*);
|
||||
// void func_E9F1D0_801935D4(Object*);
|
||||
// void func_E9F1D0_80196210(Object*);
|
||||
// void func_E9F1D0_80196288(Object*);
|
||||
// void func_E9F1D0_80197C64(Object*);
|
||||
// void func_E9F1D0_80197CB8(Object*);
|
||||
// void func_E9F1D0_8019C888(Object*);
|
||||
// void func_E9F1D0_8019E2C4(Object*);
|
||||
// void func_E9F1D0_801A4E44(Object*);
|
||||
// void func_E9F1D0_801A52B8(Object*);
|
||||
|
||||
#endif
|
||||
|
||||
+2
-2
@@ -16,8 +16,8 @@
|
||||
#define GDL(dl) gSPDisplayList(gMasterDisp++, dl) // 06000000 dl
|
||||
#define GPC(r, g, b, a) gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, r, g, b, a) // FA000000 RRGGBBAA
|
||||
#define GEC(r, g, b, a) gDPSetEnvColor(gMasterDisp++, r, g, b, a) // FB000000 RRGGBBAA
|
||||
#define GSGM_BACK(mode) gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK) // B7000000 00002000, most common geometry mode changed
|
||||
#define GCGM_BACK(mode) gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK) // B6000000 00002000
|
||||
#define GSGM_BACK() gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK) // B7000000 00002000, most common geometry mode changed
|
||||
#define GCGM_BACK() gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK) // B6000000 00002000
|
||||
|
||||
#define gSPSetOtherModeHi(pkt, settings) gSPSetOtherMode(pkt, G_SETOTHERMODE_H, G_MDSFT_BLENDMASK, 24, settings)
|
||||
#define gsSPSetOtherModeHi(settings) gsSPSetOtherMode(G_SETOTHERMODE_H, G_MDSFT_BLENDMASK, 24, settings)
|
||||
|
||||
@@ -0,0 +1,83 @@
|
||||
#ifndef PREVENT_BSS_REORDERING_H
|
||||
#define PREVENT_BSS_REORDERING_H
|
||||
|
||||
/**
|
||||
* To determine variable order for .bss, the compiler sorts variables by their
|
||||
* "name index" mod 256, where name index is something that, with -g, gets
|
||||
* incremented by struct and variable declarations, typedefs, and file markers,
|
||||
* among else. (Without -g, only variable declarations affects the index.)
|
||||
* This file contains enough dummy declarations to bump the index by 128.
|
||||
* Including it, or removing the include, should fix bss reordering problems
|
||||
* for a file, assuming the name index distance between its first and last bss
|
||||
* variable is at most 128.
|
||||
* Note that if a variable is declared "extern" within a header file, the name
|
||||
* index is taken at that point of the extern declaration. Thus, this include
|
||||
* must come before any such header.
|
||||
*/
|
||||
|
||||
struct Dummy0 { int x; };
|
||||
struct Dummy1 { int x; };
|
||||
struct Dummy2 { int x; };
|
||||
struct Dummy3 { int x; };
|
||||
struct Dummy4 { int x; };
|
||||
struct Dummy5 { int x; };
|
||||
struct Dummy6 { int x; };
|
||||
struct Dummy7 { int x; };
|
||||
struct Dummy8 { int x; };
|
||||
struct Dummy9 { int x; };
|
||||
struct Dummy10 { int x; };
|
||||
struct Dummy11 { int x; };
|
||||
struct Dummy12 { int x; };
|
||||
struct Dummy13 { int x; };
|
||||
struct Dummy14 { int x; };
|
||||
struct Dummy15 { int x; };
|
||||
struct Dummy16 { int x; };
|
||||
struct Dummy17 { int x; };
|
||||
struct Dummy18 { int x; };
|
||||
struct Dummy19 { int x; };
|
||||
struct Dummy20 { int x; };
|
||||
struct Dummy21 { int x; };
|
||||
struct Dummy22 { int x; };
|
||||
struct Dummy23 { int x; };
|
||||
struct Dummy24 { int x; };
|
||||
struct Dummy25 { int x; };
|
||||
struct Dummy26 { int x; };
|
||||
struct Dummy27 { int x; };
|
||||
struct Dummy28 { int x; };
|
||||
struct Dummy29 { int x; };
|
||||
struct Dummy30 { int x; };
|
||||
struct Dummy31 { int x; };
|
||||
struct Dummy32 { int x; };
|
||||
struct Dummy33 { int x; };
|
||||
struct Dummy34 { int x; };
|
||||
struct Dummy35 { int x; };
|
||||
struct Dummy36 { int x; };
|
||||
struct Dummy37 { int x; };
|
||||
struct Dummy38 { int x; };
|
||||
struct Dummy39 { int x; };
|
||||
struct Dummy40 { int x; };
|
||||
struct Dummy41 { int x; };
|
||||
struct Dummy42 { int x; };
|
||||
struct Dummy43 { int x; };
|
||||
struct Dummy44 { int x; };
|
||||
struct Dummy45 { int x; };
|
||||
struct Dummy46 { int x; };
|
||||
struct Dummy47 { int x; };
|
||||
struct Dummy48 { int x; };
|
||||
struct Dummy49 { int x; };
|
||||
struct Dummy50 { int x; };
|
||||
struct Dummy51 { int x; };
|
||||
struct Dummy52 { int x; };
|
||||
struct Dummy53 { int x; };
|
||||
struct Dummy54 { int x; };
|
||||
struct Dummy55 { int x; };
|
||||
struct Dummy56 { int x; };
|
||||
struct Dummy57 { int x; };
|
||||
struct Dummy58 { int x; };
|
||||
struct Dummy59 { int x; };
|
||||
struct Dummy60 { int x; };
|
||||
struct Dummy61 { int x; };
|
||||
struct Dummy62 { int x; };
|
||||
typedef int Dummy63;
|
||||
|
||||
#endif
|
||||
+43
-76
@@ -47,12 +47,12 @@ typedef enum {
|
||||
/* 1 */ COL1_1, // OBJ_80_39
|
||||
/* 2 */ COL1_2,
|
||||
/* 3 */ COL1_3, // OBJ_UNK_1000
|
||||
/* 4 */ COL1_4, // OBJ_408_308
|
||||
/* 4 */ COL1_4, // OBJ_BOSS_308
|
||||
/* 5 */ COL1_5, // OBJ_80_149
|
||||
/* 6 */ COL1_6, // OBJ_80_150
|
||||
/* 7 */ COL1_7, // OBJ_408_309
|
||||
/* 8 */ COL1_8, // OBJ_408_313
|
||||
/* 9 */ COL1_9, // OBJ_408_312
|
||||
/* 7 */ COL1_7, // OBJ_BOSS_309
|
||||
/* 8 */ COL1_8, // OBJ_BOSS_313
|
||||
/* 9 */ COL1_9, // OBJ_BOSS_312
|
||||
} CollisonId_1;
|
||||
|
||||
typedef enum {
|
||||
@@ -217,55 +217,22 @@ typedef struct {
|
||||
/* 0x05A */ s16 timer_05A;
|
||||
/* 0x05C */ s16 timer_05C;
|
||||
/* 0x05E */ u8 unk_05E;
|
||||
/* 0x05F */ char pad5F[3];
|
||||
/* 0x060 */ s16 unk_060;
|
||||
/* 0x062 */ s8 unk_062;
|
||||
/* 0x063 */ char pad63[1];
|
||||
/* 0x064 */ s16 unk_064;
|
||||
/* 0x066 */ s16 unk_066;
|
||||
/* 0x068 */ f32 unk_068;
|
||||
/* 0x06C */ Vec3f vel;
|
||||
/* 0x078 */ char pad78[0xC];
|
||||
/* 0x06C */ Vec3f vel;
|
||||
/* 0x078 */ f32 unk_078;
|
||||
/* 0x07C */ f32 unk_07C;
|
||||
/* 0x080 */ char pad80[4];
|
||||
/* 0x084 */ f32 gravity;
|
||||
/* 0x088 */ s16 unk_088;
|
||||
/* 0x08A */ s16 unk_08A;
|
||||
/* 0x08C */ char pad8C[6];
|
||||
/* 0x092 */ u16 unk_092;
|
||||
/* 0x094 */ char pad94[0x12];
|
||||
/* 0x0A6 */ s16 unk_0A6;
|
||||
/* 0x0A8 */ char padA8[6];
|
||||
/* 0x0AE */ s16 unk_0AE;
|
||||
/* 0x0B0 */ char padB0[0x16];
|
||||
/* 0x0C6 */ u16 unk_0C6;
|
||||
/* 0x0C8 */ char padC8[1];
|
||||
/* 0x0C9 */ u8 unk_0C9;
|
||||
/* 0x0CA */ char padCA[6];
|
||||
/* 0x0D0 */ s16 unk_0D0;
|
||||
/* 0x0D2 */ char padD2[4];
|
||||
/* 0x0D6 */ s16 unk_0D6;
|
||||
/* 0x0D8 */ char padD8[4];
|
||||
/* 0x0DC */ f32 unk_0DC;
|
||||
/* 0x0E0 */ f32 unk_0E0;
|
||||
/* 0x0E4 */ f32 unk_0E4;
|
||||
/* 0x0E8 */ f32 unk_0E8;
|
||||
/* 0x0EC */ f32 unk_0EC;
|
||||
/* 0x0F0 */ f32 unk_0F0;
|
||||
/* 0x0F4 */ f32 unk_0F4;
|
||||
/* 0x0F8 */ f32 unk_0F8;
|
||||
/* 0x0FC */ f32 unk_0FC;
|
||||
/* 0x100 */ Vec3f unk_100;
|
||||
/* 0x10C */ char pad10C[4];
|
||||
/* 0x110 */ f32 unk_110;
|
||||
/* 0x114 */ f32 unk_114;
|
||||
/* 0x118 */ char pad118[0x7C];
|
||||
/* 0x194 */ f32 unk_194;
|
||||
/* 0x198 */ f32 unk_198;
|
||||
/* 0x19C */ f32 unk_19C;
|
||||
/* 0x1A0 */ char pad1A0[0x168];
|
||||
/* 0x308 */ Vec3f unk_308;
|
||||
/* 0x314 */ char pad314[0xE4];
|
||||
/* 0x088 */ s16 swork[40];
|
||||
/* 0x0D8 */ f32 fwork[50];
|
||||
/* 0x1A0 */ Vec3f vwork[50];
|
||||
/* 0x3F8 */ f32 unk_3F8;
|
||||
/* 0x3FC */ Vec3f sfxPos;
|
||||
} Object_408; // size = 0x408
|
||||
} Boss; // size = 0x408
|
||||
|
||||
typedef struct {
|
||||
/* 0x000 */ Object obj;
|
||||
@@ -652,36 +619,36 @@ typedef enum{
|
||||
/* 289 */ OBJ_2F4_289,
|
||||
/* 290 */ OBJ_2F4_290,
|
||||
/* 291 */ OBJ_2F4_291,
|
||||
/* 292 */ OBJ_408_292,
|
||||
/* 293 */ OBJ_408_293,
|
||||
/* 294 */ OBJ_408_294,
|
||||
/* 295 */ OBJ_408_295,
|
||||
/* 296 */ OBJ_408_296,
|
||||
/* 297 */ OBJ_408_297,
|
||||
/* 298 */ OBJ_408_298,
|
||||
/* 299 */ OBJ_408_299,
|
||||
/* 300 */ OBJ_408_300,
|
||||
/* 301 */ OBJ_408_301,
|
||||
/* 302 */ OBJ_408_302,
|
||||
/* 303 */ OBJ_408_303,
|
||||
/* 304 */ OBJ_408_304,
|
||||
/* 305 */ OBJ_408_305,
|
||||
/* 306 */ OBJ_408_306,
|
||||
/* 307 */ OBJ_408_307,
|
||||
/* 308 */ OBJ_408_308,
|
||||
/* 309 */ OBJ_408_309,
|
||||
/* 310 */ OBJ_408_310,
|
||||
/* 311 */ OBJ_408_311,
|
||||
/* 312 */ OBJ_408_312,
|
||||
/* 313 */ OBJ_408_313,
|
||||
/* 314 */ OBJ_408_314,
|
||||
/* 315 */ OBJ_408_315,
|
||||
/* 316 */ OBJ_408_316,
|
||||
/* 317 */ OBJ_408_317,
|
||||
/* 318 */ OBJ_408_318,
|
||||
/* 319 */ OBJ_408_319,
|
||||
/* 320 */ OBJ_408_320,
|
||||
/* 321 */ OBJ_408_321,
|
||||
/* 292 */ OBJ_BOSS_292,
|
||||
/* 293 */ OBJ_BOSS_293,
|
||||
/* 294 */ OBJ_BOSS_294,
|
||||
/* 295 */ OBJ_BOSS_295,
|
||||
/* 296 */ OBJ_BOSS_296,
|
||||
/* 297 */ OBJ_BOSS_297,
|
||||
/* 298 */ OBJ_BOSS_298,
|
||||
/* 299 */ OBJ_BOSS_299,
|
||||
/* 300 */ OBJ_BOSS_300,
|
||||
/* 301 */ OBJ_BOSS_301,
|
||||
/* 302 */ OBJ_BOSS_A6,
|
||||
/* 303 */ OBJ_BOSS_303,
|
||||
/* 304 */ OBJ_BOSS_304,
|
||||
/* 305 */ OBJ_BOSS_305,
|
||||
/* 306 */ OBJ_BOSS_306,
|
||||
/* 307 */ OBJ_BOSS_ZO,
|
||||
/* 308 */ OBJ_BOSS_308,
|
||||
/* 309 */ OBJ_BOSS_309,
|
||||
/* 310 */ OBJ_BOSS_310,
|
||||
/* 311 */ OBJ_BOSS_311,
|
||||
/* 312 */ OBJ_BOSS_312,
|
||||
/* 313 */ OBJ_BOSS_313,
|
||||
/* 314 */ OBJ_BOSS_314,
|
||||
/* 315 */ OBJ_BOSS_SO,
|
||||
/* 316 */ OBJ_BOSS_316,
|
||||
/* 317 */ OBJ_BOSS_317,
|
||||
/* 318 */ OBJ_BOSS_AQ,
|
||||
/* 319 */ OBJ_BOSS_319,
|
||||
/* 320 */ OBJ_BOSS_320,
|
||||
/* 321 */ OBJ_BOSS_321,
|
||||
/* 322 */ OBJ_ITEM_LASERS,
|
||||
/* 323 */ OBJ_ITEM_CHECKPOINT,
|
||||
/* 324 */ OBJ_ITEM_SILVER_RING,
|
||||
|
||||
@@ -234,7 +234,7 @@ typedef struct Player {
|
||||
/* 0x224 */ s32 timer_224;
|
||||
/* 0x228 */ s32 unk_228;
|
||||
/* 0x22C */ s32 unk_22C;
|
||||
/* 0x230 */ char pad230[4];
|
||||
/* 0x230 */ s32 unk_230;
|
||||
/* 0x234 */ s32 unk_234;
|
||||
/* 0x238 */ s32 unk_238;
|
||||
/* 0x23C */ s32 unk_23C;
|
||||
|
||||
+9
-2
@@ -401,7 +401,7 @@ extern s32 D_80161AB8;
|
||||
extern Object_80 gObjects80[50];
|
||||
extern Object_4C gObjects4C[40];
|
||||
extern Object_2F4 gObjects2F4[60];
|
||||
extern Object_408 gObjects408[4];
|
||||
extern Boss gBosses[4];
|
||||
extern Object_8C gObjects8C[100];
|
||||
extern Item gItems[20];
|
||||
extern PlayerShot gPlayerShots[16];
|
||||
@@ -820,7 +820,7 @@ extern Gfx* D_DF4260_8019A008[];
|
||||
extern f32 D_DF4260_8019A9B8[];
|
||||
|
||||
// ovl_E16C50
|
||||
extern f32 D_E16C50_801C4188;
|
||||
// extern f32 D_E16C50_801C4188; Currently externed in relevant files for bss ordering
|
||||
|
||||
// ovl_E51970
|
||||
extern Matrix D_E51970_8019EE80;
|
||||
@@ -1707,6 +1707,13 @@ extern u16 D_60447A0[];
|
||||
extern u16 D_6047550[];
|
||||
extern Gfx D_604A9F0[];
|
||||
extern Gfx D_605C230[];
|
||||
extern f32 D_6028578[];
|
||||
extern Gfx D_600F1F0[];
|
||||
extern Gfx D_6015EE0[];
|
||||
extern Gfx D_6011910[];
|
||||
extern AnimationHeader D_6018994;
|
||||
extern Limb* D_6018BA0[];
|
||||
extern Gfx D_601B2B0[];
|
||||
|
||||
// ast_9DD390, ast_A0E340, ast_BFA740, ast_CBFE70, ast_D27600
|
||||
extern Gfx D_7000000[];
|
||||
|
||||
Reference in New Issue
Block a user