From 8a64d45fc5ef580875dd182b39f64cf3f48373a8 Mon Sep 17 00:00:00 2001 From: Alex Bates Date: Wed, 10 Feb 2021 14:42:36 +0000 Subject: [PATCH] undefined syms --- include/variables.h | 15 +++++++++++++++ src/code_16c8e0.c | 6 +++--- src/code_190B20.c | 3 +-- undefined_syms.txt | 11 +++++++++++ 4 files changed, 30 insertions(+), 5 deletions(-) diff --git a/include/variables.h b/include/variables.h index ff858e317b..62428efe76 100644 --- a/include/variables.h +++ b/include/variables.h @@ -298,4 +298,19 @@ extern UNK_TYPE D_0A0026F0; extern UNK_TYPE D_802EAE7C; extern f64 D_802EB370; +extern s32 D_80291FA8[]; +extern s32 D_80291FD0[]; +extern s32 D_80291FF8[]; +extern s32 D_80291FF8[]; +extern s32 D_80292020[]; +extern s32 D_80292048[]; +extern s32 D_80292070[]; +extern s32 D_80292098[]; +extern s32 D_80292098[]; +extern s32 D_802920C0[]; +extern s32 D_802920E8[]; +extern s32 D_802920E8[]; +extern s32 D_80292110[]; +extern s32 D_8028358C[]; + #endif diff --git a/src/code_16c8e0.c b/src/code_16c8e0.c index 4a56958f31..bb688d2a56 100644 --- a/src/code_16c8e0.c +++ b/src/code_16c8e0.c @@ -9,8 +9,8 @@ s16 D_802809F6 = -1; s16 D_802809F8 = 0; u16 D_802809FA = 0; -s32 D_802809FC[] = { - 0x80291FA8, 0x80291FD0, 0x80291FF8, 0x80292020, 0x80292048, 0x80292070, 0x80292098, 0x802920C0, 0x802920E8, 0x80292110, 0x00000000, 0x00000000, 0x00000000, +void* D_802809FC[] = { + D_80291FA8, D_80291FD0, D_80291FF8, D_80292020, D_80292048, D_80292070, D_80292098, D_802920C0, D_802920E8, D_80292110, NULL, NULL, NULL, }; s32 D_80280A30 = 0xFF; @@ -57,7 +57,7 @@ Script BtlBringPartnerOut = SCRIPT({ ForceHomePos(256, SI_VAR(0), SI_VAR(1), SI_VAR(2)); }); -u8 D_80280CE0[] = { 0, 0, 0, 0 }; +s8 D_80280CE0[] = { 0, 0, 0, 0 }; s32 D_80280CE4 = -1; Script D_80280CE8 = SCRIPT({ diff --git a/src/code_190B20.c b/src/code_190B20.c index bcc3bbed2d..a964467c47 100644 --- a/src/code_190B20.c +++ b/src/code_190B20.c @@ -418,9 +418,8 @@ ActorPartDesc bMarioParts[] = { }, }; -// TODO: split 0x8028358C s32 D_80283524[] = { - 0x00050000, 0xFFEC002D, 0x0000FFFB, 0x00550000, 0x000A007D, 0x00000019, 0x000A0032, 0xFFEC0032, 0x002DFFFB, 0x005A0032, 0x000A0082, 0x00370019, 0x000F0055, 0xFFEC0037, 0x0050FFFB, 0x005F0055, 0x000A0087, 0x005A0019, 0x000F007D, 0xFFEC0037, 0x0078FFFB, 0x005F007D, 0x000A0087, 0x00820019, 0x00690000, 0x00000000, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x8028358C, 0x8028358C, 0x8028358C, 0x8028358C, 0x8028358C, 0x8028358C, 0x8028358C, 0x8028358C, 0x00000000, + 0x00050000, 0xFFEC002D, 0x0000FFFB, 0x00550000, 0x000A007D, 0x00000019, 0x000A0032, 0xFFEC0032, 0x002DFFFB, 0x005A0032, 0x000A0082, 0x00370019, 0x000F0055, 0xFFEC0037, 0x0050FFFB, 0x005F0055, 0x000A0087, 0x005A0019, 0x000F007D, 0xFFEC0037, 0x0078FFFB, 0x005F007D, 0x000A0087, 0x00820019, 0x00690000, 0x00000000, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, D_8028358C, D_8028358C, D_8028358C, D_8028358C, D_8028358C, D_8028358C, D_8028358C, D_8028358C, 0x00000000, }; s16 D_802835D0[] = { 0x1C, 0x28 }; diff --git a/undefined_syms.txt b/undefined_syms.txt index 9ccdc84037..76618b63c8 100644 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -60,3 +60,14 @@ D_802E9904 = 0x802E9904; D_802E99DC = 0x802E99DC; nusched = 0x800DA440; D_80283770 = 0x80283770; +D_80291FA8 = 0x80291FA8; +D_80291FD0 = 0x80291FD0; +D_80291FF8 = 0x80291FF8; +D_80292020 = 0x80292020; +D_80292048 = 0x80292048; +D_80292070 = 0x80292070; +D_80292098 = 0x80292098; +D_802920C0 = 0x802920C0; +D_802920E8 = 0x802920E8; +D_80292110 = 0x80292110; +D_8028358C = 0x8028358C;