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/intro.s | |
parent | c408110319885748b4fcc696063242c7002f4d30 (diff) | |
parent | a1aa645f2364deffda698b8e0cdc5c961b5306a5 (diff) |
Merge branch 'master' of https://github.com/pret/pokeemerald into fix_perms
Diffstat (limited to 'asm/intro.s')
-rw-r--r-- | asm/intro.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/asm/intro.s b/asm/intro.s index d9f6e558f..efc36e7d9 100644 --- a/asm/intro.s +++ b/asm/intro.s @@ -184,7 +184,7 @@ _0816CCF4: movs r0, 0 movs r2, 0 bl load_copyright_graphics - bl remove_some_task + bl ScanlineEffect_Stop bl ResetTasks bl ResetSpriteData bl FreeAllSpritePalettes |