mirror/mk64
1
0
Fork 0
mirror of https://github.com/n64decomp/mk64 synced 2026-06-27 09:23:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

Match a few functions in code_800431B0 (#192)

Browse Source 
Signed-off-by: Taggerung <tyler.taggerung@gmail.com>
This commit is contained in:
Tyler McGavran
2022-05-07 00:59:17 -04:00
committed by GitHub
parent ecb085b291
commit 67331d5dda
4 changed files with 41 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code_800431B0.c
+41 -69
View File
@@ -4,16 +4,16 @@
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
extern void func_80042E00(s32, s32, f32); // extern
extern s8 D_0D006940[];
extern Gfx D_0D006940[];
extern Gfx *gDisplayListHead;
void func_800431B0(s32 arg0, Vtx *arg1, f32 arg2, s32 arg3) {
func_80042E00(arg0, arg1, arg2);
gSPVertex(gDisplayListHead++, arg3, 4, 0);
gSPDisplayList(gDisplayListHead++, &D_0D006940);
gSPDisplayList(gDisplayListHead++, D_0D006940);
}
extern s8 D_0D0077A0[];
extern Gfx D_0D0077A0[];
void func_80043220(s32 arg0, s32 arg1, f32 arg2, s32 arg3) {
func_80042E00(arg0, arg1, arg2);
gSPDisplayList(gDisplayListHead++, &D_0D0077A0);
@@ -22,13 +22,13 @@ void func_80043220(s32 arg0, s32 arg1, f32 arg2, s32 arg3) {
UNUSED void func_800433288(s32 arg0, s32 arg1, f32 arg2, s32 arg3) {
func_80042E00(arg0, arg1, arg2);
gSPDisplayList(gDisplayListHead++, &D_0D0077A0);
gSPDisplayList(gDisplayListHead++, D_0D0077A0);
gSPClearGeometryMode(gDisplayListHead++, G_CULL_BOTH);
gSPDisplayList(gDisplayListHead++, arg3);
gSPSetGeometryMode(gDisplayListHead++, G_CULL_BACK);
}
extern s8 D_0D0077D0[];
extern Gfx D_0D0077D0[];
void func_80043328(s32 arg0, s32 arg1, f32 arg2, s32 arg3) {
func_80042E00(arg0, arg1, arg2);
@@ -36,35 +36,35 @@ void func_80043328(s32 arg0, s32 arg1, f32 arg2, s32 arg3) {
gSPDisplayList(gDisplayListHead++, arg3);
}
extern s8 D_0D0077F8[];
extern s8 D_0D007828[];
extern Gfx D_0D0077F8[];
extern Gfx D_0D007828[];
UNUSED void *func_80043390(s32 arg0, s32 arg1, f32 arg2, s32 arg3) {
func_80042E00(arg0, arg1, arg2);
gSPDisplayList(gDisplayListHead++, &D_0D0077F8);
gSPDisplayList(gDisplayListHead++, D_0D0077F8);
gSPDisplayList(gDisplayListHead++, arg3);
}
UNUSED void func_800433F8(s32 arg0, s32 arg1, f32 arg2, s32 arg3) {
func_80042E00(arg0, arg1, arg2);
gSPDisplayList(gDisplayListHead++, &D_0D007828);
gSPDisplayList(gDisplayListHead++, D_0D007828);
gSPDisplayList(gDisplayListHead++, arg3);
}
UNUSED void func_80043460(s32 arg0, s32 arg1, f32 arg2, s32 arg3) {
func_80042E00(arg0, arg1, arg2);
gSPDisplayList(gDisplayListHead++, &D_0D007828);
gSPDisplayList(gDisplayListHead++, D_0D007828);
gSPClearGeometryMode(gDisplayListHead++, G_CULL_BOTH);
gSPDisplayList(gDisplayListHead++, arg3);
gSPSetGeometryMode(gDisplayListHead++, G_CULL_BACK);
}
extern s8 D_0D007850[];
extern Gfx D_0D007850[];
void func_80043500(s32 arg0, s32 arg1, f32 arg2, s32 arg3) {
func_80042E00(arg0, arg1, arg2);
gSPDisplayList(gDisplayListHead++, &D_0D007850);
gSPDisplayList(gDisplayListHead++, D_0D007850);
gSPClearGeometryMode(gDisplayListHead++, G_CULL_BOTH);
gSPDisplayList(gDisplayListHead++, arg3);
gSPSetGeometryMode(gDisplayListHead++, G_CULL_BACK);
@@ -109,24 +109,12 @@ void func_800435A0(? arg2, s32 arg3, s32 arg4) {
GLOBAL_ASM("asm/non_matchings/code_800431B0/func_800435A0.s")
#endif
#ifdef MIPS_TO_C
UNUSED void func_80043668(? arg2, s32 arg3) {
void* temp_v0;
void* temp_v0_2;
func_80042E00(arg2, arg2);
temp_v0 = gDisplayListHead;
gDisplayListHead = temp_v0 + 8;
temp_v0->unk4 = &D_0D0078A0;
temp_v0->unk0 = 0x06000000;
temp_v0_2 = gDisplayListHead;
gDisplayListHead = temp_v0_2 + 8;
temp_v0_2->unk0 = 0x06000000;
temp_v0_2->unk4 = arg3;
extern Gfx D_0D0078A0[];
UNUSED void func_80043668(s32 arg0, Vtx *arg1, f32 arg2, Vtx *arg3) {
func_80042E00(arg0, arg1, arg2);
gSPDisplayList(gDisplayListHead++, D_0D0078A0);
gSPDisplayList(gDisplayListHead++, arg3);
}
#else
GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80043668.s")
#endif
#ifdef MIPS_TO_C
UNUSED void func_800436D0(s32 arg2, ? arg3, s32 arg4) {
@@ -1548,49 +1536,33 @@ void func_80045738(s32 arg0, s32 arg1, s32 arg2, s32 arg3) {
GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80045738.s")
#endif
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
extern ? D_0D006940;
extern void *gDisplayListHead;
void func_80045B2C(s32 arg0) {
void *temp_v1;
void *temp_v1_2;
temp_v1 = gDisplayListHead;
gDisplayListHead = temp_v1 + 8;
temp_v1->unk4 = arg0;
temp_v1->unk0 = 0x400103F;
temp_v1_2 = gDisplayListHead;
gDisplayListHead = temp_v1_2 + 8;
temp_v1_2->unk0 = 0x6000000;
temp_v1_2->unk4 = &D_0D006940;
void func_80045B2C(Vtx *arg0) {
gSPVertex(gDisplayListHead++, arg0, 4, 0);
gSPDisplayList(gDisplayListHead++, D_0D006940);
}
#else
GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80045B2C.s")
#endif
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
extern ? D_0D006930;
extern void *gDisplayListHead;
void func_80045B74(s32 arg0) {
void *temp_v1;
void *temp_v1_2;
temp_v1 = gDisplayListHead;
gDisplayListHead = temp_v1 + 8;
temp_v1->unk4 = arg0;
temp_v1->unk0 = 0x4000C2F;
temp_v1_2 = gDisplayListHead;
gDisplayListHead = temp_v1_2 + 8;
temp_v1_2->unk0 = 0x6000000;
temp_v1_2->unk4 = &D_0D006930;
extern Gfx D_0D006930[];
void func_80045B74(Vtx *arg0) {
gSPVertex(gDisplayListHead++, arg0, 3, 0);
gSPDisplayList(gDisplayListHead++, D_0D006930);
}
UNUSED void func_80045BBC(s32 arg0, Vtx *arg1, f32 arg2, Vtx *arg3) {
func_80042E00(arg0, arg1, arg2);
gSPDisplayList(gDisplayListHead++, D_0D0078A0);
gSPVertex(gDisplayListHead++, arg3, 4, 0);
gSPDisplayList(gDisplayListHead++, D_0D006940);
}
extern Gfx D_0D0078D0[];
UNUSED void func_80045C48(s32 arg0, Vtx *arg1, f32 arg2, Vtx *arg3) {
func_80042E00(arg0, arg1, arg2);
gSPDisplayList(gDisplayListHead++, D_0D0078D0);
gSPClearGeometryMode(gDisplayListHead++, G_CULL_BOTH);
gSPVertex(gDisplayListHead++, arg3, 4, 0);
gSPDisplayList(gDisplayListHead++, D_0D006940);
gSPSetGeometryMode(gDisplayListHead++, G_CULL_BACK);
}
#else
GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80045B74.s")
#endif
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307