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

2017-11-15 00:47:34 -06:00
parent 6e6e11205d 3fb2a488f9
commit ce0e5cbfe4
121 changed files with 6022 additions and 11283 deletions
@@ -6763,7 +6763,7 @@ _080DB1CC:
 	adds r0, r5, 0
 	adds r1, r7, 0
 	adds r2, r6, 0
-	bl species_and_otid_get_pal
+	bl GetFrontSpritePalFromSpeciesAndPersonality
 	movs r1, 0x90
 	lsls r1, 1
 	movs r2, 0x20