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

2017-12-28 03:00:15 -06:00
parent 2d04eb22ab 87958f2f87
commit 1496ea3a24
67 changed files with 10850 additions and 4312 deletions
@@ -1,7 +1,6 @@
-@ the fourth big chunk of data
-
 	.include "asm/macros.inc"
 	.include "constants/constants.inc"
+	.include "include/constants/species.h"

 	.section .rodata

@@ -36,8 +35,11 @@ gStarterChoose_LabelCoords:: @ 85B1DF2
 	.incbin "baserom.gba", 0x5b1df2, 0x6

 sStarterMon:: @ 85B1DF8
-	.incbin "baserom.gba", 0x5b1df8, 0x8
+	.2byte SPECIES_TREECKO
+	.2byte SPECIES_TORCHIC
+	.2byte SPECIES_MUDKIP

+.align 2
 gUnknown_085B1E00:: @ 85B1E00
 	.incbin "baserom.gba", 0x5b1e00, 0xc