From ee4ec65fc17a802425b606eeef59e92a9a6c9b81 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Wed, 10 Jan 2018 02:30:17 -0500 Subject: map_objects.pal is easier to find in gfx/overworld/ than gfx/sprites/ --- engine/battle/battle_transition.asm | 2 +- engine/color.asm | 2 +- gfx/overworld/map_objects.pal | 39 +++++++++++++++++++++++++++++++++++++ gfx/sprites/map_objects.pal | 39 ------------------------------------- 4 files changed, 41 insertions(+), 41 deletions(-) create mode 100644 gfx/overworld/map_objects.pal delete mode 100644 gfx/sprites/map_objects.pal diff --git a/engine/battle/battle_transition.asm b/engine/battle/battle_transition.asm index af7bb688f..383674652 100644 --- a/engine/battle/battle_transition.asm +++ b/engine/battle/battle_transition.asm @@ -589,7 +589,7 @@ StartTrainerBattle_LoadPokeBallGraphics: ; 8c5dc (23:45dc) dec b jr nz, .loop - call .loadpokeballgfx ; ld a, [OtherTrainerClass] \ ld de, PokeBallTransition \ ret + call .loadpokeballgfx hlcoord 2, 1 ld b, SCREEN_WIDTH - 4 diff --git a/engine/color.asm b/engine/color.asm index 8bd79fd3b..58a2c0df8 100644 --- a/engine/color.asm +++ b/engine/color.asm @@ -1341,7 +1341,7 @@ TilesetBGPalette: INCLUDE "gfx/tilesets/bg_tiles.pal" MapObjectPals:: -INCLUDE "gfx/sprites/map_objects.pal" +INCLUDE "gfx/overworld/map_objects.pal" RoofPals: INCLUDE "gfx/tilesets/roofs.pal" diff --git a/gfx/overworld/map_objects.pal b/gfx/overworld/map_objects.pal new file mode 100644 index 000000000..b0f33479a --- /dev/null +++ b/gfx/overworld/map_objects.pal @@ -0,0 +1,39 @@ +; morn + RGB 28,31,16, 31,19,10, 31,07,01, 00,00,00 ; red + RGB 28,31,16, 31,19,10, 10,09,31, 00,00,00 ; blue + RGB 28,31,16, 31,19,10, 07,23,03, 00,00,00 ; green + RGB 28,31,16, 31,19,10, 15,10,03, 00,00,00 ; brown + RGB 28,31,16, 31,19,10, 30,10,06, 00,00,00 ; pink + RGB 31,31,31, 31,31,31, 13,13,13, 00,00,00 ; silver + RGB 22,31,10, 12,25,01, 05,14,00, 07,07,07 ; tree + RGB 28,31,16, 24,18,07, 20,15,03, 07,07,07 ; rock + +; day + RGB 27,31,27, 31,19,10, 31,07,01, 00,00,00 ; red + RGB 27,31,27, 31,19,10, 10,09,31, 00,00,00 ; blue + RGB 27,31,27, 31,19,10, 07,23,03, 00,00,00 ; green + RGB 27,31,27, 31,19,10, 15,10,03, 00,00,00 ; brown + RGB 27,31,27, 31,19,10, 30,10,06, 00,00,00 ; pink + RGB 31,31,31, 31,31,31, 13,13,13, 00,00,00 ; silver + RGB 22,31,10, 12,25,01, 05,14,00, 07,07,07 ; tree + RGB 27,31,27, 24,18,07, 20,15,03, 07,07,07 ; rock + +; nite + RGB 15,14,24, 31,19,10, 31,07,01, 00,00,00 ; red + RGB 15,14,24, 31,19,10, 10,09,31, 00,00,00 ; blue + RGB 15,14,24, 31,19,10, 07,23,03, 00,00,00 ; green + RGB 15,14,24, 31,19,10, 15,10,03, 00,00,00 ; brown + RGB 15,14,24, 31,19,10, 30,10,06, 00,00,00 ; pink + RGB 31,31,31, 31,31,31, 13,13,13, 00,00,00 ; silver + RGB 15,14,24, 08,13,19, 00,11,13, 00,00,00 ; tree + RGB 15,14,24, 12,09,15, 08,04,05, 00,00,00 ; rock + +; dark + RGB 01,01,02, 31,19,10, 31,07,01, 00,00,00 ; red + RGB 01,01,02, 31,19,10, 10,09,31, 00,00,00 ; blue + RGB 01,01,02, 31,19,10, 07,23,03, 00,00,00 ; green + RGB 01,01,02, 31,19,10, 15,10,03, 00,00,00 ; brown + RGB 01,01,02, 31,19,10, 30,10,06, 00,00,00 ; pink + RGB 31,31,31, 31,31,31, 13,13,13, 00,00,00 ; silver + RGB 01,01,02, 00,00,00, 00,00,00, 00,00,00 ; tree + RGB 01,01,02, 00,00,00, 00,00,00, 00,00,00 ; rock diff --git a/gfx/sprites/map_objects.pal b/gfx/sprites/map_objects.pal deleted file mode 100644 index b0f33479a..000000000 --- a/gfx/sprites/map_objects.pal +++ /dev/null @@ -1,39 +0,0 @@ -; morn - RGB 28,31,16, 31,19,10, 31,07,01, 00,00,00 ; red - RGB 28,31,16, 31,19,10, 10,09,31, 00,00,00 ; blue - RGB 28,31,16, 31,19,10, 07,23,03, 00,00,00 ; green - RGB 28,31,16, 31,19,10, 15,10,03, 00,00,00 ; brown - RGB 28,31,16, 31,19,10, 30,10,06, 00,00,00 ; pink - RGB 31,31,31, 31,31,31, 13,13,13, 00,00,00 ; silver - RGB 22,31,10, 12,25,01, 05,14,00, 07,07,07 ; tree - RGB 28,31,16, 24,18,07, 20,15,03, 07,07,07 ; rock - -; day - RGB 27,31,27, 31,19,10, 31,07,01, 00,00,00 ; red - RGB 27,31,27, 31,19,10, 10,09,31, 00,00,00 ; blue - RGB 27,31,27, 31,19,10, 07,23,03, 00,00,00 ; green - RGB 27,31,27, 31,19,10, 15,10,03, 00,00,00 ; brown - RGB 27,31,27, 31,19,10, 30,10,06, 00,00,00 ; pink - RGB 31,31,31, 31,31,31, 13,13,13, 00,00,00 ; silver - RGB 22,31,10, 12,25,01, 05,14,00, 07,07,07 ; tree - RGB 27,31,27, 24,18,07, 20,15,03, 07,07,07 ; rock - -; nite - RGB 15,14,24, 31,19,10, 31,07,01, 00,00,00 ; red - RGB 15,14,24, 31,19,10, 10,09,31, 00,00,00 ; blue - RGB 15,14,24, 31,19,10, 07,23,03, 00,00,00 ; green - RGB 15,14,24, 31,19,10, 15,10,03, 00,00,00 ; brown - RGB 15,14,24, 31,19,10, 30,10,06, 00,00,00 ; pink - RGB 31,31,31, 31,31,31, 13,13,13, 00,00,00 ; silver - RGB 15,14,24, 08,13,19, 00,11,13, 00,00,00 ; tree - RGB 15,14,24, 12,09,15, 08,04,05, 00,00,00 ; rock - -; dark - RGB 01,01,02, 31,19,10, 31,07,01, 00,00,00 ; red - RGB 01,01,02, 31,19,10, 10,09,31, 00,00,00 ; blue - RGB 01,01,02, 31,19,10, 07,23,03, 00,00,00 ; green - RGB 01,01,02, 31,19,10, 15,10,03, 00,00,00 ; brown - RGB 01,01,02, 31,19,10, 30,10,06, 00,00,00 ; pink - RGB 31,31,31, 31,31,31, 13,13,13, 00,00,00 ; silver - RGB 01,01,02, 00,00,00, 00,00,00, 00,00,00 ; tree - RGB 01,01,02, 00,00,00, 00,00,00, 00,00,00 ; rock -- cgit v1.2.3