diff options
| author | yenatch <yenatch@gmail.com> | 2015-11-28 20:15:35 -0500 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2015-11-28 20:15:35 -0500 |
| commit | 794410352fd92ccf06974763e4b3be0b807641ab (patch) | |
| tree | 05f5dd861966762db9556082229cee82e8b5eed9 /misc/crystal_misc.asm | |
| parent | 9c5473e965520f672640daf4ee76622640e0de15 (diff) | |
| parent | 4bcd71e3227181baa536357af3d87a8d02af3890 (diff) | |
Merge pull request #328 from PikalaxALT/master
Split out most of main.asm
Diffstat (limited to 'misc/crystal_misc.asm')
| -rw-r--r-- | misc/crystal_misc.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/misc/crystal_misc.asm b/misc/crystal_misc.asm index 489ec77ee..662c1788a 100644 --- a/misc/crystal_misc.asm +++ b/misc/crystal_misc.asm @@ -173,7 +173,7 @@ Function17a78f: ; 17a78f (5e:678f) ret .asm_17a79f - callba Function104061 + callba ReloadMapPart ret ; 17a7a6 (5e:67a6) @@ -768,26 +768,26 @@ Function17aba0: ; 17aba0 (5e:6ba0) Function17abcf: ; 17abcf (5e:6bcf) ld a, [rSVBK] push af - ld a, BANK(wMapPals) + ld a, BANK(UnknBGPals) ld [rSVBK], a ld hl, Palette_17ac55 - ld de, wMapPals ; $d000 + ld de, UnknBGPals ; $d000 ld bc, $30 call CopyBytes ld hl, Palette_17ac95 - ld de, Unkn2Pals + ld de, UnknOBPals ld bc, $40 call CopyBytes ld hl, GFX_17afa5 + $510 - ld de, Unkn2Pals + 2 * 4 + ld de, UnknOBPals + 2 * 4 ld bc, $10 call CopyBytes ld hl, MapObjectPals + 8 - ld de, Unkn2Pals + 6 * 4 + ld de, UnknOBPals + 6 * 4 ld bc, $8 ld a, BANK(MapObjectPals) call FarCopyBytes |