diff options
Diffstat (limited to 'arm9/modules')
-rw-r--r-- | arm9/modules/00/asm/module_00_dummy.s | 2 | ||||
-rw-r--r-- | arm9/modules/01/src/module_01.c | 12 | ||||
-rw-r--r-- | arm9/modules/01/src/module_01.cpp | 11 | ||||
-rw-r--r-- | arm9/modules/02/asm/module_02_dummy.s | 2 | ||||
-rw-r--r-- | arm9/modules/03/asm/module_03_dummy.s | 2 | ||||
-rw-r--r-- | arm9/modules/04/asm/arm_04.s | 7 |
6 files changed, 16 insertions, 20 deletions
diff --git a/arm9/modules/00/asm/module_00_dummy.s b/arm9/modules/00/asm/module_00_dummy.s index e8a42167..e69de29b 100644 --- a/arm9/modules/00/asm/module_00_dummy.s +++ b/arm9/modules/00/asm/module_00_dummy.s @@ -1,2 +0,0 @@ - .section .data - .space 32 diff --git a/arm9/modules/01/src/module_01.c b/arm9/modules/01/src/module_01.c deleted file mode 100644 index ae2e9d1f..00000000 --- a/arm9/modules/01/src/module_01.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "global.h" - -u32 UNK_021D7500[8]; - -THUMB_FUNC void MOD01_021D74E0(void) -{ - UNK_021D7500[1]++; -} - -THUMB_FUNC void (*UNK_021D74F0[4])(void) = { - MOD01_021D74E0 -}; diff --git a/arm9/modules/01/src/module_01.cpp b/arm9/modules/01/src/module_01.cpp new file mode 100644 index 00000000..21b371e0 --- /dev/null +++ b/arm9/modules/01/src/module_01.cpp @@ -0,0 +1,11 @@ +#include "global.h" +#include "FS_overlay.h" + +class Unk021D7500 { + u32 unk0; + u32 unk4; +public: + THUMB_FUNC Unk021D7500() { unk4++; } +}; + +static class Unk021D7500 UNK_021D7500; diff --git a/arm9/modules/02/asm/module_02_dummy.s b/arm9/modules/02/asm/module_02_dummy.s index e8a42167..e69de29b 100644 --- a/arm9/modules/02/asm/module_02_dummy.s +++ b/arm9/modules/02/asm/module_02_dummy.s @@ -1,2 +0,0 @@ - .section .data - .space 32 diff --git a/arm9/modules/03/asm/module_03_dummy.s b/arm9/modules/03/asm/module_03_dummy.s index e8a42167..e69de29b 100644 --- a/arm9/modules/03/asm/module_03_dummy.s +++ b/arm9/modules/03/asm/module_03_dummy.s @@ -1,2 +0,0 @@ - .section .data - .space 32 diff --git a/arm9/modules/04/asm/arm_04.s b/arm9/modules/04/asm/arm_04.s index 8d1d699b..9928ef16 100644 --- a/arm9/modules/04/asm/arm_04.s +++ b/arm9/modules/04/asm/arm_04.s @@ -58938,9 +58938,12 @@ _0220BAB8: mov r0, r2 bx lr - .section .data + .section .rodata ; 0x0220BAC0 - .incbin "baserom.nds", 0x1411e0, 0x4100 + .incbin "baserom.nds", 0x1411e0, 0x3D4 + + .section .data + .incbin "baserom.nds", 0x1415C0, 0x3D20 .section .bss ; 0x0220FBC0 |