Merge branch 'master' into link

2018-02-03 09:42:19 -05:00
parent d4e8c20f84 eb6aed50e5
commit d52f52fa73
133 changed files with 14287 additions and 26107 deletions
--- a/sym_bss.txt
+++ b/sym_bss.txt
@@ -76,16 +76,8 @@ gUnknown_03001204: @ 3001204
 	.space 0x4

 	.include "src/battle_transition.o"
-
-gUnknown_03001240: @ 3001240
-	.space 0x30
-
-gUnknown_03001270: @ 3001270
-	.space 0x4
-
-gUnknown_03001274: @ 3001274
-	.space 0x4
-
+	.include "src/pokemon_animation.o"
+	
 gUnknown_03001278: @ 3001278
 	.space 0x1