Merge branch 'master' of https://github.com/pret/pokeemerald into dump_maps

2017-11-15 00:47:34 -06:00
parent 6e6e11205d 3fb2a488f9
commit ce0e5cbfe4
121 changed files with 6022 additions and 11283 deletions
@@ -1683,7 +1683,7 @@ _080A05AC:
 	movs r0, 0
 	movs r1, 0x11
 	bl FillWindowPixelBuffer
-	ldr r2, =gUnknown_082C8959
+	ldr r2, =gText_SavingDontTurnOffPower
 	movs r4, 0
 	str r4, [sp]
 	movs r0, 0x2