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

sf_hud functions (#10)

Browse Source 
* decompile func_8008C5C8

* decompile func_8008CA44

* decompile func_8008CFB8

* decompile func_8008D250

* decompile func_8008D31C

* decompile func_8008D4F0

* trailing comma

* x and y axis

* decompile func_8008D7F4

* decompile func_8008D984

* decompile func_8008DCB0

* decompile func_8008DD78

* decompile func_8008DE68. Co-authored-by @tharo

* unnecessary parenthesis

* decompile func_8008E2C8

* decompile func_8008E620

* decompile func_8008F96C

* dec

* space

* format

* dec

* decompile func_800907C4

* fix warnings

* decompile func_80090A00 (finally)

* format
This commit is contained in:
Alejandro Asenjo Nitti
2023-10-26 16:22:08 -03:00
committed by GitHub
parent b698fd3628
commit bf55772bd9
6 changed files with 676 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions.h
+32 -9
View File
@@ -1,6 +1,8 @@
#ifndef FUNCTIONS_H
#define FUNCTIONS_H
#include "structs.h"
f32 func_80004E20(f32 arg0, f32 arg1);
void func_80004E4C(void);
f32 func_80004EB0(void);
@@ -12,11 +14,11 @@ f32 func_800055DC(f32 arg0, s32 arg1);
void func_80005604(s32* arg0, s32* arg1, s32 arg2, s32 arg3, s32 arg4);
void func_80005680(Matrix*, Matrix*);
void func_80005708(Matrix ** mtx);
void func_80005708(Matrix** mtx);
void func_80005740(Matrix** mtx);
void func_80005B00(Matrix*, f32, f32, f32, u8);
void func_80005C34(Matrix*, f32, f32, f32, s32);
void func_80006EB8(Gfx **);
void func_80006EB8(Gfx**);
void func_80006F20(void);
void func_800070C8(s64);
@@ -52,20 +54,41 @@ OSMesgQueue* osPiGetCmdQueue(void);
s32 func_8002DE78(void*, s32, s32); // Not real signature
void func_80084688(s32, s32);
void func_80086664(f32, f32);
s32 func_8008B774(void);
s32 func_8008BCBC(s32 arg0);
void func_80060FBC(u8*, f32*);
void func_8009BC2C(f32*, f32, f32, f32, f32);
void func_80084688(s32, s32);
void func_800857DC(f32, f32, f32, f32);
void func_80085890(f32, f32, f32, f32);
void func_80086664(f32, f32);
void func_80087530(f32, f32, s32);
void func_8008B5B0(f32 x, f32 y);
s32 func_8008B774(void);
void func_8008BD00(u8*, s32, s32, u8);
void func_8008C390(f32, f32, f32, s32);
void func_8008C5C8(f32, f32, f32, s32);
void func_8008C6F4(s32, s32);
s32 func_8008BCBC(s32 arg0);
void func_8008D0DC(f32, f32, f32, f32, f32);
void func_8008E9EC(f32 arg0, f32 arg1);
void func_8008EA14(f32, f32);
void func_8008FFF0(UnkStruct_D_8016F110* arg0, s32);
void func_80094D20(f32, f32);
f32 func_8009BC2C(f32*, f32, f32, f32, f32);
void func_8009D418(Gfx**, void*, u32, u32, f32, f32, f32, f32);
void func_8009D994(Gfx**, void*, u32, u32, f32, f32, f32, f32);
void func_8009FC0C(s32, s32, s32);
void func_8009FEA0(s32, s32, s32);
void func_800A1200(s32, s32, f32, f32, char*);
void func_800A1200(s32, s32, f32, f32, char*);
s32 func_800A3F50(s32);
void func_800A5D6C(void);
void func_800B8DD0(Gfx **, s16);
void func_800B8DD0(Gfx**, s16);
void func_800BA490(void);
void func_800BA4F0(void);
void func_800BB5D0(void);
void func_800B6F50(f32, f32, f32, f32, f32, f32);
void func_800B9358(void);
void func_801988E0(void);
void func_801877F0_EBFEB0(void);
s32 func_80187ABC_EC017C(void);
include/hud.h
+1 -3
View File
@@ -23,7 +23,6 @@ void func_8008A4DC(void);
void func_8008B044(void);
void func_8008B1B0(void);
void func_8008B2F0(void);
void func_8008B5B0(f32 arg0, f32 arg1);
void func_8008B734(void);
void func_8008B9E8(void);
void func_8008BAE4(void);
@@ -35,10 +34,9 @@ void func_8008D7F4(void);
void func_8008D984(void);
void func_8008DC34(void);
void func_8008E5E8(void);
void func_8008E620(void);
void func_80090E8C(void);
void func_800910C0(void);
void func_8009C320(Gfx**, s32*, s32*, s32, s32, f32, f32, f32, f32);
void func_8009C320(Gfx**, void*, void*, s32, s32, f32, f32, f32, f32);
void func_8009D0BC(Gfx**, void*, void*, u32, u32, f32, f32, f32, f32);
void func_8009D994(Gfx**, void*, u32, u32, f32, f32, f32, f32);
void func_8009E1E8(Gfx**, s32*, s32, s32, f32, f32, f32, f32);
include/structs.h
+52 -8
View File
@@ -11,16 +11,60 @@ typedef struct UnkStruct_D_801B8350 {
/* 0x58 */ s32 unk58;
} UnkStruct_D_801B8350;
typedef struct {
/* 0x00 */ u8 unk_00;
/* 0x01 */ char pad_01;
/* 0x02 */ u16 unk_02;
/* 0x04 */ Vec3f pos;
/* 0x10 */ Vec3f unk10;
} ElementType1; // size = 0x1C
typedef struct UnkStruct_D_80178280 {
/* 0x000 */ char pad_0[0x07C];
/* 0x07C */ f32 unk07C;
/* 0x080 */ char pad_80[0x148];
/* 0x1C8 */ s32 unk1C8;
/* 0x1CC */ char pad_1CC[0x98];
/* 0x264 */ s32 unk264;
/* 0x000 */ char pad_0[0xC];
/* 0x00C */ f32 unk_00C;
/* 0x010 */ char pad_010[0x64];
/* 0x074 */ f32 unk_074;
/* 0x078 */ char pad_078[0x4];
/* 0x07C */ f32 unk_07C;
/* 0x080 */ char pad_080[0xB8];
/* 0x138 */ f32 unk_138;
/* 0x13C */ char pad_13C[0x8C];
/* 0x1C8 */ s32 unk_1C8;
/* 0x1CC */ char pad_1CC[0x44];
/* 0x210 */ s32 unk_210;
/* 0x214 */ char pad_214[0x14];
/* 0x228 */ s32 unk_228;
/* 0x22C */ char pad_22C[0x38];
/* 0x264 */ s32 unk_264;
/* 0x268 */ char pad_268[0x4];
/* 0x26C */ s32 unk26C;
/* 0x270 */ char pad_270[0x270];
/* 0x26C */ s32 unk_26C;
/* 0x270 */ char pad_270[0x44];
/* 0x2B4 */ s32 unk_2B4;
/* 0x2B8 */ char pad_2B8[0x4];
/* 0x2BC */ f32 unk_2BC;
/* 0x2C0 */ char pad_2C0[0x220];
} UnkStruct_D_80178280; // size = 0x4E0
typedef struct {
/* 0x000 */ ElementType1 unk_000;
/* 0x01C */ char pad_0[0x32];
/* 0x4E */ s16 unk4E;
/* 0x50 */ char pad_50[0x88];
/* 0xD8 */ f32 unkD8[50];
} UnkStruct_D_8016F110;
typedef struct {
/* 0x000 */ ElementType1 unk_000;
/* 0x01C */ char pad_01C[0x34];
/* 0x050 */ s32 unk_050[25];
/* 0x0B4 */ char pad_0B4[0x8];
/* 0x0BC */ u16 unk_0BC;
/* 0x0BE */ char pad_0BE[0x36];
/* 0x0F4 */ f32 unk_0F4;
/* 0x0F8 */ f32 unk_0F8;
/* 0x0FC */ char pad_0FC[0x4];
/* 0x100 */ f32 unk_100[5];
/* 0x114 */ f32 unk_114[30];
} UnkStruct_func_80090A00;
#endif
include/variables.h
+39 -1
View File
@@ -16,10 +16,17 @@ extern OSMesgQueue D_800E2278;
extern f32 D_800C5D34;
extern s8 D_800C5D3C;
extern s32 D_800CFF90;
extern f32 D_800D19AC[];
extern f32 D_800D19E0[];
extern Gfx D_800D1A40[];
extern s32 D_800D1EB4;
extern s32 D_800D1EB8;
extern s32 D_800D1EBC;
extern s32 D_800D20D8;
extern s32 D_800D2180[];
extern s32 D_800D2190[];
extern f32 D_800D21A0;
extern f32 D_800D21A4;
extern s32 D_800D2870;
extern u8 D_800DD8B0[];
extern s32 D_800DD8B4;
@@ -28,7 +35,13 @@ extern Gfx* D_80137E64;
extern u8 D_80137E78;
extern s32 D_80161690;
extern f32 D_801616BC;
extern f32 D_801616C0;
extern f32 D_801616C4;
extern f32 D_801616C8;
extern s32 D_80161708;
extern s32 D_80161730;
extern s32 D_80161734;
extern s32 D_80161788;
extern s32 D_8016178C;
extern s32 D_80161790;
@@ -40,16 +53,22 @@ extern f32 D_801617A4;
extern f32 D_801617A8;
extern f32 D_801617AC;
extern s32 D_801617B0;
extern s32 D_801617B4;
extern s32 D_801617B8;
extern s16 D_80161A34;
extern s16 D_80161A36;
extern u8 D_80161A90[];
extern s16 D_80161AA0[];
extern UnkStruct_D_8016F110 D_8016F110[];
extern UnkStruct_D_80178280* D_80178280;
extern s32 D_80177834;
extern s32 D_8017783C;
extern s32 D_80177848;
extern s32 D_80177898;
extern s32 D_801778A0;
extern s32 D_801778A8;
extern s32 D_801778B8;
extern s32 D_801778E8;
extern f32 D_80177978;
extern f32 D_80177980;
@@ -61,6 +80,7 @@ extern s32 D_80177AE0;
extern s32 D_80177AF8;
extern u8 D_80177C98;
extern f32 D_80177D68;
extern s32 D_80177DA0[];
extern s32 D_80177DB0;
extern s32 D_8017829C;
extern s32 D_801782A4;
@@ -132,9 +152,24 @@ extern s32 D_801ADA44_EE6104[];
extern s32 D_801ADA84_EE6144[];
extern s32 D_801ADA94_EE6154;
extern u16 D_1002040[];
extern u16 D_10050E0[];
extern u16 D_100BAC0[];
extern u16 D_100D900[];
extern u16 D_10032A0[];
extern u8 D_1011A40[];
extern u16 D_1011AB0[];
extern u8 D_1011E80[];
extern u16 D_1011EC0[];
extern s32 D_1011ED0[];
extern s32 D_1011F08[];
extern u8 D_10129C0[];
extern u16 D_1013090[];
extern Gfx D_1015510[];
extern Gfx D_1024230[];
extern Gfx D_1024830[];
extern u8 D_1024A58[];
extern Gfx D_102A8A0[];
extern Gfx D_1024AC0[];
@@ -168,6 +203,8 @@ extern Gfx D_200F080[];
extern Gfx D_200F910[];
extern Gfx D_20101A0[];
extern u16 D_3000BC0[];
extern u8 D_5000000[];
extern u8 D_5000080[];
extern u8 D_5000100[];
@@ -184,7 +221,7 @@ extern Gfx D_6004570[];
extern Gfx D_D0098B0[];
extern Gfx D_F014180[];
extern u16 D_800D99F8[];
extern u8 D_800DD8B8[];
extern OSContStatus D_800DD8F0;
extern OSMesgQueue D_800E2128;
@@ -202,6 +239,7 @@ extern OSMesg D_80156600;
extern OSMesg D_80156608;
extern OSMesg D_80156618;
extern OSMesg D_8015661C;
extern s32 D_8015F928;
extern OSThread D_80138E90;
extern OSThread D_8013A040; // 0x1000 gap
src/main/sf_hud.c
+551 -23
View File
File diff suppressed because it is too large Load Diff
src/overlays/segment_DF4260/DFEE30.c
+1 -1
View File
@@ -14,7 +14,7 @@
void func_801924A8_DFF1E8(UnkStruct_func_801924A8_DFF1E8* arg0) {
switch (arg0->unk48) {
case 0:
if (D_80178280->unk07C < arg0->unkC) {
if (D_80178280->unk_07C < arg0->unkC) {
D_80177AB0 = 0;
D_80177A98 = 0;
arg0->unk48++;