diff options
author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-04-11 13:21:26 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-04-11 13:21:26 -0400 |
commit | c17af4853c5c5854170702292ebd573bc14b5b0e (patch) | |
tree | 4b10ee7f38e45cf1c0f74eafb1274afe70405155 /asm/link.s | |
parent | 7f920b887f9a060524347b4cc3a5e3f3abdd3b03 (diff) | |
parent | 18b20721d91e811595491d70e9512ace654e4f5a (diff) |
Merge pull request #46 from PikalaxALT/oak_speech
Oak speech
Diffstat (limited to 'asm/link.s')
-rw-r--r-- | asm/link.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/asm/link.s b/asm/link.s index a0ba7f9cb..13305edde 100644 --- a/asm/link.s +++ b/asm/link.s @@ -3252,7 +3252,7 @@ c2_800ACD4: @ 800ACD4 movs r2, 0x2 bl FillPalette bl ResetTasks - bl remove_some_task + bl ScanlineEffect_Stop ldr r1, _0800ADF0 @ =gWirelessCommType ldrb r0, [r1] cmp r0, 0 |