summaryrefslogtreecommitdiff
path: root/arm9/modules/11/src
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2020-07-27 10:22:09 -0400
committerPikalaxALT <pikalaxalt@gmail.com>2020-07-27 10:22:09 -0400
commit8a3102ca979fe327001be6fa00a42fea0120ce6c (patch)
treef7602dfa72569e996ac5fe77ff1ff6a1c4f7e61c /arm9/modules/11/src
parent3bf0b69ed022f38ed9d325b07d03888f57a69e3e (diff)
parent8e1946da03f96b5696d3f8f248a2b675ba80d594 (diff)
Merge branch 'master' of github.com:pret/pokediamond into pikalax_work
Diffstat (limited to 'arm9/modules/11/src')
-rw-r--r--arm9/modules/11/src/module_11_sinit.c17
1 files changed, 15 insertions, 2 deletions
diff --git a/arm9/modules/11/src/module_11_sinit.c b/arm9/modules/11/src/module_11_sinit.c
index b798941e..977c4fde 100644
--- a/arm9/modules/11/src/module_11_sinit.c
+++ b/arm9/modules/11/src/module_11_sinit.c
@@ -1,4 +1,17 @@
-#define NitroStaticInit MOD11_0222F284
#include "global.h"
-extern void MOD11_0222F284(void);
+#include "poke_overlay.h"
+#include "FS_overlay.h"
+
+extern u32 FUN_02033590(void);
+FS_EXTERN_OVERLAY(MODULE_16);
+
+THUMB_FUNC static void MOD11_0222F284(void)
+{
+ if (!FUN_02033590())
+ {
+ HandleLoadOverlay(FS_OVERLAY_ID(MODULE_16), 2);
+ }
+}
+
+#define NitroStaticInit MOD11_0222F284
#include "sinit.h"