From 20ec1e149ace432010f7b104e60e5d403097741b Mon Sep 17 00:00:00 2001 From: David Benepe Date: Tue, 25 May 2021 15:02:19 -0500 Subject: [PATCH] unknown_078050.c data section --- data/dkr.data.s | 418 ++++++++++++++++++++++--------------------- src/unknown_078050.c | 139 +++++++++++++- 2 files changed, 341 insertions(+), 216 deletions(-) diff --git a/data/dkr.data.s b/data/dkr.data.s index 3b8666ce..c81cf010 100644 --- a/data/dkr.data.s +++ b/data/dkr.data.s @@ -1315,215 +1315,219 @@ ############## unknown_078050.c (.data) ############## -glabel D_800DE490 -.word 0x00020000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 -.word 0x00000000 +# glabel D_800DE490 +# .word 0x00020000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x00000000 +# +# glabel D_800DE4B0 +# .word 0x00000000 +# +# glabel D_800DE4B4 +# .word 0x00000000 +# +# glabel D_800DE4B8 +# .word 0x00000000 +# +# glabel D_800DE4BC +# .word 0x00010001 +# +# glabel D_800DE4C0 +# .word 0x00000040 +# +# glabel D_800DE4C4 +# .word 0x00000000 +# +# glabel D_800DE4C8 +# .word 0x00000000 +# +# glabel D_800DE4CC +# .word 0x00000000 +# +# glabel D_800DE4D0 +# .word 0x00000000 +# +# glabel D_800DE4D4 +# .word 0x00000000 +# +# glabel D_800DE4D8 +# .word 0x00000000 +# +# glabel D_800DE4DC +# .word 0x00000000 +# +# glabel D_800DE4E0 +# .word 0xB6000000 +# .word 0x001F3204 +# .word 0xBB000000 +# .word 0x00000000 +# .word 0xB7000000 +# .word 0x00000204 +# .word 0xBC000404 +# .word 0x00000002 +# .word 0xBC000C04 +# .word 0x00000002 +# .word 0xBC001404 +# .word 0x0000FFFE +# .word 0xBC001C04 +# .word 0x0000FFFE +# .word 0xB8000000 +# .word 0x00000000 +# +# glabel D_800DE520 +# .word 0xBA001402 +# .word 0x00000000 +# .word 0xBA001701 +# .word 0x00800000 +# .word 0xBA001001 +# .word 0x00000000 +# .word 0xBA000E02 +# .word 0x00000000 +# .word 0xBA001102 +# .word 0x00000000 +# .word 0xBA001301 +# .word 0x00080000 +# .word 0xBA000C02 +# .word 0x00002000 +# .word 0xBA000903 +# .word 0x00000C00 +# .word 0xFCFFFFFF +# .word 0xFFFCF87C +# .word 0xBA000801 +# .word 0x00000000 +# .word 0xB9000002 +# .word 0x00000000 +# .word 0xB900031D +# .word 0x0F0A4000 +# .word 0xBA000602 +# .word 0x00000000 +# .word 0xE7000000 +# .word 0x00000000 +# .word 0xB8000000 +# .word 0x00000000 +# +# glabel D_800DE598 +# .word 0xE7000000 +# .word 0x00000000 +# .word 0xBA001001 +# .word 0x00000000 +# .word 0xBA000E02 +# .word 0x00000000 +# .word 0xB9000002 +# .word 0x00000000 +# .word 0xB6000000 +# .word 0x00010001 +# .word 0xE7000000 +# .word 0x00000000 +# .word 0xFCFFFFFF +# .word 0xFFFCF279 +# .word 0xEF000C0F +# .word 0x0F0A4000 +# .word 0xB8000000 +# .word 0x00000000 +# +# glabel D_800DE5E0 +# .word 0xE7000000 +# .word 0x00000000 +# .word 0xBA001001 +# .word 0x00000000 +# .word 0xBA000E02 +# .word 0x00000000 +# .word 0xB9000002 +# .word 0x00000000 +# .word 0xB6000000 +# .word 0x00010001 +# .word 0xE7000000 +# .word 0x00000000 +# .word 0xFCFFFFFF +# .word 0xFFFDF6FB +# .word 0xEF000C0F +# .word 0x0F0A4000 +# .word 0xB8000000 +# .word 0x00000000 +# +# glabel D_800DE628 +# .word 0xE7000000 +# .word 0x00000000 +# .word 0xBA001001 +# .word 0x00000000 +# .word 0xBA000E02 +# .word 0x00000000 +# .word 0xB9000002 +# .word 0x00000000 +# .word 0xB6000000 +# .word 0x00010001 +# .word 0xE7000000 +# .word 0x00000000 +# .word 0xFC119623 +# .word 0xFF2FFFFF +# .word 0xEF000C0F +# .word 0x00504240 +# .word 0xB8000000 +# .word 0x00000000 +# +# glabel D_800DE670 +# .word 0xE7000000 +# .word 0x00000000 +# .word 0xBA001001 +# .word 0x00000000 +# .word 0xBA000E02 +# .word 0x00000000 +# .word 0xB9000002 +# .word 0x00000000 +# .word 0xB6000000 +# .word 0x00010001 +# .word 0xE7000000 +# .word 0x00000000 +# .word 0xB8000000 +# .word 0x00000000 +# +# glabel D_800DE6A8 +# .word 0xFC119623 +# .word 0xFF2FFFFF +# .word 0xEF002C0F +# .word 0x00552048 +# .word 0xFC119623 +# .word 0xFF2FFFFF +# .word 0xEF002C0F +# .word 0x0F0A4000 +# .word 0xFC119623 +# .word 0xFF2FFFFF +# .word 0xEF000C0F +# .word 0x00552048 +# .word 0xFC119623 +# .word 0xFF2FFFFF +# .word 0xEF000C0F +# .word 0x0F0A4000 +# +# glabel D_800DE6E8 +# .word 0xFC119623 +# .word 0xFF2FFFFF +# .word 0xEF002C0F +# .word 0x005041C8 +# .word 0xFC119623 +# .word 0xFF2FFFFF +# .word 0xEF002C0F +# .word 0x00504240 +# .word 0xFC119623 +# .word 0xFF2FFFFF +# .word 0xEF000C0F +# .word 0x005041C8 +# .word 0xFC119623 +# .word 0xFF2FFFFF +# .word 0xEF000C0F +# .word 0x00504240 +# +# .word 0, 0 # Padding -glabel D_800DE4B0 -.word 0x00000000 +###################################################### -glabel D_800DE4B4 -.word 0x00000000 - -glabel D_800DE4B8 -.word 0x00000000 - -glabel D_800DE4BC -.word 0x00010001 - -glabel D_800DE4C0 -.word 0x00000040 - -glabel D_800DE4C4 -.word 0x00000000 - -glabel D_800DE4C8 -.word 0x00000000 - -glabel D_800DE4CC -.word 0x00000000 - -glabel D_800DE4D0 -.word 0x00000000 - -glabel D_800DE4D4 -.word 0x00000000 - -glabel D_800DE4D8 -.word 0x00000000 - -glabel D_800DE4DC -.word 0x00000000 - -glabel D_800DE4E0 -.word 0xB6000000 -.word 0x001F3204 -.word 0xBB000000 -.word 0x00000000 -.word 0xB7000000 -.word 0x00000204 -.word 0xBC000404 -.word 0x00000002 -.word 0xBC000C04 -.word 0x00000002 -.word 0xBC001404 -.word 0x0000FFFE -.word 0xBC001C04 -.word 0x0000FFFE -.word 0xB8000000 -.word 0x00000000 - -glabel D_800DE520 -.word 0xBA001402 -.word 0x00000000 -.word 0xBA001701 -.word 0x00800000 -.word 0xBA001001 -.word 0x00000000 -.word 0xBA000E02 -.word 0x00000000 -.word 0xBA001102 -.word 0x00000000 -.word 0xBA001301 -.word 0x00080000 -.word 0xBA000C02 -.word 0x00002000 -.word 0xBA000903 -.word 0x00000C00 -.word 0xFCFFFFFF -.word 0xFFFCF87C -.word 0xBA000801 -.word 0x00000000 -.word 0xB9000002 -.word 0x00000000 -.word 0xB900031D -.word 0x0F0A4000 -.word 0xBA000602 -.word 0x00000000 -.word 0xE7000000 -.word 0x00000000 -.word 0xB8000000 -.word 0x00000000 - -glabel D_800DE598 -.word 0xE7000000 -.word 0x00000000 -.word 0xBA001001 -.word 0x00000000 -.word 0xBA000E02 -.word 0x00000000 -.word 0xB9000002 -.word 0x00000000 -.word 0xB6000000 -.word 0x00010001 -.word 0xE7000000 -.word 0x00000000 -.word 0xFCFFFFFF -.word 0xFFFCF279 -.word 0xEF000C0F -.word 0x0F0A4000 -.word 0xB8000000 -.word 0x00000000 - -glabel D_800DE5E0 -.word 0xE7000000 -.word 0x00000000 -.word 0xBA001001 -.word 0x00000000 -.word 0xBA000E02 -.word 0x00000000 -.word 0xB9000002 -.word 0x00000000 -.word 0xB6000000 -.word 0x00010001 -.word 0xE7000000 -.word 0x00000000 -.word 0xFCFFFFFF -.word 0xFFFDF6FB -.word 0xEF000C0F -.word 0x0F0A4000 -.word 0xB8000000 -.word 0x00000000 - -glabel D_800DE628 -.word 0xE7000000 -.word 0x00000000 -.word 0xBA001001 -.word 0x00000000 -.word 0xBA000E02 -.word 0x00000000 -.word 0xB9000002 -.word 0x00000000 -.word 0xB6000000 -.word 0x00010001 -.word 0xE7000000 -.word 0x00000000 -.word 0xFC119623 -.word 0xFF2FFFFF -.word 0xEF000C0F -.word 0x00504240 -.word 0xB8000000 -.word 0x00000000 - -glabel D_800DE670 -.word 0xE7000000 -.word 0x00000000 -.word 0xBA001001 -.word 0x00000000 -.word 0xBA000E02 -.word 0x00000000 -.word 0xB9000002 -.word 0x00000000 -.word 0xB6000000 -.word 0x00010001 -.word 0xE7000000 -.word 0x00000000 -.word 0xB8000000 -.word 0x00000000 - -glabel D_800DE6A8 -.word 0xFC119623 -.word 0xFF2FFFFF -.word 0xEF002C0F -.word 0x00552048 -.word 0xFC119623 -.word 0xFF2FFFFF -.word 0xEF002C0F -.word 0x0F0A4000 -.word 0xFC119623 -.word 0xFF2FFFFF -.word 0xEF000C0F -.word 0x00552048 -.word 0xFC119623 -.word 0xFF2FFFFF -.word 0xEF000C0F -.word 0x0F0A4000 - -glabel D_800DE6E8 -.word 0xFC119623 -.word 0xFF2FFFFF -.word 0xEF002C0F -.word 0x005041C8 -.word 0xFC119623 -.word 0xFF2FFFFF -.word 0xEF002C0F -.word 0x00504240 -.word 0xFC119623 -.word 0xFF2FFFFF -.word 0xEF000C0F -.word 0x005041C8 -.word 0xFC119623 -.word 0xFF2FFFFF -.word 0xEF000C0F -.word 0x00504240 -.word 0x00000000 -.word 0x00000000 +############## unknown_079F50.c (.data) ############## glabel D_800DE730 .word 0x00000000 diff --git a/src/unknown_078050.c b/src/unknown_078050.c index 9f97ae9f..7223f02f 100644 --- a/src/unknown_078050.c +++ b/src/unknown_078050.c @@ -5,17 +5,136 @@ #include "macros.h" #include "libultra_internal.h" -extern u8 D_800DE4B0; -extern u8 D_800DE4B4; -extern u8 D_800DE4B8; +/************ .data ************/ -extern u32 D_800DE4C0; -extern u32 D_800DE4C4; -extern u32 D_800DE4C8; +s16 D_800DE490[16] = { + 2, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0 +}; -extern u32 D_800DE4D0; +u8 D_800DE4B0 = 0; +u8 D_800DE4B4 = 0; +u8 D_800DE4B8 = 0; +s32 D_800DE4BC = 0x00010001; -extern u32 D_800DE4E0; +u32 D_800DE4C0 = 0x40; +u32 D_800DE4C4 = 0; +u32 D_800DE4C8 = 0; +s32 D_800DE4CC = 0; + +u32 D_800DE4D0 = 0; +s32 D_800DE4D4 = 0; +s32 D_800DE4D8 = 0; +s32 D_800DE4DC = 0; + +// Fast3D (F3DDKR) display list +u32 D_800DE4E0[] = { + 0xB6000000, 0x001F3204, + 0xBB000000, 0x00000000, + 0xB7000000, 0x00000204, + 0xBC000404, 0x00000002, + 0xBC000C04, 0x00000002, + 0xBC001404, 0x0000FFFE, + 0xBC001C04, 0x0000FFFE, + 0xB8000000, 0x00000000 +}; + +// Fast3D (F3DDKR) display list +u32 D_800DE520[] = { + 0xBA001402, 0x00000000, + 0xBA001701, 0x00800000, + 0xBA001001, 0x00000000, + 0xBA000E02, 0x00000000, + 0xBA001102, 0x00000000, + 0xBA001301, 0x00080000, + 0xBA000C02, 0x00002000, + 0xBA000903, 0x00000C00, + 0xFCFFFFFF, 0xFFFCF87C, + 0xBA000801, 0x00000000, + 0xB9000002, 0x00000000, + 0xB900031D, 0x0F0A4000, + 0xBA000602, 0x00000000, + 0xE7000000, 0x00000000, + 0xB8000000, 0x00000000 +}; + +// Fast3D (F3DDKR) display list +u32 D_800DE598[] = { + 0xE7000000, 0x00000000, + 0xBA001001, 0x00000000, + 0xBA000E02, 0x00000000, + 0xB9000002, 0x00000000, + 0xB6000000, 0x00010001, + 0xE7000000, 0x00000000, + 0xFCFFFFFF, 0xFFFCF279, + 0xEF000C0F, 0x0F0A4000, + 0xB8000000, 0x00000000 +}; + +// Fast3D (F3DDKR) display list +u32 D_800DE5E0[] = { + 0xE7000000, 0x00000000, + 0xBA001001, 0x00000000, + 0xBA000E02, 0x00000000, + 0xB9000002, 0x00000000, + 0xB6000000, 0x00010001, + 0xE7000000, 0x00000000, + 0xFCFFFFFF, 0xFFFDF6FB, + 0xEF000C0F, 0x0F0A4000, + 0xB8000000, 0x00000000 +}; + +// Fast3D (F3DDKR) display list +u32 D_800DE628[] = { + 0xE7000000, 0x00000000, + 0xBA001001, 0x00000000, + 0xBA000E02, 0x00000000, + 0xB9000002, 0x00000000, + 0xB6000000, 0x00010001, + 0xE7000000, 0x00000000, + 0xFC119623, 0xFF2FFFFF, + 0xEF000C0F, 0x00504240, + 0xB8000000, 0x00000000 +}; + +// Fast3D (F3DDKR) display list +u32 D_800DE670[] = { + 0xE7000000, 0x00000000, + 0xBA001001, 0x00000000, + 0xBA000E02, 0x00000000, + 0xB9000002, 0x00000000, + 0xB6000000, 0x00010001, + 0xE7000000, 0x00000000, + 0xB8000000, 0x00000000 +}; + +// Fast3D (F3DDKR) display list +u32 D_800DE6A8[] = { + 0xFC119623, 0xFF2FFFFF, + 0xEF002C0F, 0x00552048, + 0xFC119623, 0xFF2FFFFF, + 0xEF002C0F, 0x0F0A4000, + 0xFC119623, 0xFF2FFFFF, + 0xEF000C0F, 0x00552048, + 0xFC119623, 0xFF2FFFFF, + 0xEF000C0F, 0x0F0A4000 +}; + +// Fast3D (F3DDKR) display list +u32 D_800DE6E8[] = { + 0xFC119623, 0xFF2FFFFF, + 0xEF002C0F, 0x005041C8, + 0xFC119623, 0xFF2FFFFF, + 0xEF002C0F, 0x00504240, + 0xFC119623, 0xFF2FFFFF, + 0xEF000C0F, 0x005041C8, + 0xFC119623, 0xFF2FFFFF, + 0xEF000C0F, 0x00504240 +}; + +/*******************************/ + +/************ .bss ************/ extern OSMesgQueue D_80125EA0; extern OSMesg D_80125EB8; @@ -26,6 +145,8 @@ extern OSMesg D_80125F10; extern u32 D_80126100; +/*******************************/ + GLOBAL_ASM("asm/non_matchings/unknown_078050/setupOSTasks.s") GLOBAL_ASM("asm/non_matchings/unknown_078050/func_80077A54.s") @@ -50,7 +171,7 @@ typedef struct{ } struct_800780DC_a0; void func_800780DC(struct_800780DC_a0** arg0){ - u32* tmp2= &D_800DE4E0; + u32* tmp2= D_800DE4E0; struct_800780DC_a0* tmp = *arg0;