mirror of
https://github.com/HarbourMasters/Starship
synced 2026-07-11 15:44:52 -04:00
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
+187
-183
@@ -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 *);
|
||||
|
||||
+2
-2
@@ -33,8 +33,8 @@ void func_8008D7F4(void);
|
||||
void func_8008D984(void);
|
||||
void func_8008DC34(void);
|
||||
void func_8008E5E8(void);
|
||||
s32 func_80090E8C(Object_2F4*);
|
||||
s32 func_800910C0(Object_2F4*);
|
||||
s32 func_80090E8C(Actor*);
|
||||
s32 func_800910C0(Actor*);
|
||||
|
||||
// Weird addresses, assets maybe?
|
||||
extern u16 D_1000E80[];
|
||||
|
||||
+128
-175
@@ -43,7 +43,7 @@ typedef struct {
|
||||
} CollisionHeader2; // size = 0x24
|
||||
|
||||
typedef enum {
|
||||
/* 0 */ COL1_0, // OBJ_2F4_180
|
||||
/* 0 */ COL1_0, // OBJ_ACTOR_180
|
||||
/* 1 */ COL1_1, // OBJ_80_39
|
||||
/* 2 */ COL1_2,
|
||||
/* 3 */ COL1_3, // OBJ_UNK_1000
|
||||
@@ -207,7 +207,9 @@ typedef struct {
|
||||
/* 0x000 */ Object obj;
|
||||
/* 0x01C */ ObjectInfo info;
|
||||
/* 0x040 */ s32 index;
|
||||
/* 0x044 */ char unk_44[0xA];
|
||||
/* 0x044 */ s16 unk_044;
|
||||
/* 0x046 */ char unk_46[0x6];
|
||||
/* 0x04C */ s16 unk_04C;
|
||||
/* 0x04E */ s16 unk_04E;
|
||||
/* 0x050 */ s16 timer_050;
|
||||
/* 0x052 */ s16 timer_052;
|
||||
@@ -244,44 +246,24 @@ typedef struct {
|
||||
/* 0x04A */ s16 unk_04A;
|
||||
/* 0x04C */ s16 timer_04C;
|
||||
/* 0x04E */ s16 unk_04E;
|
||||
/* 0x050 */ bool unk_050;
|
||||
/* 0x054 */ bool unk_054;
|
||||
/* 0x058 */ s32 unk_058;
|
||||
/* 0x05C */ s32 unk_05C;
|
||||
/* 0x060 */ s32 unk_060;
|
||||
/* 0x064 */ s32 unk_064;
|
||||
/* 0x068 */ s32 unk_068;
|
||||
/* 0x06C */ s32 unk_06C;
|
||||
/* 0x070 */ s32 unk_070;
|
||||
/* 0x074 */ s32 unk_074;
|
||||
/* 0x078 */ s32 unk_078;
|
||||
/* 0x07C */ s32 unk_07C;
|
||||
/* 0x080 */ s32 unk_080;
|
||||
/* 0x084 */ s32 unk_084;
|
||||
/* 0x088 */ s32 unk_088;
|
||||
/* 0x08C */ s32 unk_08C;
|
||||
/* 0x090 */ s32 unk_090;
|
||||
/* 0x094 */ s32 unk_094;
|
||||
/* 0x098 */ s32 unk_098;
|
||||
/* 0x09C */ s32 unk_09C;
|
||||
/* 0x0A0 */ char padA0[0x10];
|
||||
/* 0x0B0 */ s32 unk_0B0;
|
||||
/* 0x050 */ s32 iwork[25];
|
||||
/* 0x0B4 */ s16 unk_0B4;
|
||||
/* 0x0B6 */ s16 unk_0B6;
|
||||
/* 0x0B8 */ s16 unk_0B8;
|
||||
/* 0x0BA */ char pad0BA[0x2];
|
||||
/* 0x0BC */ u16 timer_0BC;
|
||||
/* 0x0BC */ u16 timer_0BE;
|
||||
/* 0x0BE */ u16 timer_0BE;
|
||||
/* 0x0C0 */ u16 timer_0C0;
|
||||
/* 0x0C2 */ u16 timer_0C2;
|
||||
/* 0x0C4 */ u16 timer_0C4;
|
||||
/* 0x0C6 */ u16 timer_0C6;
|
||||
/* 0x0C8 */ u8 unk_0C8;
|
||||
/* 0x0C9 */ u8 unk_0C9;
|
||||
/* 0x0C9 */ u8 timer_0CA[4];
|
||||
/* 0x0CA */ u8 timer_0CA[4];
|
||||
/* 0x0CE */ s16 unk_0CE;
|
||||
/* 0x0D0 */ s8 unk_0D0;
|
||||
/* 0x0D1 */ s16 unk_0D2;
|
||||
/* 0x0D1 */ char pad0D1[0x1];
|
||||
/* 0x0D2 */ s16 unk_0D2;
|
||||
/* 0x0D4 */ s16 unk_0D4;
|
||||
/* 0x0D6 */ u16 unk_0D6;
|
||||
/* 0x0D8 */ Vec3f unk_0D8;
|
||||
@@ -292,38 +274,9 @@ typedef struct {
|
||||
/* 0x100 */ Vec3f sfxPos;
|
||||
/* 0x10C */ f32 gravity;
|
||||
/* 0x110 */ f32 scale;
|
||||
/* 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 */ f32 unk_140;
|
||||
/* 0x144 */ f32 unk_144;
|
||||
/* 0x148 */ f32 unk_148;
|
||||
/* 0x14C */ f32 unk_14C;
|
||||
/* 0x150 */ f32 unk_150;
|
||||
/* 0x154 */ f32 unk_154;
|
||||
/* 0x158 */ f32 unk_158;
|
||||
/* 0x15C */ f32 unk_15C;
|
||||
/* 0x160 */ f32 unk_160;
|
||||
/* 0x164 */ f32 unk_164;
|
||||
/* 0x168 */ f32 unk_168;
|
||||
/* 0x16C */ f32 unk_16C;
|
||||
/* 0x170 */ f32 unk_170;
|
||||
/* 0x174 */ f32 unk_174;
|
||||
/* 0x178 */ f32 unk_178;
|
||||
/* 0x17C */ f32 unk_17C;
|
||||
/* 0x180 */ f32 unk_180;
|
||||
/* 0x184 */ f32 unk_184;
|
||||
/* 0x188 */ f32 unk_188;
|
||||
/* 0x18C */ Vec3f unk_18C[28]; // could be joint table
|
||||
/* 0x2DC */ Vec3f unk_2DC;
|
||||
/* 0x2E8 */ Vec3f unk_2E8;
|
||||
} Object_2F4; // size = 0x2F4
|
||||
/* 0x114 */ f32 fwork[30];
|
||||
/* 0x18C */ Vec3f vwork[30];
|
||||
} Actor; // size = 0x2F4
|
||||
|
||||
typedef enum{
|
||||
/* -1 */ OBJ_INVALID=-1,
|
||||
@@ -503,122 +456,122 @@ typedef enum{
|
||||
/* 173 */ OBJ_4C_173,
|
||||
/* 174 */ OBJ_4C_174,
|
||||
/* 175 */ OBJ_4C_175,
|
||||
/* 176 */ OBJ_2F4_176,
|
||||
/* 177 */ OBJ_2F4_177,
|
||||
/* 178 */ OBJ_2F4_178,
|
||||
/* 179 */ OBJ_2F4_179,
|
||||
/* 180 */ OBJ_2F4_180,
|
||||
/* 181 */ OBJ_2F4_181,
|
||||
/* 182 */ OBJ_2F4_182,
|
||||
/* 183 */ OBJ_2F4_183,
|
||||
/* 184 */ OBJ_2F4_184,
|
||||
/* 185 */ OBJ_2F4_185,
|
||||
/* 186 */ OBJ_2F4_186,
|
||||
/* 187 */ OBJ_2F4_187,
|
||||
/* 188 */ OBJ_2F4_188,
|
||||
/* 189 */ OBJ_2F4_189,
|
||||
/* 190 */ OBJ_2F4_190,
|
||||
/* 191 */ OBJ_2F4_191,
|
||||
/* 192 */ OBJ_2F4_192,
|
||||
/* 193 */ OBJ_2F4_193,
|
||||
/* 194 */ OBJ_2F4_194,
|
||||
/* 195 */ OBJ_2F4_195,
|
||||
/* 196 */ OBJ_2F4_196,
|
||||
/* 197 */ OBJ_2F4_197,
|
||||
/* 198 */ OBJ_2F4_198,
|
||||
/* 199 */ OBJ_2F4_199,
|
||||
/* 200 */ OBJ_2F4_200,
|
||||
/* 201 */ OBJ_2F4_201,
|
||||
/* 202 */ OBJ_2F4_202,
|
||||
/* 203 */ OBJ_2F4_203,
|
||||
/* 204 */ OBJ_2F4_204,
|
||||
/* 205 */ OBJ_2F4_205,
|
||||
/* 206 */ OBJ_2F4_206,
|
||||
/* 207 */ OBJ_2F4_207,
|
||||
/* 208 */ OBJ_2F4_208,
|
||||
/* 209 */ OBJ_2F4_209,
|
||||
/* 210 */ OBJ_2F4_210,
|
||||
/* 211 */ OBJ_2F4_211,
|
||||
/* 212 */ OBJ_2F4_212,
|
||||
/* 213 */ OBJ_2F4_213,
|
||||
/* 214 */ OBJ_2F4_214,
|
||||
/* 215 */ OBJ_2F4_215,
|
||||
/* 216 */ OBJ_2F4_216,
|
||||
/* 217 */ OBJ_2F4_217,
|
||||
/* 218 */ OBJ_2F4_218,
|
||||
/* 219 */ OBJ_2F4_219,
|
||||
/* 220 */ OBJ_2F4_220,
|
||||
/* 221 */ OBJ_2F4_221,
|
||||
/* 222 */ OBJ_2F4_222,
|
||||
/* 223 */ OBJ_2F4_223,
|
||||
/* 224 */ OBJ_2F4_224,
|
||||
/* 225 */ OBJ_2F4_225,
|
||||
/* 226 */ OBJ_2F4_226,
|
||||
/* 227 */ OBJ_2F4_227,
|
||||
/* 228 */ OBJ_2F4_228,
|
||||
/* 229 */ OBJ_2F4_229,
|
||||
/* 230 */ OBJ_2F4_230,
|
||||
/* 231 */ OBJ_2F4_231,
|
||||
/* 232 */ OBJ_2F4_232,
|
||||
/* 233 */ OBJ_2F4_233,
|
||||
/* 234 */ OBJ_2F4_234,
|
||||
/* 235 */ OBJ_2F4_235,
|
||||
/* 236 */ OBJ_2F4_236,
|
||||
/* 237 */ OBJ_2F4_237,
|
||||
/* 238 */ OBJ_2F4_238,
|
||||
/* 239 */ OBJ_2F4_239,
|
||||
/* 240 */ OBJ_2F4_240,
|
||||
/* 241 */ OBJ_2F4_241,
|
||||
/* 242 */ OBJ_2F4_242,
|
||||
/* 243 */ OBJ_2F4_243,
|
||||
/* 244 */ OBJ_2F4_244,
|
||||
/* 245 */ OBJ_2F4_245,
|
||||
/* 246 */ OBJ_2F4_246,
|
||||
/* 247 */ OBJ_2F4_247,
|
||||
/* 248 */ OBJ_2F4_248,
|
||||
/* 249 */ OBJ_2F4_249,
|
||||
/* 250 */ OBJ_2F4_250,
|
||||
/* 251 */ OBJ_2F4_251,
|
||||
/* 252 */ OBJ_2F4_252,
|
||||
/* 253 */ OBJ_2F4_253,
|
||||
/* 254 */ OBJ_2F4_254,
|
||||
/* 255 */ OBJ_2F4_255,
|
||||
/* 256 */ OBJ_2F4_256,
|
||||
/* 257 */ OBJ_2F4_257,
|
||||
/* 258 */ OBJ_2F4_258,
|
||||
/* 259 */ OBJ_2F4_259,
|
||||
/* 260 */ OBJ_2F4_260,
|
||||
/* 261 */ OBJ_2F4_261,
|
||||
/* 262 */ OBJ_2F4_262,
|
||||
/* 263 */ OBJ_2F4_263,
|
||||
/* 264 */ OBJ_2F4_264,
|
||||
/* 265 */ OBJ_2F4_265,
|
||||
/* 266 */ OBJ_2F4_266,
|
||||
/* 267 */ OBJ_2F4_267,
|
||||
/* 268 */ OBJ_2F4_268,
|
||||
/* 269 */ OBJ_2F4_269,
|
||||
/* 270 */ OBJ_2F4_270,
|
||||
/* 271 */ OBJ_2F4_271,
|
||||
/* 272 */ OBJ_2F4_272,
|
||||
/* 273 */ OBJ_2F4_273,
|
||||
/* 274 */ OBJ_2F4_274,
|
||||
/* 275 */ OBJ_2F4_275,
|
||||
/* 276 */ OBJ_2F4_276,
|
||||
/* 277 */ OBJ_2F4_277,
|
||||
/* 278 */ OBJ_2F4_278,
|
||||
/* 279 */ OBJ_2F4_279,
|
||||
/* 280 */ OBJ_2F4_280,
|
||||
/* 281 */ OBJ_2F4_281,
|
||||
/* 282 */ OBJ_2F4_282,
|
||||
/* 283 */ OBJ_2F4_283,
|
||||
/* 284 */ OBJ_2F4_284,
|
||||
/* 285 */ OBJ_2F4_285,
|
||||
/* 286 */ OBJ_2F4_286,
|
||||
/* 287 */ OBJ_2F4_287,
|
||||
/* 288 */ OBJ_2F4_288,
|
||||
/* 289 */ OBJ_2F4_289,
|
||||
/* 290 */ OBJ_2F4_290,
|
||||
/* 291 */ OBJ_2F4_291,
|
||||
/* 176 */ OBJ_ACTOR_176,
|
||||
/* 177 */ OBJ_ACTOR_177,
|
||||
/* 178 */ OBJ_ACTOR_178,
|
||||
/* 179 */ OBJ_ACTOR_179,
|
||||
/* 180 */ OBJ_ACTOR_180,
|
||||
/* 181 */ OBJ_ACTOR_181,
|
||||
/* 182 */ OBJ_ACTOR_182,
|
||||
/* 183 */ OBJ_ACTOR_183,
|
||||
/* 184 */ OBJ_ACTOR_184,
|
||||
/* 185 */ OBJ_ACTOR_185,
|
||||
/* 186 */ OBJ_ACTOR_186,
|
||||
/* 187 */ OBJ_ACTOR_187,
|
||||
/* 188 */ OBJ_ACTOR_188,
|
||||
/* 189 */ OBJ_ACTOR_189,
|
||||
/* 190 */ OBJ_ACTOR_190,
|
||||
/* 191 */ OBJ_ACTOR_191,
|
||||
/* 192 */ OBJ_ACTOR_192,
|
||||
/* 193 */ OBJ_ACTOR_193,
|
||||
/* 194 */ OBJ_ACTOR_194,
|
||||
/* 195 */ OBJ_ACTOR_195,
|
||||
/* 196 */ OBJ_ACTOR_196,
|
||||
/* 197 */ OBJ_ACTOR_197,
|
||||
/* 198 */ OBJ_ACTOR_198,
|
||||
/* 199 */ OBJ_ACTOR_199,
|
||||
/* 200 */ OBJ_ACTOR_200,
|
||||
/* 201 */ OBJ_ACTOR_201,
|
||||
/* 202 */ OBJ_ACTOR_202,
|
||||
/* 203 */ OBJ_ACTOR_203,
|
||||
/* 204 */ OBJ_ACTOR_204,
|
||||
/* 205 */ OBJ_ACTOR_205,
|
||||
/* 206 */ OBJ_ACTOR_206,
|
||||
/* 207 */ OBJ_ACTOR_207,
|
||||
/* 208 */ OBJ_ACTOR_208,
|
||||
/* 209 */ OBJ_ACTOR_209,
|
||||
/* 210 */ OBJ_ACTOR_210,
|
||||
/* 211 */ OBJ_ACTOR_211,
|
||||
/* 212 */ OBJ_ACTOR_212,
|
||||
/* 213 */ OBJ_ACTOR_213,
|
||||
/* 214 */ OBJ_ACTOR_214,
|
||||
/* 215 */ OBJ_ACTOR_215,
|
||||
/* 216 */ OBJ_ACTOR_216,
|
||||
/* 217 */ OBJ_ACTOR_217,
|
||||
/* 218 */ OBJ_ACTOR_218,
|
||||
/* 219 */ OBJ_ACTOR_219,
|
||||
/* 220 */ OBJ_ACTOR_220,
|
||||
/* 221 */ OBJ_ACTOR_221,
|
||||
/* 222 */ OBJ_ACTOR_222,
|
||||
/* 223 */ OBJ_ACTOR_223,
|
||||
/* 224 */ OBJ_ACTOR_224,
|
||||
/* 225 */ OBJ_ACTOR_225,
|
||||
/* 226 */ OBJ_ACTOR_226,
|
||||
/* 227 */ OBJ_ACTOR_227,
|
||||
/* 228 */ OBJ_ACTOR_228,
|
||||
/* 229 */ OBJ_ACTOR_229,
|
||||
/* 230 */ OBJ_ACTOR_230,
|
||||
/* 231 */ OBJ_ACTOR_231,
|
||||
/* 232 */ OBJ_ACTOR_232,
|
||||
/* 233 */ OBJ_ACTOR_233,
|
||||
/* 234 */ OBJ_ACTOR_234,
|
||||
/* 235 */ OBJ_ACTOR_235,
|
||||
/* 236 */ OBJ_ACTOR_236,
|
||||
/* 237 */ OBJ_ACTOR_237,
|
||||
/* 238 */ OBJ_ACTOR_238,
|
||||
/* 239 */ OBJ_ACTOR_239,
|
||||
/* 240 */ OBJ_ACTOR_240,
|
||||
/* 241 */ OBJ_ACTOR_241,
|
||||
/* 242 */ OBJ_ACTOR_242,
|
||||
/* 243 */ OBJ_ACTOR_243,
|
||||
/* 244 */ OBJ_ACTOR_244,
|
||||
/* 245 */ OBJ_ACTOR_245,
|
||||
/* 246 */ OBJ_ACTOR_246,
|
||||
/* 247 */ OBJ_ACTOR_247,
|
||||
/* 248 */ OBJ_ACTOR_248,
|
||||
/* 249 */ OBJ_ACTOR_249,
|
||||
/* 250 */ OBJ_ACTOR_250,
|
||||
/* 251 */ OBJ_ACTOR_251,
|
||||
/* 252 */ OBJ_ACTOR_252,
|
||||
/* 253 */ OBJ_ACTOR_253,
|
||||
/* 254 */ OBJ_ACTOR_254,
|
||||
/* 255 */ OBJ_ACTOR_255,
|
||||
/* 256 */ OBJ_ACTOR_256,
|
||||
/* 257 */ OBJ_ACTOR_257,
|
||||
/* 258 */ OBJ_ACTOR_258,
|
||||
/* 259 */ OBJ_ACTOR_259,
|
||||
/* 260 */ OBJ_ACTOR_260,
|
||||
/* 261 */ OBJ_ACTOR_261,
|
||||
/* 262 */ OBJ_ACTOR_262,
|
||||
/* 263 */ OBJ_ACTOR_263,
|
||||
/* 264 */ OBJ_ACTOR_264,
|
||||
/* 265 */ OBJ_ACTOR_265,
|
||||
/* 266 */ OBJ_ACTOR_266,
|
||||
/* 267 */ OBJ_ACTOR_267,
|
||||
/* 268 */ OBJ_ACTOR_268,
|
||||
/* 269 */ OBJ_ACTOR_269,
|
||||
/* 270 */ OBJ_ACTOR_270,
|
||||
/* 271 */ OBJ_ACTOR_271,
|
||||
/* 272 */ OBJ_ACTOR_272,
|
||||
/* 273 */ OBJ_ACTOR_273,
|
||||
/* 274 */ OBJ_ACTOR_274,
|
||||
/* 275 */ OBJ_ACTOR_275,
|
||||
/* 276 */ OBJ_ACTOR_276,
|
||||
/* 277 */ OBJ_ACTOR_277,
|
||||
/* 278 */ OBJ_ACTOR_278,
|
||||
/* 279 */ OBJ_ACTOR_279,
|
||||
/* 280 */ OBJ_ACTOR_280,
|
||||
/* 281 */ OBJ_ACTOR_281,
|
||||
/* 282 */ OBJ_ACTOR_282,
|
||||
/* 283 */ OBJ_ACTOR_283,
|
||||
/* 284 */ OBJ_ACTOR_284,
|
||||
/* 285 */ OBJ_ACTOR_285,
|
||||
/* 286 */ OBJ_ACTOR_286,
|
||||
/* 287 */ OBJ_ACTOR_287,
|
||||
/* 288 */ OBJ_ACTOR_288,
|
||||
/* 289 */ OBJ_ACTOR_289,
|
||||
/* 290 */ OBJ_ACTOR_290,
|
||||
/* 291 */ OBJ_ACTOR_291,
|
||||
/* 292 */ OBJ_BOSS_292,
|
||||
/* 293 */ OBJ_BOSS_293,
|
||||
/* 294 */ OBJ_BOSS_294,
|
||||
|
||||
+2
-2
@@ -141,7 +141,7 @@ extern Vec3f D_800C9F2C;
|
||||
// fox_display
|
||||
extern s32 D_800CA220;
|
||||
extern f32 D_800CA230;
|
||||
extern Object_2F4* D_800CA234;
|
||||
extern Actor* D_800CA234;
|
||||
extern s32 D_Timer_800CA238;
|
||||
|
||||
// fox_edata
|
||||
@@ -387,7 +387,7 @@ extern s32 D_80161AB8;
|
||||
// 0x44
|
||||
extern Object_80 gObjects80[50];
|
||||
extern Object_4C gObjects4C[40];
|
||||
extern Object_2F4 gObjects2F4[60];
|
||||
extern Actor gActors[60];
|
||||
extern Boss gBosses[4];
|
||||
extern Effect gEffects[100];
|
||||
extern Item gItems[20];
|
||||
|
||||
Reference in New Issue
Block a user