Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

General Matching Progress #77

Merged
merged 5 commits into from
Jan 24, 2025
Merged

General Matching Progress #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2974d03
general progress
inspectredc Jan 14, 2025
8395ff7
some matches
inspectredc Jan 15, 2025
959634e
use correct function name for non_matching
inspectredc Jan 22, 2025
a212f4c
more matches
inspectredc Jan 22, 2025
2ece831
misc matches
inspectredc Jan 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions include/functions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,10 @@ s32 func_8006AC10(Mtx3F* mtx);
void func_8006ADE4(s32 arg0, s32 arg1, s32 arg2, s32* red, s32* green, s32* blue);
void Lights_SetSource(Lights1* light, s32 ambientR, s32 ambientG, s32 ambientB, s32 r, s32 g, s32 b, s32 x, s32 y, s32 z);
void Light_SetLookAtSource(LookAt* lookAt, MtxF* mtx);
void Matrix_ToMtx(MtxF* src, Mtx* dest2);
void func_8006BC84(Mtx* arg0, MtxF* arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, f32 arg7, f32 arg8, f32 arg9, f32 argA, f32 argB, f32 argC, f32 argD);
void func_8006BFCC(Mtx* arg0, MtxF* arg1, f32 arg2, f32 arg3, f32 arg4, f32* arg5, f32* arg6, f32* arg7);
void func_8006C278(Mtx* arg0, MtxF* arg1, f32 arg2, f32 arg3, f32 arg4, Mtx3F* arg5, Vec3f* arg6);
void func_8006C378(Mtx* arg0, MtxF* arg1, f32 arg2, s32 arg3, s32 arg4, s32 arg5, f32 arg6, f32 arg7, f32 arg8);
void func_8006C520(Mtx* arg0, MtxF* arg1, f32 arg2, s32 arg3, f32 arg4, f32 arg5, f32 arg6, f32 arg7, f32 arg8, f32 arg9);
void func_8006CC98(Mtx* arg0, MtxF* arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, f32 arg7, f32 arg8, f32 arg9, f32 argA);
Expand Down Expand Up @@ -119,6 +121,7 @@ Gfx* func_8007DB28(Gfx* gfx, s32 arg1);
void func_8007DEF0(void);
s32 func_8007E008(void);
void func_8007E08C(void);
void func_8007E0AC(s32 arg0);
void func_8007E0CC(void);
void func_8007E0EC(void);
s8 func_8007E10C(s32 i);
Expand Down Expand Up @@ -155,7 +158,7 @@ unk_800E51B8* func_80080AA8(s16 arg0, s16 arg1, s16 arg2, s16 arg3, s16 arg4, u1
Gfx* func_80080E90(Gfx* gfx);
bool func_8008108C(unk_800E51B8* arg0, s32 arg1);

Gfx* func_800833AC(Gfx* gfx, s32 arg1, s32 arg2);
Gfx* func_800833AC(Gfx* gfx, s32 arg1, s32 playerIndex);
void func_80083580(unk_800E5D70* arg0, s32 arg1);
void func_80083734(unk_800E5D70* arg0, unk_8008112C_arg_1* arg1);
void func_80084654(unk_800E5D70* arg0, unk_80085434_arg_2* arg1);
Expand All @@ -176,7 +179,7 @@ void func_8008D824(void);
void func_8008D8E8(void);
void func_80095144(void);
void func_800952F4(void);
Gfx* func_80096CE8(Gfx* gfx, s32 arg1);
Gfx* func_80096CE8(Gfx* gfx, s32 playerIndex);
Gfx* func_8009CBE8(Gfx* gfx, s32 arg1, s32 red, s32 green, s32 blue);
Gfx* func_8009CCBC(Gfx* gfx, s32 character, s32 arg2);
Gfx* func_8009CD60(Gfx* gfx, s32 character);
Expand All @@ -191,6 +194,7 @@ f32 func_8009E538(unk_8006FC8C*, f32, Vec3f*);
void func_8009E6F0(unk_8006FC8C*, f32, Vec3f*);
f32 func_8009E85C(unk_8006FC8C*, f32, Mtx3F*, f32);
void func_8009F508(unk_800F8510* arg0);
f32 func_8009DFA0(Racer_unk_C* arg0);

s32 func_800A2D2C(unk_800F8510* arg0, Vtx* arg1);
void func_800A3044(void);
Expand All @@ -209,16 +213,20 @@ void Audio_Init(void);
void Audio_SetSoundMode(u8 soundMode);
void func_800BA2B4(u8);
void func_800BA2D0(u8);
void func_800BA2E0(u8 arg0);
void func_800BA2F0(u8, u8);
void func_800BA3E4(u8, u8);
void func_800BA710(u8 arg0, u8 arg1);
void func_800BA8D8(u8 arg0);
void func_800BAA88(u8 arg0, u8 arg1);
void func_800BAB34(u8 arg0);
void func_800BAB50(u8);
void func_800BAB68(u8);
void func_800BAE5C(u8 arg0);
void func_800BAF30(u8);
void func_800BAF80(void);
void func_800BAFA4(u8);
void func_800BB018(void);
void func_800BB038(void);
void func_800BB048(void);
void func_800BB078(void);
Expand Down Expand Up @@ -272,6 +280,7 @@ s32 func_i2_801058FC(f32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5,
s32 func_i2_801059B4(f32 arg0, Racer* arg1);
s32 func_i2_80105A28(f32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, Mtx3F* arg6, s32 arg7, s32 arg8, s32 arg9, Racer* argA);
void func_i2_80105DB0(s32 num, s8* str);
s32 func_i2_80106024(s8* str, s32 fontSetLowercase);
s32 func_i2_801062E4(s8*, s32, s32);
Gfx* func_i2_80106450(Gfx*, s32, s32, s8*, s32, s32, s32);
Gfx* func_i2_80106700(Gfx* gfx, s32 left, s32 top, s8* str, s32 additionalSpacing, s32 fontSet, s32 arg6, f32 scaleX, f32 scaleY);
Expand Down
2 changes: 1 addition & 1 deletion include/fzx_game.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ typedef enum GameMode {
/* 0xE */ GAMEMODE_TIME_ATTACK,
/* 0xF */ GAMEMODE_F,
/* 0x10 */ GAMEMODE_10,
/* 0x11 */ GAMEMODE_11,
/* 0x11 */ GAMEMODE_GP_END_CS,
/* 0x12 */ GAMEMODE_12,
/* 0x13 */ GAMEMODE_13,
/* 0x14 */ GAMEMODE_OPTIONS_MENU,
Expand Down
14 changes: 13 additions & 1 deletion include/sys.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,18 @@
#include "other_types.h"
#include "segment_symbols.h"


// FAKE!!
typedef struct unk_Light_t {
s8 unk_00[0x8];
s16 unk_08[3];
} unk_Light_t;

typedef union unk_Light {
unk_Light_t l;
long long int force_structure_alignment[2];
} unk_Light;

// ROUGH APPROXIMATIONS OF SIZES, NOT CORRECT!!

typedef struct GfxPool {
Expand All @@ -33,7 +45,7 @@ typedef struct GfxPool {
Mtx unk_21988[1];
s8 pad_219C8[0xC0];
Lights1 unk_21A88[4];
s8 pad_21AE8[0x40];
unk_Light unk_21AE8[4];
LookAt unk_21B28;
Vtx unk_21B48[2048];
Vtx unk_29B48[28];
Expand Down
67 changes: 30 additions & 37 deletions include/unk_structs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ typedef struct unk_8006FC8C {
/* 0x38 */ struct unk_8006FC8C* prev;
/* 0x3C */ struct unk_36ED0* unk_3C;
/* 0x40 */ struct unk_36ED0* unk_40;
/* 0x44 */ s8 unk_44[0x8];
/* 0x44 */ struct unk_802D3D38* unk_44;
/* 0x48 */ struct unk_802D3D38* unk_48;
/* 0x4C */ struct unk_802D3978* unk_4C;
/* 0x50 */ struct unk_802D3978* unk_50;
/* 0x54 */ struct unk_802D3E38* unk_54;
Expand Down Expand Up @@ -64,6 +65,13 @@ typedef struct unk_802D3E38 {
s8 unk_24[0x4];
} unk_802D3E38; // size = 0x28

typedef struct unk_802D3D38 {
Vec3f unk_00;
Mtx3F unk_0C;
Vec3f unk_30;
s8 unk_3C[0x4];
} unk_802D3D38; // size = 0x40

typedef struct unk_8006FF90_arg_1 {
s32 unk_00;
s32 unk_04;
Expand All @@ -73,25 +81,12 @@ typedef struct unk_8006FF90_arg_1 {
f32 unk_14;
} unk_8006FF90_arg_1; // size = 0x18

typedef struct unk_8006FF90_arg_2 {
s16 unk_00;
s16 unk_02;
s16 unk_04;
s16 unk_06;
s16 unk_08;
s16 unk_0A;
s16 unk_0C;
s16 unk_0E;
} unk_8006FF90_arg_2; // size = 0x10

typedef struct unk_802D1B60_unk_00 {
s32 unk_00;
s32 unk_04;
f32 unk_08;
f32 unk_0C;
f32 unk_10;
f32 unk_14;
f32 unk_18;
Vec3f unk_10;
} unk_802D1B60_unk_00; // size = 0x1C

typedef struct unk_802D1B60 {
Expand All @@ -101,17 +96,11 @@ typedef struct unk_802D1B60 {
s32 unk_0C;
} unk_802D1B60;

typedef struct unk_802A9FC0 {
s8 unk_00[0x14];
Vec3f unk_14;
s8 unk_20[0x40];
} unk_802A9FC0; // size = 0x60

typedef struct unk_802D08E0 {
Vec3f unk_00;
Mtx3F unk_0C;
f32 unk_30;
unk_802A9FC0* unk_34;
struct unk_36ED0* unk_34;
} unk_802D08E0; // size = 0x38

typedef struct unk_800E3A28 {
Expand Down Expand Up @@ -305,7 +294,7 @@ typedef struct Racer {
Vec3f unk_68;
Vec3f unk_74;
Vec3f unk_80;
s8 unk_8C[0xC];
Vec3f unk_8C;
f32 unk_98;
f32 maxSpeed;
f32 unk_A0;
Expand All @@ -317,7 +306,7 @@ typedef struct Racer {
Mtx3F unk_E8;
Vec3f unk_10C;
Vec3f unk_118;
s8 unk_124[0x40];
MtxF unk_124;
s8 unk_164;
s8 unk_165;
s8 unk_166;
Expand All @@ -336,9 +325,10 @@ typedef struct Racer {
f32 unk_1B4;
f32 unk_1B8;
f32 unk_1BC;
s8 unk_1C0[0x4];
f32 unk_1C0;
f32 unk_1C4;
s8 unk_1C8[0x8];
f32 unk_1C8;
f32 unk_1CC;
f32 unk_1D0;
f32 unk_1D4;
f32 unk_1D8;
Expand All @@ -350,7 +340,7 @@ typedef struct Racer {
f32 unk_1F0;
f32 unk_1F4;
f32 unk_1F8;
s8 unk_1FC[0x4];
f32 unk_1FC;
f32 unk_200;
s32 unk_204;
s32 unk_208;
Expand All @@ -376,7 +366,7 @@ typedef struct Racer {
s16 unk_278;
s16 unk_27A;
s32 unk_27C;
s8 unk_280[0x4];
s32 unk_280;
s16 unk_284;
s16 unk_286;
s32 unk_288;
Expand All @@ -398,8 +388,8 @@ typedef struct Racer {
f32 unk_2C4;
s8 character;
s8 unk_2C9;
s8 unk_2CA;
s8 unk_2CB;
u8 unk_2CA;
u8 unk_2CB;
s16 unk_2CC;
s16 unk_2CE;
s16 unk_2D0;
Expand All @@ -419,7 +409,10 @@ typedef struct Racer {
f32 unk_2F8;
f32 unk_2FC;
f32 unk_300;
s8 unk_304[0x18];
f32 unk_304;
f32 unk_308;
f32 unk_30C;
s8 unk_310[0xC];
f32 unk_31C;
f32 unk_320;
f32 unk_324;
Expand Down Expand Up @@ -567,8 +560,8 @@ typedef struct unk_802D2D70 {

typedef struct unk_802D2D78 {
s32 unk_00;
unk_8006FF90_arg_2* unk_04;
unk_8006FF90_arg_2* unk_08;
Vtx* unk_04;
Vtx* unk_08;
s8 unk_0C[0x4];
} unk_802D2D78; // size = 0x10

Expand Down Expand Up @@ -640,7 +633,7 @@ typedef struct unk_800F5DF0 {
s32 unk_14;
s32 unk_18;
s32 unk_1C;
s8 unk_20[0xC];
Vec3f unk_20;
f32 unk_2C;
Racer* unk_30;
} unk_800F5DF0; // size 0x34
Expand Down Expand Up @@ -771,7 +764,7 @@ typedef struct unk_80111870 {
Vec3f unk_00;
Vec3f unk_0C;
f32 unk_18;
u32 unk_1C;
s32 unk_1C;
Racer* unk_20;
} unk_80111870; // size = 0x24

Expand Down Expand Up @@ -820,8 +813,8 @@ typedef struct unk_800CF1B0 {

typedef struct unk_80225800 {
Mtx unk_000;
Vtx unk_040[4][6];
Vtx unk_1C0[48][5];
Vtx unk_040[4 * 6];
Vtx unk_1C0[48 * 5];
} unk_80225800; // size = 0x10C0

#endif // UNK_STRUCTS_H
Loading
Loading