diff options
| author | Rémi Calixte <remicalixte.rmc@gmail.com> | 2021-05-13 19:37:12 +0200 |
|---|---|---|
| committer | Rémi Calixte <remicalixte.rmc@gmail.com> | 2021-05-13 19:37:12 +0200 |
| commit | a50b0bd9052bbeb9c439f2a25e5ab290c528cdf4 (patch) | |
| tree | f58aac843f5cafb1f909a738f5ae3f141e0db37b /arm9/modules/11 | |
| parent | 1598b5dcbb9c2fc7dfc51b4503fe5bcac75dab47 (diff) | |
| parent | 7962c5086f9ddd90508559a0d326f4eca9573669 (diff) | |
Merge branch 'master' into unk_02016B94
Diffstat (limited to 'arm9/modules/11')
| -rw-r--r-- | arm9/modules/11/asm/module_11_thumb2.s | 2 | ||||
| -rw-r--r-- | arm9/modules/11/src/module_11_sinit.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/arm9/modules/11/asm/module_11_thumb2.s b/arm9/modules/11/asm/module_11_thumb2.s index 3e416af6..62996375 100644 --- a/arm9/modules/11/asm/module_11_thumb2.s +++ b/arm9/modules/11/asm/module_11_thumb2.s @@ -25381,7 +25381,7 @@ _0223B916: str r0, [sp, #0xe0] ldr r0, [r4] bl MOD11_022300D0 - bl FUN_0206BB34 + bl Pokedex_IsNatDexEnabled str r0, [sp, #0xe4] bl FUN_0201D658 str r0, [r4, #0x54] diff --git a/arm9/modules/11/src/module_11_sinit.c b/arm9/modules/11/src/module_11_sinit.c index 977c4fde..8bf5f6f6 100644 --- a/arm9/modules/11/src/module_11_sinit.c +++ b/arm9/modules/11/src/module_11_sinit.c @@ -1,8 +1,9 @@ #include "global.h" #include "poke_overlay.h" #include "FS_overlay.h" +#include "unk_02031734.h" + -extern u32 FUN_02033590(void); FS_EXTERN_OVERLAY(MODULE_16); THUMB_FUNC static void MOD11_0222F284(void) |