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/52 | |
| parent | beabf27ffdfc12888c058e0706f30ad1d6856ece (diff) | |
| parent | f4e8c9289b47f1bf3cb83b96074f4f3e540d51ac (diff) | |
Merge branch 'master' of https://github.com/martmists/pokediamond into pikalax_work
Diffstat (limited to 'arm9/modules/52')
| -rw-r--r-- | arm9/modules/52/asm/module_52.s | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arm9/modules/52/asm/module_52.s b/arm9/modules/52/asm/module_52.s index e5c9dc7b..d5cf5223 100644 --- a/arm9/modules/52/asm/module_52.s +++ b/arm9/modules/52/asm/module_52.s @@ -80,13 +80,13 @@ MOD52_021D7560: ; 0x021D7560 mov r0, #0x4d bl FUN_020168D0 mov r0, #0 - ldr r1, _021D7578 ; =0x020F2B7C + ldr r1, _021D7578 ; =UNK_020F2B7C mvn r0, r0 bl FUN_02000E7C mov r0, #1 pop {r3, pc} nop -_021D7578: .word 0x020F2B7C +_021D7578: .word UNK_020F2B7C thumb_func_end MOD52_021D7560 thumb_func_start MOD52_021D757C @@ -146,13 +146,13 @@ MOD52_021D75E8: ; 0x021D75E8 mov r0, #0x4d bl FUN_020168D0 mov r0, #0 - ldr r1, _021D7600 ; =0x020F2B8C + ldr r1, _021D7600 ; =UNK_020F2B8C mvn r0, r0 bl FUN_02000E7C mov r0, #1 pop {r3, pc} nop -_021D7600: .word 0x020F2B8C +_021D7600: .word UNK_020F2B8C thumb_func_end MOD52_021D75E8 thumb_func_start MOD52_021D7604 @@ -246,9 +246,9 @@ _021D76C4: .word 0x00000BB8 .rodata .global MOD52_021D76C8 MOD52_021D76C8: ; 0x021D76C8 - .byte 0x7D, 0x75, 0x1D, 0x02, 0x95, 0x75, 0x1D, 0x02, 0xE9, 0x75, 0x1D, 0x02, 0xFF, 0xFF, 0xFF, 0xFF - .byte 0x29, 0x75, 0x1D, 0x02, 0x41, 0x75, 0x1D, 0x02, 0x61, 0x75, 0x1D, 0x02, 0xFF, 0xFF, 0xFF, 0xFF - .byte 0xE1, 0x74, 0x1D, 0x02, 0xF9, 0x74, 0x1D, 0x02, 0x0D, 0x75, 0x1D, 0x02, 0xFF, 0xFF, 0xFF, 0xFF + .word MOD52_021D757C, MOD52_021D7594, MOD52_021D75E8, 0xFFFFFFFF + .word MOD52_021D7528, MOD52_021D7540, MOD52_021D7560, 0xFFFFFFFF + .word MOD52_021D74E0, MOD52_021D74F8, MOD52_021D750C, 0xFFFFFFFF .global MOD52_021D76F8 MOD52_021D76F8: ; 0x021D76F8 |