mirror/mk64
1
0
Fork 0
mirror of https://github.com/n64decomp/mk64 synced 2026-07-28 15:17:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Lots of matches related to the object list (#284)

Browse Source 
Identified a couple more lists of object list indices, added some
 comments indicating what they're used for. Those comments are
 most likely non-exhaustive so there's still some investigation
 to be done there.

Signed-off-by: Taggerung <tyler.taggerung@gmail.com>
This commit is contained in:
Tyler McGavran
2022-12-28 22:19:11 -05:00
committed by GitHub
parent 94b3a6f07b
commit c705bc4a6a
62 changed files with 974 additions and 4772 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/actors.h
-1
View File
@@ -113,7 +113,6 @@ void update_simple_objects();
// audio/external.c
extern void func_800C98B8(Vec3f, Vec3f, u32);
extern void func_800C99E0(Vec3f, s32);
extern void func_800C9D80(Vec3f, Vec3f, u32);
extern Vec3f D_802B91C8;
src/audio/external.h
+1
View File
@@ -118,6 +118,7 @@ void func_800C8F44(u8);
void func_800C9060(u8, u32);
void func_800C90F4(u8, uintptr_t);
void func_800C9A88(u8);
void func_800C9D80(Vec3f, Vec3f, u32);
void func_800C9EF4(Vec3f, u32);
void func_800C9F90(u8);
void func_800CA008(u8, u8);
src/code_800431B0.c
+283 -668
View File
File diff suppressed because it is too large Load Diff
src/code_800431B0.h
+28
View File
@@ -307,22 +307,35 @@ void func_800523B8(s32, s32, u32);
void func_800524B4(s32);
void func_800524B4(s32);
void func_800527D8(s32);
void func_8005285C(s32);
void func_80052590(s32);
void func_80052C60();
void func_80052D70(s32);
void func_80052E30(s32);
void func_8005309C(s32);
void func_8005327C(s32);
void func_800532A4(s32);
void func_800534E8(s32);
void func_800536C8(s32);
void func_80053870(s32);
void func_80053D74(s32, s32, s32);
void func_80053E6C(s32);
void func_800540CC(s32, s32);
void func_800541BC(s32);
void func_80054324(s32, s32);
void func_80054414(s32);
void func_8005457C(s32, s32);
void func_80054664(s32);
void func_8005477C(s32, u8, Vec3f);
void func_80054938(s32);
void func_80054AFC(s32, Vec3f);
void func_80054BE8(s32);
void func_80054D00(s32, s32);
void func_80054E10(s32);
void func_80054EB8(s32);
void func_80054F04(s32);
void func_800550A4(s32);
void func_80055228(s32);
@@ -334,6 +347,7 @@ void func_8005568C(s32);
void func_800557AC();
void func_8005592C(s32);
void func_80055C38(s32);
void func_80055CCC(s32, s32);
void func_80055E68(s32);
void func_80055EF4(s32, s32);
void func_80055F48(s32);
@@ -342,6 +356,7 @@ void func_80055FA0(s32, s32);
void func_80056160(s32);
void func_80056188(s32);
void func_800568A0(s32, s32);
void func_8005669C(s32, s32, s32);
void func_800569F4(s32);
void func_80056A40(s32, s32);
void func_80056A94(s32);
@@ -384,13 +399,18 @@ extern u16 D_801656D0;
extern u16 D_801656E0;
extern s32 D_80183DD8[];
extern Vec3f D_80183E40;
extern Vec3f D_80183E50;
extern Vec3f D_80183E70;
extern Vec3s D_80183E80;
extern s32 D_80183E88[];
extern Vec3s D_80183E98;
extern s32 D_80183EAC;
extern UnkActorInner D_8018C830;
extern s32 D_8018D1E0;
extern s32 D_8018D1F0;
extern struct UnkStruct_800DC5EC *D_800DC5F0;
extern Lights1 D_800E4638;
extern Lights1 D_800E4650;
@@ -405,4 +425,12 @@ extern u8 D_06006F38[]; // Some type of pallette?
extern Gfx *gDisplayListHead;
// Stuff from undefined_syms.txt, don't know where else to put them
extern s8 D_06013670[];
extern Gfx D_06007218[];
extern Gfx D_0600F650[];
extern Gfx D_0600F960[];
extern Gfx D_0600FA20[];
extern Gfx D_0600FBE0[];
#endif
src/code_80057C60.c
+6 -5
View File
@@ -17,6 +17,7 @@
#include "skybox_and_splitscreen.h"
#include "common_textures.h"
#include "audio/external.h"
#include "objects.h"
// UI Code?
void func_80057C60(void) {
@@ -390,16 +391,16 @@ void func_800588F4(s32 arg0) {
void func_80058B58() {
switch(gCurrentCourseId) {
case 5:
case COURSE_FRAPPE_SNOWLAND:
if (gGamestate != 9) {
if ((D_8015F894 == 0) && (gPlayerCountSelection1 == COURSE_CHOCO_MOUNTAIN)) {
if ((D_8015F894 == 0) && (gPlayerCountSelection1 == 1)) {
func_800517C8();
}
break;
} else {
func_800517C8();
}
func_800517C8();
break;
case 12:
case COURSE_SHERBET_LAND:
func_80052C60();
break;
}
src/code_80057C60.h
-1
View File
@@ -204,7 +204,6 @@ extern s8 D_801657C8;
extern s32 D_8018D22C;
extern s32 gGamestate;
extern u16 D_800DC51C;
extern s16 D_80165730;
extern s8 D_8018EDF3;
extern s8 D_80165898;
extern u16 D_8015F894;
src/code_8006E9C0.h
-1
View File
@@ -14,7 +14,6 @@ void func_80070714();
extern s32 gScreenModeSelection;
extern s32 gTextureLogoMarioKart64;
extern s16 D_80165730;
extern s16 D_80165738;
extern s16 D_80165740;
extern s16 D_80165748;
extern s32 D_80183D5C;
src/code_80071F00.c
+557 -1120
View File
File diff suppressed because it is too large Load Diff
src/code_80071F00.h
+46 -11
View File
@@ -109,36 +109,64 @@ void func_800748F4(s32, s32);
void func_80074924(s32);
void func_80074D94(s32);
void func_80074E28(s32);
void func_80074EE8();
void func_80074FD8(s32);
void func_800750D8(s32, s32, Vec3f, s32, s32);
void func_80075304(Vec3f, s32, s32, s32);
void func_8007542C(s32);
void func_80075574(s32, Vec3f, f32);
s32 func_800755FC(s32, Vec3f, f32);
void func_80075698(s32);
void func_80075714(s32);
void func_800759EC(s32, Vec3f, f32);
s32 func_80075A6C(s32, s32, f32);
s32 func_80075A6C(s32, Vec3f, f32);
void func_80075B08(s32);
void func_80075B84(s32);
void func_80075E5C(s32, Vec3f, u16, f32, s32);
s32 func_80075F28(Vec3f, u16, f32, s32);
void func_80075F98(Vec3f, s32, f32);
void func_80075F98(Vec3f, u16, f32);
void func_8007601C(s32);
void func_8007614C();
void func_80076194(s32, Vec3f, f32, s32);
s32 func_80076278(Vec3f, f32, s32);
void func_800762DC(Vec3f, f32);
void func_8007634C(s32);
void func_800763CC(s32);
void func_80076538(s32);
void func_8007661C();
void func_8007675C(s32, Vec3s, s32);
s32 func_80076828(Vec3s, s32);
void func_80076958(s32);
void func_800769D8(s32);
void func_80076AEC(s32);
void func_80076B7C();
void func_80076B84();
void func_80076C9C(s32, Vec3f, s16);
void func_80076D70(Vec3f, s32, s16);
void func_80076DC4(s32);
void func_80076E14(s32);
void func_80076ED8(s32);
void func_80076F2C();
void func_80076FEC(s32, s32);
void func_800770F0(s32);
void func_800773D8(s32, s32);
void func_80077428(s32);
void func_80077450(s32);
void func_80077584(s32);
void func_80077640();
void func_80077700(s32, Vec3f, s32);
s32 func_80077A54(Vec3f, s32);
void func_80077AB0(Vec3f, s32);
void func_80077B14(s32);
void func_80077B3C(s32);
void func_80077BCC(s32);
void func_80077C9C();
void func_80077E20(s32);
void func_80078220(s32);
void func_80078288(s32);
void func_800786EC(s32);
void func_80078790();
void func_80078838();
void func_80078C68();
void func_80078C70(s32);
void func_80078F64();
@@ -164,16 +192,27 @@ void func_8007BD04(s32);
void func_8007BDA8();
void func_8007C2F8(s32);
void func_8007C340();
void func_8007C360(s32, Camera*);
void func_8007C420(s32, Player*, Camera*);
void func_8007C4A4(s32);
void func_8007C550(s32);
void func_8007C49C();
void func_8007D360(s32, s32);
void func_8007D6A8(s32, s32);
void func_8007D714(s32);
s32 func_8007D804(s32);
void func_8007D8AC(s32);
void func_8007D8D4(s32, s32);
void func_8007DA4C(s32);
void func_8007DA74(s32);
void func_8007DAF8(s32, s32);
void func_8007DDC0(s32);
void func_8007E1F4(s32);
void func_8007E358(s32);
void func_8007E3EC(s32);
void func_8007E4C4();
s32 func_8007E50C(s32, Player*, Camera*);
s32 func_8007E59C(s32);
void func_8007EFBC(s32);
void func_8007F280(s32);
void func_8007F544(s32);
@@ -205,9 +244,6 @@ void func_80086424(s32);
void func_80086604();
void func_80086D80();
// audio/external.c
void func_800C9D80(Vec3f, Vec3f, u32);
s32 osPiStartDma(OSIoMesg *mb, s32 priority, s32 direction, uintptr_t devAddr, void *vAddr, size_t nbytes, OSMesgQueue *mq);
s32 osRecvMesg(OSMesgQueue*, OSMesg*, s32);
@@ -221,16 +257,15 @@ extern f64 D_800EEAD0;
extern f32 D_800EEAD8;
extern f64 D_800EEAE0;
extern f32 D_800EEAE8;
extern s32 D_80162DF8;
extern s32 D_80165598;
extern s16 D_80165740;
extern s8 D_801657B4;
extern Vec3su D_8016582C;
extern s32 D_80183D5C;
extern s32 D_80183DB8[];
extern s32 D_80183E38;
extern s32 D_80183E4C;
extern s32 D_80183E5C;
extern s32 D_8018C1B0;
extern s32 D_8018C3F0;
extern s32 D_8018C630;
extern s32 D_80183EA8;
extern s16 D_8018CFE8;
extern f32 D_8018D01C;
extern s32 D_8018D140;
extern s32 D_8018D224;