diff options
| author | Evan <eroelke@gmail.com> | 2019-11-21 09:31:40 -0700 |
|---|---|---|
| committer | Evan <eroelke@gmail.com> | 2019-11-21 09:31:40 -0700 |
| commit | 407d22af8e685076bc92f837266786dfe78e7123 (patch) | |
| tree | 11a039ad7737c105d4b81ae653ba899d342b6e57 /asm/fldeff_flash.s | |
| parent | e6bc189a033bb2019233dc99f2c1114053c7650d (diff) | |
| parent | 1234d0252cbe2b0001784b10b75f0d339824632d (diff) | |
fix PR merge conflicts
Diffstat (limited to 'asm/fldeff_flash.s')
| -rw-r--r-- | asm/fldeff_flash.s | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/asm/fldeff_flash.s b/asm/fldeff_flash.s index 63067bb03..51e55de63 100644 --- a/asm/fldeff_flash.s +++ b/asm/fldeff_flash.s @@ -421,7 +421,7 @@ sub_80C9E4C: @ 80C9E4C movs r1, 0xE0 movs r2, 0x20 bl LoadPalette - ldr r0, _080C9EDC @ =gUnknown_83F5854 + ldr r0, _080C9EDC @ =gUnknown_83F5844 + 0x10 movs r1, 0xE0 movs r2, 0x10 bl LoadPalette @@ -434,7 +434,7 @@ sub_80C9E4C: @ 80C9E4C movs r0, 0x54 movs r1, 0 bl SetGpuReg - ldr r1, _080C9EE4 @ =0x00001f0c + ldr r1, _080C9EE4 @ =0x00001f0c =BGCNT_PRIORITY(0) | BGCNT_CHARBASE(3) | BGCNT_SCREENBASE(31) movs r0, 0x8 bl SetGpuReg movs r1, 0x8A @@ -461,7 +461,7 @@ _080C9ECC: .4byte 0x0600c000 _080C9ED0: .4byte gUnknown_83F5864 _080C9ED4: .4byte 0x0600f800 _080C9ED8: .4byte gUnknown_83F5804 -_080C9EDC: .4byte gUnknown_83F5854 +_080C9EDC: .4byte gUnknown_83F5844 + 0x10 _080C9EE0: .4byte 0x00003e41 _080C9EE4: .4byte 0x00001f0c _080C9EE8: .4byte gTasks @@ -527,7 +527,7 @@ sub_80C9F38: @ 80C9F38 adds r0, r1, 0x1 strh r0, [r4, 0xC] lsls r1, 1 - ldr r0, _080C9F7C @ =gUnknown_83F5854 + ldr r0, _080C9F7C @ =gUnknown_83F5844 + 0x10 adds r0, r1, r0 movs r2, 0x10 subs r2, r1 @@ -539,7 +539,7 @@ sub_80C9F38: @ 80C9F38 .align 2, 0 _080C9F74: .4byte 0x00001010 _080C9F78: .4byte gTasks -_080C9F7C: .4byte gUnknown_83F5854 +_080C9F7C: .4byte gUnknown_83F5844 + 0x10 _080C9F80: ldr r0, _080C9F98 @ =gUnknown_83F5804 movs r1, 0 |