diff options
-rw-r--r-- | arm9/modules/08/asm/module_08.s | 269 | ||||
-rw-r--r-- | arm9/modules/16/asm/module_16.s | 10 | ||||
-rw-r--r-- | arm9/modules/17/asm/module_17.s | 4 | ||||
-rw-r--r-- | arm9/modules/18/asm/module_18.s | 22 | ||||
-rw-r--r-- | arm9/modules/20/asm/module_20.s | 6 | ||||
-rw-r--r-- | arm9/modules/64/asm/module_64.s | 12 | ||||
-rw-r--r-- | arm9/modules/69/asm/module_69.s | 14 | ||||
-rw-r--r-- | arm9/modules/73/asm/module_73.s | 14 | ||||
-rw-r--r-- | arm9/modules/77/asm/module_77.s | 16 | ||||
-rw-r--r-- | arm9/modules/81/asm/module_81.s | 16 | ||||
-rw-r--r-- | arm9/modules/84/asm/module_84.s | 8 |
11 files changed, 221 insertions, 170 deletions
diff --git a/arm9/modules/08/asm/module_08.s b/arm9/modules/08/asm/module_08.s index d0fcc19c..d472f0de 100644 --- a/arm9/modules/08/asm/module_08.s +++ b/arm9/modules/08/asm/module_08.s @@ -12587,12 +12587,12 @@ _02217C52: thumb_func_start MOD08_02217C58 MOD08_02217C58: ; 0x02217C58 - ldr r3, _02217C60 ; =0x020C50B8 + ldr r3, _02217C60 ; =FX_Div sub r0, r1, r0 lsl r1, r2, #0xc bx r3 .align 2, 0 -_02217C60: .word 0x020C50B8 +_02217C60: .word FX_Div thumb_func_start MOD08_02217C64 MOD08_02217C64: ; 0x02217C64 @@ -12792,7 +12792,7 @@ _02217DA2: ldr r2, [r4, #0xc] asr r0, r0, #4 lsl r1, r0, #2 - ldr r0, _02217E2C ; =0x020FFA38 + ldr r0, _02217E2C ; =UNK_020FFA38 asr r3, r2, #0x1f ldrsh r0, [r0, r1] asr r1, r0, #0x1f @@ -12813,7 +12813,7 @@ _02217DA2: lsl r0, r0, #1 add r0, r0, #1 lsl r1, r0, #1 - ldr r0, _02217E2C ; =0x020FFA38 + ldr r0, _02217E2C ; =UNK_020FFA38 asr r3, r2, #0x1f ldrsh r0, [r0, r1] asr r1, r0, #0x1f @@ -12834,7 +12834,7 @@ _02217E26: mov r0, #0 pop {r4, pc} nop -_02217E2C: .word 0x020FFA38 +_02217E2C: .word UNK_020FFA38 thumb_func_start MOD08_02217E30 MOD08_02217E30: ; 0x02217E30 @@ -13221,7 +13221,7 @@ _022180CE: lsl r0, r0, #1 add r0, r0, #1 lsl r1, r0, #1 - ldr r0, _0221811C ; =0x020FFA38 + ldr r0, _0221811C ; =UNK_020FFA38 asr r3, r2, #0x1f ldrsh r0, [r0, r1] asr r1, r0, #0x1f @@ -13242,7 +13242,7 @@ _02218116: mov r0, #0 pop {r4, pc} nop -_0221811C: .word 0x020FFA38 +_0221811C: .word UNK_020FFA38 thumb_func_start MOD08_02218120 MOD08_02218120: ; 0x02218120 @@ -22923,7 +22923,7 @@ _0221CDF8: mov r1, #0 bl MOD08_02212498 _0221CE00: - ldr r5, _0221CE38 ; =0x0222D5A0 + ldr r5, _0221CE38 ; =MOD8_0222D5A0 str r0, [r7, #0x2c] mov r6, #0 add r4, r7, #0 @@ -22950,7 +22950,7 @@ _0221CE1C: bl MOD08_0221CD94 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 -_0221CE38: .word 0x0222D5A0 +_0221CE38: .word MOD8_0222D5A0 _0221CE3C: .word MOD08_0221CD94 thumb_func_start MOD08_0221CE40 @@ -33358,11 +33358,11 @@ MOD08_02222418: ; 0x02222418 lsr r0, r0, #0x10 orr r0, r2 mov r2, #3 - ldr r3, _02222434 ; =0x020CE1FC + ldr r3, _02222434 ; =MIi_CpuClear32 lsl r2, r2, #8 bx r3 .align 2, 0 -_02222434: .word 0x020CE1FC +_02222434: .word MIi_CpuClear32 thumb_func_start MOD08_02222438 MOD08_02222438: ; 0x02222438 @@ -38351,7 +38351,7 @@ _02224CA6: mul r0, r1 asr r0, r0, #4 lsl r0, r0, #2 - ldr r1, _02224D70 ; =0x020FFA38 + ldr r1, _02224D70 ; =UNK_020FFA38 str r0, [sp, #0x18] add r1, r1, r0 mov r0, #2 @@ -38371,7 +38371,7 @@ _02224CA6: lsl r0, r1, #4 asr r6, r0, #0x10 mov r2, #3 - ldr r1, _02224D70 ; =0x020FFA38 + ldr r1, _02224D70 ; =UNK_020FFA38 ldr r0, [sp, #0x18] lsl r2, r2, #0x10 ldrsh r0, [r1, r0] @@ -38437,7 +38437,7 @@ _02224D50: pop {r3, r4, r5, r6, r7, pc} nop _02224D6C: .word 0x00001555 -_02224D70: .word 0x020FFA38 +_02224D70: .word UNK_020FFA38 _02224D74: .word 0x00000000 _02224D78: .word MOD08_02224AF4 @@ -39693,7 +39693,7 @@ _022257C6: lsr r0, r0, #0x10 asr r0, r0, #4 lsl r1, r0, #2 - ldr r0, _0222586C ; =0x020FFA38 + ldr r0, _0222586C ; =UNK_020FFA38 ldr r3, [r6, #0x14] ldrsh r0, [r0, r1] lsl r2, r2, #0xc @@ -39762,7 +39762,7 @@ _02225852: add sp, #8 pop {r3, r4, r5, r6, r7, pc} nop -_0222586C: .word 0x020FFA38 +_0222586C: .word UNK_020FFA38 _02225870: .word 0x00000132 _02225874: .word 0x00000000 _02225878: .word 0x00003FFF @@ -40033,7 +40033,7 @@ MOD08_02225A70: ; 0x02225A70 lsr r0, r0, #0x10 asr r0, r0, #4 lsl r1, r0, #2 - ldr r0, _02225B30 ; =0x020FFA38 + ldr r0, _02225B30 ; =UNK_020FFA38 lsl r2, r2, #0xc ldrsh r0, [r0, r1] mov r3, #0 @@ -40096,7 +40096,7 @@ _02225B2A: add sp, #0xc pop {r4, r5, r6, r7, pc} .align 2, 0 -_02225B30: .word 0x020FFA38 +_02225B30: .word UNK_020FFA38 _02225B34: .word 0x00000000 _02225B38: .word 0x45800000 @@ -40407,7 +40407,7 @@ _02225D8C: lsr r0, r0, #0x10 asr r0, r0, #4 lsl r1, r0, #2 - ldr r0, _02225E0C ; =0x020FFA38 + ldr r0, _02225E0C ; =UNK_020FFA38 asr r3, r2, #0x1f ldrsh r0, [r0, r1] asr r1, r0, #0x1f @@ -40459,7 +40459,7 @@ _02225E02: pop {r4, r5, r6, r7, pc} nop _02225E08: .word 0x00000199 -_02225E0C: .word 0x020FFA38 +_02225E0C: .word UNK_020FFA38 _02225E10: .word 0x00000000 thumb_func_start MOD08_02225E14 @@ -49986,38 +49986,89 @@ MOD8_0222A760: ; 0x0222A760 MOD8_0222A780: ; 0x0222A780 .byte 0xCD, 0x75, 0x39, 0x77, 0xAD, 0x49, 0x8C, 0x3D, 0x6A, 0x35, 0x29, 0x29, 0x08, 0x21, 0x42, 0x14 .byte 0x22, 0x10, 0xF0, 0x49, 0x08, 0x21, 0x00, 0x00, 0x8C, 0x31, 0xB5, 0x56, 0xBB, 0x53, 0x0A, 0x39 + + .global MOD8_0222A7A0 +MOD8_0222A7A0: ; 0x0222A7A0 .byte 0xCD, 0x75, 0xFF, 0x7F, 0x90, 0x39, 0x6F, 0x35, 0x4D, 0x2D, 0x4C, 0x29, 0x2B, 0x25, 0x09, 0x04 .byte 0x06, 0x04, 0x74, 0x29, 0x08, 0x21, 0x00, 0x00, 0x8C, 0x31, 0xB5, 0x56, 0xBB, 0x53, 0x0A, 0x39 + + .global MOD8_0222A7C0 +MOD8_0222A7C0: ; 0x0222A7C0 .byte 0xCD, 0x75, 0xFF, 0x7F, 0x75, 0x6D, 0xF1, 0x64, 0x6C, 0x5C, 0x08, 0x50, 0x86, 0x48, 0x00, 0x00 .byte 0x00, 0x00, 0x7A, 0x5A, 0x08, 0x21, 0x00, 0x00, 0x8C, 0x31, 0xB5, 0x56, 0xBB, 0x53, 0x0A, 0x39 + + .global MOD8_0222A7E0 +MOD8_0222A7E0: ; 0x0222A7E0 .byte 0xCD, 0x75, 0xFF, 0x7F, 0x94, 0x7F, 0x51, 0x7B, 0x0D, 0x77, 0xAA, 0x72, 0x67, 0x6E, 0x00, 0x00 .byte 0x00, 0x00, 0xF7, 0x7F, 0x08, 0x21, 0x00, 0x00, 0x8C, 0x31, 0xB5, 0x56, 0xBB, 0x53, 0x0A, 0x39 + + .global MOD8_0222A800 +MOD8_0222A800: ; 0x0222A800 .byte 0xCD, 0x75, 0xFF, 0x7F, 0xFF, 0x7D, 0x9F, 0x71, 0x3E, 0x61, 0xFD, 0x50, 0x9C, 0x40, 0x33, 0x50 .byte 0x4F, 0x3C, 0xDF, 0x7E, 0x08, 0x21, 0x00, 0x00, 0x8C, 0x31, 0xB5, 0x56, 0xBB, 0x53, 0x0A, 0x39 + + .global MOD8_0222A820 +MOD8_0222A820: ; 0x0222A820 .byte 0xCD, 0x75, 0xFF, 0x7F, 0xBF, 0x3F, 0x9F, 0x2B, 0x9F, 0x1B, 0x1C, 0x03, 0x99, 0x02, 0x14, 0x06 .byte 0xB0, 0x05, 0xDF, 0x4F, 0x08, 0x21, 0x00, 0x00, 0x8C, 0x31, 0xB5, 0x56, 0xBB, 0x53, 0x0A, 0x39 + + .global MOD8_0222A840 +MOD8_0222A840: ; 0x0222A840 .byte 0xCD, 0x75, 0xFF, 0x7F, 0xAF, 0x23, 0x6C, 0x1B, 0x09, 0x0F, 0xC6, 0x02, 0x67, 0x02, 0xE6, 0x01 .byte 0x65, 0x05, 0xF5, 0x3B, 0x08, 0x21, 0x00, 0x00, 0x8C, 0x31, 0xB5, 0x56, 0xBB, 0x53, 0x0A, 0x39 + + .global MOD8_0222A860 +MOD8_0222A860: ; 0x0222A860 .byte 0xCD, 0x75, 0xFF, 0x7F, 0x72, 0x7F, 0xE4, 0x7E, 0x64, 0x6A, 0xA0, 0x59, 0x60, 0x49, 0x20, 0x39 .byte 0xC1, 0x28, 0xBA, 0x7F, 0x08, 0x21, 0x00, 0x00, 0x8C, 0x31, 0xB5, 0x56, 0xBB, 0x53, 0x0A, 0x39 + + .global MOD8_0222A880 +MOD8_0222A880: ; 0x0222A880 .byte 0xCD, 0x75, 0xFF, 0x7F, 0xFF, 0x3D, 0x7F, 0x2D, 0xFF, 0x1C, 0x1C, 0x00, 0x19, 0x04, 0x34, 0x08 .byte 0x4C, 0x08, 0x7F, 0x4E, 0x08, 0x21, 0x00, 0x00, 0x8C, 0x31, 0xB5, 0x56, 0xBB, 0x53, 0x0A, 0x39 + + .global MOD8_0222A8A0 +MOD8_0222A8A0: ; 0x0222A8A0 .byte 0xCD, 0x75, 0xFF, 0x7F, 0x7A, 0x5A, 0x17, 0x4E, 0xB5, 0x45, 0x72, 0x3D, 0x30, 0x31, 0xED, 0x28 .byte 0xCB, 0x20, 0xFB, 0x66, 0x08, 0x21, 0x00, 0x00, 0x8C, 0x31, 0xB5, 0x56, 0xBB, 0x53, 0x0A, 0x39 + + .global MOD8_0222A8C0 +MOD8_0222A8C0: ; 0x0222A8C0 .byte 0xCD, 0x75, 0xFF, 0x7F, 0x9D, 0x77, 0x39, 0x67, 0xD6, 0x5A, 0x52, 0x4E, 0xEF, 0x41, 0x8D, 0x35 .byte 0x4A, 0x2D, 0x7B, 0x6F, 0x08, 0x21, 0x00, 0x00, 0x8C, 0x31, 0xB5, 0x56, 0xBB, 0x53, 0x0A, 0x39 + + .global MOD8_0222A8E0 +MOD8_0222A8E0: ; 0x0222A8E0 .byte 0xCD, 0x75, 0xFF, 0x7F, 0xD9, 0x50, 0xD5, 0x48, 0xD2, 0x3C, 0xEE, 0x30, 0xCD, 0x30, 0xAB, 0x24 .byte 0xA9, 0x20, 0xDE, 0x51, 0x08, 0x21, 0x00, 0x00, 0x8C, 0x31, 0xB5, 0x56, 0xBB, 0x53, 0x0A, 0x39 + + .global MOD8_0222A900 +MOD8_0222A900: ; 0x0222A900 .byte 0xCD, 0x75, 0xFF, 0x7F, 0x1C, 0x37, 0xFC, 0x26, 0xDC, 0x1A, 0x59, 0x02, 0xF7, 0x01, 0x92, 0x05 .byte 0x0B, 0x05, 0x5D, 0x4F, 0x08, 0x21, 0x00, 0x00, 0x8C, 0x31, 0xB5, 0x56, 0xBB, 0x53, 0x0A, 0x39 + + .global MOD8_0222A920 +MOD8_0222A920: ; 0x0222A920 .byte 0xCD, 0x75, 0xFF, 0x7F, 0x76, 0x42, 0x35, 0x36, 0x14, 0x2E, 0x90, 0x19, 0x4F, 0x15, 0x0C, 0x15 .byte 0xCA, 0x10, 0x18, 0x5B, 0x08, 0x21, 0x00, 0x00, 0x8C, 0x31, 0xB5, 0x56, 0xBB, 0x53, 0x0A, 0x39 + + .global MOD8_0222A940 +MOD8_0222A940: ; 0x0222A940 .byte 0xCD, 0x75, 0xFF, 0x7F, 0xDE, 0x32, 0x9C, 0x22, 0x3A, 0x12, 0xD8, 0x01, 0x96, 0x01, 0x51, 0x01 .byte 0xED, 0x04, 0x1F, 0x3F, 0x08, 0x21, 0x00, 0x00, 0x8C, 0x31, 0xB5, 0x56, 0xBB, 0x53, 0x0A, 0x39 + + .global MOD8_0222A960 +MOD8_0222A960: ; 0x0222A960 .byte 0xB5, 0x56, 0xFF, 0x7F, 0xFC, 0x7D, 0x5B, 0x7D, 0xDA, 0x7C, 0x16, 0x70, 0x12, 0x64, 0x2E, 0x50 .byte 0x09, 0x3C, 0x1A, 0x7F, 0x08, 0x21, 0x00, 0x00, 0x8C, 0x31, 0xB5, 0x56, 0xBB, 0x53, 0x0A, 0x39 + + .global MOD8_0222A980 +MOD8_0222A980: ; 0x0222A980 .byte 0xCD, 0x75, 0xFF, 0x7F, 0xAF, 0x7E, 0x4A, 0x7E, 0xE6, 0x7D, 0x40, 0x71, 0x40, 0x65, 0x01, 0x51 .byte 0xA2, 0x30, 0xF3, 0x7E, 0x08, 0x21, 0x00, 0x00, 0x8C, 0x31, 0xB5, 0x56, 0xBB, 0x53, 0x0A, 0x39 + + .global MOD8_0222A9A0 +MOD8_0222A9A0: ; 0x0222A9A0 .byte 0xCD, 0x75, 0xFF, 0x7F, 0xDF, 0x3A, 0x9F, 0x2A, 0x5F, 0x1A, 0x9C, 0x01, 0x59, 0x01, 0x14, 0x05 .byte 0xCF, 0x00, 0xDF, 0x43, 0x08, 0x21, 0x00, 0x00, 0x8C, 0x31, 0xB5, 0x56, 0xBB, 0x53, 0x0A, 0x39 .byte 0x27, 0x00, 0x27, 0x00, 0x27, 0x00, 0x27, 0x00, 0x27, 0x00, 0x27, 0x00, 0x27, 0x00, 0x27, 0x00 @@ -50026,11 +50077,11 @@ MOD8_0222A780: ; 0x0222A780 .global MOD8_0222A9E4 MOD8_0222A9E4: ; 0x0222A9E4 - .byte 0x60, 0xA7, 0x22, 0x02, 0xA0, 0xA9, 0x22, 0x02, 0x80, 0xA9, 0x22, 0x02, 0x60, 0xA9, 0x22, 0x02 - .byte 0x40, 0xA9, 0x22, 0x02, 0x20, 0xA9, 0x22, 0x02, 0x00, 0xA9, 0x22, 0x02, 0xE0, 0xA8, 0x22, 0x02 - .byte 0xC0, 0xA8, 0x22, 0x02, 0xA0, 0xA8, 0x22, 0x02, 0x80, 0xA8, 0x22, 0x02, 0x60, 0xA8, 0x22, 0x02 - .byte 0x40, 0xA8, 0x22, 0x02, 0x20, 0xA8, 0x22, 0x02, 0x00, 0xA8, 0x22, 0x02, 0xE0, 0xA7, 0x22, 0x02 - .byte 0xC0, 0xA7, 0x22, 0x02, 0xA0, 0xA7, 0x22, 0x02 + .word MOD8_0222A760, MOD8_0222A9A0, MOD8_0222A980, MOD8_0222A960 + .word MOD8_0222A940, MOD8_0222A920, MOD8_0222A900, MOD8_0222A8E0 + .word MOD8_0222A8C0, MOD8_0222A8A0, MOD8_0222A880, MOD8_0222A860 + .word MOD8_0222A840, MOD8_0222A820, MOD8_0222A800, MOD8_0222A7E0 + .word MOD8_0222A7C0, MOD8_0222A7A0 .global MOD8_0222AA2C MOD8_0222AA2C: ; 0x0222AA2C @@ -50047,8 +50098,8 @@ MOD8_0222AA4C: ; 0x0222AA4C .global MOD8_0222AA64 MOD8_0222AA64: ; 0x0222AA64 - .byte 0x3D, 0x3E, 0x21, 0x02, 0x31, 0x41, 0x21, 0x02, 0x91, 0x44, 0x21, 0x02, 0x3D, 0x3F, 0x21, 0x02 - .byte 0x59, 0x42, 0x21, 0x02, 0x9D, 0x44, 0x21, 0x02 + .word MOD08_02213E3C, MOD08_02214130, MOD08_02214490, MOD08_02213F3C + .word MOD08_02214258, MOD08_0221449C .global MOD8_0222AA7C MOD8_0222AA7C: ; 0x0222AA7C @@ -50067,13 +50118,13 @@ MOD8_0222AAAC: ; 0x0222AAAC .global MOD8_0222AAC4 MOD8_0222AAC4: ; 0x0222AAC4 - .byte 0xB5, 0x25, 0x21, 0x02, 0xB9, 0x25, 0x21, 0x02, 0x15, 0x26, 0x21, 0x02, 0x1D, 0x26, 0x21, 0x02 - .byte 0x25, 0x26, 0x21, 0x02, 0x65, 0x26, 0x21, 0x02 + .word MOD08_022125B4, MOD08_022125B8, MOD08_02212614, MOD08_0221261C + .word MOD08_02212624, MOD08_02212664 .global MOD8_0222AADC MOD8_0222AADC: ; 0x0222AADC - .byte 0x49, 0x45, 0x21, 0x02, 0x4D, 0x45, 0x21, 0x02, 0xBD, 0x48, 0x21, 0x02, 0xD5, 0x48, 0x21, 0x02 - .byte 0x49, 0x45, 0x21, 0x02, 0xF9, 0x45, 0x21, 0x02, 0xD1, 0x46, 0x21, 0x02 + .word MOD08_02214548, MOD08_0221454C, MOD08_022148BC, MOD08_022148D4 + .word MOD08_02214548, MOD08_022145F8, MOD08_022146D0 .global MOD8_0222AAF8 MOD8_0222AAF8: ; 0x0222AAF8 @@ -50113,28 +50164,28 @@ MOD8_0222ABDC: ; 0x0222ABDC .global MOD8_0222AC6C MOD8_0222AC6C: ; 0x0222AC6C - .byte 0xDD, 0x26, 0x21, 0x02, 0xFD, 0x26, 0x21, 0x02, 0x29, 0x29, 0x21, 0x02, 0x69, 0x29, 0x21, 0x02 - .byte 0xB5, 0x29, 0x21, 0x02, 0x3D, 0x4B, 0x21, 0x02, 0xA1, 0x34, 0x21, 0x02, 0xA5, 0x34, 0x21, 0x02 - .byte 0x99, 0x4E, 0x21, 0x02, 0xC9, 0x4E, 0x21, 0x02, 0x31, 0x30, 0x21, 0x02, 0x61, 0x30, 0x21, 0x02 - .byte 0x1D, 0x27, 0x21, 0x02, 0x4D, 0x31, 0x21, 0x02, 0x81, 0x32, 0x21, 0x02, 0xB5, 0x32, 0x21, 0x02 - .byte 0x11, 0x49, 0x21, 0x02, 0x61, 0x49, 0x21, 0x02, 0xB9, 0x49, 0x21, 0x02, 0x0D, 0x4A, 0x21, 0x02 - .byte 0x2D, 0x4A, 0x21, 0x02, 0x4D, 0x4A, 0x21, 0x02, 0x71, 0x4B, 0x21, 0x02, 0xA9, 0x4B, 0x21, 0x02 - .byte 0xC5, 0x4B, 0x21, 0x02, 0x81, 0x4D, 0x21, 0x02, 0xE5, 0x4D, 0x21, 0x02, 0xD1, 0x4E, 0x21, 0x02 - .byte 0x3D, 0x4E, 0x21, 0x02, 0x41, 0x4E, 0x21, 0x02, 0x8D, 0x30, 0x21, 0x02, 0xA9, 0x34, 0x21, 0x02 - .byte 0x31, 0x36, 0x21, 0x02, 0xC5, 0x30, 0x21, 0x02, 0xC9, 0x4A, 0x21, 0x02, 0x65, 0x4C, 0x21, 0x02 - .byte 0xDD, 0x4C, 0x21, 0x02, 0x29, 0x4B, 0x21, 0x02, 0x2D, 0x4B, 0x21, 0x02, 0x31, 0x4B, 0x21, 0x02 - .byte 0x39, 0x3C, 0x21, 0x02, 0x3D, 0x3C, 0x21, 0x02, 0x35, 0x4B, 0x21, 0x02, 0x39, 0x4B, 0x21, 0x02 - .byte 0x55, 0x4B, 0x21, 0x02, 0xED, 0x30, 0x21, 0x02, 0xC5, 0x2B, 0x21, 0x02, 0x59, 0x2C, 0x21, 0x02 - .byte 0xA9, 0x2D, 0x21, 0x02, 0x61, 0x2E, 0x21, 0x02, 0x19, 0x2F, 0x21, 0x02, 0x59, 0x2F, 0x21, 0x02 - .byte 0xAD, 0x2F, 0x21, 0x02, 0x05, 0x30, 0x21, 0x02, 0x39, 0x53, 0x21, 0x02, 0xA9, 0x52, 0x21, 0x02 - .byte 0x59, 0x36, 0x21, 0x02, 0xD1, 0x36, 0x21, 0x02, 0x81, 0x37, 0x21, 0x02, 0xA1, 0x39, 0x21, 0x02 - .byte 0xCD, 0x39, 0x21, 0x02, 0xED, 0x3B, 0x21, 0x02, 0x01, 0x3C, 0x21, 0x02, 0x1D, 0x3C, 0x21, 0x02 - .byte 0x79, 0x31, 0x21, 0x02, 0xB1, 0x52, 0x21, 0x02, 0x0D, 0x53, 0x21, 0x02, 0x3D, 0x27, 0x21, 0x02 - .byte 0xC1, 0x28, 0x21, 0x02, 0x05, 0x29, 0x21, 0x02, 0xBD, 0x31, 0x21, 0x02, 0x19, 0x32, 0x21, 0x02 - .byte 0x41, 0x32, 0x21, 0x02, 0xD5, 0x4E, 0x21, 0x02, 0x71, 0x4F, 0x21, 0x02, 0xB5, 0x4F, 0x21, 0x02 - .byte 0x11, 0x50, 0x21, 0x02, 0x55, 0x50, 0x21, 0x02, 0x99, 0x50, 0x21, 0x02, 0xA5, 0x51, 0x21, 0x02 - .byte 0x59, 0x52, 0x21, 0x02, 0x85, 0x52, 0x21, 0x02, 0x21, 0x3A, 0x21, 0x02, 0xD5, 0x3B, 0x21, 0x02 - .byte 0xA5, 0x26, 0x21, 0x02 + .word MOD08_022126DC, MOD08_022126FC, MOD08_02212928, MOD08_02212968 + .word MOD08_022129B4, MOD08_02214B3C, MOD08_022134A0, MOD08_022134A4 + .word MOD08_02214E98, MOD08_02214EC8, MOD08_02213030, MOD08_02213060 + .word MOD08_0221271C, MOD08_0221314C, MOD08_02213280, MOD08_022132B4 + .word MOD08_02214910, MOD08_02214960, MOD08_022149B8, MOD08_02214A0C + .word MOD08_02214A2C, MOD08_02214A4C, MOD08_02214B70, MOD08_02214BA8 + .word MOD08_02214BC4, MOD08_02214D80, MOD08_02214DE4, MOD08_02214ED0 + .word MOD08_02214E3C, MOD08_02214E40, MOD08_0221308C, MOD08_022134A8 + .word MOD08_02213630, MOD08_022130C4, MOD08_02214AC8, MOD08_02214C64 + .word MOD08_02214CDC, MOD08_02214B28, MOD08_02214B2C, MOD08_02214B30 + .word MOD08_02213C38, MOD08_02213C3C, MOD08_02214B34, MOD08_02214B38 + .word MOD08_02214B54, MOD08_022130EC, MOD08_02212BC4, MOD08_02212C58 + .word MOD08_02212DA8, MOD08_02212E60, MOD08_02212F18, MOD08_02212F58 + .word MOD08_02212FAC, MOD08_02213004, MOD08_02215338, MOD08_022152A8 + .word MOD08_02213658, MOD08_022136D0, MOD08_02213780, MOD08_022139A0 + .word MOD08_022139CC, MOD08_02213BEC, MOD08_02213C00, MOD08_02213C1C + .word MOD08_02213178, MOD08_022152B0, MOD08_0221530C, MOD08_0221273C + .word MOD08_022128C0, MOD08_02212904, MOD08_022131BC, MOD08_02213218 + .word MOD08_02213240, MOD08_02214ED4, MOD08_02214F70, MOD08_02214FB4 + .word MOD08_02215010, MOD08_02215054, MOD08_02215098, MOD08_022151A4 + .word MOD08_02215258, MOD08_02215284, MOD08_02213A20, MOD08_02213BD4 + .word MOD08_022126A4 .global MOD8_0222ADC0 MOD8_0222ADC0: ; 0x0222ADC0 @@ -50214,12 +50265,12 @@ MOD8_0222ADC0: ; 0x0222ADC0 .global MOD8_0222B248 MOD8_0222B248: ; 0x0222B248 - .byte 0xA1, 0x5A, 0x21, 0x02, 0x8D, 0x5B, 0x21, 0x02, 0x45, 0x5C, 0x21, 0x02, 0xE5, 0x5C, 0x21, 0x02 - .byte 0xA1, 0x5C, 0x21, 0x02, 0x15, 0x64, 0x21, 0x02, 0x99, 0x64, 0x21, 0x02, 0x21, 0x64, 0x21, 0x02 - .byte 0x2D, 0x64, 0x21, 0x02, 0x39, 0x64, 0x21, 0x02, 0x45, 0x64, 0x21, 0x02, 0x51, 0x64, 0x21, 0x02 - .byte 0x5D, 0x64, 0x21, 0x02, 0x69, 0x64, 0x21, 0x02, 0x75, 0x64, 0x21, 0x02, 0x81, 0x64, 0x21, 0x02 - .byte 0x8D, 0x64, 0x21, 0x02, 0xCD, 0x71, 0x21, 0x02, 0x45, 0x5E, 0x21, 0x02, 0x75, 0x5D, 0x21, 0x02 - .byte 0xDD, 0x5D, 0x21, 0x02, 0x29, 0x5D, 0x21, 0x02, 0x89, 0x5B, 0x21, 0x02 + .word MOD08_02215AA0, MOD08_02215B8C, MOD08_02215C44, MOD08_02215CE4 + .word MOD08_02215CA0, MOD08_02216414, MOD08_02216498, MOD08_02216420 + .word MOD08_0221642C, MOD08_02216438, MOD08_02216444, MOD08_02216450 + .word MOD08_0221645C, MOD08_02216468, MOD08_02216474, MOD08_02216480 + .word MOD08_0221648C, MOD08_022171CC, MOD08_02215E44, MOD08_02215D74 + .word MOD08_02215DDC, MOD08_02215D28, MOD08_02215B88 .global MOD8_0222B2A4 MOD8_0222B2A4: ; 0x0222B2A4 @@ -50575,10 +50626,10 @@ MOD8_0222C05C: ; 0x0222C05C .global MOD8_0222C204 MOD8_0222C204: ; 0x0222C204 - .byte 0xC9, 0x73, 0x21, 0x02, 0xCD, 0x73, 0x21, 0x02, 0xB1, 0x74, 0x21, 0x02, 0xB5, 0x74, 0x21, 0x02 - .byte 0xB9, 0x74, 0x21, 0x02, 0x81, 0x75, 0x21, 0x02, 0x05, 0x76, 0x21, 0x02, 0x85, 0x76, 0x21, 0x02 - .byte 0xED, 0x76, 0x21, 0x02, 0xF1, 0x76, 0x21, 0x02, 0xF5, 0x76, 0x21, 0x02, 0xF9, 0x76, 0x21, 0x02 - .byte 0xFD, 0x76, 0x21, 0x02, 0x09, 0x78, 0x21, 0x02 + .word MOD08_022173C8, MOD08_022173CC, MOD08_022174B0, MOD08_022174B4 + .word MOD08_022174B8, MOD08_02217580, MOD08_02217604, MOD08_02217684 + .word MOD08_022176EC, MOD08_022176F0, MOD08_022176F4, MOD08_022176F8 + .word MOD08_022176FC, MOD08_02217808 .global MOD8_0222C23C MOD8_0222C23C: ; 0x0222C23C @@ -50595,9 +50646,9 @@ MOD8_0222C278: ; 0x0222C278 .global MOD8_0222C2A8 MOD8_0222C2A8: ; 0x0222C2A8 - .byte 0x05, 0x79, 0x21, 0x02, 0x29, 0x79, 0x21, 0x02, 0x65, 0x79, 0x21, 0x02, 0xA1, 0x79, 0x21, 0x02 - .byte 0xDD, 0x79, 0x21, 0x02, 0x3D, 0x7A, 0x21, 0x02, 0x79, 0x7A, 0x21, 0x02, 0xB5, 0x7A, 0x21, 0x02 - .byte 0xDD, 0x7A, 0x21, 0x02 + .word MOD08_02217904, MOD08_02217928, MOD08_02217964, MOD08_022179A0 + .word MOD08_022179DC, MOD08_02217A3C, MOD08_02217A78, MOD08_02217AB4 + .word MOD08_02217ADC .global MOD8_0222C2CC MOD8_0222C2CC: ; 0x0222C2CC @@ -50612,39 +50663,39 @@ MOD8_0222C2CE: ; 0x0222C2CE .global MOD8_0222C300 MOD8_0222C300: ; 0x0222C300 - .byte 0xCD, 0x8D, 0x21, 0x02, 0xED, 0xD0, 0x21, 0x02, 0xB5, 0x20, 0x22, 0x02, 0xF1, 0xF7, 0x21, 0x02 - .byte 0x29, 0x2F, 0x22, 0x02, 0x4D, 0x32, 0x22, 0x02, 0xE1, 0x34, 0x22, 0x02, 0x8D, 0x38, 0x22, 0x02 - .byte 0x8D, 0x3B, 0x22, 0x02, 0x59, 0x3E, 0x22, 0x02, 0x2D, 0x9A, 0x21, 0x02, 0xB5, 0x45, 0x22, 0x02 - .byte 0x1D, 0x4C, 0x22, 0x02, 0xE5, 0x4E, 0x22, 0x02, 0x91, 0x56, 0x22, 0x02, 0x71, 0x59, 0x22, 0x02 - .byte 0x01, 0x5C, 0x22, 0x02, 0xD9, 0xEE, 0x21, 0x02, 0x1D, 0x62, 0x22, 0x02, 0x45, 0xFA, 0x21, 0x02 - .byte 0xE5, 0xFD, 0x21, 0x02, 0x81, 0x01, 0x22, 0x02, 0x7D, 0x05, 0x22, 0x02, 0xA1, 0x08, 0x22, 0x02 - .byte 0x15, 0x0F, 0x22, 0x02, 0x5D, 0xC4, 0x21, 0x02, 0xD1, 0xC5, 0x21, 0x02, 0x95, 0xC6, 0x21, 0x02 - .byte 0x45, 0xC8, 0x21, 0x02, 0xB9, 0x68, 0x22, 0x02, 0x25, 0x6C, 0x22, 0x02, 0xDD, 0x6A, 0x22, 0x02 - .byte 0xAD, 0x6F, 0x22, 0x02 + .word MOD08_02218DCC, MOD08_0221D0EC, MOD08_022220B4, MOD08_0221F7F0 + .word MOD08_02222F28, MOD08_0222324C, MOD08_022234E0, MOD08_0222388C + .word MOD08_02223B8C, MOD08_02223E58, MOD08_02219A2C, MOD08_022245B4 + .word MOD08_02224C1C, MOD08_02224EE4, MOD08_02225690, MOD08_02225970 + .word MOD08_02225C00, MOD08_0221EED8, MOD08_0222621C, MOD08_0221FA44 + .word MOD08_0221FDE4, MOD08_02220180, MOD08_0222057C, MOD08_022208A0 + .word MOD08_02220F14, MOD08_0221C45C, MOD08_0221C5D0, MOD08_0221C694 + .word MOD08_0221C844, MOD08_022268B8, MOD08_02226C24, MOD08_02226ADC + .word MOD08_02226FAC .global MOD8_0222C384 MOD8_0222C384: ; 0x0222C384 - .byte 0x71, 0x8C, 0x21, 0x02, 0x9D, 0x8C, 0x21, 0x02, 0xED, 0x8C, 0x21, 0x02, 0x39, 0x8D, 0x21, 0x02 - .byte 0xB9, 0x96, 0x21, 0x02, 0x19, 0xD4, 0x21, 0x02, 0xE1, 0xD6, 0x21, 0x02, 0x11, 0xD9, 0x21, 0x02 - .byte 0xF5, 0x19, 0x22, 0x02, 0x69, 0x1C, 0x22, 0x02, 0xE5, 0x97, 0x21, 0x02, 0x49, 0x23, 0x22, 0x02 - .byte 0x55, 0x26, 0x22, 0x02, 0x65, 0xDC, 0x21, 0x02, 0x69, 0xDD, 0x21, 0x02, 0x79, 0xDF, 0x21, 0x02 - .byte 0xCD, 0xE0, 0x21, 0x02, 0xC9, 0x29, 0x22, 0x02, 0x79, 0x2A, 0x22, 0x02, 0x2D, 0xE2, 0x21, 0x02 - .byte 0xC9, 0x2C, 0x22, 0x02, 0x45, 0xE3, 0x21, 0x02, 0x45, 0xE6, 0x21, 0x02, 0x81, 0x36, 0x22, 0x02 - .byte 0x81, 0xE8, 0x21, 0x02, 0xB9, 0x40, 0x22, 0x02, 0x59, 0xE9, 0x21, 0x02, 0x7D, 0xEB, 0x21, 0x02 - .byte 0xB1, 0xEC, 0x21, 0x02, 0xD9, 0x46, 0x22, 0x02, 0xE9, 0x48, 0x22, 0x02, 0x61, 0x42, 0x22, 0x02 - .byte 0xB5, 0x53, 0x22, 0x02, 0xD9, 0x9A, 0x21, 0x02, 0x2D, 0x9C, 0x21, 0x02, 0x6D, 0x9F, 0x21, 0x02 - .byte 0x61, 0x8F, 0x21, 0x02, 0xFD, 0x5E, 0x22, 0x02, 0x19, 0xA4, 0x21, 0x02, 0x15, 0xEE, 0x21, 0x02 - .byte 0xC5, 0xA4, 0x21, 0x02, 0x45, 0x61, 0x22, 0x02, 0xE1, 0xA1, 0x21, 0x02, 0x29, 0x64, 0x22, 0x02 - .byte 0x61, 0x91, 0x21, 0x02, 0x89, 0x94, 0x21, 0x02, 0xD9, 0x64, 0x22, 0x02, 0xE5, 0x66, 0x22, 0x02 - .byte 0x61, 0x68, 0x22, 0x02, 0x25, 0xF2, 0x21, 0x02, 0x6D, 0xA5, 0x21, 0x02, 0x45, 0xA6, 0x21, 0x02 - .byte 0xD1, 0xA7, 0x21, 0x02, 0x7D, 0xAA, 0x21, 0x02, 0xBD, 0xAC, 0x21, 0x02, 0x2D, 0x04, 0x22, 0x02 - .byte 0xF1, 0xAD, 0x21, 0x02, 0x1D, 0xAF, 0x21, 0x02, 0x95, 0x0A, 0x22, 0x02, 0x25, 0x0D, 0x22, 0x02 - .byte 0xB1, 0xB0, 0x21, 0x02, 0x71, 0xB1, 0x21, 0x02, 0x8D, 0xB3, 0x21, 0x02, 0x5D, 0xB4, 0x21, 0x02 - .byte 0xB5, 0xB5, 0x21, 0x02, 0xD9, 0xBD, 0x21, 0x02, 0x05, 0xC1, 0x21, 0x02, 0xE9, 0xB8, 0x21, 0x02 - .byte 0xC1, 0xBA, 0x21, 0x02, 0xB9, 0xBB, 0x21, 0x02, 0x35, 0x12, 0x22, 0x02, 0x7D, 0x15, 0x22, 0x02 - .byte 0xBD, 0xC2, 0x21, 0x02, 0x0D, 0xBF, 0x21, 0x02, 0x89, 0xC8, 0x21, 0x02, 0x79, 0xCB, 0x21, 0x02 - .byte 0xC5, 0xCE, 0x21, 0x02, 0x65, 0xB2, 0x21, 0x02, 0xD5, 0xCD, 0x21, 0x02, 0x71, 0x18, 0x22, 0x02 - .byte 0xB9, 0x73, 0x22, 0x02, 0xE5, 0x73, 0x22, 0x02, 0x11, 0x74, 0x22, 0x02, 0x3D, 0x74, 0x22, 0x02 + .word MOD08_02218C70, MOD08_02218C9C, MOD08_02218CEC, MOD08_02218D38 + .word MOD08_022196B8, MOD08_0221D418, MOD08_0221D6E0, MOD08_0221D910 + .word MOD08_022219F4, MOD08_02221C68, MOD08_022197E4, MOD08_02222348 + .word MOD08_02222654, MOD08_0221DC64, MOD08_0221DD68, MOD08_0221DF78 + .word MOD08_0221E0CC, MOD08_022229C8, MOD08_02222A78, MOD08_0221E22C + .word MOD08_02222CC8, MOD08_0221E344, MOD08_0221E644, MOD08_02223680 + .word MOD08_0221E880, MOD08_022240B8, MOD08_0221E958, MOD08_0221EB7C + .word MOD08_0221ECB0, MOD08_022246D8, MOD08_022248E8, MOD08_02224260 + .word MOD08_022253B4, MOD08_02219AD8, MOD08_02219C2C, MOD08_02219F6C + .word MOD08_02218F60, MOD08_02225EFC, MOD08_0221A418, MOD08_0221EE14 + .word MOD08_0221A4C4, MOD08_02226144, MOD08_0221A1E0, MOD08_02226428 + .word MOD08_02219160, MOD08_02219488, MOD08_022264D8, MOD08_022266E4 + .word MOD08_02226860, MOD08_0221F224, MOD08_0221A56C, MOD08_0221A644 + .word MOD08_0221A7D0, MOD08_0221AA7C, MOD08_0221ACBC, MOD08_0222042C + .word MOD08_0221ADF0, MOD08_0221AF1C, MOD08_02220A94, MOD08_02220D24 + .word MOD08_0221B0B0, MOD08_0221B170, MOD08_0221B38C, MOD08_0221B45C + .word MOD08_0221B5B4, MOD08_0221BDD8, MOD08_0221C104, MOD08_0221B8E8 + .word MOD08_0221BAC0, MOD08_0221BBB8, MOD08_02221234, MOD08_0222157C + .word MOD08_0221C2BC, MOD08_0221BF0C, MOD08_0221C888, MOD08_0221CB78 + .word MOD08_0221CEC4, MOD08_0221B264, MOD08_0221CDD4, MOD08_02221870 + .word MOD08_022273B8, MOD08_022273E4, MOD08_02227410, MOD08_0222743C .global MOD8_0222C4D4 MOD8_0222C4D4: ; 0x0222C4D4 @@ -51036,13 +51087,13 @@ MOD8_0222D004: ; 0x0222D004 .global MOD8_0222D01C MOD8_0222D01C: ; 0x0222D01C - .byte 0x15, 0x91, 0x22, 0x02, 0xD5, 0x93, 0x22, 0x02, 0xF9, 0x97, 0x22, 0x02, 0x01, 0x91, 0x22, 0x02 - .byte 0x85, 0x98, 0x22, 0x02, 0x65, 0x96, 0x22, 0x02 + .word MOD08_02229114, MOD08_022293D4, MOD08_022297F8, MOD08_02229100 + .word MOD08_02229884, MOD08_02229664 .global MOD8_0222D034 MOD8_0222D034: ; 0x0222D034 - .byte 0x79, 0x89, 0x22, 0x02, 0xA1, 0x89, 0x22, 0x02, 0xC9, 0x89, 0x22, 0x02, 0xF1, 0x89, 0x22, 0x02 - .byte 0x19, 0x8A, 0x22, 0x02, 0x41, 0x8A, 0x22, 0x02, 0x69, 0x8A, 0x22, 0x02, 0x91, 0x8A, 0x22, 0x02 + .word MOD08_02228978, MOD08_022289A0, MOD08_022289C8, MOD08_022289F0 + .word MOD08_02228A18, MOD08_02228A40, MOD08_02228A68, MOD08_02228A90 .byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00 .byte 0x02, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00 @@ -51069,13 +51120,13 @@ MOD8_0222D0D0: ; 0x0222D0D0 .global MOD8_0222D118 MOD8_0222D118: ; 0x0222D118 - .byte 0xE1, 0x8A, 0x22, 0x02, 0xE5, 0x8A, 0x22, 0x02, 0xFD, 0x8A, 0x22, 0x02, 0x09, 0x8B, 0x22, 0x02 - .byte 0xE9, 0x8B, 0x22, 0x02, 0xED, 0x8B, 0x22, 0x02, 0x41, 0x8C, 0x22, 0x02, 0x45, 0x8C, 0x22, 0x02 - .byte 0x51, 0x8C, 0x22, 0x02, 0x5D, 0x8C, 0x22, 0x02, 0x05, 0x8D, 0x22, 0x02, 0x11, 0x8D, 0x22, 0x02 - .byte 0x85, 0x8D, 0x22, 0x02, 0x89, 0x8D, 0x22, 0x02, 0x25, 0x8E, 0x22, 0x02, 0x29, 0x8E, 0x22, 0x02 - .byte 0x49, 0x8E, 0x22, 0x02, 0x55, 0x8E, 0x22, 0x02, 0xED, 0x8E, 0x22, 0x02, 0xF1, 0x8E, 0x22, 0x02 - .byte 0xFD, 0x8E, 0x22, 0x02, 0x09, 0x8F, 0x22, 0x02, 0xF9, 0x8F, 0x22, 0x02, 0xFD, 0x8F, 0x22, 0x02 - .byte 0x61, 0x90, 0x22, 0x02, 0x6D, 0x90, 0x22, 0x02, 0xF1, 0x90, 0x22, 0x02, 0xFD, 0x90, 0x22, 0x02 + .word MOD08_02228AE0, MOD08_02228AE4, MOD08_02228AFC, MOD08_02228B08 + .word MOD08_02228BE8, MOD08_02228BEC, MOD08_02228C40, MOD08_02228C44 + .word MOD08_02228C50, MOD08_02228C5C, MOD08_02228D04, MOD08_02228D10 + .word MOD08_02228D84, MOD08_02228D88, MOD08_02228E24, MOD08_02228E28 + .word MOD08_02228E48, MOD08_02228E54, MOD08_02228EEC, MOD08_02228EF0 + .word MOD08_02228EFC, MOD08_02228F08, MOD08_02228FF8, MOD08_02228FFC + .word MOD08_02229060, MOD08_0222906C, MOD08_022290F0, MOD08_022290FC .byte 0x00, 0x00 .global MOD8_0222D18A @@ -51186,8 +51237,8 @@ MOD8_0222D550: ; 0x0222D550 .byte 0x00, 0xFE, 0x50, 0x01, 0x32, 0x00, 0x00, 0xFE .data - .global MOD8_00000000 -MOD8_00000000: ; 0x00000000 + .global MOD8_0222D5A0 +MOD8_0222D5A0: ; 0x0222D5A0 .byte 0x14, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 diff --git a/arm9/modules/16/asm/module_16.s b/arm9/modules/16/asm/module_16.s index 72471ecd..f74e7e78 100644 --- a/arm9/modules/16/asm/module_16.s +++ b/arm9/modules/16/asm/module_16.s @@ -29023,7 +29023,7 @@ _021E4ACE: lsr r0, r0, #0x10 asr r0, r0, #4 lsl r1, r0, #2 - ldr r0, _021E4B10 ; =0x020FFA38 + ldr r0, _021E4B10 ; =UNK_020FFA38 mov r2, #3 ldrsh r0, [r0, r1] lsl r2, r2, #0x10 @@ -29044,7 +29044,7 @@ _021E4ACE: pop {r3, pc} .align 2, 0 _021E4B0C: .word 0x00007FFF -_021E4B10: .word 0x020FFA38 +_021E4B10: .word UNK_020FFA38 thumb_func_end MOD16_021E4AC0 thumb_func_start MOD16_021E4B14 @@ -49298,7 +49298,7 @@ MOD16_021EE2A4: ; 0x021EE2A4 lsl r4, r0, #1 add r0, r4, #1 lsl r1, r0, #1 - ldr r0, _021EE354 ; =0x020FFA38 + ldr r0, _021EE354 ; =UNK_020FFA38 mov r3, #0 ldrsh r0, [r0, r1] asr r1, r0, #0x1f @@ -49312,7 +49312,7 @@ MOD16_021EE2A4: ; 0x021EE2A4 lsr r5, r2, #0xc orr r5, r0 mov r2, #0xe - ldr r0, _021EE354 ; =0x020FFA38 + ldr r0, _021EE354 ; =UNK_020FFA38 lsl r1, r4, #1 ldrsh r0, [r0, r1] lsl r2, r2, #0xe @@ -49364,7 +49364,7 @@ MOD16_021EE2A4: ; 0x021EE2A4 add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 -_021EE354: .word 0x020FFA38 +_021EE354: .word UNK_020FFA38 thumb_func_end MOD16_021EE2A4 thumb_func_start MOD16_021EE358 diff --git a/arm9/modules/17/asm/module_17.s b/arm9/modules/17/asm/module_17.s index e680ca83..e6c0d81c 100644 --- a/arm9/modules/17/asm/module_17.s +++ b/arm9/modules/17/asm/module_17.s @@ -1055,7 +1055,7 @@ MOD17_021D7C28: ; 0x021D7C28 mov r0, #0 str r0, [r1] ldr r0, [sp] - ldr r1, _021D7CB4 ; =0x020FFA38 + ldr r1, _021D7CB4 ; =UNK_020FFA38 asr r0, r0, #4 lsl r2, r0, #1 lsl r0, r2, #1 @@ -1101,7 +1101,7 @@ _021D7CA0: nop _021D7CAC: .word 0x04000454 _021D7CB0: .word 0x04000470 -_021D7CB4: .word 0x020FFA38 +_021D7CB4: .word UNK_020FFA38 _021D7CB8: .word 0x0400046C _021D7CBC: .word 0x04000448 thumb_func_end MOD17_021D7C28 diff --git a/arm9/modules/18/asm/module_18.s b/arm9/modules/18/asm/module_18.s index 874c8dbf..dc563f4c 100644 --- a/arm9/modules/18/asm/module_18.s +++ b/arm9/modules/18/asm/module_18.s @@ -17178,7 +17178,7 @@ _02241A30: lsl r2, r2, #0xa asr r0, r0, #4 lsl r6, r0, #1 - ldr r0, _02241AAC ; =0x020FFA38 + ldr r0, _02241AAC ; =UNK_020FFA38 lsl r1, r6, #1 ldrsh r0, [r0, r1] mov r3, #0 @@ -17194,7 +17194,7 @@ _02241A30: orr r4, r0 add r0, r6, #1 lsl r1, r0, #1 - ldr r0, _02241AAC ; =0x020FFA38 + ldr r0, _02241AAC ; =UNK_020FFA38 mov r2, #0xa ldrsh r0, [r0, r1] lsl r2, r2, #0xa @@ -17233,7 +17233,7 @@ _02241AA8: add sp, #0x10 pop {r3, r4, r5, r6, r7, pc} .align 2, 0 -_02241AAC: .word 0x020FFA38 +_02241AAC: .word UNK_020FFA38 _02241AB0: .word MOD18_022513A0 thumb_func_end MOD18_02241A04 @@ -17478,7 +17478,7 @@ _02241C70: ldr r2, [sp] asr r0, r0, #4 lsl r1, r0, #2 - ldr r0, _02241D34 ; =0x020FFA38 + ldr r0, _02241D34 ; =UNK_020FFA38 asr r3, r2, #0x1f ldrsh r0, [r0, r1] asr r1, r0, #0x1f @@ -17504,7 +17504,7 @@ _02241C70: lsl r0, r0, #1 add r0, r0, #1 lsl r1, r0, #1 - ldr r0, _02241D34 ; =0x020FFA38 + ldr r0, _02241D34 ; =UNK_020FFA38 ldrsh r0, [r0, r1] asr r1, r0, #0x1f bl _ll_mul @@ -17561,7 +17561,7 @@ _02241D24: .word MOD18_02241AB4 _02241D28: .word MOD18_022513A0 _02241D2C: .word 0x00000B3B _02241D30: .word 0x00000000 -_02241D34: .word 0x020FFA38 +_02241D34: .word UNK_020FFA38 thumb_func_end MOD18_02241AD0 thumb_func_start MOD18_02241D38 @@ -18343,7 +18343,7 @@ MOD18_02242320: ; 0x02242320 ldrh r0, [r2, r1] asr r0, r0, #4 lsl r1, r0, #2 - ldr r0, _022423AC ; =0x020FFA38 + ldr r0, _022423AC ; =UNK_020FFA38 ldrsh r1, [r0, r1] mov r0, #1 lsl r0, r0, #0xc @@ -18373,7 +18373,7 @@ _022423A4: pop {r4, r5, pc} .align 2, 0 _022423A8: .word MOD18_022513A0 -_022423AC: .word 0x020FFA38 +_022423AC: .word UNK_020FFA38 thumb_func_end MOD18_02242320 thumb_func_start MOD18_022423B0 @@ -18529,7 +18529,7 @@ _022424D4: ldrh r0, [r4, #0x1c] asr r0, r0, #4 lsl r1, r0, #2 - ldr r0, _02242594 ; =0x020FFA38 + ldr r0, _02242594 ; =UNK_020FFA38 ldrsh r1, [r0, r1] ldr r0, [r5, #0x48] sub r0, r0, r1 @@ -18538,7 +18538,7 @@ _022424D4: ldr r0, [r5, #0x44] asr r1, r1, #4 lsl r2, r1, #2 - ldr r1, _02242594 ; =0x020FFA38 + ldr r1, _02242594 ; =UNK_020FFA38 add r2, r1, r2 mov r1, #2 ldrsh r1, [r2, r1] @@ -18616,7 +18616,7 @@ _02242584: .word 0x00000000 _02242588: .word MOD18_022500C0 _0224258C: .word 0x00000626 _02242590: .word MOD18_022513A0 -_02242594: .word 0x020FFA38 +_02242594: .word UNK_020FFA38 _02242598: .word 0x0000FFFF thumb_func_end MOD18_022423B0 diff --git a/arm9/modules/20/asm/module_20.s b/arm9/modules/20/asm/module_20.s index ea14dee0..ed1c291d 100644 --- a/arm9/modules/20/asm/module_20.s +++ b/arm9/modules/20/asm/module_20.s @@ -3404,7 +3404,7 @@ _02253CEE: add r0, #0x8c ldrh r2, [r6, #0x10] ldrh r0, [r0] - ldr r1, _02253E58 ; =0x020FFA38 + ldr r1, _02253E58 ; =UNK_020FFA38 add r0, r2, r0 lsl r0, r0, #0x10 lsr r0, r0, #0x10 @@ -3425,7 +3425,7 @@ _02253D20: beq _02253D3E asr r0, r0, #4 lsl r3, r0, #2 - ldr r1, _02253E58 ; =0x020FFA38 + ldr r1, _02253E58 ; =UNK_020FFA38 ldr r0, [r4, #0x6c] add r2, r1, r3 ldrsh r1, [r1, r3] @@ -3574,7 +3574,7 @@ _02253E52: add sp, #0x20 pop {r3, r4, r5, r6, r7, pc} nop -_02253E58: .word 0x020FFA38 +_02253E58: .word UNK_020FFA38 _02253E5C: .word 0xDFFFFFFF _02253E60: .word 0xFFFFF3FF _02253E64: .word 0xFFFF0FFF diff --git a/arm9/modules/64/asm/module_64.s b/arm9/modules/64/asm/module_64.s index 361e1dfa..30ea656a 100644 --- a/arm9/modules/64/asm/module_64.s +++ b/arm9/modules/64/asm/module_64.s @@ -1149,7 +1149,7 @@ MOD64_021D7E34: ; 0x021D7E34 add r0, r4, #0 add r0, #0x90 ldrh r0, [r0] - ldr r3, _021D7ECC ; =0x020FFA38 + ldr r3, _021D7ECC ; =UNK_020FFA38 asr r0, r0, #4 lsl r2, r0, #1 lsl r1, r2, #1 @@ -1166,7 +1166,7 @@ MOD64_021D7E34: ; 0x021D7E34 add r0, r4, #0 add r0, #0x92 ldrh r0, [r0] - ldr r3, _021D7ECC ; =0x020FFA38 + ldr r3, _021D7ECC ; =UNK_020FFA38 asr r0, r0, #4 lsl r2, r0, #1 lsl r1, r2, #1 @@ -1183,7 +1183,7 @@ MOD64_021D7E34: ; 0x021D7E34 add r0, r4, #0 add r0, #0x94 ldrh r0, [r0] - ldr r3, _021D7ECC ; =0x020FFA38 + ldr r3, _021D7ECC ; =UNK_020FFA38 asr r0, r0, #4 lsl r2, r0, #1 lsl r1, r2, #1 @@ -1211,7 +1211,7 @@ _021D7EC8: add sp, #0x48 pop {r4, pc} .align 2, 0 -_021D7ECC: .word 0x020FFA38 +_021D7ECC: .word UNK_020FFA38 thumb_func_end MOD64_021D7E34 thumb_func_start MOD64_021D7ED0 @@ -2795,7 +2795,7 @@ MOD64_021D8A90: ; 0x021D8A90 lsr r0, r0, #0x10 asr r0, r0, #4 lsl r1, r0, #2 - ldr r0, _021D8ADC ; =0x020FFA38 + ldr r0, _021D8ADC ; =UNK_020FFA38 ldr r2, [r4, #4] ldrsh r0, [r0, r1] asr r3, r2, #0x1f @@ -2818,7 +2818,7 @@ MOD64_021D8A90: ; 0x021D8A90 pop {r4, pc} nop _021D8AD8: .word 0x0000FFFF -_021D8ADC: .word 0x020FFA38 +_021D8ADC: .word UNK_020FFA38 thumb_func_end MOD64_021D8A90 thumb_func_start MOD64_021D8AE0 diff --git a/arm9/modules/69/asm/module_69.s b/arm9/modules/69/asm/module_69.s index 2e53bedd..152ad47d 100644 --- a/arm9/modules/69/asm/module_69.s +++ b/arm9/modules/69/asm/module_69.s @@ -3795,10 +3795,10 @@ _0222F408: mov r1, #1 bl G3B_LightVector ldrh r0, [r4, #0x28] - ldr r3, _0222F62C ; =0x020FFA38 + ldr r3, _0222F62C ; =UNK_020FFA38 asr r0, r0, #4 lsl r1, r0, #2 - ldr r0, _0222F62C ; =0x020FFA38 + ldr r0, _0222F62C ; =UNK_020FFA38 add r2, r0, r1 ldrsh r1, [r3, r1] mov r3, #2 @@ -3810,10 +3810,10 @@ _0222F408: add r1, r5, #0 bl MTX_Concat44 ldrh r0, [r4, #0x2a] - ldr r3, _0222F62C ; =0x020FFA38 + ldr r3, _0222F62C ; =UNK_020FFA38 asr r0, r0, #4 lsl r1, r0, #2 - ldr r0, _0222F62C ; =0x020FFA38 + ldr r0, _0222F62C ; =UNK_020FFA38 add r2, r0, r1 ldrsh r1, [r3, r1] mov r3, #2 @@ -3825,10 +3825,10 @@ _0222F408: add r1, r5, #0 bl MTX_Concat44 ldrh r0, [r4, #0x2c] - ldr r3, _0222F62C ; =0x020FFA38 + ldr r3, _0222F62C ; =UNK_020FFA38 asr r0, r0, #4 lsl r1, r0, #2 - ldr r0, _0222F62C ; =0x020FFA38 + ldr r0, _0222F62C ; =UNK_020FFA38 add r2, r0, r1 ldrsh r1, [r3, r1] mov r3, #2 @@ -3950,7 +3950,7 @@ _0222F61C: .word 0x0000019A _0222F620: .word 0x00002D6B _0222F624: .word 0x00000FFF _0222F628: .word 0xFFFFF001 -_0222F62C: .word 0x020FFA38 +_0222F62C: .word UNK_020FFA38 _0222F630: .word 0x00007FFF _0222F634: .word 0x00008D1C _0222F638: .word 0x0000151C diff --git a/arm9/modules/73/asm/module_73.s b/arm9/modules/73/asm/module_73.s index 8bd45140..a83f3eec 100644 --- a/arm9/modules/73/asm/module_73.s +++ b/arm9/modules/73/asm/module_73.s @@ -6738,7 +6738,7 @@ _021DA906: str r0, [sp, #0x6c] asr r0, r0, #0x1f lsl r3, r2, #1 - ldr r1, _021DAAA0 ; =0x020FFA38 + ldr r1, _021DAAA0 ; =UNK_020FFA38 str r0, [sp, #0x70] ldr r0, [sp, #0xa8] ldrsh r6, [r1, r3] @@ -6904,7 +6904,7 @@ _021DA906: pop {r3, r4, r5, r6, r7, pc} nop _021DAA9C: .word MOD73_021DBE7C -_021DAAA0: .word 0x020FFA38 +_021DAAA0: .word UNK_020FFA38 _021DAAA4: .word 0x0000019A thumb_func_end MOD73_021DA8BC @@ -7130,7 +7130,7 @@ _021DABFC: lsl r4, r0, #1 add r0, r4, #1 lsl r1, r0, #1 - ldr r0, _021DAC98 ; =0x020FFA38 + ldr r0, _021DAC98 ; =UNK_020FFA38 add r2, r6, #0 ldrsh r0, [r0, r1] add r3, r7, #0 @@ -7146,7 +7146,7 @@ _021DABFC: lsr r0, r0, #0xc orr r0, r1 str r0, [sp] - ldr r0, _021DAC98 ; =0x020FFA38 + ldr r0, _021DAC98 ; =UNK_020FFA38 lsl r1, r4, #1 ldrsh r0, [r0, r1] add r2, r6, #0 @@ -7177,7 +7177,7 @@ _021DAC94: add sp, #0xc pop {r4, r5, r6, r7, pc} .align 2, 0 -_021DAC98: .word 0x020FFA38 +_021DAC98: .word UNK_020FFA38 thumb_func_end MOD73_021DABD0 thumb_func_start MOD73_021DAC9C @@ -7706,7 +7706,7 @@ MOD73_021DB020: ; 0x021DB020 asr r0, r0, #4 lsl r1, r0, #1 add r0, r1, #1 - ldr r7, _021DB124 ; =0x020FFA38 + ldr r7, _021DB124 ; =UNK_020FFA38 lsl r0, r0, #1 ldrsh r3, [r7, r0] asr r6, r3, #0x1f @@ -7819,7 +7819,7 @@ _021DB112: add sp, #0x1c pop {r4, r5, r6, r7, pc} nop -_021DB124: .word 0x020FFA38 +_021DB124: .word UNK_020FFA38 _021DB128: .word 0x00000000 thumb_func_end MOD73_021DB020 diff --git a/arm9/modules/77/asm/module_77.s b/arm9/modules/77/asm/module_77.s index 4bd5edea..45d5c131 100644 --- a/arm9/modules/77/asm/module_77.s +++ b/arm9/modules/77/asm/module_77.s @@ -2567,7 +2567,7 @@ MOD77_021D8A30: ; 0x021D8A30 sub sp, #0x24 add r4, r1, #0 ldr r1, [r4, #4] - ldr r3, _021D8AA4 ; =0x020FFA38 + ldr r3, _021D8AA4 ; =UNK_020FFA38 lsl r1, r1, #0x10 lsr r1, r1, #0x10 asr r1, r1, #4 @@ -2580,7 +2580,7 @@ MOD77_021D8A30: ; 0x021D8A30 add r5, r0, #0 bl MTX_RotY33_ ldr r0, [r4] - ldr r3, _021D8AA4 ; =0x020FFA38 + ldr r3, _021D8AA4 ; =UNK_020FFA38 lsl r0, r0, #0x10 lsr r0, r0, #0x10 asr r0, r0, #4 @@ -2597,7 +2597,7 @@ MOD77_021D8A30: ; 0x021D8A30 add r2, r5, #0 bl MTX_Concat33 ldr r0, [r4, #8] - ldr r3, _021D8AA4 ; =0x020FFA38 + ldr r3, _021D8AA4 ; =UNK_020FFA38 lsl r0, r0, #0x10 lsr r0, r0, #0x10 asr r0, r0, #4 @@ -2616,7 +2616,7 @@ MOD77_021D8A30: ; 0x021D8A30 add sp, #0x24 pop {r4, r5, pc} nop -_021D8AA4: .word 0x020FFA38 +_021D8AA4: .word UNK_020FFA38 thumb_func_end MOD77_021D8A30 thumb_func_start MOD77_021D8AA8 @@ -2625,7 +2625,7 @@ MOD77_021D8AA8: ; 0x021D8AA8 sub sp, #0x24 add r4, r1, #0 ldr r1, [r4] - ldr r3, _021D8B1C ; =0x020FFA38 + ldr r3, _021D8B1C ; =UNK_020FFA38 lsl r1, r1, #0x10 lsr r1, r1, #0x10 asr r1, r1, #4 @@ -2638,7 +2638,7 @@ MOD77_021D8AA8: ; 0x021D8AA8 add r5, r0, #0 bl MTX_RotY33_ ldr r0, [r4, #4] - ldr r3, _021D8B1C ; =0x020FFA38 + ldr r3, _021D8B1C ; =UNK_020FFA38 neg r0, r0 lsl r0, r0, #0x10 lsr r0, r0, #0x10 @@ -2656,7 +2656,7 @@ MOD77_021D8AA8: ; 0x021D8AA8 add r2, r5, #0 bl MTX_Concat33 ldr r0, [r4, #8] - ldr r3, _021D8B1C ; =0x020FFA38 + ldr r3, _021D8B1C ; =UNK_020FFA38 lsl r0, r0, #0x10 lsr r0, r0, #0x10 asr r0, r0, #4 @@ -2675,7 +2675,7 @@ MOD77_021D8AA8: ; 0x021D8AA8 add sp, #0x24 pop {r4, r5, pc} .align 2, 0 -_021D8B1C: .word 0x020FFA38 +_021D8B1C: .word UNK_020FFA38 thumb_func_end MOD77_021D8AA8 thumb_func_start MOD77_021D8B20 diff --git a/arm9/modules/81/asm/module_81.s b/arm9/modules/81/asm/module_81.s index bf838d07..4f7d4453 100644 --- a/arm9/modules/81/asm/module_81.s +++ b/arm9/modules/81/asm/module_81.s @@ -1520,7 +1520,7 @@ MOD81_02238988: ; 0x02238988 add r0, r4, #0 add r0, #0x80 ldrh r0, [r0] - ldr r3, _02238A34 ; =0x020FFA38 + ldr r3, _02238A34 ; =UNK_020FFA38 asr r0, r0, #4 lsl r2, r0, #1 lsl r1, r2, #1 @@ -1537,7 +1537,7 @@ MOD81_02238988: ; 0x02238988 add r0, r4, #0 add r0, #0x82 ldrh r0, [r0] - ldr r3, _02238A34 ; =0x020FFA38 + ldr r3, _02238A34 ; =UNK_020FFA38 asr r0, r0, #4 lsl r2, r0, #1 lsl r1, r2, #1 @@ -1554,7 +1554,7 @@ MOD81_02238988: ; 0x02238988 add r0, r4, #0 add r0, #0x84 ldrh r0, [r0] - ldr r3, _02238A34 ; =0x020FFA38 + ldr r3, _02238A34 ; =UNK_020FFA38 asr r0, r0, #4 lsl r2, r0, #1 lsl r1, r2, #1 @@ -1591,7 +1591,7 @@ _02238A20: add sp, #0x50 pop {r4, pc} .align 2, 0 -_02238A34: .word 0x020FFA38 +_02238A34: .word UNK_020FFA38 thumb_func_end MOD81_02238988 thumb_func_start MOD81_02238A38 @@ -1806,7 +1806,7 @@ MOD81_02238B8C: ; 0x02238B8C add r0, r4, #0 add r0, #0x80 ldrh r0, [r0] - ldr r3, _02238C3C ; =0x020FFA38 + ldr r3, _02238C3C ; =UNK_020FFA38 asr r0, r0, #4 lsl r2, r0, #1 lsl r1, r2, #1 @@ -1823,7 +1823,7 @@ MOD81_02238B8C: ; 0x02238B8C add r0, r4, #0 add r0, #0x82 ldrh r0, [r0] - ldr r3, _02238C3C ; =0x020FFA38 + ldr r3, _02238C3C ; =UNK_020FFA38 asr r0, r0, #4 lsl r2, r0, #1 lsl r1, r2, #1 @@ -1840,7 +1840,7 @@ MOD81_02238B8C: ; 0x02238B8C add r0, r4, #0 add r0, #0x84 ldrh r0, [r0] - ldr r3, _02238C3C ; =0x020FFA38 + ldr r3, _02238C3C ; =UNK_020FFA38 asr r0, r0, #4 lsl r2, r0, #1 lsl r1, r2, #1 @@ -1876,7 +1876,7 @@ MOD81_02238B8C: ; 0x02238B8C add sp, #0x4c pop {r3, r4, pc} .align 2, 0 -_02238C3C: .word 0x020FFA38 +_02238C3C: .word UNK_020FFA38 thumb_func_end MOD81_02238B8C thumb_func_start MOD81_02238C40 diff --git a/arm9/modules/84/asm/module_84.s b/arm9/modules/84/asm/module_84.s index c01fd84c..b710e7ca 100644 --- a/arm9/modules/84/asm/module_84.s +++ b/arm9/modules/84/asm/module_84.s @@ -1010,7 +1010,7 @@ MOD84_021D7CFC: ; 0x021D7CFC add r0, r4, #0 add r0, #0x94 ldrh r0, [r0] - ldr r3, _021D7DF0 ; =0x020FFA38 + ldr r3, _021D7DF0 ; =UNK_020FFA38 asr r0, r0, #4 lsl r2, r0, #1 lsl r1, r2, #1 @@ -1027,7 +1027,7 @@ MOD84_021D7CFC: ; 0x021D7CFC add r0, r4, #0 add r0, #0x96 ldrh r0, [r0] - ldr r3, _021D7DF0 ; =0x020FFA38 + ldr r3, _021D7DF0 ; =UNK_020FFA38 asr r0, r0, #4 lsl r2, r0, #1 lsl r1, r2, #1 @@ -1044,7 +1044,7 @@ MOD84_021D7CFC: ; 0x021D7CFC add r0, r4, #0 add r0, #0x98 ldrh r0, [r0] - ldr r3, _021D7DF0 ; =0x020FFA38 + ldr r3, _021D7DF0 ; =UNK_020FFA38 asr r0, r0, #4 lsl r2, r0, #1 lsl r1, r2, #1 @@ -1105,7 +1105,7 @@ _021D7DBA: add sp, #0x4c pop {r3, r4, pc} nop -_021D7DF0: .word 0x020FFA38 +_021D7DF0: .word UNK_020FFA38 thumb_func_end MOD84_021D7CFC thumb_func_start MOD84_021D7DF4 |