merge with master and move to C

2017-09-28 16:32:23 +02:00
parent bc3b4b4d9a 3c8091393c
commit 14fcc9ec20
125 changed files with 10000 additions and 4659 deletions
@@ -3977,7 +3977,7 @@ sub_809B114: @ 809B114
 	adds r4, r0
 	ldr r0, [r4]
 	lsrs r1, 11
-	ldr r2, =gUnknown_085A5C09
+	ldr r2, =gDecorations + 1
 	adds r1, r2
 	bl StringCopy
 	movs r0, 0