diff options
| -rw-r--r-- | arm9/asm/unk_02035068.s | 23 | ||||
| -rw-r--r-- | arm9/asm/unk_02089960.s | 4 | ||||
| -rw-r--r-- | arm9/global.inc | 7 | ||||
| -rw-r--r-- | arm9/modules/52/asm/module_52.s | 14 |
4 files changed, 30 insertions, 18 deletions
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_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/global.inc b/arm9/global.inc index 2a8b1bd9..47c24fe9 100644 --- a/arm9/global.inc +++ b/arm9/global.inc @@ -2584,6 +2584,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 @@ -7173,6 +7177,7 @@ .extern MOD81_02237E40 .extern MOD81_02238004 .extern MOD81_02238064 +.extern MOD83_0223A360 .extern MTX_Concat33 .extern MTX_Concat43 .extern MTX_Concat44 @@ -7667,6 +7672,8 @@ .extern UNK05_021F9194 .extern UNK05_021F9494 .extern MOD63_021DBAB8 +.extern UNK_020F2B7C +.extern UNK_020F2B8C .extern UNK_020FB6F8 .extern UNK_020FB704 .extern UNK_020FB710 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 |