file splits, renames, more functions in play (#53)

* 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
This commit is contained in:
petrie911 2023-12-19 08:54:50 -06:00 committed by GitHub
parent af26374677
commit 8101aa8bc2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
32 changed files with 8763 additions and 6791 deletions

View File

@ -84,6 +84,8 @@ void RdRam_CheckIPL3(void);
void Mio0_Decompress(void* header, u8* dst);
s32 vsprintf(char* dst, const char* fmt, va_list args);
// sf_2EFE0
void func_8002E3E0(Object_2F4*);
void func_8002E548(void);
@ -97,13 +99,13 @@ void func_8002E6B8(Object_2F4*);
void func_8002E6DC(Object_2F4*);
void func_8002E700(Player *);
void func_8002EE64(Object_2F4 *);
void func_8002F180();
void func_8002F180(void);
void func_8002F5F4(void);
void func_800319AC(Object_2F4*);
void func_80035448(Object_2F4*);
//sf_36930
void func_80035E48(Object_70 *);
void Object_70_Initialize(Object_70 *);
void func_800365E4(f32, f32, f32, f32, f32, f32, f32, f32, f32, s32, s32);
void func_8003D9B8();
void func_8003DA0C(void);
@ -137,10 +139,10 @@ void func_8004F8AC(Object_2F4*);
void func_8004FEC0(Object_2F4*);
void func_800515C4(void);
// fox_52730
// fox_display
void func_80053658(WingInfo *);
void func_8005465C(s32);
void func_80057814(Player* arg0);
void func_80057814(Player*);
void func_80057D00(void);
// fox_edata
@ -187,13 +189,13 @@ void func_8005F670(Vec3f*);
s32 func_8005F9DC(Vec3f*);
// fox_enmy
void func_80060714(s32 arg0);
void func_8006089C(u8 arg0);
void func_80060714(s32 );
void func_8006089C(u8 );
void func_80060968(void);
void func_80060F30(Vec3f* arg0, u32 arg1, s32 arg2);
void func_80060F30(Vec3f* , u32 , s32 );
void Object_Kill(Object*, Vec3f*);
s32 func_80060FE4(Vec3f*, f32);
void func_800612B8(ObjectStruct_1C*, u32);
void Object_Set1C(ObjectStruct_1C*, u32);
void Object_80_Initialize(Object_80*);
void Object_4C_Initialize(Object_4C*);
void Object_2F4_Initialize(Object_2F4*);
@ -202,14 +204,14 @@ void Object_6C_Initialize(Object_6C*);
void Object_8C_Initialize(Object_8C*);
void func_80061B68(void);
void func_80061CD0(void);
void func_80061E48(Object_2F4* arg0, f32 arg1, f32 arg2, f32 arg3);
void func_80061F0C(Object_2F4* arg0, ObjectInit* arg1, s32 arg2);
void func_80062180(ObjectInit* arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4);
void func_80061E48(Object_2F4* , f32 , f32 , f32 );
void func_80061F0C(Object_2F4* , ObjectInit* , s32 );
void Object_Spawn(ObjectInit* , f32 , f32 , f32 , f32 );
void func_80062568(void);
void func_80062C38(f32, f32);
s32 func_800631A8(Vec3f*, f32*, Vec3f*);
s32 func_8006326C(Vec3f* arg0, Vec3f* arg1, s32 arg2, Object* arg3);
s32 func_8006351C(s32 arg0, Vec3f* arg1, Vec3f* arg2, s32 arg3);
s32 func_8006326C(Vec3f* , Vec3f* , s32 , Object* );
s32 func_8006351C(s32 , Vec3f* , Vec3f* , s32 );
void func_800652CC(Object_80*);
void func_800654E4(Object *);
void func_800656D4(Object_2F4*);
@ -248,15 +250,15 @@ void func_80069658(Object_408 *);
void func_800696F8(Object_80 *);
void func_80069858(Object_4C *);
void func_80069A10(Object_6C *);
void func_80069AAC(Object_2F4*);
void func_80069CBC(Object_408 *);
void func_80069DF4(Object_80 *);
void func_80069E88(Object_4C *);
void func_80069F30(Object_6C *);
void func_80069FD4(Object_8C *);
void Object_2F4_Update(Object_2F4*);
void Object_408_Update(Object_408 *);
void Object_80_Update(Object_80 *);
void Object_4C_Update(Object_4C *);
void Object_6C_Update(Object_6C *);
void Object_8C_Update(Object_8C *);
void func_8006A06C(UnkEntity30*);
void func_8006A38C(void);
void func_8006A3E8(void);
void Object_UpdateAll(void);
//fox_6B3B0
void func_8006A96C(Object_2F4*);
@ -281,46 +283,46 @@ void func_800771CC(Object_2F4*);
void func_80077218(Object_2F4*);
// sf_77E40
void func_80077240(f32 posX, f32 posY, f32 posZ, s32 arg3);
void func_80077240(f32 posX, f32 posY, f32 posZ, s32 );
void func_8007729C(void);
void func_80077790(void);
Object_8C* func_8007783C(s32 objId);
void func_8007797C(f32 posX, f32 posY, f32 posZ, f32 arg3, f32 arg4, f32 arg5, f32 arg6);
void func_80077A00(Object_8C* arg0);
void func_80077A7C(Object_8C* arg0);
void func_80077B78(void* arg0);
void func_80077B84(Object_8C* arg0);
void func_80078038(Object_8C* arg0);
void func_800780F8(Object_8C* arg0);
void func_800783C0(Object_8C* arg0);
void func_80078438(Object_8C* arg0);
void func_800784B4(Object_8C* arg0);
void func_80078550(Object_8C* arg0);
void func_80078604(Object_8C* arg0);
void func_8007868C(Object_8C* arg0);
void func_8007879C(Object_8C* arg0);
void func_800788B0(Object_8C* arg0);
void func_80078A64(Object_8C* arg0);
void func_80078AEC(Object_8C* arg0);
void func_80078B8C(Object_8C *arg0);
void func_80078BE0(Object_8C* arg0);
void func_80078C84(Object_8C* arg0);
void func_80078CE8(Object_8C* arg0);
void func_80078E50(f32 posX, f32 posY, f32 posZ, f32 arg3);
void func_80078EBC(Object_8C* arg0);
void func_80078F78(Object_8C* arg0);
void func_8007905C(Object_8C* arg0, f32 posX, f32 posY, f32 posZ, f32 arg4, u8 arg5);
void func_800794CC(f32 posX, f32 posY, f32 posZ, f32 arg3);
void func_8007953C(f32 posX, f32 posY, f32 posZ, f32 arg3);
void func_800795AC(f32 posX, f32 posY, f32 posZ, f32 arg3);
void func_80079618(f32 posX, f32 posY, f32 posZ, f32 arg3);
void func_8007968C(Object_8C *arg0);
s32 func_800798C4(s32 arg0, Gfx** arg1, Vec3f* arg2, Vec3f* arg3, void* arg4); //OverrideLimbDraw
void func_800798F0(Object_8C* arg0);
void func_8007A28C(Object_8C* arg0);
void func_8007A3C0(Object_8C* arg0);
void func_8007A568(f32 xPos, f32 yPos, f32 zPos, f32 arg3);
void func_8007A5F8(Object_8C* arg0, Vec3f* arg1, u32 arg2);
void func_8007797C(f32 posX, f32 posY, f32 posZ, f32 , f32 , f32 , f32 );
void func_80077A00(Object_8C* );
void func_80077A7C(Object_8C* );
void func_80077B78(Object_8C* );
void func_80077B84(Object_8C* );
void func_80078038(Object_8C* );
void func_800780F8(Object_8C* );
void func_800783C0(Object_8C* );
void func_80078438(Object_8C* );
void func_800784B4(Object_8C* );
void func_80078550(Object_8C* );
void func_80078604(Object_8C* );
void func_8007868C(Object_8C* );
void func_8007879C(Object_8C* );
void func_800788B0(Object_8C* );
void func_80078A64(Object_8C* );
void func_80078AEC(Object_8C* );
void func_80078B8C(Object_8C *);
void func_80078BE0(Object_8C* );
void func_80078C84(Object_8C* );
void func_80078CE8(Object_8C* );
void func_80078E50(f32 posX, f32 posY, f32 posZ, f32 );
void func_80078EBC(Object_8C* );
void func_80078F78(Object_8C* );
void func_8007905C(Object_8C* , f32 posX, f32 posY, f32 posZ, f32 , u8 );
void func_800794CC(f32 posX, f32 posY, f32 posZ, f32 );
void func_8007953C(f32 posX, f32 posY, f32 posZ, f32 );
void func_800795AC(f32 posX, f32 posY, f32 posZ, f32 );
void func_80079618(f32 posX, f32 posY, f32 posZ, f32 );
void func_8007968C(Object_8C *);
s32 func_800798C4(s32 , Gfx** , Vec3f* , Vec3f* , void* ); //OverrideLimbDraw
void func_800798F0(Object_8C* );
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_8007A748(Object_8C*);
s32 func_8007A774(Player*, Object_8C*, f32);
@ -330,20 +332,20 @@ void func_8007A994(Object_8C*);
void func_8007AA60(Object_8C*);
void func_8007AB50(Object_8C*);
void func_8007ACE0(f32, f32, f32, f32, f32, f32);
void func_8007ADF4(f32 arg0, f32 posY, f32 arg2, f32 arg3, f32 arg4);
void func_8007AFD0(f32 posX, f32 posZ, f32 arg2, f32 arg3, f32 arg4);
void func_8007ADF4(f32 , f32 posY, f32 , f32 , f32 );
void func_8007AFD0(f32 posX, f32 posZ, f32 , f32 , f32 );
void func_8007B040(Object_8C*);
void func_8007B0F4(Object_8C*);
void func_8007B228(f32 posX, f32 posY, f32 posZ, f32 arg3);
void func_8007B344(f32 xPos, f32 yPos, f32 zPos, f32 arg3, s32 arg4);
void func_8007B228(f32 posX, f32 posY, f32 posZ, f32 );
void func_8007B344(f32 xPos, f32 yPos, f32 zPos, f32 , s32 );
void func_8007B3B8(Object_8C*);
void func_8007B550(f32 posX, f32 posY, f32 posZ, f32 arg3, s32 arg4);
void func_8007B550(f32 posX, f32 posY, f32 posZ, f32 , s32 );
void func_8007B5C0(Object_8C*);
void func_8007B62C(Object_8C*);
void func_8007B670(Object_8C*);
void func_8007B67C(Object_8C*);
void func_8007B758(Object_8C*);
void func_8007B8F8(f32 posX, f32 posY, f32 posZ, f32 arg3);
void func_8007B8F8(f32 posX, f32 posY, f32 posZ, f32 );
void func_8007B960(Object_8C*);
void func_8007BC7C(f32, f32, f32, f32);
void func_8007BCE8(Object_8C*);
@ -356,7 +358,7 @@ void func_8007C120(f32, f32, f32, f32, f32, f32, f32, s32);
void func_8007C250(Object_8C*);
void func_8007C484(f32, f32, f32, f32, f32, f32, f32, s32);
void func_8007C50C(Object_8C*);
void func_8007C688(f32 arg0, f32 arg1, f32 arg2, f32 arg3, s32 arg4);
void func_8007C688(f32 , f32 , f32 , f32 , s32 );
void func_8007C8C4(Object_8C*);
void func_8007C9E0(Object_8C*);
void func_8007CAF0(Object_8C*);
@ -383,9 +385,9 @@ void func_8007E3E4(Object_8C*);
void func_8007E45C(Object_8C*);
void func_8007E5CC(Object_8C*);
void func_8007E648(Object_8C*);
void func_8007E93C(Object_8C *arg0, u16 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5);
void func_8007F04C(s32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32); // Object_Spawn?
void func_8007F20C(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4);
void func_8007E93C(Object_8C *, u16 , f32 , f32 , f32 , f32 );
void func_8007F04C(s32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32);
void func_8007F20C(s32 , f32 , f32 , f32 , f32 );
void func_8007F438(Object_8C*);
void func_8007F6B0(Object_8C*);
void func_8007F958(Object_8C*);
@ -403,11 +405,11 @@ void func_80081C5C(Object_8C*);
void func_80082F78(Object_8C*);
void func_800837EC(Object_8C*);
void func_80083B8C(Object_8C*);
void func_80083D2C(f32 arg0, f32 arg1, f32 arg2, f32 arg3);
void func_80083D2C(f32 , f32 , f32 , f32 );
void func_80083FA8(Object_8C*);
void func_80084194(Object_8C*);
// fox_84F70
// fox_fade
void func_80084370(s32);
void func_800843FC(s32);
void func_80084488(s32);
@ -455,7 +457,7 @@ void func_80098860(Plane *plane, Vec3f *point, Vec3f *normal);
s32 func_800988B4(Vec3f *vec, Plane *plane);
s32 func_800998FC(Vec3f*, Vec3f*, Vec3f*, s32, Vec3f*, f32*);
// fox_A24B0
// fox_game
void Game_Initialize(void);
void Game_SetGameState(void);
bool func_800A1B6C(void);
@ -474,29 +476,30 @@ bool func_800A3690(Vec3f*, Vec3f*, s32, Vec3f*);
// fox_A48A0
void func_800A3CA0(void);
// sf_A4B50
// fox_play
s32 Play_CheckMedalStatus(u16);
s32 Play_GetMaxHealth(void);
void func_800A5844(void);
void func_800A5D6C(void);
void func_800A5FA0(Vec3f* arg0, u32 arg1, s32 arg2);
void func_800A5FA0(Vec3f* , u32 , s32 );
void func_800A6148(void);
void func_800A69F8(s32 arg0, f32 arg1, f32 arg2, f32 arg3);
void func_800A69F8(s32 , f32 , f32 , f32 );
void func_800A6CD0(Player *, s32, s32);
s32 func_800A73E4(f32* arg0, s32* arg1, f32 posX, f32 posY, f32 posZ);
s32 func_800A78C4(f32* arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6);
void func_800ACDC0(Player *arg0, Object_70 *arg1, s32 arg2);
void func_800B0F50(Player *arg0);
void func_800B44C4(Player *arg0);
void func_800B5FBC(Player *arg0, s32 arg1, s32 arg2);
bool func_800A73E4(f32* , s32* , f32 posX, f32 posY, f32 posZ);
s32 func_800A78C4(f32* hitbox, f32 , f32 , f32 , f32 , f32 , f32 );
void func_800A8BA4(Player* player);
void func_800AA800(Player *player);
void func_800ACDC0(Player *, Object_70 *, s32 );
void func_800B0F50(Player *);
void func_800B44C4(Player *);
void func_800B5FBC(Player *, s32 , s32 );
void func_800B63BC(Player *, s32);
void func_800B6848(Player *arg0, s32 arg1);
void func_800B6BFC(Player *arg0, s32 arg1);
void func_800B6848(Player *, s32 );
void func_800B6BFC(Player *, s32 );
void func_800B6F50(f32, f32, f32, f32, f32, f32);
void func_800B7184(Player *arg0, s32);
void func_800B7184(Player *, s32);
void func_800B73E0(Player *);
s32 func_800A73E4(f32* arg0, s32* arg1, f32 posX, f32 posY, f32 posZ);
void func_800B852C(s32 arg0, Object_6C *arg1);
void func_800B852C(s32 , Object_6C *);
void func_800B86CC(void);
// fox_radio
@ -537,6 +540,7 @@ void func_E08400_80187B08(Object_2F4 *);
void func_E08400_80188A40(Object_408 *);
void func_E08400_8018CCF8(Object_2F4 *);
void func_E16C50_801A9824(void);
void func_E16C50_801AC8A8(f32, f32, f32, f32, s32);
void func_E16C50_8019E9F4(f32, f32, f32, f32, f32, f32, f32, s32);
void func_E16C50_80187754(Object_408 *);
@ -564,7 +568,14 @@ void func_E16C50_80190430(Object_2F4 *);
void func_E51970_80193CA4(Object_408 *);
void func_E51970_80198594(Object_408 *);
void func_E51970_8019EA68(Object_58**);
void func_E51970_80198930(Object_58**);
void func_E51970_8018BA2C(Object_58**);
void func_E51970_80191ED8(Object_58**);
void func_E6A810_80188F30(void);
void func_E6A810_80199920(void);
void func_E6A810_801B5110(f32, f32, f32);
void func_E6A810_8018769C(Object_2F4 *);
void func_E6A810_80189B80(Object_2F4 *);
void func_E6A810_8018ADC4(Object_2F4 *);
@ -590,6 +601,9 @@ void func_E6A810_801B58AC(Gfx **, f32);
s32 func_E6A810_801B6AEC(f32, f32, f32);
void func_E6A810_801B6E20(f32, f32, f32 *, f32 *, f32 *);
void func_E9F1D0_80196968(Object_58**);
void func_E9F1D0_801878A8(Object_58**);
void func_E9F1D0_801961AC(Object_58**);
void func_E9F1D0_801A4CB0(Object_2F4*);
void func_E9F1D0_801A3BD4(Object_2F4*);
void func_E9F1D0_801888F4(Object_2F4 *);

View File

@ -17,7 +17,7 @@ void func_80085944(void);
void func_80086CC8(void);
void func_80086DCC(void);
void func_80087B5C(void);
void func_80089994(s32 arg0);
void func_80089994(s32);
void func_8008A4DC(void);
void func_8008B044(void);
void func_8008B1B0(void);
@ -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* arg0);
s32 func_800910C0(Object_2F4* arg0);
s32 func_80090E8C(Object_2F4*);
s32 func_800910C0(Object_2F4*);
// Weird addresses, assets maybe?
extern u16 D_1000E80[];
@ -68,7 +68,7 @@ extern s32 gHitCount;
extern s32 D_80177838;
extern s32 D_80177854;
extern s32 D_80177880;
extern s32 D_801778B0[];
extern s32 gTeamHealth[];
extern s32 D_801778BC;
extern s32 D_801778E8;
extern s32 D_80177B48;

