diff options
| author | Cleverking2003 <30466983+Cleverking2003@users.noreply.github.com> | 2020-05-16 12:42:01 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-16 12:42:01 +0300 |
| commit | d4398936cda38436513ebbc844e034b1b5dc8e90 (patch) | |
| tree | e290e10dad497d76e36ecb15db8d0facbd19f1ec /arm9/modules/24/asm/module_24.s | |
| parent | 929c523340dfecbd0e3313e25d36abe47e1cc63e (diff) | |
| parent | c19beb3d17121a509121949f5f0893971c61bb66 (diff) | |
Merge branch 'master' into master
Diffstat (limited to 'arm9/modules/24/asm/module_24.s')
| -rw-r--r-- | arm9/modules/24/asm/module_24.s | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/arm9/modules/24/asm/module_24.s b/arm9/modules/24/asm/module_24.s index ba2c3f32..2b129ec7 100644 --- a/arm9/modules/24/asm/module_24.s +++ b/arm9/modules/24/asm/module_24.s @@ -1181,7 +1181,19 @@ _022550DC: .section .rodata ; 0x022550F8 - .incbin "baserom.nds", 0x288EB8, 0xC8 + .byte 0x18, 0x58, 0xB4, 0xCC, 0x68, 0xA8, 0xB4, 0xCC, 0xAD, 0x49, 0x25, 0x02, 0xF9, 0x49, 0x25, 0x02 + .byte 0x65, 0x4C, 0x25, 0x02, 0x07, 0x02, 0x02, 0x14, 0x13, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0E, 0x00 + .byte 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0F, 0x00, 0x00, 0x03, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x80, 0x03, 0x00, 0x00, 0x00, 0x00, 0x02 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x80, 0x08, 0x00, 0x03, 0x00, 0x00, 0x02 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xDD, 0x4D, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00 + .byte 0x01, 0x00, 0x00, 0x00, 0xE1, 0x4E, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00 + .byte 0x29, 0x4F, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x41, 0x4F, 0x25, 0x02 + .byte 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x39, 0x50, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00 + .byte 0x05, 0x00, 0x00, 0x00, 0x51, 0x50, 0x25, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 .section .sinit .word MOD24_02254840 |