diff options
| -rw-r--r-- | arm9/modules/15/asm/module_15.s | 24 | ||||
| -rw-r--r-- | arm9/modules/66/asm/module_66.s | 60 |
2 files changed, 52 insertions, 32 deletions
diff --git a/arm9/modules/15/asm/module_15.s b/arm9/modules/15/asm/module_15.s index 040c4ddb..b8195ed1 100644 --- a/arm9/modules/15/asm/module_15.s +++ b/arm9/modules/15/asm/module_15.s @@ -8589,12 +8589,12 @@ _021DB75C: ldr r0, [r1, #0xc] asr r2, r0, #0xc _021DB760: - ldr r3, _021DB768 ; =0x020C74B8 + ldr r3, _021DB768 ; =G2x_SetBlendBrightness_ ldr r0, _021DB76C ; =0x04000050 ldr r1, [r1] bx r3 .align 2, 0 -_021DB768: .word 0x020C74B8 +_021DB768: .word G2x_SetBlendBrightness_ _021DB76C: .word 0x04000050 thumb_func_start MOD15_021DB770 @@ -8751,11 +8751,11 @@ _021DB868: .word MOD15_021DBA55 .rodata .global MOD15_021DB86C MOD15_021DB86C: ; 0x021DB86C - .byte 0x99, 0x7E, 0x1D, 0x02, 0x51, 0x7F, 0x1D, 0x02 + .word MOD15_021D7E98, MOD15_021D7F50 .global MOD15_021DB874 MOD15_021DB874: ; 0x021DB874 - .byte 0xB1, 0x77, 0x1D, 0x02, 0x91, 0x78, 0x1D, 0x02, 0xC1, 0x79, 0x1D, 0x02 + .word MOD15_021D77B0, MOD15_021D7890, MOD15_021D79C0 .global MOD15_021DB880 MOD15_021DB880: ; 0x021DB880 @@ -8818,14 +8818,14 @@ MOD15_021DB964: ; 0x021DB964 .global MOD15_021DB98C MOD15_021DB98C: ; 0x021DB98C - .byte 0xC1, 0x89, 0x1D, 0x02, 0x59, 0x8B, 0x1D, 0x02, 0xB5, 0x8C, 0x1D, 0x02, 0x05, 0x8D, 0x1D, 0x02 - .byte 0x31, 0x8D, 0x1D, 0x02, 0x75, 0x8D, 0x1D, 0x02, 0xA5, 0x8D, 0x1D, 0x02, 0x29, 0x8F, 0x1D, 0x02 - .byte 0x8D, 0x8F, 0x1D, 0x02, 0x2D, 0x90, 0x1D, 0x02, 0x01, 0x91, 0x1D, 0x02, 0xE1, 0x91, 0x1D, 0x02 - .byte 0xB9, 0x92, 0x1D, 0x02, 0xD9, 0x92, 0x1D, 0x02, 0xF9, 0x92, 0x1D, 0x02, 0x19, 0x93, 0x1D, 0x02 - .byte 0x39, 0x93, 0x1D, 0x02, 0x89, 0x93, 0x1D, 0x02, 0xA5, 0x93, 0x1D, 0x02, 0xF5, 0x93, 0x1D, 0x02 - .byte 0x45, 0x94, 0x1D, 0x02, 0x61, 0x94, 0x1D, 0x02, 0x81, 0x94, 0x1D, 0x02, 0x1D, 0x8E, 0x1D, 0x02 - .byte 0x85, 0x8E, 0x1D, 0x02, 0xC9, 0x94, 0x1D, 0x02, 0xE5, 0x94, 0x1D, 0x02, 0x01, 0x95, 0x1D, 0x02 - .byte 0x1D, 0x95, 0x1D, 0x02 + .word MOD15_021D89C0, MOD15_021D8B58, MOD15_021D8CB4, MOD15_021D8D04 + .word MOD15_021D8D30, MOD15_021D8D74, MOD15_021D8DA4, MOD15_021D8F28 + .word MOD15_021D8F8C, MOD15_021D902C, MOD15_021D9100, MOD15_021D91E0 + .word MOD15_021D92B8, MOD15_021D92D8, MOD15_021D92F8, MOD15_021D9318 + .word MOD15_021D9338, MOD15_021D9388, MOD15_021D93A4, MOD15_021D93F4 + .word MOD15_021D9444, MOD15_021D9460, MOD15_021D9480, MOD15_021D8E1C + .word MOD15_021D8E84, MOD15_021D94C8, MOD15_021D94E4, MOD15_021D9500 + .word MOD15_021D951C .global MOD15_021DBA00 MOD15_021DBA00: ; 0x021DBA00 diff --git a/arm9/modules/66/asm/module_66.s b/arm9/modules/66/asm/module_66.s index f7fff5bf..a489d51f 100644 --- a/arm9/modules/66/asm/module_66.s +++ b/arm9/modules/66/asm/module_66.s @@ -4220,43 +4220,43 @@ MOD66_021D95A0: ; 0x021D95A0 .global MOD66_021D95C8 MOD66_021D95C8: ; 0x021D95C8 - .byte 0xB5, 0x7B, 0x1D, 0x02 + .word MOD66_021D7BB4 .global MOD66_021D95CC MOD66_021D95CC: ; 0x021D95CC - .byte 0x05, 0x7C, 0x1D, 0x02 + .word MOD66_021D7C04 .global MOD66_021D95D0 MOD66_021D95D0: ; 0x021D95D0 - .byte 0xAD, 0x7C, 0x1D, 0x02 + .word MOD66_021D7CAC .global MOD66_021D95D4 MOD66_021D95D4: ; 0x021D95D4 - .byte 0xF9, 0x7C, 0x1D, 0x02 + .word MOD66_021D7CF8 .global MOD66_021D95D8 MOD66_021D95D8: ; 0x021D95D8 - .byte 0x99, 0x7D, 0x1D, 0x02 + .word MOD66_021D7D98 .global MOD66_021D95DC MOD66_021D95DC: ; 0x021D95DC - .byte 0x55, 0x7E, 0x1D, 0x02 + .word MOD66_021D7E54 .global MOD66_021D95E0 MOD66_021D95E0: ; 0x021D95E0 - .byte 0xA1, 0x7E, 0x1D, 0x02 + .word MOD66_021D7EA0 .global MOD66_021D95E4 MOD66_021D95E4: ; 0x021D95E4 - .byte 0xD5, 0x7B, 0x1D, 0x02 + .word MOD66_021D7BD4 .global MOD66_021D95E8 MOD66_021D95E8: ; 0x021D95E8 - .byte 0xB5, 0x7E, 0x1D, 0x02, 0xB5, 0x7B, 0x1D, 0x02, 0x05, 0x7C, 0x1D, 0x02, 0xAD, 0x7C, 0x1D, 0x02 - .byte 0xF9, 0x7C, 0x1D, 0x02, 0xD5, 0x7D, 0x1D, 0x02, 0x55, 0x7E, 0x1D, 0x02, 0xA1, 0x7E, 0x1D, 0x02 - .byte 0xD5, 0x7B, 0x1D, 0x02, 0xB5, 0x7E, 0x1D, 0x02, 0xB5, 0x7B, 0x1D, 0x02, 0x05, 0x7C, 0x1D, 0x02 - .byte 0x25, 0x7D, 0x1D, 0x02, 0x6D, 0x7D, 0x1D, 0x02, 0x2D, 0x7E, 0x1D, 0x02, 0x55, 0x7E, 0x1D, 0x02 - .byte 0xA1, 0x7E, 0x1D, 0x02, 0xD5, 0x7B, 0x1D, 0x02, 0xB5, 0x7E, 0x1D, 0x02 + .word MOD66_021D7EB4, MOD66_021D7BB4, MOD66_021D7C04, MOD66_021D7CAC + .word MOD66_021D7CF8, MOD66_021D7DD4, MOD66_021D7E54, MOD66_021D7EA0 + .word MOD66_021D7BD4, MOD66_021D7EB4, MOD66_021D7BB4, MOD66_021D7C04 + .word MOD66_021D7D24, MOD66_021D7D6C, MOD66_021D7E2C, MOD66_021D7E54 + .word MOD66_021D7EA0, MOD66_021D7BD4, MOD66_021D7EB4 .global MOD66_021D9634 MOD66_021D9634: ; 0x021D9634 @@ -4341,8 +4341,8 @@ MOD66_021D9894: ; 0x021D9894 .global MOD66_021D98A8 MOD66_021D98A8: ; 0x021D98A8 - .byte 0xCC, 0x9A, 0x1D, 0x02, 0xB4, 0x9A, 0x1D, 0x02, 0xFC, 0x9A, 0x1D, 0x02, 0xE4, 0x9A, 0x1D, 0x02 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x9B, 0x1D, 0x02 + .word MOD66_021D9ACC, MOD66_021D9AB4, MOD66_021D9AFC, MOD66_021D9AE4 + .word 0x00000000, 0x00000000, MOD66_021D9B14 .global MOD66_021D98C4 MOD66_021D98C4: ; 0x021D98C4 @@ -4387,13 +4387,33 @@ MOD66_021D990C: ; 0x021D990C .global MOD66_021D9AA0 MOD66_021D9AA0: ; 0x021D9AA0 .byte 0x64, 0x61, 0x74, 0x61, 0x2F, 0x74, 0x6D, 0x61, 0x70, 0x5F, 0x62, 0x6C, 0x6F, 0x63, 0x6B, 0x2E - .byte 0x64, 0x61, 0x74, 0x00, 0x64, 0x61, 0x74, 0x61, 0x2F, 0x74, 0x6D, 0x61, 0x70, 0x6E, 0x5F, 0x70 - .byte 0x61, 0x6C, 0x2E, 0x72, 0x65, 0x73, 0x64, 0x61, 0x74, 0x00, 0x00, 0x00, 0x64, 0x61, 0x74, 0x61 + .byte 0x64, 0x61, 0x74, 0x00 + + .global MOD66_021D9AB4 +MOD66_021D9AB4: ; 0x021D9AB4 + .byte 0x64, 0x61, 0x74, 0x61, 0x2F, 0x74, 0x6D, 0x61, 0x70, 0x6E, 0x5F, 0x70 + .byte 0x61, 0x6C, 0x2E, 0x72, 0x65, 0x73, 0x64, 0x61, 0x74, 0x00, 0x00, 0x00 + + .global MOD66_021D9ACC +MOD66_021D9ACC: ; 0x021D9ACC + .byte 0x64, 0x61, 0x74, 0x61 .byte 0x2F, 0x74, 0x6D, 0x61, 0x70, 0x6E, 0x5F, 0x63, 0x68, 0x72, 0x2E, 0x72, 0x65, 0x73, 0x64, 0x61 - .byte 0x74, 0x00, 0x00, 0x00, 0x64, 0x61, 0x74, 0x61, 0x2F, 0x74, 0x6D, 0x61, 0x70, 0x6E, 0x5F, 0x63 - .byte 0x61, 0x6E, 0x6D, 0x2E, 0x72, 0x65, 0x73, 0x64, 0x61, 0x74, 0x00, 0x00, 0x64, 0x61, 0x74, 0x61 + .byte 0x74, 0x00, 0x00, 0x00 + + .global MOD66_021D9AE4 +MOD66_021D9AE4: ; 0x021D9AE4 + .byte 0x64, 0x61, 0x74, 0x61, 0x2F, 0x74, 0x6D, 0x61, 0x70, 0x6E, 0x5F, 0x63 + .byte 0x61, 0x6E, 0x6D, 0x2E, 0x72, 0x65, 0x73, 0x64, 0x61, 0x74, 0x00, 0x00 + + .global MOD66_021D9AFC +MOD66_021D9AFC: ; 0x021D9AFC + .byte 0x64, 0x61, 0x74, 0x61 .byte 0x2F, 0x74, 0x6D, 0x61, 0x70, 0x6E, 0x5F, 0x63, 0x65, 0x6C, 0x6C, 0x2E, 0x72, 0x65, 0x73, 0x64 - .byte 0x61, 0x74, 0x00, 0x00, 0x64, 0x61, 0x74, 0x61, 0x2F, 0x74, 0x6D, 0x61, 0x70, 0x6E, 0x5F, 0x63 + .byte 0x61, 0x74, 0x00, 0x00 + + .global MOD66_021D9B14 +MOD66_021D9B14: ; 0x021D9B14 + .byte 0x64, 0x61, 0x74, 0x61, 0x2F, 0x74, 0x6D, 0x61, 0x70, 0x6E, 0x5F, 0x63 .byte 0x65, 0x6C, 0x61, 0x63, 0x74, 0x2E, 0x63, 0x6C, 0x64, 0x61, 0x74, 0x00, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 |