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 | |
parent | beabf27ffdfc12888c058e0706f30ad1d6856ece (diff) | |
parent | f4e8c9289b47f1bf3cb83b96074f4f3e540d51ac (diff) |
Merge branch 'master' of https://github.com/martmists/pokediamond into pikalax_work
-rw-r--r-- | arm9/arm9.lcf | 172 | ||||
-rw-r--r-- | arm9/asm/unk_02035068.s | 23 | ||||
-rw-r--r-- | arm9/asm/unk_020372D4.s | 4 | ||||
-rw-r--r-- | arm9/asm/unk_020377F0.s | 18 | ||||
-rw-r--r-- | arm9/asm/unk_02058EE8.s | 60 | ||||
-rw-r--r-- | arm9/asm/unk_0205CE48.s | 2 | ||||
-rw-r--r-- | arm9/asm/unk_02089960.s | 4 | ||||
-rw-r--r-- | arm9/asm/unk_0208A258.s | 2 | ||||
-rw-r--r-- | arm9/global.inc | 45 | ||||
-rw-r--r-- | arm9/modules/06/asm/module_06.s | 613 | ||||
-rw-r--r-- | arm9/modules/11/asm/module_11.s | 8 | ||||
-rw-r--r-- | arm9/modules/13/asm/module_13_arm1.s | 12 | ||||
-rw-r--r-- | arm9/modules/13/asm/module_13_thumb.s | 4 | ||||
-rw-r--r-- | arm9/modules/17/asm/module_17.s | 16 | ||||
-rw-r--r-- | arm9/modules/52/asm/module_52.s | 14 | ||||
-rw-r--r-- | arm9/modules/54/asm/module_54.s | 8 | ||||
-rw-r--r-- | arm9/modules/63/asm/module_63.s | 680 | ||||
-rw-r--r-- | arm9/modules/73/asm/module_73.s | 8 | ||||
-rw-r--r-- | arm9/modules/77/asm/module_77.s | 12 | ||||
-rw-r--r-- | arm9/modules/83/asm/module_83.s | 28 | ||||
-rw-r--r-- | arm9/src/main.c | 4 |
21 files changed, 1141 insertions, 596 deletions
diff --git a/arm9/arm9.lcf b/arm9/arm9.lcf index 77af27c0..ccb65a8d 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/asm/unk_02035068.s b/arm9/asm/unk_02035068.s index 252405dd..5a905b2d 100644 --- a/arm9/asm/unk_02035068.s +++ b/arm9/asm/unk_02035068.s @@ -2,7 +2,6 @@ .include "global.inc" .extern UNK_020F96DC - .section .rodata .global UNK_020F2A8C @@ -32,11 +31,11 @@ UNK_020F2ACC: ; 0x020F2ACC .global UNK_020F2AD0 UNK_020F2AD0: ; 0x020F2AD0 - .byte 0x11, 0x5D, 0x03, 0x02, 0x01, 0x00, 0x00, 0x00, 0xF9, 0x5D, 0x03, 0x02, 0x02, 0x00, 0x00, 0x00 - .byte 0x85, 0x62, 0x03, 0x02, 0x03, 0x00, 0x00, 0x00, 0x11, 0x65, 0x03, 0x02, 0x04, 0x00, 0x00, 0x00 - .byte 0xBD, 0x65, 0x03, 0x02, 0x05, 0x00, 0x00, 0x00, 0x85, 0x66, 0x03, 0x02, 0x06, 0x00, 0x00, 0x00 - .byte 0xFE, 0xFF, 0xFF, 0xFF, 0x07, 0x00, 0x00, 0x00, 0x01, 0x67, 0x03, 0x02, 0x08, 0x00, 0x00, 0x00 - .byte 0xE9, 0x67, 0x03, 0x02 + .word FUN_02035D10, 0x00000001, FUN_02035DF8, 0x00000002 + .word FUN_02036284, 0x00000003, FUN_02036510, 0x00000004 + .word FUN_020365BC, 0x00000005, FUN_02036684, 0x00000006 + .word 0xFFFFFFFE, 0x00000007, FUN_02036700, 0x00000008 + .word FUN_020367E8 .global UNK_020F2B14 UNK_020F2B14: ; 0x020F2B14 @@ -50,9 +49,15 @@ UNK_020F2B48: ; 0x020F2B48 .byte 0xAE, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x01, 0x00, 0x00, 0x00, 0xD9, 0x34, 0x00, 0x00, 0xD8, 0x34, 0x00, 0x00, 0xD9, 0x34, 0x00, 0x00 .byte 0xD9, 0x34, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x05, 0x73, 0x03, 0x02, 0x1D, 0x73, 0x03, 0x02, 0x35, 0x73, 0x03, 0x02 - .byte 0xFF, 0xFF, 0xFF, 0xFF, 0xD5, 0x72, 0x03, 0x02, 0x1D, 0x73, 0x03, 0x02, 0x35, 0x73, 0x03, 0x02 - .byte 0xFF, 0xFF, 0xFF, 0xFF + .byte 0x00, 0x00, 0x00, 0x00 + + .global UNK_020F2B7C +UNK_020F2B7C: ; 0x020F2B7C + .word FUN_02037304, FUN_0203731C, FUN_02037334, 0xFFFFFFFF + + .global UNK_020F2B8C +UNK_020F2B8C: ; 0x020F2B8C + .word FUN_020372D4, FUN_0203731C, FUN_02037334, 0xFFFFFFFF .text diff --git a/arm9/asm/unk_020372D4.s b/arm9/asm/unk_020372D4.s index 32c141c4..92ff091d 100644 --- a/arm9/asm/unk_020372D4.s +++ b/arm9/asm/unk_020372D4.s @@ -67,13 +67,13 @@ FUN_02037334: ; 0x02037334 push {r3, lr} bl FUN_020374B0 ldr r0, _02037348 ; =SDK_OVERLAY_MODULE_63_ID - ldr r1, _0203734C ; =UNK63_021DBAB8 + ldr r1, _0203734C ; =MOD63_021DBAB8 bl FUN_02000E7C mov r0, #0x1 pop {r3, pc} nop _02037348: .word SDK_OVERLAY_MODULE_63_ID -_0203734C: .word UNK63_021DBAB8 +_0203734C: .word MOD63_021DBAB8 thumb_func_start LoadOverlay_MODULE_05 LoadOverlay_MODULE_05: ; 0x02037350 diff --git a/arm9/asm/unk_020377F0.s b/arm9/asm/unk_020377F0.s index 7d27a313..f5272628 100644 --- a/arm9/asm/unk_020377F0.s +++ b/arm9/asm/unk_020377F0.s @@ -36,39 +36,39 @@ UNK_020F2BE8: ; 0x020F2BE8 .global UNK_020F2BF4 UNK_020F2BF4: ; 0x020F2BF4 - .byte 0xE1, 0x74, 0x1D, 0x02, 0x8D, 0x75, 0x1D, 0x02, 0x5D, 0x75, 0x1D, 0x02, 0x46, 0x00, 0x00, 0x00 + .word MOD70_021D74E0, MOD70_021D758C, MOD70_021D755C, SDK_OVERLAY_MODULE_70_ID .global UNK_020F2C04 UNK_020F2C04: ; 0x020F2C04 - .byte 0xE1, 0x74, 0x1D, 0x02, 0x49, 0x77, 0x1D, 0x02, 0xA5, 0x76, 0x1D, 0x02, 0x54, 0x00, 0x00, 0x00 + .word MOD84_021D74E0, MOD84_021D7748, MOD84_021D76A4, SDK_OVERLAY_MODULE_84_ID .global UNK_020F2C14 UNK_020F2C14: ; 0x020F2C14 - .byte 0xE1, 0x74, 0x1D, 0x02, 0xA1, 0x75, 0x1D, 0x02, 0x45, 0x76, 0x1D, 0x02, 0x55, 0x00, 0x00, 0x00 + .word MOD85_021D74E0, MOD85_021D75A0, MOD85_021D7644, SDK_OVERLAY_MODULE_85_ID .global UNK_020F2C24 UNK_020F2C24: ; 0x020F2C24 - .byte 0x21, 0x9A, 0x1D, 0x02, 0x8D, 0x9B, 0x1D, 0x02, 0xF1, 0x9B, 0x1D, 0x02, 0x3A, 0x00, 0x00, 0x00 + .word MOD58_021D9A20, MOD58_021D9B8C, MOD58_021D9BF0, SDK_OVERLAY_MODULE_58_ID .global UNK_020F2C34 UNK_020F2C34: ; 0x020F2C34 - .byte 0xE1, 0x74, 0x1D, 0x02, 0x41, 0x76, 0x1D, 0x02, 0xF5, 0x76, 0x1D, 0x02, 0x40, 0x00, 0x00, 0x00 + .word MOD64_021D74E0, MOD64_021D7640, MOD64_021D76F4, SDK_OVERLAY_MODULE_64_ID .global UNK_020F2C44 UNK_020F2C44: ; 0x020F2C44 - .byte 0xE1, 0x74, 0x1D, 0x02, 0x89, 0x75, 0x1D, 0x02, 0x15, 0x76, 0x1D, 0x02, 0x10, 0x00, 0x00, 0x00 + .word MOD16_021D74E0, MOD16_021D7588, MOD16_021D7614, SDK_OVERLAY_MODULE_16_ID .global UNK_020F2C54 UNK_020F2C54: ; 0x020F2C54 - .byte 0xE1, 0x74, 0x1D, 0x02, 0x15, 0x77, 0x1D, 0x02, 0x45, 0x79, 0x1D, 0x02, 0x39, 0x00, 0x00, 0x00 + .word MOD57_021D74E0, MOD57_021D7714, MOD57_021D7944, SDK_OVERLAY_MODULE_57_ID .global UNK_020F2C64 UNK_020F2C64: ; 0x020F2C64 - .byte 0xD1, 0xDF, 0x22, 0x02, 0x35, 0xE1, 0x22, 0x02, 0x5D, 0xE2, 0x22, 0x02, 0x50, 0x00, 0x00, 0x00 + .word MOD80_0222DFD0, MOD80_0222E134, MOD80_0222E25C, SDK_OVERLAY_MODULE_80_ID .global UNK_020F2C74 UNK_020F2C74: ; 0x020F2C74 - .byte 0x35, 0xDA, 0x22, 0x02, 0x7D, 0xDB, 0x22, 0x02, 0x51, 0xDC, 0x22, 0x02, 0x52, 0x00, 0x00, 0x00 + .word MOD82_0222DA34, MOD82_0222DB7C, MOD82_0222DC50, SDK_OVERLAY_MODULE_82_ID .global UNK_020F2C84 UNK_020F2C84: ; 0x020F2C84 diff --git a/arm9/asm/unk_02058EE8.s b/arm9/asm/unk_02058EE8.s index eb57352b..70e6414e 100644 --- a/arm9/asm/unk_02058EE8.s +++ b/arm9/asm/unk_02058EE8.s @@ -676,26 +676,46 @@ UNK_020F6984: ; 0x020F6984 .global UNK_020F69BC UNK_020F69BC: ; 0x020F69BC - .word 0x00000000, 0x020F6950, 0x00000001, 0x020F6678 - .word 0x00000002, 0x020F669C, 0x00000003, 0x020F6684 - .word 0x00000004, 0x020F66A8, 0x00000005, 0x020F6864 - .word 0x00000006, 0x020F6824, 0x00000007, 0x020F6834 - .word 0x00000008, 0x020F6854, 0x00000009, 0x020F66D8 - .word 0x0000000A, 0x020F66C0, 0x0000000B, 0x020F68C4 - .word 0x0000000C, 0x020F66B4, 0x0000000D, 0x020F6690 - .word 0x0000000E, 0x020F67D4, 0x0000000F, 0x020F67C4 - .word 0x00000010, 0x020F67A4, 0x00000011, 0x020F67B4 - .word 0x00000012, 0x020F68A4, 0x00000013, 0x020F6784 - .word 0x00000014, 0x020F66E4, 0x00000015, 0x020F68B4 - .word 0x00000016, 0x020F67E4, 0x00000017, 0x020F67F4 - .word 0x00000018, 0x020F6844, 0x00000019, 0x020F6874 - .word 0x0000001A, 0x020F6804, 0x0000001B, 0x020F6704 - .word 0x0000001C, 0x020F66F4, 0x0000001D, 0x020F6734 - .word 0x0000001E, 0x020F6794, 0x0000001F, 0x020F6744 - .word 0x00000020, 0x020F6814, 0x00000021, 0x020F6884 - .word 0x00000022, 0x020F6714, 0x00000023, 0x020F6764 - .word 0x00000024, 0x020F6774, 0x00000025, 0x020F6894 - .word 0x00000026, 0x020F6914, 0x00000027, 0x00000000 + .word 0x00000000, UNK_020F6950 + .word 0x00000001, UNK_020F6678 + .word 0x00000002, UNK_020F669C + .word 0x00000003, UNK_020F6684 + .word 0x00000004, UNK_020F66A8 + .word 0x00000005, UNK_020F6864 + .word 0x00000006, UNK_020F6824 + .word 0x00000007, UNK_020F6834 + .word 0x00000008, UNK_020F6854 + .word 0x00000009, UNK_020F66D8 + .word 0x0000000A, UNK_020F66C0 + .word 0x0000000B, UNK_020F68C4 + .word 0x0000000C, UNK_020F66B4 + .word 0x0000000D, UNK_020F6690 + .word 0x0000000E, UNK_020F67D4 + .word 0x0000000F, UNK_020F67C4 + .word 0x00000010, UNK_020F67A4 + .word 0x00000011, UNK_020F67B4 + .word 0x00000012, UNK_020F68A4 + .word 0x00000013, UNK_020F6784 + .word 0x00000014, UNK_020F66E4 + .word 0x00000015, UNK_020F68B4 + .word 0x00000016, UNK_020F67E4 + .word 0x00000017, UNK_020F67F4 + .word 0x00000018, UNK_020F6844 + .word 0x00000019, UNK_020F6874 + .word 0x0000001A, UNK_020F6804 + .word 0x0000001B, UNK_020F6704 + .word 0x0000001C, UNK_020F66F4 + .word 0x0000001D, UNK_020F6734 + .word 0x0000001E, UNK_020F6794 + .word 0x0000001F, UNK_020F6744 + .word 0x00000020, UNK_020F6814 + .word 0x00000021, UNK_020F6884 + .word 0x00000022, UNK_020F6714 + .word 0x00000023, UNK_020F6764 + .word 0x00000024, UNK_020F6774 + .word 0x00000025, UNK_020F6894 + .word 0x00000026, UNK_020F6914 + .word 0x00000027, 0x00000000 .global UNK_020F6AFC UNK_020F6AFC: ; 0x020F6AFC diff --git a/arm9/asm/unk_0205CE48.s b/arm9/asm/unk_0205CE48.s index d69aacdd..6feef167 100644 --- a/arm9/asm/unk_0205CE48.s +++ b/arm9/asm/unk_0205CE48.s @@ -1619,7 +1619,7 @@ FUN_0205DAAC: ; 0x0205DAAC mov r0, #0x0 pop {r4, pc} .balign 4 -_0205DAC8: .word 0x0224C721 +_0205DAC8: .word MOD06_0224C720 thumb_func_start FUN_0205DACC FUN_0205DACC: ; 0x0205DACC diff --git a/arm9/asm/unk_02089960.s b/arm9/asm/unk_02089960.s index 95a710e9..df52b64f 100644 --- a/arm9/asm/unk_02089960.s +++ b/arm9/asm/unk_02089960.s @@ -143,13 +143,13 @@ FUN_02089A40: ; 0x02089A40 add r0, r4, #0x0 bl FUN_020168D0 ldr r0, _02089A64 ; =SDK_OVERLAY_MODULE_83_ID - ldr r1, _02089A68 ; =0x0223A360 + ldr r1, _02089A68 ; =MOD83_0223A360 bl FUN_02000E7C mov r0, #0x1 pop {r3-r5, pc} nop _02089A64: .word SDK_OVERLAY_MODULE_83_ID -_02089A68: .word 0x0223A360 +_02089A68: .word MOD83_0223A360 thumb_func_start FUN_02089A6C FUN_02089A6C: ; 0x02089A6C diff --git a/arm9/asm/unk_0208A258.s b/arm9/asm/unk_0208A258.s index 2e476eaf..21a8f91a 100644 --- a/arm9/asm/unk_0208A258.s +++ b/arm9/asm/unk_0208A258.s @@ -84,5 +84,5 @@ FUN_0208A2C4: ; 0x0208A2C4 _0208A2F6: pop {r4-r6, pc} .balign 4 -_0208A2F8: .word 0x0223D4AD +_0208A2F8: .word MOD06_0223D4AC _0208A2FC: .word 0x0000022F diff --git a/arm9/global.inc b/arm9/global.inc index 9d7977df..1f0a338e 100644 --- a/arm9/global.inc +++ b/arm9/global.inc @@ -2586,6 +2586,10 @@ .extern FUN_020371D0 .extern FUN_02037230 .extern FUN_02037264 +.extern FUN_020372D4 +.extern FUN_02037304 +.extern FUN_0203731C +.extern FUN_02037334 .extern FUN_02037394 .extern FUN_0203739C .extern FUN_020373AC @@ -4686,6 +4690,8 @@ .extern FUN_0206475C .extern FUN_0206476C .extern FUN_0206477C +.extern FUN_02064794 +.extern FUN_02064798 .extern FUN_020647A4 .extern FUN_0206486C .extern FUN_020649B0 @@ -6463,6 +6469,7 @@ .extern MOD06_0223CD7C .extern MOD06_0223CDB8 .extern MOD06_0223D3D0 +.extern MOD06_0223D4AC .extern MOD06_0223DFB4 .extern MOD06_02240790 .extern MOD06_022407CC @@ -6659,6 +6666,7 @@ .extern MOD06_0224C6E8 .extern MOD06_0224C6F4 .extern MOD06_0224C700 +.extern MOD06_0224C720 .extern MOD06_0224C8C8 .extern MOD06_0224C8E8 .extern MOD06_0224CA58 @@ -6848,6 +6856,9 @@ .extern MOD15_021D74E0 .extern MOD15_021D7558 .extern MOD15_021D7608 +.extern MOD16_021D74E0 +.extern MOD16_021D7588 +.extern MOD16_021D7614 .extern MOD16_021EEF0C .extern MOD16_021EEF84 .extern MOD16_021EEF98 @@ -7104,6 +7115,12 @@ .extern MOD56_02212164 .extern MOD56_02212240 .extern MOD56_0221244C +.extern MOD57_021D74E0 +.extern MOD57_021D7714 +.extern MOD57_021D7944 +.extern MOD58_021D9A20 +.extern MOD58_021D9B8C +.extern MOD58_021D9BF0 .extern MOD59_021D74E0 .extern MOD59_021D7564 .extern MOD59_021D76C0 @@ -7125,6 +7142,9 @@ .extern MOD62_02230F3C .extern MOD62_02230F70 .extern MOD62_02230F80 +.extern MOD64_021D74E0 +.extern MOD64_021D7640 +.extern MOD64_021D76F4 .extern MOD65_021D74E0 .extern MOD65_021D7524 .extern MOD65_021D753C @@ -7135,6 +7155,9 @@ .extern MOD68_021D75D8 .extern MOD68_021D762C .extern MOD69_0222EC60 +.extern MOD70_021D74E0 +.extern MOD70_021D758C +.extern MOD70_021D755C .extern MOD71_0222D5C0 .extern MOD71_0222D9C8 .extern MOD71_0222E438 @@ -7170,9 +7193,22 @@ .extern MOD79_02213D80 .extern MOD79_02213DBC .extern MOD79_02213E24 +.extern MOD80_0222DFD0 +.extern MOD80_0222E134 +.extern MOD80_0222E25C .extern MOD81_02237E40 .extern MOD81_02238004 .extern MOD81_02238064 +.extern MOD82_0222DA34 +.extern MOD82_0222DB7C +.extern MOD82_0222DC50 +.extern MOD83_0223A360 +.extern MOD84_021D74E0 +.extern MOD84_021D7748 +.extern MOD84_021D76A4 +.extern MOD85_021D74E0 +.extern MOD85_021D75A0 +.extern MOD85_021D7644 .extern MTX_Concat33 .extern MTX_Concat43 .extern MTX_Concat44 @@ -7666,7 +7702,9 @@ .extern UNK05_021F9080 .extern UNK05_021F9194 .extern UNK05_021F9494 -.extern UNK63_021DBAB8 +.extern MOD63_021DBAB8 +.extern UNK_020F2B7C +.extern UNK_020F2B8C .extern UNK_020FB6F8 .extern UNK_020FB704 .extern UNK_020FB710 @@ -7674,6 +7712,8 @@ .extern UNK_020FB740 .extern UNK_020FB764 .extern UNK_020FD144 +.extern UNK_021064B8 +.extern UNK_021064C0 .extern UNK_021C8ECC .extern UNK_021C8ED0 .extern UNK_021C8ED4 @@ -7714,11 +7754,14 @@ .extern Unk_02106900 .extern Unk_02106A00 .extern Unk_02106A04 +.extern UNK_020FF368 +.extern UNK_020FF3D4 .extern UNK_020FFA38 .extern UNK_02105BB8 .extern UNK_021064BC .extern UNK_021064C4 .extern gUnknown21C48B8 +.extern gUnk021C4918 .extern UNK_021CED20 .extern UNK_021CED98 .extern UNK_021CEDD4 diff --git a/arm9/modules/06/asm/module_06.s b/arm9/modules/06/asm/module_06.s index e0be924d..81c8d551 100644 --- a/arm9/modules/06/asm/module_06.s +++ b/arm9/modules/06/asm/module_06.s @@ -1461,17 +1461,17 @@ MOD06_0223A1C4: ; 0x0223A1C4 ldr r1, _0223A1D8 ; =0x0224F174 ldr r3, _0223A1DC ; =MOD05_021D8024 ldr r2, [r1, r2] - ldr r1, _0223A1E0 ; =0x02252240 + ldr r1, _0223A1E0 ; =MOD6_02252240 str r2, [r1, #8] ldr r0, [r0, #4] - ldr r1, _0223A1E4 ; =0x02252240 + ldr r1, _0223A1E4 ; =MOD6_02252240 ldr r0, [r0, #4] bx r3 .align 2, 0 _0223A1D8: .word MOD6_0224F174 _0223A1DC: .word MOD05_021D8024 -_0223A1E0: .word 0x02252240 -_0223A1E4: .word 0x02252240 +_0223A1E0: .word MOD6_02252240 +_0223A1E4: .word MOD6_02252240 thumb_func_start MOD06_0223A1E8 MOD06_0223A1E8: ; 0x0223A1E8 @@ -2255,12 +2255,12 @@ MOD06_0223A748: ; 0x0223A748 thumb_func_start MOD06_0223A74C MOD06_0223A74C: ; 0x0223A74C - ldr r3, _0223A754 ; =0x020C5978 + ldr r3, _0223A754 ; =GXx_SetMasterBrightness_ ldr r0, _0223A758 ; =0x0400006C ldr r1, [r1] bx r3 .align 2, 0 -_0223A754: .word 0x020C5978 +_0223A754: .word GXx_SetMasterBrightness_ _0223A758: .word 0x0400006C thumb_func_start MOD06_0223A75C @@ -3880,12 +3880,12 @@ MOD06_0223B348: ; 0x0223B348 thumb_func_start MOD06_0223B36C MOD06_0223B36C: ; 0x0223B36C - ldr r3, _0223B374 ; =0x020DF4A4 + ldr r3, _0223B374 ; =memset mov r1, #0 mov r2, #0x90 bx r3 .align 2, 0 -_0223B374: .word 0x020DF4A4 +_0223B374: .word memset thumb_func_start MOD06_0223B378 MOD06_0223B378: ; 0x0223B378 @@ -14791,7 +14791,7 @@ MOD06_02240B04: ; 0x02240B04 add r5, r0, #0 mov r0, #3 mov r1, #4 - ldr r4, _02240BA8 ; =0x022522E4 + ldr r4, _02240BA8 ; =MOD6_022522E4 bl FUN_02012838 str r0, [r5, #0xc] mov r0, #0xa @@ -14863,7 +14863,7 @@ _02240B4A: add sp, #0x34 pop {r3, r4, r5, r6, pc} nop -_02240BA8: .word 0x022522E4 +_02240BA8: .word MOD6_022522E4 _02240BAC: .word 0x000002F7 _02240BB0: .word 0x000003D9 _02240BB4: .word MOD6_0224F704 @@ -15040,8 +15040,8 @@ _02240CFE: blt _02240CFE mov r0, #0 str r0, [sp, #0x18] - ldr r0, _02240F04 ; =0x022522D8 - ldr r7, _02240F08 ; =0x022522CC + ldr r0, _02240F04 ; =MOD6_022522D8 + ldr r7, _02240F08 ; =MOD6_022522CC str r0, [sp, #0x20] mov r0, #0x10 str r0, [sp, #0x1c] @@ -15268,8 +15268,8 @@ _02240EE0: .align 2, 0 _02240EFC: .word 0x0000013A _02240F00: .word 0x000003D9 -_02240F04: .word 0x022522D8 -_02240F08: .word 0x022522CC +_02240F04: .word MOD6_022522D8 +_02240F08: .word MOD6_022522CC _02240F0C: .word 0x00002710 _02240F10: .word 0x00035D2E _02240F14: .word 0x0000C350 @@ -18597,10 +18597,10 @@ MOD06_022429C4: ; 0x022429C4 ldrb r2, [r2, #0x13] add r5, r0, #0 mul r5, r4 - ldr r4, _02242A2C ; =0x022522FC + ldr r4, _02242A2C ; =MOD6_022522FC lsl r2, r2, #2 ldr r6, [r4, r5] - ldr r4, _02242A30 ; =0x02252300 + ldr r4, _02242A30 ; =MOD6_02252300 add r4, r4, r5 ldr r2, [r2, r4] mov r5, #0 @@ -18643,8 +18643,8 @@ _02242A26: pop {r4, r5, r6, r7} bx lr .align 2, 0 -_02242A2C: .word 0x022522FC -_02242A30: .word 0x02252300 +_02242A2C: .word MOD6_022522FC +_02242A30: .word MOD6_02252300 _02242A34: .word MOD6_0224F774 thumb_func_start MOD06_02242A38 @@ -19885,11 +19885,11 @@ _02243386: thumb_func_start MOD06_0224339C MOD06_0224339C: ; 0x0224339C - ldr r3, _022433A4 ; =0x020CD3B4 + ldr r3, _022433A4 ; =OS_ResetSystem mov r0, #0 bx r3 nop -_022433A4: .word 0x020CD3B4 +_022433A4: .word OS_ResetSystem thumb_func_start MOD06_022433A8 MOD06_022433A8: ; 0x022433A8 @@ -22730,7 +22730,7 @@ _0224499C: blt _0224498A mov r0, #0 strb r0, [r5, #0x1e] - ldr r0, _02244A30 ; =0x020ECAC4 + ldr r0, _02244A30 ; =gGameLanguage mov r1, #0x19 ldrb r0, [r0] strb r0, [r5, #0x1f] @@ -22791,7 +22791,7 @@ _02244A20: .word 0xFFF07FFF _02244A24: .word 0xFE0FFFFF _02244A28: .word 0xC1FFFFFF _02244A2C: .word 0x000001FE -_02244A30: .word 0x020ECAC4 +_02244A30: .word gGameLanguage thumb_func_start MOD06_02244A34 MOD06_02244A34: ; 0x02244A34 @@ -31290,12 +31290,12 @@ _02248B08: thumb_func_start MOD06_02248B0C MOD06_02248B0C: ; 0x02248B0C - ldr r3, _02248B14 ; =0x020CE34C + ldr r3, _02248B14 ; =MI_CpuFill8 mov r1, #0 mov r2, #0x18 bx r3 .align 2, 0 -_02248B14: .word 0x020CE34C +_02248B14: .word MI_CpuFill8 thumb_func_start MOD06_02248B18 MOD06_02248B18: ; 0x02248B18 @@ -32219,7 +32219,7 @@ _022491C2: cmp r6, #0xb blo _022491C2 mov r4, #0 - ldr r3, _022491F8 ; =0x02252338 + ldr r3, _022491F8 ; =MOD6_02252338 add r0, r4, #0 add r2, sp, #4 _022491DA: @@ -32239,7 +32239,7 @@ _022491E8: pop {r3, r4, r5, r6, r7, pc} .align 2, 0 _022491F4: .word MOD6_02251770 -_022491F8: .word 0x02252338 +_022491F8: .word MOD6_02252338 thumb_func_start MOD06_022491FC MOD06_022491FC: ; 0x022491FC @@ -38684,7 +38684,7 @@ _0224C3C2: mov r1, #0xc ldr r0, [r4] add r3, r2, #0 - ldr r2, _0224C50C ; =0x02252358 + ldr r2, _0224C50C ; =MOD6_02252358 mul r3, r1 ldr r2, [r2, r3] add r0, r0, r2 @@ -38692,7 +38692,7 @@ _0224C3C2: ldrb r2, [r4, #0xd] ldr r0, [r4, #4] add r3, r2, #0 - ldr r2, _0224C510 ; =0x0225235C + ldr r2, _0224C510 ; =MOD6_0225235C mul r3, r1 ldr r2, [r2, r3] add r0, r0, r2 @@ -38701,7 +38701,7 @@ _0224C3C2: ldr r0, [r4, #8] add r3, r2, #0 mul r3, r1 - ldr r1, _0224C514 ; =0x02252360 + ldr r1, _0224C514 ; =MOD6_02252360 ldr r1, [r1, r3] add r0, r0, r1 str r0, [sp, #0x34] @@ -38833,9 +38833,9 @@ _0224C500: pop {r3, r4, r5, r6, r7, pc} nop _0224C508: .word 0x00000205 -_0224C50C: .word 0x02252358 -_0224C510: .word 0x0225235C -_0224C514: .word 0x02252360 +_0224C50C: .word MOD6_02252358 +_0224C510: .word MOD6_0225235C +_0224C514: .word MOD6_02252360 _0224C518: .word 0x000005FE _0224C51C: .word 0x0000048E @@ -39952,7 +39952,7 @@ MOD06_0224CDA0: ; 0x0224CDA0 MOD06_0224CDB8: ; 0x0224CDB8 cmp r1, #0 beq _0224CE2A - ldr r1, _0224CE2C ; =0x021C4918 + ldr r1, _0224CE2C ; =gUnk021C4918 ldrb r1, [r1, #6] cmp r1, #5 bhi _0224CE2A @@ -40016,7 +40016,7 @@ _0224CE1C: _0224CE2A: bx lr .align 2, 0 -_0224CE2C: .word 0x021C4918 +_0224CE2C: .word gUnk021C4918 thumb_func_start MOD06_0224CE30 MOD06_0224CE30: ; 0x0224CE30 @@ -43045,7 +43045,7 @@ _0224E644: mov r1, #0xc ldr r3, [r4] add r2, r5, #0 - ldr r5, _0224E758 ; =0x022523C0 + ldr r5, _0224E758 ; =MOD6_022523C0 mul r2, r1 ldr r2, [r5, r2] add r2, r3, r2 @@ -43053,7 +43053,7 @@ _0224E644: ldrb r5, [r4, #0xd] ldr r3, [r4, #4] add r2, r5, #0 - ldr r5, _0224E75C ; =0x022523C4 + ldr r5, _0224E75C ; =MOD6_022523C4 mul r2, r1 ldr r2, [r5, r2] add r2, r3, r2 @@ -43062,7 +43062,7 @@ _0224E644: ldr r2, [r4, #8] add r5, r3, #0 mul r5, r1 - ldr r1, _0224E760 ; =0x022523C8 + ldr r1, _0224E760 ; =MOD6_022523C8 add r3, sp, #0x24 ldr r1, [r1, r5] add r1, r2, r1 @@ -43173,9 +43173,9 @@ _0224E74C: pop {r4, r5, r6, pc} nop _0224E754: .word 0x00000205 -_0224E758: .word 0x022523C0 -_0224E75C: .word 0x022523C4 -_0224E760: .word 0x022523C8 +_0224E758: .word MOD6_022523C0 +_0224E75C: .word MOD6_022523C4 +_0224E760: .word MOD6_022523C8 thumb_func_start MOD06_0224E764 MOD06_0224E764: ; 0x0224E764 @@ -44536,7 +44536,7 @@ _0224F170: .word MOD06_0224F0D8 .rodata .global MOD6_0224F174 MOD6_0224F174: ; 0x0224F174 - .byte 0x81, 0x9F, 0x23, 0x02, 0x21, 0xA0, 0x23, 0x02, 0xD5, 0xA0, 0x23, 0x02 + .word MOD06_02239F80, MOD06_0223A020, MOD06_0223A0D4 .global MOD6_0224F180 MOD6_0224F180: ; 0x0224F180 @@ -44544,18 +44544,18 @@ MOD6_0224F180: ; 0x0224F180 .global MOD6_0224F190 MOD6_0224F190: ; 0x0224F190 - .byte 0x00, 0x04, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x05, 0x9F, 0x23, 0x02, 0x41, 0x9F, 0x23, 0x02 - .byte 0x4D, 0x9F, 0x23, 0x02, 0x59, 0x9F, 0x23, 0x02 + .word 0x00000400, 0x00000004, MOD06_02239F04, MOD06_02239F40 + .word MOD06_02239F4C, MOD06_02239F58 .global MOD6_0224F1A8 MOD6_0224F1A8: ; 0x0224F1A8 - .byte 0x00, 0x04, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0xE9, 0xA1, 0x23, 0x02, 0x09, 0xA2, 0x23, 0x02 - .byte 0x1D, 0xA2, 0x23, 0x02, 0xDD, 0xA2, 0x23, 0x02 + .word 0x00000400, 0x00000010, MOD06_0223A1E8, MOD06_0223A208 + .word MOD06_0223A21C, MOD06_0223A2DC .global MOD6_0224F1C0 MOD6_0224F1C0: ; 0x0224F1C0 - .byte 0x00, 0x04, 0x00, 0x00, 0x74, 0x00, 0x00, 0x00, 0x09, 0x9B, 0x23, 0x02, 0x39, 0x9B, 0x23, 0x02 - .byte 0x59, 0x9B, 0x23, 0x02, 0xD1, 0x9C, 0x23, 0x02 + .word 0x00000400, 0x00000074, MOD06_02239B08, MOD06_02239B38 + .word MOD06_02239B58, MOD06_02239CD0 .global MOD6_0224F1D8 MOD6_0224F1D8: ; 0x0224F1D8 @@ -44585,8 +44585,38 @@ MOD6_0224F248: ; 0x0224F248 .byte 0x18, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x09, 0x21, 0x00, 0x00, 0x6A, 0x00, 0xFF, 0x7F, 0x1A, 0xF8 .byte 0x17, 0xF2, 0x5D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x2A, 0x25, 0x4B, 0x29, 0x6D, 0x39, 0x2B, 0x29, 0x00, 0x00 - .byte 0x05, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00 - .byte 0x08, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x1A, 0x1B, 0x00, 0x00, 0x00, 0x01, 0x02, 0x06 + + .global MOD6_0224F2D8 +MOD6_0224F2D8: ; 0x0224F2D8 + .byte 0x05, 0x00, 0x00, 0x00 + + .global MOD6_0224F2DC +MOD6_0224F2DC: ; 0x0224F2DC + .byte 0x03, 0x00, 0x00, 0x00 + + .global MOD6_0224F2E0 +MOD6_0224F2E0: ; 0x0224F2E0 + .byte 0x04, 0x00, 0x00, 0x00 + + .global MOD6_0224F2E4 +MOD6_0224F2E4: ; 0x0224F2E4 + .byte 0x0D, 0x00, 0x00, 0x00 + + .global MOD6_0224F2E8 +MOD6_0224F2E8: ; 0x0224F2E8 + .byte 0x08, 0x00, 0x00, 0x00 + + .global MOD6_0224F2EC +MOD6_0224F2EC: ; 0x0224F2EC + .byte 0x11, 0x00, 0x00, 0x00 + + .global MOD6_0224F2F0 +MOD6_0224F2F0: ; 0x0224F2F0 + .byte 0x1A, 0x1B, 0x00, 0x00 + + .global MOD6_0224F2F4 +MOD6_0224F2F4: ; 0x0224F2F4 + .byte 0x00, 0x01, 0x02, 0x06 .byte 0x07, 0x09, 0x0A, 0x0B, 0x0C, 0x0E, 0x0F, 0x10, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19 .global MOD6_0224F308 @@ -44595,10 +44625,10 @@ MOD6_0224F308: ; 0x0224F308 .global MOD6_0224F30C MOD6_0224F30C: ; 0x0224F30C - .byte 0xF4, 0xF2, 0x24, 0x02, 0x01, 0x00, 0x00, 0x00, 0xD8, 0xF2, 0x24, 0x02, 0x01, 0x00, 0x00, 0x00 - .byte 0xEC, 0xF2, 0x24, 0x02, 0x01, 0x00, 0x00, 0x00, 0xE8, 0xF2, 0x24, 0x02, 0x01, 0x00, 0x00, 0x00 - .byte 0xE4, 0xF2, 0x24, 0x02, 0x01, 0x00, 0x00, 0x00, 0xE0, 0xF2, 0x24, 0x02, 0x01, 0x00, 0x00, 0x00 - .byte 0xDC, 0xF2, 0x24, 0x02, 0x02, 0x00, 0x00, 0x00, 0xF0, 0xF2, 0x24, 0x02 + .word MOD6_0224F2F4, 0x00000001, MOD6_0224F2D8, 0x00000001 + .word MOD6_0224F2EC, 0x00000001, MOD6_0224F2E8, 0x00000001 + .word MOD6_0224F2E4, 0x00000001, MOD6_0224F2E0, 0x00000001 + .word MOD6_0224F2DC, 0x00000002, MOD6_0224F2F0 .global MOD6_0224F348 MOD6_0224F348: ; 0x0224F348 @@ -44618,13 +44648,13 @@ MOD6_0224F364: ; 0x0224F364 .global MOD6_0224F370 MOD6_0224F370: ; 0x0224F370 - .byte 0x6C, 0x22, 0x25, 0x02, 0x84, 0x22, 0x25, 0x02, 0x9C, 0x22, 0x25, 0x02, 0xB4, 0x22, 0x25, 0x02 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x58, 0x22, 0x25, 0x02 + .word MOD6_0225226C, MOD6_02252284, MOD6_0225229C, MOD6_022522B4 + .word 0x00000000, 0x00000000, MOD6_02252258 .global MOD6_0224F38C MOD6_0224F38C: ; 0x0224F38C - .byte 0x00, 0x00, 0x00, 0x00, 0xF1, 0xDC, 0x23, 0x02, 0x35, 0xDE, 0x23, 0x02, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x10, 0x20, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00 + .word 0x00000000, MOD06_0223DCF0, MOD06_0223DE34, 0x00000000 + .word 0x00070000, 0x10000000, 0x80000020, 0x00000000 .global MOD6_0224F3AC MOD6_0224F3AC: ; 0x0224F3AC @@ -44660,7 +44690,7 @@ MOD6_0224F490: ; 0x0224F490 .global MOD6_0224F4B0 MOD6_0224F4B0: ; 0x0224F4B0 - .byte 0x00, 0x00, 0x00, 0x00, 0xA9, 0xF0, 0x23, 0x02, 0xC9, 0xF0, 0x23, 0x02, 0x00, 0x00, 0x00, 0x00 + .word 0x00000000, MOD06_0223F0A8, MOD06_0223F0C8, 0x00000000 .byte 0x10, 0x00, 0x05, 0x00, 0x00, 0x08, 0x00, 0x10, 0x2F, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00 .global MOD6_0224F4D0 @@ -44732,15 +44762,44 @@ MOD6_0224F6AC: ; 0x0224F6AC MOD6_0224F704: ; 0x0224F704 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x10, 0x2F, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x03, 0x06, 0x07, 0x08, 0x09, 0x00, 0x00, 0x02, 0x03, 0x04, 0x07, 0x08, 0x0B, 0x00, 0x00 - .byte 0x00, 0x01, 0x05, 0x06, 0x09, 0x0A, 0x00, 0x00, 0x01, 0x02, 0x04, 0x05, 0x0A, 0x0B, 0x00, 0x00 - .byte 0x00, 0x03, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0C, 0x0D, 0x11, 0x00, 0x02, 0x03, 0x04, 0x06 - .byte 0x07, 0x0A, 0x0B, 0x0D, 0x10, 0x02, 0x02, 0x00, 0x01, 0x02, 0x04, 0x05, 0x07, 0x08, 0x09, 0x0A - .byte 0x0B, 0x0C, 0x0F, 0x00, 0x00, 0x01, 0x04, 0x05, 0x06, 0x0B, 0x0C, 0x0D, 0x0E, 0x00, 0x00, 0x00 + + .global MOD6_0224F724 +MOD6_0224F724: ; 0x0224F724 + .byte 0x00, 0x03, 0x06, 0x07, 0x08, 0x09, 0x00, 0x00 + + .global MOD6_0224F72C +MOD6_0224F72C: ; 0x0224F72C + .byte 0x02, 0x03, 0x04, 0x07, 0x08, 0x0B, 0x00, 0x00 + + .global MOD6_0224F734 +MOD6_0224F734: ; 0x0224F734 + .byte 0x00, 0x01, 0x05, 0x06, 0x09, 0x0A, 0x00, 0x00 + + .global MOD6_0224F73C +MOD6_0224F73C: ; 0x0224F73C + .byte 0x01, 0x02, 0x04, 0x05, 0x0A, 0x0B, 0x00, 0x00 + + .global MOD6_0224F744 +MOD6_0224F744: ; 0x0224F744 + .byte 0x00, 0x03, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0C, 0x0D, 0x11, 0x00 + + .global MOD6_0224F750 +MOD6_0224F750: ; 0x0224F750 + .byte 0x02, 0x03, 0x04, 0x06 + .byte 0x07, 0x0A, 0x0B, 0x0D, 0x10, 0x02, 0x02, 0x00 + + .global MOD6_0224F75C +MOD6_0224F75C: ; 0x0224F75C + .byte 0x01, 0x02, 0x04, 0x05, 0x07, 0x08, 0x09, 0x0A + .byte 0x0B, 0x0C, 0x0F, 0x00 + + .global MOD6_0224F768 +MOD6_0224F768: ; 0x0224F768 + .byte 0x00, 0x01, 0x04, 0x05, 0x06, 0x0B, 0x0C, 0x0D, 0x0E, 0x00, 0x00, 0x00 .global MOD6_0224F774 MOD6_0224F774: ; 0x0224F774 - .byte 0x04, 0xF8, 0x24, 0x02, 0x70, 0xF8, 0x24, 0x02, 0xE0, 0xF9, 0x24, 0x02 + .word MOD6_0224F804, MOD6_0224F870, MOD6_0224F9E0 .global MOD6_0224F780 MOD6_0224F780: ; 0x0224F780 @@ -44752,7 +44811,7 @@ MOD6_0224F78C: ; 0x0224F78C .global MOD6_0224F798 MOD6_0224F798: ; 0x0224F798 - .byte 0xBC, 0xF7, 0x24, 0x02, 0xD4, 0xF7, 0x24, 0x02, 0x78, 0xF9, 0x24, 0x02 + .word MOD6_0224F7BC, MOD6_0224F7D4, MOD6_0224F978 .global MOD6_0224F7A4 MOD6_0224F7A4: ; 0x0224F7A4 @@ -44760,12 +44819,24 @@ MOD6_0224F7A4: ; 0x0224F7A4 .global MOD6_0224F7B0 MOD6_0224F7B0: ; 0x0224F7B0 - .byte 0xEF, 0x00, 0x00, 0x00, 0xF0, 0x00, 0x00, 0x00, 0xF1, 0x00, 0x00, 0x00, 0xCB, 0x01, 0x00, 0x00 + .byte 0xEF, 0x00, 0x00, 0x00, 0xF0, 0x00, 0x00, 0x00, 0xF1, 0x00, 0x00, 0x00 + + .global MOD6_0224F7BC +MOD6_0224F7BC: ; 0x0224F7BC + .byte 0xCB, 0x01, 0x00, 0x00 .byte 0x03, 0x00, 0x08, 0x01, 0xCC, 0x01, 0x00, 0x00, 0x08, 0x00, 0x08, 0x06, 0xCB, 0x01, 0x00, 0x00 - .byte 0x0D, 0x00, 0x08, 0x00, 0xCB, 0x01, 0x00, 0x00, 0x06, 0x00, 0x08, 0x01, 0xCA, 0x01, 0x00, 0x00 + .byte 0x0D, 0x00, 0x08, 0x00 + + .global MOD6_0224F7D4 +MOD6_0224F7D4: ; 0x0224F7D4 + .byte 0xCB, 0x01, 0x00, 0x00, 0x06, 0x00, 0x08, 0x01, 0xCA, 0x01, 0x00, 0x00 .byte 0x0B, 0x00, 0x08, 0x07, 0xCF, 0x01, 0x00, 0x00, 0x0F, 0x03, 0x08, 0x0D, 0xCF, 0x01, 0x00, 0x00 .byte 0x02, 0x03, 0x0D, 0x09, 0xCA, 0x01, 0x00, 0x00, 0x06, 0x00, 0x0D, 0x06, 0xCD, 0x01, 0x00, 0x00 - .byte 0x0B, 0x00, 0x0D, 0x02, 0x01, 0x08, 0x02, 0x01, 0x03, 0x06, 0x01, 0x02, 0x04, 0x08, 0x02, 0x01 + .byte 0x0B, 0x00, 0x0D, 0x02 + + .global MOD6_0224F804 +MOD6_0224F804: ; 0x0224F804 + .byte 0x01, 0x08, 0x02, 0x01, 0x03, 0x06, 0x01, 0x02, 0x04, 0x08, 0x02, 0x01 .byte 0x03, 0x09, 0x01, 0x02, 0x06, 0x08, 0x02, 0x01, 0x08, 0x06, 0x01, 0x02, 0x09, 0x08, 0x02, 0x01 .byte 0x08, 0x09, 0x01, 0x02, 0x0B, 0x08, 0x02, 0x01, 0x0D, 0x06, 0x01, 0x02, 0x0E, 0x08, 0x02, 0x01 .byte 0x0D, 0x09, 0x01, 0x02 @@ -44775,7 +44846,11 @@ MOD6_0224F834: ; 0x0224F834 .byte 0x0C, 0x14, 0x01, 0x0B, 0x02, 0x14, 0x00, 0x0B, 0x12, 0x13, 0x00, 0x0A, 0x09, 0x12, 0x01, 0x09 .byte 0x15, 0x10, 0x01, 0x08, 0x0F, 0x10, 0x00, 0x08, 0x0B, 0x10, 0x01, 0x07, 0x12, 0x0E, 0x00, 0x06 .byte 0x0F, 0x0D, 0x00, 0x05, 0x09, 0x0C, 0x01, 0x04, 0x16, 0x0A, 0x01, 0x03, 0x10, 0x0A, 0x01, 0x02 - .byte 0x02, 0x0A, 0x00, 0x01, 0x08, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x08, 0x02, 0x01 + .byte 0x02, 0x0A, 0x00, 0x01, 0x08, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + + .global MOD6_0224F870 +MOD6_0224F870: ; 0x0224F870 + .byte 0x04, 0x08, 0x02, 0x01 .byte 0x06, 0x06, 0x01, 0x02, 0x07, 0x08, 0x02, 0x01, 0x06, 0x09, 0x01, 0x02, 0x09, 0x08, 0x02, 0x01 .byte 0x0B, 0x06, 0x01, 0x02, 0x0C, 0x08, 0x02, 0x01, 0x0B, 0x09, 0x01, 0x02, 0x0F, 0x06, 0x01, 0x05 .byte 0x02, 0x0B, 0x01, 0x05, 0x04, 0x0D, 0x02, 0x01, 0x06, 0x0B, 0x01, 0x02, 0x07, 0x0D, 0x02, 0x01 @@ -44807,13 +44882,20 @@ MOD6_0224F918: ; 0x0224F918 .byte 0x13, 0x04, 0x00, 0x00, 0x16, 0x01, 0x00, 0x00, 0x04, 0x02, 0x07, 0x01, 0x07, 0x02, 0x0A, 0x01 .byte 0x10, 0x02, 0x13, 0x01, 0x11, 0x02, 0x14, 0x01, 0x04, 0x01, 0x00, 0x00, 0x05, 0x04, 0x00, 0x00 .byte 0x13, 0x04, 0x00, 0x00, 0x16, 0x01, 0x00, 0x00, 0x03, 0x04, 0x00, 0x00, 0x08, 0x04, 0x00, 0x00 + + .global MOD6_0224F978 +MOD6_0224F978: ; 0x0224F978 .byte 0xCD, 0x01, 0x00, 0x00, 0x06, 0x06, 0x08, 0x01, 0xCC, 0x01, 0x00, 0x00, 0x0B, 0x06, 0x08, 0x04 .byte 0xCE, 0x01, 0x00, 0x00, 0x10, 0x06, 0x08, 0x00, 0xCF, 0x01, 0x00, 0x00, 0x02, 0x03, 0x0D, 0x0C .byte 0xCC, 0x01, 0x00, 0x00, 0x06, 0x06, 0x0D, 0x05, 0xCD, 0x01, 0x00, 0x00, 0x0B, 0x06, 0x0D, 0x03 .byte 0xCE, 0x01, 0x00, 0x00, 0x10, 0x06, 0x0D, 0x07, 0xCF, 0x01, 0x00, 0x00, 0x14, 0x03, 0x0D, 0x09 .byte 0xD0, 0x01, 0x00, 0x00, 0x02, 0x03, 0x12, 0x08, 0xCB, 0x01, 0x00, 0x00, 0x06, 0x00, 0x12, 0x05 .byte 0xCE, 0x01, 0x00, 0x00, 0x0B, 0x00, 0x12, 0x03, 0xCD, 0x01, 0x00, 0x00, 0x10, 0x00, 0x12, 0x04 - .byte 0xD0, 0x01, 0x00, 0x00, 0x14, 0x03, 0x12, 0x0D, 0x04, 0x08, 0x02, 0x01, 0x06, 0x06, 0x01, 0x02 + .byte 0xD0, 0x01, 0x00, 0x00, 0x14, 0x03, 0x12, 0x0D + + .global MOD6_0224F9E0 +MOD6_0224F9E0: ; 0x0224F9E0 + .byte 0x04, 0x08, 0x02, 0x01, 0x06, 0x06, 0x01, 0x02 .byte 0x07, 0x08, 0x02, 0x01, 0x06, 0x09, 0x01, 0x02, 0x09, 0x08, 0x02, 0x01, 0x0B, 0x06, 0x01, 0x02 .byte 0x0C, 0x08, 0x02, 0x01, 0x0B, 0x09, 0x01, 0x02, 0x0E, 0x08, 0x02, 0x01, 0x10, 0x06, 0x01, 0x02 .byte 0x11, 0x08, 0x02, 0x01, 0x10, 0x09, 0x01, 0x02, 0x02, 0x0B, 0x01, 0x05, 0x04, 0x0D, 0x02, 0x01 @@ -45142,9 +45224,21 @@ MOD6_0224FC00: ; 0x0224FC00 .byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01 .byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01 .byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01 + + .global MOD6_02250C00 +MOD6_02250C00: ; 0x02250C00 .byte 0x00, 0x04, 0x05, 0x09, 0x0D, 0x10, 0x13, 0x17, 0x19, 0x1B, 0x1E, 0x21, 0x24, 0x27, 0x00, 0x00 + + .global MOD6_02250C10 +MOD6_02250C10: ; 0x02250C10 .byte 0x02, 0x06, 0x07, 0x0B, 0x0E, 0x0F, 0x11, 0x15, 0x19, 0x1C, 0x1D, 0x1F, 0x26, 0x27, 0x00, 0x00 + + .global MOD6_02250C20 +MOD6_02250C20: ; 0x02250C20 .byte 0x01, 0x04, 0x07, 0x0A, 0x0C, 0x0F, 0x10, 0x14, 0x16, 0x1A, 0x1D, 0x1E, 0x22, 0x23, 0x00, 0x00 + + .global MOD6_02250C30 +MOD6_02250C30: ; 0x02250C30 .byte 0x03, 0x05, 0x06, 0x08, 0x0C, 0x0D, 0x0E, 0x12, 0x18, 0x1A, 0x1B, 0x1C, 0x20, 0x25, 0x00, 0x00 .global MOD6_02250C40 @@ -45333,13 +45427,24 @@ MOD6_02251340: ; 0x02251340 .byte 0x90, 0x01, 0x00, 0x00, 0xD5, 0x01, 0x00, 0x00, 0x93, 0x01, 0x00, 0x00, 0x96, 0x01, 0x00, 0x00 .byte 0x97, 0x01, 0x00, 0x00, 0xD7, 0x01, 0x00, 0x00, 0x38, 0x01, 0x00, 0x00, 0x3B, 0x01, 0x00, 0x00 .byte 0x3E, 0x01, 0x00, 0x00, 0xC8, 0x00, 0x00, 0x00, 0xCB, 0x00, 0x00, 0x00, 0xCC, 0x00, 0x00, 0x00 - .byte 0xFD, 0x7B, 0x24, 0x02, 0x25, 0x60, 0x24, 0x02, 0xB5, 0x7C, 0x24, 0x02, 0xC1, 0x7D, 0x24, 0x02 + + .global MOD6_022513B0 +MOD6_022513B0: ; 0x022513B0 + .word MOD06_02247BFC + + .global MOD6_022513B4 +MOD6_022513B4: ; 0x022513B4 + .word MOD06_02246024 + + .global MOD6_022513B8 +MOD6_022513B8: ; 0x022513B8 + .word MOD06_02247CB4, MOD06_02247DC0 .byte 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00 .byte 0x01, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00 .global MOD6_022513D8 MOD6_022513D8: ; 0x022513D8 - .byte 0xB4, 0x13, 0x25, 0x02, 0x50, 0x15, 0x25, 0x02, 0x01, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00 + .word MOD6_022513B4, MOD6_02251550, 0x00000001, 0x0000000B .global MOD6_022513E8 MOD6_022513E8: ; 0x022513E8 @@ -45383,7 +45488,7 @@ MOD6_02251454: ; 0x02251454 .global MOD6_02251460 MOD6_02251460: ; 0x02251460 - .byte 0xB0, 0x13, 0x25, 0x02, 0xB8, 0x13, 0x25, 0x02, 0xB4, 0x14, 0x25, 0x02 + .word MOD6_022513B0, MOD6_022513B8, MOD6_022514B4 .global MOD6_0225146C MOD6_0225146C: ; 0x0225146C @@ -45407,8 +45512,11 @@ MOD6_0225149C: ; 0x0225149C .global MOD6_022514A8 MOD6_022514A8: ; 0x022514A8 - .byte 0x00, 0x80, 0x12, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x31, 0x7F, 0x24, 0x02 - .byte 0xA1, 0x80, 0x24, 0x02, 0xFD, 0x80, 0x24, 0x02, 0x39, 0x82, 0x24, 0x02 + .byte 0x00, 0x80, 0x12, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00 + + .global MOD6_022514B4 +MOD6_022514B4: ; 0x022514B4 + .word MOD06_02247F30, MOD06_022480A0, MOD06_022480FC, MOD06_02248238 .global MOD6_022514C4 MOD6_022514C4: ; 0x022514C4 @@ -45416,35 +45524,38 @@ MOD6_022514C4: ; 0x022514C4 .global MOD6_022514D4 MOD6_022514D4: ; 0x022514D4 - .byte 0x24, 0x00, 0x00, 0x00, 0xF5, 0x82, 0x24, 0x02, 0x99, 0x47, 0x06, 0x02, 0xA1, 0x83, 0x24, 0x02 - .byte 0x95, 0x47, 0x06, 0x02 + .word 0x00000024, MOD06_022482F4, FUN_02064798, MOD06_022483A0 + .word FUN_02064794 .global MOD6_022514E8 MOD6_022514E8: ; 0x022514E8 - .byte 0x24, 0x00, 0x00, 0x00, 0x55, 0x7A, 0x24, 0x02, 0x9D, 0x7A, 0x24, 0x02, 0xA9, 0x7A, 0x24, 0x02 - .byte 0x29, 0x7B, 0x24, 0x02 + .word 0x00000024, MOD06_02247A54, MOD06_02247A9C, MOD06_02247AA8 + .word MOD06_02247B28 .global MOD6_022514FC MOD6_022514FC: ; 0x022514FC - .byte 0x08, 0x00, 0x00, 0x00, 0x71, 0x86, 0x24, 0x02, 0x99, 0x47, 0x06, 0x02, 0x85, 0x86, 0x24, 0x02 - .byte 0x95, 0x47, 0x06, 0x02 + .word 0x00000008, MOD06_02248670, FUN_02064798, MOD06_02248684 + .word FUN_02064794 .global MOD6_02251510 MOD6_02251510: ; 0x02251510 - .byte 0x68, 0x00, 0x00, 0x00, 0xA1, 0x7B, 0x24, 0x02, 0xCD, 0x7B, 0x24, 0x02, 0xD9, 0x7B, 0x24, 0x02 - .byte 0xF9, 0x7B, 0x24, 0x02 + .word 0x00000068, MOD06_02247BA0, MOD06_02247BCC, MOD06_02247BD8 + .word MOD06_02247BF8 .global MOD6_02251524 MOD6_02251524: ; 0x02251524 - .byte 0x74, 0x00, 0x00, 0x00, 0xAD, 0x5F, 0x24, 0x02, 0xF9, 0x5F, 0x24, 0x02, 0x05, 0x60, 0x24, 0x02 - .byte 0x95, 0x47, 0x06, 0x02 + .word 0x00000074, MOD06_02245FAC, MOD06_02245FF8, MOD06_02246004 + .word FUN_02064794 .global MOD6_02251538 MOD6_02251538: ; 0x02251538 - .byte 0x39, 0x84, 0x24, 0x02, 0x51, 0x84, 0x24, 0x02, 0x95, 0x85, 0x24, 0x02, 0xDD, 0x85, 0x24, 0x02 - .byte 0x09, 0x86, 0x24, 0x02, 0x31, 0x86, 0x24, 0x02, 0x9D, 0x61, 0x24, 0x02, 0x9D, 0x62, 0x24, 0x02 - .byte 0xD1, 0x62, 0x24, 0x02, 0xBD, 0x63, 0x24, 0x02, 0xE1, 0x63, 0x24, 0x02, 0xA5, 0x64, 0x24, 0x02 - .byte 0xB1, 0x65, 0x24, 0x02, 0x01, 0x66, 0x24, 0x02 + .word MOD06_02248438, MOD06_02248450, MOD06_02248594, MOD06_022485DC + .word MOD06_02248608, MOD06_02248630 + + .global MOD6_02251550 +MOD6_02251550: ; 0x02251550 + .word MOD06_0224619C, MOD06_0224629C, MOD06_022462D0, MOD06_022463BC + .word MOD06_022463E0, MOD06_022464A4, MOD06_022465B0, MOD06_02246600 .global MOD6_02251570 MOD6_02251570: ; 0x02251570 @@ -45454,19 +45565,19 @@ MOD6_02251570: ; 0x02251570 .global MOD6_022515A0 MOD6_022515A0: ; 0x022515A0 - .byte 0x1D, 0x67, 0x24, 0x02, 0x35, 0x67, 0x24, 0x02, 0xA5, 0x67, 0x24, 0x02, 0xDD, 0x67, 0x24, 0x02 - .byte 0x1D, 0x68, 0x24, 0x02, 0xA1, 0x68, 0x24, 0x02, 0xC1, 0x68, 0x24, 0x02, 0x0D, 0x69, 0x24, 0x02 - .byte 0x75, 0x69, 0x24, 0x02, 0x95, 0x69, 0x24, 0x02, 0xF9, 0x69, 0x24, 0x02, 0x79, 0x6A, 0x24, 0x02 - .byte 0x8D, 0x6A, 0x24, 0x02, 0xA1, 0x6A, 0x24, 0x02 + .word MOD06_0224671C, MOD06_02246734, MOD06_022467A4, MOD06_022467DC + .word MOD06_0224681C, MOD06_022468A0, MOD06_022468C0, MOD06_0224690C + .word MOD06_02246974, MOD06_02246994, MOD06_022469F8, MOD06_02246A78 + .word MOD06_02246A8C, MOD06_02246AA0 .global MOD6_022515D8 MOD6_022515D8: ; 0x022515D8 - .byte 0x1D, 0x67, 0x24, 0x02, 0xDD, 0x6A, 0x24, 0x02, 0xA5, 0x67, 0x24, 0x02, 0xDD, 0x67, 0x24, 0x02 - .byte 0x1D, 0x68, 0x24, 0x02, 0xA1, 0x68, 0x24, 0x02, 0xC1, 0x68, 0x24, 0x02, 0x0D, 0x69, 0x24, 0x02 - .byte 0x75, 0x69, 0x24, 0x02, 0x95, 0x69, 0x24, 0x02, 0x4D, 0x6B, 0x24, 0x02, 0x61, 0x6B, 0x24, 0x02 - .byte 0x79, 0x6B, 0x24, 0x02, 0x99, 0x6B, 0x24, 0x02, 0xC1, 0x6B, 0x24, 0x02, 0xE9, 0x6B, 0x24, 0x02 - .byte 0x09, 0x6C, 0x24, 0x02, 0x39, 0x6C, 0x24, 0x02, 0xDD, 0x6C, 0x24, 0x02, 0x25, 0x6D, 0x24, 0x02 - .byte 0x79, 0x6A, 0x24, 0x02, 0x8D, 0x6A, 0x24, 0x02, 0xA1, 0x6A, 0x24, 0x02 + .word MOD06_0224671C, MOD06_02246ADC, MOD06_022467A4, MOD06_022467DC + .word MOD06_0224681C, MOD06_022468A0, MOD06_022468C0, MOD06_0224690C + .word MOD06_02246974, MOD06_02246994, MOD06_02246B4C, MOD06_02246B60 + .word MOD06_02246B78, MOD06_02246B98, MOD06_02246BC0, MOD06_02246BE8 + .word MOD06_02246C08, MOD06_02246C38, MOD06_02246CDC, MOD06_02246D24 + .word MOD06_02246A78, MOD06_02246A8C, MOD06_02246AA0 .global MOD6_02251634 MOD6_02251634: ; 0x02251634 @@ -45497,15 +45608,62 @@ MOD6_02251738: ; 0x02251738 .global MOD6_02251770 MOD6_02251770: ; 0x02251770 - .byte 0xF1, 0x90, 0x24, 0x02, 0x09, 0x91, 0x24, 0x02, 0xF5, 0x90, 0x24, 0x02, 0x1D, 0x91, 0x24, 0x02 - .byte 0x31, 0x91, 0x24, 0x02, 0x45, 0x91, 0x24, 0x02, 0x59, 0x91, 0x24, 0x02, 0x6D, 0x91, 0x24, 0x02 - .byte 0x85, 0x91, 0x24, 0x02, 0x95, 0x91, 0x24, 0x02, 0xA5, 0x91, 0x24, 0x02, 0x02, 0x02, 0x02, 0x15 - .byte 0x02, 0x0F, 0x02, 0x14, 0x03, 0x17, 0x02, 0x01, 0x02, 0x19, 0x02, 0x1D, 0x02, 0x03, 0x02, 0x11 - .byte 0x03, 0x15, 0x02, 0x19, 0x03, 0x01, 0x02, 0x06, 0x02, 0x0B, 0x04, 0x0C, 0x02, 0x03, 0x02, 0x0B - .byte 0x02, 0x0C, 0x00, 0x0E, 0x02, 0x04, 0x04, 0x07, 0x02, 0x0E, 0x02, 0x18, 0x02, 0x03, 0x02, 0x0C - .byte 0x02, 0x1E, 0x00, 0x1F, 0x02, 0x01, 0x01, 0x03, 0x02, 0x0B, 0x02, 0x10, 0x00, 0x17, 0x00, 0x01 - .byte 0x02, 0x03, 0x00, 0x04, 0x02, 0x05, 0x02, 0x08, 0x02, 0x1D, 0x03, 0x06, 0x03, 0x09, 0x01, 0x0D - .byte 0x01, 0x0E, 0x02, 0x0F, 0x01, 0x10, 0x02, 0x1C, 0x02, 0x06, 0x02, 0x08, 0x02, 0x17, 0x02, 0x18 + .word MOD06_022490F0, MOD06_02249108, MOD06_022490F4, MOD06_0224911C + .word MOD06_02249130, MOD06_02249144, MOD06_02249158, MOD06_0224916C + .word MOD06_02249184, MOD06_02249194, MOD06_022491A4 + + .global MOD6_0225179C +MOD6_0225179C: ; 0x0225179C + .byte 0x02, 0x02, 0x02, 0x15 + + .global MOD6_022517A0 +MOD6_022517A0: ; 0x022517A0 + .byte 0x02, 0x0F, 0x02, 0x14, 0x03, 0x17 + + .global MOD6_022517A6 +MOD6_022517A6: ; 0x022517A6 + .byte 0x02, 0x01, 0x02, 0x19, 0x02, 0x1D + + .global MOD6_022517AC +MOD6_022517AC: ; 0x022517AC + .byte 0x02, 0x03, 0x02, 0x11 + .byte 0x03, 0x15, 0x02, 0x19 + + .global MOD6_022517B4 +MOD6_022517B4: ; 0x022517B4 + .byte 0x03, 0x01, 0x02, 0x06, 0x02, 0x0B, 0x04, 0x0C + + .global MOD6_022517BC +MOD6_022517BC: ; 0x022517BC + .byte 0x02, 0x03, 0x02, 0x0B + .byte 0x02, 0x0C, 0x00, 0x0E + + .global MOD6_022517C4 +MOD6_022517C4: ; 0x022517C4 + .byte 0x02, 0x04, 0x04, 0x07, 0x02, 0x0E, 0x02, 0x18 + + .global MOD6_022517CC +MOD6_022517CC: ; 0x022517CC + .byte 0x02, 0x03, 0x02, 0x0C + .byte 0x02, 0x1E, 0x00, 0x1F + + .global MOD6_022517D4 +MOD6_022517D4: ; 0x022517D4 + .byte 0x02, 0x01, 0x01, 0x03, 0x02, 0x0B, 0x02, 0x10, 0x00, 0x17 + + .global MOD6_022517DE +MOD6_022517DE: ; 0x022517DE + .byte 0x00, 0x01 + .byte 0x02, 0x03, 0x00, 0x04, 0x02, 0x05, 0x02, 0x08, 0x02, 0x1D + + .global MOD6_022517EA +MOD6_022517EA: ; 0x022517EA + .byte 0x03, 0x06, 0x03, 0x09, 0x01, 0x0D + .byte 0x01, 0x0E, 0x02, 0x0F, 0x01, 0x10, 0x02, 0x1C + + .global MOD6_022517F8 +MOD6_022517F8: ; 0x022517F8 + .byte 0x02, 0x06, 0x02, 0x08, 0x02, 0x17, 0x02, 0x18 .byte 0x01, 0x19, 0x00, 0x1A, 0x01, 0x1F, 0x00, 0x00 .global MOD6_02251808 @@ -45515,12 +45673,12 @@ MOD6_02251808: ; 0x02251808 .global MOD6_0225181C MOD6_0225181C: ; 0x0225181C - .byte 0x04, 0x00, 0x00, 0x00, 0xB4, 0x17, 0x25, 0x02, 0x04, 0x00, 0x00, 0x00, 0xBC, 0x17, 0x25, 0x02 - .byte 0x04, 0x00, 0x00, 0x00, 0xAC, 0x17, 0x25, 0x02, 0x03, 0x00, 0x00, 0x00, 0xA6, 0x17, 0x25, 0x02 - .byte 0x06, 0x00, 0x00, 0x00, 0xDE, 0x17, 0x25, 0x02, 0x02, 0x00, 0x00, 0x00, 0x9C, 0x17, 0x25, 0x02 - .byte 0x04, 0x00, 0x00, 0x00, 0xC4, 0x17, 0x25, 0x02, 0x07, 0x00, 0x00, 0x00, 0xEA, 0x17, 0x25, 0x02 - .byte 0x03, 0x00, 0x00, 0x00, 0xA0, 0x17, 0x25, 0x02, 0x04, 0x00, 0x00, 0x00, 0xCC, 0x17, 0x25, 0x02 - .byte 0x05, 0x00, 0x00, 0x00, 0xD4, 0x17, 0x25, 0x02, 0x07, 0x00, 0x00, 0x00, 0xF8, 0x17, 0x25, 0x02 + .word 0x00000004, MOD6_022517B4, 0x00000004, MOD6_022517BC + .word 0x00000004, MOD6_022517AC, 0x00000003, MOD6_022517A6 + .word 0x00000006, MOD6_022517DE, 0x00000002, MOD6_0225179C + .word 0x00000004, MOD6_022517C4, 0x00000007, MOD6_022517EA + .word 0x00000003, MOD6_022517A0, 0x00000004, MOD6_022517CC + .word 0x00000005, MOD6_022517D4, 0x00000007, MOD6_022517F8 .global MOD6_0225187C MOD6_0225187C: ; 0x0225187C @@ -45528,8 +45686,8 @@ MOD6_0225187C: ; 0x0225187C .global MOD6_02251888 MOD6_02251888: ; 0x02251888 - .byte 0x20, 0x00, 0x00, 0x00, 0x4D, 0x95, 0x24, 0x02, 0x99, 0x95, 0x24, 0x02, 0x9D, 0x95, 0x24, 0x02 - .byte 0x09, 0x96, 0x24, 0x02 + .word 0x00000020, MOD06_0224954C, MOD06_02249598, MOD06_0224959C + .word MOD06_02249608 .global MOD6_0225189C MOD6_0225189C: ; 0x0225189C @@ -45538,8 +45696,8 @@ MOD6_0225189C: ; 0x0225189C .global MOD6_022518B0 MOD6_022518B0: ; 0x022518B0 - .byte 0x20, 0x00, 0x00, 0x00, 0x4D, 0x95, 0x24, 0x02, 0x99, 0x95, 0x24, 0x02, 0xAD, 0x96, 0x24, 0x02 - .byte 0x01, 0x97, 0x24, 0x02 + .word 0x00000020, MOD06_0224954C, MOD06_02249598, MOD06_022496AC + .word MOD06_02249700 .global MOD6_022518C4 MOD6_022518C4: ; 0x022518C4 @@ -45566,13 +45724,13 @@ MOD6_02251948: ; 0x02251948 .global MOD6_02251958 MOD6_02251958: ; 0x02251958 - .byte 0x38, 0x00, 0x00, 0x00, 0x35, 0x98, 0x24, 0x02, 0xAD, 0x98, 0x24, 0x02, 0xBD, 0x98, 0x24, 0x02 - .byte 0x55, 0x99, 0x24, 0x02 + .word 0x00000038, MOD06_02249834, MOD06_022498AC, MOD06_022498BC + .word MOD06_02249954 .global MOD6_0225196C MOD6_0225196C: ; 0x0225196C - .byte 0x38, 0x00, 0x00, 0x00, 0xC5, 0x9B, 0x24, 0x02, 0x25, 0x9C, 0x24, 0x02, 0x31, 0x9C, 0x24, 0x02 - .byte 0x75, 0x9C, 0x24, 0x02 + .word 0x00000038, MOD06_02249BC4, MOD06_02249C24, MOD06_02249C30 + .word MOD06_02249C74 .global MOD6_02251980 MOD6_02251980: ; 0x02251980 @@ -45580,8 +45738,8 @@ MOD6_02251980: ; 0x02251980 .global MOD6_0225198C MOD6_0225198C: ; 0x0225198C - .byte 0x1C, 0x00, 0x00, 0x00, 0x85, 0x9F, 0x24, 0x02, 0xAD, 0x9F, 0x24, 0x02, 0xB1, 0x9F, 0x24, 0x02 - .byte 0xE1, 0x9F, 0x24, 0x02 + .word 0x0000001C, MOD06_02249F84, MOD06_02249FAC, MOD06_02249FB0 + .word MOD06_02249FE0 .global MOD6_022519A0 MOD6_022519A0: ; 0x022519A0 @@ -45614,8 +45772,8 @@ MOD6_02251A54: ; 0x02251A54 .global MOD6_02251A60 MOD6_02251A60: ; 0x02251A60 - .byte 0x6C, 0x00, 0x00, 0x00, 0x9D, 0xA1, 0x24, 0x02, 0xD9, 0xA1, 0x24, 0x02, 0xDD, 0xA1, 0x24, 0x02 - .byte 0x39, 0xA2, 0x24, 0x02 + .word 0x0000006C, MOD06_0224A19C, MOD06_0224A1D8, MOD06_0224A1DC + .word MOD06_0224A238 .global MOD6_02251A74 MOD6_02251A74: ; 0x02251A74 @@ -45638,13 +45796,13 @@ MOD6_02251ABC: ; 0x02251ABC .global MOD6_02251AC8 MOD6_02251AC8: ; 0x02251AC8 - .byte 0x1C, 0x00, 0x00, 0x00, 0x71, 0xA5, 0x24, 0x02, 0xB1, 0xA5, 0x24, 0x02, 0xC9, 0xA5, 0x24, 0x02 - .byte 0x25, 0xA6, 0x24, 0x02 + .word 0x0000001C, MOD06_0224A570, MOD06_0224A5B0, MOD06_0224A5C8 + .word MOD06_0224A624 .global MOD6_02251ADC MOD6_02251ADC: ; 0x02251ADC - .byte 0x1C, 0x00, 0x00, 0x00, 0x55, 0xA3, 0x24, 0x02, 0x81, 0xA3, 0x24, 0x02, 0x85, 0xA3, 0x24, 0x02 - .byte 0xF5, 0xA3, 0x24, 0x02 + .word 0x0000001C, MOD06_0224A354, MOD06_0224A380, MOD06_0224A384 + .word MOD06_0224A3F4 .global MOD6_02251AF0 MOD6_02251AF0: ; 0x02251AF0 @@ -45672,18 +45830,18 @@ MOD6_02251B4C: ; 0x02251B4C .global MOD6_02251B58 MOD6_02251B58: ; 0x02251B58 - .byte 0x20, 0x00, 0x00, 0x00, 0x11, 0xA7, 0x24, 0x02, 0xC9, 0xA7, 0x24, 0x02, 0xDD, 0xA7, 0x24, 0x02 - .byte 0x71, 0xA8, 0x24, 0x02 + .word 0x00000020, MOD06_0224A710, MOD06_0224A7C8, MOD06_0224A7DC + .word MOD06_0224A870 .global MOD6_02251B6C MOD6_02251B6C: ; 0x02251B6C - .byte 0x18, 0x00, 0x00, 0x00, 0x19, 0xA9, 0x24, 0x02, 0x45, 0xA9, 0x24, 0x02, 0x49, 0xA9, 0x24, 0x02 - .byte 0xA1, 0xA9, 0x24, 0x02 + .word 0x00000018, MOD06_0224A918, MOD06_0224A944, MOD06_0224A948 + .word MOD06_0224A9A0 .global MOD6_02251B80 MOD6_02251B80: ; 0x02251B80 - .byte 0x18, 0x00, 0x00, 0x00, 0x85, 0xAA, 0x24, 0x02, 0xB1, 0xAA, 0x24, 0x02, 0xB5, 0xAA, 0x24, 0x02 - .byte 0x0D, 0xAB, 0x24, 0x02 + .word 0x00000018, MOD06_0224AA84, MOD06_0224AAB0, MOD06_0224AAB4 + .word MOD06_0224AB0C .global MOD6_02251B94 MOD6_02251B94: ; 0x02251B94 @@ -45707,8 +45865,8 @@ MOD6_02251BE8: ; 0x02251BE8 .global MOD6_02251BF4 MOD6_02251BF4: ; 0x02251BF4 - .byte 0x34, 0x00, 0x00, 0x00, 0x39, 0xAC, 0x24, 0x02, 0x81, 0xAC, 0x24, 0x02, 0x99, 0xAC, 0x24, 0x02 - .byte 0x45, 0xAD, 0x24, 0x02 + .word 0x00000034, MOD06_0224AC38, MOD06_0224AC80, MOD06_0224AC98 + .word MOD06_0224AD44 .global MOD6_02251C08 MOD6_02251C08: ; 0x02251C08 @@ -45722,8 +45880,8 @@ MOD6_02251C2C: ; 0x02251C2C .global MOD6_02251C38 MOD6_02251C38: ; 0x02251C38 - .byte 0x24, 0x00, 0x00, 0x00, 0x75, 0xAF, 0x24, 0x02, 0xB1, 0xAF, 0x24, 0x02, 0xC5, 0xAF, 0x24, 0x02 - .byte 0xF9, 0xAF, 0x24, 0x02 + .word 0x00000024, MOD06_0224AF74, MOD06_0224AFB0, MOD06_0224AFC4 + .word MOD06_0224AFF8 .global MOD6_02251C4C MOD6_02251C4C: ; 0x02251C4C @@ -45733,24 +45891,24 @@ MOD6_02251C4C: ; 0x02251C4C .global MOD6_02251C70 MOD6_02251C70: ; 0x02251C70 - .byte 0x0C, 0x00, 0x00, 0x00, 0x89, 0xB1, 0x24, 0x02, 0x01, 0xB2, 0x24, 0x02, 0x15, 0xB2, 0x24, 0x02 - .byte 0x3D, 0xB2, 0x24, 0x02 + .word 0x0000000C, MOD06_0224B188, MOD06_0224B200, MOD06_0224B214 + .word MOD06_0224B23C .global MOD6_02251C84 MOD6_02251C84: ; 0x02251C84 - .byte 0x0C, 0x00, 0x00, 0x00, 0x25, 0xB3, 0x24, 0x02, 0x9D, 0xB3, 0x24, 0x02, 0xB1, 0xB3, 0x24, 0x02 - .byte 0xD9, 0xB3, 0x24, 0x02 + .word 0x0000000C, MOD06_0224B324, MOD06_0224B39C, MOD06_0224B3B0 + .word MOD06_0224B3D8 .global MOD6_02251C98 MOD6_02251C98: ; 0x02251C98 - .byte 0x38, 0x00, 0x00, 0x00, 0xD1, 0xB5, 0x24, 0x02, 0x65, 0xB6, 0x24, 0x02, 0x71, 0xB6, 0x24, 0x02 - .byte 0x51, 0xB7, 0x24, 0x02, 0x20, 0x00, 0x00, 0x00, 0x89, 0xB7, 0x24, 0x02, 0xC1, 0xB7, 0x24, 0x02 - .byte 0xCD, 0xB7, 0x24, 0x02, 0x01, 0xB8, 0x24, 0x02 + .word 0x00000038, MOD06_0224B5D0, MOD06_0224B664, MOD06_0224B670 + .word MOD06_0224B750, 0x00000020, MOD06_0224B788, MOD06_0224B7C0 + .word MOD06_0224B7CC, MOD06_0224B800 .global MOD6_02251CC0 MOD6_02251CC0: ; 0x02251CC0 - .byte 0x28, 0x00, 0x00, 0x00, 0x79, 0xB8, 0x24, 0x02, 0xFD, 0xB8, 0x24, 0x02, 0x09, 0xB9, 0x24, 0x02 - .byte 0x31, 0xB9, 0x24, 0x02 + .word 0x00000028, MOD06_0224B878, MOD06_0224B8FC, MOD06_0224B908 + .word MOD06_0224B930 .global MOD6_02251CD4 MOD6_02251CD4: ; 0x02251CD4 @@ -45774,8 +45932,8 @@ MOD6_02251D1C: ; 0x02251D1C .global MOD6_02251D34 MOD6_02251D34: ; 0x02251D34 - .byte 0x28, 0x00, 0x00, 0x00, 0x31, 0xBA, 0x24, 0x02, 0x89, 0xBA, 0x24, 0x02, 0x95, 0xBA, 0x24, 0x02 - .byte 0x0D, 0xBB, 0x24, 0x02 + .word 0x00000028, MOD06_0224BA30, MOD06_0224BA88, MOD06_0224BA94 + .word MOD06_0224BB0C .global MOD6_02251D48 MOD6_02251D48: ; 0x02251D48 @@ -45784,8 +45942,8 @@ MOD6_02251D48: ; 0x02251D48 .global MOD6_02251D60 MOD6_02251D60: ; 0x02251D60 - .byte 0x24, 0x00, 0x00, 0x00, 0x51, 0xBC, 0x24, 0x02, 0x95, 0xBC, 0x24, 0x02, 0xA1, 0xBC, 0x24, 0x02 - .byte 0xD1, 0xBC, 0x24, 0x02 + .word 0x00000024, MOD06_0224BC50, MOD06_0224BC94, MOD06_0224BCA0 + .word MOD06_0224BCD0 .global MOD6_02251D74 MOD6_02251D74: ; 0x02251D74 @@ -45794,8 +45952,8 @@ MOD6_02251D74: ; 0x02251D74 .global MOD6_02251D8C MOD6_02251D8C: ; 0x02251D8C - .byte 0x38, 0x00, 0x00, 0x00, 0xF9, 0xBD, 0x24, 0x02, 0x8D, 0xBE, 0x24, 0x02, 0x99, 0xBE, 0x24, 0x02 - .byte 0x65, 0xBF, 0x24, 0x02 + .word 0x00000038, MOD06_0224BDF8, MOD06_0224BE8C, MOD06_0224BE98 + .word MOD06_0224BF64 .global MOD6_02251DA0 MOD6_02251DA0: ; 0x02251DA0 @@ -45804,8 +45962,8 @@ MOD6_02251DA0: ; 0x02251DA0 .global MOD6_02251DB8 MOD6_02251DB8: ; 0x02251DB8 - .byte 0x38, 0x00, 0x00, 0x00, 0xA1, 0xC0, 0x24, 0x02, 0x41, 0xC1, 0x24, 0x02, 0x4D, 0xC1, 0x24, 0x02 - .byte 0x19, 0xC2, 0x24, 0x02 + .word 0x00000038, MOD06_0224C0A0, MOD06_0224C140, MOD06_0224C14C + .word MOD06_0224C218 .global MOD6_02251DCC MOD6_02251DCC: ; 0x02251DCC @@ -45818,11 +45976,11 @@ MOD6_02251DE4: ; 0x02251DE4 .global MOD6_02251DF4 MOD6_02251DF4: ; 0x02251DF4 - .byte 0x55, 0xC9, 0x24, 0x02, 0xC9, 0xC9, 0x24, 0x02, 0x0D, 0xCA, 0x24, 0x02, 0x59, 0xCA, 0x24, 0x02 + .word MOD06_0224C954, MOD06_0224C9C8, MOD06_0224CA0C, MOD06_0224CA58 .global MOD6_02251E04 MOD6_02251E04: ; 0x02251E04 - .byte 0x5D, 0xC7, 0x24, 0x02, 0xC1, 0xC7, 0x24, 0x02, 0x45, 0xC8, 0x24, 0x02, 0x89, 0xC8, 0x24, 0x02 + .word MOD06_0224C75C, MOD06_0224C7C0, MOD06_0224C844, MOD06_0224C888 .global MOD6_02251E14 MOD6_02251E14: ; 0x02251E14 @@ -45831,8 +45989,8 @@ MOD6_02251E14: ; 0x02251E14 .global MOD6_02251E28 MOD6_02251E28: ; 0x02251E28 - .byte 0xE9, 0xCA, 0x24, 0x02, 0x0D, 0xCB, 0x24, 0x02, 0x5D, 0xC7, 0x24, 0x02, 0xC1, 0xC7, 0x24, 0x02 - .byte 0x45, 0xC8, 0x24, 0x02, 0x89, 0xC8, 0x24, 0x02 + .word MOD06_0224CAE8, MOD06_0224CB0C, MOD06_0224C75C, MOD06_0224C7C0 + .word MOD06_0224C844, MOD06_0224C888 .global MOD6_02251E40 MOD6_02251E40: ; 0x02251E40 @@ -45864,8 +46022,8 @@ MOD6_02251F18: ; 0x02251F18 .global MOD6_02251F28 MOD6_02251F28: ; 0x02251F28 - .byte 0x24, 0x00, 0x00, 0x00, 0x3D, 0xCF, 0x24, 0x02, 0x6D, 0xCF, 0x24, 0x02, 0x8D, 0xCF, 0x24, 0x02 - .byte 0x91, 0xCF, 0x24, 0x02 + .word 0x00000024, MOD06_0224CF3C, MOD06_0224CF6C, MOD06_0224CF8C + .word MOD06_0224CF90 .global MOD6_02251F3C MOD6_02251F3C: ; 0x02251F3C @@ -45875,8 +46033,8 @@ MOD6_02251F3C: ; 0x02251F3C .global MOD6_02251F60 MOD6_02251F60: ; 0x02251F60 - .byte 0x24, 0x00, 0x00, 0x00, 0x45, 0xD3, 0x24, 0x02, 0x89, 0xD3, 0x24, 0x02, 0x95, 0xD3, 0x24, 0x02 - .byte 0xC5, 0xD3, 0x24, 0x02 + .word 0x00000024, MOD06_0224D344, MOD06_0224D388, MOD06_0224D394 + .word MOD06_0224D3C4 .global MOD6_02251F74 MOD6_02251F74: ; 0x02251F74 @@ -45941,62 +46099,116 @@ MOD6_02252188: ; 0x02252188 .global MOD6_0225218C MOD6_0225218C: ; 0x0225218C - .byte 0x00, 0x04, 0x00, 0x00, 0xF0, 0x00, 0x00, 0x00, 0x31, 0xEB, 0x24, 0x02, 0xC5, 0xEB, 0x24, 0x02 - .byte 0xD5, 0xEB, 0x24, 0x02, 0x09, 0xEC, 0x24, 0x02 + .word 0x00000400, 0x000000F0, MOD06_0224EB30, MOD06_0224EBC4 + .word MOD06_0224EBD4, MOD06_0224EC08 .global MOD6_022521A4 MOD6_022521A4: ; 0x022521A4 - .byte 0x00, 0x04, 0x00, 0x00, 0xF0, 0x00, 0x00, 0x00, 0x79, 0xEB, 0x24, 0x02, 0xC5, 0xEB, 0x24, 0x02 - .byte 0xD5, 0xEB, 0x24, 0x02, 0x09, 0xEC, 0x24, 0x02 + .word 0x00000400, 0x000000F0, MOD06_0224EB78, MOD06_0224EBC4 + .word MOD06_0224EBD4, MOD06_0224EC08 .global MOD6_022521BC MOD6_022521BC: ; 0x022521BC - .byte 0x00, 0x04, 0x00, 0x00, 0xCC, 0x01, 0x00, 0x00, 0x5D, 0xEC, 0x24, 0x02, 0xF5, 0xEC, 0x24, 0x02 - .byte 0x15, 0xED, 0x24, 0x02, 0x7D, 0xED, 0x24, 0x02 + .word 0x00000400, 0x000001CC, MOD06_0224EC5C, MOD06_0224ECF4 + .word MOD06_0224ED14, MOD06_0224ED7C .global MOD6_022521D4 MOD6_022521D4: ; 0x022521D4 - .byte 0x00, 0x04, 0x00, 0x00, 0xF0, 0x00, 0x00, 0x00, 0x65, 0xEA, 0x24, 0x02, 0xAD, 0xEA, 0x24, 0x02 - .byte 0xBD, 0xEA, 0x24, 0x02, 0xF1, 0xEA, 0x24, 0x02 + .word 0x00000400, 0x000000F0, MOD06_0224EA64, MOD06_0224EAAC + .word MOD06_0224EABC, MOD06_0224EAF0 .global MOD6_022521EC MOD6_022521EC: ; 0x022521EC - .byte 0x00, 0x04, 0x00, 0x00, 0x10, 0x0D, 0x00, 0x00, 0x99, 0xEF, 0x24, 0x02, 0x2D, 0xF0, 0x24, 0x02 - .byte 0x69, 0xF0, 0x24, 0x02, 0xA5, 0xF0, 0x24, 0x02 + .word 0x00000400, 0x00000D10, MOD06_0224EF98, MOD06_0224F02C + .word MOD06_0224F068, MOD06_0224F0A4 .global MOD6_02252204 MOD6_02252204: ; 0x02252204 - .byte 0x11, 0xEB, 0x24, 0x02, 0x3D, 0xEC, 0x24, 0x02, 0x3D, 0xEC, 0x24, 0x02 + .word MOD06_0224EB10, MOD06_0224EC3C, MOD06_0224EC3C .global MOD6_02252210 MOD6_02252210: ; 0x02252210 - .byte 0xFD, 0xEA, 0x24, 0x02, 0x15, 0xEC, 0x24, 0x02, 0x29, 0xEC, 0x24, 0x02 + .word MOD06_0224EAFC, MOD06_0224EC14, MOD06_0224EC28 .global MOD6_0225221C MOD6_0225221C: ; 0x0225221C - .byte 0x19, 0xEB, 0x24, 0x02, 0x45, 0xEC, 0x24, 0x02, 0x45, 0xEC, 0x24, 0x02 + .word MOD06_0224EB18, MOD06_0224EC44, MOD06_0224EC44 .data .global MOD6_02252240 -MOD6_22252240: ; 0x02252240 - .byte 0x00, 0x04, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0xA1, 0x23, 0x02 - .byte 0x9D, 0xA1, 0x23, 0x02, 0xB1, 0xA1, 0x23, 0x02, 0x64, 0x61, 0x74, 0x61, 0x2F, 0x73, 0x68, 0x6F - .byte 0x70, 0x5F, 0x68, 0x2E, 0x63, 0x6C, 0x64, 0x61, 0x74, 0x00, 0x00, 0x00, 0x64, 0x61, 0x74, 0x61 +MOD6_02252240: ; 0x02252240 + .word 0x00000400, 0x0000000C, 0x00000000, MOD06_0223A188 + .word MOD06_0223A19C, MOD06_0223A1B0 + + .global MOD6_02252258 +MOD6_02252258: ; 0x02252258 + .byte 0x64, 0x61, 0x74, 0x61, 0x2F, 0x73, 0x68, 0x6F + .byte 0x70, 0x5F, 0x68, 0x2E, 0x63, 0x6C, 0x64, 0x61, 0x74, 0x00, 0x00, 0x00 + + .global MOD6_0225226C +MOD6_0225226C: ; 0x0225226C + .byte 0x64, 0x61, 0x74, 0x61 .byte 0x2F, 0x73, 0x68, 0x6F, 0x70, 0x5F, 0x63, 0x68, 0x72, 0x2E, 0x72, 0x65, 0x73, 0x64, 0x61, 0x74 - .byte 0x00, 0x00, 0x00, 0x00, 0x64, 0x61, 0x74, 0x61, 0x2F, 0x73, 0x68, 0x6F, 0x70, 0x5F, 0x70, 0x61 - .byte 0x6C, 0x2E, 0x72, 0x65, 0x73, 0x64, 0x61, 0x74, 0x00, 0x00, 0x00, 0x00, 0x64, 0x61, 0x74, 0x61 + .byte 0x00, 0x00, 0x00, 0x00 + + .global MOD6_02252284 +MOD6_02252284: ; 0x02252284 + .byte 0x64, 0x61, 0x74, 0x61, 0x2F, 0x73, 0x68, 0x6F, 0x70, 0x5F, 0x70, 0x61 + .byte 0x6C, 0x2E, 0x72, 0x65, 0x73, 0x64, 0x61, 0x74, 0x00, 0x00, 0x00, 0x00 + + .global MOD6_0225229C +MOD6_0225229C: ; 0x0225229C + .byte 0x64, 0x61, 0x74, 0x61 .byte 0x2F, 0x73, 0x68, 0x6F, 0x70, 0x5F, 0x63, 0x65, 0x6C, 0x6C, 0x2E, 0x72, 0x65, 0x73, 0x64, 0x61 - .byte 0x74, 0x00, 0x00, 0x00, 0x64, 0x61, 0x74, 0x61, 0x2F, 0x73, 0x68, 0x6F, 0x70, 0x5F, 0x63, 0x61 - .byte 0x6E, 0x6D, 0x2E, 0x72, 0x65, 0x73, 0x64, 0x61, 0x74, 0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x05 - .byte 0x07, 0x04, 0x0B, 0x0A, 0x09, 0x00, 0x00, 0x00, 0x46, 0x47, 0x48, 0x49, 0x4B, 0x4D, 0x4D, 0x4D - .byte 0x4F, 0x00, 0x00, 0x00, 0x73, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x74, 0x00, 0x00, 0x00 - .byte 0x02, 0x00, 0x00, 0x00, 0x72, 0x00, 0x00, 0x00, 0xFE, 0xFF, 0xFF, 0xFF, 0x06, 0x00, 0x00, 0x00 - .byte 0x3C, 0xF7, 0x24, 0x02, 0x34, 0xF7, 0x24, 0x02, 0x24, 0xF7, 0x24, 0x02, 0x2C, 0xF7, 0x24, 0x02 - .byte 0x0B, 0x00, 0x00, 0x00, 0x5C, 0xF7, 0x24, 0x02, 0x68, 0xF7, 0x24, 0x02, 0x44, 0xF7, 0x24, 0x02 - .byte 0x50, 0xF7, 0x24, 0x02, 0x0E, 0x00, 0x00, 0x00, 0x10, 0x0C, 0x25, 0x02, 0x20, 0x0C, 0x25, 0x02 - .byte 0x00, 0x0C, 0x25, 0x02, 0x30, 0x0C, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x01, 0x04 + .byte 0x74, 0x00, 0x00, 0x00 + + .global MOD6_022522B4 +MOD6_022522B4: ; 0x022522B4 + .byte 0x64, 0x61, 0x74, 0x61, 0x2F, 0x73, 0x68, 0x6F, 0x70, 0x5F, 0x63, 0x61 + .byte 0x6E, 0x6D, 0x2E, 0x72, 0x65, 0x73, 0x64, 0x61, 0x74, 0x00, 0x00, 0x00 + + .global MOD6_022522CC +MOD6_022522CC: ; 0x022522CC + .byte 0x01, 0x02, 0x03, 0x05 + .byte 0x07, 0x04, 0x0B, 0x0A, 0x09, 0x00, 0x00, 0x00 + + .global MOD6_022522D8 +MOD6_022522D8: ; 0x022522D8 + .byte 0x46, 0x47, 0x48, 0x49, 0x4B, 0x4D, 0x4D, 0x4D + .byte 0x4F, 0x00, 0x00, 0x00 + + .global MOD6_022522E4 +MOD6_022522E4: ; 0x022522E4 + .byte 0x73, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x74, 0x00, 0x00, 0x00 + .byte 0x02, 0x00, 0x00, 0x00, 0x72, 0x00, 0x00, 0x00, 0xFE, 0xFF, 0xFF, 0xFF + + .global MOD6_022522FC +MOD6_022522FC: ; 0x022522FC + .byte 0x06, 0x00, 0x00, 0x00 + + .global MOD6_02252300 +MOD6_02252300: ; 0x02252300 + .word MOD6_0224F73C, MOD6_0224F734, MOD6_0224F724, MOD6_0224F72C + .word 0x0000000B, MOD6_0224F75C, MOD6_0224F768, MOD6_0224F744 + .word MOD6_0224F750, 0x0000000E, MOD6_02250C10, MOD6_02250C20 + .word MOD6_02250C00, MOD6_02250C30 + + .global MOD6_02252338 +MOD6_02252338: ; 0x02252338 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x01, 0x04 .byte 0x04, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x07, 0x07, 0x03, 0x08, 0x0A, 0x0A, 0x08, 0x05, 0x05 - .byte 0x09, 0x09, 0x06, 0x06, 0x0A, 0x00, 0x00, 0x00, 0x00, 0xB8, 0xFF, 0xFF, 0x00, 0xC0, 0x00, 0x00 + .byte 0x09, 0x09, 0x06, 0x06, 0x0A, 0x00, 0x00, 0x00 + + .global MOD6_02252358 +MOD6_02252358: ; 0x02252358 + .byte 0x00, 0xB8, 0xFF, 0xFF + + .global MOD6_0225235C +MOD6_0225235C: ; 0x0225235C + .byte 0x00, 0xC0, 0x00, 0x00 + + .global MOD6_02252360 +MOD6_02252360: ; 0x02252360 .byte 0x00, 0xB8, 0xFF, 0xFF, 0x00, 0x48, 0x00, 0x00, 0x00, 0xC0, 0x00, 0x00, 0x00, 0xB8, 0xFF, 0xFF .byte 0x00, 0xB8, 0xFF, 0xFF, 0x00, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x48, 0x00, 0x00 .byte 0x00, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xB8, 0xFF, 0xFF, 0x00, 0xC0, 0x00, 0x00 @@ -46006,7 +46218,18 @@ MOD6_22252240: ; 0x02252240 MOD6_022523A0: ; 0x022523A0 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x07, 0x00, 0x00, 0x10, 0x00, 0x18, 0x2F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0xB8, 0xFF, 0xFF, 0x00, 0xC0, 0x00, 0x00, 0x00, 0xB8, 0xFF, 0xFF, 0x00, 0x48, 0x00, 0x00 + + .global MOD6_022523C0 +MOD6_022523C0: ; 0x022523C0 + .byte 0x00, 0xB8, 0xFF, 0xFF + + .global MOD6_022523C4 +MOD6_022523C4: ; 0x022523C4 + .byte 0x00, 0xC0, 0x00, 0x00 + + .global MOD6_022523C8 +MOD6_022523C8: ; 0x022523C8 + .byte 0x00, 0xB8, 0xFF, 0xFF, 0x00, 0x48, 0x00, 0x00 .byte 0x00, 0xC0, 0x00, 0x00, 0x00, 0xB8, 0xFF, 0xFF, 0x00, 0xB8, 0xFF, 0xFF, 0x00, 0xC0, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x48, 0x00, 0x00, 0x00, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0xB8, 0xFF, 0xFF, 0x00, 0xC0, 0x00, 0x00, 0x00, 0x48, 0x00, 0x00, 0x00, 0x48, 0x00, 0x00 diff --git a/arm9/modules/11/asm/module_11.s b/arm9/modules/11/asm/module_11.s index c238c469..338eaadb 100644 --- a/arm9/modules/11/asm/module_11.s +++ b/arm9/modules/11/asm/module_11.s @@ -26862,7 +26862,7 @@ _0223A994: mov r1, #0xc mov r2, #0 bl GetMonData - ldr r1, _0223ABAC ; =0x020ECAC4 + ldr r1, _0223ABAC ; =gGameLanguage ldrb r1, [r1] cmp r1, r0 beq _0223A9C2 @@ -27111,7 +27111,7 @@ _0223AB9C: .word 0x00002E4C _0223ABA0: .word 0x00002FCC _0223ABA4: .word 0x00003144 _0223ABA8: .word 0x00000467 -_0223ABAC: .word 0x020ECAC4 +_0223ABAC: .word gGameLanguage _0223ABB0: .word 0x0000219C _0223ABB4: .word 0x00002DA4 _0223ABB8: .word 0x0225DCC0 @@ -78236,13 +78236,13 @@ MOD11_02253A74: ; 0x02253A74 thumb_func_start MOD11_02253A78 MOD11_02253A78: ; 0x02253A78 - ldr r3, _02253A84 ; =0x020CE34C + ldr r3, _02253A84 ; =MI_CpuFill8 add r0, #0x80 mov r1, #0 mov r2, #8 bx r3 nop -_02253A84: .word 0x020CE34C +_02253A84: .word MI_CpuFill8 thumb_func_start MOD11_02253A88 MOD11_02253A88: ; 0x02253A88 diff --git a/arm9/modules/13/asm/module_13_arm1.s b/arm9/modules/13/asm/module_13_arm1.s index f70f9ce7..d3afc6b8 100644 --- a/arm9/modules/13/asm/module_13_arm1.s +++ b/arm9/modules/13/asm/module_13_arm1.s @@ -5490,12 +5490,12 @@ _02216B6C: arm_func_start MOD13_02216B80 MOD13_02216B80: ; 0x02216B80 - ldr ip, _02216B90 ; =0x020CE34C + ldr ip, _02216B90 ; =MI_CpuFill8 mov r1, #0 mov r2, #0x70 bx ip .align 2, 0 -_02216B90: .word 0x020CE34C +_02216B90: .word MI_CpuFill8 arm_func_start MOD13_02216B94 MOD13_02216B94: ; 0x02216B94 @@ -5651,12 +5651,12 @@ MOD13_02216D78: ; 0x02216D78 arm_func_start MOD13_02216D90 MOD13_02216D90: ; 0x02216D90 - ldr ip, _02216DA0 ; =0x020CE34C + ldr ip, _02216DA0 ; =MI_CpuFill8 mov r1, #0 mov r2, #0x20 bx ip .align 2, 0 -_02216DA0: .word 0x020CE34C +_02216DA0: .word MI_CpuFill8 arm_func_start MOD13_02216DA4 MOD13_02216DA4: ; 0x02216DA4 @@ -6022,14 +6022,14 @@ _0221727C: .word MOD13_02240B24 arm_func_start MOD13_02217280 MOD13_02217280: ; 0x02217280 ldr r3, _02217298 ; =0x02240B24 - ldr ip, _0221729C ; =0x020CE34C + ldr ip, _0221729C ; =MI_CpuFill8 mov r1, #0 mov r2, #0x21c str r0, [r3] bx ip .align 2, 0 _02217298: .word MOD13_02240B24 -_0221729C: .word 0x020CE34C +_0221729C: .word MI_CpuFill8 arm_func_start MOD13_022172A0 MOD13_022172A0: ; 0x022172A0 diff --git a/arm9/modules/13/asm/module_13_thumb.s b/arm9/modules/13/asm/module_13_thumb.s index e8acb2b6..236b95f3 100644 --- a/arm9/modules/13/asm/module_13_thumb.s +++ b/arm9/modules/13/asm/module_13_thumb.s @@ -278,10 +278,10 @@ MOD13_022174A4: ; 0x022174A4 MOD13_022174C0: ; 0x022174C0 lsl r1, r1, #0x18 lsr r1, r1, #0x18 - ldr r3, _022174C8 ; =0x020CE34C + ldr r3, _022174C8 ; =MI_CpuFill8 bx r3 .align 2, 0 -_022174C8: .word 0x020CE34C +_022174C8: .word MI_CpuFill8 thumb_func_start MOD13_022174CC MOD13_022174CC: ; 0x022174CC diff --git a/arm9/modules/17/asm/module_17.s b/arm9/modules/17/asm/module_17.s index 9e816e77..e680ca83 100644 --- a/arm9/modules/17/asm/module_17.s +++ b/arm9/modules/17/asm/module_17.s @@ -411,19 +411,19 @@ MOD17_021D7794: ; 0x021D7794 bl MOD17_021D7D08 bl MOD17_021D7D28 bl MOD17_021D7DB0 - ldr r0, _021D77B0 ; =0x021C4918 + ldr r0, _021D77B0 ; =gUnk021C4918 mov r1, #1 strb r1, [r0, #5] bl FUN_0201E7A0 pop {r3, pc} nop -_021D77B0: .word 0x021C4918 +_021D77B0: .word gUnk021C4918 thumb_func_end MOD17_021D7794 thumb_func_start MOD17_021D77B4 MOD17_021D77B4: ; 0x021D77B4 push {r3, lr} - ldr r0, _021D77D0 ; =0x021C4918 + ldr r0, _021D77D0 ; =gUnk021C4918 mov r1, #0 strb r1, [r0, #5] bl FUN_0201E7A0 @@ -432,7 +432,7 @@ MOD17_021D77B4: ; 0x021D77B4 bl GX_ResetBankForTex pop {r3, pc} nop -_021D77D0: .word 0x021C4918 +_021D77D0: .word gUnk021C4918 thumb_func_end MOD17_021D77B4 thumb_func_start MOD17_021D77D4 @@ -5151,12 +5151,12 @@ _021D9CD0: .word 0x000006A4 thumb_func_start MOD17_021D9CD4 MOD17_021D9CD4: ; 0x021D9CD4 - ldr r3, _021D9CDC ; =0x020DF4A4 + ldr r3, _021D9CDC ; =memset mov r1, #0 mov r2, #0xac bx r3 .align 2, 0 -_021D9CDC: .word 0x020DF4A4 +_021D9CDC: .word memset thumb_func_end MOD17_021D9CD4 thumb_func_start MOD17_021D9CE0 @@ -13821,7 +13821,7 @@ _021DDBBC: ldr r0, [r5, #8] str r0, [r4, #0xc] bl MOD17_021D7794 - ldr r0, _021DDC2C ; =0x021C4918 + ldr r0, _021DDC2C ; =gUnk021C4918 mov r1, #0 strb r1, [r0, #5] bl FUN_0201E7A0 @@ -13864,7 +13864,7 @@ _021DDC02: pop {r3, r4, r5, pc} .align 2, 0 _021DDC28: .word MOD17_021DDD40 -_021DDC2C: .word 0x021C4918 +_021DDC2C: .word gUnk021C4918 thumb_func_end MOD17_021DDB58 thumb_func_start MOD17_021DDC30 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 diff --git a/arm9/modules/54/asm/module_54.s b/arm9/modules/54/asm/module_54.s index 9f417cef..752e8f3c 100644 --- a/arm9/modules/54/asm/module_54.s +++ b/arm9/modules/54/asm/module_54.s @@ -1968,7 +1968,7 @@ MOD54_021D84D4: ; 0x021D84D4 push {r3, r4, r5, lr} add r5, r0, #0 add r4, r1, #0 - ldr r0, _021D8514 ; =0x021C4918 + ldr r0, _021D8514 ; =gUnk021C4918 mov r1, #1 strb r1, [r0, #8] mov r0, #0x33 @@ -1993,7 +1993,7 @@ MOD54_021D84D4: ; 0x021D84D4 add r0, r4, #0 pop {r3, r4, r5, pc} nop -_021D8514: .word 0x021C4918 +_021D8514: .word gUnk021C4918 thumb_func_end MOD54_021D84D4 thumb_func_start MOD54_021D8518 @@ -2035,7 +2035,7 @@ _021D852A: str r1, [r5, #0xc] lsl r0, r0, #4 str r1, [r5, r0] - ldr r0, _021D8580 ; =0x021C4918 + ldr r0, _021D8580 ; =gUnk021C4918 strb r1, [r0, #8] ldr r0, _021D8584 ; =0x00004A40 strb r1, [r5, r0] @@ -2044,7 +2044,7 @@ _021D8576: pop {r3, r4, r5, pc} nop _021D857C: .word 0x00000658 -_021D8580: .word 0x021C4918 +_021D8580: .word gUnk021C4918 _021D8584: .word 0x00004A40 thumb_func_end MOD54_021D8518 diff --git a/arm9/modules/63/asm/module_63.s b/arm9/modules/63/asm/module_63.s index 65ffe22c..e7b2dde0 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_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_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 @@ -1028,7 +1028,7 @@ _021D7C52: mov r0, #0x10 orr r0, r1 strh r0, [r2] - ldr r0, _021D7D70 ; =0x021C4918 + ldr r0, _021D7D70 ; =gUnk021C4918 mov r1, #1 strb r1, [r0, #5] bl FUN_0201E7A0 @@ -1043,7 +1043,7 @@ _021D7D60: .word 0x04000060 _021D7D64: .word 0xFFFFCFFF _021D7D68: .word 0x00007FFF _021D7D6C: .word 0x0000010E -_021D7D70: .word 0x021C4918 +_021D7D70: .word gUnk021C4918 thumb_func_end MOD63_021D7C18 thumb_func_start MOD63_021D7D74 @@ -1853,7 +1853,7 @@ MOD63_021D8360: ; 0x021D8360 ldr r0, _021D83A0 ; =0x0000CFDF and r0, r1 strh r0, [r2] - ldr r0, _021D83A4 ; =0x021C4918 + ldr r0, _021D83A4 ; =gUnk021C4918 strb r3, [r0, #5] bl FUN_0201E7A0 mov r0, #1 @@ -1861,7 +1861,7 @@ MOD63_021D8360: ; 0x021D8360 .align 2, 0 _021D839C: .word 0x04000050 _021D83A0: .word 0x0000CFDF -_021D83A4: .word 0x021C4918 +_021D83A4: .word gUnk021C4918 thumb_func_end MOD63_021D8360 thumb_func_start MOD63_021D83A8 @@ -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 @@ -2765,7 +2765,7 @@ MOD63_021D8ADC: ; 0x021D8ADC ldr r0, [r4] bl FUN_02016B94 add r3, sp, #0x8c - ldr r5, _021D8BBC ; =0x021DBB6C + ldr r5, _021D8BBC ; =MOD63_021DBB6C str r0, [r4, #0xc] add r2, r3, #0 ldmia r5!, {r0, r1} @@ -2778,7 +2778,7 @@ MOD63_021D8ADC: ; 0x021D8ADC lsl r2, r2, #0x1a ldr r1, [r2] ldr r0, _021D8BC0 ; =0xC7FFFFFF - ldr r5, _021D8BC4 ; =0x021DBCF8 + ldr r5, _021D8BC4 ; =MOD63_021DBCF8 and r1, r0 lsl r0, r2, #1 orr r0, r1 @@ -2797,7 +2797,7 @@ MOD63_021D8ADC: ; 0x021D8ADC ldr r0, [r4, #0xc] mov r3, #0 bl FUN_02016C18 - ldr r5, _021D8BC8 ; =0x021DBD14 + ldr r5, _021D8BC8 ; =MOD63_021DBD14 add r3, sp, #0x54 ldmia r5!, {r0, r1} add r2, r3, #0 @@ -2812,7 +2812,7 @@ MOD63_021D8ADC: ; 0x021D8ADC ldr r0, [r4, #0xc] mov r3, #1 bl FUN_02016C18 - ldr r5, _021D8BCC ; =0x021DBD30 + ldr r5, _021D8BCC ; =MOD63_021DBD30 add r3, sp, #0x38 ldmia r5!, {r0, r1} add r2, r3, #0 @@ -2827,7 +2827,7 @@ MOD63_021D8ADC: ; 0x021D8ADC ldr r0, [r4, #0xc] mov r3, #1 bl FUN_02016C18 - ldr r5, _021D8BD0 ; =0x021DBBA8 + ldr r5, _021D8BD0 ; =MOD63_021DBBA8 add r3, sp, #0x1c ldmia r5!, {r0, r1} add r2, r3, #0 @@ -2842,7 +2842,7 @@ MOD63_021D8ADC: ; 0x021D8ADC ldr r0, [r4, #0xc] add r3, r1, #0 bl FUN_02016C18 - ldr r5, _021D8BD4 ; =0x021DBBE0 + ldr r5, _021D8BD4 ; =MOD63_021DBBE0 add r3, sp, #0 ldmia r5!, {r0, r1} add r2, r3, #0 @@ -2863,13 +2863,13 @@ MOD63_021D8ADC: ; 0x021D8ADC add sp, #0x9c pop {r4, r5, pc} nop -_021D8BBC: .word 0x021DBB6C +_021D8BBC: .word MOD63_021DBB6C _021D8BC0: .word 0xC7FFFFFF -_021D8BC4: .word 0x021DBCF8 -_021D8BC8: .word 0x021DBD14 -_021D8BCC: .word 0x021DBD30 -_021D8BD0: .word 0x021DBBA8 -_021D8BD4: .word 0x021DBBE0 +_021D8BC4: .word MOD63_021DBCF8 +_021D8BC8: .word MOD63_021DBD14 +_021D8BCC: .word MOD63_021DBD30 +_021D8BD0: .word MOD63_021DBBA8 +_021D8BD4: .word MOD63_021DBBE0 thumb_func_end MOD63_021D8ADC thumb_func_start MOD63_021D8BD8 @@ -2943,7 +2943,7 @@ MOD63_021D8C20: ; 0x021D8C20 mov r1, #0x20 orr r1, r2 strh r1, [r0] - ldr r0, _021D8C98 ; =0x021DBB5C + ldr r0, _021D8C98 ; =MOD63_021DBB5C bl G3X_SetEdgeColorTable mov r0, #0 add r1, r0, #0 @@ -2964,7 +2964,7 @@ MOD63_021D8C20: ; 0x021D8C20 _021D8C8C: .word 0x04000008 _021D8C90: .word 0xFFFFCFFD _021D8C94: .word 0x0000CFFB -_021D8C98: .word 0x021DBB5C +_021D8C98: .word MOD63_021DBB5C _021D8C9C: .word 0x00007FFF _021D8CA0: .word 0xBFFF0000 _021D8CA4: .word 0x04000580 @@ -3074,7 +3074,7 @@ MOD63_021D8D10: ; 0x021D8D10 str r1, [r4, #8] lsl r0, r0, #2 strb r1, [r4, r0] - ldr r0, _021D8D94 ; =0x021C4918 + ldr r0, _021D8D94 ; =gUnk021C4918 strb r1, [r0, #5] bl FUN_0201E7A0 bl GetLCRNGSeed @@ -3085,7 +3085,7 @@ MOD63_021D8D10: ; 0x021D8D10 pop {r4, pc} .align 2, 0 _021D8D90: .word 0x00007FFF -_021D8D94: .word 0x021C4918 +_021D8D94: .word gUnk021C4918 thumb_func_end MOD63_021D8D10 thumb_func_start MOD63_021D8D98 @@ -3211,13 +3211,13 @@ MOD63_021D8E68: ; 0x021D8E68 mov r0, #0x4c bl FUN_020168D0 ldr r0, _021D8E94 ; =SDK_OVERLAY_MODULE_63_ID - ldr r1, _021D8E98 ; =UNK63_021DBAB8 + ldr r1, _021D8E98 ; =MOD63_021DBAB8 bl FUN_02000E7C mov r0, #1 pop {r3, r4, r5, pc} .align 2, 0 _021D8E94: .word SDK_OVERLAY_MODULE_63_ID -_021D8E98: .word UNK63_021DBAB8 +_021D8E98: .word MOD63_021DBAB8 thumb_func_end MOD63_021D8E68 thumb_func_start MOD63_021D8E9C @@ -4014,11 +4014,11 @@ MOD63_021D9498: ; 0x021D9498 ldr r0, [r5, #0xc] mov r1, #1 str r0, [r5, #0x40] - ldr r0, _021D9588 ; =0x021C4918 + ldr r0, _021D9588 ; =gUnk021C4918 strb r1, [r0, #5] bl FUN_0201E7A0 - ldr r6, _021D958C ; =0x021DBDE8 - ldr r7, _021D9590 ; =0x021DBAD0 + ldr r6, _021D958C ; =MOD63_021DBDE8 + ldr r7, _021D9590 ; =MOD63_021DBAD0 mov r4, #0 _021D950C: mov r0, #0xc @@ -4076,9 +4076,9 @@ _021D950C: add sp, #8 pop {r3, r4, r5, r6, r7, pc} nop -_021D9588: .word 0x021C4918 -_021D958C: .word 0x021DBDE8 -_021D9590: .word 0x021DBAD0 +_021D9588: .word gUnk021C4918 +_021D958C: .word MOD63_021DBDE8 +_021D9590: .word MOD63_021DBAD0 _021D9594: .word 0x00004210 _021D9598: .word 0x0000318A _021D959C: .word 0x00004A52 @@ -4208,7 +4208,7 @@ _021D969C: .word 0xFFFF1FFF MOD63_021D96A0: ; 0x021D96A0 push {r3, r4, r5, r6, r7, lr} sub sp, #0x28 - ldr r3, _021D980C ; =0x021DBB2C + ldr r3, _021D980C ; =MOD63_021DBB2C add r2, sp, #0x18 add r5, r0, #0 ldmia r3!, {r0, r1} @@ -4369,7 +4369,7 @@ _021D96F8: add sp, #0x28 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 -_021D980C: .word 0x021DBB2C +_021D980C: .word MOD63_021DBB2C thumb_func_end MOD63_021D96A0 thumb_func_start MOD63_021D9810 @@ -4411,7 +4411,7 @@ _021D9840: mov r7, #0 str r0, [sp, #0x10] _021D9862: - ldr r1, _021D9964 ; =0x021DBB90 + ldr r1, _021D9964 ; =MOD63_021DBB90 lsl r2, r7, #2 ldr r1, [r1, r2] mov r0, #0x58 @@ -4488,7 +4488,7 @@ _021D98BC: mov r0, #0x4c bl FUN_0201EB64 add r3, sp, #0x20 - ldr r4, _021D9968 ; =0x021DBAE4 + ldr r4, _021D9968 ; =MOD63_021DBAE4 str r0, [r5, #0x44] ldmia r4!, {r0, r1} add r2, r3, #0 @@ -4503,12 +4503,12 @@ _021D98BC: ldr r3, _021D9970 ; =0x000005C1 str r0, [sp, #8] add r0, r2, #0 - ldr r2, _021D9974 ; =0x021DBB80 + ldr r2, _021D9974 ; =MOD63_021DBB80 bl FUN_0201ECA8 ldr r0, _021D9978 ; =0x00000981 ldr r1, [r5, #0x44] bl FUN_0201EEF0 - ldr r4, _021D997C ; =0x021DBB08 + ldr r4, _021D997C ; =MOD63_021DBB08 add r3, sp, #0x14 ldmia r4!, {r0, r1} add r2, r3, #0 @@ -4525,20 +4525,20 @@ _021D98BC: add sp, #0x2c pop {r4, r5, r6, r7, pc} .align 2, 0 -_021D9964: .word 0x021DBB90 -_021D9968: .word 0x021DBAE4 +_021D9964: .word MOD63_021DBB90 +_021D9968: .word MOD63_021DBAE4 _021D996C: .word 0x0029AEC1 _021D9970: .word 0x000005C1 -_021D9974: .word 0x021DBB80 +_021D9974: .word MOD63_021DBB80 _021D9978: .word 0x00000981 -_021D997C: .word 0x021DBB08 +_021D997C: .word MOD63_021DBB08 thumb_func_end MOD63_021D9810 thumb_func_start MOD63_021D9980 MOD63_021D9980: ; 0x021D9980 push {r4, r5, r6, r7, lr} sub sp, #0x3c - ldr r4, _021D99E4 ; =0x021DBD4C + ldr r4, _021D99E4 ; =MOD63_021DBD4C add r5, r0, #0 add r3, sp, #0x18 mov r2, #4 @@ -4550,7 +4550,7 @@ _021D998C: ldr r0, [r4] add r2, sp, #0xc str r0, [r3] - ldr r3, _021D99E8 ; =0x021DBAFC + ldr r3, _021D99E8 ; =MOD63_021DBAFC ldmia r3!, {r0, r1} stmia r2!, {r0, r1} ldr r0, [r3] @@ -4585,8 +4585,8 @@ _021D99BE: add sp, #0x3c pop {r4, r5, r6, r7, pc} .align 2, 0 -_021D99E4: .word 0x021DBD4C -_021D99E8: .word 0x021DBAFC +_021D99E4: .word MOD63_021DBD4C +_021D99E8: .word MOD63_021DBAFC thumb_func_end MOD63_021D9980 thumb_func_start MOD63_021D99EC @@ -5268,7 +5268,7 @@ _021D9F70: ldr r0, _021DA078 ; =0x000004AB cmp r5, r0 bne _021DA074 - ldr r5, _021DA084 ; =0x021DBAD8 + ldr r5, _021DA084 ; =MOD63_021DBAD8 add r3, sp, #0x38 ldmia r5!, {r0, r1} add r2, r3, #0 @@ -5283,9 +5283,9 @@ _021D9F70: ldr r3, _021DA07C ; =0x000005C1 str r0, [sp, #8] add r0, r2, #0 - ldr r2, _021DA08C ; =0x021DBB80 + ldr r2, _021DA08C ; =MOD63_021DBB80 bl FUN_0201ECA8 - ldr r5, _021DA090 ; =0x021DBB20 + ldr r5, _021DA090 ; =MOD63_021DBB20 add r3, sp, #0x2c ldmia r5!, {r0, r1} add r2, r3, #0 @@ -5295,7 +5295,7 @@ _021D9F70: ldr r1, [r4, #0x44] add r0, r2, #0 bl FUN_0201EF70 - ldr r2, _021DA094 ; =0x021DBAC8 + ldr r2, _021DA094 ; =MOD63_021DBAC8 add r1, sp, #0xc ldrh r3, [r2] add r0, sp, #0xc @@ -5324,7 +5324,7 @@ _021D9FE2: ldr r3, _021DA098 ; =0x0000057D cmp r5, r3 bne _021DA074 - ldr r6, _021DA09C ; =0x021DBB14 + ldr r6, _021DA09C ; =MOD63_021DBB14 add r5, sp, #0x20 ldmia r6!, {r0, r1} add r2, r5, #0 @@ -5339,12 +5339,12 @@ _021D9FE2: add r3, #0x44 str r0, [sp, #8] add r0, r2, #0 - ldr r2, _021DA08C ; =0x021DBB80 + ldr r2, _021DA08C ; =MOD63_021DBB80 bl FUN_0201ECA8 ldr r0, _021DA07C ; =0x000005C1 ldr r1, [r4, #0x44] bl FUN_0201EEF0 - ldr r5, _021DA0A0 ; =0x021DBAF0 + ldr r5, _021DA0A0 ; =MOD63_021DBAF0 add r3, sp, #0x14 ldmia r5!, {r0, r1} add r2, r3, #0 @@ -5386,14 +5386,14 @@ _021DA074: _021DA078: .word 0x000004AB _021DA07C: .word 0x000005C1 _021DA080: .word 0x0000FFE0 -_021DA084: .word 0x021DBAD8 +_021DA084: .word MOD63_021DBAD8 _021DA088: .word 0x0029AEC1 -_021DA08C: .word 0x021DBB80 -_021DA090: .word 0x021DBB20 -_021DA094: .word 0x021DBAC8 +_021DA08C: .word MOD63_021DBB80 +_021DA090: .word MOD63_021DBB20 +_021DA094: .word MOD63_021DBAC8 _021DA098: .word 0x0000057D -_021DA09C: .word 0x021DBB14 -_021DA0A0: .word 0x021DBAF0 +_021DA09C: .word MOD63_021DBB14 +_021DA0A0: .word MOD63_021DBAF0 _021DA0A4: .word 0x00000618 thumb_func_end MOD63_021D9F38 @@ -6020,14 +6020,14 @@ MOD63_021DA5A0: ; 0x021DA5A0 cmp r0, #0 beq _021DA630 ldrb r3, [r4, #1] - ldr r0, _021DA634 ; =0x021DBF40 + ldr r0, _021DA634 ; =MOD63_021DBF40 ldrb r1, [r4, #3] ldrb r0, [r0, r3] cmp r1, r0 blo _021DA614 mov r1, #0 str r1, [sp] - ldr r6, _021DA638 ; =0x021DBF48 + ldr r6, _021DA638 ; =MOD63_021DBF48 ldr r0, [r5, #0x14] ldrb r3, [r6, r3] mov r2, #1 @@ -6037,7 +6037,7 @@ MOD63_021DA5A0: ; 0x021DA5A0 mov r0, #0x20 str r0, [sp] ldrb r6, [r4, #1] - ldr r3, _021DA63C ; =0x021DBF44 + ldr r3, _021DA63C ; =MOD63_021DBF44 ldr r0, [r5, #0x14] ldrb r3, [r3, r6] mov r1, #0 @@ -6050,7 +6050,7 @@ MOD63_021DA5A0: ; 0x021DA5A0 ldr r0, [r5, #0x14] mov r1, #1 ldrb r5, [r4, #1] - ldr r3, _021DA63C ; =0x021DBF44 + ldr r3, _021DA63C ; =MOD63_021DBF44 add r2, r1, #0 ldrb r3, [r3, r5] lsl r3, r3, #0x1c @@ -6073,7 +6073,7 @@ _021DA618: ldrb r0, [r4, #1] cmp r0, #0 bne _021DA630 - ldr r0, _021DA634 ; =0x021DBF40 + ldr r0, _021DA634 ; =MOD63_021DBF40 ldrb r1, [r4, #3] ldrb r0, [r0] cmp r1, r0 @@ -6085,16 +6085,16 @@ _021DA630: add sp, #4 pop {r3, r4, r5, r6, pc} .align 2, 0 -_021DA634: .word 0x021DBF40 -_021DA638: .word 0x021DBF48 -_021DA63C: .word 0x021DBF44 +_021DA634: .word MOD63_021DBF40 +_021DA638: .word MOD63_021DBF48 +_021DA63C: .word MOD63_021DBF44 thumb_func_end MOD63_021DA5A0 thumb_func_start MOD63_021DA640 MOD63_021DA640: ; 0x021DA640 push {r4, lr} sub sp, #0x10 - ldr r4, _021DA66C ; =0x021DBE4C + ldr r4, _021DA66C ; =MOD63_021DBE4C add r3, sp, #0 add r2, r3, #0 ldmia r4!, {r0, r1} @@ -6111,7 +6111,7 @@ MOD63_021DA640: ; 0x021DA640 add sp, #0x10 pop {r4, pc} .align 2, 0 -_021DA66C: .word 0x021DBE4C +_021DA66C: .word MOD63_021DBE4C thumb_func_end MOD63_021DA640 thumb_func_start MOD63_021DA670 @@ -6217,7 +6217,7 @@ MOD63_021DA6E8: ; 0x021DA6E8 mov r1, #0 lsl r2, r2, #0x14 bl FUN_02008D24 - ldr r4, _021DAA00 ; =0x021DBE28 + ldr r4, _021DAA00 ; =MOD63_021DBE28 mov r7, #0 add r6, r5, #0 _021DA73C: @@ -6552,7 +6552,7 @@ _021DA9DC: pop {r4, r5, r6, r7, pc} .align 2, 0 _021DA9FC: .word 0xFFCFFFEF -_021DAA00: .word 0x021DBE28 +_021DAA00: .word MOD63_021DBE28 thumb_func_end MOD63_021DA6E8 thumb_func_start MOD63_021DAA04 @@ -6602,7 +6602,7 @@ _021DAA32: MOD63_021DAA5C: ; 0x021DAA5C push {r4, r5, r6, r7, lr} sub sp, #0xa4 - ldr r3, _021DABC0 ; =0x021DBE5C + ldr r3, _021DABC0 ; =MOD63_021DBE5C add r5, r0, #0 ldmia r3!, {r0, r1} add r2, sp, #0x38 @@ -6611,7 +6611,7 @@ MOD63_021DAA5C: ; 0x021DAA5C stmia r2!, {r0, r1} ldmia r3!, {r0, r1} stmia r2!, {r0, r1} - ldr r3, _021DABC4 ; =0x021DBE74 + ldr r3, _021DABC4 ; =MOD63_021DBE74 add r2, sp, #0x20 ldmia r3!, {r0, r1} stmia r2!, {r0, r1} @@ -6619,7 +6619,7 @@ MOD63_021DAA5C: ; 0x021DAA5C stmia r2!, {r0, r1} ldmia r3!, {r0, r1} stmia r2!, {r0, r1} - ldr r3, _021DABC8 ; =0x021DBE8C + ldr r3, _021DABC8 ; =MOD63_021DBE8C add r2, sp, #8 ldmia r3!, {r0, r1} stmia r2!, {r0, r1} @@ -6762,9 +6762,9 @@ _021DAB58: add sp, #0xa4 pop {r4, r5, r6, r7, pc} nop -_021DABC0: .word 0x021DBE5C -_021DABC4: .word 0x021DBE74 -_021DABC8: .word 0x021DBE8C +_021DABC0: .word MOD63_021DBE5C +_021DABC4: .word MOD63_021DBE74 +_021DABC8: .word MOD63_021DBE8C thumb_func_end MOD63_021DAA5C thumb_func_start MOD63_021DABCC @@ -6967,13 +6967,13 @@ MOD63_021DAD18: ; 0x021DAD18 add r7, r0, #0 cmp r6, #0 bne _021DAD44 - ldr r0, _021DAD64 ; =0x021DBFA0 + ldr r0, _021DAD64 ; =MOD63_021DBFA0 add r1, r7, #0 mov r2, #0x20 bl GX_LoadOBJPltt pop {r3, r4, r5, r6, r7, pc} _021DAD44: - ldr r0, _021DAD68 ; =0x021DBF64 + ldr r0, _021DAD68 ; =MOD63_021DBF64 ldr r0, [r0, r4] lsl r0, r0, #4 add r1, r5, r0 @@ -6987,15 +6987,15 @@ _021DAD44: bl GX_LoadOBJPltt pop {r3, r4, r5, r6, r7, pc} nop -_021DAD64: .word 0x021DBFA0 -_021DAD68: .word 0x021DBF64 +_021DAD64: .word MOD63_021DBFA0 +_021DAD68: .word MOD63_021DBF64 thumb_func_end MOD63_021DAD18 thumb_func_start MOD63_021DAD6C MOD63_021DAD6C: ; 0x021DAD6C push {r3, r4, r5, r6, r7, lr} sub sp, #0x30 - ldr r3, _021DAE44 ; =0x021DBE40 + ldr r3, _021DAE44 ; =MOD63_021DBE40 add r2, sp, #0x18 str r0, [sp] str r1, [sp, #4] @@ -7003,7 +7003,7 @@ MOD63_021DAD6C: ; 0x021DAD6C str r2, [sp, #8] stmia r2!, {r0, r1} ldr r0, [r3] - ldr r3, _021DAE48 ; =0x021DBE34 + ldr r3, _021DAE48 ; =MOD63_021DBE34 str r0, [r2] ldmia r3!, {r0, r1} add r2, sp, #0xc @@ -7033,7 +7033,7 @@ _021DAD98: stmia r3!, {r0, r1} ldr r0, [r6] str r0, [r3] - ldr r0, _021DAE50 ; =0x021DBF4C + ldr r0, _021DAE50 ; =MOD63_021DBF4C ldr r1, [sp, #0x24] ldr r0, [r0, r7] sub r0, r1, r0 @@ -7077,7 +7077,7 @@ _021DADF0: stmia r3!, {r0, r1} ldr r0, [r6] str r0, [r3] - ldr r0, _021DAE58 ; =0x021DBF58 + ldr r0, _021DAE58 ; =MOD63_021DBF58 ldr r1, [sp, #0x24] ldr r0, [r0, r7] sub r0, r1, r0 @@ -7101,19 +7101,19 @@ _021DAE3E: add sp, #0x30 pop {r3, r4, r5, r6, r7, pc} nop -_021DAE44: .word 0x021DBE40 -_021DAE48: .word 0x021DBE34 +_021DAE44: .word MOD63_021DBE40 +_021DAE48: .word MOD63_021DBE34 _021DAE4C: .word 0x000005C8 -_021DAE50: .word 0x021DBF4C +_021DAE50: .word MOD63_021DBF4C _021DAE54: .word 0x000005E6 -_021DAE58: .word 0x021DBF58 +_021DAE58: .word MOD63_021DBF58 thumb_func_end MOD63_021DAD6C thumb_func_start MOD63_021DAE5C MOD63_021DAE5C: ; 0x021DAE5C push {r4, lr} sub sp, #0x10 - ldr r4, _021DAE88 ; =0x021DBEAC + ldr r4, _021DAE88 ; =MOD63_021DBEAC add r3, sp, #0 add r2, r3, #0 ldmia r4!, {r0, r1} @@ -7130,7 +7130,7 @@ MOD63_021DAE5C: ; 0x021DAE5C add sp, #0x10 pop {r4, pc} .align 2, 0 -_021DAE88: .word 0x021DBEAC +_021DAE88: .word MOD63_021DBEAC thumb_func_end MOD63_021DAE5C thumb_func_start MOD63_021DAE8C @@ -7361,7 +7361,7 @@ MOD63_021DAFEC: ; 0x021DAFEC add r1, r7, #4 mov r2, #0x4c bl FUN_02008C9C - ldr r4, _021DB104 ; =0x021DBEBC + ldr r4, _021DB104 ; =MOD63_021DBEBC str r0, [r7] mov r6, #0 add r5, r7, #0 @@ -7453,7 +7453,7 @@ _021DB040: nop _021DB0FC: .word 0xFFCFFFEF _021DB100: .word 0x04001000 -_021DB104: .word 0x021DBEBC +_021DB104: .word MOD63_021DBEBC thumb_func_end MOD63_021DAFEC thumb_func_start MOD63_021DB108 @@ -7938,7 +7938,7 @@ MOD63_021DB498: ; 0x021DB498 MOD63_021DB49C: ; 0x021DB49C push {r4, r5, r6, r7, lr} sub sp, #0x2c - ldr r3, _021DB56C ; =0x021DBECC + ldr r3, _021DB56C ; =MOD63_021DBECC add r5, r0, #0 ldmia r3!, {r0, r1} add r2, sp, #0x10 @@ -7947,7 +7947,7 @@ MOD63_021DB49C: ; 0x021DB49C str r0, [r2] mov r0, #0x4c bl FUN_02006D98 - ldr r7, _021DB570 ; =0x021DBEF0 + ldr r7, _021DB570 ; =MOD63_021DBEF0 str r0, [r5] mov r4, #0 _021DB4BA: @@ -8029,8 +8029,8 @@ _021DB4BA: add sp, #0x2c pop {r4, r5, r6, r7, pc} nop -_021DB56C: .word 0x021DBECC -_021DB570: .word 0x021DBEF0 +_021DB56C: .word MOD63_021DBECC +_021DB570: .word MOD63_021DBEF0 _021DB574: .word 0x000003FF _021DB578: .word MOD63_021DB450 _021DB57C: .word MOD63_021DB474 @@ -8138,7 +8138,7 @@ _021DB5FA: add r0, r0, #1 strb r0, [r5] _021DB63C: - ldr r2, _021DB708 ; =0x021DBED8 + ldr r2, _021DB708 ; =MOD63_021DBED8 lsl r3, r6, #3 ldr r2, [r2, r3] add r0, r4, #0 @@ -8158,7 +8158,7 @@ _021DB658: bl FUN_02013440 lsl r0, r6, #2 str r0, [sp, #4] - ldr r1, _021DB70C ; =0x021DBF08 + ldr r1, _021DB70C ; =MOD63_021DBF08 lsl r6, r6, #3 ldr r3, [sp, #4] add r7, r4, #4 @@ -8167,7 +8167,7 @@ _021DB658: ldr r2, _021DB710 ; =MOD63_021DB940 ldr r3, [r7, r3] bl FUN_020133AC - ldr r1, _021DB714 ; =0x021DBF0C + ldr r1, _021DB714 ; =MOD63_021DBF0C ldr r3, [sp, #4] ldr r0, [r4, #0x18] ldr r1, [r1, r6] @@ -8183,7 +8183,7 @@ _021DB690: bl FUN_020133C8 cmp r0, #0 bne _021DB6FC - ldr r0, _021DB718 ; =0x021DBEC0 + ldr r0, _021DB718 ; =MOD63_021DBEC0 lsl r1, r6, #2 ldr r0, [r0, r1] cmp r7, r0 @@ -8202,7 +8202,7 @@ _021DB690: strb r0, [r5] b _021DB6FC _021DB6BE: - ldr r2, _021DB71C ; =0x021DBEDC + ldr r2, _021DB71C ; =MOD63_021DBEDC lsl r3, r6, #3 ldr r2, [r2, r3] blx r2 @@ -8239,12 +8239,12 @@ _021DB6FC: pop {r3, r4, r5, r6, r7, pc} nop _021DB704: .word 0x0400004A -_021DB708: .word 0x021DBED8 -_021DB70C: .word 0x021DBF08 +_021DB708: .word MOD63_021DBED8 +_021DB70C: .word MOD63_021DBF08 _021DB710: .word MOD63_021DB940 -_021DB714: .word 0x021DBF0C -_021DB718: .word 0x021DBEC0 -_021DB71C: .word 0x021DBEDC +_021DB714: .word MOD63_021DBF0C +_021DB718: .word MOD63_021DBEC0 +_021DB71C: .word MOD63_021DBEDC thumb_func_end MOD63_021DB5CC thumb_func_start MOD63_021DB720 @@ -8571,116 +8571,370 @@ 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 - .global UNK63_021DBAB8 -UNK63_021DBAB8: ; 0x021DBAB8 + .global MOD63_021DBAB8 +MOD63_021DBAB8: ; 0x021DBAB8 .word MOD63_021D74E0, MOD63_021D759C, MOD63_021D77B4, 0xFFFFFFFF - ; 0x021DBAC8 + .global MOD63_021DBAC8 +MOD63_021DBAC8: ; 0x021DBAC8 .byte 0x00, 0x00, 0x80, 0xF6, 0x00, 0x00, 0x00, 0x00 - .byte 0x18, 0x4B, 0x00, 0x00, 0x42, 0x30, 0xFF, 0x7F, 0x00, 0x00, 0xF8, 0xFF, 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0xE4, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00 - .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 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 + + .global MOD63_021DBAD0 +MOD63_021DBAD0: ; 0x021DBAD0 + .byte 0x18, 0x4B, 0x00, 0x00, 0x42, 0x30, 0xFF, 0x7F + + .global MOD63_021DBAD8 +MOD63_021DBAD8: ; 0x021DBAD8 + .byte 0x00, 0x00, 0xF8, 0xFF, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0xE4, 0xFF + + .global MOD63_021DBAE4 +MOD63_021DBAE4: ; 0x021DBAE4 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00 + + .global MOD63_021DBAF0 +MOD63_021DBAF0: ; 0x021DBAF0 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00 + + .global MOD63_021DBAFC +MOD63_021DBAFC: ; 0x021DBAFC + .byte 0x00, 0x10, 0x00, 0x00 + .byte 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00 + + .global MOD63_021DBB08 +MOD63_021DBB08: ; 0x021DBB08 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + + .global MOD63_021DBB14 +MOD63_021DBB14: ; 0x021DBB14 + .byte 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0xFF + + .global MOD63_021DBB20 +MOD63_021DBB20: ; 0x021DBB20 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00 + + .global MOD63_021DBB2C +MOD63_021DBB2C: ; 0x021DBB2C + .byte 0x1D, 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 + + .global MOD63_021DBB5C +MOD63_021DBB5C: ; 0x021DBB5C + .byte 0x00, 0x00, 0x84, 0x10 + .byte 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10 + + .global MOD63_021DBB6C +MOD63_021DBB6C: ; 0x021DBB6C + .byte 0x01, 0x00, 0x00, 0x00 .byte 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC1, 0xAE, 0x29, 0x00 + + .global MOD63_021DBB80 +MOD63_021DBB80: ; 0x021DBB80 .byte 0x02, 0xD6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC1, 0x05, 0x00, 0x00, 0x00, 0x00 + + .global MOD63_021DBB90 +MOD63_021DBB90: ; 0x021DBB90 .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 0x44, 0x00, 0x00, 0x00, 0x45, 0x00, 0x00, 0x00 + + .global MOD63_021DBBA8 +MOD63_021DBBA8: ; 0x021DBBA8 + .byte 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 + + .global MOD63_021DBBE0 +MOD63_021DBBE0: ; 0x021DBBE0 .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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + + .global MOD63_021DBCF8 +MOD63_021DBCF8: ; 0x021DBCF8 + .byte 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 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + + .global MOD63_021DBD14 +MOD63_021DBD14: ; 0x021DBD14 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x19, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + + .global MOD63_021DBD30 +MOD63_021DBD30: ; 0x021DBD30 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x04, 0x01, 0x1B, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00 + .byte 0x04, 0x01, 0x1B, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + + .global MOD63_021DBD4C +MOD63_021DBD4C: ; 0x021DBD4C + .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_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 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + + .global MOD63_021DBDE8 +MOD63_021DBDE8: ; 0x021DBDE8 + .byte 0x05, 0xF8, 0xFF, 0xFF, 0x24, 0xF2, 0xFF, 0xFF .byte 0x6E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00 - .global MOD63_UNK_021DBE18 -MOD63_UNK_021DBE18: + .global MOD63_021DBE18 +MOD63_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 - .byte 0x05, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x4C, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00 - .byte 0x06, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x01, 0x00, 0x00 + + .global MOD63_021DBE28 +MOD63_021DBE28: ; 0x021DBE28 + .byte 0x05, 0x05, 0x05, 0x05, 0x4C, 0x00, 0x00, 0x00, 0x4C, 0x00, 0x00, 0x00 + + .global MOD63_021DBE34 +MOD63_021DBE34: ; 0x021DBE34 + .byte 0x06, 0x00, 0x00, 0x00 + .byte 0x07, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00 + + .global MOD63_021DBE40 +MOD63_021DBE40: ; 0x021DBE40 + .byte 0x03, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00 + .byte 0x05, 0x00, 0x00, 0x00 + + .global MOD63_021DBE4C +MOD63_021DBE4C: ; 0x021DBE4C + .byte 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x4C, 0x00, 0x00, 0x00 + + .global MOD63_021DBE5C +MOD63_021DBE5C: ; 0x021DBE5C + .byte 0x03, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00 + .byte 0x06, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00 + + .global MOD63_021DBE74 +MOD63_021DBE74: ; 0x021DBE74 + .byte 0x08, 0x01, 0x00, 0x00 .byte 0x20, 0x01, 0x00, 0x00, 0x20, 0x01, 0x00, 0x00, 0xC8, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x00 - .byte 0xE0, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0x00 + .byte 0xE0, 0x00, 0x00, 0x00 + + .global MOD63_021DBE8C +MOD63_021DBE8C: ; 0x021DBE8C + .byte 0x80, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0x00 .byte 0xE0, 0x00, 0x00, 0x00, 0xD0, 0x00, 0x00, 0x00, 0xF0, 0x00, 0x00, 0x00, 0x4C, 0x00, 0x00, 0x00 - .byte 0x4C, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x4C, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x03, 0x07, 0x00, 0x00, 0xCE, 0x07, 0x00, 0x00 - .byte 0xA8, 0x08, 0x00, 0x00, 0x83, 0x01, 0x00, 0x00, 0x86, 0x01, 0x00, 0x00, 0x89, 0x01, 0x00, 0x00 - .byte 0x21, 0xB7, 0x1D, 0x02, 0x85, 0xB7, 0x1D, 0x02, 0xD1, 0xB7, 0x1D, 0x02, 0x39, 0xB8, 0x1D, 0x02 - .byte 0x85, 0xB8, 0x1D, 0x02, 0xE9, 0xB8, 0x1D, 0x02, 0x80, 0x00, 0x00, 0x00, 0xC0, 0x00, 0x00, 0x00 + .byte 0x4C, 0x00, 0x00, 0x00 + + .global MOD63_021DBEAC +MOD63_021DBEAC: ; 0x021DBEAC + .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x4C, 0x00, 0x00, 0x00 + + .global MOD63_021DBEBC +MOD63_021DBEBC: ; 0x021DBEBC + .byte 0x01, 0x01, 0x01, 0x01 + + .global MOD63_021DBEC0 +MOD63_021DBEC0: ; 0x021DBEC0 + .byte 0x03, 0x07, 0x00, 0x00, 0xCE, 0x07, 0x00, 0x00 + .byte 0xA8, 0x08, 0x00, 0x00 + + .global MOD63_021DBECC +MOD63_021DBECC: ; 0x021DBECC + .byte 0x83, 0x01, 0x00, 0x00, 0x86, 0x01, 0x00, 0x00, 0x89, 0x01, 0x00, 0x00 + + .global MOD63_021DBED8 +MOD63_021DBED8: ; 0x021DBED8 + .word MOD63_021DB720 + + .global MOD63_021DBEDC +MOD63_021DBEDC: ; 0x021DBEDC + .word MOD63_021DB784, MOD63_021DB7D0, MOD63_021DB838, MOD63_021DB884 + .word MOD63_021DB8E8 + + .global MOD63_021DBEF0 +MOD63_021DBEF0: ; 0x021DBEF0 + .byte 0x80, 0x00, 0x00, 0x00, 0xC0, 0x00, 0x00, 0x00 .byte 0x00, 0x01, 0x00, 0x00, 0xC0, 0x00, 0x00, 0x00, 0x50, 0x00, 0x00, 0x00, 0xC0, 0x00, 0x00, 0x00 - .byte 0x04, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00 + + .global MOD63_021DBF08 +MOD63_021DBF08: ; 0x021DBF08 + .byte 0x04, 0x00, 0x00, 0x00 + + .global MOD63_021DBF0C +MOD63_021DBF0C: ; 0x021DBF0C + .byte 0x05, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 .section .data - ; 0x021DBF40 - .byte 0x08, 0x06, 0x06, 0x04, 0x05, 0x04, 0x03, 0x01, 0x08, 0x07, 0x06, 0x00, 0x00, 0x60, 0x00, 0x00 - .byte 0x00, 0x58, 0x00, 0x00, 0x00, 0x50, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x50, 0x00, 0x00 - .byte 0x00, 0x58, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00 + + .global MOD63_021DBF40 +MOD63_021DBF40: ; 0x021DBF40 + .byte 0x08, 0x06, 0x06, 0x04 + + .global MOD63_021DBF44 +MOD63_021DBF44: ; 0x021DBF44 + .byte 0x05, 0x04, 0x03, 0x01 + + .global MOD63_021DBF48 +MOD63_021DBF48: ; 0x021DBF48 + .byte 0x08, 0x07, 0x06, 0x00 + + .global MOD63_021DBF4C +MOD63_021DBF4C: ; 0x021DBF4C + .byte 0x00, 0x60, 0x00, 0x00 + .byte 0x00, 0x58, 0x00, 0x00, 0x00, 0x50, 0x00, 0x00 + + .global MOD63_021DBF58 +MOD63_021DBF58: ; 0x021DBF58 + .byte 0x00, 0x40, 0x00, 0x00, 0x00, 0x50, 0x00, 0x00 + .byte 0x00, 0x58, 0x00, 0x00 + + .global MOD63_021DBF64 +MOD63_021DBF64: ; 0x021DBF64 + .byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00 .byte 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x04, 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, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .section .bss - ; 0x021DBFA0 + + .global MOD63_021DBFA0 +MOD63_021DBFA0: ; 0x021DBFA0 .space 0x20 diff --git a/arm9/modules/73/asm/module_73.s b/arm9/modules/73/asm/module_73.s index 08eafb54..8bd45140 100644 --- a/arm9/modules/73/asm/module_73.s +++ b/arm9/modules/73/asm/module_73.s @@ -2230,7 +2230,7 @@ MOD73_021D8630: ; 0x021D8630 bl MOD73_021DAFA8 add r0, r4, #0 bl MOD73_021D8BDC - ldr r0, _021D8758 ; =0x021C4918 + ldr r0, _021D8758 ; =gUnk021C4918 mov r1, #1 strb r1, [r0, #5] bl FUN_0201E7A0 @@ -2245,7 +2245,7 @@ _021D8748: .word 0x0000058C _021D874C: .word 0x0000061C _021D8750: .word 0x00000A84 _021D8754: .word 0x00000B04 -_021D8758: .word 0x021C4918 +_021D8758: .word gUnk021C4918 thumb_func_end MOD73_021D8630 thumb_func_start MOD73_021D875C @@ -2299,7 +2299,7 @@ MOD73_021D875C: ; 0x021D875C bl MOD73_021D8BD0 add r0, r4, #0 bl MOD73_021D8D18 - ldr r0, _021D880C ; =0x021C4918 + ldr r0, _021D880C ; =gUnk021C4918 mov r1, #0 strb r1, [r0, #5] bl FUN_0201E7A0 @@ -2313,7 +2313,7 @@ _021D87FC: .word 0x00000598 _021D8800: .word 0x0000061C _021D8804: .word 0x00000A84 _021D8808: .word 0x00000B04 -_021D880C: .word 0x021C4918 +_021D880C: .word gUnk021C4918 thumb_func_end MOD73_021D875C thumb_func_start MOD73_021D8810 diff --git a/arm9/modules/77/asm/module_77.s b/arm9/modules/77/asm/module_77.s index 02ccc896..4bd5edea 100644 --- a/arm9/modules/77/asm/module_77.s +++ b/arm9/modules/77/asm/module_77.s @@ -39,7 +39,7 @@ MOD77_021D74E0: ; 0x021D74E0 bl memset mov r0, #0x32 str r0, [r5] - ldr r0, _021D75E0 ; =0x020ECAC4 + ldr r0, _021D75E0 ; =gGameLanguage ldrb r0, [r0] cmp r0, #1 bne _021D753E @@ -94,7 +94,7 @@ _021D7540: mov r0, #0 add r1, #0x1c str r0, [r5, r1] - ldr r0, _021D7600 ; =0x021C4918 + ldr r0, _021D7600 ; =gUnk021C4918 mov r1, #1 strb r1, [r0, #5] bl FUN_0201E7A0 @@ -109,7 +109,7 @@ _021D7540: _021D75D4: .word 0xFFFFE0FF _021D75D8: .word 0x04001000 _021D75DC: .word 0x0000C32C -_021D75E0: .word 0x020ECAC4 +_021D75E0: .word gGameLanguage _021D75E4: .word 0x0000C2F0 _021D75E8: .word 0x0000C314 _021D75EC: .word 0x0000C318 @@ -117,7 +117,7 @@ _021D75F0: .word 0x0000C324 _021D75F4: .word 0x0000C010 _021D75F8: .word 0x0000C070 _021D75FC: .word 0x0000C2CC -_021D7600: .word 0x021C4918 +_021D7600: .word gUnk021C4918 thumb_func_end MOD77_021D74E0 thumb_func_start MOD77_021D7604 @@ -832,7 +832,7 @@ MOD77_021D7BAC: ; 0x021D7BAC bl FUN_0200627C add r0, r5, #0 bl FUN_020168D0 - ldr r0, _021D7C20 ; =0x021C4918 + ldr r0, _021D7C20 ; =gUnk021C4918 mov r1, #0 strb r1, [r0, #5] mov r0, #1 @@ -841,7 +841,7 @@ MOD77_021D7BAC: ; 0x021D7BAC _021D7C14: .word 0x0000C2CC _021D7C18: .word 0x0000C070 _021D7C1C: .word 0x0000C010 -_021D7C20: .word 0x021C4918 +_021D7C20: .word gUnk021C4918 thumb_func_end MOD77_021D7BAC thumb_func_start MOD77_021D7C24 diff --git a/arm9/modules/83/asm/module_83.s b/arm9/modules/83/asm/module_83.s index 81c6448f..3937ec87 100644 --- a/arm9/modules/83/asm/module_83.s +++ b/arm9/modules/83/asm/module_83.s @@ -147,7 +147,7 @@ _0222D6BE: cmp r0, #0 beq _0222D6E6 bl MOD83_02236EA8 - ldr r1, _0222D6E8 ; =0x020ECAC4 + ldr r1, _0222D6E8 ; =gGameLanguage ldrb r1, [r1] cmp r1, r0 bne _0222D6E6 @@ -158,7 +158,7 @@ _0222D6BE: _0222D6E6: pop {r3, r4, r5, pc} .align 2, 0 -_0222D6E8: .word 0x020ECAC4 +_0222D6E8: .word gGameLanguage thumb_func_end MOD83_0222D67C thumb_func_start MOD83_0222D6EC @@ -16267,7 +16267,7 @@ _02235512: str r0, [sp, #0x20] ldr r0, [sp, #0x1c] bl MOD83_02237EBC - ldr r2, _0223563C ; =0x021C4918 + ldr r2, _0223563C ; =gUnk021C4918 ldr r1, [sp, #0x20] ldrb r2, [r2, #6] bl MOD83_02235350 @@ -16364,7 +16364,7 @@ _02235602: nop _02235634: .word 0x0000E880 _02235638: .word 0x0000E884 -_0223563C: .word 0x021C4918 +_0223563C: .word gUnk021C4918 _02235640: .word MOD83_022354AC _02235644: .word 0x00012604 thumb_func_end MOD83_022354F0 @@ -17526,7 +17526,7 @@ _02235F48: bl FUN_0201E66C ldr r0, [r4, #0x20] bl MOD83_02235E68 - ldr r0, _02235FB8 ; =0x021C4918 + ldr r0, _02235FB8 ; =gUnk021C4918 mov r1, #1 strb r1, [r0, #5] bl FUN_0201E7A0 @@ -17566,7 +17566,7 @@ _02235F48: pop {r3, r4, r5, pc} .align 2, 0 _02235FB4: .word MOD83_0223A59C -_02235FB8: .word 0x021C4918 +_02235FB8: .word gUnk021C4918 thumb_func_end MOD83_02235F3C thumb_func_start MOD83_02235FBC @@ -17818,7 +17818,7 @@ _02236148: ldr r0, _02236288 ; =0x00000414 str r7, [sp] ldr r0, [r4, r0] - ldr r3, _0223628C ; =0x021C4918 + ldr r3, _0223628C ; =gUnk021C4918 str r0, [sp, #4] ldrb r3, [r3, #6] ldr r0, [sp, #0x14] @@ -17905,7 +17905,7 @@ _02236148: pop {r4, r5, r6, r7, pc} .align 2, 0 _02236288: .word 0x00000414 -_0223628C: .word 0x021C4918 +_0223628C: .word gUnk021C4918 _02236290: .word MOD83_0223B280 _02236294: .word 0x000003D2 thumb_func_end MOD83_022360C8 @@ -18090,7 +18090,7 @@ _022363E2: ldr r0, _02236448 ; =0x0000E88C ldr r0, [r6, r0] bl FUN_020145A8 - ldr r0, _0223644C ; =0x021C4918 + ldr r0, _0223644C ; =gUnk021C4918 mov r1, #0 strb r1, [r0, #5] bl FUN_0201E7A0 @@ -18112,7 +18112,7 @@ _0223643C: .word 0x00000478 _02236440: .word 0x00000488 _02236444: .word 0x00000498 _02236448: .word 0x0000E88C -_0223644C: .word 0x021C4918 +_0223644C: .word gUnk021C4918 thumb_func_end MOD83_02236330 thumb_func_start MOD83_02236450 @@ -22457,7 +22457,7 @@ _022384AE: ldr r1, _022385F0 ; =0x00000182 cmp r0, r1 bne _022384FE - ldr r0, _022385F4 ; =0x021C4918 + ldr r0, _022385F4 ; =gUnk021C4918 ldrb r0, [r0, #6] cmp r0, #5 bhi _022384DE @@ -22512,7 +22512,7 @@ _022384FE: mov r1, #3 mov r2, #0 bl MOD83_02237A10 - ldr r1, _022385F8 ; =0x020ECAC4 + ldr r1, _022385F8 ; =gGameLanguage ldrb r1, [r1] cmp r1, r0 beq _0223853E @@ -22597,8 +22597,8 @@ _0223853E: pop {r3, r4, r5, r6, r7, pc} nop _022385F0: .word 0x00000182 -_022385F4: .word 0x021C4918 -_022385F8: .word 0x020ECAC4 +_022385F4: .word gUnk021C4918 +_022385F8: .word gGameLanguage thumb_func_end MOD83_02237F6C thumb_func_start MOD83_022385FC diff --git a/arm9/src/main.c b/arm9/src/main.c index 3e65666f..45f3eba4 100644 --- a/arm9/src/main.c +++ b/arm9/src/main.c @@ -48,7 +48,7 @@ extern void FUN_020222C4(void); extern void FUN_0200A318(void); extern void FUN_0200E2D8(void); -extern struct Unk21DBE18 MOD63_UNK_021DBE18; +extern struct Unk21DBE18 MOD63_021DBE18; extern struct Unk21DBE18 MOD52_021D76C8; extern u8 SDK_STATIC_BSS_START[]; @@ -88,7 +88,7 @@ THUMB_FUNC void NitroMain(void) { case 0: gBacklightTop.unk1C = 0; - FUN_02000E7C(FS_OVERLAY_ID(MODULE_63), &MOD63_UNK_021DBE18); + FUN_02000E7C(FS_OVERLAY_ID(MODULE_63), &MOD63_021DBE18); break; case 1: gBacklightTop.unk1C = 1; |