Matches in code_80005D0 (#487)

* Variety of matches
This commit is contained in:
MegaMech
2023-11-07 20:17:28 -07:00
committed by GitHub
parent b6abd829d2
commit f75460cb8b
10 changed files with 587 additions and 2211 deletions
+5 -5
View File
@@ -18,17 +18,17 @@
f32 D_800DDB30[] = { 0.4f, 0.6f, 0.275f, 0.3f };
// Future BSS section, replaces unknown amount of stuff in bss_8001C4D0.s
// f32 D_80164A30;
// s32 D_80164A2C;
// f32 D_8016524C; <- could maybe, maybe be part of spawn_players' bss stuff?
Camera cameras[4];
Camera *camera1 = &cameras[0];
Camera *camera2 = &cameras[1];
Camera *camera3 = &cameras[2];
Camera *camera4 = &cameras[3];
// Future BSS section, replaces unknown amount of stuff in bss_8001C4D0.s
// f32 D_80164A30;
// s32 D_80164A2C;
// f32 D_8016524C; <- could maybe, maybe be part of spawn_players' bss stuff?
extern f32 D_80164498[];
extern s16 D_80164678[];
extern f32 D_801649D8[]; // f32[4]
+494 -735
View File
File diff suppressed because it is too large Load Diff
+77 -9
View File
@@ -49,6 +49,14 @@ typedef struct {
extern D_801642D8_entry D_801642D8[];
typedef struct {
u16 unk0;
u16 unk2;
u16 unk4;
u16 unk6;
} UnkStruct_46D0;
/* Function Prototypes */
void func_80012190(void);
void func_8000BA14(u16, f32, f32, s16);
@@ -128,12 +136,16 @@ void func_800107C4(s32);
s16 func_80010CB0(s32, s32);
void func_80010DBC(s32);
void func_80010E6C(s32);
f32 func_80010F40(f32, f32, f32, s32);
f32 func_80010FA0(f32, f32, f32, s32);
f32 func_80010F40(f32, f32, f32, s32, s32);
f32 func_80010FA0(f32, f32, f32, s32, s32);
u16 func_80011014(TrackWaypoint *, TrackWaypoint *, s32, s32);
s32 func_80011014(TrackWaypoint *, TrackWaypoint *, s32, s32);
s32 process_path_data(TrackWaypoint*, TrackWaypoint*);
s32 func_8001168C(void*, void*, s32);
typedef struct {
s16 x;
s16 z;
} PathNoY;
s32 func_8001168C(PathNoY*, TrackWaypoint*, s32);
void func_80011A5C(void);
void func_80011AB8(s32);
void func_80011AE4(s32);
@@ -232,13 +244,73 @@ extern s16 D_8016347A;
// Suspected to be the "width" of each waypoint. See data_0DD0A0_1.s
extern f32 D_800DCA4C[];
struct _struct_D_800DD9D0_0x10 {
/* 0x00 */ u16 unk0;
/* 0x02 */ u16 unk2;
/* 0x04 */ u16 unk4;
/* 0x06 */ u16 unk6;
/* 0x08 */ u16 unk8;
/* 0x0A */ char padA[6];
}; // size 0x10
extern uintptr_t *D_80163598;
extern uintptr_t gCoursePathTable[20][4];
extern uintptr_t D_800DC8D0[20][4];
// An array of 21 items. The final element is for podium ceremony.
extern struct _struct_D_800DD9D0_0x10 D_800DD9D0[];
extern s16 D_80162F10[];
extern s16 D_80162F50[];
extern s16 D_80162FF8[];
extern s16 D_80163010[];
extern f32 D_80163028[];
extern s16 D_80163050[];
extern f32 D_80163090[];
extern u16 D_80163258[];
extern u16 D_80163270[];
extern s16 D_80163346[];
extern s32 D_801630B8[];
extern s16 D_801630E8[];
extern s32 D_80163100[];
extern s32 D_80163128[];
extern s32 D_80163150[];
extern f32 D_80163178[];
extern f32 D_801631A0[];
extern s32 D_801631CC;
extern s16 D_801631F8[];
extern f32 D_80163210[];
extern s32 D_80163288[];
extern u16 D_80163330[]; // static?
extern u16 D_80163344[];
extern u16 D_8016334C[];
extern s16 D_80163350[];
extern s32 D_80163378;
extern s16 D_80163380[];
extern s16 D_80163398[];
extern s16 D_801633B0[];
extern s16 D_801633C8[];
extern s16 D_801633F8[];
extern f32 D_80163450[];
extern s16 D_801634C0[];
extern s16 D_801634EC;
extern s32 D_801634F0;
extern s32 D_801634F4;
extern s16 D_80164358;
extern s16 D_8016435A;
extern s16 D_8016435C;
extern s16 D_80164538[];
extern f32 D_80164698;
extern f32 D_8016469C;
extern f32 D_801646A0;
extern f32 D_800DCAA0[];
// See bss_80005FD0.s
extern Collision D_80162E70;
extern s16 D_80162EB0;
extern s16 D_80162FCC;
extern f32 D_80162FA0[];
extern f32 gCourseCompletionPercentByRank[8]; // D_80162FD8
extern u16 D_80163348[];
extern s16 D_80164378[];
extern s32 D_801643E0[];
extern struct unexpiredActors gUnexpiredActorsList[];
@@ -258,11 +330,7 @@ extern s16 D_80164672;
extern s16 D_80164674;
extern s16 D_80164676;
extern s16 D_80164678[]; // Size 4? Is the three below this fake?
extern s16 D_8016467A;
extern s16 D_8016467C;
extern s16 D_8016467E;
extern s16 D_80164680[];
extern s16 D_80164682;
extern f32 D_80164688[];
extern s16 D_801646C0[];
extern s16 D_801646CC;