From 2f92e17630af0955afca6961d7e4c062db8a4550 Mon Sep 17 00:00:00 2001 From: David Benepe Date: Tue, 25 May 2021 15:21:17 -0500 Subject: [PATCH] unknown_07AF10.c data section --- data/dkr.data.s | 50 ++++++++++++++++++++++++-------------------- src/unknown_07AF10.c | 22 ++++++++++++++++++- 2 files changed, 48 insertions(+), 24 deletions(-) diff --git a/data/dkr.data.s b/data/dkr.data.s index 391d7293..19626339 100644 --- a/data/dkr.data.s +++ b/data/dkr.data.s @@ -1571,31 +1571,35 @@ ############## unknown_07AF10.c (.data) ############## -glabel D_800DE770 -.word 0x00000000 -.word 0x00000000 -.word 0x02000000 +# glabel D_800DE770 +# .word 0x00000000 +# .word 0x00000000 +# .word 0x02000000 +# +# glabel D_800DE77C +# .word 0x00000140 +# .word 0x000000F0 +# .word 0x00000140 +# .word 0x000000F0 +# .word 0x00000280 +# .word 0x000000F0 +# .word 0x00000280 +# .word 0x000000F0 +# .word 0x00000280 +# .word 0x000001E0 +# .word 0x00000280 +# .word 0x000001E0 +# .word 0x00000280 +# .word 0x000001E0 +# .word 0x00000280 +# .word 0x000001E0 +# +# glabel D_800DE7BC +# .word 0x00000000 -glabel D_800DE77C -.word 0x00000140 -.word 0x000000F0 -.word 0x00000140 -.word 0x000000F0 -.word 0x00000280 -.word 0x000000F0 -.word 0x00000280 -.word 0x000000F0 -.word 0x00000280 -.word 0x000001E0 -.word 0x00000280 -.word 0x000001E0 -.word 0x00000280 -.word 0x000001E0 -.word 0x00000280 -.word 0x000001E0 +###################################################### -glabel D_800DE7BC -.word 0x00000000 +############## unknown_07B870.c (.data) ############## glabel D_800DE7C0 .word 0xFF00FFFF diff --git a/src/unknown_07AF10.c b/src/unknown_07AF10.c index 67ffcfc9..bf69b37b 100644 --- a/src/unknown_07AF10.c +++ b/src/unknown_07AF10.c @@ -4,13 +4,33 @@ #include "types.h" #include "macros.h" +/************ .data ************/ + +s32 D_800DE770 = 0; +s32 D_800DE774 = 0; // Currently unknown, might be a different type. +s8 D_800DE778 = 2; + /* Size: 0x08 bytes */ typedef struct unk800DE77C { /* 0x00 */ s32 unk0; /* 0x04 */ s32 unk4; } unk800DE77C; -extern unk800DE77C D_800DE77C[8]; +extern unk800DE77C D_800DE77C[8] = { + { 0x140, 0xF0 }, + { 0x140, 0xF0 }, + { 0x280, 0xF0 }, + { 0x280, 0xF0 }, + { 0x280, 0x1E0 }, + { 0x280, 0x1E0 }, + { 0x280, 0x1E0 }, + { 0x280, 0x1E0 } +}; + +s32 D_800DE7BC = 0; // Currently unknown, might be a different type. + +/*******************************/ + extern s32 D_801262B0[2]; extern s32 D_801262B8[2]; extern s32 D_801262C8;