From 5e9e9b4b65b17c92daf2f51ca0ff58a9a6b3b0d7 Mon Sep 17 00:00:00 2001 From: Zeta_Null Date: Fri, 20 Oct 2023 02:08:39 -0400 Subject: [PATCH] Fixed Typos and added unused SGB Colors for later use --- constants/scgb_constants.asm | 1 + data/maps/maps.asm | 2 +- gfx/sgb/predef.pal | 1 + maps/SilentHills.asm | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/constants/scgb_constants.asm b/constants/scgb_constants.asm index 449be75..dde5f41 100644 --- a/constants/scgb_constants.asm +++ b/constants/scgb_constants.asm @@ -71,6 +71,7 @@ DEF SCGB_DEFAULT EQU $ff const PREDEFPAL_LAKE_OF_RAGE const PREDEFPAL_SILVER_CAVE const PREDEFPAL_DUNGEONS + const PREDEFPAL_SILENT_HILLS const PREDEFPAL_NITE const PREDEFPAL_BLACKOUT const PREDEFPAL_DIPLOMA ; RB_MEWMON diff --git a/data/maps/maps.asm b/data/maps/maps.asm index 7b6d02a..c0268f1 100644 --- a/data/maps/maps.asm +++ b/data/maps/maps.asm @@ -541,4 +541,4 @@ MapGroup_Cherrygrove: MapGroup_SilentHills: table_width MAP_LENGTH, MapGroup_SilentHills map SilentHills, TILESET_JOHTO, TOWN, LANDMARK_SILENT_HILLS, MUSIC_NEW_BARK_TOWN, TRUE, PALETTE_AUTO, FISHGROUP_SHORE - assert_table_length NUM_SILENT_HILLS_MAP + assert_table_length NUM_SILENT_HILLS_MAPS diff --git a/gfx/sgb/predef.pal b/gfx/sgb/predef.pal index 745767d..9299476 100644 --- a/gfx/sgb/predef.pal +++ b/gfx/sgb/predef.pal @@ -23,6 +23,7 @@ RGB 31,31,31, 31,20,20, 15,20,31, 00,00,00 ; PREDEFPAL_LAKE_OF_RAGE RGB 31,31,31, 26,26,26, 15,20,31, 00,00,00 ; PREDEFPAL_SILVER_CAVE RGB 31,31,31, 21,14,09, 15,20,20, 00,00,00 ; PREDEFPAL_DUNGEONS + RGB 31,31,31, 12,28,22, 15,20,20, 00,00,00 ; PREDEFPAL_SILENT_HILLS RGB 31,31,31, 12,28,22, 15,20,20, 00,00,00 ; PREDEFPAL_NITE RGB 31,31,31, 07,07,07, 02,03,03, 00,00,00 ; PREDEFPAL_BLACKOUT RGB 31,31,31, 30,22,17, 16,14,19, 00,00,00 ; PREDEFPAL_DIPLOMA diff --git a/maps/SilentHills.asm b/maps/SilentHills.asm index 7914ee2..d96def4 100644 --- a/maps/SilentHills.asm +++ b/maps/SilentHills.asm @@ -5,7 +5,7 @@ SilentHills_MapScripts: def_scene_scripts def_callbacks - callback MAPCALLBACK_NEWMAP, SilentHillFlypointCallback + callback MAPCALLBACK_NEWMAP, SilentHillsFlypointCallback SilentHillsFlypointCallback: setflag ENGINE_FLYPOINT_SILENT_HILLS