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
@@ -28559,7 +28559,7 @@ _081D5268:
 	ldr r0, =gUnknown_085EE097
 	bl sub_8018884
 	ldr r0, =gUnknown_03006370
-	ldr r1, =gUnknown_089A6550
+	ldr r1, =gMultiBootProgram_BerryGlitchFix_Start
 	ldr r2, =gUnknown_089A3470
 	subs r1, r2
 	bl sub_81D4D50