diff options
Diffstat (limited to 'arm9')
| -rw-r--r-- | arm9/arm9.lsf | 1 | ||||
| -rw-r--r-- | arm9/modules/62/asm/module_62.s | 14 | ||||
| -rw-r--r-- | arm9/modules/62/src/module_62_sinit.c | 13 |
3 files changed, 14 insertions, 14 deletions
diff --git a/arm9/arm9.lsf b/arm9/arm9.lsf index e977dbf4..008ca0ad 100644 --- a/arm9/arm9.lsf +++ b/arm9/arm9.lsf @@ -933,6 +933,7 @@ Overlay MODULE_61 Overlay MODULE_62 { After MODULE_08 + Object module_62_sinit.o Object module_62.o } diff --git a/arm9/modules/62/asm/module_62.s b/arm9/modules/62/asm/module_62.s index 33e331d3..ff70fe6d 100644 --- a/arm9/modules/62/asm/module_62.s +++ b/arm9/modules/62/asm/module_62.s @@ -3,17 +3,6 @@ .section .text .balign 4, 0 - thumb_func_start MOD62_0222D5C0 -MOD62_0222D5C0: ; 0x0222D5C0 - ldr r3, _0222D5C8 ; =HandleLoadOverlay - ldr r0, _0222D5CC ; =SDK_OVERLAY_MODULE_08_ID - mov r1, #2 - bx r3 - .align 2, 0 -_0222D5C8: .word HandleLoadOverlay -_0222D5CC: .word SDK_OVERLAY_MODULE_08_ID - thumb_func_end MOD62_0222D5C0 - thumb_func_start MOD62_0222D5D0 MOD62_0222D5D0: ; 0x0222D5D0 add r3, r2, #0 @@ -7631,6 +7620,3 @@ MOD62_02231358: ; 0x02231358 .word 0x02, MOD62_0222F94C .word 0x03, MOD62_0222F970 .word 0x04, MOD62_0222F980 - - .section .sinit - .word MOD62_0222D5C0 diff --git a/arm9/modules/62/src/module_62_sinit.c b/arm9/modules/62/src/module_62_sinit.c new file mode 100644 index 00000000..db679e41 --- /dev/null +++ b/arm9/modules/62/src/module_62_sinit.c @@ -0,0 +1,13 @@ +#include "global.h" +#include "poke_overlay.h" +#include "FS_overlay.h" + +FS_EXTERN_OVERLAY(MODULE_08); + +THUMB_FUNC static void MOD62_0222D5C0(void) +{ + HandleLoadOverlay(FS_OVERLAY_ID(MODULE_08), 2); +} + +#define NitroStaticInit MOD62_0222D5C0 +#include "sinit.h" |