resolve conflict

2019-12-04 01:57:27 -05:00
parent 1b7dc422d9 bc0fe11d16
commit cb5fe2f84f
27 changed files with 1519 additions and 3748 deletions
@@ -5484,7 +5484,7 @@ sub_810A9D4: @ 810A9D4
 	mov r2, r8
 	ldrh r1, [r2, 0x10]
 	movs r2, 0x2
-	bl sub_809C09C
+	bl RecordItemPurchase
 	mov r3, r8
 	ldrb r0, [r3]
 	ldr r4, _0810AAE4 @ =gUnknown_203ACFC