Decomped some of 80057C60 & 800431B0

This commit is contained in:
CoderStig
2021-12-25 18:12:52 -07:00
parent 5a151c1457
commit d6e9866399
15 changed files with 5056 additions and 6012 deletions
+36 -143
View File
@@ -4060,81 +4060,28 @@ void func_8004BB3C(s32 arg0, s32 arg1, s32 arg2, s32 arg3, f32 arg4) {
GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004BB3C.s")
#endif
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_8004B97C(s16, s16, s16, ?, s32); // extern
extern void *gDisplayListHead;
extern Gfx *gDisplayListHead;
void func_8004C024(s16 arg0, s16 arg1, s16 arg2, u16 arg3, u16 arg4, u16 arg5, u16 arg6) {
void *temp_v0;
void *temp_v0_2;
void *temp_v0_3;
void *temp_v0_4;
void *temp_v0_5;
temp_v0 = gDisplayListHead;
gDisplayListHead = temp_v0 + 8;
temp_v0->unk0 = 0xFA000000;
temp_v0->unk4 = (arg3 << 0x18) | ((arg4 & 0xFF) << 0x10) | ((arg5 & 0xFF) << 8) | (arg6 & 0xFF);
temp_v0_2 = gDisplayListHead;
gDisplayListHead = temp_v0_2 + 8;
temp_v0_2->unk4 = 0;
temp_v0_2->unk0 = 0xBA000E02;
temp_v0_3 = gDisplayListHead;
gDisplayListHead = temp_v0_3 + 8;
temp_v0_3->unk4 = 0;
temp_v0_3->unk0 = 0xBA001301;
temp_v0_4 = gDisplayListHead;
gDisplayListHead = temp_v0_4 + 8;
temp_v0_4->unk4 = 0xFFFDF6FB;
temp_v0_4->unk0 = 0xFCFFFFFF;
temp_v0_5 = gDisplayListHead;
gDisplayListHead = temp_v0_5 + 8;
temp_v0_5->unk4 = 0x504240;
temp_v0_5->unk0 = 0xB900031D;
gDPSetPrimColor(gDisplayListHead++, 0, 0, arg3, arg4, arg5, arg6);
gDPSetTextureLUT(gDisplayListHead++, G_TT_NONE);
gDPSetTexturePersp(gDisplayListHead++, G_TP_NONE);
gDPSetCombineMode(gDisplayListHead++, G_CC_PRIMITIVE, G_CC_PRIMITIVE);
gDPSetRenderMode(gDisplayListHead++, G_RM_XLU_SURF, G_RM_XLU_SURF2);
func_8004B97C(arg0, arg1, arg2, 1, 1);
}
#else
GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004C024.s")
#endif
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_8004B97C(s16, s16, ?, s16, s32); // extern
extern void *gDisplayListHead;
void func_8004C148(s16 arg0, s16 arg1, s16 arg2, u16 arg3, u16 arg4, u16 arg5, u16 arg6) {
void *temp_v0;
void *temp_v0_2;
void *temp_v0_3;
void *temp_v0_4;
void *temp_v0_5;
temp_v0 = gDisplayListHead;
gDisplayListHead = temp_v0 + 8;
temp_v0->unk0 = 0xFA000000;
temp_v0->unk4 = (arg3 << 0x18) | ((arg4 & 0xFF) << 0x10) | ((arg5 & 0xFF) << 8) | (arg6 & 0xFF);
temp_v0_2 = gDisplayListHead;
gDisplayListHead = temp_v0_2 + 8;
temp_v0_2->unk4 = 0;
temp_v0_2->unk0 = 0xBA000E02;
temp_v0_3 = gDisplayListHead;
gDisplayListHead = temp_v0_3 + 8;
temp_v0_3->unk4 = 0;
temp_v0_3->unk0 = 0xBA001301;
temp_v0_4 = gDisplayListHead;
gDisplayListHead = temp_v0_4 + 8;
temp_v0_4->unk4 = 0xFFFDF6FB;
temp_v0_4->unk0 = 0xFCFFFFFF;
temp_v0_5 = gDisplayListHead;
gDisplayListHead = temp_v0_5 + 8;
temp_v0_5->unk4 = 0x504240;
temp_v0_5->unk0 = 0xB900031D;
gDPSetPrimColor(gDisplayListHead++, 0, 0, arg3, arg4, arg5, arg6);
gDPSetTextureLUT(gDisplayListHead++, G_TT_NONE);
gDPSetTexturePersp(gDisplayListHead++, G_TP_NONE);
gDPSetCombineMode(gDisplayListHead++, G_CC_PRIMITIVE, G_CC_PRIMITIVE);
gDPSetRenderMode(gDisplayListHead++, G_RM_XLU_SURF, G_RM_XLU_SURF2);
func_8004B97C(arg0, arg1, 1, arg2, 1);
}
#else
GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004C148.s")
#endif
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
@@ -4167,107 +4114,53 @@ void func_8004C268(s32 arg0, s32 arg1, s32 arg2, u32 arg3, u32 arg4, u32 arg5, s
GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004C268.s")
#endif
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_80043D50(s32, u32, u32); // extern
? func_8004B97C(s32, s32, u32, u32, s32); // extern
extern ? D_0D007EB8;
extern ? D_0D007EF8;
extern ? D_0D008108;
extern void *gDisplayListHead;
extern Gfx D_0D007EF8[];
extern Gfx D_0D007EB8[];
extern Gfx D_0D008108[];
void func_8004C364(s32 arg0, s32 arg1, u32 arg2, u32 arg3, s32 arg4) {
void *temp_v0;
void *temp_v0_2;
void *temp_v0_3;
void *temp_v0_4;
temp_v0 = gDisplayListHead;
gDisplayListHead = temp_v0 + 8;
temp_v0->unk4 = &D_0D008108;
temp_v0->unk0 = 0x6000000;
temp_v0_2 = gDisplayListHead;
gDisplayListHead = temp_v0_2 + 8;
temp_v0_2->unk4 = &D_0D007EF8;
temp_v0_2->unk0 = 0x6000000;
temp_v0_3 = gDisplayListHead;
gDisplayListHead = temp_v0_3 + 8;
temp_v0_3->unk4 = 1;
temp_v0_3->unk0 = 0xB9000002;
gSPDisplayList(gDisplayListHead++, D_0D008108);
gSPDisplayList(gDisplayListHead++, D_0D007EF8);
gDPSetAlphaCompare(gDisplayListHead++, G_AC_THRESHOLD);
func_80043D50(arg4, arg2, arg3);
func_8004B97C(arg0 - (arg2 >> 1), arg1 - (arg3 >> 1), arg2, arg3, 0);
temp_v0_4 = gDisplayListHead;
gDisplayListHead = temp_v0_4 + 8;
temp_v0_4->unk0 = 0x6000000;
temp_v0_4->unk4 = &D_0D007EB8;
gSPDisplayList(gDisplayListHead++, D_0D007EB8);
}
#else
GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004C364.s")
#endif
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_80043D50(s32, u32, u32); // extern
? func_8004B614(u16, u16, u16, ?, s32, s32, s32); // extern
? func_8004B97C(s32, s32, u32, u32, s32); // extern
extern ? D_0D007EB8;
extern ? D_0D007F38;
extern Gfx D_0D007EB8[];
extern Gfx D_0D007F38[];
extern u16 D_801656C0;
extern u16 D_801656D0;
extern u16 D_801656E0;
extern void *gDisplayListHead;
void func_8004C450(s32 arg0, s32 arg1, u32 arg2, u32 arg3, s32 arg4) {
void *temp_v1;
void *temp_v1_2;
temp_v1 = gDisplayListHead;
gDisplayListHead = temp_v1 + 8;
temp_v1->unk0 = 0x6000000;
temp_v1->unk4 = &D_0D007F38;
gSPDisplayList(gDisplayListHead++, D_0D007F38);
func_8004B614(D_801656C0, D_801656D0, D_801656E0, 0x80, 0x80, 0x80, 0xFF);
func_80043D50(arg4, arg2, arg3);
func_8004B97C(arg0 - (arg2 >> 1), arg1 - (arg3 >> 1), arg2, arg3, 1);
temp_v1_2 = gDisplayListHead;
gDisplayListHead = temp_v1_2 + 8;
temp_v1_2->unk0 = 0x6000000;
temp_v1_2->unk4 = &D_0D007EB8;
gSPDisplayList(gDisplayListHead++, D_0D007EB8);
}
#else
GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004C450.s")
#endif
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_80043A84(s32, u32, u32); // extern
? func_8004B97C(s32, s32, u32, u32, s32); // extern
extern ? D_0D007EB8;
extern ? D_0D007EF8;
extern void *gDisplayListHead;
UNUSED void func_8004C53C(s32 arg0, s32 arg1, u32 arg2, u32 arg3, s32 arg4) {
gSPDisplayList(gDisplayListHead++, D_0D008108);
gSPDisplayList(gDisplayListHead++, D_0D007EF8);
gDPSetAlphaCompare(gDisplayListHead++, G_AC_THRESHOLD);
func_800440B8(arg4, arg2, arg3);
func_8004B97C(arg0 - (arg2 >> 1), arg1 - (arg3 >> 1), arg2, arg3, 0);
gSPDisplayList(gDisplayListHead++, D_0D007EB8);
}
void func_8004C628(s32 arg0, s32 arg1, u32 arg2, u32 arg3, s32 arg4) {
void *temp_v0;
void *temp_v0_2;
void *temp_v0_3;
temp_v0 = gDisplayListHead;
gDisplayListHead = temp_v0 + 8;
temp_v0->unk0 = 0x6000000;
temp_v0->unk4 = &D_0D007EF8;
temp_v0_2 = gDisplayListHead;
gDisplayListHead = temp_v0_2 + 8;
temp_v0_2->unk4 = 1;
temp_v0_2->unk0 = 0xB9000002;
gSPDisplayList(gDisplayListHead++, D_0D007EF8);
gDPSetAlphaCompare(gDisplayListHead++, G_AC_THRESHOLD);
func_80043A84(arg4, arg2, arg3);
func_8004B97C(arg0 - (arg2 >> 1), arg1 - (arg3 >> 1), arg2, arg3, 1);
temp_v0_3 = gDisplayListHead;
gDisplayListHead = temp_v0_3 + 8;
temp_v0_3->unk0 = 0x6000000;
temp_v0_3->unk4 = &D_0D007EB8;
gSPDisplayList(gDisplayListHead++, D_0D007EB8);
}
#else
GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004C628.s")
#endif
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307