Merge branch 'master' of https://github.com/pret/pokeemerald into fix_perms

This commit is contained in:
Devin
2018-01-21 15:22:05 -05:00
293 changed files with 8429 additions and 2787 deletions
+1 -1
View File
@@ -2239,7 +2239,7 @@ _081C50E4:
bl clear_scheduled_bg_copies_to_vram
b _081C51A2
_081C50EE:
bl remove_some_task
bl ScanlineEffect_Stop
b _081C51A2
_081C50F4:
bl FreeAllSpritePalettes