From ceabc969896b00792382c7745bfe4badbf8bb583 Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Mon, 27 May 2024 08:55:31 -0700 Subject: [PATCH] more ram stuff --- src/code_8072F3C.c | 2 +- src/mission_reward.c | 3 +-- sym_ewram2.txt | 9 ++------- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/code_8072F3C.c b/src/code_8072F3C.c index 3a228b92e..633c8a057 100644 --- a/src/code_8072F3C.c +++ b/src/code_8072F3C.c @@ -26,7 +26,7 @@ struct unkStruct_203B314 struct struct_Sub80095E4_2 sBC; }; -extern struct unkStruct_203B314 *gUnknown_203B314; +EWRAM_DATA_2 struct unkStruct_203B314 *gUnknown_203B314 = {0}; const UnkTextStruct2 gUnknown_80E06FC = { diff --git a/src/mission_reward.c b/src/mission_reward.c index 9dfeaaa77..c0f59bc58 100644 --- a/src/mission_reward.c +++ b/src/mission_reward.c @@ -32,8 +32,7 @@ struct unkStruct_203B310 u8 unk22; UnkTextStruct2 unk24[4]; }; -extern struct unkStruct_203B310 *gUnknown_203B310; - +EWRAM_DATA_2 struct unkStruct_203B310 *gUnknown_203B310 = {0}; extern u8 gUnknown_202E038[]; extern u8 gUnknown_202E628[]; diff --git a/sym_ewram2.txt b/sym_ewram2.txt index d6d163e38..0ceb00a8c 100644 --- a/sym_ewram2.txt +++ b/sym_ewram2.txt @@ -191,13 +191,8 @@ gUnknown_203B2AA: /* 203B2AA (sub_8023868 - sub_8023C60) */ .include "src/mailbox.o" .include "src/pelipper_board.o" .include "src/wonder_mail_3_mid.o" - -gUnknown_203B310: /* 203B310 (sub_802F204 - ProceedToNextRewardSceneState) */ - .space 0x4 - -gUnknown_203B314: /* 203B314 (sub_802F73C - sub_802FA50) */ - .space 0x4 - +.include "src/mission_reward.o" +.include "src/code_8072F3C.o" .include "src/makuhita_dojo1.o" .include "src/makuhita_dojo2.o" .include "src/wonder_mail_4.o"