izzy/Starship
0
0
Fork 0
mirror of https://github.com/izzy2lost/Starship.git synced 2026-07-05 15:19:42 -07:00
Code Issues Packages Projects Releases Wiki Activity

Wip on sf_77E40 (#42)

Browse Source 
* Match func_80077240

* Apply changes from style guide

* Match func_8007729C and style guide changes

* Further style guide changes

* Several matches courtesy of petrie911

* Match func_80077B84

* Run make format

* Match func_80078038

* Match func_800780F8

* Match func_800783C0

* Match func_80078438 and func_800784B4

* Match func_80078550

* Match func_80078604

* Match func_8007868C

* WIP func_80084194

* Rename funcs as required from merge with master.

* Match func_8007879C

* Match func_800788B0 and func_80084194

* Match func_80078A64

* Match 3 more funcs

* Match func_80078C84

* Match func_80078D60 and func_80078CE8

* Match func_80078E50

* Match func_80078EBC

* Match func_80078F78

* Add function prototypes to functions.h

* (M_PI / 180.0f) to M_DTOR

* Match func_8007905C

* Match func_800794CC

* Match func_8007953C

* Match func_80079618

* Fix changes from master

* Match func_8007968C

* Match func_800798C4

* Match func_800798F0

* return -> break

* Match func_8007A28C

* Match func_8007A3C0

* Match func_8007A4B8

* Match func_8007A568

* Match two more funcs
This commit is contained in:
Ryan Myers
2023-12-06 07:29:49 -06:00
committed by GitHub
parent 3e1c0db70b
commit 80053694ea
5 changed files with 921 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions.h
+41 -4
View File
@@ -233,14 +233,51 @@ void func_8006B74C(Object_2F4 *);
void func_8006EEFC(s32, f32, f32, f32, f32, f32, f32, f32, f32, f32);
void func_800763A4(Object_2F4 *, s32);
void func_8007717C(Object_2F4 *, s32);
void func_80077240(f32, f32, f32, s32);
void func_80078E50(f32, f32, f32, f32);
void func_800794CC(f32, f32, f32, f32);
void func_80077240(f32 posX, f32 posY, f32 posZ, s32 arg3);
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(void *unused);
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_8007A6F0(Vec3f *, u32);
void func_8007ACE0(f32, f32, f32, f32, f32, f32);
void func_8007AFD0(f32, f32, f32, s32, f32);
void func_8007B228(f32, f32, f32, f32);
void func_8007B2BC(Object_8C* arg0, f32 xPos, f32 yPos, f32 zPos, f32 arg4, s32 arg5);
void func_8007B344(f32 xPos, f32 yPos, f32 zPos, f32 arg3, s32 arg4);
void func_8007BC7C(f32, f32, f32, f32);
void func_8007BFFC(f32, f32, f32, f32, f32, f32, f32, s32);
void func_8007C120(f32, f32, f32, f32, f32, f32, f32, s32);
include/structs.h
+9 -5
View File
@@ -302,10 +302,6 @@ typedef struct {
/* 0x14 */ char pad14[0x14];
} UnkStruct_D_80175A10; // size = 0x28
typedef struct {
char unk_00[0x1C];
} UnkStruct_D_80176438;
typedef struct {
/* 0x00 */ Object obj;
/* 0x1C */ char pad1C[0x1C];
@@ -392,7 +388,7 @@ typedef struct {
/* 0x46 */ s16 unk_46;
/* 0x48 */ s16 unk_48;
/* 0x4A */ s16 unk_4A;
/* 0x4C */ char pad4C[0x2];
/* 0x4C */ u8 unk_4C;
/* 0x4E */ s16 unk_4E;
/* 0x50 */ u16 unk_50;
/* 0x50 */ char pad50[0x2];
@@ -542,4 +538,12 @@ typedef struct {
/* 0x2E8 */ Vec3f unk_2E8;
} Object_2F4; // size = 0x2F4
typedef struct {
/* 0x00 */ u8 unk_00;
/* 0x04 */ Vec3f pos; //May be a Vec4f
/* 0x10 */ f32 unk_10;
/* 0x14 */ char pad14[0x4];
/* 0x18 */ u16 unk_18;
} UnkStruct_D_80176438; // size = 0x1C
#endif
include/variables.h
+51 -7
View File
@@ -192,6 +192,13 @@ extern s32 D_800CFF90;
extern s16 D_800CFF94[];
extern u8 D_800CFFB4[];
extern f32 D_800CFFC4[];
extern Gfx* D_800D14E0[][2];
extern Gfx* D_800D14FC[];
extern Vec3f D_800D1528;
extern f32 D_800D1534[10][10];
extern s32 D_800D173C[];
extern s32 D_800D18F0[]; //[6][4]?
extern s32 D_800D1950[];
extern f32 D_800D19AC[];
extern f32 D_800D19E0[];
extern Gfx D_800D1A40[];
@@ -435,10 +442,10 @@ extern s32 D_801782FC;
extern s32 D_80178300;
extern u16* D_80178308;
extern ObjectInit* D_80178310;
extern s32 D_80178320;
extern s32 D_80178328;
extern s32 D_80178330;
extern s32 D_80178338;
extern s32 D_80178320; //red
extern s32 D_80178328; //green
extern s32 D_80178330; //blue
extern s32 D_80178338; //alpha
extern s32 D_80178340;
extern s32 D_80178348;
extern s32 D_80178350;
@@ -458,8 +465,8 @@ extern s32 D_801783A0[];
extern s32 D_801783B0[];
extern f32 D_801783D0;
extern f32 D_801783D4;
extern s32 D_801783D8;
extern s32 D_801783DC;
extern s32 D_801783D8; //near
extern s32 D_801783DC; //far
extern s32 D_80178410;
extern f32 D_80178420;
extern f32 D_80178424;
@@ -591,12 +598,16 @@ extern u16 D_8038F080[];
extern u16 D_8038F300[];
extern FrameBuffer gFrameBuffers[3]; // 8038F800
extern Gfx D_1011F20[];
extern u8 D_1013170[];
extern u16 D_1013570[];
extern u16 D_10041C0[];
extern Gfx D_1015980[];
extern u16 D_1006000[];
extern Gfx D_1016580[];
extern u16 D_1006F20[];
extern u16 D_1007E40[];
extern Gfx D_10182C0[];
extern u16 D_1008D60[];
extern u16 D_1009C80[];
extern u16 D_100ABA0[];
@@ -607,7 +618,9 @@ extern u16 D_10050E0[];
extern u16 D_100BAC0[];
extern u16 D_100D900[];
extern u16 D_10032A0[];
extern void *D_10190C0; // A texture of some sort.
extern Gfx D_10194C0[];
extern Gfx D_1021E20[];
extern Gfx D_1024290[];
extern u8 D_1011A40[];
extern u16 D_1011AB0[];
@@ -630,18 +643,23 @@ extern u8 D_1024A58[];
extern Gfx D_102A8A0[];
extern Gfx D_1024AC0[];
extern Gfx D_1028230[];
extern Gfx D_101C2E0[];
extern Gfx D_101CAE0[];
extern Gfx D_1023C80[];
extern Gfx D_101A570[];
extern Gfx D_1019CA0[];
extern Gfx D_1016870[];
extern Gfx D_1022E80[];
extern Gfx D_1029780[];
extern Gfx D_102A010[];
extern Gfx D_1032780[];
extern Gfx D_1019820[];
extern Gfx D_101A8E0[];
extern Gfx D_102FE80[];
extern Gfx D_101ABD0[];
extern Gfx D_10231A0[];
extern Gfx D_102ED50[];
extern Gfx D_102F5E0[];
extern Gfx D_102FE80[];
extern Gfx D_2000000[];
extern Gfx D_2000890[];
@@ -661,19 +679,23 @@ extern Gfx D_20055A0[];
extern Gfx D_2005E30[];
extern Gfx D_2006360[];
extern Gfx D_20066C0[];
extern Gfx D_2006F50[];
extern Gfx D_20073F0[];
extern Gfx D_2008480[];
extern Gfx D_2009510[];
extern Gfx D_200A5A0[];
extern Gfx D_200B630[];
extern Gfx D_200C6C0[];
extern Gfx D_200D750[];
extern Gfx D_200E7F0[];
extern Gfx D_200F080[];
extern Gfx D_200F910[];
extern Gfx D_20101A0[];
extern Gfx D_20112C0[];
extern u8 D_3000000[];
extern u16 D_3000080[];
extern Gfx D_3000660[];
extern u16 D_3000BC0[];
extern u8 D_300D350[];
extern u16 D_300D398[];
@@ -684,6 +706,7 @@ extern u16 D_300D500[];
extern Gfx D_30155E0[];
extern Gfx D_3015D80[];
extern Gfx D_3016660[];
extern Gfx D_3016B30[];
extern Gfx D_3011720[];
extern Gfx D_3005980[];
extern ObjectInit D_302DE3C[];
@@ -752,6 +775,7 @@ extern Gfx D_602E380[];
extern Gfx D_60320E0[];
extern Gfx D_6032580[];
extern Gfx D_6032BC0[];
extern Gfx D_6033000[];
extern Gfx D_6034B90[];
extern Gfx D_6035DA0[];
extern Gfx D_60361F0[];
@@ -767,7 +791,20 @@ extern u16 D_600D5C0[];
extern Gfx D_600D730[];
extern Gfx D_600DBC0[];
extern u8 D_600DDC0[];
extern Gfx D_600F160[];
extern Gfx D_600F2F0[];
extern Gfx D_600F3D0[];
extern Gfx D_600F6C0[];
extern Gfx D_600F8A0[];
extern u8 D_600F940[];
extern Gfx D_600F9B0[];
extern Gfx D_601A7A0[];
extern Gfx D_60200E0[];
extern Gfx D_6020A30[];
extern Gfx D_6020E60[];
extern Gfx D_60223C0[];
extern Gfx D_6022450[];
extern Gfx D_6022530[];
extern Gfx D_60363B0[];
extern Gfx D_6036840[];
extern Gfx D_6036CD0[];
@@ -790,6 +827,8 @@ extern AnimationHeader D_601E8C4;
extern Limb* D_601E9D0[];
extern Gfx D_6018C00[];
extern Gfx D_6018D40[];
extern Gfx D_601FF80[];
extern Gfx D_6024220[];
extern Gfx D_6024B60[];
extern Gfx D_6025B50[];
extern Gfx D_6007CF0[];
@@ -802,8 +841,10 @@ extern Gfx D_6004570[];
extern u8 D_6001B80[];
extern u8 D_60020D0[];
extern u16 D_6000900[];
extern Gfx D_6000A80[];
extern u16 D_6000B60[];
extern u16 D_6001820[];
extern Gfx D_6001A60[];
extern u16 D_6001A80[];
extern u16 D_60029A0[];
extern u16 D_60038C0[];
@@ -823,11 +864,14 @@ extern u16 D_6021ED0[];
extern u16 D_60245E0[];
extern u16 D_6025500[];
extern u16 D_6026420[];
extern AnimationHeader D_6027320;
extern u16 D_6027340[];
extern Limb* D_602742C;
extern Gfx D_605C230[];
extern Vtx D_6001C50[];
extern Vtx D_6004500[];
extern Vtx D_6009ED0[];
extern Gfx D_600A220[];
extern Vtx D_600C780[];
extern u16 D_6022760[];
extern u16 D_602AC50[];
src/main/sf_77E40.c
+819 -48
View File
File diff suppressed because it is too large Load Diff
tools/permuter_settings.toml
+1 -1
View File
@@ -5,4 +5,4 @@ compiler_type = "ido"
"gs[DS]P.*" = "void"
[decompme.compilers]
"tools/ido_recomp/linux/5.3/cc" = "ido5.3"
"tools/ido-recomp/linux/cc" = "ido5.3"