fox_co decomp, Object_2F4 rename to Actor with work buffers (#79)

* first few functions

* funcs so far - messy

* only large funcs left

* func_DF4260_8018F880 and func_DF4260_80191160

* func_DF4260_8018C19C

* func_DF4260_8018F880 player

* build post merge

* first cleanup pass

* add work buffers to Object_2F4

* halfway through data import

* finish data import

* cleanup and add non_matching

* bss complete

* actor rename

* post merge cleanup

* file rename

* arg rename

* other object variables rename

* hex cleanup for func_DF4260_80189058

* format

* revert note_data

* suggestions

* format suggestions
This commit is contained in:
inspectredc
2024-01-13 22:45:37 +00:00
committed by GitHub
parent 262a0bede2
commit 31bfc1ecdd
32 changed files with 8044 additions and 4948 deletions
+187 -183
View File
@@ -96,23 +96,24 @@ s32 vsprintf(char* dst, const char* fmt, va_list args);
// fox_360
void func_8002ED60(Player*);
void func_8002E3E0(Object_2F4*);
void func_8002E3E0(Actor*);
void func_8002E548(void);
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*);
void func_8002E6DC(Object_2F4*);
void func_8002E670(Actor*);
void func_8002E694(Actor*);
void func_8002E6B8(Actor*);
void func_8002E6DC(Actor*);
bool func_8002E4F8(u16*, s32);
void func_8002E700(Player *);
void func_8002EE64(Object_2F4 * obj2F4);
void func_8002EE64(Actor * actor);
void func_8002F180(void);
void func_8002F5F4(u16* msg, s32 character);
void func_8003088C(Object_2F4*);
void func_800319AC(Object_2F4* this);
void func_80035448(Object_2F4* obj2F4);
void func_8003088C(Actor*);
void func_800319AC(Actor* this);
void func_80035448(Actor* actor);
//fox_beam
void PlayerShot_Initialize(PlayerShot *);
@@ -131,7 +132,6 @@ void func_80040CE4(void);
void func_80042D38(void);
// fox_43AC0
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);
@@ -139,6 +139,8 @@ void func_80042FC4(Boss* boss);
void func_80042FD0(Boss* boss);
void func_80042FDC(Boss* boss);
void func_80042FE8(Boss* boss);
void func_800430DC(f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, s32, s32);
void func_8004319C(Player* player, f32 arg1, f32 arg2, f32 arg3);
// fox_43E80
void func_80043468(Player* player);
@@ -150,12 +152,13 @@ void func_80046358(Player*);
void func_80048AC0(s32 teamId);
void func_80049C0C(Player *);
void func_8004A52C(Player *);
void func_8004AA84(void);
void func_8004AAF4(Player *);
void func_8004C930(Player *);
void func_8004CCC0(Player *);
void func_8004E3D8(Player *);
void func_8004F8AC(Object_2F4*);
void func_8004FEC0(Object_2F4*);
void func_8004F8AC(Actor*);
void func_8004FEC0(Actor*);
void func_800515C4(void);
// fox_display
@@ -168,31 +171,31 @@ void func_80057D00(void);
void func_800594F0(Object_80*);
void func_800595D0(Object_80*);
void func_800596C0(void);
void func_800596B0(Object_2F4*);
void func_800596B0(Actor*);
// fox_edisplay
void Graphics_SetScaleMtx(f32);
void func_80059850(Object_4C*);
void func_800598E8(Object_2F4*);
void func_80059A24(Object_2F4*);
void func_800598E8(Actor*);
void func_80059A24(Actor*);
void func_80059AEC(Object_80*);
void func_80059B20(Object_80*);
void func_80059BBC(Object_80*);
void func_80059BF0(Object_2F4*);
void func_80059BF0(Actor*);
void func_80059C34(Object_4C*);
void func_80059C40(Object_4C*);
void func_80059F68(Item*);
void func_80059FDC(Item*);
void func_8005A094(Object_2F4*);
void func_8005ADAC(Object_2F4*);
void func_8005B1E8(Object_2F4*, s32);
void func_8005B388(Object_2F4*);
void func_8005B6A4(Object_2F4*);
void func_8005B71C(Object_2F4*);
void func_8005B7CC(Object_2F4*);
void func_8005B848(Object_2F4*);
void func_8005B9A4(Object_2F4*);
void func_8005BA30(Object_2F4*);
void func_8005A094(Actor*);
void func_8005ADAC(Actor*);
void func_8005B1E8(Actor*, s32);
void func_8005B388(Actor*);
void func_8005B6A4(Actor*);
void func_8005B71C(Actor*);
void func_8005B7CC(Actor*);
void func_8005B848(Actor*);
void func_8005B9A4(Actor*);
void func_8005BA30(Actor*);
void func_8005C5F0(Item*);
void func_8005C900(Item*);
void func_8005C9C0(Item*);
@@ -218,14 +221,14 @@ s32 func_80060FE4(Vec3f*, f32);
void Object_SetInfo(ObjectInfo* info, u32 objId);
void Object_80_Initialize(Object_80*);
void Object_4C_Initialize(Object_4C*);
void Object_2F4_Initialize(Object_2F4*);
void Actor_Initialize(Actor*);
void Boss_Initialize(Boss*);
void Item_Initialize(Item*);
void Effect_Initialize(Effect*);
void func_80061B68(void);
void func_80061CD0(void);
void func_80061E48(Object_2F4* , f32 , f32 , f32 );
void func_80061F0C(Object_2F4* , ObjectInit* , s32 );
void func_80061E48(Actor* , f32 , f32 , f32 );
void func_80061F0C(Actor* , ObjectInit* , s32 );
void Object_Load(ObjectInit* , f32 , f32 , f32 , f32 );
void func_80062568(void);
void func_80062B60(f32 xPos, f32 zPos, s32 arg2, f32 arg3);
@@ -236,13 +239,13 @@ s32 func_8006351C(s32 , Vec3f* , Vec3f* , s32 );
s32 func_801A55D4(s32 , Vec3f* , Vec3f* , s32 );
void func_800652CC(Object_80*);
void func_800654E4(Object *);
void func_800656D4(Object_2F4*);
void func_800660F0(Object_2F4*);
void func_80066254(Object_2F4*);
void func_8006654C(Object_2F4*);
void func_8006684C(Object_2F4*);
void func_800669A0(Object_2F4*);
void func_80066A80(Object_2F4*);
void func_800656D4(Actor*);
void func_800660F0(Actor*);
void func_80066254(Actor*);
void func_8006654C(Actor*);
void func_8006684C(Actor*);
void func_800669A0(Actor*);
void func_80066A80(Actor*);
void func_80066C00(Object_80*);
void func_80066D5C(Object_80*);
void func_80066E8C(Object_4C*);
@@ -250,8 +253,8 @@ void func_80066EA8(Object_80*);
void func_80066EF0(Item *);
void func_800671D0(Item *);
void func_800674B4(f32, f32, f32, f32, f32, f32, f32, f32);
void func_8006753C(Object_2F4*);
void func_80067874(Object_2F4*);
void func_8006753C(Actor*);
void func_80067874(Actor*);
void func_80067A40(void);
void func_80067B1C(Item*);
void func_80067BEC(Item*);
@@ -267,12 +270,12 @@ void func_80068C88(Item*);
void func_80068FE0(Object_4C*);
void func_800690D0(s32, ObjectId);
void func_80069924(Effect *);
void func_800693E8(Object_2F4 *);
void func_800693E8(Actor *);
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 Actor_Update(Actor*);
void Boss_Update(Boss *);
void Object_80_Update(Object_80 *);
void Object_4C_Update(Object_4C *);
@@ -283,27 +286,27 @@ void func_8006A38C(void);
void Object_UpdateAll(void);
//fox_6B3B0
void func_8006A96C(Object_2F4*);
void func_8006A978(Object_2F4*);
void func_8006A96C(Actor*);
void func_8006A978(Actor*);
void func_8006AA98(Object_80*);
void func_8006AC08(Object_2F4*);
void func_8006AD18(Object_2F4*);
void func_8006B094(Object_2F4*);
void func_8006B0A0(Object_2F4 *);
void func_8006B74C(Object_2F4 *);
void func_8006AC08(Actor*);
void func_8006AD18(Actor*);
void func_8006B094(Actor*);
void func_8006B0A0(Actor *);
void func_8006B74C(Actor *);
void func_8006B95C(Object_80*);
void func_8006BB78(Object_2F4*);
void func_8006C008(Object_2F4*);
void func_8006BB78(Actor*);
void func_8006C008(Actor*);
void func_8006D350(Object_80*);
void func_8006EEFC(s32, f32, f32, f32, f32, f32, f32, f32, f32, f32);
void func_8006F0D8(f32 xPos, f32 yPos, f32 zPos, f32 arg3);
void func_80072594(Object_2F4*);
void func_80072594(Actor*);
s32 func_80074F90(Object_80*);
void func_80074FF0(Object_2F4*);
void func_800763A4(Object_2F4 *);
void func_8007717C(Object_2F4 *);
void func_800771CC(Object_2F4*);
void func_80077218(Object_2F4*);
void func_80074FF0(Actor*);
void func_800763A4(Actor *);
void func_8007717C(Actor *);
void func_800771CC(Actor*);
void func_80077218(Actor*);
// fox_effect
void func_80077240(f32 posX, f32 posY, f32 posZ, s32 hits);
@@ -456,6 +459,7 @@ void func_800869A0(f32, f32, s32, f32, s32, s32);
void func_80087530(f32, f32, s32);
void func_80088564(void);
void func_8008865C(void);
s32 func_8008AC54(s32);
void func_8008AD94(void);
void func_8008B5B0(f32 x, f32 y);
s32 func_8008B774(void);
@@ -475,12 +479,12 @@ void func_8008EA14(f32, f32);
void func_8008FA84(void);
void func_8008FE78(Boss*);
void func_8008FFF0(Boss*, s32);
bool func_8009092C(Object_2F4*);
bool func_8009092C(Actor*);
void func_800907C4(Boss*);
s32 func_800915FC(Object_2F4*);
void func_80092D48(Object_2F4 *);
void func_80092EC0(Object_2F4*);
void func_80093164(Object_2F4*);
s32 func_800915FC(Actor*);
void func_80092D48(Actor *);
void func_80092EC0(Actor*);
void func_80093164(Actor*);
void func_800935E8(Player*);
void func_80095604(Player*);
void func_80094954(Effect*);
@@ -503,7 +507,7 @@ void func_800A1FB0(Gfx **, u8 , u8);
void func_800A24DC(s32);
void func_800A26C0(void);
void func_800A25DC(void);
Object_2F4 *func_800A3608(s32);
Actor *func_800A3608(s32);
// fox_A4290
bool func_800A3690(Vec3f*, Vec3f*, s32, Vec3f*);
@@ -582,14 +586,14 @@ void func_DF4260_80187520(s32, void*);
void func_DF4260_80187530(Object_80*);
void func_DF4260_8018753C(Object_80*);
void func_DF4260_801878D8(Boss *);
void func_DF4260_8018B0B4(Object_2F4 *);
void func_DF4260_8018B0B4(Actor *);
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_8019250C(Actor *);
void func_DF4260_80192CB0(Actor *);
void func_DF4260_80192EA4(Actor *);
void func_DF4260_801933B4(Actor *);
void func_DF4260_801935CC(Boss *);
void func_DF4260_80198310(Boss *);
void func_DF4260_80198594(Boss *);
@@ -600,9 +604,9 @@ void func_DF4260_8019864C(PlayerShot*);
void func_E08400_80187520(s32, void*);
void func_E08400_80187B08(Object_2F4 *);
void func_E08400_80187B08(Actor *);
void func_E08400_80188A40(Boss *);
void func_E08400_8018CCF8(Object_2F4 *);
void func_E08400_8018CCF8(Actor *);
void func_E16C50_80187520(s32, void*);
void func_E16C50_80187754(Boss *);
@@ -612,61 +616,61 @@ 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_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_80190430(Actor *);
void func_E16C50_801904CC(Actor*);
void func_E16C50_80190A00(Actor*);
void func_E16C50_80190F08(Actor *);
void func_E16C50_80191010(Actor*);
void func_E16C50_801914C4(Actor*);
void func_E16C50_801915A4(Actor *);
void func_E16C50_80191680(Actor*);
void func_E16C50_80191B4C(Actor*);
void func_E16C50_80191BB8(Actor *);
void func_E16C50_80191BC4(Actor*);
void func_E16C50_80191DB0(Actor*);
void func_E16C50_80191DB0(Actor*);
void func_E16C50_80191FFC(Actor*);
void func_E16C50_80192094(Actor*);
void func_E16C50_80192834(Actor*);
void func_E16C50_80192C18(Actor*);
void func_E16C50_80192E64(Actor*);
void func_E16C50_80193240(Actor*);
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_8019969C(Actor*);
void func_E16C50_8019983C(Actor*);
void func_E16C50_80199A28(Actor*);
void func_E16C50_80199E24(Actor*);
void func_E16C50_80199F10(Actor*);
void func_E16C50_8019A1FC(Actor*);
void func_E16C50_8019A5D4(Actor*);
void func_E16C50_8019ACCC(Actor*);
void func_E16C50_8019B1F0(Actor *);
void func_E16C50_8019B548(Actor*);
void func_E16C50_8019B7DC(Actor*);
void func_E16C50_8019B810(Actor *);
void func_E16C50_8019B854(Actor*);
void func_E16C50_8019BDE0(Actor*);
void func_E16C50_8019BE48(Actor*);
void func_E16C50_8019C1CC(Actor*);
void func_E16C50_8019C200(Actor *);
void func_E16C50_8019C454(Actor*);
void func_E16C50_8019C83C(Actor*);
void func_E16C50_8019CBEC(Actor*);
void func_E16C50_8019CE58(Actor*);
void func_E16C50_8019D060(Actor *);
void func_E16C50_8019D15C(Actor*);
void func_E16C50_8019D3C4(Actor*);
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_8019EA7C(Actor*);
void func_E16C50_8019F20C(Actor*);
void func_E16C50_8019F7AC(Actor*);
void func_E16C50_801A003C(Actor*);
void func_E16C50_801A0120(Effect*);
void func_E16C50_801A0AF0(Effect*);
void func_E16C50_801A10F4(Player* player);
@@ -687,96 +691,96 @@ void func_E16C50_801AC918(Effect*);
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_801AFA5C(Object_2F4*);
void func_E16C50_801B099C(Object_2F4*);
void func_E16C50_801B0B60(Object_2F4*);
void func_E16C50_801B0EC0(Object_2F4*);
void func_E16C50_801AD688(Actor *);
void func_E16C50_801AD6C0(Actor*);
void func_E16C50_801AE168(Actor*);
void func_E16C50_801AE3AC(Actor *);
void func_E16C50_801AE3D8(Actor*);
void func_E16C50_801AEB44(Actor*);
void func_E16C50_801AF9FC(Actor *);
void func_E16C50_801AFA5C(Actor*);
void func_E16C50_801B099C(Actor*);
void func_E16C50_801B0B60(Actor*);
void func_E16C50_801B0EC0(Actor*);
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_801B504C(Actor*);
void func_E16C50_801B50E8(Actor*);
void func_E16C50_801B619C(Actor*);
void func_E16C50_801B6344(Actor *);
void func_E16C50_801B638C(Actor*);
void func_E16C50_801B6E54(Actor *);
void func_E16C50_801B6FF8(Actor*);
void func_E16C50_801B7A24(Actor*);
void func_E16C50_801B7AF0(Actor *);
void func_E16C50_801B7C78(Actor*);
void func_E16C50_801B90DC(Actor*);
void func_E16C50_801B91A4(Actor*);
void func_E16C50_801BA108(Actor*);
void func_E16C50_801BA26C(Actor*);
void func_E16C50_801BA4E4(Actor*);
void func_E16C50_801BA57C(Actor *);
void func_E16C50_801BA6A4(Actor*);
void func_E16C50_801BAD7C(Actor*);
void func_E16C50_801BADF8(Actor*);
void func_E16C50_801BB204(Actor*);
void func_E16C50_801BB26C(Actor *);
void func_E16C50_801BB79C(Actor*);
void func_E16C50_801BC930(Actor*);
void func_E16C50_801BC9A0(Actor*);
void func_E16C50_801BD264(Actor*);
void func_E16C50_801BD54C(Actor*);
void func_E16C50_801BDE6C(Actor*);
void func_E16C50_801BE1FC(Object_80*);
void func_E16C50_801BE3F8(Object_2F4*);
void func_E16C50_801BEB1C(Object_2F4*);
void func_E16C50_801BE3F8(Actor*);
void func_E16C50_801BEB1C(Actor*);
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_801BEC68(Actor*);
void func_E16C50_801BEC74(Actor*);
void func_E16C50_801BEC80(Player*);
void func_E51970_80187520(s32, void*);
void func_E51970_80187960(Object_2F4*);
void func_E51970_80187960(Actor*);
void func_E51970_8018BA2C(Object_58**);
void func_E51970_8018C158(Object_2F4*);
void func_E51970_8018C158(Actor*);
void func_E51970_80191ED8(Object_58**);
void func_E51970_80192264(void);
void func_E51970_80193CA4(Boss *);
void func_E51970_80198594(Object_2F4*);
void func_E51970_80198594(Actor*);
void func_E51970_80198930(Object_58**);
void func_E51970_80199900(Object_2F4 *, s32);
void func_E51970_80199C60(Object_2F4*);
void func_E51970_8019AB8C(Object_2F4*);
void func_E51970_80199900(Actor *, s32);
void func_E51970_80199C60(Actor*);
void func_E51970_8019AB8C(Actor*);
void func_E51970_8019EA68(Object_58**);
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 *);
void func_E6A810_8018B720(Object_2F4 *);
void func_E6A810_8018B96C(Object_2F4 *);
void func_E6A810_8018BFB0(Object_2F4 *);
void func_E6A810_8018E3B0(Object_2F4 *);
void func_E6A810_8018E3CC(Object_2F4 *);
void func_E6A810_8018E5E8(Object_2F4 *);
void func_E6A810_80189B80(Actor *);
void func_E6A810_8018ADC4(Actor *);
void func_E6A810_8018B720(Actor *);
void func_E6A810_8018B96C(Actor *);
void func_E6A810_8018BFB0(Actor *);
void func_E6A810_8018E3B0(Actor *);
void func_E6A810_8018E3CC(Actor *);
void func_E6A810_8018E5E8(Actor *);
void func_E6A810_8018EFF0(Object_4C *);
void func_E6A810_8018F0D8(Object_80 *);
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 *);
void func_E6A810_801A4660(Object_2F4 *);
void func_E6A810_801A4AF8(Object_2F4 *);
void func_E6A810_801A5E2C(Object_2F4 *);
void func_E6A810_801A6134(Object_2F4 *);
void func_E6A810_80199F8C(Actor *);
void func_E6A810_801A3E70(Actor *);
void func_E6A810_801A4660(Actor *);
void func_E6A810_801A4AF8(Actor *);
void func_E6A810_801A5E2C(Actor *);
void func_E6A810_801A6134(Actor *);
void func_E6A810_801A65E0(Object_80 *);
void func_E6A810_801A7D98(Object_2F4 *);
void func_E6A810_801A7D98(Actor *);
void func_E6A810_801ACFBC(ObjectInit*);
void func_E6A810_801AD080(void);
void func_E6A810_801B5110(f32, f32, f32);
@@ -789,20 +793,20 @@ 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_8018769C(Actor*);
void func_E9F1D0_80187520(s32, void*);
void func_E9F1D0_801878A8(Object_58**);
void func_E9F1D0_801888F4(Object_2F4 *);
void func_E9F1D0_801888F4(Actor *);
void func_E9F1D0_80189214(void);
void func_E9F1D0_8018BDD8(void);
void func_E9F1D0_8018C390(Player*);
void func_E9F1D0_8018D16C(Boss *);
void func_E9F1D0_801961AC(Object_58**);
void func_E9F1D0_80196314(Object_2F4*);
void func_E9F1D0_80196314(Actor*);
void func_E9F1D0_80196968(Object_58**);
void func_E9F1D0_80197CC4(Boss *);
void func_E9F1D0_801A3BD4(Object_2F4*);
void func_E9F1D0_801A4CB0(Object_2F4*);
void func_E9F1D0_801A3BD4(Actor*);
void func_E9F1D0_801A4CB0(Actor*);
void func_E9F1D0_801A5AD4(Player*);
void func_E9F1D0_801A5FC0(Player*);
void func_E9F1D0_801A6164(Player *);