summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan <eroelke@gmail.com>2019-12-05 14:46:17 -0700
committerEvan <eroelke@gmail.com>2019-12-05 14:46:17 -0700
commitb0963b831e6d5e5d5bb2d2ce95d70aabd1f075f8 (patch)
tree51a0e89c133e09e4803134eebdce0f0c7ba3b401
parent646f34f9811201c1e299756cf71991e2bee50a8e (diff)
common_syms update
-rw-r--r--common_syms/battle_anim_special.txt3
-rw-r--r--src/battle_anim_special.c6
-rw-r--r--sym_common.txt10
3 files changed, 7 insertions, 12 deletions
diff --git a/common_syms/battle_anim_special.txt b/common_syms/battle_anim_special.txt
new file mode 100644
index 000000000..ec4ed5fae
--- /dev/null
+++ b/common_syms/battle_anim_special.txt
@@ -0,0 +1,3 @@
+gUnknown_3005424
+gUnknown_3005428
+gUnknown_300542C \ No newline at end of file
diff --git a/src/battle_anim_special.c b/src/battle_anim_special.c
index 8390857bb..1c9d6fe9b 100644
--- a/src/battle_anim_special.c
+++ b/src/battle_anim_special.c
@@ -40,9 +40,9 @@
#define LOHALF(n) ((n) & 0xFFFF)
// RAM
-EWRAM_DATA int gUnknown_3005424 = 0;
-EWRAM_DATA u16 gUnknown_3005428 = 0;
-EWRAM_DATA u16 gUnknown_300542C = 0;
+int gUnknown_3005424;
+u16 gUnknown_3005428;
+u16 gUnknown_300542C;
// Function Declarations
static void sub_80EEDF4(u8);
diff --git a/sym_common.txt b/sym_common.txt
index 9a64a9d0f..345829a24 100644
--- a/sym_common.txt
+++ b/sym_common.txt
@@ -98,16 +98,8 @@ gUnknown_3005354: @ 3005354
.include "evolution_scene.o"
.align 2
.include "save.o"
-
.align 2
-gUnknown_3005424: @ 3005424
- .space 0x4
-
-gUnknown_3005428: @ 3005428
- .space 0x4
-
-gUnknown_300542C: @ 300542C
- .space 0x4
+ .include "battle_anim_special.o"
gUnknown_3005430: @ 3005430
.space 0x10