View File

@ -14,7 +14,7 @@ typedef struct {
/* 0x00 */ s32 type;
/* 0x04 */ s32 unk_04;
/* 0x08 */ u16 bgColor;
/* 0x0A */ u16 unk_0A;
/* 0x0A */ u16 seqId;
/* 0x0C */ s32 fogR;
/* 0x10 */ s32 fogG;
/* 0x14 */ s32 fogB;

View File

@ -9,6 +9,11 @@ typedef struct {
/* 0x8 */ f32 z;
} Vec3f; // size = 0xC
typedef struct {
Vec3f pos;
Vec3f rot;
} PosRot;
typedef struct {
Vec3f normal;
f32 dist;

View File

@ -45,24 +45,24 @@ typedef struct {
};
/* 0x00 */ u8 drawType;
/* 0x08 */ ObjectFunc action; // argument must have object type.
/* 0x0C */ f32* unk_0C; // some sort of script? hitboxes?
/* 0x0C */ f32* hitbox; // some sort of script? hitboxes?
/* 0x10 */ f32 unk_10; // z coordinate of something
/* 0x14 */ s16 unk_14; // can be -1, 0, 1
/* 0x16 */ s16 unk_16; // can be 0, 1, 2
/* 0x18 */ u8 unk_18; // damage?
/* 0x18 */ u8 damage; // damage?
/* 0x19 */ u8 unk_19; // can be 0, 1, 2
/* 0x1C */ f32 unk_1C; // y offset of something
/* 0x20 */ u8 unk_20; // increment for something
/* 0x20 */ u8 bonus; // increment for something
} ObjectStruct_1C; // size = 0x24
typedef struct {
/* 0x00 */ Object obj;
/* 0x1C */ s32 unk_1C;
/* 0x1C */ s32 index;
/* 0x20 */ Vec3f unk_20;
/* 0x2C */ f32 unk_2C;
/* 0x30 */ f32 unk_30;
/* 0x34 */ f32 unk_34;
/* 0x38 */ Vec3f unk_38;
/* 0x38 */ Vec3f sfxPos;
/* 0x44 */ f32 unk_44;
/* 0x44 */ f32 unk_48;
/* 0x44 */ f32 unk_4C;
@ -80,14 +80,14 @@ typedef struct {
/* 0x00 */ Object obj;
/* 0x1C */ ObjectStruct_1C unk_1C;
/* 0x40 */ char unk40[0x8];
/* 0x48 */ Vec3f unk_48;
/* 0x48 */ Vec3f sfxPos;
/* 0x54 */ f32 unk_54;
} Object_58; // size = 0x58
typedef struct {
/* 0x00 */ Object obj;
/* 0x1C */ ObjectStruct_1C unk_1C;
/* 0x40 */ s32 unk_40;
/* 0x40 */ s32 index;
/* 0x44 */ s32 unk_44;
/* 0x48 */ s32 unk_48;
/* 0x4C */ s32 unk_4C;
@ -97,14 +97,14 @@ typedef struct {
/* 0x58 */ char pad58[8];
/* 0x60 */ f32 unk_60;
/* 0x64 */ Vec3f unk_64;
/* 0x70 */ Vec3f unk_70;
/* 0x70 */ Vec3f sfxPos;
/* 0x7C */ char pad7C[4];
} Object_80; // size = 0x80
typedef struct {
/* 0x00 */ Object obj;
/* 0x1C */ ObjectStruct_1C unk_1C;
/* 0x40 */ s32 unk_40;
/* 0x40 */ s32 index;
/* 0x44 */ char pad44[1];
/* 0x45 */ u8 unk_45; // could be short loaded as u8
/* 0x46 */ s8 unk_46;
@ -114,7 +114,7 @@ typedef struct {
typedef struct {
/* 0x00 */ Object obj;
/* 0x1C */ ObjectStruct_1C unk_1C;
/* 0x40 */ s32 unk_40;
/* 0x40 */ s32 index;
/* 0x44 */ s16 unk_44;
/* 0x46 */ u8 unk_46;
/* 0x48 */ u16 unk_48;
@ -124,14 +124,14 @@ typedef struct {
/* 0x50 */ f32 unk_50;
/* 0x54 */ f32 unk_54;
/* 0x58 */ f32 unk_58;
/* 0x5C */ Vec3f unk_5C;
/* 0x5C */ Vec3f sfxPos;
/* 0x68 */ f32 unk_68;
} Object_6C; // size 0x6C
typedef struct {
/* 0x00 */ Object obj;
/* 0x1C */ ObjectStruct_1C unk_1C;
/* 0x40 */ s32 unk_40;
/* 0x40 */ s32 index;
/* 0x44 */ s16 unk_44;
/* 0x46 */ s16 unk_46;
/* 0x48 */ s16 unk_48;
@ -148,7 +148,7 @@ typedef struct {
/* 0x78 */ s16 unk_78;
/* 0x7A */ s16 unk_7A;
/* 0x7C */ char pad7C[4];
/* 0x80 */ Vec3f unk_80;
/* 0x80 */ Vec3f sfxPos;
} Object_8C; // size 0x8C
typedef struct {
@ -171,9 +171,7 @@ typedef struct {
/* 0x064 */ s16 unk_064;
/* 0x066 */ s16 unk_066;
/* 0x068 */ f32 unk_068;
/* 0x06C */ f32 unk_06C;
/* 0x070 */ f32 unk_070;
/* 0x074 */ f32 unk_074;
/* 0x06C */ Vec3f unk_06C;
/* 0x078 */ char pad78[0xC];
/* 0x084 */ f32 unk_084;
/* 0x088 */ s16 unk_088;
@ -214,7 +212,7 @@ typedef struct {
/* 0x308 */ Vec3f unk_308;
/* 0x314 */ char pad314[0xE4];
/* 0x3F8 */ f32 unk_3F8;
/* 0x3FC */ Vec3f unk_3FC;
/* 0x3FC */ Vec3f sfxPos;
} Object_408; // size = 0x408
typedef struct {
@ -272,7 +270,7 @@ typedef struct {
/* 0x0E6 */ s16 unk_0E6;
/* 0x0E8 */ Vec3f unk_0E8;
/* 0x0F4 */ Vec3f unk_0F4;
/* 0x100 */ Vec3f unk_100;
/* 0x100 */ Vec3f sfxPos;
/* 0x10C */ f32 unk_10C;
/* 0x110 */ f32 unk_110;
/* 0x114 */ f32 unk_114;
@ -633,10 +631,10 @@ typedef enum{
/* 320 */ OBJECT_320,
/* 321 */ OBJECT_321,
/* 322 */ OBJECT_6C_LASERS, // start of 6C
/* 323 */ OBJECT_323,
/* 323 */ OBJECT_6C_CHECKPOINT,
/* 324 */ OBJECT_6C_SILVER_RING,
/* 325 */ OBJECT_325,
/* 326 */ OBJECT_326,
/* 325 */ OBJECT_6C_STAR_RING,
/* 326 */ OBJECT_6C_METEO_WARP,
/* 327 */ OBJECT_6C_BOMB,
/* 328 */ OBJECT_328,
/* 329 */ OBJECT_329,
@ -644,11 +642,11 @@ typedef enum{
/* 331 */ OBJECT_331,
/* 332 */ OBJECT_332,
/* 333 */ OBJECT_333,
/* 334 */ OBJECT_334,
/* 334 */ OBJECT_6C_CORN_ARCH,
/* 335 */ OBJECT_6C_1UP,
/* 336 */ OBJECT_6C_GOLD_RING,
/* 337 */ OBJECT_6C_WING_REPAIR,
/* 338 */ OBJECT_338,
/* 338 */ OBJECT_6C_TRAINING_RING,
/* 339 */ OBJECT_339, // start of 8C
/* 340 */ OBJECT_340,
/* 341 */ OBJECT_341,

View File

@ -6,6 +6,17 @@
#define UNK_TYPE s32
typedef struct {
f32 offset;
f32 size;
} HitboxDim;
typedef struct {
HitboxDim z;
HitboxDim y;
HitboxDim x;
} Hitbox;
typedef struct {
s16 vtx[3];
s16 unk_06;
@ -81,7 +92,7 @@ typedef struct {
/* 0x0 */ u16 unk_0;
/* 0x2 */ s8 unk_2;
/* 0x3 */ s8 unk_3;
} UnkStruct_D_8017797C; // size = 0x4
} UnkStruct_gChngInputPtr; // size = 0x4
typedef struct {
/* 0x00 */ u8 unk_00;
@ -288,28 +299,28 @@ typedef struct Player {
Vec3f unk_460_arr[1]; // probably fake
};
/* 0x460 */ Vec3f unk_46C;
/* 0x494 */ u8 unk_478;
/* 0x478 */ u8 unk_478;
/* 0x479 */ s8 unk_479;
/* 0x47C */ Vec3f *unk_47C;
/* 0x480 */ Vec3f *unk_480;
/* 0x484 */ s8 unk_484;
/* 0x485 */ s8 unk_485;
/* 0x488 */ f32 unk_488;
/* 0x48C */ s8 unk_48C;
/* 0x48C */ u8 unk_48C;
/* 0x490 */ f32 unk_490;
/* 0x494 */ s32 unk_494;
/* 0x494 */ u8 unk_494;
/* 0x498 */ s32 unk_498;
/* 0x49C */ WingInfo wings;
/* 0x4D8 */ f32 unk_4D8;
/* 0x4DC */ f32 unk_4DC;
} Player; // size = 0x4E0 Might be Player
/* 0x4DC */ s32 unk_4DC;
} Player; // size = 0x4E0
typedef struct {
/* 0x00 */ u8 unk_00;
/* 0x00 */ u8 hits;
/* 0x04 */ Vec3f pos;
/* 0x10 */ f32 unk_10;
/* 0x14 */ char pad14[0x4];
/* 0x18 */ u16 unk_18;
/* 0x18 */ u16 timer;
} UnkEntity1C; // size = 0x1C
#endif

View File

@ -228,7 +228,7 @@ extern CollisionHeader D_800D2B38[];
extern CollisionHeader2 D_800D2CA0[];
extern u8 D_800D2F68;
extern u8 D_800D3180[30];
extern s32 D_800D31A0[4]; // could belong to fox_rcp or sf_A4B50
extern s32 D_800D31A0[4]; // could belong to fox_rcp or fox_play
extern s32 sCurrentMsgPri;
extern Save gDefaultSave;
@ -267,7 +267,7 @@ extern f32 D_80161394;
// fox_43AC0
extern s32 D_801613A0;
// fox_52730
// fox_display
extern Vec3f D_801613B0[];
extern Vec3f D_801613E0[];
extern s16 D_80161410;
@ -322,7 +322,7 @@ extern s32 D_80161810[];
extern s32 D_80161900[];
extern s32 D_80161910[0x10]; // could be in fox_97F80
// fox_A24B0
// fox_game
extern f32 D_80161A10;
extern f32 D_80161A14;
extern s32 D_80161A18[4];
@ -339,7 +339,7 @@ extern f32 D_80161A3C;
extern f32 D_80161A40;
extern f32 D_80161A44;
// sf_A4B50
// fox_play
extern u8 D_80161A50;
extern f32 D_80161A54;
//
@ -360,7 +360,7 @@ extern s32 D_80161A8C;
extern u8 gGoldRingCount[4];
extern u8 D_80161A94;
extern s32 gHitCount;
extern s32 D_80161A9C;
extern s32 gSavedHitCount;
extern s16 gLifeCount[4];
extern s32 gLaserStrength[4];
//
@ -413,17 +413,17 @@ extern s32 D_801778A0;
extern s32 D_801778A4;
extern s32 gCamCount;
extern s32 D_801778AC;
extern s32 D_801778B0[6];
extern s32 gTeamHealth[6];
extern s32 D_801778C8;
//
extern s32 D_801778D0[6];
extern s32 gSavedTeamHealth[6];
extern s32 D_801778E8;
//
extern UNK_TYPE D_801778F0[6];
extern u16 D_80177908[4];
extern s32 D_80177910[6];
extern u16 D_80177928[4];
extern s8 D_80177930;
extern u8 D_80177930;
//
extern u16 D_80177938[4];
extern f32 D_80177940;
@ -435,9 +435,9 @@ extern f32 D_80177958[4];
extern f32 D_80177968;
extern s32 D_8017796C;
extern f32 D_80177970;
extern OSContPad *D_80177974;
extern OSContPad *gCurInputPtr;
extern f32 D_80177978;
extern OSContPad* D_8017797C;
extern OSContPad* gChngInputPtr;
extern f32 D_80177980;
extern u8 *D_80177984;
extern f32 D_80177988;
@ -483,7 +483,7 @@ extern s32 D_80177B00[4][4];
extern s32 D_80177B40;
extern u8 D_80177B44;
extern s32 D_80177B48;
extern s8 D_80177B4C;
extern u8 D_80177B4C;
extern s32 D_80177B50[7];
extern u8 D_80177B6C;
extern s32 D_80177B70[7];
@ -589,7 +589,7 @@ extern s32 D_801782B4;
extern s32 D_801782B8;
extern s32 D_801782BC;
extern s32 D_801782C0;
extern f32 *D_801782C4;
extern PosRot *D_801782C4;
extern s32 D_801782C8;
extern f32 *D_801782CC;
extern s32 D_801782D0;

View File

@ -1,6 +1,3 @@
// fox_enmy
Object_Kill = 0x80060FBC;
//fox_std_lib
Graphics_ClearPrintBuffer = 0x80099980;
Graphics_Printf = 0x800999D8;
@ -49,6 +46,9 @@ Graphics_GetSmallTextWidth = 0x800A13EC;
func_800A1540 = 0x800A1540;
func_800A1558 = 0x800A1558;
// sf_36930
Object_70_Initialize = 0x80035E48;
// fox_rcp
RCP_SetupDL = 0x800B8DD0;
RCP_SetFog = 0x800B8E14;
@ -143,15 +143,171 @@ Message_IsPrintingChar = 0x800C2F30;
gDefaultSave = 0x800D4D10;
gSaveFile = 0x80178870; //size:0x200
// fox_edisplay
func_800596C0 = 0x800596C0;
func_800597C0 = 0x800597C0;
func_8005980C = 0x8005980C;
func_80059850 = 0x80059850;
func_800598DC = 0x800598DC;
func_800598E8 = 0x800598E8;
func_800599A4 = 0x800599A4;
func_80059A24 = 0x80059A24;
func_80059AEC = 0x80059AEC;
func_80059B20 = 0x80059B20;
func_80059BB0 = 0x80059BB0;
func_80059BBC = 0x80059BBC;
func_80059BF0 = 0x80059BF0;
func_80059C28 = 0x80059C28;
func_80059C34 = 0x80059C34;
func_80059C40 = 0x80059C40;
func_80059F68 = 0x80059F68;
func_80059FDC = 0x80059FDC;
func_8005A010 = 0x8005A010;
func_8005A07C = 0x8005A07C;
func_8005A088 = 0x8005A088;
func_8005A094 = 0x8005A094;
func_8005ADAC = 0x8005ADAC;
func_8005B1E8 = 0x8005B1E8;
func_8005B388 = 0x8005B388;
func_8005B6A4 = 0x8005B6A4;
func_8005B71C = 0x8005B71C;
func_8005B7CC = 0x8005B7CC;
func_8005B848 = 0x8005B848;
func_8005B9A4 = 0x8005B9A4;
func_8005BA30 = 0x8005BA30;
func_8005BAAC = 0x8005BAAC;
func_8005BAB4 = 0x8005BAB4;
func_8005C5F0 = 0x8005C5F0;
func_8005C900 = 0x8005C900;
func_8005C9C0 = 0x8005C9C0;
func_8005CA80 = 0x8005CA80;
func_8005CB44 = 0x8005CB44;
func_8005CC9C = 0x8005CC9C;
func_8005CDA8 = 0x8005CDA8;
func_8005D008 = 0x8005D008;
func_8005D1F0 = 0x8005D1F0;
func_8005D3CC = 0x8005D3CC;
Object_80_Draw = 0x8005D654;
Object_4C_Draw = 0x8005D8B8;
Object_2F4_Draw2 = 0x8005D954;
Object_2F4_Draw1 = 0x8005DBC0;
Object_408_Draw = 0x8005E1B8;
Object_8C_Draw1 = 0x8005E454;
Object_8C_Draw2 = 0x8005E538;
Object_6C_Draw = 0x8005E7B8;
func_8005EA24 = 0x8005EA24;
func_8005ECD8 = 0x8005ECD8;
func_8005F030 = 0x8005F030;
func_8005F0E8 = 0x8005F0E8;
func_8005F1EC = 0x8005F1EC;
func_8005F290 = 0x8005F290;
Object_58_Draw = 0x8005F2F4;
func_8005F670 = 0x8005F670;
func_8005F9DC = 0x8005F9DC;
Object_DrawAll = 0x8005FB70;
func_8006046C = 0x8006046C;
func_80060714 = 0x80060714;
func_8006089C = 0x8006089C;
func_80060968 = 0x80060968;
func_80060D94 = 0x80060D94;
// fox_enmy
func_80060F30 = 0x80060F30;
Object_Kill = 0x80060FBC;
func_80060FE4 = 0x80060FE4;
func_80061148 = 0x80061148;
Object_Set1C = 0x800612B8;
Object_80_Initialize = 0x80061364;
Object_4C_Initialize = 0x80061394;
Object_2F4_Initialize = 0x800613C4;
Object_408_Initialize = 0x80061404;
Object_6C_Initialize = 0x80061444;
Object_8C_Initialize = 0x80061474;
Object_80_Spawn = 0x800614B4;
Object_4C_Spawn = 0x800615A0;
Object_2F4_Spawn = 0x8006168C;
Object_408_Spawn = 0x80061778;
Object_6C_Spawn = 0x80061864;
func_80061958 = 0x80061958;
func_80061A4C = 0x80061A4C;
func_80061B68 = 0x80061B68;
func_80061CD0 = 0x80061CD0;
func_80061E48 = 0x80061E48;
func_80061F0C = 0x80061F0C;
Object_Spawn = 0x80062180;
func_80062568 = 0x80062568;
func_80062664 = 0x80062664;
func_80062B60 = 0x80062B60;
func_80062C38 = 0x80062C38;
func_80062D04 = 0x80062D04;
func_80062DBC = 0x80062DBC;
func_800631A8 = 0x800631A8;
func_8006326C = 0x8006326C;
func_8006351C = 0x8006351C;
func_80063CAC = 0x80063CAC;
func_80063D58 = 0x80063D58;
func_80063E5C = 0x80063E5C;
func_80063F4C = 0x80063F4C;
func_80063F58 = 0x80063F58;
func_80063F74 = 0x80063F74;
Object_Init = 0x80063F90;
func_800652CC = 0x800652CC;
func_80065380 = 0x80065380;
func_8006546C = 0x8006546C;
func_800654E4 = 0x800654E4;
func_800655C8 = 0x800655C8;
func_8006566C = 0x8006566C;
func_800656D4 = 0x800656D4;
func_800660F0 = 0x800660F0;
func_80066254 = 0x80066254;
func_8006654C = 0x8006654C;
func_8006684C = 0x8006684C;
func_800669A0 = 0x800669A0;
func_80066A80 = 0x80066A80;
func_80066A8C = 0x80066A8C;
func_80066C00 = 0x80066C00;
func_80066D5C = 0x80066D5C;
func_80066E80 = 0x80066E80;
func_80066E8C = 0x80066E8C;
func_80066EA8 = 0x80066EA8;
func_80066EE4 = 0x80066EE4;
func_80066EF0 = 0x80066EF0;
func_800671D0 = 0x800671D0;
func_80067348 = 0x80067348;
func_800674B4 = 0x800674B4;
func_8006753C = 0x8006753C;
func_80067874 = 0x80067874;
func_80067A40 = 0x80067A40;
func_80067B1C = 0x80067B1C;
func_80067BEC = 0x80067BEC;
func_80067F6C = 0x80067F6C;
func_80068020 = 0x80068020;
func_800685D8 = 0x800685D8;
func_800685F8 = 0x800685F8;
func_80068618 = 0x80068618;
func_80068688 = 0x80068688;
func_80068914 = 0x80068914;
func_80068C48 = 0x80068C48;
func_80068C88 = 0x80068C88;
func_80068FE0 = 0x80068FE0;
func_800690D0 = 0x800690D0;
func_800693E8 = 0x800693E8;
func_80069658 = 0x80069658;
func_800696F8 = 0x800696F8;
func_80069858 = 0x80069858;
func_80069924 = 0x80069924;
func_80069A10 = 0x80069A10;
Object_2F4_Update = 0x80069AAC;
Object_408_Update = 0x80069CBC;
Object_80_Update = 0x80069DF4;
Object_4C_Update = 0x80069E88;
Object_6C_Update = 0x80069F30;
Object_8C_Update = 0x80069FD4;
func_8006A06C = 0x8006A06C;
func_8006A38C = 0x8006A38C;
Object_UpdateAll = 0x8006A3E8;
// fox_A24B0
// fox_game
D_80161A10 = 0x80161A10;
D_80161A14 = 0x80161A14;
D_80161A18 = 0x80161A18; //size:0x10
@ -191,7 +347,7 @@ func_800A3608 = 0x800A3608;
gMedalFlashTimer = 0x801617B8;
gMedalStatus = 0x801617B4;
// sf_A4B50
// fox_play
D_80161A50 = 0x80161A50;
D_80161A54 = 0x80161A54;
D_80161A5C = 0x80161A5C;
@ -209,7 +365,7 @@ D_80161A88 = 0x80161A88;
D_80161A8C = 0x80161A8C;
gGoldRingCount = 0x80161A90;
gHitCount = 0x80161A98;
D_80161A9C = 0x80161A9C;
gSavedHitCount = 0x80161A9C;
gLifeCount = 0x80161AA0;
gLaserStrength = 0x80161AA8;//size:0x10
D_80161AB8 = 0x80161AB8;
@ -256,9 +412,9 @@ D_801778A4 = 0x801778A4;
gCamCount = 0x801778A8;
D_801778AB = 0x801778AB;
D_801778AC = 0x801778AC;
D_801778B0 = 0x801778B0;
gTeamHealth = 0x801778B0; //size:0x18
D_801778C8 = 0x801778C8;
D_801778D0 = 0x801778D0;
gSavedTeamHealth = 0x801778D0; //size:0x18
D_801778E8 = 0x801778E8;
D_80177908 = 0x80177908;
D_80177910 = 0x80177910;
@ -269,8 +425,9 @@ D_80177940 = 0x80177940;
D_80177948 = 0x80177948;
D_80177950 = 0x80177950;
D_80177958 = 0x80177958;
gCurInputPtr = 0x80177974;
D_80177978 = 0x80177978;
D_8017797C = 0x8017797C;
gChngInputPtr = 0x8017797C;
D_80177980 = 0x80177980;
D_80177988 = 0x80177988;
D_80177990 = 0x80177990;

View File

@ -137,4 +137,3 @@ gAudioDataBuffer = 0x802D7800; //size:0xB0000
gTextureRenderBuffer = 0x80387800; //size:0x7880
gFillBuffer = 0x8038F080; //size:0x780
gFrameBuffers = 0x8038F800; //size:0x70800

View File

@ -9,7 +9,7 @@ s32 D_800C9E90[28] = {
const f32 D_800D55D0[] = { 6000.0f, 18000.0f, -6000.0f, -18000.0f };
void func_80042EC0(Object_408* arg0) {
void func_80042EC0(Object_408* obj408) {
s32 var_a3;
f32 var_fv0;
@ -26,56 +26,56 @@ void func_80042EC0(Object_408* arg0) {
}
if (var_a3 != 0) {
var_fv0 = 0.0f;
if (arg0->obj.id == OBJECT_292) {
if (obj408->obj.id == OBJECT_292) {
var_fv0 = 300.0f;
} else if (arg0->obj.id == OBJECT_306) {
} else if (obj408->obj.id == OBJECT_306) {
var_fv0 = 200.0f;
}
func_80077240(arg0->obj.pos.x, arg0->obj.pos.y + var_fv0, arg0->obj.pos.z, var_a3);
func_80077240(obj408->obj.pos.x, obj408->obj.pos.y + var_fv0, obj408->obj.pos.z, var_a3);
}
gHitCount += var_a3 + 1;
D_80177850 = 0xF;
}
void func_80042FAC(Object_408* arg0) {
void func_80042FAC(Object_408* obj408) {
}
void func_80042FB8(Object_408* arg0) {
void func_80042FB8(Object_408* obj408) {
}
void func_80042FC4(Object_408* arg0) {
void func_80042FC4(Object_408* obj408) {
}
void func_80042FD0(Object_408* arg0) {
void func_80042FD0(Object_408* obj408) {
}
void func_80042FDC(Object_408* arg0) {
void func_80042FDC(Object_408* obj408) {
}
void func_80042FE8(Object_408* arg0) {
void func_80042FE8(Object_408* obj408) {
}
void func_80042FF4(Object_2F4* arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, f32 arg7, f32 arg8,
void func_80042FF4(Object_2F4* obj2F4, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, f32 arg7, f32 arg8,
f32 arg9, f32 argA, s32 argB, s32 argC) {
Object_2F4_Initialize(arg0);
arg0->obj.status = 1;
arg0->obj.id = OBJECT_189;
arg0->unk_0B8 = argB;
arg0->obj.pos.x = arg1;
arg0->obj.pos.y = arg2;
arg0->obj.pos.z = arg3;
arg0->obj.rot.x = arg4;
arg0->obj.rot.y = arg5;
arg0->obj.rot.z = arg6;
arg0->unk_0E8.x = arg7;
arg0->unk_0E8.y = arg8;
arg0->unk_0E8.z = arg9;
arg0->unk_110 = argA;
arg0->unk_0BC = argC;
arg0->unk_0BE = 20;
func_800612B8(&arg0->unk_01C, arg0->obj.id);
Object_2F4_Initialize(obj2F4);
obj2F4->obj.status = 1;
obj2F4->obj.id = OBJECT_189;
obj2F4->unk_0B8 = argB;
obj2F4->obj.pos.x = arg1;
obj2F4->obj.pos.y = arg2;
obj2F4->obj.pos.z = arg3;
obj2F4->obj.rot.x = arg4;
obj2F4->obj.rot.y = arg5;
obj2F4->obj.rot.z = arg6;
obj2F4->unk_0E8.x = arg7;
obj2F4->unk_0E8.y = arg8;
obj2F4->unk_0E8.z = arg9;
obj2F4->unk_110 = argA;
obj2F4->unk_0BC = argC;
obj2F4->unk_0BE = 20;
Object_Set1C(&obj2F4->unk_01C, obj2F4->obj.id);
if (gLevelType == 0) {
arg0->unk_10C = 0.5f;
obj2F4->unk_10C = 0.5f;
}
}
@ -91,11 +91,11 @@ void func_800430DC(f32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f
}
}
void func_80043188(Object_2F4* arg0) {
arg0->unk_01C.unk_10 = 30000.0f;
void func_80043188(Object_2F4* obj2F4) {
obj2F4->unk_01C.unk_10 = 30000.0f;
}
void func_8004319C(Player* arg0, f32 arg1, f32 arg2, f32 arg3) {
void func_8004319C(Player* player, f32 arg1, f32 arg2, f32 arg3) {
func_800182F4(0x105000FF);
func_800182F4(0x115000FF);
@ -104,14 +104,14 @@ void func_8004319C(Player* arg0, f32 arg1, f32 arg2, f32 arg3) {
D_80178440 = arg1;
D_80178444 = arg2;
arg0->unk_1C8 = 7;
arg0->unk_1D0 = 10;
arg0->unk_1F8 = 50;
arg0->unk_1FC = 50;
arg0->unk_000 = 0.0f;
arg0->unk_004 = 1.0f;
if (arg0->unk_074 < arg0->unk_0AC) {
arg0->unk_004 = -1.0f;
player->unk_1C8 = 7;
player->unk_1D0 = 10;
player->unk_1F8 = 50;
player->unk_1FC = 50;
player->unk_000 = 0.0f;
player->unk_004 = 1.0f;
if (player->unk_074 < player->unk_0AC) {
player->unk_004 = -1.0f;
}
gPlayer[0].unk_0C0.x = 0.0f;
}

File diff suppressed because it is too large Load Diff

View File

@ -328,6 +328,7 @@ s32 func_800985CC(Vec3f* vec, Vtx_tn* tri) {
return 1;
}
// Plane from normal and point
void func_80098860(Plane* plane, Vec3f* point, Vec3f* normal) {
plane->normal.x = normal->x;
plane->normal.y = normal->y;
@ -335,14 +336,17 @@ void func_80098860(Plane* plane, Vec3f* point, Vec3f* normal) {
plane->dist = -normal->x * point->x - normal->y * point->y - normal->z * point->z;
}
// y dist to plane
s32 func_800988B4(Vec3f* vec, Plane* plane) {
return (-plane->normal.x * vec->x - plane->normal.z * vec->z - plane->dist) / plane->normal.y;
}
// z dist to plane
s32 func_800988F8(Vec3f* vec, Plane* plane) {
return (-plane->normal.x * vec->x - plane->normal.y * vec->y - plane->dist) / plane->normal.z;
}
// x dist to plane
s32 func_8009893C(Vec3f* vec, Plane* plane) {
return (-plane->normal.y * vec->y - plane->normal.z * vec->z - plane->dist) / plane->normal.x;
}

View File

@ -79,41 +79,42 @@ bool func_800A36FC(Vec3f* arg0, Vec3f* arg1, CollisionHeader2* arg2, Vec3f* arg3
return sp38;
}
// Checks if arg0 is above the triangle arg1. If so, returns the triangle normal in arg2.
s32 func_800A3A74(Vec3f* arg0, Vec3f** arg1, Vec3f* arg2) {
s32 pad;
f32 temp1;
s32 var_v1;
f32 temp_fv0;
Vec3f sp44;
Vec3f sp38;
Vec3f sp2C;
f32 sp28;
f32 sp24;
Vec3f v1;
Vec3f v2;
Vec3f v3;
f32 a0x;
f32 a0y;
var_v1 = 0;
sp44.x = (*arg1)->x;
sp44.y = (*arg1)->y;
sp44.z = (*arg1)->z;
var_v1 = false;
v1.x = (*arg1)->x;
v1.y = (*arg1)->y;
v1.z = (*arg1)->z;
arg1++;
sp38.x = (*arg1)->x;
sp38.y = (*arg1)->y;
sp38.z = (*arg1)->z;
v2.x = (*arg1)->x;
v2.y = (*arg1)->y;
v2.z = (*arg1)->z;
arg1++;
sp2C.x = (*arg1)->x;
sp2C.y = (*arg1)->y;
sp2C.z = (*arg1)->z;
v3.x = (*arg1)->x;
v3.y = (*arg1)->y;
v3.z = (*arg1)->z;
arg1++;
sp28 = arg0->x;
sp24 = arg0->z;
temp1 = ((sp38.z - sp44.z) * (sp28 - sp38.x)) - ((sp38.x - sp44.x) * (sp24 - sp38.z));
a0x = arg0->x;
a0y = arg0->z;
temp1 = ((v2.z - v1.z) * (a0x - v2.x)) - ((v2.x - v1.x) * (a0y - v2.z));
if (temp1 >= 0.0f) {
if (((sp2C.x - sp38.x) * (sp24 - sp2C.z)) <= ((sp2C.z - sp38.z) * (sp28 - sp2C.x))) {
if (((sp44.x - sp2C.x) * (sp24 - sp44.z)) <= ((sp44.z - sp2C.z) * (sp28 - sp44.x))) {
var_v1 = 1;
arg2->x = ((sp38.y - sp44.y) * (sp2C.z - sp38.z)) - ((sp38.z - sp44.z) * (sp2C.y - sp38.y));
arg2->y = ((sp38.z - sp44.z) * (sp2C.x - sp38.x)) - ((sp38.x - sp44.x) * (sp2C.z - sp38.z));
arg2->z = ((sp38.x - sp44.x) * (sp2C.y - sp38.y)) - ((sp38.y - sp44.y) * (sp2C.x - sp38.x));
if (((v3.x - v2.x) * (a0y - v3.z)) <= ((v3.z - v2.z) * (a0x - v3.x))) {
if (((v1.x - v3.x) * (a0y - v1.z)) <= ((v1.z - v3.z) * (a0x - v1.x))) {
var_v1 = true;
arg2->x = ((v2.y - v1.y) * (v3.z - v2.z)) - ((v2.z - v1.z) * (v3.y - v2.y));
arg2->y = ((v2.z - v1.z) * (v3.x - v2.x)) - ((v2.x - v1.x) * (v3.z - v2.z));
arg2->z = ((v2.x - v1.x) * (v3.y - v2.y)) - ((v2.y - v1.y) * (v3.x - v2.x));
if ((arg2->x != 0.0f) || (arg2->y != 0.0f) || (arg2->z != 0.0f)) {
temp_fv0 = sqrtf(SQ(arg2->x) + SQ(arg2->y) + SQ(arg2->z));
if (temp_fv0 != 0) {

File diff suppressed because it is too large Load Diff

View File

@ -4,7 +4,7 @@
f32* D_800CF964[] = { NULL };
void func_800594F0(Object_80* arg0) {
void func_800594F0(Object_80* obj80) {
RCP_SetupDL_57(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
Matrix_RotateY(gGfxMatrix, M_PI, 1);
Matrix_SetGfxMtx(&gMasterDisp);
@ -12,7 +12,7 @@ void func_800594F0(Object_80* arg0) {
RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
}
void func_800595D0(Object_80* arg0) {
void func_800595D0(Object_80* obj80) {
RCP_SetupDL_57(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
Matrix_RotateY(gGfxMatrix, M_PI, 1);
Matrix_SetGfxMtx(&gMasterDisp);
@ -20,5 +20,5 @@ void func_800595D0(Object_80* arg0) {
RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
}
void func_800596B0(Object_2F4* arg0) {
void func_800596B0(Object_2F4* obj2F4) {
}

View File

@ -659,10 +659,10 @@ ObjectStruct_1C D_800CC124[0x190] = {
/* OBJECT_408_320 */ {(void*) func_801928C8, 2, (ObjectFunc) func_8018DBF0, D_C038DC0, 10000.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJECT_408_321 */ {(void*) func_8018B8C0, 1, (ObjectFunc) func_80189B70, D_C038F24, 10000.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJECT_6C_LASERS */ {(void*) func_8005CC9C, 1, (ObjectFunc) func_80067F6C, D_800CBFA8, 700.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJECT_6C_323 */ {(void*) func_8005C5F0, 1, (ObjectFunc) func_80068914, D_800CBF38, 700.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJECT_6C_CHECKPOINT */ {(void*) func_8005C5F0, 1, (ObjectFunc) func_80068914, D_800CBF38, 700.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJECT_6C_SILVER_RING */ {(void*) func_8005C900, 1, (ObjectFunc) func_80068020, D_800CBF54, 700.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJECT_6C_325 */ {(void*) func_8005C9C0, 1, (ObjectFunc) func_800685D8, D_800CBF54, 700.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJECT_6C_326 */ {(void*) func_8005CDA8, 1, (ObjectFunc) func_80068688, D_800CBF70, 700.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJECT_6C_STAR_RING */ {(void*) func_8005C9C0, 1, (ObjectFunc) func_800685D8, D_800CBF54, 700.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJECT_6C_METEO_WARP */ {(void*) func_8005CDA8, 1, (ObjectFunc) func_80068688, D_800CBF70, 700.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJECT_6C_BOMB */ {(void*) func_8005CB44, 1, (ObjectFunc) func_80067BEC, D_800CBFC8, 700.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJECT_6C_328 */ {(void*) NULL, 1, (ObjectFunc) func_80068C88, D_800CBF8C, 1500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJECT_6C_329 */ {(void*) NULL, 1, (ObjectFunc) func_80068C88, D_800CBF8C, 1500.0f, 0, 0, 0, 0, 0.0f, 0 },
@ -670,11 +670,11 @@ ObjectStruct_1C D_800CC124[0x190] = {
/* OBJECT_6C_331 */ {(void*) NULL, 1, (ObjectFunc) func_80068C88, D_800CBF8C, 1500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJECT_6C_332 */ {(void*) NULL, 1, (ObjectFunc) func_80068C88, D_800CBF8C, 1500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJECT_6C_333 */ {(void*) NULL, 1, (ObjectFunc) func_80068C88, D_800CBF8C, 1500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJECT_6C_334 */ {(void*) NULL, 1, (ObjectFunc) func_80068C48, D_800CBF18, 700.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJECT_6C_CORN_ARCH */ {(void*) NULL, 1, (ObjectFunc) func_80068C48, D_800CBF18, 700.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJECT_6C_1UP */ {(void*) D_1022120, 0, (ObjectFunc) func_80067B1C, D_800CBE8C, 700.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJECT_6C_GOLD_RING */ {(void*) func_8005CA80, 1, (ObjectFunc) func_800685F8, D_800CBF54, 700.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJECT_6C_WING_REPAIR */ {(void*) D_3007650, 0, (ObjectFunc) func_80068618, D_800CBFA8, 700.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJECT_6C_338 */ {(void*) D_6006140, 0, (ObjectFunc) func_80198968, D_6009CFC, 700.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJECT_6C_TRAINING_RING */ {(void*) D_6006140, 0, (ObjectFunc) func_80198968, D_6009CFC, 700.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJECT_8C_339 */ {(void*) func_8007D55C, 1, (ObjectFunc) func_8007D2F4, NULL, -200.0f, 1, 2, 0, 0, 0.0f, 0 },
/* OBJECT_8C_340 */ {(void*) func_8007D55C, 1, (ObjectFunc) func_8007D748, NULL, -200.0f, 1, 2, 0, 0, 0.0f, 0 },
/* OBJECT_8C_341 */ {(void*) func_8007D55C, 1, (ObjectFunc) func_8007D8A8, NULL, -200.0f, 1, 2, 0, 0, 0.0f, 0 },

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

48
src/main/fox_fade.c Normal file
View File

@ -0,0 +1,48 @@
#include "global.h"
void func_80084370(s32 arg0) {
Graphics_FillRectangle(&gMasterDisp, 0, 0, arg0, SCREEN_HEIGHT, 0, 0, 0, 255);
Graphics_FillRectangle(&gMasterDisp, SCREEN_WIDTH - arg0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0, 0, 255);
}
void func_800843FC(s32 arg0) {
Graphics_FillRectangle(&gMasterDisp, 0, 0, SCREEN_WIDTH, arg0, 0, 0, 0, 255);
Graphics_FillRectangle(&gMasterDisp, 0, SCREEN_HEIGHT - arg0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0, 0, 255);
}
void func_80084488(s32 arg0) {
s32 var_s1;
RCP_SetupDL_12();
Matrix_Push(&gGfxMatrix);
Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -150.0f, 0);
for (var_s1 = 0; var_s1 < MIN(360, arg0 * 15); var_s1 += 15) {
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 0, 0, 0, MIN((arg0 - (var_s1 / 15)) * 15, 255));
Matrix_Push(&gGfxMatrix);
Matrix_RotateZ(gGfxMatrix, var_s1 * M_DTOR, 1);
Matrix_Scale(gGfxMatrix, 0.53f, 1.0f, 1.0f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_Gfx_800D9688);
Matrix_Pop(&gGfxMatrix);
}
Matrix_Pop(&gGfxMatrix);
}
void func_80084688(s32 arg0, s32 arg1) {
if (arg1 != 0) {
switch (arg0) {
case 0:
func_80084488(arg1);
break;
case 1:
func_80084370(arg1);
break;
case 2:
func_800843FC(arg1);
break;
default:
(void) "そのような フェード は ない (%d)\n"; // There is no such fade
break;
}
}
}

View File

@ -390,16 +390,16 @@ void func_800A26C0(void) {
gNextGameState = D_80177C94 = D_80177CAC = D_80177CB4 = D_80177CBC = D_80177CC4 = D_80177C9C =
D_80177CA4 = D_80161A5C = D_80161A34 = 0;
for (i = 0; i < 4; i++) {
D_80177908[i] = 2;
D_80177928[i] = 4;
D_80177938[i] = 0x8000;
D_80177948[i] = 0x4000;
D_80177908[i] = L_CBUTTONS;
D_80177928[i] = D_CBUTTONS;
D_80177938[i] = A_BUTTON;
D_80177948[i] = B_BUTTON;
D_80177958[i] = 1.0f;
D_80177858[i] = 3;
D_80177870[i] = 0;
D_800D2860[i] = 1;
D_800D2860[i] = R_CBUTTONS;
D_80178380[i] = 0;
}
D_8017789C = 0;
@ -542,20 +542,20 @@ void func_800A26C0(void) {
}
Object_2F4* func_800A3608(s32 arg0) {
Object_2F4* var_a2 = gObjects2F4;
Object_2F4* obj2F4 = gObjects2F4;
s32 i;
for (i = 0; i < ARRAY_COUNT(gObjects2F4); i++, var_a2++) {
if (var_a2->obj.status == 0) {
Object_2F4_Initialize(var_a2);
var_a2->obj.status = 1;
var_a2->obj.id = arg0;
func_800612B8(&var_a2->unk_01C, var_a2->obj.id);
for (i = 0; i < ARRAY_COUNT(gObjects2F4); i++, obj2F4++) {
if (obj2F4->obj.status == 0) {
Object_2F4_Initialize(obj2F4);
obj2F4->obj.status = 1;
obj2F4->obj.id = arg0;
Object_Set1C(&obj2F4->unk_01C, obj2F4->obj.id);
break;
}
}
if (i == ARRAY_COUNT(gObjects2F4)) {
var_a2 = NULL;
obj2F4 = NULL;
}
return var_a2;
return obj2F4;
}

3373
src/main/fox_play.c Normal file

File diff suppressed because it is too large Load Diff

View File

@ -68,7 +68,7 @@ void func_800BA808(u16* msg, s32 character) {
if (character == RCID_PEPPY) {
var_v1 = 3;
}
if ((D_801778B0[var_v1] <= 0) && (D_801778B0[var_v1] != -2)) {
if ((gTeamHealth[var_v1] <= 0) && (gTeamHealth[var_v1] != -2)) {
return;
}
}
@ -644,7 +644,7 @@ void func_800BB5D0(void) {
if (temp_ft0 == RCID_PEPPY) {
var_v1 = 3;
}
if ((D_801778B0[var_v1] <= 0) && (gFrameCount & 4) && (D_801778B0[var_v1] != -2) && (D_801782A4 != 2) &&
if ((gTeamHealth[var_v1] <= 0) && (gFrameCount & 4) && (gTeamHealth[var_v1] != -2) && (D_801782A4 != 2) &&
(D_801782A4 != 3) && (D_801782A4 != 1000)) {
RCP_SetupDL(&gMasterDisp, 0x4C);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 0, 255);
@ -652,7 +652,7 @@ void func_800BB5D0(void) {
func_80084B94(1);
}
if ((D_801782A4 != 2) && (D_801782A4 != 3) && (D_801782A4 != 1000)) {
func_80086110(22.0f, 165.0f, D_801778B0[var_v1]);
func_80086110(22.0f, 165.0f, gTeamHealth[var_v1]);
}
}
temp_ft0 = (s32) D_80177D68;

View File

@ -2,35 +2,35 @@
void func_80187520(s32, void*);
void func_8002E3E0(Object_2F4* arg0) {
s32 var_a3 = 0;
void func_8002E3E0(Object_2F4* obj2F4) {
s32 hits = 0;
if (gCurrentLevel == LEVEL_VENOM_SW) {
if (D_8015F940 < 0xF00) {
var_a3 = 50;
hits = 50;
} else if (D_8015F940 < 0x1680) {
var_a3 = 30;
hits = 30;
} else if (D_8015F940 < 0x1E00) {
var_a3 = 20;
hits = 20;
} else if (D_8015F940 < 0x2580) {
var_a3 = 10;
hits = 10;
}
} else {
if (D_8015F940 < 0xF00) {
var_a3 = 10;
hits = 10;
} else if (D_8015F940 < 0x1680) {
var_a3 = 5;
hits = 5;
} else if (D_8015F940 < 0x1E00) {
var_a3 = 2;
hits = 2;
} else if (D_8015F940 < 0x2580) {
var_a3 = 1;
hits = 1;
}
}
if (var_a3 != 0) {
func_80077240(arg0->obj.pos.x, arg0->obj.pos.y, arg0->obj.pos.z, var_a3);
if (hits != 0) {
func_80077240(obj2F4->obj.pos.x, obj2F4->obj.pos.y, obj2F4->obj.pos.z, hits);
}
gHitCount += var_a3;
D_80177850 = 0xF;
gHitCount += hits;
D_80177850 = 15;
}
s32 func_8002E4F8(u16* arg0, s32 arg1) {
@ -53,36 +53,36 @@ void func_8002E548(void) {
}
}
void func_8002E5E0(Object_408* arg0) {
func_80187520(0x5B, arg0);
void func_8002E5E0(Object_408* obj408) {
func_80187520(0x5B, obj408);
}
void func_8002E604(Object_408* arg0) {
func_80187520(0x5C, arg0);
void func_8002E604(Object_408* obj408) {
func_80187520(0x5C, obj408);
}
void func_8002E628(Object_408* arg0) {
func_80187520(0x5D, arg0);
void func_8002E628(Object_408* obj408) {
func_80187520(0x5D, obj408);
}
void func_8002E64C(Object_408* arg0) {
func_80187520(0x5E, arg0);
void func_8002E64C(Object_408* obj408) {
func_80187520(0x5E, obj408);
}
void func_8002E670(Object_2F4* arg0) {
func_80187520(0x5F, arg0);
void func_8002E670(Object_2F4* obj408) {
func_80187520(0x5F, obj408);
}
void func_8002E694(Object_2F4* arg0) {
func_80187520(0x60, arg0);
void func_8002E694(Object_2F4* obj408) {
func_80187520(0x60, obj408);
}
void func_8002E6B8(Object_2F4* arg0) {
func_80187520(0x61, arg0);
void func_8002E6B8(Object_2F4* obj408) {
func_80187520(0x61, obj408);
}
void func_8002E6DC(Object_2F4* arg0) {
func_80187520(0x62, arg0);
void func_8002E6DC(Object_2F4* obj408) {
func_80187520(0x62, obj408);
}
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_2EFE0/func_8002E700.s")

View File

@ -4,7 +4,7 @@
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/func_80035DEC.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/func_80035E48.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/Object_70_Initialize.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/func_80035E78.s")
@ -73,23 +73,3 @@
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/func_8003D9B8.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/func_8003DA0C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/func_8003DAF0.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/func_8003DE68.s")
void func_8003E1E0(void) {
}
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/func_8003E1E8.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/func_80040450.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/func_80040954.s")
void func_80040CDC(void) {
}
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/func_80040CE4.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_36930/func_80042D38.s")

21
src/main/sf_3E6F0.c Normal file
View File

@ -0,0 +1,21 @@
#include "common.h"
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_3E6F0/func_8003DAF0.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_3E6F0/func_8003DE68.s")
void func_8003E1E0(void) {
}
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_3E6F0/func_8003E1E8.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_3E6F0/func_80040450.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_3E6F0/func_80040954.s")
void func_80040CDC(void) {
}
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_3E6F0/func_80040CE4.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_3E6F0/func_80042D38.s")

File diff suppressed because it is too large Load Diff

View File

@ -1,52 +1,5 @@
#include "global.h"
void func_80084370(s32 arg0) {
Graphics_FillRectangle(&gMasterDisp, 0, 0, arg0, SCREEN_HEIGHT, 0, 0, 0, 255);
Graphics_FillRectangle(&gMasterDisp, SCREEN_WIDTH - arg0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0, 0, 255);
}
void func_800843FC(s32 arg0) {
Graphics_FillRectangle(&gMasterDisp, 0, 0, SCREEN_WIDTH, arg0, 0, 0, 0, 255);
Graphics_FillRectangle(&gMasterDisp, 0, SCREEN_HEIGHT - arg0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0, 0, 255);
}
void func_80084488(s32 arg0) {
s32 var_s1;
RCP_SetupDL_12();
Matrix_Push(&gGfxMatrix);
Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -150.0f, 0);
for (var_s1 = 0; var_s1 < MIN(360, arg0 * 15); var_s1 += 15) {
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 0, 0, 0, MIN((arg0 - (var_s1 / 15)) * 15, 255));
Matrix_Push(&gGfxMatrix);
Matrix_RotateZ(gGfxMatrix, var_s1 * M_DTOR, 1);
Matrix_Scale(gGfxMatrix, 0.53f, 1.0f, 1.0f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_Gfx_800D9688);
Matrix_Pop(&gGfxMatrix);
}
Matrix_Pop(&gGfxMatrix);
}
void func_80084688(s32 arg0, s32 arg1) {
if (arg1 != 0) {
switch (arg0) {
case 0:
func_80084488(arg1);
break;
case 1:
func_80084370(arg1);
break;
case 2:
func_800843FC(arg1);
break;
default:
(void) "そのような フェード は ない (%d)\n"; // There is no such fade
break;
}
}
}
#ifdef NON_MATCHING
// pretty sure this is equivalent, but it's almost certainly not implemented this way. Raw m2c included for those who
// want to try.
@ -178,5 +131,5 @@ void func_800846F0(FrameBuffer* arg0) {
osWritebackDCacheAll();
}
#else
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/fox_84F70/func_800846F0.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_852F0/func_800846F0.s")
#endif

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -4,7 +4,7 @@
void func_DF4260_80187520(s32 arg0, s32 arg1) {
}
void func_DF4260_80187530(Object_80* arg0) {
void func_DF4260_80187530(Object_80* obj80) {
}
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DF4260/func_DF4260_8018753C.s")

View File

@ -31,9 +31,9 @@ void func_DF4260_801924A8(UnkStruct_func_DF4260_801924A8* arg0) {
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DFEE30/func_DF4260_80192AA4.s")
void func_DF4260_80192CB0(Object_2F4* arg0) {
arg0->unk_050 = arg0->obj.rot.x;
arg0->obj.rot.x = 0.0f;
void func_DF4260_80192CB0(Object_2F4* obj2F4) {
obj2F4->unk_050 = obj2F4->obj.rot.x;
obj2F4->obj.rot.x = 0.0f;
}
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_DF4260/DFEE30/func_DF4260_80192CD4.s")

View File

@ -172,24 +172,26 @@
# Game engine
- [0x2EFE0, c, sf_2EFE0]
- [0x36930, c, sf_36930]
- [0x3E6F0, c, sf_3E6F0]
- [0x43AC0, c, fox_43AC0]
- [0x43E80, c, sf_43E80]
- [0x496C0, c, sf_496C0]
- [0x52730, c, fox_52730]
- [0x52730, c, fox_display]
- [0x59780, c, fox_load]
- [0x5A0F0, c, fox_edata]
- [0x5A2C0, c, fox_edisplay]
- [0x61B30, c, fox_enmy]
- [0x6B3B0, c, fox_6B3B0]
- [0x77E40, c, sf_77E40]
- [0x84F70, c, fox_84F70]
- [0x84F70, c, fox_fade]
- [0x852F0, c, sf_852F0]
- [0x85530, c, sf_hud]
- [0x97F80, c, fox_97F80]
- [0x9A580, c, fox_std_lib]
- [0xA24B0, c, fox_A24B0]
- [0xA24B0, c, fox_game]
- [0xA4290, c, fox_A4290]
- [0xA48A0, c, fox_A48A0]
- [0xA4B50, c, sf_A4B50]
- [0xA4B50, c, fox_play]
- [0xB99D0, c, fox_rcp]
- [0xBB360, c, fox_radio]
- [0xBD0B0, c, fox_reset]
@ -264,10 +266,11 @@
- [0xCA690, data, sf_2EFE0]
- [0xCA7C0, data, sf_36930]
- [0xCA830, data, sf_3E6F0]
- [0xCAA90, .data, fox_43AC0]
- [0xCAB00, data, sf_43E80]
- [0xCAB60, data, sf_496C0]
- [0xCAE20, .data, fox_52730]
- [0xCAE20, .data, fox_display]
- [0xCAFB0, .data, fox_load]
- [0xCCA70, .data, fox_edata]
- [0xD0570, .data, fox_edisplay]
@ -276,9 +279,9 @@
- [0xD20E0, data, sf_77E40]
- [0xD2570, data, sf_hud]
- [0xD31D0, .data, fox_std_lib]
- [0xD3460, .data, fox_A24B0]
- [0xD3460, .data, fox_game]
- [0xD3520, .data, fox_A4290]
- [0xD3B50, data, sf_A4B50]
- [0xD3B50, data, fox_play]
- [0xD3DB0, .data, fox_rcp]
- [0xD5670, .data, fox_radio]
- [0xD5680, .data, fox_reset]
@ -288,23 +291,24 @@
# RODATA - game engine
- [0xD5A10, .rodata, sf_2EFE0]
- [0xD5CF0, .rodata, sf_36930]
- [0xD5F90, .rodata, sf_3E6F0]
- [0xD61D0, .rodata, fox_43AC0]
- [0xD61F0, .rodata, sf_43E80]
- [0xD6350, .rodata, sf_496C0]
- [0xD69A0, .rodata, fox_52730]
- [0xD69A0, .rodata, fox_display]
- [0xD6BA0, .rodata, fox_load]
- [0xD6C20, .rodata, fox_edisplay]
- [0xD6FD0, .rodata, fox_enmy]
- [0xD7650, .rodata, fox_6B3B0]
- [0xD7E30, .rodata, sf_77E40]
- [0xD82F0, .rodata, fox_84F70]
- [0xD82F0, .rodata, fox_fade]
- [0xD8320, .rodata, sf_hud]
- [0xD8DE0, .rodata, fox_97F80]
- [0xD8DF0, .rodata, fox_std_lib]
- [0xD8E50, .rodata, fox_A24B0]
- [0xD8E50, .rodata, fox_game]
- [0xD8ED0, .rodata, fox_A4290]
- [0xD8EE0, .rodata, fox_A48A0]
- [0xD8EF0, .rodata, sf_A4B50]
- [0xD8EF0, .rodata, fox_play]
- [0xD97F0, .rodata, fox_radio]
- [0xD9E50, .rodata, sf_versus]
- [0xD9F60, .rodata, fox_message]
@ -356,16 +360,17 @@
# Game engine bss
- { start: 0xDE480, type: bss, vram: 0x8015F900, name: sf_2EFE0 }
- { start: 0xDE480, type: bss, vram: 0x8015F950, name: sf_36930 }
- { start: 0xDE480, type: bss, vram: 0x8015F960, name: sf_3E6F0 }
- { start: 0xDE480, type: .bss, vram: 0x801613A0, name: fox_43AC0 }
- { start: 0xDE480, type: .bss, vram: 0x801613B0, name: fox_52730 }
- { start: 0xDE480, type: .bss, vram: 0x801613B0, name: fox_display }
- { start: 0xDE480, type: .bss, vram: 0x801615D0, name: fox_edisplay }
- { start: 0xDE480, type: .bss, vram: 0x80161670, name: fox_enmy }
- { start: 0xDE480, type: .bss, vram: 0x80161690, name: fox_6B3B0 }
- { start: 0xDE480, type: bss, vram: 0x801616A0, name: sf_hud }
- { start: 0xDE480, type: .bss, vram: 0x80161950, name: fox_97F80 }
- { start: 0xDE480, type: .bss, vram: 0x801619A0, name: fox_std_lib }
- { start: 0xDE480, type: .bss, vram: 0x80161A10, name: fox_A24B0 }
- { start: 0xDE480, type: bss, vram: 0x80161A50, name: sf_A4B50 }
- { start: 0xDE480, type: .bss, vram: 0x80161A10, name: fox_game }
- { start: 0xDE480, type: bss, vram: 0x80161A50, name: fox_play }
- { start: 0xDE480, type: .bss, vram: 0x80178580, name: fox_rcp }
- { start: 0xDE480, type: .bss, vram: 0x80178720, name: fox_radio }
- { start: 0xDE480, type: bss, vram: 0x80178750, name: sf_versus }