Merge branch 'master' into link

2018-02-11 19:22:06 -05:00
parent f39053ee30 14a76793e5
commit ea347199a2
429 changed files with 56348 additions and 62508 deletions
@@ -5764,7 +5764,7 @@ sub_813ABD4: @ 813ABD4
 	adds r0, r4, 0
 	adds r1, r4, 0
 	adds r2, r5, 0
-	bl AddItemIconObject
+	bl AddItemIconSprite
 	ldr r4, =gUnknown_0203AB6C
 	strb r0, [r4]
 	lsls r0, 24
@@ -7156,14 +7156,14 @@ sub_813B7D8: @ 813B7D8
 	ldr r2, =c2_exit_to_overworld_1_continue_scripts_restart_music
 	movs r0, 0
 	movs r1, 0x1
-	bl sub_81D6720
+	bl DoRayquazaScene
 	b _0813B802
 	.pool
 _0813B7F8:
 	ldr r2, =c2_exit_to_overworld_1_continue_scripts_restart_music
 	movs r0, 0x1
 	movs r1, 0
-	bl sub_81D6720
+	bl DoRayquazaScene
 _0813B802:
 	pop {r0}
 	bx r0