diff options
| -rw-r--r-- | arm9/arm9.lcf | 172 | ||||
| -rw-r--r-- | arm9/global.inc | 3 | ||||
| -rw-r--r-- | arm9/modules/07/asm/module_07.s | 4 | ||||
| -rw-r--r-- | arm9/modules/08/asm/module_08.s | 4 | ||||
| -rw-r--r-- | arm9/modules/11/asm/module_11.s | 4 | ||||
| -rw-r--r-- | arm9/modules/12/asm/module_12.s | 16 | ||||
| -rw-r--r-- | arm9/modules/16/asm/module_16.s | 4 | ||||
| -rw-r--r-- | arm9/modules/17/asm/module_17.s | 4 | ||||
| -rw-r--r-- | arm9/modules/62/asm/module_62.s | 4 | ||||
| -rw-r--r-- | arm9/modules/63/asm/module_63.s | 255 | ||||
| -rw-r--r-- | arm9/modules/64/asm/module_64.s | 4 | ||||
| -rw-r--r-- | arm9/modules/81/asm/module_81.s | 8 |
12 files changed, 290 insertions, 192 deletions
diff --git a/arm9/arm9.lcf b/arm9/arm9.lcf index 546d2b71..7aba3287 100644 --- a/arm9/arm9.lcf +++ b/arm9/arm9.lcf @@ -13,93 +13,93 @@ MEMORY { arm9_defs (RW) : ORIGIN=AFTER(arm9), LENGTH=0 > arm9_defs.sbin arm9_table (RW) : ORIGIN=AFTER(arm9), LENGTH=0 > arm9_table.sbin - MODULE_00 (RWXO) : ORIGIN=0x021D74E0, LENGTH=0 > MODULE_00.sbin - MODULE_01 (RWXO) : ORIGIN=0x021D74E0, LENGTH=0 > MODULE_01.sbin - MODULE_02 (RWXO) : ORIGIN=0x021D7520, LENGTH=0 > MODULE_02.sbin - MODULE_03 (RWXO) : ORIGIN=0x01FF8700, LENGTH=0 > MODULE_03.sbin - MODULE_04 (RWXO) : ORIGIN=0x021D74E0, LENGTH=0 > MODULE_04.sbin - MODULE_05 (RWXO) : ORIGIN=0x021D74E0, LENGTH=0 > MODULE_05.sbin - MODULE_06 (RWXO) : ORIGIN=0x022396A0, LENGTH=0 > MODULE_06.sbin - MODULE_07 (RWXO) : ORIGIN=0x02211E60, LENGTH=0 > MODULE_07.sbin - MODULE_08 (RWXO) : ORIGIN=0x02211E60, LENGTH=0 > MODULE_08.sbin - MODULE_09 (RWXO) : ORIGIN=0x02211E60, LENGTH=0 > MODULE_09.sbin - MODULE_10 (RWXO) : ORIGIN=0x021D74E0, LENGTH=0 > MODULE_10.sbin - MODULE_11 (RWXO) : ORIGIN=0x0222D5C0, LENGTH=0 > MODULE_11.sbin - MODULE_12 (RWXO) : ORIGIN=0x0222D5C0, LENGTH=0 > MODULE_12.sbin - MODULE_13 (RWXO) : ORIGIN=0x02211E60, LENGTH=0 > MODULE_13.sbin - MODULE_14 (RWXO) : ORIGIN=0x021D74E0, LENGTH=0 > MODULE_14.sbin - MODULE_15 (RWXO) : ORIGIN=0x021D74E0, LENGTH=0 > MODULE_15.sbin - MODULE_16 (RWXO) : ORIGIN=0x021D74E0, LENGTH=0 > MODULE_16.sbin - MODULE_17 (RWXO) : ORIGIN=0x021D74E0, LENGTH=0 > MODULE_17.sbin - MODULE_18 (RWXO) : ORIGIN=0x022396A0, LENGTH=0 > MODULE_18.sbin - MODULE_19 (RWXO) : ORIGIN=0x02252440, LENGTH=0 > MODULE_19.sbin - MODULE_20 (RWXO) : ORIGIN=0x02252440, LENGTH=0 > MODULE_20.sbin - MODULE_21 (RWXO) : ORIGIN=0x02254840, LENGTH=0 > MODULE_21.sbin - MODULE_22 (RWXO) : ORIGIN=0x02254840, LENGTH=0 > MODULE_22.sbin - MODULE_23 (RWXO) : ORIGIN=0x02254840, LENGTH=0 > MODULE_23.sbin - MODULE_24 (RWXO) : ORIGIN=0x02254840, LENGTH=0 > MODULE_24.sbin - MODULE_25 (RWXO) : ORIGIN=0x02254840, LENGTH=0 > MODULE_25.sbin - MODULE_26 (RWXO) : ORIGIN=0x02254840, LENGTH=0 > MODULE_26.sbin - MODULE_27 (RWXO) : ORIGIN=0x02254840, LENGTH=0 > MODULE_27.sbin - MODULE_28 (RWXO) : ORIGIN=0x02254840, LENGTH=0 > MODULE_28.sbin - MODULE_29 (RWXO) : ORIGIN=0x02254840, LENGTH=0 > MODULE_29.sbin - MODULE_30 (RWXO) : ORIGIN=0x02254840, LENGTH=0 > MODULE_30.sbin - MODULE_31 (RWXO) : ORIGIN=0x02254840, LENGTH=0 > MODULE_31.sbin - MODULE_32 (RWXO) : ORIGIN=0x02254840, LENGTH=0 > MODULE_32.sbin - MODULE_33 (RWXO) : ORIGIN=0x02254840, LENGTH=0 > MODULE_33.sbin - MODULE_34 (RWXO) : ORIGIN=0x02254840, LENGTH=0 > MODULE_34.sbin - MODULE_35 (RWXO) : ORIGIN=0x02254840, LENGTH=0 > MODULE_35.sbin - MODULE_36 (RWXO) : ORIGIN=0x02254840, LENGTH=0 > MODULE_36.sbin - MODULE_37 (RWXO) : ORIGIN=0x02254840, LENGTH=0 > MODULE_37.sbin - MODULE_38 (RWXO) : ORIGIN=0x02254840, LENGTH=0 > MODULE_38.sbin - MODULE_39 (RWXO) : ORIGIN=0x02254840, LENGTH=0 > MODULE_39.sbin - MODULE_40 (RWXO) : ORIGIN=0x02254840, LENGTH=0 > MODULE_40.sbin - MODULE_41 (RWXO) : ORIGIN=0x02254840, LENGTH=0 > MODULE_41.sbin - MODULE_42 (RWXO) : ORIGIN=0x02254840, LENGTH=0 > MODULE_42.sbin - MODULE_43 (RWXO) : ORIGIN=0x02254840, LENGTH=0 > MODULE_43.sbin - MODULE_44 (RWXO) : ORIGIN=0x02254840, LENGTH=0 > MODULE_44.sbin - MODULE_45 (RWXO) : ORIGIN=0x02254840, LENGTH=0 > MODULE_45.sbin - MODULE_46 (RWXO) : ORIGIN=0x02254840, LENGTH=0 > MODULE_46.sbin - MODULE_47 (RWXO) : ORIGIN=0x02254840, LENGTH=0 > MODULE_47.sbin - MODULE_48 (RWXO) : ORIGIN=0x02254840, LENGTH=0 > MODULE_48.sbin - MODULE_49 (RWXO) : ORIGIN=0x02254840, LENGTH=0 > MODULE_49.sbin - MODULE_50 (RWXO) : ORIGIN=0x02254840, LENGTH=0 > MODULE_50.sbin - MODULE_51 (RWXO) : ORIGIN=0x02254840, LENGTH=0 > MODULE_51.sbin - MODULE_52 (RWXO) : ORIGIN=0x021D74E0, LENGTH=0 > MODULE_52.sbin - MODULE_53 (RWXO) : ORIGIN=0x021D74E0, LENGTH=0 > MODULE_53.sbin - MODULE_54 (RWXO) : ORIGIN=0x021D74E0, LENGTH=0 > MODULE_54.sbin - MODULE_55 (RWXO) : ORIGIN=0x021D74E0, LENGTH=0 > MODULE_55.sbin - MODULE_56 (RWXO) : ORIGIN=0x02211E60, LENGTH=0 > MODULE_56.sbin - MODULE_57 (RWXO) : ORIGIN=0x021D74E0, LENGTH=0 > MODULE_57.sbin - MODULE_58 (RWXO) : ORIGIN=0x021D9A20, LENGTH=0 > MODULE_58.sbin - MODULE_59 (RWXO) : ORIGIN=0x021D74E0, LENGTH=0 > MODULE_59.sbin - MODULE_60 (RWXO) : ORIGIN=0x021D74E0, LENGTH=0 > MODULE_60.sbin - MODULE_61 (RWXO) : ORIGIN=0x021D74E0, LENGTH=0 > MODULE_61.sbin - MODULE_62 (RWXO) : ORIGIN=0x0222D5C0, LENGTH=0 > MODULE_62.sbin - MODULE_63 (RWXO) : ORIGIN=0x021D74E0, LENGTH=0 > MODULE_63.sbin - MODULE_64 (RWXO) : ORIGIN=0x021D74E0, LENGTH=0 > MODULE_64.sbin - MODULE_65 (RWXO) : ORIGIN=0x021D74E0, LENGTH=0 > MODULE_65.sbin - MODULE_66 (RWXO) : ORIGIN=0x021D74E0, LENGTH=0 > MODULE_66.sbin - MODULE_67 (RWXO) : ORIGIN=0x021D74E0, LENGTH=0 > MODULE_67.sbin - MODULE_68 (RWXO) : ORIGIN=0x021D74E0, LENGTH=0 > MODULE_68.sbin - MODULE_69 (RWXO) : ORIGIN=0x0222D5C0, LENGTH=0 > MODULE_69.sbin - MODULE_70 (RWXO) : ORIGIN=0x021D74E0, LENGTH=0 > MODULE_70.sbin - MODULE_71 (RWXO) : ORIGIN=0x0222D5C0, LENGTH=0 > MODULE_71.sbin - MODULE_72 (RWXO) : ORIGIN=0x021D74E0, LENGTH=0 > MODULE_72.sbin - MODULE_73 (RWXO) : ORIGIN=0x021D74E0, LENGTH=0 > MODULE_73.sbin - MODULE_74 (RWXO) : ORIGIN=0x021D74E0, LENGTH=0 > MODULE_74.sbin + MODULE_00 (RWXO) : ORIGIN=AFTER(arm9), LENGTH=0 > MODULE_00.sbin + MODULE_01 (RWXO) : ORIGIN=AFTER(arm9), LENGTH=0 > MODULE_01.sbin + MODULE_02 (RWXO) : ORIGIN=AFTER(MODULE_01), LENGTH=0 > MODULE_02.sbin + MODULE_03 (RWXO) : ORIGIN=AFTER(ITCM), LENGTH=0 > MODULE_03.sbin + MODULE_04 (RWXO) : ORIGIN=AFTER(arm9), LENGTH=0 > MODULE_04.sbin + MODULE_05 (RWXO) : ORIGIN=AFTER(arm9), LENGTH=0 > MODULE_05.sbin + MODULE_06 (RWXO) : ORIGIN=AFTER(MODULE_05), LENGTH=0 > MODULE_06.sbin + MODULE_07 (RWXO) : ORIGIN=AFTER(MODULE_04), LENGTH=0 > MODULE_07.sbin + MODULE_08 (RWXO) : ORIGIN=AFTER(MODULE_04), LENGTH=0 > MODULE_08.sbin + MODULE_09 (RWXO) : ORIGIN=AFTER(MODULE_04), LENGTH=0 > MODULE_09.sbin + MODULE_10 (RWXO) : ORIGIN=AFTER(arm9), LENGTH=0 > MODULE_10.sbin + MODULE_11 (RWXO) : ORIGIN=AFTER(MODULE_08), LENGTH=0 > MODULE_11.sbin + MODULE_12 (RWXO) : ORIGIN=AFTER(MODULE_08), LENGTH=0 > MODULE_12.sbin + MODULE_13 (RWXO) : ORIGIN=AFTER(MODULE_04), LENGTH=0 > MODULE_13.sbin + MODULE_14 (RWXO) : ORIGIN=AFTER(arm9), LENGTH=0 > MODULE_14.sbin + MODULE_15 (RWXO) : ORIGIN=AFTER(arm9), LENGTH=0 > MODULE_15.sbin + MODULE_16 (RWXO) : ORIGIN=AFTER(arm9), LENGTH=0 > MODULE_16.sbin + MODULE_17 (RWXO) : ORIGIN=AFTER(arm9), LENGTH=0 > MODULE_17.sbin + MODULE_18 (RWXO) : ORIGIN=AFTER(MODULE_05), LENGTH=0 > MODULE_18.sbin + MODULE_19 (RWXO) : ORIGIN=AFTER(MODULE_06), LENGTH=0 > MODULE_19.sbin + MODULE_20 (RWXO) : ORIGIN=AFTER(MODULE_06), LENGTH=0 > MODULE_20.sbin + MODULE_21 (RWXO) : ORIGIN=AFTER(MODULE_20), LENGTH=0 > MODULE_21.sbin + MODULE_22 (RWXO) : ORIGIN=AFTER(MODULE_20), LENGTH=0 > MODULE_22.sbin + MODULE_23 (RWXO) : ORIGIN=AFTER(MODULE_20), LENGTH=0 > MODULE_23.sbin + MODULE_24 (RWXO) : ORIGIN=AFTER(MODULE_20), LENGTH=0 > MODULE_24.sbin + MODULE_25 (RWXO) : ORIGIN=AFTER(MODULE_20), LENGTH=0 > MODULE_25.sbin + MODULE_26 (RWXO) : ORIGIN=AFTER(MODULE_20), LENGTH=0 > MODULE_26.sbin + MODULE_27 (RWXO) : ORIGIN=AFTER(MODULE_20), LENGTH=0 > MODULE_27.sbin + MODULE_28 (RWXO) : ORIGIN=AFTER(MODULE_20), LENGTH=0 > MODULE_28.sbin + MODULE_29 (RWXO) : ORIGIN=AFTER(MODULE_20), LENGTH=0 > MODULE_29.sbin + MODULE_30 (RWXO) : ORIGIN=AFTER(MODULE_20), LENGTH=0 > MODULE_30.sbin + MODULE_31 (RWXO) : ORIGIN=AFTER(MODULE_20), LENGTH=0 > MODULE_31.sbin + MODULE_32 (RWXO) : ORIGIN=AFTER(MODULE_20), LENGTH=0 > MODULE_32.sbin + MODULE_33 (RWXO) : ORIGIN=AFTER(MODULE_20), LENGTH=0 > MODULE_33.sbin + MODULE_34 (RWXO) : ORIGIN=AFTER(MODULE_20), LENGTH=0 > MODULE_34.sbin + MODULE_35 (RWXO) : ORIGIN=AFTER(MODULE_20), LENGTH=0 > MODULE_35.sbin + MODULE_36 (RWXO) : ORIGIN=AFTER(MODULE_20), LENGTH=0 > MODULE_36.sbin + MODULE_37 (RWXO) : ORIGIN=AFTER(MODULE_20), LENGTH=0 > MODULE_37.sbin + MODULE_38 (RWXO) : ORIGIN=AFTER(MODULE_20), LENGTH=0 > MODULE_38.sbin + MODULE_39 (RWXO) : ORIGIN=AFTER(MODULE_20), LENGTH=0 > MODULE_39.sbin + MODULE_40 (RWXO) : ORIGIN=AFTER(MODULE_20), LENGTH=0 > MODULE_40.sbin + MODULE_41 (RWXO) : ORIGIN=AFTER(MODULE_20), LENGTH=0 > MODULE_41.sbin + MODULE_42 (RWXO) : ORIGIN=AFTER(MODULE_20), LENGTH=0 > MODULE_42.sbin + MODULE_43 (RWXO) : ORIGIN=AFTER(MODULE_20), LENGTH=0 > MODULE_43.sbin + MODULE_44 (RWXO) : ORIGIN=AFTER(MODULE_20), LENGTH=0 > MODULE_44.sbin + MODULE_45 (RWXO) : ORIGIN=AFTER(MODULE_20), LENGTH=0 > MODULE_45.sbin + MODULE_46 (RWXO) : ORIGIN=AFTER(MODULE_20), LENGTH=0 > MODULE_46.sbin + MODULE_47 (RWXO) : ORIGIN=AFTER(MODULE_20), LENGTH=0 > MODULE_47.sbin + MODULE_48 (RWXO) : ORIGIN=AFTER(MODULE_20), LENGTH=0 > MODULE_48.sbin + MODULE_49 (RWXO) : ORIGIN=AFTER(MODULE_20), LENGTH=0 > MODULE_49.sbin + MODULE_50 (RWXO) : ORIGIN=AFTER(MODULE_20), LENGTH=0 > MODULE_50.sbin + MODULE_51 (RWXO) : ORIGIN=AFTER(MODULE_20), LENGTH=0 > MODULE_51.sbin + MODULE_52 (RWXO) : ORIGIN=AFTER(arm9), LENGTH=0 > MODULE_52.sbin + MODULE_53 (RWXO) : ORIGIN=AFTER(arm9), LENGTH=0 > MODULE_53.sbin + MODULE_54 (RWXO) : ORIGIN=AFTER(arm9), LENGTH=0 > MODULE_54.sbin + MODULE_55 (RWXO) : ORIGIN=AFTER(arm9), LENGTH=0 > MODULE_55.sbin + MODULE_56 (RWXO) : ORIGIN=AFTER(MODULE_04), LENGTH=0 > MODULE_56.sbin + MODULE_57 (RWXO) : ORIGIN=AFTER(arm9), LENGTH=0 > MODULE_57.sbin + MODULE_58 (RWXO) : ORIGIN=AFTER(MODULE_57), LENGTH=0 > MODULE_58.sbin + MODULE_59 (RWXO) : ORIGIN=AFTER(arm9), LENGTH=0 > MODULE_59.sbin + MODULE_60 (RWXO) : ORIGIN=AFTER(arm9), LENGTH=0 > MODULE_60.sbin + MODULE_61 (RWXO) : ORIGIN=AFTER(arm9), LENGTH=0 > MODULE_61.sbin + MODULE_62 (RWXO) : ORIGIN=AFTER(MODULE_08), LENGTH=0 > MODULE_62.sbin + MODULE_63 (RWXO) : ORIGIN=AFTER(arm9), LENGTH=0 > MODULE_63.sbin + MODULE_64 (RWXO) : ORIGIN=AFTER(arm9), LENGTH=0 > MODULE_64.sbin + MODULE_65 (RWXO) : ORIGIN=AFTER(arm9), LENGTH=0 > MODULE_65.sbin + MODULE_66 (RWXO) : ORIGIN=AFTER(arm9), LENGTH=0 > MODULE_66.sbin + MODULE_67 (RWXO) : ORIGIN=AFTER(arm9), LENGTH=0 > MODULE_67.sbin + MODULE_68 (RWXO) : ORIGIN=AFTER(arm9), LENGTH=0 > MODULE_68.sbin + MODULE_69 (RWXO) : ORIGIN=AFTER(MODULE_08), LENGTH=0 > MODULE_69.sbin + MODULE_70 (RWXO) : ORIGIN=AFTER(arm9), LENGTH=0 > MODULE_70.sbin + MODULE_71 (RWXO) : ORIGIN=AFTER(MODULE_08), LENGTH=0 > MODULE_71.sbin + MODULE_72 (RWXO) : ORIGIN=AFTER(arm9), LENGTH=0 > MODULE_72.sbin + MODULE_73 (RWXO) : ORIGIN=AFTER(arm9), LENGTH=0 > MODULE_73.sbin + MODULE_74 (RWXO) : ORIGIN=AFTER(arm9), LENGTH=0 > MODULE_74.sbin MODULE_75 (RWXO) : ORIGIN=0x021E6BA0, LENGTH=0 > MODULE_75.sbin - MODULE_76 (RWXO) : ORIGIN=0x021D74E0, LENGTH=0 > MODULE_76.sbin - MODULE_77 (RWXO) : ORIGIN=0x021D74E0, LENGTH=0 > MODULE_77.sbin - MODULE_78 (RWXO) : ORIGIN=0x021D74E0, LENGTH=0 > MODULE_78.sbin - MODULE_79 (RWXO) : ORIGIN=0x02211E60, LENGTH=0 > MODULE_79.sbin - MODULE_80 (RWXO) : ORIGIN=0x0222D5C0, LENGTH=0 > MODULE_80.sbin - MODULE_81 (RWXO) : ORIGIN=0x02237E40, LENGTH=0 > MODULE_81.sbin - MODULE_82 (RWXO) : ORIGIN=0x0222D5C0, LENGTH=0 > MODULE_82.sbin - MODULE_83 (RWXO) : ORIGIN=0x0222D5C0, LENGTH=0 > MODULE_83.sbin - MODULE_84 (RWXO) : ORIGIN=0x021D74E0, LENGTH=0 > MODULE_84.sbin - MODULE_85 (RWXO) : ORIGIN=0x021D74E0, LENGTH=0 > MODULE_85.sbin - MODULE_86 (RWXO) : ORIGIN=0x021D74E0, LENGTH=0 > MODULE_86.sbin + MODULE_76 (RWXO) : ORIGIN=AFTER(arm9), LENGTH=0 > MODULE_76.sbin + MODULE_77 (RWXO) : ORIGIN=AFTER(arm9), LENGTH=0 > MODULE_77.sbin + MODULE_78 (RWXO) : ORIGIN=AFTER(arm9), LENGTH=0 > MODULE_78.sbin + MODULE_79 (RWXO) : ORIGIN=AFTER(MODULE_04), LENGTH=0 > MODULE_79.sbin + MODULE_80 (RWXO) : ORIGIN=AFTER(MODULE_08), LENGTH=0 > MODULE_80.sbin + MODULE_81 (RWXO) : ORIGIN=AFTER(MODULE_80), LENGTH=0 > MODULE_81.sbin + MODULE_82 (RWXO) : ORIGIN=AFTER(MODULE_08), LENGTH=0 > MODULE_82.sbin + MODULE_83 (RWXO) : ORIGIN=AFTER(MODULE_08), LENGTH=0 > MODULE_83.sbin + MODULE_84 (RWXO) : ORIGIN=AFTER(arm9), LENGTH=0 > MODULE_84.sbin + MODULE_85 (RWXO) : ORIGIN=AFTER(arm9), LENGTH=0 > MODULE_85.sbin + MODULE_86 (RWXO) : ORIGIN=AFTER(arm9), LENGTH=0 > MODULE_86.sbin dummy.MAIN_EX (RW) : ORIGIN = 0x023e0000, LENGTH = 0x0 arena.MAIN (RW) : ORIGIN = AFTER(arm9,MODULE_00,MODULE_01,MODULE_02,MODULE_04,MODULE_05,MODULE_06,MODULE_07,MODULE_08,MODULE_09,MODULE_10,MODULE_11,MODULE_12,MODULE_13,MODULE_14,MODULE_15,MODULE_16,MODULE_17,MODULE_18,MODULE_19,MODULE_20,MODULE_21,MODULE_22,MODULE_23,MODULE_24,MODULE_25,MODULE_26,MODULE_27,MODULE_28,MODULE_29,MODULE_30,MODULE_31,MODULE_32,MODULE_33,MODULE_34,MODULE_35,MODULE_36,MODULE_37,MODULE_38,MODULE_39,MODULE_40,MODULE_41,MODULE_42,MODULE_43,MODULE_44,MODULE_45,MODULE_46,MODULE_47,MODULE_48,MODULE_49,MODULE_50,MODULE_51,MODULE_52,MODULE_53,MODULE_54,MODULE_55,MODULE_56,MODULE_57,MODULE_58,MODULE_59,MODULE_60,MODULE_61,MODULE_62,MODULE_63,MODULE_64,MODULE_65,MODULE_66,MODULE_67,MODULE_68,MODULE_69,MODULE_70,MODULE_71,MODULE_72,MODULE_73,MODULE_74,MODULE_75,MODULE_76,MODULE_77,MODULE_78,MODULE_79,MODULE_80,MODULE_81,MODULE_82,MODULE_83,MODULE_84,MODULE_85,MODULE_86), LENGTH = 0x0 diff --git a/arm9/global.inc b/arm9/global.inc index 63e7bdb9..6b3b22e1 100644 --- a/arm9/global.inc +++ b/arm9/global.inc @@ -7674,6 +7674,7 @@ .extern UNK_020FB740 .extern UNK_020FB764 .extern UNK_020FD144 +.extern UNK_021064C0 .extern UNK_021C8ECC .extern UNK_021C8ED0 .extern UNK_021C8ED4 @@ -7714,6 +7715,8 @@ .extern Unk_02106900 .extern Unk_02106A00 .extern Unk_02106A04 +.extern UNK_020FF368 +.extern UNK_020FF3D4 .extern UNK_020FFA38 .extern UNK_02105BB8 .extern UNK_021064BC diff --git a/arm9/modules/07/asm/module_07.s b/arm9/modules/07/asm/module_07.s index c030b585..35785b87 100644 --- a/arm9/modules/07/asm/module_07.s +++ b/arm9/modules/07/asm/module_07.s @@ -3174,7 +3174,7 @@ _02213830: .word 0x021064B8 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..15a22bf2 100644 --- a/arm9/modules/08/asm/module_08.s +++ b/arm9/modules/08/asm/module_08.s @@ -8087,7 +8087,7 @@ _02215A80: .word 0x021064B8 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 f7679bb4..f1edf86b 100644 --- a/arm9/modules/11/asm/module_11.s +++ b/arm9/modules/11/asm/module_11.s @@ -3068,7 +3068,7 @@ MOD11_0222EFDC: ; 0x0222EFDC 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] @@ -3088,7 +3088,7 @@ _0222F00C: pop {r3, r4, r5, pc} nop _0222F014: .word 0x021064B8 -_0222F018: .word 0x021064C0 +_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..6dd1c9cf 100644 --- a/arm9/modules/12/asm/module_12.s +++ b/arm9/modules/12/asm/module_12.s @@ -751,7 +751,7 @@ MOD12_0222DCAC: ; 0x0222DCAC 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] @@ -771,7 +771,7 @@ _0222DCDC: pop {r3, r4, r5, pc} nop _0222DCE4: .word 0x021064B8 -_0222DCE8: .word 0x021064C0 +_0222DCE8: .word UNK_021064C0 thumb_func_start MOD12_0222DCEC MOD12_0222DCEC: ; 0x0222DCEC @@ -4006,7 +4006,7 @@ MOD12_0222F6E0: ; 0x0222F6E0 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] @@ -4026,7 +4026,7 @@ _0222F710: pop {r3, r4, r5, pc} nop _0222F718: .word 0x021064B8 -_0222F71C: .word 0x021064C0 +_0222F71C: .word UNK_021064C0 thumb_func_start MOD12_0222F720 MOD12_0222F720: ; 0x0222F720 @@ -6365,7 +6365,7 @@ _02230A78: .word 0x021064B8 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 @@ -42069,7 +42069,7 @@ MOD12_02241B0C: ; 0x02241B0C 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] @@ -42089,7 +42089,7 @@ _02241B3C: pop {r3, r4, r5, pc} nop _02241B44: .word 0x021064B8 -_02241B48: .word 0x021064C0 +_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..60746d6a 100644 --- a/arm9/modules/16/asm/module_16.s +++ b/arm9/modules/16/asm/module_16.s @@ -3552,7 +3552,7 @@ MOD16_021D8F9C: ; 0x021D8F9C 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 @@ -3608,7 +3608,7 @@ _021D9004: pop {r3, r4, r5, r6, r7, pc} nop _021D9030: .word 0x021064B8 -_021D9034: .word 0x021064C0 +_021D9034: .word UNK_021064C0 _021D9038: .word 0x7FFF0000 _021D903C: .word 0xFFFF0000 _021D9040: .word MOD16_021FF490 diff --git a/arm9/modules/17/asm/module_17.s b/arm9/modules/17/asm/module_17.s index d7a9eab1..14fa98ad 100644 --- a/arm9/modules/17/asm/module_17.s +++ b/arm9/modules/17/asm/module_17.s @@ -1920,7 +1920,7 @@ MOD17_021D82E4: ; 0x021D82E4 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 @@ -1949,7 +1949,7 @@ MOD17_021D82E4: ; 0x021D82E4 pop {r4, r5, r6, pc} nop _021D833C: .word 0x021064B8 -_021D8340: .word 0x021064C0 +_021D8340: .word UNK_021064C0 _021D8344: .word 0x7FFF0000 _021D8348: .word 0xFFFF0000 thumb_func_end MOD17_021D82E4 diff --git a/arm9/modules/62/asm/module_62.s b/arm9/modules/62/asm/module_62.s index bbd36ef5..82a2dd26 100644 --- a/arm9/modules/62/asm/module_62.s +++ b/arm9/modules/62/asm/module_62.s @@ -1833,7 +1833,7 @@ MOD62_0222E360: ; 0x0222E360 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] @@ -1853,7 +1853,7 @@ _0222E390: pop {r3, r4, r5, pc} nop _0222E398: .word 0x021064B8 -_0222E39C: .word 0x021064C0 +_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 753b0692..c35a7bc6 100644 --- a/arm9/modules/63/asm/module_63.s +++ b/arm9/modules/63/asm/module_63.s @@ -386,16 +386,16 @@ _021D780A: mov r0, #0 bl FUN_0200415C ldr r0, _021D7824 ; =SDK_OVERLAY_MODULE_63_ID - ldr r1, _021D7828 ; =0x021DBE18 + ldr r1, _021D7828 ; =MOD63_UNK_021DBE18 bl FUN_02000E7C _021D7818: mov r0, #1 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 -_021D781C: .word 0x020FF3D4 -_021D7820: .word 0x020FF368 +_021D781C: .word UNK_020FF3D4 +_021D7820: .word UNK_020FF368 _021D7824: .word SDK_OVERLAY_MODULE_63_ID -_021D7828: .word 0x021DBE18 +_021D7828: .word MOD63_UNK_021DBE18 thumb_func_end MOD63_021D77B4 thumb_func_start MOD63_021D782C @@ -411,7 +411,7 @@ _021D7834: .word FUN_0201AB60 MOD63_021D7838: ; 0x021D7838 push {r4, lr} sub sp, #0x28 - ldr r4, _021D7854 ; =0x021DBA90 + ldr r4, _021D7854 ; =MOD63_021DBA90 add r3, sp, #0 mov r2, #5 _021D7842: @@ -424,7 +424,7 @@ _021D7842: add sp, #0x28 pop {r4, pc} .align 2, 0 -_021D7854: .word 0x021DBA90 +_021D7854: .word MOD63_021DBA90 thumb_func_end MOD63_021D7838 thumb_func_start MOD63_021D7858 @@ -551,7 +551,7 @@ MOD63_021D78BC: ; 0x021D78BC add r4, #0x78 stmia r4!, {r0, r1} ldr r0, [r6] - ldr r6, _021D796C ; =0x021DB9A8 + ldr r6, _021D796C ; =MOD63_021DB9A8 str r0, [r4] add r4, r5, #0 ldmia r6!, {r0, r1} @@ -570,7 +570,7 @@ MOD63_021D78BC: ; 0x021D78BC add sp, #0x18 pop {r3, r4, r5, r6, r7, pc} nop -_021D796C: .word 0x021DB9A8 +_021D796C: .word MOD63_021DB9A8 thumb_func_end MOD63_021D78BC thumb_func_start MOD63_021D7970 @@ -592,7 +592,7 @@ MOD63_021D7970: ; 0x021D7970 MOD63_021D798C: ; 0x021D798C push {r4, r5, lr} sub sp, #0x24 - ldr r5, _021D7A44 ; =0x021DBA6C + ldr r5, _021D7A44 ; =MOD63_021DBA6C add r4, r0, #0 add r3, sp, #0 mov r2, #4 @@ -683,7 +683,7 @@ _021D7A3E: add sp, #0x24 pop {r4, r5, pc} nop -_021D7A44: .word 0x021DBA6C +_021D7A44: .word MOD63_021DBA6C thumb_func_end MOD63_021D798C thumb_func_start MOD63_021D7A48 @@ -694,7 +694,7 @@ MOD63_021D7A48: ; 0x021D7A48 ldr r0, [r4] bl FUN_02016B94 add r3, sp, #0xa8 - ldr r5, _021D7B80 ; =0x021DB9B4 + ldr r5, _021D7B80 ; =MOD63_021DB9B4 str r0, [r4, #4] add r2, r3, #0 ldmia r5!, {r0, r1} @@ -703,7 +703,7 @@ MOD63_021D7A48: ; 0x021D7A48 stmia r3!, {r0, r1} add r0, r2, #0 bl FUN_02016BBC - ldr r5, _021D7B84 ; =0x021DB9E0 + ldr r5, _021D7B84 ; =MOD63_021DB9E0 add r3, sp, #0x8c ldmia r5!, {r0, r1} add r2, r3, #0 @@ -718,7 +718,7 @@ MOD63_021D7A48: ; 0x021D7A48 ldr r0, [r4, #4] mov r3, #0 bl FUN_02016C18 - ldr r5, _021D7B88 ; =0x021DB9C4 + ldr r5, _021D7B88 ; =MOD63_021DB9C4 add r3, sp, #0x70 ldmia r5!, {r0, r1} add r2, r3, #0 @@ -733,7 +733,7 @@ MOD63_021D7A48: ; 0x021D7A48 ldr r0, [r4, #4] mov r3, #0 bl FUN_02016C18 - ldr r5, _021D7B8C ; =0x021DBA50 + ldr r5, _021D7B8C ; =MOD63_021DBA50 add r3, sp, #0x54 ldmia r5!, {r0, r1} add r2, r3, #0 @@ -748,7 +748,7 @@ MOD63_021D7A48: ; 0x021D7A48 ldr r0, [r4, #4] mov r3, #0 bl FUN_02016C18 - ldr r5, _021D7B90 ; =0x021DBA34 + ldr r5, _021D7B90 ; =MOD63_021DBA34 add r3, sp, #0x38 ldmia r5!, {r0, r1} add r2, r3, #0 @@ -763,7 +763,7 @@ MOD63_021D7A48: ; 0x021D7A48 ldr r0, [r4, #4] mov r3, #0 bl FUN_02016C18 - ldr r5, _021D7B94 ; =0x021DB9FC + ldr r5, _021D7B94 ; =MOD63_021DB9FC add r3, sp, #0x1c ldmia r5!, {r0, r1} add r2, r3, #0 @@ -778,7 +778,7 @@ MOD63_021D7A48: ; 0x021D7A48 mov r1, #3 mov r3, #0 bl FUN_02016C18 - ldr r5, _021D7B98 ; =0x021DBA18 + ldr r5, _021D7B98 ; =MOD63_021DBA18 add r3, sp, #0 ldmia r5!, {r0, r1} add r2, r3, #0 @@ -826,13 +826,13 @@ MOD63_021D7A48: ; 0x021D7A48 add sp, #0xb8 pop {r3, r4, r5, pc} nop -_021D7B80: .word 0x021DB9B4 -_021D7B84: .word 0x021DB9E0 -_021D7B88: .word 0x021DB9C4 -_021D7B8C: .word 0x021DBA50 -_021D7B90: .word 0x021DBA34 -_021D7B94: .word 0x021DB9FC -_021D7B98: .word 0x021DBA18 +_021D7B80: .word MOD63_021DB9B4 +_021D7B84: .word MOD63_021DB9E0 +_021D7B88: .word MOD63_021DB9C4 +_021D7B8C: .word MOD63_021DBA50 +_021D7B90: .word MOD63_021DBA34 +_021D7B94: .word MOD63_021DB9FC +_021D7B98: .word MOD63_021DBA18 thumb_func_end MOD63_021D7A48 thumb_func_start MOD63_021D7B9C @@ -2051,7 +2051,7 @@ _021D844C: bl String_ctor add r1, r6, #0 add r4, r0, #0 - ldr r2, _021D85D0 ; =0x021DB9A0 + ldr r2, _021D85D0 ; =MOD63_021DB9A0 add r0, r5, #0 add r1, #0xac bl FUN_02019150 @@ -2115,7 +2115,7 @@ _021D844C: nop _021D85C8: .word gGameVersion _021D85CC: .word 0x00000227 -_021D85D0: .word 0x021DB9A0 +_021D85D0: .word MOD63_021DB9A0 _021D85D4: .word 0x00010100 thumb_func_end MOD63_021D83A8 @@ -2477,7 +2477,7 @@ _021D888C: .word 0xFFFFFB61 MOD63_021D8890: ; 0x021D8890 push {r4, lr} sub sp, #0x28 - ldr r4, _021D88AC ; =0x021DBD70 + ldr r4, _021D88AC ; =MOD63_021DBD70 add r3, sp, #0 mov r2, #5 _021D889A: @@ -2490,14 +2490,14 @@ _021D889A: add sp, #0x28 pop {r4, pc} .align 2, 0 -_021D88AC: .word 0x021DBD70 +_021D88AC: .word MOD63_021DBD70 thumb_func_end MOD63_021D8890 thumb_func_start MOD63_021D88B0 MOD63_021D88B0: ; 0x021D88B0 push {r4, lr} sub sp, #0x28 - ldr r4, _021D88CC ; =0x021DBD98 + ldr r4, _021D88CC ; =MOD63_021DBD98 add r3, sp, #0 mov r2, #5 _021D88BA: @@ -2510,14 +2510,14 @@ _021D88BA: add sp, #0x28 pop {r4, pc} .align 2, 0 -_021D88CC: .word 0x021DBD98 +_021D88CC: .word MOD63_021DBD98 thumb_func_end MOD63_021D88B0 thumb_func_start MOD63_021D88D0 MOD63_021D88D0: ; 0x021D88D0 push {r4, lr} sub sp, #0x28 - ldr r4, _021D88EC ; =0x021DBDC0 + ldr r4, _021D88EC ; =MOD63_021DBDC0 add r3, sp, #0 mov r2, #5 _021D88DA: @@ -2530,7 +2530,7 @@ _021D88DA: add sp, #0x28 pop {r4, pc} .align 2, 0 -_021D88EC: .word 0x021DBDC0 +_021D88EC: .word MOD63_021DBDC0 thumb_func_end MOD63_021D88D0 thumb_func_start MOD63_021D88F0 @@ -2541,7 +2541,7 @@ MOD63_021D88F0: ; 0x021D88F0 ldr r0, [r4] bl FUN_02016B94 add r3, sp, #0xa8 - ldr r5, _021D89E8 ; =0x021DBB4C + ldr r5, _021D89E8 ; =MOD63_021DBB4C str r0, [r4, #0xc] add r2, r3, #0 ldmia r5!, {r0, r1} @@ -2550,7 +2550,7 @@ MOD63_021D88F0: ; 0x021D88F0 stmia r3!, {r0, r1} add r0, r2, #0 bl FUN_02016BBC - ldr r5, _021D89EC ; =0x021DBC88 + ldr r5, _021D89EC ; =MOD63_021DBC88 add r3, sp, #0x8c ldmia r5!, {r0, r1} add r2, r3, #0 @@ -2565,7 +2565,7 @@ MOD63_021D88F0: ; 0x021D88F0 ldr r0, [r4, #0xc] mov r3, #0 bl FUN_02016C18 - ldr r5, _021D89F0 ; =0x021DBC6C + ldr r5, _021D89F0 ; =MOD63_021DBC6C add r3, sp, #0x70 ldmia r5!, {r0, r1} add r2, r3, #0 @@ -2580,7 +2580,7 @@ MOD63_021D88F0: ; 0x021D88F0 ldr r0, [r4, #0xc] mov r3, #0 bl FUN_02016C18 - ldr r5, _021D89F4 ; =0x021DBBC4 + ldr r5, _021D89F4 ; =MOD63_021DBBC4 add r3, sp, #0x54 ldmia r5!, {r0, r1} add r2, r3, #0 @@ -2595,7 +2595,7 @@ MOD63_021D88F0: ; 0x021D88F0 ldr r0, [r4, #0xc] mov r3, #0 bl FUN_02016C18 - ldr r5, _021D89F8 ; =0x021DBBFC + ldr r5, _021D89F8 ; =MOD63_021DBBFC add r3, sp, #0x38 ldmia r5!, {r0, r1} add r2, r3, #0 @@ -2610,7 +2610,7 @@ MOD63_021D88F0: ; 0x021D88F0 ldr r0, [r4, #0xc] mov r3, #0 bl FUN_02016C18 - ldr r5, _021D89FC ; =0x021DBC18 + ldr r5, _021D89FC ; =MOD63_021DBC18 add r3, sp, #0x1c ldmia r5!, {r0, r1} add r2, r3, #0 @@ -2625,7 +2625,7 @@ MOD63_021D88F0: ; 0x021D88F0 mov r1, #6 mov r3, #0 bl FUN_02016C18 - ldr r5, _021D8A00 ; =0x021DBC34 + ldr r5, _021D8A00 ; =MOD63_021DBC34 add r3, sp, #0 ldmia r5!, {r0, r1} add r2, r3, #0 @@ -2649,13 +2649,13 @@ MOD63_021D88F0: ; 0x021D88F0 add sp, #0xb8 pop {r3, r4, r5, pc} nop -_021D89E8: .word 0x021DBB4C -_021D89EC: .word 0x021DBC88 -_021D89F0: .word 0x021DBC6C -_021D89F4: .word 0x021DBBC4 -_021D89F8: .word 0x021DBBFC -_021D89FC: .word 0x021DBC18 -_021D8A00: .word 0x021DBC34 +_021D89E8: .word MOD63_021DBB4C +_021D89EC: .word MOD63_021DBC88 +_021D89F0: .word MOD63_021DBC6C +_021D89F4: .word MOD63_021DBBC4 +_021D89F8: .word MOD63_021DBBFC +_021D89FC: .word MOD63_021DBC18 +_021D8A00: .word MOD63_021DBC34 thumb_func_end MOD63_021D88F0 thumb_func_start MOD63_021D8A04 @@ -2666,7 +2666,7 @@ MOD63_021D8A04: ; 0x021D8A04 ldr r0, [r4] bl FUN_02016B94 add r3, sp, #0x70 - ldr r5, _021D8AC4 ; =0x021DBB3C + ldr r5, _021D8AC4 ; =MOD63_021DBB3C str r0, [r4, #0xc] add r2, r3, #0 ldmia r5!, {r0, r1} @@ -2679,7 +2679,7 @@ MOD63_021D8A04: ; 0x021D8A04 lsl r2, r2, #0x1a ldr r1, [r2] ldr r0, _021D8AC8 ; =0xC7FFFFFF - ldr r5, _021D8ACC ; =0x021DBC50 + ldr r5, _021D8ACC ; =MOD63_021DBC50 and r1, r0 lsl r0, r2, #1 orr r0, r1 @@ -2698,7 +2698,7 @@ MOD63_021D8A04: ; 0x021D8A04 ldr r0, [r4, #0xc] mov r3, #0 bl FUN_02016C18 - ldr r5, _021D8AD0 ; =0x021DBCA4 + ldr r5, _021D8AD0 ; =MOD63_021DBCA4 add r3, sp, #0x38 ldmia r5!, {r0, r1} add r2, r3, #0 @@ -2713,7 +2713,7 @@ MOD63_021D8A04: ; 0x021D8A04 ldr r0, [r4, #0xc] mov r3, #0 bl FUN_02016C18 - ldr r5, _021D8AD4 ; =0x021DBCC0 + ldr r5, _021D8AD4 ; =MOD63_021DBCC0 add r3, sp, #0x1c ldmia r5!, {r0, r1} add r2, r3, #0 @@ -2728,7 +2728,7 @@ MOD63_021D8A04: ; 0x021D8A04 ldr r0, [r4, #0xc] mov r3, #0 bl FUN_02016C18 - ldr r5, _021D8AD8 ; =0x021DBCDC + ldr r5, _021D8AD8 ; =MOD63_021DBCDC add r3, sp, #0 ldmia r5!, {r0, r1} add r2, r3, #0 @@ -2749,12 +2749,12 @@ MOD63_021D8A04: ; 0x021D8A04 add sp, #0x80 pop {r3, r4, r5, pc} nop -_021D8AC4: .word 0x021DBB3C +_021D8AC4: .word MOD63_021DBB3C _021D8AC8: .word 0xC7FFFFFF -_021D8ACC: .word 0x021DBC50 -_021D8AD0: .word 0x021DBCA4 -_021D8AD4: .word 0x021DBCC0 -_021D8AD8: .word 0x021DBCDC +_021D8ACC: .word MOD63_021DBC50 +_021D8AD0: .word MOD63_021DBCA4 +_021D8AD4: .word MOD63_021DBCC0 +_021D8AD8: .word MOD63_021DBCDC thumb_func_end MOD63_021D8A04 thumb_func_start MOD63_021D8ADC @@ -2894,7 +2894,7 @@ MOD63_021D8BD8: ; 0x021D8BD8 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 @@ -2905,7 +2905,7 @@ MOD63_021D8BD8: ; 0x021D8BD8 nop _021D8C14: .word MOD63_021D8C20 _021D8C18: .word 0x021064B8 -_021D8C1C: .word 0x021064C0 +_021D8C1C: .word UNK_021064C0 thumb_func_end MOD63_021D8BD8 thumb_func_start MOD63_021D8C20 @@ -7911,7 +7911,7 @@ _021DB470: .word 0x021064B8 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 @@ -8571,22 +8571,61 @@ MOD63_021DB940: ; 0x021DB940 thumb_func_end MOD63_021DB940 .section .rodata - ; 0x021DB9A0 - .byte 0x04, 0x02, 0x13, 0x1C, 0x02, 0x02, 0x01, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00 - .byte 0x00, 0x10, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00 + + .global MOD63_021DB9A0 +MOD63_021DB9A0: ; 0x021DB9A0 + .byte 0x04, 0x02, 0x13, 0x1C, 0x02, 0x02, 0x01, 0x00 + + .global MOD63_021DB9A8 +MOD63_021DB9A8: ; 0x021DB9A8 + .byte 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00 + .byte 0x00, 0x10, 0x00, 0x00 + + .global MOD63_021DB9B4 +MOD63_021DB9B4: ; 0x021DB9B4 + .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x01, 0x00, 0x00, 0x00 + + .global MOD63_021DB9C4 +MOD63_021DB9C4: ; 0x021DB9C4 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x06, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + + .global MOD63_021DB9E0 +MOD63_021DB9E0: ; 0x021DB9E0 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x01, 0x00, 0x05, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x01, 0x00, 0x05, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + + .global MOD63_021DB9FC +MOD63_021DB9FC: ; 0x021DB9FC + .byte 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x04, 0x00 - .byte 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + + .global MOD63_021DB9A18 +MOD63_021DBA18: ; 0x021DBA18 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x04, 0x00, 0x00, 0x03, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + + .global MOD63_021DBA34 +MOD63_021DBA34: ; 0x021DBA34 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x07, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + + .global MOD63_021DBA50 +MOD63_021DBA50: ; 0x021DBA50 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x01, 0x01, 0x07, 0x04, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00 + .byte 0x01, 0x01, 0x07, 0x04, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + + .global MOD63_021DBA6C +MOD63_021DBA6C: ; 0x021DBA6C + .byte 0x00, 0x10, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00 + + .global MOD63_021DBA90 +MOD63_021DBA90: ; 0x021DBA90 .byte 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x01, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00 @@ -8603,8 +8642,16 @@ UNK63_021DBAB8: ; 0x021DBAB8 .byte 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0xFF .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1D, 0x00, 0x00, 0x00 - .byte 0x1E, 0x00, 0x00, 0x00, 0x1F, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 + .byte 0x1E, 0x00, 0x00, 0x00, 0x1F, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00 + + .global MOD63_021DBB3C +MOD63_021DBB3C: ; 0x021DBB3C + .byte 0x01, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 + + .global MOD63_021DBB4C +MOD63_021DBB4C: ; 0x021DBB4C + .byte 0x01, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x84, 0x10 .byte 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x01, 0x00, 0x00, 0x00 .byte 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC1, 0xAE, 0x29, 0x00 @@ -8612,24 +8659,62 @@ UNK63_021DBAB8: ; 0x021DBAB8 .byte 0x40, 0x00, 0x00, 0x00, 0x41, 0x00, 0x00, 0x00, 0x42, 0x00, 0x00, 0x00, 0x43, 0x00, 0x00, 0x00 .byte 0x44, 0x00, 0x00, 0x00, 0x45, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x17, 0x03, 0x00, 0x02, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + + .global MOD63_021DBBC4 +MOD63_021DBBC4: ; 0x021DBBC4 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x02, 0x02, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + + .global MOD63_021DBBFC +MOD63_021DBBFC: ; 0x021DBBFC + .byte 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x02, 0x02 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + + .global MOD63_021DBC18 +MOD63_021DBC18: ; 0x021DBC18 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + + .global MOD63_021DBC34 +MOD63_021DBC34: ; 0x021DBC34 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + + .global MOD63_021DBC50 +MOD63_021DBC50: ; 0x021DBC50 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x03, 0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x03, 0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + + .global MOD63_021DBC6C +MOD63_021DBC6C: ; 0x021DBC6C + .byte 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x02 - .byte 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + + .global MOD63_021DBC88 +MOD63_021DBC88: ; 0x021DBC88 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + + .global MOD63_021DBCA4 +MOD63_021DBCA4: ; 0x021DBCA4 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x02, 0x05, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + + .global MOD63_021DBCC0 +MOD63_021DBCC0: ; 0x021DBCC0 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x01, 0x00, 0x03, 0x05, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x01, 0x00, 0x03, 0x05, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + + .global MOD63_021DBCDC +MOD63_021DBCDC: ; 0x021DBCDC + .byte 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x18, 0x00, 0x00, 0x03, 0x00, 0x00 @@ -8639,11 +8724,21 @@ UNK63_021DBAB8: ; 0x021DBAB8 .byte 0x04, 0x01, 0x1B, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00 + + .global MOD63_021DBD70 +MOD63_021DBD70: ; 0x021DBD70 .byte 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x01, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x01, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00 + + .global MOD63_021DBD98 +MOD63_021DBD98: ; 0x021DBD98 + .byte 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00 + + .global MOD63_021DBDC0 +MOD63_021DBDC0: ; 0x021DBDC0 .byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0xF8, 0xFF, 0xFF, 0x24, 0xF2, 0xFF, 0xFF @@ -8652,7 +8747,7 @@ UNK63_021DBAB8: ; 0x021DBAB8 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00 .global MOD63_UNK_021DBE18 -MOD63_UNK_021DBE18: +MOD63_UNK_021DBE18: ; 0x021DBE18 .word MOD63_021D8D10, MOD63_021D8D98, MOD63_021D8E68, 0xFFFFFFFF .byte 0x05, 0x05, 0x05, 0x05, 0x4C, 0x00, 0x00, 0x00, 0x4C, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00 .byte 0x07, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00 diff --git a/arm9/modules/64/asm/module_64.s b/arm9/modules/64/asm/module_64.s index 2416462c..712c854b 100644 --- a/arm9/modules/64/asm/module_64.s +++ b/arm9/modules/64/asm/module_64.s @@ -747,7 +747,7 @@ MOD64_021D7B04: ; 0x021D7B04 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 @@ -809,7 +809,7 @@ _021D7B8E: pop {r3, r4, r5, r6, r7, pc} nop _021D7BA4: .word 0x021064B8 -_021D7BA8: .word 0x021064C0 +_021D7BA8: .word UNK_021064C0 _021D7BAC: .word 0x7FFF0000 _021D7BB0: .word 0xFFFF0000 thumb_func_end MOD64_021D7B04 diff --git a/arm9/modules/81/asm/module_81.s b/arm9/modules/81/asm/module_81.s index 7f8fad4e..7fee2ada 100644 --- a/arm9/modules/81/asm/module_81.s +++ b/arm9/modules/81/asm/module_81.s @@ -2742,7 +2742,7 @@ MOD81_022392D8: ; 0x022392D8 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 @@ -2775,7 +2775,7 @@ _02239388: .word 0x0000CFFB _0223938C: .word 0x04000540 _02239390: .word 0xBFFF0000 _02239394: .word 0x021064B8 -_02239398: .word 0x021064C0 +_02239398: .word UNK_021064C0 _0223939C: .word 0x7FFF0000 _022393A0: .word 0xFFFF0000 thumb_func_end MOD81_022392D8 @@ -9794,7 +9794,7 @@ MOD81_0223CAC4: ; 0x0223CAC4 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 @@ -9827,7 +9827,7 @@ _0223CB74: .word 0x0000CFFB _0223CB78: .word 0x04000540 _0223CB7C: .word 0xBFFF0000 _0223CB80: .word 0x021064B8 -_0223CB84: .word 0x021064C0 +_0223CB84: .word UNK_021064C0 _0223CB88: .word 0x7FFF0000 _0223CB8C: .word 0xFFFF0000 thumb_func_end MOD81_0223CAC4 |