From 60b498f072ab9ef4e4926e24712a366b6e8a0511 Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Sun, 6 Aug 2023 20:09:35 -0400 Subject: [PATCH] Also extern gUnknown_2027370 --- include/text1.h | 1 + src/code_8272724.c | 11 +++++------ src/menu_input.c | 2 +- src/menu_input_1.c | 3 +-- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/include/text1.h b/include/text1.h index aaf6532a4..04a27252b 100644 --- a/include/text1.h +++ b/include/text1.h @@ -3,6 +3,7 @@ #include "text.h" +extern EWRAM_DATA struct UnkTextStruct1 gUnknown_2027370[4]; extern EWRAM_DATA struct UnkTextStruct2 gUnknown_202AFC0[4]; extern EWRAM_DATA u16 gUnknown_202B038[4][32][32]; diff --git a/src/code_8272724.c b/src/code_8272724.c index 945be97b5..a02b03358 100644 --- a/src/code_8272724.c +++ b/src/code_8272724.c @@ -1,17 +1,16 @@ #include "global.h" +#include "text1.h" -extern void sub_8272774(u32 *r0, u32 r1); -extern void sub_8272884(u32 *r0, u32 r1); - -extern u32 gUnknown_2027370; // TODO defined in text.c and join later +extern void sub_8272774(struct UnkTextStruct1 *r0, u32 r1); +extern void sub_8272884(struct UnkTextStruct1 *r0, u32 r1); void sub_8272760(u32 r0) { - sub_8272774(&gUnknown_2027370, r0); + sub_8272774(gUnknown_2027370, r0); } // TODO once sub_8272774 is decomped //void sub_8272870(u32 r0) //{ -// sub_8272884(&gUnknown_2027370, r0); +// sub_8272884(gUnknown_2027370, r0); //} diff --git a/src/menu_input.c b/src/menu_input.c index 56900b0f6..92f870804 100644 --- a/src/menu_input.c +++ b/src/menu_input.c @@ -2,6 +2,7 @@ #include "constants/colors.h" #include "constants/input.h" #include "menu.h" +#include "text1.h" #include "text2.h" #include "util.h" #include "code_800D090.h" @@ -13,7 +14,6 @@ struct unkChar s16 unk4; s16 unk6; }; -extern struct UnkTextStruct1 gUnknown_2027370[4]; extern u8 gUnknown_80D4828[]; extern void PlayMenuSoundEffect(u32); diff --git a/src/menu_input_1.c b/src/menu_input_1.c index f8eaebf3e..002e74b31 100644 --- a/src/menu_input_1.c +++ b/src/menu_input_1.c @@ -1,10 +1,9 @@ #include "global.h" #include "constants/input.h" #include "input.h" -#include "text.h" +#include "text1.h" #include "menu_input.h" -extern struct UnkTextStruct1 gUnknown_2027370[4]; extern void PlayMenuSoundEffect(u32); void sub_801332C(u16 *);