diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-06-28 08:00:00 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-06-28 08:00:00 -0400 |
| commit | 6f3986ed64996be8e9812c44be54bf4ef5ff3b1f (patch) | |
| tree | 7e103bfa2ead8631bc9e98e47586238ac080ac87 /arm9/modules/13/asm/module_13_thumb.s | |
| parent | beabf27ffdfc12888c058e0706f30ad1d6856ece (diff) | |
| parent | f4e8c9289b47f1bf3cb83b96074f4f3e540d51ac (diff) | |
Merge branch 'master' of https://github.com/martmists/pokediamond into pikalax_work
Diffstat (limited to 'arm9/modules/13/asm/module_13_thumb.s')
| -rw-r--r-- | arm9/modules/13/asm/module_13_thumb.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arm9/modules/13/asm/module_13_thumb.s b/arm9/modules/13/asm/module_13_thumb.s index e8acb2b6..236b95f3 100644 --- a/arm9/modules/13/asm/module_13_thumb.s +++ b/arm9/modules/13/asm/module_13_thumb.s @@ -278,10 +278,10 @@ MOD13_022174A4: ; 0x022174A4 MOD13_022174C0: ; 0x022174C0 lsl r1, r1, #0x18 lsr r1, r1, #0x18 - ldr r3, _022174C8 ; =0x020CE34C + ldr r3, _022174C8 ; =MI_CpuFill8 bx r3 .align 2, 0 -_022174C8: .word 0x020CE34C +_022174C8: .word MI_CpuFill8 thumb_func_start MOD13_022174CC MOD13_022174CC: ; 0x022174CC |