Merge branch 'master' into link

2017-11-27 20:05:51 -05:00
parent 73b0f9eb53 18c6b8efc2
commit cbd2718b5e
106 changed files with 13373 additions and 14129 deletions
@@ -238,8 +238,8 @@ _08084854:
 	.pool
 	thumb_func_end sav12_xor_set

-	thumb_func_start ApplyNewEncyprtionKeyToGameStats
-ApplyNewEncyprtionKeyToGameStats: @ 8084864
+	thumb_func_start ApplyNewEncryptionKeyToGameStats
+ApplyNewEncryptionKeyToGameStats: @ 8084864
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	movs r4, 0
@@ -251,7 +251,7 @@ _0808486C:
 	ldr r0, [r6]
 	adds r0, r1
 	adds r1, r5, 0
-	bl ApplyNewEncyprtionKeyToWord
+	bl ApplyNewEncryptionKeyToWord
 	adds r0, r4, 0x1
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -261,7 +261,7 @@ _0808486C:
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end ApplyNewEncyprtionKeyToGameStats
+	thumb_func_end ApplyNewEncryptionKeyToGameStats

 	thumb_func_start CopyFieldObjectTemplatesToSav1
@ void CopyFieldObjectTemplatesToSav1()
@@ -2675,12 +2675,12 @@ sub_8085B2C: @ 8085B2C
 	ldr r1, =gUnknown_02032306
 	movs r0, 0x1
 	strb r0, [r1]
-	bl sub_80B582C
+	bl GetLocalWaterMon
 	b _08085B62
 	.pool
 _08085B5C:
 	ldr r0, =gUnknown_02032306
-	bl wild_pokemon_rand_for_map
+	bl GetLocalWildMon
 _08085B62:
 	ldr r1, =gUnknown_02032304
 	strh r0, [r1]