Merge branch 'master' into decompile_battle_frontier_1

2018-08-25 20:02:09 +02:00
parent edcf04b665 60dff848aa
commit 447e65860c
118 changed files with 21234 additions and 25833 deletions
@@ -1244,7 +1244,7 @@ _0819AF1A:
 	movs r0, 0x1
 	adds r2, r6, 0
 	movs r3, 0x5
-	bl sub_81BF8EC
+	bl ShowPokemonSummaryScreen
 _0819AF50:
 	add sp, 0x4
 	pop {r4-r6}
@@ -4373,7 +4373,7 @@ _0819C9C4:
 	str r0, [sp]
 	movs r0, 0
 	movs r3, 0x2
-	bl sub_81BF8EC
+	bl ShowPokemonSummaryScreen
 _0819C9F0:
 	add sp, 0x4
 	pop {r4-r6}