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/18/asm | |
| parent | 1c6d32df7675093fe2a9d325278a97757355cb76 (diff) | |
Match most other overlays (pearl)
Diffstat (limited to 'arm9/modules/18/asm')
| -rw-r--r-- | arm9/modules/18/asm/module_18.s | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/arm9/modules/18/asm/module_18.s b/arm9/modules/18/asm/module_18.s index 80b4595e..874c8dbf 100644 --- a/arm9/modules/18/asm/module_18.s +++ b/arm9/modules/18/asm/module_18.s @@ -3032,20 +3032,36 @@ MOD18_0223AE88: ; 0x0223AE88 mov r1, #0 cmp r0, #0 beq _0223AEB6 + .ifdef DIAMOND ldrh r0, [r5, #8] + .else + ldrh r0, [r5, #0xa] + .endif b _0223AEB8 _0223AEB6: + .ifdef DIAMOND ldrh r0, [r5, #4] + .else + ldrh r0, [r5, #6] + .endif _0223AEB8: add r0, r1, r0 cmp r4, #0 beq _0223AECC ldrb r1, [r5, #0xe] + .ifdef DIAMOND cmp r1, #6 + .else + cmp r1, #7 + .endif bne _0223AEC6 add r0, #0x21 _0223AEC6: + .ifdef DIAMOND cmp r1, #1 + .else + cmp r1, #2 + .endif bne _0223AECC add r0, #0x42 _0223AECC: |