battle labels merge with master

2018-02-09 00:43:07 +01:00
parent 9df5e16343 387dbf48d0
commit bce01bc518
137 changed files with 40431 additions and 35066 deletions
@@ -241,20 +241,7 @@ gBattle_WIN1V: @ 2022E2A
    .include "src/battle_message.o"
 	.include "src/battle_main.o"

-sLearningMoveTableID: @ 20244E8
-	.space 0x1
-
-gPlayerPartyCount: @ 20244E9
-	.space 0x1
-
-gEnemyPartyCount: @ 20244EA
-	.space 0x2
-
-gPlayerParty: @ 20244EC
-	.space 600
-
-gEnemyParty: @ 2024744
-	.space 600
+	.include "src/pokemon_1.o"

 gUnknown_0202499C: @ 202499C
 	.space 0x18
@@ -1006,36 +993,9 @@ gUnknown_0203CD80: @ 203CD80
 gUnknown_0203CD88: @ 203CD88
 	.space 0x4

-gUnknown_0203CD8C: @ 203CD8C
-	.space 0x1
-
-gUnknown_0203CD8D: @ 203CD8D
-	.space 0x3
-
-gUnknown_0203CD90: @ 203CD90
-	.space 0xC
-
-gUnknown_0203CD9C: @ 203CD9C
-	.space 0x2
-
-gUnknown_0203CD9E: @ 203CD9E
-	.space 0x1
-
-gUnknown_0203CD9F: @ 203CD9F
-	.space 0x1
-
-gUnknown_0203CDA0: @ 203CDA0
-	.space 0x4
-
-gUnknown_0203CDA4: @ 203CDA4
-	.space 0x4
-
-gUnknown_0203CDA8: @ 203CDA8
-	.space 0x4
-
-gUnknown_0203CDAC: @ 203CDAC
-	.space 0x80
+    .include "src/menu.o"

+    .align 2
 gUnknown_0203CE2C: @ 203CE2C
 	.space 0x4