diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2017-03-04 23:32:12 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2017-03-04 23:32:12 -0600 |
| commit | d12fd5c5ce574dd920a968794591afe7d42659fb (patch) | |
| tree | 95a469d0243864473d13cd19082827cc89fe1a69 /asm/save_failed_screen.s | |
| parent | 56f5e8bdabdc9cb18f65eccc4de66b2932489db1 (diff) | |
| parent | 83ae14e2b9e2af7ce3eb01383fe3466357ac30b1 (diff) | |
Merge remote-tracking branch 'refs/remotes/pret/master'
Diffstat (limited to 'asm/save_failed_screen.s')
| -rw-r--r-- | asm/save_failed_screen.s | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/asm/save_failed_screen.s b/asm/save_failed_screen.s index 52ff44cc6..617108424 100644 --- a/asm/save_failed_screen.s +++ b/asm/save_failed_screen.s @@ -84,7 +84,7 @@ sub_8178FDC: @ 8178FDC mov r7, r8 push {r7} sub sp, 0xC - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain movs r1, 0x87 lsls r1, 3 adds r7, r0, r1 @@ -426,7 +426,7 @@ sub_8179390: @ 8179390 ldr r1, =gUnknown_0203BCFE movs r0, 0 strh r0, [r1] - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -457,7 +457,7 @@ sub_81793E0: @ 81793E0 ldr r0, =gUnknown_0203BCFE movs r2, 0 strh r2, [r0] - ldr r0, =gUnknown_030022C0 + ldr r0, =gMain ldrh r1, [r0, 0x2E] movs r0, 0x1 ands r0, r1 @@ -492,7 +492,7 @@ sub_8179428: @ 8179428 ldr r0, [r5] cmp r0, 0 bne _08179448 - bl Reset + bl DoSoftReset b _0817944E .pool _08179448: @@ -507,7 +507,7 @@ _0817944E: thumb_func_start sub_8179454 sub_8179454: @ 8179454 push {r4,r5,lr} - ldr r5, =gUnknown_030022C0 + ldr r5, =gMain ldr r0, [r5, 0x24] lsrs r4, r0, 3 movs r0, 0x7 |