Fix merge conflicts

2017-09-20 13:12:43 +02:00
parent 67a8ac72ec f94074b602
commit 3919b7130b
60 changed files with 8390 additions and 21788 deletions
@@ -751,7 +751,7 @@ sub_80E90C8: @ 80E90C8
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
-	ldr r0, =gUnknown_02037590
+	ldr r0, =gPlayerAvatar
 	ldrb r1, [r0, 0x5]
 	lsls r0, r1, 3
 	adds r0, r1