diff options
| author | paul <nintendo6496@googlemail.com> | 2018-10-14 16:36:53 +0200 |
|---|---|---|
| committer | paul <nintendo6496@googlemail.com> | 2018-10-14 16:36:53 +0200 |
| commit | 3037f37cc669bec7580fe2623ce2c6ea1c4ebe76 (patch) | |
| tree | 5ee0dc775f6a4b6dda46baa8852ef78dd464528e /asm/main_menu.s | |
| parent | 943931f86f50b946145548b0bee9663724e14980 (diff) | |
| parent | a2e49c4d5c275b28b6485d404e305a98c935d022 (diff) | |
merge upstream, fix non-conflict in trade.s
Diffstat (limited to 'asm/main_menu.s')
| -rw-r--r-- | asm/main_menu.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/main_menu.s b/asm/main_menu.s index 9c1302cdc..ff1ab95cc 100644 --- a/asm/main_menu.s +++ b/asm/main_menu.s @@ -254,7 +254,7 @@ _0800C4E8: movs r0, 0x54 movs r1, 0x7 bl SetGpuReg - ldr r0, _0800C53C @ =gUnknown_30053A0 + ldr r0, _0800C53C @ =gSaveFileStatus ldrh r4, [r0] cmp r4, 0x2 beq _0800C58C @@ -267,7 +267,7 @@ _0800C4E8: b _0800C5E8 .align 2, 0 _0800C538: .4byte gUnknown_2037AB8 -_0800C53C: .4byte gUnknown_30053A0 +_0800C53C: .4byte gSaveFileStatus _0800C540: cmp r4, 0x4 beq _0800C60C |