diff options
| author | Devin <easyaspi314@users.noreply.github.com> | 2018-01-21 15:22:05 -0500 |
|---|---|---|
| committer | Devin <easyaspi314@users.noreply.github.com> | 2018-01-21 15:22:05 -0500 |
| commit | 35cc20c9aa5a37f03bc0bf46bc31398aecda7bf6 (patch) | |
| tree | 59427fda7dbbb92268caf353870d0f0ed8f5e13b /asm/pokenav.s | |
| parent | c408110319885748b4fcc696063242c7002f4d30 (diff) | |
| parent | a1aa645f2364deffda698b8e0cdc5c961b5306a5 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into fix_perms
Diffstat (limited to 'asm/pokenav.s')
| -rw-r--r-- | asm/pokenav.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/pokenav.s b/asm/pokenav.s index 32d053222..b9cb53492 100644 --- a/asm/pokenav.s +++ b/asm/pokenav.s @@ -7095,7 +7095,7 @@ titlescreen_0: @ 81CA92C movs r0, 0x44 movs r1, 0xA0 bl SetGpuRegBits - bl remove_some_task + bl ScanlineEffect_Stop bl sub_81CAA3C ldr r2, =gUnknown_08620384 ldr r0, [r2] @@ -7122,7 +7122,7 @@ sub_81CA994: @ 81CA994 lsls r1, 6 movs r0, 0 bl ClearGpuRegBits - bl remove_some_task + bl ScanlineEffect_Stop ldr r0, =sub_81CA9EC bl FindTaskIdByFunc lsls r0, 24 |