fix merge conflicts

2019-12-04 21:35:31 -07:00
parent c8b22e2680 67f48e5f28
commit 9f2a53eec3
156 changed files with 4490 additions and 6970 deletions
@@ -709,11 +709,11 @@ _080480A4: .4byte sub_8048128
 GetHealthboxElementGfxPtr: @ 80480A8
 	lsls r0, 24
 	lsrs r0, 19
-	ldr r1, _080480B4 @ =gUnknown_8D11BC4
+	ldr r1, _080480B4 @ =gHealthboxElementsGfxTable
 	adds r0, r1
 	bx lr
 	.align 2, 0
-_080480B4: .4byte gUnknown_8D11BC4
+_080480B4: .4byte gHealthboxElementsGfxTable
 	thumb_func_end GetHealthboxElementGfxPtr

 	thumb_func_start sub_80480B8
@@ -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