diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2015-11-01 18:14:37 -0500 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-11-01 18:19:52 -0500 |
| commit | 6b2d0ae841f5a7ff851d462b12f09eac998d2d8f (patch) | |
| tree | 280e64b26f9b525606de02701f0c9a768301c4d2 /engine/diploma.asm | |
| parent | 010b450834bd595b961582aea5e5771632510ef9 (diff) | |
| parent | 25c126c69beebfdf26d0de286e25c65f6f3db16e (diff) | |
Fix merge conflicts
Diffstat (limited to 'engine/diploma.asm')
| -rw-r--r-- | engine/diploma.asm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engine/diploma.asm b/engine/diploma.asm index f56e4ec00..eff2ff5f1 100644 --- a/engine/diploma.asm +++ b/engine/diploma.asm @@ -33,7 +33,7 @@ Function1dd709: ; 1dd709 call WaitBGMap ld b, $8 call GetSGBLayout - call Function32f9 + call SetPalettes call DelayFrame ret ; 1dd760 |