diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-04-11 19:21:51 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-11 19:21:51 -0400 |
| commit | 24bb85896d9e670c0fa419dc7cb6c96b5d0806c7 (patch) | |
| tree | eba61257e555461f5d9662fea9477561bef51adf /asm/intro.s | |
| parent | 532907559304e1b32f8efa76e2fb8a2fc526ec02 (diff) | |
| parent | c85f726224bbe53502ba98557d2c89eef89d7fbd (diff) | |
Merge pull request #47 from PikalaxALT/roamer
Roamer
Diffstat (limited to 'asm/intro.s')
| -rw-r--r-- | asm/intro.s | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/asm/intro.s b/asm/intro.s index fd430031e..309b636c8 100644 --- a/asm/intro.s +++ b/asm/intro.s @@ -898,7 +898,7 @@ _080ECCF6: movs r1, 0x10 movs r2, 0x10 movs r3, 0 - bl OakSpeech_StartBlendTask + bl StartBlendTask b _080ECD36 .align 2, 0 _080ECD14: .4byte 0x00003f44 @@ -907,7 +907,7 @@ _080ECD18: bl ShowBg b _080ECD36 _080ECD20: - bl OakSpeech_IsBlendTaskActive + bl IsBlendTaskActive lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0 @@ -980,7 +980,7 @@ _080ECD9C: movs r1, 0x10 movs r2, 0x10 movs r3, 0 - bl OakSpeech_StartBlendTask + bl StartBlendTask strh r4, [r6, 0x8] strh r5, [r6, 0xA] strh r4, [r6, 0x12] @@ -992,7 +992,7 @@ _080ECDC4: str r0, [r6, 0x14] b _080ECE70 _080ECDCC: - bl OakSpeech_IsBlendTaskActive + bl IsBlendTaskActive lsls r0, 24 cmp r0, 0 bne _080ECE96 @@ -1051,10 +1051,10 @@ _080ECE26: movs r1, 0 movs r2, 0 movs r3, 0x10 - bl OakSpeech_StartBlendTask + bl StartBlendTask b _080ECE70 _080ECE52: - bl OakSpeech_IsBlendTaskActive + bl IsBlendTaskActive lsls r0, 24 cmp r0, 0 bne _080ECE96 |