summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/easy_chat.h2
-rw-r--r--src/battle/battle_message.c3
-rw-r--r--src/contest.c26
-rw-r--r--src/easy_chat_2.c2
-rw-r--r--src/engine/record_mixing.c2
-rw-r--r--src/engine/trade.c10
-rw-r--r--src/field/field_weather.c12
-rw-r--r--src/field/party_menu.c13
-rw-r--r--src/field/pc_screen_effect.c2
-rw-r--r--src/field/secret_base.c2
-rw-r--r--src/pokemon/pokemon_summary_screen.c5
-rw-r--r--src/scene/intro_credits_graphics.c7
-rw-r--r--sym_ewram.txt161
13 files changed, 60 insertions, 187 deletions
diff --git a/include/easy_chat.h b/include/easy_chat.h
index c68a3fa02..58750fa92 100644
--- a/include/easy_chat.h
+++ b/include/easy_chat.h
@@ -114,8 +114,6 @@ struct Shared1000
u8 unk9F8E[7]; // unknown length
};
-extern u8 gUnknown_020388AC;
-
// const pointer to shared1000. easy_chat might be two separate files.
extern struct Shared1000 *const gEasyChatStruct;
diff --git a/src/battle/battle_message.c b/src/battle/battle_message.c
index 18e07acf6..e9334ef61 100644
--- a/src/battle/battle_message.c
+++ b/src/battle/battle_message.c
@@ -158,7 +158,6 @@ extern u8 gBankAttacker;
extern u8 gBankTarget;
extern u8 gStringBank;
extern u8 gEffectBank;
-extern u8 gAbilitiesPerBank[4];
extern u8 gBattleTextBuff1[];
extern u8 gBattleTextBuff2[];
extern u8 gBattleTextBuff3[];
@@ -175,6 +174,8 @@ extern u16 gBattlePartyID[4];
extern struct BattleEnigmaBerry gEnigmaBerries[4];
extern u8 gBattleBufferA[4][0x200];
+EWRAM_DATA u8 gAbilitiesPerBank[4] = {0};
+
extern const u8* const gUnknown_08401674[]; // table of pointers to 'a -TYPE' strings
extern const u8* const gUnknown_08400F58[]; // table of pointers to stat strings
extern const u8* const gUnknown_08400F78[]; // table of pointers to flavour strings
diff --git a/src/contest.c b/src/contest.c
index df4bb361d..972c19c2c 100644
--- a/src/contest.c
+++ b/src/contest.c
@@ -39,8 +39,6 @@ extern void sub_80C8AD0(u8);
extern void sub_80C8C80(u8);
extern struct MusicPlayerInfo gMPlay_SE1;
-extern u16 gSpecialVar_ContestCategory;
-extern u16 gSpecialVar_ContestRank;
extern u8 gBattleMonForms[];
extern u8 gDisplayedStringBattle[];
extern u16 gBattleTypeFlags;
@@ -48,8 +46,6 @@ extern u8 gBankAttacker;
extern u8 gBankTarget;
extern u8 gBanksBySide[];
extern u8 gObjectBankIDs[];
-extern u8 gIsLinkContest;
-extern u8 gContestPlayerMonIndex;
extern u16 gBattle_BG3_X;
extern s16 gBattle_BG1_Y;
extern u16 gBattle_BG3_Y;
@@ -65,14 +61,6 @@ extern u16 gBattle_BG1_X;
extern u16 gBattle_WIN0H;
extern u32 gUnknown_03005D28; // saved RNG value
-extern s16 gUnknown_02038680[];
-extern u16 gUnknown_02038688[];
-extern u8 gUnknown_02038694;
-extern u8 gUnknown_02038696[];
-extern u8 gUnknown_0203869B;
-extern s16 gUnknown_02038670[];
-extern s16 gUnknown_02038678[];
-extern u8 gContestFinalStandings[]; // What "place" each participant came in.
extern struct SpriteTemplate gUnknown_02024E8C;
@@ -292,6 +280,20 @@ void sub_80B292C(void);
void sub_80B2968(void);
void SelectContestMoveBankTarget(u16);
+EWRAM_DATA u8 gUnknown_0203856C = 0;
+EWRAM_DATA struct ContestPokemon gContestMons[4] = {0};
+EWRAM_DATA s16 gUnknown_02038670[4] = {0};
+EWRAM_DATA s16 gUnknown_02038678[4] = {0};
+EWRAM_DATA s16 gUnknown_02038680[4] = {0};
+EWRAM_DATA u16 gUnknown_02038688[4] = {0};
+EWRAM_DATA u8 gContestFinalStandings[4] = {0}; // What "place" each participant came in.
+EWRAM_DATA u8 gUnknown_02038694 = 0;
+EWRAM_DATA u8 gContestPlayerMonIndex = 0;
+EWRAM_DATA u8 gUnknown_02038696[4] = {0};
+EWRAM_DATA u8 gIsLinkContest = 0;
+EWRAM_DATA u8 gUnknown_0203869B = 0;
+EWRAM_DATA u16 gSpecialVar_ContestCategory = 0;
+EWRAM_DATA u16 gSpecialVar_ContestRank = 0;
void nullsub_89(u8 taskId)
{
diff --git a/src/easy_chat_2.c b/src/easy_chat_2.c
index dc8bddd5a..c56fe7576 100644
--- a/src/easy_chat_2.c
+++ b/src/easy_chat_2.c
@@ -70,6 +70,8 @@ static u16 sub_80EB960(void);
u8 sub_80EB9C8(void);
static u16 sub_80EB9D8(void);
+EWRAM_DATA u8 gUnknown_020388AC = 0;
+
static u8 gUnknown_03000740;
const u16 InterviewPalette_0[] = INCBIN_U16("graphics/misc/interview_pal0.gbapal");
diff --git a/src/engine/record_mixing.c b/src/engine/record_mixing.c
index 75ca92e6a..a2660bf82 100644
--- a/src/engine/record_mixing.c
+++ b/src/engine/record_mixing.c
@@ -26,7 +26,7 @@
#include "tv.h"
#include "ewram.h"
-extern struct RecordMixingDayCareMail gUnknown_02038738;
+EWRAM_DATA struct RecordMixingDayCareMail gUnknown_02038738 = {0};
extern u16 gSpecialVar_0x8005;
u32 gUnknown_03005D2C;
diff --git a/src/engine/trade.c b/src/engine/trade.c
index 3a14adaca..e49cde6cd 100644
--- a/src/engine/trade.c
+++ b/src/engine/trade.c
@@ -213,12 +213,14 @@ static
#endif
void sub_804DB84(void);
-extern u8 gUnknown_020297D8[2];
-extern u8 *gUnknown_020296CC[13];
+EWRAM_DATA u8 *gUnknown_020296CC[13] = {0};
+EWRAM_DATA struct MailStruct gUnknown_02029700[6] = {0};
+EWRAM_DATA u8 gUnknown_020297D8[2] = {0};
+
extern struct TradeEwramSubstruct *gUnknown_03004824;
-extern struct MailStruct gUnknown_02029700[16];
-const u32 unref_data_820ABD4[] = {
+const u32 unref_data_820ABD4[] =
+{
0x00000890,
0x00003AC0,
0x0000001C,
diff --git a/src/field/field_weather.c b/src/field/field_weather.c
index 48d7da7f7..b6475d8ff 100644
--- a/src/field/field_weather.c
+++ b/src/field/field_weather.c
@@ -35,10 +35,11 @@ struct WeatherCallbacks
bool8 (*finish)(void);
};
-extern struct Weather gWeather;
-extern u8 gUnknown_0202FF38[];
-extern u16 gUnknown_0202FF58;
-IWRAM_DATA const u8 *gUnknown_030006DC;
+EWRAM_DATA struct Weather gWeather = {0};
+EWRAM_DATA u8 gUnknown_0202FF38[32] = {0};
+EWRAM_DATA u16 gUnknown_0202FF58 = {0};
+
+static const u8 *gUnknown_030006DC;
const u8 DroughtPaletteData_0[] = INCBIN_U8("graphics/weather/drought0.bin.lz");
const u8 DroughtPaletteData_1[] = INCBIN_U8("graphics/weather/drought1.bin.lz");
@@ -47,9 +48,6 @@ const u8 DroughtPaletteData_3[] = INCBIN_U8("graphics/weather/drought3.bin.lz");
const u8 DroughtPaletteData_4[] = INCBIN_U8("graphics/weather/drought4.bin.lz");
const u8 DroughtPaletteData_5[] = INCBIN_U8("graphics/weather/drought5.bin.lz");
-extern u8 (*gUnknown_0202FC48)[32];
-extern u8 gUnknown_0202F9E8[32];
-
static const u8 *const sCompressedDroughtPalettes[] =
{
DroughtPaletteData_0,
diff --git a/src/field/party_menu.c b/src/field/party_menu.c
index 48275435e..32986fae9 100644
--- a/src/field/party_menu.c
+++ b/src/field/party_menu.c
@@ -101,7 +101,14 @@ static void sub_806BF24(const u8 *a, u8 monIndex, u8 c, u8 d);
static void sub_806BB9C(u8 a);
static void sub_806BBEC(u8 a);
-const u16 TMHMMoves[] = {
+EWRAM_DATA u8 gUnknown_0202E8F4 = 0;
+EWRAM_DATA u8 gUnknown_0202E8F5 = 0;
+EWRAM_DATA u8 gUnknown_0202E8F6 = 0;
+EWRAM_DATA u16 gUnknown_0202E8F8 = 0;
+EWRAM_DATA u8 gPartyMenuType = 0;
+
+const u16 TMHMMoves[] =
+{
MOVE_FOCUS_PUNCH,
MOVE_DRAGON_CLAW,
MOVE_WATER_PULSE,
@@ -458,10 +465,6 @@ struct Unk201FE00
extern u16 gBattleTypeFlags;
extern u8 gTileBuffer[];
-extern u8 gUnknown_0202E8F4;
-extern u8 gUnknown_0202E8F6;
-extern u16 gUnknown_0202E8F8;
-extern u8 gPartyMenuType;
extern u8 gLastFieldPokeMenuOpened;
extern u8 gPlayerPartyCount;
extern s32 gBattleMoveDamage;
diff --git a/src/field/pc_screen_effect.c b/src/field/pc_screen_effect.c
index 364fca0aa..e0853e01d 100644
--- a/src/field/pc_screen_effect.c
+++ b/src/field/pc_screen_effect.c
@@ -30,7 +30,7 @@ extern const u16 gUnknownPal_083D18EC[16];
extern const u8 gUnknownGfx_083D190C[128];
-extern struct UnkStruct *gUnknown_020387EC;
+EWRAM_DATA struct UnkStruct *gUnknown_020387EC = NULL;
const struct SpriteSheet gUnknown_083D1898 = { gUnknownGfx_083D190C, sizeof(gUnknownGfx_083D190C), 0 };
diff --git a/src/field/secret_base.c b/src/field/secret_base.c
index 203b57867..728decc9c 100644
--- a/src/field/secret_base.c
+++ b/src/field/secret_base.c
@@ -51,7 +51,7 @@ static void Task_SecretBasePC_Registry(u8 taskId);
extern u8 gUnknown_0815F399[];
extern u8 gUnknown_0815F49A[];
-extern u8 gUnknown_020387DC;
+EWRAM_DATA u8 gUnknown_020387DC = 0;
const struct
{
diff --git a/src/pokemon/pokemon_summary_screen.c b/src/pokemon/pokemon_summary_screen.c
index bf8306fc0..7b40918e9 100644
--- a/src/pokemon/pokemon_summary_screen.c
+++ b/src/pokemon/pokemon_summary_screen.c
@@ -121,7 +121,6 @@ extern u8 ball_number_to_ball_processing_index(u16);
extern u8 StorageSystemGetNextMonIndex(struct BoxPokemon *, u8, u8, u8);
extern struct MusicPlayerInfo gMPlay_BGM;
-extern u8 gUnknown_020384F0;
extern u8 gUnknown_08208238[];
extern u16 gBattle_BG3_Y;
extern u16 gBattle_BG2_Y;
@@ -130,7 +129,6 @@ extern u16 gBattle_BG1_X;
extern u16 gBattle_BG2_X;
extern u16 gBattle_BG3_X;
extern TaskFunc gUnknown_03005CF0;
-extern struct Sprite *gUnknown_020384F4;
extern struct SpriteTemplate gUnknown_02024E8C;
extern const u8 gStatusPal_Icons[];
@@ -157,6 +155,9 @@ extern const u16 gUnknown_08E94550[];
extern const u16 gUnknown_08E94590[];
extern const u8 gUnknown_08E73E88[];
+EWRAM_DATA u8 gUnknown_020384F0 = 0;
+EWRAM_DATA struct Sprite *gUnknown_020384F4 = NULL;
+
#if ENGLISH
#include "../data/text/move_descriptions_en.h"
#include "../data/text/nature_names_en.h"
diff --git a/src/scene/intro_credits_graphics.c b/src/scene/intro_credits_graphics.c
index f0f1264a0..7f6765ef6 100644
--- a/src/scene/intro_credits_graphics.c
+++ b/src/scene/intro_credits_graphics.c
@@ -301,9 +301,10 @@ const struct CompressedSpriteSheet gUnknown_08416E34[] = {
};
-extern u16 gUnknown_02039358;
-extern s16 gUnknown_0203935A;
-extern s16 gUnknown_0203935C;
+EWRAM_DATA u16 gUnknown_02039358 = 0;
+EWRAM_DATA s16 gUnknown_0203935A = 0;
+EWRAM_DATA s16 gUnknown_0203935C = 0;
+
extern u8 gReservedSpritePaletteCount;
void sub_8149248();
diff --git a/sym_ewram.txt b/sym_ewram.txt
index 0bb35e8c2..aeb04170d 100644
--- a/sym_ewram.txt
+++ b/sym_ewram.txt
@@ -296,18 +296,7 @@ gBattleMonForms: @ 2024E84
.include "src/pokemon/pokemon_1.o"
.include "src/pokemon/pokemon_2.o"
.include "src/engine/load_save.o"
-
-@ trade
-
-gUnknown_020296CC: @ 20296CC
- .space 0x34
-
-gUnknown_02029700: @ 2029700
- .space 0xD8
-
-gUnknown_020297D8: @ 20297D8
- .space 0x4
-
+ .include "src/engine/trade.o"
.include "src/scene/berry_blender.o"
.include "src/scene/new_game.o"
.include "src/field/overworld.o"
@@ -319,25 +308,7 @@ gUnknown_020297D8: @ 20297D8
.include "src/field/scrcmd.o"
.include "src/field/field_control_avatar.o"
.include "src/field/event_data.o"
-
-@ party_menu
-
- .align 2
-gUnknown_0202E8F4: @ 202E8F4
- .space 0x1
-
-gUnknown_0202E8F5: @ 202E8F5
- .space 0x1
-
-gUnknown_0202E8F6: @ 202E8F6
- .space 0x2
-
-gUnknown_0202E8F8: @ 202E8F8
- .space 0x2
-
-gPartyMenuType: @ 202E8FA
- .space 0x2
-
+ .include "src/field/party_menu.o"
.include "src/field/start_menu.o"
.include "src/engine/menu.o"
.include "src/engine/tileset_anim.o"
@@ -346,25 +317,7 @@ gPartyMenuType: @ 202E8FA
.include "src/battle/battle_anim.o"
.include "src/rom_8077ABC.o"
.include "src/scene/title_screen.o"
-
-@ field_weather
-
- .align 2
-gWeather: @ 202F7E8
- .space 0x200
-
-gUnknown_0202F9E8: @ 202F9E8
- .space 0x260
-
-gUnknown_0202FC48: @ 202FC48
- .space 0x2F0
-
-gUnknown_0202FF38: @ 202FF38
- .space 0x20
-
-gUnknown_0202FF58: @ 202FF58
- .space 0x4
-
+ .include "src/field/field_weather.o"
.include "src/battle/battle_setup.o"
.include "src/field/wild_encounter.o"
.include "src/field/field_effect.o"
@@ -428,100 +381,25 @@ gUnknown_020384EA: @ 20384EA
gUnknown_020384EC: @ 20384EC
.space 0x4
-@ pokemon_summary_screen
-
-gUnknown_020384F0: @ 20384F0
- .space 0x4
-
-gUnknown_020384F4: @ 20384F4
- .space 0x4
-
+ .include "src/pokemon/pokemon_summary_screen.o"
.include "src/field/script_movement.o"
.include "src/field/map_name_popup.o"
.include "src/field/item_menu.o"
-
-@ contest
-
- .align 2
-gUnknown_0203856C: @ 203856C
- .space 0x4
-
-gContestMons: @ 2038570
- .space 0x100
-
-gUnknown_02038670: @ 2038670
- .space 0x8
-
-gUnknown_02038678: @ 2038678
- .space 0x8
-
-gUnknown_02038680: @ 2038680
- .space 0x8
-
-gUnknown_02038688: @ 2038688
- .space 0x8
-
-gContestFinalStandings: @ 2038690
- .space 0x4
-
-gUnknown_02038694: @ 2038694
- .space 0x1
-
-gContestPlayerMonIndex: @ 2038695
- .space 0x1
-
-gUnknown_02038696: @ 2038696
- .space 0x4
-
-gIsLinkContest: @ 203869A
- .space 0x1
-
-gUnknown_0203869B: @ 203869B
- .space 0x1
-
-gSpecialVar_ContestCategory: @ 203869C
- .space 0x2
-
-gSpecialVar_ContestRank: @ 203869E
- .space 0x2
-
+ .include "src/contest.o"
.include "src/field/shop.o"
.include "src/field/money.o"
-
-@ record_mixing
-
- .align 2
-gUnknown_02038738: @ 2038738
- .space 0x78
-
+ .include "src/engine/record_mixing.o"
.include "src/debug/sound_check_menu.o"
-
-@ secret_base
-
- .align 2
-gUnknown_020387DC: @ 20387DC
- .space 0x4
-
-@ tv
-
+ .include "src/field/secret_base.o"
.include "src/field/tv.o"
-
-@ fldeff_80C5CD4
-
- .align 2
-gUnknown_020387EC: @ 20387EC
- .space 0x4
-
+ .include "src/field/pc_screen_effect.o"
.include "src/field/rotating_gate.o"
.include "src/field/safari_zone.o"
-
-@ easy_chat
-
-gUnknown_020388AC: @ 20388AC
- .space 0x4
+ .include "src/easy_chat_2.o"
@ pokenav
+ .align 2
gUnknown_020388B0: @ 20388B0
.space 0x4
@@ -559,11 +437,7 @@ gUnknown_02039268: @ 2039268
gUnknown_0203926A: @ 203926A
.space 0x2
-@ battle_message
-
-gAbilitiesPerBank: @ 203926C
- .space 0x4
-
+ .include "src/battle/battle_message.o"
.include "src/field/choose_party.o"
.include "src/scene/cable_car.o"
.include "src/engine/save.o"
@@ -579,20 +453,11 @@ gAbilitiesPerBank: @ 203926C
.include "src/engine/mystery_event_menu.o"
.include "src/engine/save_failed_screen.o"
.include "src/pokemon/pokeblock_feed.o"
-
-@ intro_credits_graphics
-
-gUnknown_02039358: @ 2039358
- .space 0x2
-
-gUnknown_0203935A: @ 203935A
- .space 0x2
-
-gUnknown_0203935C: @ 203935C
- .space 0x4
+ .include "src/scene/intro_credits_graphics.o"
@ ???
+ .align 4
gTileBuffer: @ 2039360
.space 0x100
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-07 08:44:05 +0000