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 | |
| parent | 1598b5dcbb9c2fc7dfc51b4503fe5bcac75dab47 (diff) | |
| parent | 7962c5086f9ddd90508559a0d326f4eca9573669 (diff) | |
Merge branch 'master' into unk_02016B94
Diffstat (limited to 'arm9/modules')
| -rw-r--r-- | arm9/modules/11/asm/module_11_thumb2.s | 2 | ||||
| -rw-r--r-- | arm9/modules/11/src/module_11_sinit.c | 3 | ||||
| -rw-r--r-- | arm9/modules/14/asm/module_14.s | 4 | ||||
| -rw-r--r-- | arm9/modules/52/src/module_52.c | 2 |
4 files changed, 6 insertions, 5 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) diff --git a/arm9/modules/14/asm/module_14.s b/arm9/modules/14/asm/module_14.s index edbb6d86..37a18d6d 100644 --- a/arm9/modules/14/asm/module_14.s +++ b/arm9/modules/14/asm/module_14.s @@ -1925,7 +1925,7 @@ _021D84AA: str r1, [r4, r0] sub r0, #0x38 ldr r0, [r4, r0] - bl FUN_0206BB28 + bl SavArray_IsNatDexEnabled mov r1, #0x52 lsl r1, r1, #2 str r0, [r4, r1] @@ -9205,7 +9205,7 @@ MOD14_021DBEAC: ; 0x021DBEAC mov r0, #0x47 lsl r0, r0, #2 ldr r0, [r6, r0] - bl FUN_0206BB28 + bl SavArray_IsNatDexEnabled ldrh r1, [r4, #4] bl FUN_0206BB48 strh r0, [r4, #8] diff --git a/arm9/modules/52/src/module_52.c b/arm9/modules/52/src/module_52.c index a5b53e6c..1f74c77f 100644 --- a/arm9/modules/52/src/module_52.c +++ b/arm9/modules/52/src/module_52.c @@ -1,5 +1,6 @@ #include "module_52.h" #include "heap.h" +#include "unk_0205FA2C.h" extern struct Unk21DBE18 UNK_020FD144; @@ -7,7 +8,6 @@ extern struct Unk21DBE18 UNK_020F2B7C; extern struct Unk21DBE18 UNK_020F2B8C; extern void FUN_02015E3C(struct IGT *igt); -extern void FUN_0206007C(struct SaveBlock2 *sav2); extern int FUN_02053678(u32 random, u32 gender, u32 param2); extern void FUN_020250C4(void *sav_ptr, u32 heap_id, const u8 param2[], u32 param3); extern void FUN_020377E0(struct SaveBlock2 *sav2); |