From 0dc88447e236b628b74bbc090a081b897978b901 Mon Sep 17 00:00:00 2001 From: Martha Schilling Date: Thu, 21 Dec 2023 20:04:51 +0000 Subject: [PATCH] Mt Moon Crater improvement (wait, didn't we already have this today?) I'M ON A FUCKING ROLL HERE AND I WON'T STOP - Made Mt. Moon Crater have a more 'mystical' purple palette at LuciShrimp's request :3 --- data/sgb/sgb_palettes.asm | 2 +- engine/gfx/palettes.asm | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/data/sgb/sgb_palettes.asm b/data/sgb/sgb_palettes.asm index 14752e7e..4beb709f 100644 --- a/data/sgb/sgb_palettes.asm +++ b/data/sgb/sgb_palettes.asm @@ -18,7 +18,7 @@ SuperPalettes: RGB 31,31,31, 00,21,31, 10,28,00, 01,01,01 ; PAL_TOWNMAP RGB 31,31,31, 31,31,00, 31,01,09, 31,13,15 ; PAL_LOGO1 RGB 31,31,31, 31,31,00, 07,07,25, 00,00,17 ; PAL_LOGO2 - RGB 31,31,31, 13,01,31, 00,09,31, 01,01,01 ; PAL_0F + RGB 31,31,31, 29,16,30, 09,03,27, 01,01,01 ; PAL_0F RGB 31,31,31, 30,17,11, 11,05,14, 03,03,03 ; PAL_MEWMON RGB 31,31,31, 16,18,31, 00,01,25, 03,03,03 ; PAL_BLUEMON RGB 31,31,31, 31,17,00, 31,00,00, 03,03,03 ; PAL_REDMON diff --git a/engine/gfx/palettes.asm b/engine/gfx/palettes.asm index f103fe39..2d2cc8e3 100644 --- a/engine/gfx/palettes.asm +++ b/engine/gfx/palettes.asm @@ -211,6 +211,8 @@ SetPal_Overworld: jp z, .pallet cp REDS_HOUSE_2F jp z, .pallet + cp MT_MOON_CRATER + jp z, .areazero cp CERULEAN_CAVE_2F jp c, .normalDungeonOrBuilding cp LORELEIS_ROOM @@ -301,6 +303,9 @@ SetPal_Overworld: .ferry ld a, PAL_BLUEMON - 1 jr .town +.areazero + ld a, PAL_0F - 1 + jr .town ; used when a Pokemon is the only thing on the screen ; such as evolution, trading and the Hall of Fame