summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2017-09-28 21:25:54 -0400
committerPikalaxALT <pikalaxalt@gmail.com>2017-09-28 21:25:54 -0400
commit170c82f299905b6e55b20a5c2c04f92353131d0e (patch)
treea949631e1be83f63c50f6a584ed13f1a9ea746a8 /src
parentb7f9479bdb37f12774f7e31a934a3dd5e8f821e0 (diff)
Remove all hardcoded labels in sym_bss.txt
Diffstat (limited to 'src')
-rw-r--r--src/battle_anim_80CA710.c18
-rw-r--r--src/daycare.c11
-rw-r--r--src/easy_chat.c2
-rw-r--r--src/field_weather.c2
-rw-r--r--src/mauville_old_man.c2
-rw-r--r--src/pokenav.c2
-rw-r--r--src/trade.c1
7 files changed, 32 insertions, 6 deletions
diff --git a/src/battle_anim_80CA710.c b/src/battle_anim_80CA710.c
new file mode 100644
index 000000000..65ccd7c21
--- /dev/null
+++ b/src/battle_anim_80CA710.c
@@ -0,0 +1,18 @@
+
+// Includes
+#include "global.h"
+
+// Static type declarations
+
+// Static RAM declarations
+
+IWRAM_DATA u32 filler_03000724;
+IWRAM_DATA u16 gUnknown_03000728[4];
+IWRAM_DATA u16 gUnknown_03000730[6];
+IWRAM_DATA u32 filler_0300073c;
+
+// Static ROM declarations
+
+// .rodata
+
+// .text
diff --git a/src/daycare.c b/src/daycare.c
index b0f7a193f..717e37330 100644
--- a/src/daycare.c
+++ b/src/daycare.c
@@ -25,6 +25,12 @@
extern u16 word_2024E82;
+IWRAM_DATA u16 gUnknown_03000470[52];
+IWRAM_DATA u16 gUnknown_030004D8[4];
+IWRAM_DATA u16 gUnknown_030004E0[4];
+IWRAM_DATA u16 gUnknown_030004E8[12];
+IWRAM_DATA u16 gUnknown_03000500[4];
+
static void sub_80417F4(struct DayCareMail *);
static void sub_80420FC(struct Pokemon *, u16, struct DayCareData *);
static u8 daycare_relationship_score(struct DayCareData *);
@@ -430,11 +436,6 @@ u8 pokemon_get_eggmoves(struct Pokemon *pokemon, u16 *eggMoves)
}
#ifdef NONMATCHING
-extern u16 gUnknown_03000470[50];
-extern u16 gUnknown_030004D8[4];
-extern u16 gUnknown_030004E0[4];
-extern u16 gUnknown_030004E8[10];
-extern u16 gUnknown_03000500[4];
void daycare_build_child_moveset(struct Pokemon *egg, struct BoxPokemon *dad, struct BoxPokemon *mom)
{
diff --git a/src/easy_chat.c b/src/easy_chat.c
index cca8c1355..f3673c8fa 100644
--- a/src/easy_chat.c
+++ b/src/easy_chat.c
@@ -19,6 +19,8 @@ extern const u8 gEasyChatGroupSizes[];
extern u16 gSpecialVar_0x8004;
+IWRAM_DATA u8 gUnknown_03000740;
+
u8 *sub_80EB3FC(u8 *dst, u16 word)
{
diff --git a/src/field_weather.c b/src/field_weather.c
index 5ff2eddf9..443a38357 100644
--- a/src/field_weather.c
+++ b/src/field_weather.c
@@ -55,7 +55,7 @@ extern struct Weather gWeather;
extern u8 *gUnknown_083970E8;
extern u8 (*gUnknown_08396FC8[][4])(void);
extern u8 (*gUnknown_083970B8[])(void);
-extern u8 *gUnknown_030006DC;
+IWRAM_DATA u8 *gUnknown_030006DC;
extern u8 gUnknown_083970C8;
extern u8 (*gUnknown_0202FC48)[32];
extern u8 gUnknown_0202F9E8[32];
diff --git a/src/mauville_old_man.c b/src/mauville_old_man.c
index 93684fc60..789a251e6 100644
--- a/src/mauville_old_man.c
+++ b/src/mauville_old_man.c
@@ -16,6 +16,8 @@ extern u32 gUnknown_083E53A8[];
extern u16 gUnknown_083E537C[];
+IWRAM_DATA u8 gUnknown_03000748;
+
void sub_80F7A34(void)
{
u16 i;
diff --git a/src/pokenav.c b/src/pokenav.c
index 84ed7b14b..21d7bb4e3 100644
--- a/src/pokenav.c
+++ b/src/pokenav.c
@@ -38,3 +38,5 @@ void sub_80F700C(u8 *arg0, u16 arg1) {
ptr[2] = 0x80;
ptr[3] = 0xFF;
}
+
+IWRAM_DATA MainCallback gUnknown_03000744;
diff --git a/src/trade.c b/src/trade.c
index cb190d194..0816fe555 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -37,6 +37,7 @@ struct UnkStructD {
extern const struct InGameTrade gIngameTrades[];
extern const u16 gIngameTradeMail[][10];
+IWRAM_DATA u8 gUnknown_03000508[8];
void sub_804A96C(struct UnkStructD *arg0, u8 left, u8 top, u16 *tilemap, u8 width, u8 height, u16 sp8) {
int y, x;