diff options
Diffstat (limited to 'engine/gfx/color.asm')
| -rw-r--r-- | engine/gfx/color.asm | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/engine/gfx/color.asm b/engine/gfx/color.asm index 9f42d24f6..a0de280af 100644 --- a/engine/gfx/color.asm +++ b/engine/gfx/color.asm @@ -138,13 +138,13 @@ Intro_LoadMagikarpPalettes: ; unreferenced ret z ; CGB only - ld hl, .BGPal + ld hl, .MagikarpBGPal ld de, wBGPals1 ld bc, 1 palettes ld a, BANK(wBGPals1) call FarCopyWRAM - ld hl, .OBPal + ld hl, .MagikarpOBPal ld de, wOBPals1 ld bc, 1 palettes ld a, BANK(wOBPals1) @@ -155,17 +155,11 @@ Intro_LoadMagikarpPalettes: ; unreferenced ldh [hCGBPalUpdate], a ret -.BGPal: - RGB 31, 31, 31 - RGB 18, 23, 31 - RGB 15, 20, 31 - RGB 00, 00, 00 - -.OBPal: - RGB 31, 31, 31 - RGB 31, 31, 12 - RGB 08, 16, 28 - RGB 00, 00, 00 +.MagikarpBGPal: +INCLUDE "gfx/intro/gs_magikarp_bg.pal" + +.MagikarpOBPal: +INCLUDE "gfx/intro/gs_magikarp_ob.pal" Intro_LoadAllPal0: ; unreferenced call CheckCGB |