From c3cfd6065825ec8ddd5e1782998071518efaa322 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sat, 6 Apr 2019 15:16:05 -0500 Subject: [PATCH] Generate zoom_tiles palette from correct image --- data/pokenav.s | 2 +- graphics/pokenav/{zoom_tiles.pal => 8622868.pal} | 0 src/graphics.c | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename graphics/pokenav/{zoom_tiles.pal => 8622868.pal} (100%) diff --git a/data/pokenav.s b/data/pokenav.s index 354d781d46..cb5030b4ba 100644 --- a/data/pokenav.s +++ b/data/pokenav.s @@ -1436,7 +1436,7 @@ gUnknown_08622850:: @ 8622850 spr_template 8, 13, gUnknown_08622848, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy gUnknown_08622868:: @ 8622868 - .incbin "graphics/pokenav/zoom_tiles.gbapal" + .incbin "graphics/pokenav/8622868.gbapal" gUnknown_08622888:: @ 8622888 .incbin "graphics/pokenav/zoom_tiles.4bpp.lz" diff --git a/graphics/pokenav/zoom_tiles.pal b/graphics/pokenav/8622868.pal similarity index 100% rename from graphics/pokenav/zoom_tiles.pal rename to graphics/pokenav/8622868.pal diff --git a/src/graphics.c b/src/graphics.c index fd5f24d49b..531d337a2a 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -1363,7 +1363,7 @@ const u16 gPokenavMessageBox_Pal[] = INCBIN_U16("graphics/pokenav/message.gbapal const u32 gPokenavMessageBox_Gfx[] = INCBIN_U32("graphics/pokenav/message.4bpp.lz"); const u32 gPokenavMessageBox_Tilemap[] = INCBIN_U32("graphics/pokenav/message.bin.lz"); -const u16 gHoennMapZoomIcons_Pal[] = INCBIN_U16("graphics/pokenav/zoom.gbapal"); +const u16 gHoennMapZoomIcons_Pal[] = INCBIN_U16("graphics/pokenav/zoom_tiles.gbapal"); const u32 gHoennMapZoomIcons_Gfx[] = INCBIN_U32("graphics/pokenav/zoom.4bpp.lz"); const u16 gPokenavConditionCancel_Pal[] = INCBIN_U16("graphics/pokenav/cancel.gbapal");