Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_item_menu

2018-02-11 20:34:56 -05:00
parent 56e1a52823 14a76793e5
commit f2144e9932
75 changed files with 2756 additions and 4161 deletions
--- a/sym_common.txt
+++ b/sym_common.txt
@@ -202,33 +202,7 @@ gUnknown_03005CDE: @ 3005CDE
 	.space 0x1A

    .include "rtc.o"
-
-gPreBattleCallback1: @ 3005D00
-	.space 0x4
-
-gBattleMainFunc: @ 3005D04
-	.space 0xC
-
-gBattleResults: @ 3005D10
-	.space 0x44
-
-gLeveledUpInBattle: @ 3005D54
-	.space 0xC
-
-gBattlerControllerFuncs: @ 3005D60
-	.space 0x10
-
-gHealthboxSpriteIds: @ 3005D70
-	.space 0x4
-
-gMultiUsePlayerCursor: @ 3005D74
-	.space 0x4
-
-gNumberOfMovesToChoose: @ 3005D78
-	.space 0x4
-
-gUnknown_03005D7C: @ 3005D7C
-	.space 0x4
+    .include "battle_main.o"

 gRngValue: @ 3005D80
 	.space 0x4