summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2019-04-04 09:23:13 -0400
committerhuderlem <huderlem@gmail.com>2019-04-04 19:26:45 -0500
commitcb04af05dc473f15eb97ae181dcba624efa2b8d1 (patch)
tree4716895c801be64b76c2395605b8ba76be053503
parent53efbe2832f5e7a6973c3c5a6a6d7240ea5ecbdd (diff)
Resolve unnecessarily externed symbols
-rwxr-xr-xsrc/union_room_chat.c15
-rw-r--r--sym_ewram.txt12
2 files changed, 5 insertions, 22 deletions
diff --git a/src/union_room_chat.c b/src/union_room_chat.c
index ffe30d863..84a0406be 100755
--- a/src/union_room_chat.c
+++ b/src/union_room_chat.c
@@ -214,18 +214,9 @@ static bool32 sub_801FD88(u8 *state);
static void sub_8020ABC(struct Sprite *sprite);
static void sub_8020AF4(struct Sprite *sprite);
-extern struct UnionRoomChat *gUnknown_02022C84;
-extern struct UnionRoomChat2 *gUnknown_02022C88;
-extern struct UnionRoomChat3 *gUnknown_02022C8C;
-extern const u16 gUnknown_082F2C20[];
-extern const u16 gUnknown_082F2C40[];
-extern const struct SpritePalette gUnknown_082F315C;
-extern const struct SpriteTemplate gUnknown_082F319C;
-extern const u16 gUnknown_082F2DF0[];
-extern const struct SpriteTemplate gUnknown_082F31BC;
-extern const struct SpriteTemplate gUnknown_082F31D4;
-extern const struct SpriteTemplate gUnknown_082F322C;
-extern const struct SpriteTemplate gUnknown_082F3244;
+EWRAM_DATA struct UnionRoomChat *gUnknown_02022C84 = NULL;
+EWRAM_DATA struct UnionRoomChat2 *gUnknown_02022C88 = NULL;
+EWRAM_DATA struct UnionRoomChat3 *gUnknown_02022C8C = NULL;
void (*const gUnknown_082F2A7C[])(void) =
{
diff --git a/sym_ewram.txt b/sym_ewram.txt
index ff27b4cfb..141d42875 100644
--- a/sym_ewram.txt
+++ b/sym_ewram.txt
@@ -14,18 +14,10 @@
.include "src/mevent_801BAAC.o"
.include "src/mevent_server.o"
.include "src/mevent_client.o"
+ .include "src/union_room_chat.o"
- @ union_room_chat
+ @ berry_crush
.align 2
-gUnknown_02022C84: @ 2022C84
- .space 0x4
-
-gUnknown_02022C88: @ 2022C88
- .space 0x4
-
-gUnknown_02022C8C: @ 2022C8C
- .space 0x4
-
gUnknown_02022C90: @ 2022C90
.space 0x4