diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-06-27 20:24:10 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-06-27 20:24:10 -0400 |
| commit | beabf27ffdfc12888c058e0706f30ad1d6856ece (patch) | |
| tree | cc6fc81b148716b0e4ab444faa07c5040b309697 /arm9/modules/16/asm/module_16.s | |
| parent | 1c6d32df7675093fe2a9d325278a97757355cb76 (diff) | |
Match most other overlays (pearl)
Diffstat (limited to 'arm9/modules/16/asm/module_16.s')
| -rw-r--r-- | arm9/modules/16/asm/module_16.s | 30 |
1 files changed, 25 insertions, 5 deletions
diff --git a/arm9/modules/16/asm/module_16.s b/arm9/modules/16/asm/module_16.s index 2c788539..72471ecd 100644 --- a/arm9/modules/16/asm/module_16.s +++ b/arm9/modules/16/asm/module_16.s @@ -3545,14 +3545,14 @@ MOD16_021D8F9C: ; 0x021D8F9C mov r1, #0x55 lsl r1, r1, #2 str r0, [r5, r1] - ldr r3, _021D9030 ; =0x021064B8 + ldr r3, _021D9030 ; =UNK_021064B8 mov r0, #2 mov r1, #0 ldr r3, [r3] lsl r0, r0, #0xe add r2, r1, #0 blx r3 - ldr r3, _021D9034 ; =0x021064C0 + ldr r3, _021D9034 ; =UNK_021064C0 add r4, r0, #0 ldr r3, [r3] mov r0, #0x80 @@ -3607,8 +3607,8 @@ _021D9004: add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} nop -_021D9030: .word 0x021064B8 -_021D9034: .word 0x021064C0 +_021D9030: .word UNK_021064B8 +_021D9034: .word UNK_021064C0 _021D9038: .word 0x7FFF0000 _021D903C: .word 0xFFFF0000 _021D9040: .word MOD16_021FF490 @@ -9771,7 +9771,12 @@ MOD16_021DBC48: ; 0x021DBC48 _021DBC6C: add r0, r5, r4 str r0, [sp, #4] + .ifdef DIAMOND ldr r0, _021DBC98 ; =0x00000267 + .else + mov r0, #0x9a + lsl r0, r0, #2 + .endif b _021DBC8C _021DBC74: cmp r4, #1 @@ -9792,8 +9797,11 @@ _021DBC8C: bl MOD16_021DBCA0 add sp, #0x10 pop {r4, r5, r6, pc} - .align 2, 0 + .ifdef DIAMOND _021DBC98: .word 0x00000267 + .else + nop + .endif _021DBC9C: .word 0x00000269 thumb_func_end MOD16_021DBC48 @@ -9935,7 +9943,11 @@ _021DBD82: str r2, [sp] add r0, sp, #8 str r0, [sp, #4] + .ifdef DIAMOND mov r0, #0x8b + .else + mov r0, #0x8c + .endif add r1, r5, r1 bl FUN_02006D18 str r0, [r4] @@ -9986,7 +9998,11 @@ MOD16_021DBDE4: ; 0x021DBDE4 str r1, [sp] add r0, sp, #8 str r0, [sp, #4] + .ifdef DIAMOND mov r0, #0x8b + .else + mov r0, #0x8c + .endif add r2, r1, #0 bl FUN_02006D18 cmp r4, #0 @@ -10010,7 +10026,11 @@ MOD16_021DBE0C: ; 0x021DBE0C str r2, [sp] add r0, sp, #8 str r0, [sp, #4] + .ifdef DIAMOND mov r0, #0x8b + .else + mov r0, #0x8c + .endif mov r1, #2 bl FUN_02006D18 add r5, r0, #0 |