summaryrefslogtreecommitdiff
path: root/gfx
diff options
context:
space:
mode:
Diffstat (limited to 'gfx')
-rw-r--r--gfx/pokedex/question_mark.2bpp.lz.14c284f5 (renamed from gfx/pokemon/questionmark/front.2bpp.lz.14c284f5)bin144 -> 144 bytes
-rw-r--r--gfx/pokedex/question_mark.png (renamed from gfx/pokemon/questionmark/front.png)bin183 -> 183 bytes
-rw-r--r--gfx/tileset_palette_maps.asm (renamed from gfx/tilesets/palette_maps.asm)2
-rw-r--r--gfx/tilesets/bg_tiles.pal12
4 files changed, 3 insertions, 11 deletions
diff --git a/gfx/pokemon/questionmark/front.2bpp.lz.14c284f5 b/gfx/pokedex/question_mark.2bpp.lz.14c284f5
index cd2f7f22e..cd2f7f22e 100644
--- a/gfx/pokemon/questionmark/front.2bpp.lz.14c284f5
+++ b/gfx/pokedex/question_mark.2bpp.lz.14c284f5
Binary files differ
diff --git a/gfx/pokemon/questionmark/front.png b/gfx/pokedex/question_mark.png
index e2b681c73..e2b681c73 100644
--- a/gfx/pokemon/questionmark/front.png
+++ b/gfx/pokedex/question_mark.png
Binary files differ
diff --git a/gfx/tilesets/palette_maps.asm b/gfx/tileset_palette_maps.asm
index 5e8f9f4eb..b3b2f5b98 100644
--- a/gfx/tilesets/palette_maps.asm
+++ b/gfx/tileset_palette_maps.asm
@@ -2,7 +2,7 @@ tilepal: MACRO
; used in gfx/tilesets/*_palette_map.asm
; vram bank, pals
x = \1 << OAM_TILE_BANK
-rept (_NARG +- 1) / 2
+rept (_NARG + -1) / 2
dn (x | PAL_BG_\3), (x | PAL_BG_\2)
shift
shift
diff --git a/gfx/tilesets/bg_tiles.pal b/gfx/tilesets/bg_tiles.pal
index e21561c74..3605e2184 100644
--- a/gfx/tilesets/bg_tiles.pal
+++ b/gfx/tilesets/bg_tiles.pal
@@ -49,13 +49,5 @@
RGB 31,31,16, 31,31,16, 14,09,00, 00,00,00 ; text
; overworld water
-; morn/day
- RGB 23, 23, 31
- RGB 18, 19, 31
- RGB 13, 12, 31
- RGB 07, 07, 07
-; nite
- RGB 15, 13, 27
- RGB 10, 09, 20
- RGB 04, 03, 18
- RGB 00, 00, 00
+ RGB 23,23,31, 18,19,31, 13,12,31, 07,07,07 ; morn/day
+ RGB 15,13,27, 10,09,20, 04,03,18, 00,00,00 ; nite