diff options
| -rw-r--r-- | arm9/arm9.lsf | 2 | ||||
| -rw-r--r-- | arm9/modules/20/asm/module_20.s | 34 |
2 files changed, 21 insertions, 15 deletions
diff --git a/arm9/arm9.lsf b/arm9/arm9.lsf index b4f2b9ac..bd1cabb4 100644 --- a/arm9/arm9.lsf +++ b/arm9/arm9.lsf @@ -613,12 +613,14 @@ Overlay MODULE_19 Overlay MODULE_20 { + ##Pokétch## After MODULE_06 Object module_20.o } Overlay MODULE_21 { + ##Pokétch## After MODULE_20 Object module_21.o Object module_21_sinit.o diff --git a/arm9/modules/20/asm/module_20.s b/arm9/modules/20/asm/module_20.s index ed1c291d..152de123 100644 --- a/arm9/modules/20/asm/module_20.s +++ b/arm9/modules/20/asm/module_20.s @@ -4572,7 +4572,7 @@ MOD20_022544C4: ; 0x022544C4 .global MOD20_022544CC MOD20_022544CC: ; 0x022544CC - .byte 0x01, 0x26, 0x25, 0x02, 0x89, 0x26, 0x25, 0x02, 0xAD, 0x27, 0x25, 0x02, 0x19, 0x28, 0x25, 0x02 + .word MOD20_02252600, MOD20_02252688, MOD20_022527AC, MOD20_02252818 .global MOD20_022544DC MOD20_022544DC: ; 0x022544DC @@ -4619,18 +4619,22 @@ MOD20_022545EC: ; 0x022545EC .global MOD20_02254644 MOD20_02254644: ; 0x02254644 - .byte 0x00, 0x00, 0x00, 0x00, 0xD1, 0x2E, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 - .byte 0xF1, 0x2F, 0x25, 0x02, 0x04, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0xF1, 0x2F, 0x25, 0x02 - .byte 0x04, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x29, 0x32, 0x25, 0x02, 0x04, 0x00, 0x00, 0x00 - .byte 0x04, 0x00, 0x00, 0x00, 0x01, 0x31, 0x25, 0x02, 0x04, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00 - .byte 0x8D, 0x32, 0x25, 0x02, 0x04, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0xF1, 0x32, 0x25, 0x02 - .byte 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x39, 0x33, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00 - .byte 0x07, 0x00, 0x00, 0x00, 0x79, 0x33, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00 - .byte 0xC1, 0x33, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0xED, 0x33, 0x25, 0x02 - .byte 0x00, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x0D, 0x34, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00 - .byte 0x0C, 0x00, 0x00, 0x00, 0xCD, 0x35, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x0D, 0x00, 0x00, 0x00 - .byte 0x69, 0x36, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x00, 0x00, 0x00, 0xC9, 0x36, 0x25, 0x02 - .byte 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .word 0x00000000, MOD20_02252ED0, 0x00000000 + .word 0x00000001, MOD20_02252FF0, 0x00000004 + .word 0x00000002, MOD20_02252FF0, 0x00000004 + .word 0x00000003, MOD20_02253228, 0x00000004 + .word 0x00000004, MOD20_02253100, 0x00000004 + .word 0x00000005, MOD20_0225328C, 0x00000004 + .word 0x00000006, MOD20_022532F0, 0x00000000 + .word 0x00000008, MOD20_02253338, 0x00000000 + .word 0x00000007, MOD20_02253378, 0x00000000 + .word 0x00000009, MOD20_022533C0, 0x00000000 + .word 0x0000000A, MOD20_022533EC, 0x00000000 + .word 0x0000000B, MOD20_0225340C, 0x00000000 + .word 0x0000000C, MOD20_022535CC, 0x00000000 + .word 0x0000000D, MOD20_02253668, 0x00000000 + .word 0x0000000E, MOD20_022536C8, 0x00000000 + .word 0xFFFFFFFF, 0x00000000, 0x00000000 .global MOD20_02254704 MOD20_02254704: ; 0x02254704 @@ -4646,8 +4650,8 @@ MOD20_0225470C: ; 0x0225470C .global MOD20_02254710 MOD20_02254710: ; 0x02254710 - .byte 0x41, 0x43, 0x25, 0x02, 0x5D, 0x43, 0x25, 0x02, 0xBD, 0x43, 0x25, 0x02, 0xF5, 0x43, 0x25, 0x02 - .byte 0x0D, 0x44, 0x25, 0x02 + .word MOD20_02254340, MOD20_0225435C, MOD20_022543BC, MOD20_022543F4 + .word MOD20_0225440C .global MOD20_02254724 MOD20_02254724: ; 0x02254724 |