diff --git a/src/unknown_06B2B0.c b/src/unknown_06B2B0.c index b3a29691..73eca5f4 100644 --- a/src/unknown_06B2B0.c +++ b/src/unknown_06B2B0.c @@ -5,12 +5,14 @@ #include #include +#include #include "memory.h" #include "types.h" #include "macros.h" #include "structs.h" #include "f3ddkr.h" #include "asset_sections.h" +#include "asset_loading.h" #include "menu.h" #include "video.h" #include "lib/src/mips1/sc/sched.h" @@ -19,6 +21,10 @@ #include "thread0_epc.h" #include "thread30.h" #include "unknown_0ABDF0.h" +#include "audio.h" +#include "unknown_00BC20.h" +#include "camera.h" +#include "controller_pak.h" /************ .rodata ************/ @@ -121,15 +127,6 @@ s32 gNumberOfLevelHeaders; s32 gNumberOfWorlds; s8 *D_80121178; - -/* Size: 6 bytes */ -typedef struct unk8012117C { - s8 unk0; - s8 unk1; - s8 unk2; - s8 unk3; - s16 unk4; -} unk8012117C; unk8012117C *D_8012117C; s32 D_80121180[16]; @@ -186,47 +183,6 @@ extern s32 gVideoCurrFramebuffer; extern s32 gVideoLastFramebuffer; extern s32 gVideoLastDepthBuffer; -void func_8006F43C(void); - -void func_800014BC(f32 arg0); -s8 *get_misc_asset(s32 arg0); -s32 func_8006A624(s8 arg0); -void func_8006F870(Matrix, s32*); -s16 get_level_segment_index_from_position(f32, f32, f32); -void func_8006A50C(void); -void func_800665E8(s32 arg0); -void load_level_2(s32 arg0, s32 arg1, s32 arg2, s32 arg3); -void func_8006C164(void); -void func_8000E194(void); -f32 sqrtf(f32); -void osSetTime(u64); -void func_8001D5E0(f32 arg0, f32 arg1, f32 arg2); -void func_800705F8(s32, f32, f32, f32); -void func_8006ECFC(s32 arg0); -void load_level_3(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4); -void func_800813C0(); -void func_80004A60(s32, s32); -void render(void); -void func_8006C3E0(void); -Settings *get_settings(void); -s32 is_in_tracks_mode(void); -s32 *load_asset_section_from_rom(s32); -void load_asset_to_address(u32, s32*, s32, s32); -void func_8006C1AC(s32 arg0, s32 arg1, s32 arg2, s32 arg3); -void func_8006C2E4(void); -s16 func_8006C2F0(void); -void func_8006DB20(s32 arg0); -void func_80072708(void); -void update_camera_fov(f32); -void func_8006BFC8(s8 *arg0); -void func_80068158(Gfx**, s32, s32, s32, s32); -s32 get_trophy_race_world_id(void); -void func_8006DCF8(s32 arg0); -void func_8006EC48(s32 arg0); -void calc_and_alloc_heap_for_settings(void); -void reset_character_id_slots(void); -void func_8006EFDC(void); - #ifdef NON_MATCHING void func_8006A6B0(void) { @@ -1499,8 +1455,8 @@ void func_8006DB14(s32 arg0) { D_80123518 = arg0; } -void func_8006DB20(s32 arg0) { - D_8012351C = arg0; +void func_8006DB20(s32 vehicleId) { + D_8012351C = vehicleId; } s32 func_8006DB2C(void) { diff --git a/src/unknown_06B2B0.h b/src/unknown_06B2B0.h index d746e2bc..7280c5d1 100644 --- a/src/unknown_06B2B0.h +++ b/src/unknown_06B2B0.h @@ -2,6 +2,7 @@ #define _UNKNOWN_06B2B0_H_ #include "types.h" +#include "structs.h" typedef struct unknown800DD408 { u8 unk0; @@ -12,6 +13,15 @@ typedef struct unknown800DD408 { u16 unk6; } unknown800DD408; +/* Size: 6 bytes */ +typedef struct unk8012117C { + s8 unk0; + s8 unk1; + s8 unk2; + s8 unk3; + s16 unk4; +} unk8012117C; + enum NumberOfPlayers { ZERO_PLAYERS = -1, // A.I. Only ONE_PLAYER = 0, @@ -86,4 +96,28 @@ extern s32 D_800DD41C[2]; extern s32 D_800DD424[2]; +void func_8006F870(Matrix, Matrix); //unknown_070110 +void func_800705F8(s32, f32, f32, f32); //From unknown_070110 +f32 sqrtf(f32); //IDO? + +void func_8006F43C(void); +void load_level_2(s32 levelId, s32 numberOfPlayers, s32 entranceId, s32 vehicleId); +void func_8006C164(void); +void load_level_3(s32 levelId, s32 numberOfPlayers, s32 entranceId, s32 vehicleId, s32 cutsceneId); +void render(void); +void func_8006C3E0(void); +Settings *get_settings(void); +void func_8006C1AC(s32 arg0, s32 arg1, s32 arg2, s32 arg3); +void func_8006C2E4(void); +s16 func_8006C2F0(void); +void func_8006DB20(s32 vehicleId); +void func_8006BFC8(s8 *arg0); +void func_8006EC48(s32 arg0); +void calc_and_alloc_heap_for_settings(void); + +//Non Matching +void func_8006ECFC(s32 arg0); +void func_8006DCF8(s32 arg0); +void func_8006EFDC(void); + #endif