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 /misc/crystal_misc.asm | |
| parent | 010b450834bd595b961582aea5e5771632510ef9 (diff) | |
| parent | 25c126c69beebfdf26d0de286e25c65f6f3db16e (diff) | |
Fix merge conflicts
Diffstat (limited to 'misc/crystal_misc.asm')
| -rw-r--r-- | misc/crystal_misc.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/misc/crystal_misc.asm b/misc/crystal_misc.asm index 0c833295b..cb152cefd 100644 --- a/misc/crystal_misc.asm +++ b/misc/crystal_misc.asm @@ -51,7 +51,7 @@ Function17a6a8: ; 17a6a8 (5e:66a8) call Function17abcf callba Function49409 callba Function49420 - call Function32f9 + call SetPalettes call DelayFrame ret @@ -430,7 +430,7 @@ Function17a91e: ; 17a91e (5e:691e) ret .asm_17a92c - call Function1d6e + call LoadMenuDataHeader_0x1d75 call Function17a99e ld hl, $d088 set 7, [hl] |