diff options
Diffstat (limited to 'arm9/modules')
-rw-r--r-- | arm9/modules/05/asm/module_05.s | 2 | ||||
-rw-r--r-- | arm9/modules/14/asm/module_14.s | 2 | ||||
-rw-r--r-- | arm9/modules/71/asm/module_71.s | 4 | ||||
-rw-r--r-- | arm9/modules/80/asm/module_80.s | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/arm9/modules/05/asm/module_05.s b/arm9/modules/05/asm/module_05.s index ea4a9191..b5f89157 100644 --- a/arm9/modules/05/asm/module_05.s +++ b/arm9/modules/05/asm/module_05.s @@ -43155,7 +43155,7 @@ _021EC544: bl FUN_0206B938 ldr r1, _021EC578 ; =0x000001B9 add r0, r6, #0 - bl FUN_0206BAE4 + bl PartyHasMon cmp r0, #0 bne _021EC572 add r0, r7, #0 diff --git a/arm9/modules/14/asm/module_14.s b/arm9/modules/14/asm/module_14.s index 0b764ed1..e0034fd2 100644 --- a/arm9/modules/14/asm/module_14.s +++ b/arm9/modules/14/asm/module_14.s @@ -116,7 +116,7 @@ MOD14_021D75B8: ; 0x021D75B8 lsl r1, r1, #2 ldr r0, [r4, r1] add r1, #0x95 - bl FUN_0206BAE4 + bl PartyHasMon cmp r0, #0 bne _021D75DE mov r0, #0x47 diff --git a/arm9/modules/71/asm/module_71.s b/arm9/modules/71/asm/module_71.s index e9d79012..606353f1 100644 --- a/arm9/modules/71/asm/module_71.s +++ b/arm9/modules/71/asm/module_71.s @@ -138,7 +138,7 @@ MOD71_0222D5C0: ; 0x0222D5C0 mov r0, #0x1a bl FUN_020335F0 bl FUN_02033E74 - bl FUN_0201277C + bl IsNighttime cmp r0, #0 bne _0222D71A ldr r1, _0222D748 ; =0x0000043D @@ -6375,7 +6375,7 @@ _02230A40: ldr r0, [sp, #4] ldr r1, _02230AE0 ; =0x000001B9 str r6, [r5, #0x2c] - bl FUN_0206BAE4 + bl PartyHasMon cmp r0, #0 bne _02230A98 ldr r0, [r5, #0x10] diff --git a/arm9/modules/80/asm/module_80.s b/arm9/modules/80/asm/module_80.s index 52e2cc5f..71ef95f1 100644 --- a/arm9/modules/80/asm/module_80.s +++ b/arm9/modules/80/asm/module_80.s @@ -16121,7 +16121,7 @@ _02235590: ldr r0, [r5] ldr r1, _022355EC ; =0x000001B9 ldr r0, [r0, #8] - bl FUN_0206BAE4 + bl PartyHasMon cmp r0, #0 bne _022355DC ldr r0, [r5] |