use globaldata for random and text

This commit is contained in:
DizzyEggg 2024-11-30 21:26:49 +01:00
parent 236a221b9c
commit 5f13eee872
11 changed files with 3 additions and 11 deletions

View File

@ -422,6 +422,7 @@ SECTIONS {
{
data/data_code_2.o(.rodata);
data/data.o(.rodata);
src/random.o(.rodata);
src/text.o(.rodata);
data/data2.o(.rodata);
src/math.o(.rodata);

View File

@ -9,7 +9,6 @@
#include "menu_input.h"
#include "sprite.h"
#include "text.h"
#include "text.h"
static EWRAM_DATA_2 unkStruct_203B230 *sUnknown_203B230 = {0};

View File

@ -7,7 +7,6 @@
#include "memory.h"
#include "menu_input.h"
#include "text.h"
#include "text.h"
static EWRAM_DATA_2 struct unkStruct_203B244 *sUnknown_203B244 = {0};
static EWRAM_DATA_2 u32 sUnknown_203B248 = {0};

View File

@ -25,7 +25,6 @@
#include "party_list_menu.h"
#include "rescue_team_info.h"
#include "text.h"
#include "text.h"
#include "wigglytuff_shop2.h"
#include "wonder_mail_802C4C8.h"
#include "wonder_mail_802C860.h"

View File

@ -8,7 +8,6 @@
#include "moves.h"
#include "pokemon.h"
#include "text.h"
#include "text.h"
#include "structs/struct_sub80095e4.h"
struct unkStruct_203B274

View File

@ -10,7 +10,6 @@
#include "structs/menu.h"
#include "structs/str_text.h"
#include "text.h"
#include "text.h"
// TODO: UNIFY WITH struct_Sub80095E4
struct unkStruct_203B278

View File

@ -15,7 +15,6 @@
#include "menu_input.h"
#include "pokemon_3.h"
#include "text.h"
#include "text.h"
static EWRAM_DATA_2 unkStruct_203B294 *sUnknown_203B294 = {0};

View File

@ -12,7 +12,6 @@
#include "menu_input.h"
#include "pokemon_3.h"
#include "text.h"
#include "text.h"
static EWRAM_DATA_2 u32 gUnknown_203B298 = {0};
static EWRAM_DATA_2 u16 gUnknown_203B29C = {0};

View File

@ -1,6 +1,5 @@
#include "global.h"
#include "text.h"
#include "text.h"
extern void sub_8272774(UnkTextStruct1 *r0, u32 r1);
extern void sub_8272884(UnkTextStruct1 *r0, u32 r1);

View File

@ -1,4 +1,5 @@
#include "global.h"
#include "globaldata.h"
#include "random.h"
EWRAM_DATA_2 s32 gPRNGSequenceNum = {0};

View File

@ -1,4 +1,5 @@
#include "global.h"
#include "globaldata.h"
#include "text.h"
#include "decompress.h"
#include "code_8009804.h"
@ -69,9 +70,6 @@ static const u8 *HandleTextFormat(UnkTextStruct1 *strArr, const u8 *str, struct
static void sub_8009388(void);
static s32 InterpretColorChar(u8 a0);
UNUSED static const char sPksDir0[] = "pksdir0";
UNUSED static const char sPksDir1[] = "pksdir0";
static const u32 gUnknown_80B853C[16] =
{
0x66666666,