From 4f842fa4b34128b7c965a493b688d5408edee373 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 27 Jun 2020 15:57:30 -0400 Subject: Bring overlay 06 closer to matching --- arm9/modules/06/asm/module_06.s | 70 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 68 insertions(+), 2 deletions(-) (limited to 'arm9/modules') diff --git a/arm9/modules/06/asm/module_06.s b/arm9/modules/06/asm/module_06.s index 53f1760a..4a57efd2 100644 --- a/arm9/modules/06/asm/module_06.s +++ b/arm9/modules/06/asm/module_06.s @@ -1,5 +1,6 @@ .include "asm/macros.inc" .include "global.inc" + .include "config.h" .section .text .balign 4, 0 @@ -1209,19 +1210,30 @@ MOD06_02239F80: ; 0x02239F80 ldr r1, _0223A01C ; =0x000022A2 add r0, sp, #0 strh r1, [r0] + .ifdef DIAMOND mov r1, #0x3e lsl r1, r1, #0xa + .else + ldr r1, _0223A01C_PEARL ; =0x0000090C + .endif strh r1, [r0, #2] mov r1, #0 strh r1, [r0, #4] ldr r1, [r5, #0x20] add r0, sp, #0 bl FUN_0201EF90 + .ifdef DIAMOND mov r0, #2 mov r1, #0x7d + .else + mov r0, #0xe + ldr r1, _0223A020_PEARL ; 0x007EF000 + .endif ldr r2, [r5, #0x20] lsl r0, r0, #0xc + .ifdef DIAMOND lsl r1, r1, #0x10 + .endif bl FUN_0201EC94 mov r0, #4 bl MOD06_0223B574 @@ -1245,12 +1257,23 @@ MOD06_02239F80: ; 0x02239F80 add sp, #0x14 pop {r4, r5, pc} nop + .ifdef DIAMOND _0223A008: .word 0x00001701 _0223A00C: .word 0x000C8A55 _0223A010: .word 0x002280EF _0223A014: .word 0x000CA424 _0223A018: .word 0x00268C50 _0223A01C: .word 0x000022A2 + .else +_0223A008: .word 0x000010C1 +_0223A00C: .word 0x000D5052 +_0223A010: .word 0x001BFFBD +_0223A014: .word 0x000AA361 +_0223A018: .word 0x0025DFDC +_0223A01C: .word 0x000019A3 +_0223A01C_PEARL: .word 0x0000090C +_0223A020_PEARL: .word 0x007EF000 + .endif thumb_func_start MOD06_0223A020 MOD06_0223A020: ; 0x0223A020 @@ -4163,10 +4186,20 @@ MOD06_0223B598: ; 0x0223B598 str r4, [sp] ldr r4, _0223B5C0 ; =0x000080B5 str r4, [sp, #4] + .ifdef DIAMOND sub r4, r4, #7 + .else + ldr r4, _0223B5C4 ; =0x000085A8 + .endif str r4, [sp, #8] + .ifdef DIAMOND ldr r4, _0223B5C4 ; =0x00029BA8 add r1, r1, r4 + .else + mov r4, #0x4b + lsl r4, r4, #0xc + sub r1, r1, r4 + .endif ldr r4, _0223B5C8 ; =0x00037294 sub r2, r2, r4 ldr r4, _0223B5CC ; =0x000B6876 @@ -4174,12 +4207,24 @@ MOD06_0223B598: ; 0x0223B598 bl MOD06_0223B514 add sp, #0xc pop {r3, r4, pc} + .ifdef DIAMOND .align 2, 0 + .else + nop + .endif +.ifdef DIAMOND _0223B5BC: .word 0x0000F49F _0223B5C0: .word 0x000080B5 _0223B5C4: .word 0x00029BA8 _0223B5C8: .word 0x00037294 _0223B5CC: .word 0x000B6876 +.else +_0223B5BC: .word 0x0000E667 +_0223B5C0: .word 0x0000760B +_0223B5C4: .word 0x000085A8 +_0223B5C8: .word 0x000156B1 +_0223B5CC: .word 0x00099919 +.endif thumb_func_start MOD06_0223B5D0 MOD06_0223B5D0: ; 0x0223B5D0 @@ -4274,8 +4319,13 @@ MOD06_0223B66C: ; 0x0223B66C str r4, [sp, #4] ldr r4, _0223B6A0 ; =0x000080B5 str r4, [sp, #8] + .ifdef DIAMOND sub r4, r4, #7 + .else + ldr r4, _0223B6AC_PEARL ; =0x000085A8 + .endif str r4, [sp, #0xc] + .ifdef DIAMOND mov r4, #0x11 lsl r4, r4, #0xc add r1, r1, r4 @@ -4284,13 +4334,29 @@ MOD06_0223B66C: ; 0x0223B66C sub r2, r2, r4 mov r4, #0xcb lsl r4, r4, #0xc + .else + mov r4, #0x3e + lsl r4, r4, #0xc + sub r1, r1, r4 + mov r4, #0x4f + lsl r4, r4, #0xc + sub r2, r2, r4 + mov r4, #0xd + lsl r4, r4, #0x10 + .endif sub r3, r3, r4 bl MOD06_0223B20C add sp, #0x10 pop {r4, pc} nop + .ifdef DIAMOND _0223B69C: .word 0x0000F49F _0223B6A0: .word 0x000080B5 + .else +_0223B69C: .word 0x0000E667 +_0223B6A0: .word 0x0000760B +_0223B6AC_PEARL: .word 0x000085A8 + .endif thumb_func_start MOD06_0223B6A4 MOD06_0223B6A4: ; 0x0223B6A4 @@ -31366,7 +31432,7 @@ MOD06_02248BC0: ; 0x02248BC0 mov r1, #2 bl MOD06_02248B1C add r0, r4, #0 - mov r1, #0xa + mov r1, #GAME_VERSION bl MOD06_02248B20 add r0, r6, #0 bl FUN_0202B544 @@ -31403,7 +31469,7 @@ MOD06_02248C18: ; 0x02248C18 mov r1, #2 bl MOD06_02248B1C add r0, r4, #0 - mov r1, #0xa + mov r1, #GAME_VERSION bl MOD06_02248B20 mov r0, #0 str r0, [r4, #0x14] -- cgit v1.2.3 From beabf27ffdfc12888c058e0706f30ad1d6856ece Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 27 Jun 2020 20:24:10 -0400 Subject: Match most other overlays (pearl) --- arm9/modules/05/asm/module_05.s | 7 +++++-- arm9/modules/06/asm/module_06.s | 1 - arm9/modules/07/asm/module_07.s | 8 ++++---- arm9/modules/08/asm/module_08.s | 8 ++++---- arm9/modules/11/asm/module_11.s | 8 ++++---- arm9/modules/12/asm/module_12.s | 32 ++++++++++++++++---------------- arm9/modules/16/asm/module_16.s | 30 +++++++++++++++++++++++++----- arm9/modules/17/asm/module_17.s | 8 ++++---- arm9/modules/18/asm/module_18.s | 16 ++++++++++++++++ arm9/modules/54/asm/module_54.s | 2 +- arm9/modules/62/asm/module_62.s | 8 ++++---- arm9/modules/63/asm/module_63.s | 16 ++++++++-------- arm9/modules/64/asm/module_64.s | 8 ++++---- arm9/modules/80/asm/module_80.s | 2 +- arm9/modules/81/asm/module_81.s | 16 ++++++++-------- arm9/modules/83/asm/module_83.s | 28 ++++++++++++++++++++++++++-- arm9/modules/84/asm/module_84.s | 6 +++++- 17 files changed, 135 insertions(+), 69 deletions(-) (limited to 'arm9/modules') diff --git a/arm9/modules/05/asm/module_05.s b/arm9/modules/05/asm/module_05.s index 0279b0fc..11800b6f 100644 --- a/arm9/modules/05/asm/module_05.s +++ b/arm9/modules/05/asm/module_05.s @@ -66803,8 +66803,11 @@ UNK05_021FC634: ; 0x021FC634 .global UNK05_021FC644 UNK05_021FC644: ; 0x021FC644 - .byte 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00 - .byte 0x04, 0x00, 0x00, 0x00 +.ifdef DIAMOND + .word 2, 3, 4 +.else + .word 5, 6, 7 +.endif .global UNK05_021FC650 UNK05_021FC650: ; 0x021FC650 diff --git a/arm9/modules/06/asm/module_06.s b/arm9/modules/06/asm/module_06.s index 4a57efd2..e0be924d 100644 --- a/arm9/modules/06/asm/module_06.s +++ b/arm9/modules/06/asm/module_06.s @@ -1,6 +1,5 @@ .include "asm/macros.inc" .include "global.inc" - .include "config.h" .section .text .balign 4, 0 diff --git a/arm9/modules/07/asm/module_07.s b/arm9/modules/07/asm/module_07.s index c030b585..f3a76d4a 100644 --- a/arm9/modules/07/asm/module_07.s +++ b/arm9/modules/07/asm/module_07.s @@ -3155,7 +3155,7 @@ _0221380C: .word 0x00000B58 thumb_func_start MOD07_02213810 MOD07_02213810: ; 0x02213810 push {r4, lr} - ldr r3, _02213830 ; =0x021064B8 + ldr r3, _02213830 ; =UNK_021064B8 mov r2, #0 ldr r3, [r3] blx r3 @@ -3169,12 +3169,12 @@ _02213828: lsr r0, r0, #0xd pop {r4, pc} nop -_02213830: .word 0x021064B8 +_02213830: .word UNK_021064B8 thumb_func_start MOD07_02213834 MOD07_02213834: ; 0x02213834 push {r4, lr} - ldr r3, _02213854 ; =0x021064C0 + ldr r3, _02213854 ; =UNK_021064C0 mov r2, #1 ldr r3, [r3] blx r3 @@ -3188,7 +3188,7 @@ _0221384C: lsr r0, r0, #0xd pop {r4, pc} nop -_02213854: .word 0x021064C0 +_02213854: .word UNK_021064C0 thumb_func_start MOD07_02213858 MOD07_02213858: ; 0x02213858 diff --git a/arm9/modules/08/asm/module_08.s b/arm9/modules/08/asm/module_08.s index b9b56fd9..d0fcc19c 100644 --- a/arm9/modules/08/asm/module_08.s +++ b/arm9/modules/08/asm/module_08.s @@ -8072,7 +8072,7 @@ _02215A66: thumb_func_start MOD08_02215A68 MOD08_02215A68: ; 0x02215A68 push {r4, lr} - ldr r3, _02215A80 ; =0x021064B8 + ldr r3, _02215A80 ; =UNK_021064B8 mov r2, #0 ldr r3, [r3] blx r3 @@ -8082,12 +8082,12 @@ MOD08_02215A68: ; 0x02215A68 lsr r0, r0, #0xd pop {r4, pc} nop -_02215A80: .word 0x021064B8 +_02215A80: .word UNK_021064B8 thumb_func_start MOD08_02215A84 MOD08_02215A84: ; 0x02215A84 push {r4, lr} - ldr r3, _02215A9C ; =0x021064C0 + ldr r3, _02215A9C ; =UNK_021064C0 mov r2, #0 ldr r3, [r3] blx r3 @@ -8097,7 +8097,7 @@ MOD08_02215A84: ; 0x02215A84 lsr r0, r0, #0xd pop {r4, pc} nop -_02215A9C: .word 0x021064C0 +_02215A9C: .word UNK_021064C0 thumb_func_start MOD08_02215AA0 MOD08_02215AA0: ; 0x02215AA0 diff --git a/arm9/modules/11/asm/module_11.s b/arm9/modules/11/asm/module_11.s index 4154f5dd..c238c469 100644 --- a/arm9/modules/11/asm/module_11.s +++ b/arm9/modules/11/asm/module_11.s @@ -3061,14 +3061,14 @@ _0222EFD8: .word FUN_020223BC thumb_func_start MOD11_0222EFDC MOD11_0222EFDC: ; 0x0222EFDC push {r3, r4, r5, lr} - ldr r3, _0222F014 ; =0x021064B8 + ldr r3, _0222F014 ; =UNK_021064B8 mov r0, #2 mov r1, #0 ldr r3, [r3] lsl r0, r0, #0xe add r2, r1, #0 blx r3 - ldr r3, _0222F018 ; =0x021064C0 + ldr r3, _0222F018 ; =UNK_021064C0 mov r1, #0 add r4, r0, #0 ldr r3, [r3] @@ -3087,8 +3087,8 @@ _0222F00C: bl FUN_02012CC8 pop {r3, r4, r5, pc} nop -_0222F014: .word 0x021064B8 -_0222F018: .word 0x021064C0 +_0222F014: .word UNK_021064B8 +_0222F018: .word UNK_021064C0 thumb_func_start MOD11_0222F01C MOD11_0222F01C: ; 0x0222F01C diff --git a/arm9/modules/12/asm/module_12.s b/arm9/modules/12/asm/module_12.s index aeea1d62..d8814351 100644 --- a/arm9/modules/12/asm/module_12.s +++ b/arm9/modules/12/asm/module_12.s @@ -744,14 +744,14 @@ MOD12_0222DC80: ; 0x0222DC80 thumb_func_start MOD12_0222DCAC MOD12_0222DCAC: ; 0x0222DCAC push {r3, r4, r5, lr} - ldr r3, _0222DCE4 ; =0x021064B8 + ldr r3, _0222DCE4 ; =UNK_021064B8 mov r0, #2 mov r1, #0 ldr r3, [r3] lsl r0, r0, #0xe add r2, r1, #0 blx r3 - ldr r3, _0222DCE8 ; =0x021064C0 + ldr r3, _0222DCE8 ; =UNK_021064C0 mov r1, #0 add r4, r0, #0 ldr r3, [r3] @@ -770,8 +770,8 @@ _0222DCDC: bl FUN_02012CC8 pop {r3, r4, r5, pc} nop -_0222DCE4: .word 0x021064B8 -_0222DCE8: .word 0x021064C0 +_0222DCE4: .word UNK_021064B8 +_0222DCE8: .word UNK_021064C0 thumb_func_start MOD12_0222DCEC MOD12_0222DCEC: ; 0x0222DCEC @@ -3999,14 +3999,14 @@ MOD12_0222F6B4: ; 0x0222F6B4 thumb_func_start MOD12_0222F6E0 MOD12_0222F6E0: ; 0x0222F6E0 push {r3, r4, r5, lr} - ldr r3, _0222F718 ; =0x021064B8 + ldr r3, _0222F718 ; =UNK_021064B8 mov r0, #2 mov r1, #0 ldr r3, [r3] lsl r0, r0, #0xe add r2, r1, #0 blx r3 - ldr r3, _0222F71C ; =0x021064C0 + ldr r3, _0222F71C ; =UNK_021064C0 mov r1, #0 add r4, r0, #0 ldr r3, [r3] @@ -4025,8 +4025,8 @@ _0222F710: bl FUN_02012CC8 pop {r3, r4, r5, pc} nop -_0222F718: .word 0x021064B8 -_0222F71C: .word 0x021064C0 +_0222F718: .word UNK_021064B8 +_0222F71C: .word UNK_021064C0 thumb_func_start MOD12_0222F720 MOD12_0222F720: ; 0x0222F720 @@ -6350,7 +6350,7 @@ MOD12_02230A40: ; 0x02230A40 thumb_func_start MOD12_02230A60 MOD12_02230A60: ; 0x02230A60 push {r4, lr} - ldr r3, _02230A78 ; =0x021064B8 + ldr r3, _02230A78 ; =UNK_021064B8 mov r2, #0 ldr r3, [r3] blx r3 @@ -6360,12 +6360,12 @@ MOD12_02230A60: ; 0x02230A60 lsr r0, r0, #0xd pop {r4, pc} nop -_02230A78: .word 0x021064B8 +_02230A78: .word UNK_021064B8 thumb_func_start MOD12_02230A7C MOD12_02230A7C: ; 0x02230A7C push {r4, lr} - ldr r3, _02230A94 ; =0x021064C0 + ldr r3, _02230A94 ; =UNK_021064C0 mov r2, #0 ldr r3, [r3] blx r3 @@ -6375,7 +6375,7 @@ MOD12_02230A7C: ; 0x02230A7C lsr r0, r0, #0xd pop {r4, pc} nop -_02230A94: .word 0x021064C0 +_02230A94: .word UNK_021064C0 thumb_func_start MOD12_02230A98 MOD12_02230A98: ; 0x02230A98 @@ -42062,14 +42062,14 @@ _02241B08: .word 0x00000133 thumb_func_start MOD12_02241B0C MOD12_02241B0C: ; 0x02241B0C push {r3, r4, r5, lr} - ldr r3, _02241B44 ; =0x021064B8 + ldr r3, _02241B44 ; =UNK_021064B8 mov r0, #2 mov r1, #0 ldr r3, [r3] lsl r0, r0, #0xe add r2, r1, #0 blx r3 - ldr r3, _02241B48 ; =0x021064C0 + ldr r3, _02241B48 ; =UNK_021064C0 mov r1, #0 add r4, r0, #0 ldr r3, [r3] @@ -42088,8 +42088,8 @@ _02241B3C: bl FUN_02012CC8 pop {r3, r4, r5, pc} nop -_02241B44: .word 0x021064B8 -_02241B48: .word 0x021064C0 +_02241B44: .word UNK_021064B8 +_02241B48: .word UNK_021064C0 thumb_func_start MOD12_02241B4C MOD12_02241B4C: ; 0x02241B4C 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 diff --git a/arm9/modules/17/asm/module_17.s b/arm9/modules/17/asm/module_17.s index 2cb41492..9e816e77 100644 --- a/arm9/modules/17/asm/module_17.s +++ b/arm9/modules/17/asm/module_17.s @@ -1914,13 +1914,13 @@ MOD17_021D82E4: ; 0x021D82E4 add r6, r3, #0 bl FUN_02006D98 str r0, [r5, #0x20] - ldr r3, _021D833C ; =0x021064B8 + ldr r3, _021D833C ; =UNK_021064B8 mov r1, #0 ldr r3, [r3] add r0, r4, #0 add r2, r1, #0 blx r3 - ldr r3, _021D8340 ; =0x021064C0 + ldr r3, _021D8340 ; =UNK_021064C0 add r4, r0, #0 ldr r3, [r3] add r0, r6, #0 @@ -1948,8 +1948,8 @@ MOD17_021D82E4: ; 0x021D82E4 str r0, [r5, #0x24] pop {r4, r5, r6, pc} nop -_021D833C: .word 0x021064B8 -_021D8340: .word 0x021064C0 +_021D833C: .word UNK_021064B8 +_021D8340: .word UNK_021064C0 _021D8344: .word 0x7FFF0000 _021D8348: .word 0xFFFF0000 thumb_func_end MOD17_021D82E4 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: diff --git a/arm9/modules/54/asm/module_54.s b/arm9/modules/54/asm/module_54.s index 6b0fa1ff..9f417cef 100644 --- a/arm9/modules/54/asm/module_54.s +++ b/arm9/modules/54/asm/module_54.s @@ -3735,7 +3735,7 @@ _021D91DC: add r0, r4, #0 bl FUN_020239CC strb r0, [r5, #4] - mov r0, #0xa + mov r0, #GAME_VERSION strb r0, [r5, #5] mov r0, #2 strb r0, [r5, #6] diff --git a/arm9/modules/62/asm/module_62.s b/arm9/modules/62/asm/module_62.s index bbd36ef5..d1aa6be9 100644 --- a/arm9/modules/62/asm/module_62.s +++ b/arm9/modules/62/asm/module_62.s @@ -1826,14 +1826,14 @@ _0222E35C: .word 0x04000580 thumb_func_start MOD62_0222E360 MOD62_0222E360: ; 0x0222E360 push {r3, r4, r5, lr} - ldr r3, _0222E398 ; =0x021064B8 + ldr r3, _0222E398 ; =UNK_021064B8 mov r0, #2 mov r1, #0 ldr r3, [r3] lsl r0, r0, #0xe add r2, r1, #0 blx r3 - ldr r3, _0222E39C ; =0x021064C0 + ldr r3, _0222E39C ; =UNK_021064C0 mov r1, #0 add r4, r0, #0 ldr r3, [r3] @@ -1852,8 +1852,8 @@ _0222E390: bl FUN_02012CC8 pop {r3, r4, r5, pc} nop -_0222E398: .word 0x021064B8 -_0222E39C: .word 0x021064C0 +_0222E398: .word UNK_021064B8 +_0222E39C: .word UNK_021064C0 thumb_func_end MOD62_0222E360 thumb_func_start MOD62_0222E3A0 diff --git a/arm9/modules/63/asm/module_63.s b/arm9/modules/63/asm/module_63.s index 372796e3..65ffe22c 100644 --- a/arm9/modules/63/asm/module_63.s +++ b/arm9/modules/63/asm/module_63.s @@ -2887,14 +2887,14 @@ MOD63_021D8BD8: ; 0x021D8BD8 add r3, r1, #0 bl FUN_02022318 str r0, [r4, #0x10] - ldr r3, _021D8C18 ; =0x021064B8 + ldr r3, _021D8C18 ; =UNK_021064B8 mov r0, #2 mov r1, #0 ldr r3, [r3] lsl r0, r0, #0xe add r2, r1, #0 blx r3 - ldr r3, _021D8C1C ; =0x021064C0 + ldr r3, _021D8C1C ; =UNK_021064C0 mov r0, #0x80 ldr r3, [r3] mov r1, #0 @@ -2904,8 +2904,8 @@ MOD63_021D8BD8: ; 0x021D8BD8 pop {r4, pc} nop _021D8C14: .word MOD63_021D8C20 -_021D8C18: .word 0x021064B8 -_021D8C1C: .word 0x021064C0 +_021D8C18: .word UNK_021064B8 +_021D8C1C: .word UNK_021064C0 thumb_func_end MOD63_021D8BD8 thumb_func_start MOD63_021D8C20 @@ -7891,7 +7891,7 @@ _021DB44C: thumb_func_start MOD63_021DB450 MOD63_021DB450: ; 0x021DB450 push {r4, lr} - ldr r3, _021DB470 ; =0x021064B8 + ldr r3, _021DB470 ; =UNK_021064B8 mov r2, #0 ldr r3, [r3] blx r3 @@ -7905,13 +7905,13 @@ _021DB468: lsr r0, r0, #0xd pop {r4, pc} nop -_021DB470: .word 0x021064B8 +_021DB470: .word UNK_021064B8 thumb_func_end MOD63_021DB450 thumb_func_start MOD63_021DB474 MOD63_021DB474: ; 0x021DB474 push {r4, lr} - ldr r3, _021DB494 ; =0x021064C0 + ldr r3, _021DB494 ; =UNK_021064C0 mov r2, #1 ldr r3, [r3] blx r3 @@ -7925,7 +7925,7 @@ _021DB486: lsr r0, r0, #0xd pop {r4, pc} nop -_021DB494: .word 0x021064C0 +_021DB494: .word UNK_021064C0 thumb_func_end MOD63_021DB474 thumb_func_start MOD63_021DB498 diff --git a/arm9/modules/64/asm/module_64.s b/arm9/modules/64/asm/module_64.s index 2416462c..361e1dfa 100644 --- a/arm9/modules/64/asm/module_64.s +++ b/arm9/modules/64/asm/module_64.s @@ -741,13 +741,13 @@ MOD64_021D7B04: ; 0x021D7B04 mov r1, #2 lsl r1, r1, #8 str r0, [r5, r1] - ldr r3, _021D7BA4 ; =0x021064B8 + ldr r3, _021D7BA4 ; =UNK_021064B8 lsl r0, r1, #6 mov r1, #0 ldr r3, [r3] add r2, r1, #0 blx r3 - ldr r3, _021D7BA8 ; =0x021064C0 + ldr r3, _021D7BA8 ; =UNK_021064C0 add r4, r0, #0 ldr r3, [r3] mov r0, #0x80 @@ -808,8 +808,8 @@ _021D7B8E: blt _021D7B8E pop {r3, r4, r5, r6, r7, pc} nop -_021D7BA4: .word 0x021064B8 -_021D7BA8: .word 0x021064C0 +_021D7BA4: .word UNK_021064B8 +_021D7BA8: .word UNK_021064C0 _021D7BAC: .word 0x7FFF0000 _021D7BB0: .word 0xFFFF0000 thumb_func_end MOD64_021D7B04 diff --git a/arm9/modules/80/asm/module_80.s b/arm9/modules/80/asm/module_80.s index 2af8ecb3..257ac70a 100644 --- a/arm9/modules/80/asm/module_80.s +++ b/arm9/modules/80/asm/module_80.s @@ -13623,7 +13623,7 @@ _022342BC: add r1, #0xf6 strb r0, [r1] ldr r0, _0223432C ; =0x00000122 - mov r1, #0xa + mov r1, #GAME_VERSION strb r1, [r5, r0] mov r1, #2 add r0, r0, #1 diff --git a/arm9/modules/81/asm/module_81.s b/arm9/modules/81/asm/module_81.s index 7f8fad4e..bf838d07 100644 --- a/arm9/modules/81/asm/module_81.s +++ b/arm9/modules/81/asm/module_81.s @@ -2735,14 +2735,14 @@ MOD81_022392D8: ; 0x022392D8 lsl r0, r0, #0xe mov r1, #1 bl FUN_020AEDF4 - ldr r3, _02239394 ; =0x021064B8 + ldr r3, _02239394 ; =UNK_021064B8 mov r0, #1 mov r1, #0 ldr r3, [r3] lsl r0, r0, #0xe add r2, r1, #0 blx r3 - ldr r3, _02239398 ; =0x021064C0 + ldr r3, _02239398 ; =UNK_021064C0 add r4, r0, #0 ldr r3, [r3] mov r0, #0x80 @@ -2774,8 +2774,8 @@ _02239384: .word 0xFFFFCFFD _02239388: .word 0x0000CFFB _0223938C: .word 0x04000540 _02239390: .word 0xBFFF0000 -_02239394: .word 0x021064B8 -_02239398: .word 0x021064C0 +_02239394: .word UNK_021064B8 +_02239398: .word UNK_021064C0 _0223939C: .word 0x7FFF0000 _022393A0: .word 0xFFFF0000 thumb_func_end MOD81_022392D8 @@ -9787,14 +9787,14 @@ MOD81_0223CAC4: ; 0x0223CAC4 lsl r0, r0, #0xe mov r1, #1 bl FUN_020AEDF4 - ldr r3, _0223CB80 ; =0x021064B8 + ldr r3, _0223CB80 ; =UNK_021064B8 mov r0, #1 mov r1, #0 ldr r3, [r3] lsl r0, r0, #0xe add r2, r1, #0 blx r3 - ldr r3, _0223CB84 ; =0x021064C0 + ldr r3, _0223CB84 ; =UNK_021064C0 add r4, r0, #0 ldr r3, [r3] mov r0, #0x80 @@ -9826,8 +9826,8 @@ _0223CB70: .word 0xFFFFCFFD _0223CB74: .word 0x0000CFFB _0223CB78: .word 0x04000540 _0223CB7C: .word 0xBFFF0000 -_0223CB80: .word 0x021064B8 -_0223CB84: .word 0x021064C0 +_0223CB80: .word UNK_021064B8 +_0223CB84: .word UNK_021064C0 _0223CB88: .word 0x7FFF0000 _0223CB8C: .word 0xFFFF0000 thumb_func_end MOD81_0223CAC4 diff --git a/arm9/modules/83/asm/module_83.s b/arm9/modules/83/asm/module_83.s index 2eabc2f0..81c6448f 100644 --- a/arm9/modules/83/asm/module_83.s +++ b/arm9/modules/83/asm/module_83.s @@ -11565,7 +11565,11 @@ _022332E8: mov r4, #0 mvn r4, r4 _022332F0: + .ifdef DIAMOND mov r0, #1 + .else + mov r0, #2 + .endif lsl r0, r0, #0xa tst r0, r4 bne _022332FC @@ -18703,7 +18707,11 @@ _02236926: ldr r0, _02236B50 ; =0x0000E88C ldr r0, [r4, r0] bl FUN_020146C4 + .ifdef DIAMOND mov r0, #0x22 + .else + mov r0, #0x23 + .endif str r0, [r4, #8] mov r0, #4 str r0, [r5] @@ -19190,7 +19198,11 @@ _02236D12: bl FUN_020054C8 cmp r6, #0xb bne _02236D34 + .ifdef DIAMOND mov r1, #0x1d + .else + mov r1, #0x1e + .endif b _02236D36 _02236D34: mov r1, #0x24 @@ -26871,8 +26883,20 @@ MOD83_0223B280: ; 0x0223B280 .global MOD83_0223B288 MOD83_0223B288: ; 0x0223B288 - .byte 0x00, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0x00, 0x00, 0x1A, 0x00, 0x00, 0x00 + .word 0x00 + .ifdef DIAMOND + .word 0x14 + .word 0x12 + .word 0x16 + .word 0x18 + .word 0x1A + .else + .word 0x15 + .word 0x13 + .word 0x17 + .word 0x19 + .word 0x1B + .endif .global MOD83_0223B2A0 MOD83_0223B2A0: ; 0x0223B2A0 diff --git a/arm9/modules/84/asm/module_84.s b/arm9/modules/84/asm/module_84.s index 244ed0d7..c01fd84c 100644 --- a/arm9/modules/84/asm/module_84.s +++ b/arm9/modules/84/asm/module_84.s @@ -6308,7 +6308,11 @@ MOD84_021DA700: ; 0x021DA700 .global MOD84_021DA764 MOD84_021DA764: ; 0x021DA764 - .byte 0x00, 0x00 + .ifdef DIAMOND + .short 0 + .else + .short 1 + .endif .global MOD84_021DA766 MOD84_021DA766: ; 0x021DA766 -- cgit v1.2.3