From eadc711a1d79636e744568b771266540bbd35ca1 Mon Sep 17 00:00:00 2001 From: Ryan Myers Date: Sun, 12 Sep 2021 11:49:24 -0400 Subject: [PATCH] Create game_text.h --- src/game_text.c | 24 +----------------------- src/game_text.h | 43 +++++++++++++++++++++++++++++++++++++++++++ src/menu.c | 2 +- 3 files changed, 45 insertions(+), 24 deletions(-) create mode 100644 src/game_text.h diff --git a/src/game_text.c b/src/game_text.c index 60675404..aa1d6368 100644 --- a/src/game_text.c +++ b/src/game_text.c @@ -1,12 +1,7 @@ /* The comment below is needed for this file to be picked up by generate_ld */ /* RAM_POS: 0x800C29F0 */ -#include "types.h" -#include "macros.h" -#include "f3ddkr.h" -#include "asset_sections.h" -#include "memory.h" -#include "PR/libultra.h" +#include "game_text.h" /************ .data ************/ @@ -20,16 +15,6 @@ s32 D_800E3680 = 1; /************ .bss ************/ -typedef struct unk8012A7C8 { - u8 *unk0; - u8 *unk4; -} unk8012A7C8; - -typedef struct unk8012A798 { - u8 *unk0; - u8 *unk4; -} unk8012A798; - u8 *D_8012A780; s8 D_8012A784; s8 D_8012A785; @@ -65,13 +50,6 @@ s32 D_8012A7DC; /*****************************/ -extern u32 osTvType; - -void func_800C2F1C(s32); -void func_8005A3B0(void); -void func_800C31EC(s32); -s8 func_8000C8B4(s32); - void func_800C29F0(void) { D_8012A7C8.unk0 = (u8 *)allocate_from_main_pool_safe(0x780, COLOR_TAG_GREEN); D_8012A7C8.unk4 = D_8012A7C8.unk0 + 0x3C0; diff --git a/src/game_text.h b/src/game_text.h new file mode 100644 index 00000000..846210f6 --- /dev/null +++ b/src/game_text.h @@ -0,0 +1,43 @@ +#ifndef _GAME_TEXT_H_ +#define _GAME_TEXT_H_ + +#include "types.h" +#include "macros.h" +#include "f3ddkr.h" +#include "asset_sections.h" +#include "memory.h" +#include "font.h" +#include "PR/libultra.h" + +typedef struct unk8012A7C8 { + u8 *unk0; + u8 *unk4; +} unk8012A7C8; + +typedef struct unk8012A798 { + u8 *unk0; + u8 *unk4; +} unk8012A798; + +extern u32 osTvType; + +void func_8005A3B0(void); //unknown_043920.c +s32 func_8000C8B4(s32 arg0); //unknown_00BC20.c +void func_8009CFB0(void); //menu.c +s32 func_8009CFEC(u32 arg0); //menu.c + +void func_800C29F0(void); +void func_800C2AB4(void); +void func_800C2AF4(s32 arg0); +void func_800C2F1C(s32 arg0); +void func_800C3048(void); +void func_800C30CC(void); +void func_800C3140(s32 arg0); +void func_800C314C(void); +void func_800C3158(s32 arg0, f32 arg1); +s32 func_800C3400(void); +void func_800C3440(s32 arg0); + +void func_800C31EC(s32); //Non Matching + +#endif diff --git a/src/menu.c b/src/menu.c index 61032a69..fecd8a46 100644 --- a/src/menu.c +++ b/src/menu.c @@ -1565,7 +1565,7 @@ s32 music_is_playing(void); void set_text_color(s32 red, s32 green, s32 blue, s32 alpha, s32 opacity); void func_80082FAC(void); void func_8009ABAC(void); -void func_800C31EC(s32); +void func_800C31EC(s32); //game_text.h void update_controller_sticks(void); void func_80078D00(Gfx**, void *element, s32, s32, f32, f32, u32, s32);