From eef131a8c0c35ccf3e0c666b1f8b6aadca7eb44a Mon Sep 17 00:00:00 2001 From: Antonio Castelli Date: Wed, 2 Jun 2021 18:25:18 -0700 Subject: [PATCH] Moved symbols in unknown_032760 to header file. --- include/unknown_032760.h | 32 ++++++++++++++++++++++++++++++++ src/unknown_032760.c | 10 ++++++---- undefined_syms.txt | 22 ---------------------- 3 files changed, 38 insertions(+), 26 deletions(-) create mode 100644 include/unknown_032760.h diff --git a/include/unknown_032760.h b/include/unknown_032760.h new file mode 100644 index 00000000..92e932d4 --- /dev/null +++ b/include/unknown_032760.h @@ -0,0 +1,32 @@ +#ifndef _UNKNOWN_032760_H_ +#define _UNKNOWN_032760_H_ + +#include "types.h" + +extern s32 D_800DC950; +extern s32 D_800DC954; +extern s32 D_800DC958; +extern s32 D_800DC95C; +extern s32 D_800DC960; +extern s32 D_800DC964; +extern s32 D_800DC968; +extern s32 D_800DC96C; + +// Unsure about the signed/unsigned with these arrays. +extern u16 D_800DC970[4]; +extern u16 D_800DC978[4]; +extern u16 D_800DC980[20]; +extern u16 D_800DC9A8[20]; +extern u16 D_800DC9D0[64]; +extern s8 D_800DCA50[8]; +extern u8 D_800DCA58[9]; +extern s8 D_800DCA64[9]; +extern s8 D_800DCA70[10]; +extern s32 D_800DCA7C[3]; +extern s32 D_800DCA88[3]; +extern s8 D_800DCA94[8]; +extern s8 D_800DCA9C[12]; +extern u16 D_800DCAA8[64]; +extern u16 D_800DCB28[20]; + +#endif \ No newline at end of file diff --git a/src/unknown_032760.c b/src/unknown_032760.c index 8b09eb9b..0d29386b 100644 --- a/src/unknown_032760.c +++ b/src/unknown_032760.c @@ -1,6 +1,8 @@ /* The comment below is needed for this file to be picked up by generate_ld */ /* RAM_POS: 0x80031B60 */ +#include "unknown_032760.h" + #include "types.h" #include "macros.h" #include "structs.h" @@ -73,11 +75,11 @@ s32 D_800DCA7C[3] = { // Not sure about typing s32 D_800DCA88[3] = { // Not sure about typing 0, 0, 0 }; -s8 D_800DCA94[16] = { - 0x00, 0x00, 0x01, 0x01, 0x02, 0x00, 0x00, 0x00, - 0x00, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x00 +s8 D_800DCA94[8] = { + 0x00, 0x00, 0x01, 0x01, 0x02, 0x00, 0x00, 0x00 }; -s8 D_800DCA9C[4] = { +s8 D_800DCA9C[12] = { + 0x00, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; u16 D_800DCAA8[64] = { diff --git a/undefined_syms.txt b/undefined_syms.txt index 33dd0daa..038afb66 100755 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -67,28 +67,6 @@ D_800D84C0 = 0x800D84C0; D_800D8590 = 0x800D8590; D_800D9790 = 0x800D9790; D_800DA970 = 0x800DA970; -D_800DC950 = 0x800DC950; -D_800DC954 = 0x800DC954; -D_800DC958 = 0x800DC958; -D_800DC95C = 0x800DC95C; -D_800DC960 = 0x800DC960; -D_800DC964 = 0x800DC964; -D_800DC968 = 0x800DC968; -D_800DC970 = 0x800DC970; -D_800DC978 = 0x800DC978; -D_800DC980 = 0x800DC980; -D_800DC9A8 = 0x800DC9A8; -D_800DC9D0 = 0x800DC9D0; -D_800DCA50 = 0x800DCA50; -D_800DCA58 = 0x800DCA58; -D_800DCA64 = 0x800DCA64; -D_800DCA70 = 0x800DCA70; -D_800DCA7C = 0x800DCA7C; -D_800DCA88 = 0x800DCA88; -D_800DCA94 = 0x800DCA94; -D_800DCA9C = 0x800DCA9C; -D_800DCAA8 = 0x800DCAA8; -D_800DCB28 = 0x800DCB28; D_800DCB50 = 0x800DCB50; D_800DCB54 = 0x800DCB54; D_800DCB98 = 0x800DCB98;