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
@@ -2801,7 +2801,7 @@ sub_819BCF8: @ 819BCF8
 	lsls r0, 16
 	lsrs r0, 16
 	add r1, sp, 0xC
-	bl sub_81DB468
+	bl CopyMonCategoryText
 	movs r0, 0x1
 	add r1, sp, 0xC
 	movs r2, 0x76
@@ -8831,7 +8831,7 @@ _0819EFF2:
 	lsls r0, 16
 	lsrs r0, 16
 	add r1, sp, 0xC
-	bl sub_81DB468
+	bl CopyMonCategoryText
 	movs r0, 0x1
 	add r1, sp, 0xC
 	movs r2, 0x76