diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-02-11 13:43:14 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-02-11 13:43:14 -0500 |
| commit | 9ff146b0bcf3e5f2bbb0db9a21a147dde80d81fd (patch) | |
| tree | 1c983f6d141765bc5e556abd8c19b67f7aac9305 /asm | |
| parent | 354d837d6f680b44b7824e95a1363b387717807a (diff) | |
document minigame_countdown.c
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/berry_crush_2.s | 4 | ||||
| -rw-r--r-- | asm/dodrio_berry_picking.s | 4 | ||||
| -rw-r--r-- | asm/pokemon_jump_2.s | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/asm/berry_crush_2.s b/asm/berry_crush_2.s index 1bf9aad82..00bf2150e 100644 --- a/asm/berry_crush_2.s +++ b/asm/berry_crush_2.s @@ -962,10 +962,10 @@ _0814C26C: adds r0, r1, 0 movs r2, 0x78 movs r3, 0x50 - bl sub_815F138 + bl StartMinigameCountdown b _0814C2EC _0814C28A: - bl sub_815F198 + bl IsMinigameCountdownRunning cmp r0, 0 bne _0814C2F2 _0814C292: diff --git a/asm/dodrio_berry_picking.s b/asm/dodrio_berry_picking.s index b396926d4..ad958c579 100644 --- a/asm/dodrio_berry_picking.s +++ b/asm/dodrio_berry_picking.s @@ -649,7 +649,7 @@ _08150D28: movs r1, 0x8 movs r2, 0x78 movs r3, 0x50 - bl sub_815F138 + bl StartMinigameCountdown b _08150D52 _08150D3A: bl IsLinkTaskFinished @@ -658,7 +658,7 @@ _08150D3A: beq _08150D74 b _08150D52 _08150D46: - bl sub_815F198 + bl IsMinigameCountdownRunning cmp r0, 0 bne _08150D74 _08150D4E: diff --git a/asm/pokemon_jump_2.s b/asm/pokemon_jump_2.s index 269ffc7bd..ff6757630 100644 --- a/asm/pokemon_jump_2.s +++ b/asm/pokemon_jump_2.s @@ -7702,7 +7702,7 @@ sub_814B43C: @ 814B43C movs r1, 0x7 movs r2, 0x78 movs r3, 0x50 - bl sub_815F138 + bl StartMinigameCountdown adds r0, r4, 0 bl sub_814B134 add sp, 0x4 @@ -7714,7 +7714,7 @@ sub_814B43C: @ 814B43C thumb_func_start sub_814B460 sub_814B460: @ 814B460 push {lr} - bl sub_815F198 + bl IsMinigameCountdownRunning pop {r1} bx r1 thumb_func_end sub_814B460 |