fox_play finished, lots of new names for things (#58)

* stuff

* three whole files

* format

* format and such

* a switch in time

* merge prep

* nintendo switch

* format

* the great switch statement of our time

* 43AC0 matched

* stuff

* Enums everywhere

* oh god the switch

* knakyo

* new headers

* format

* fox

* everyone hates recursion

* format

* one more thing

* one more one more thing

* renames

* matches

* matrix scale why

* names and such

* cleanup

* name back

* it just keeps going

* they don't give up

* splits

* merge going poorly

* I object

* more names

* one nonmatching

* merge time

* merge complete

* cleanup

* poor rambo

* level fix
This commit is contained in:
petrie911
2023-12-24 13:28:35 -06:00
committed by GitHub
parent f76ce38ad1
commit 7633af7a28
39 changed files with 5818 additions and 2339 deletions
+26 -9
View File
@@ -22,10 +22,10 @@ void func_8000FFCC(void);
u8* func_8001C3EC(void);
void func_80016A50(void);
void func_800182F4(s32);
void func_80019218(u32, Vec3f*, u8, f32*, f32*, s8*);
void Audio_PlaySfx(u32, Vec3f*, u8, f32*, f32*, s8*);
void func_80019290(s32, Vec3f**);
void func_8001A38C(u8, Vec3f*);
void func_8001A500(Vec3f* sfxPos);
void Audio_KillSfx(Vec3f*);
void func_8001A55C(Vec3f*, u32);
void func_8001A838(u32);
void func_8001ACDC(s32);
@@ -37,7 +37,7 @@ void func_8001C8B8(u8);
void func_8001CA24(u8);
void func_8001CB80(u8, u8);
void func_8001CCDC(u8, Vec3f *);
void func_8001D1C8(s32, s32);
void func_8001D1C8(u8, s32);
void func_8001D2FC(Vec3f *, u16);
void func_8001D3A0(Vec3f *, u16);
void func_8001D400(s8);
@@ -110,7 +110,7 @@ void func_80035448(Object_2F4*);
//sf_36930
void PlayerShot_Initialize(PlayerShot *);
void func_800365E4(f32, f32, f32, f32, f32, f32, f32, f32, f32, s32, s32);
void func_8003D9B8();
void func_8003D9B8(void);
void func_8003DA0C(void);
void func_8003DAF0(void);
void func_8003DE68(s32, s32);
@@ -155,7 +155,7 @@ void func_800596C0(void);
void func_800596B0(Object_2F4*);
// fox_edisplay
void func_8005980C(f32);
void Graphics_SetScaleMtx(f32);
void func_80059850(Object_4C*);
void func_800598E8(Object_2F4*);
void func_80059A24(Object_2F4*);
@@ -199,7 +199,7 @@ void func_80060D94(s32);
void func_80060F30(Vec3f* , u32 , s32 );
void Object_Kill(Object*, Vec3f*);
s32 func_80060FE4(Vec3f*, f32);
void Object_SetInfo(ObjectInfo* info, u32 objId);
void Object_SetInfo(ObjectInfo*, u32);
void Object_80_Initialize(Object_80*);
void Object_4C_Initialize(Object_4C*);
void Object_2F4_Initialize(Object_2F4*);
@@ -210,7 +210,7 @@ void func_80061B68(void);
void func_80061CD0(void);
void func_80061E48(Object_2F4* , f32 , f32 , f32 );
void func_80061F0C(Object_2F4* , ObjectInit* , s32 );
void Object_Spawn(ObjectInit* , f32 , f32 , f32 , f32 );
void Object_Load(ObjectInit* , f32 , f32 , f32 , f32 );
void func_80062568(void);
void func_80062C38(f32, f32);
s32 func_800631A8(Vec3f*, f32*, Vec3f*);
@@ -327,7 +327,7 @@ void func_8007A28C(Object_8C* );
void func_8007A3C0(Object_8C* );
void func_8007A568(f32 xPos, f32 yPos, f32 zPos, f32 );
void func_8007A5F8(Object_8C* , Vec3f* , u32 );
void func_8007A6F0(Vec3f *, u32);
void func_8007A6F0(Vec3f *, s32);
void func_8007A748(Object_8C*);
s32 func_8007A774(Player*, Object_8C*, f32);
void func_8007A818(Object_8C*, f32 posX, f32 posY, f32 posZ, f32, u8, u8, u16);
@@ -490,7 +490,7 @@ void func_800A5FA0(Vec3f* , u32 , s32 );
void func_800A6070(Vec3f* arg0, u32 arg1);
void func_800A6148(void);
void func_800A69F8(s32 , f32 , f32 , f32 );
void func_800A6CD0(Player *, s32, s32);
void Player_ApplyDamage(Player *, s32, s32);
bool func_800A73E4(f32* , s32* , f32 posX, f32 posY, f32 posZ);
s32 func_800A78C4(Hitbox* hitbox, f32 , f32 , f32 , f32 , f32 , f32 );
void func_800A8BA4(Player* player);
@@ -544,6 +544,23 @@ void func_DF4260_80198310(Object_408 *);
void func_DF4260_801988E0(void);
void func_DF4260_8018ED78(Object_408*);
void func_E9F1D0_80189214(void);
void func_E9F1D0_8018BDD8(void);
void func_E9F1D0_8018C390(Player*);
void func_DF4260_80198C50(void);
void func_DF4260_8019949C(void);
void func_E16C50_8019E8B8(f32, f32, f32, f32);
void func_E9F1D0_801A5AD4(Player*);
void func_E9F1D0_801A5FC0(Player*);
void func_E16C50_801AA8E8(Player*);
void func_E16C50_801AACF8(Player*);
void func_E16C50_801AC274(Player*);
void func_E16C50_801ACE50(Player*);
void func_E6A810_801ACFBC(ObjectInit*);
void func_E6A810_801AD080(void);
void func_E16C50_801AD328(Player*);
void func_E16C50_801BEC80(Player*);
void func_E08400_80187B08(Object_2F4 *);
void func_E08400_80188A40(Object_408 *);
void func_E08400_8018CCF8(Object_2F4 *);