Merge branch 'master' into quest_log

This commit is contained in:
PikalaxALT committed 2018-10-15 09:19:30 -05:00
commit f07f73e188
36 files changed
+2576 -3691

No files matched your search

+2 -2
View File
@@ -1379,7 +1379,7 @@ _0806F814:
beq _0806F858
b _0806F864
_0806F81A:
ldr r0, _0806F838 @ =gUnknown_30053A0
ldr r0, _0806F838 @ =gSaveFileStatus
ldrh r0, [r0]
cmp r0, 0
beq _0806F826
@@ -1396,7 +1396,7 @@ _0806F82E:
str r0, [r1]
b _0806F864
.align 2, 0
_0806F838: .4byte gUnknown_30053A0
_0806F838: .4byte gSaveFileStatus
_0806F83C: .4byte gUnknown_2031DB0
_0806F840: .4byte gUnknown_3000FA4
_0806F844: .4byte sub_806F86C