From f3919ab5c3b2c1cbb5644c994ac7af88eca13bea Mon Sep 17 00:00:00 2001 From: GriffinR Date: Mon, 6 Apr 2020 10:10:12 -0400 Subject: Drop missed prefixes --- graphics/oak_speech/background_tilemap.bin | Bin 0 -> 1280 bytes graphics/oak_speech/grass_platform_palette.pal | 19 +++++++++++++++++++ .../oak_speech/oak_speech_background_tilemap.bin | Bin 1280 -> 0 bytes .../oak_speech/oak_speech_grass_platform_palette.pal | 19 ------------------- graphics/oak_speech/oak_speech_pika_palette.pal | 19 ------------------- graphics/oak_speech/pika_palette.pal | 19 +++++++++++++++++++ src/oak_speech.c | 6 +++--- 7 files changed, 41 insertions(+), 41 deletions(-) create mode 100644 graphics/oak_speech/background_tilemap.bin create mode 100644 graphics/oak_speech/grass_platform_palette.pal delete mode 100644 graphics/oak_speech/oak_speech_background_tilemap.bin delete mode 100644 graphics/oak_speech/oak_speech_grass_platform_palette.pal delete mode 100644 graphics/oak_speech/oak_speech_pika_palette.pal create mode 100644 graphics/oak_speech/pika_palette.pal diff --git a/graphics/oak_speech/background_tilemap.bin b/graphics/oak_speech/background_tilemap.bin new file mode 100644 index 000000000..64374cd24 Binary files /dev/null and b/graphics/oak_speech/background_tilemap.bin differ diff --git a/graphics/oak_speech/grass_platform_palette.pal b/graphics/oak_speech/grass_platform_palette.pal new file mode 100644 index 000000000..4fb339128 --- /dev/null +++ b/graphics/oak_speech/grass_platform_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +189 189 164 +65 139 131 +82 148 139 +106 164 156 +131 180 172 +156 197 189 +180 213 205 +205 230 222 +230 246 238 +0 0 0 +255 0 255 +139 189 164 +156 205 172 +180 222 197 +205 238 222 +115 172 156 diff --git a/graphics/oak_speech/oak_speech_background_tilemap.bin b/graphics/oak_speech/oak_speech_background_tilemap.bin deleted file mode 100644 index 64374cd24..000000000 Binary files a/graphics/oak_speech/oak_speech_background_tilemap.bin and /dev/null differ diff --git a/graphics/oak_speech/oak_speech_grass_platform_palette.pal b/graphics/oak_speech/oak_speech_grass_platform_palette.pal deleted file mode 100644 index 4fb339128..000000000 --- a/graphics/oak_speech/oak_speech_grass_platform_palette.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -189 189 164 -65 139 131 -82 148 139 -106 164 156 -131 180 172 -156 197 189 -180 213 205 -205 230 222 -230 246 238 -0 0 0 -255 0 255 -139 189 164 -156 205 172 -180 222 197 -205 238 222 -115 172 156 diff --git a/graphics/oak_speech/oak_speech_pika_palette.pal b/graphics/oak_speech/oak_speech_pika_palette.pal deleted file mode 100644 index 4d2e92c74..000000000 --- a/graphics/oak_speech/oak_speech_pika_palette.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -205 205 180 -255 255 255 -255 246 106 -246 213 0 -238 172 0 -197 139 0 -131 82 0 -255 0 255 -255 0 255 -180 180 180 -255 74 74 -230 0 0 -180 0 0 -106 106 106 -16 16 16 -255 0 255 diff --git a/graphics/oak_speech/pika_palette.pal b/graphics/oak_speech/pika_palette.pal new file mode 100644 index 000000000..4d2e92c74 --- /dev/null +++ b/graphics/oak_speech/pika_palette.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +205 205 180 +255 255 255 +255 246 106 +246 213 0 +238 172 0 +197 139 0 +131 82 0 +255 0 255 +255 0 255 +180 180 180 +255 74 74 +230 0 0 +180 0 0 +106 106 106 +16 16 16 +255 0 255 diff --git a/src/oak_speech.c b/src/oak_speech.c index b6a7d0a8e..91fe117f1 100644 --- a/src/oak_speech.c +++ b/src/oak_speech.c @@ -113,7 +113,7 @@ ALIGNED(4) static const u16 sHelpDocsPalette[] = INCBIN_U16("graphics/oak_speech static const u32 sOakSpeechGfx_GameStartHelpUI[] = INCBIN_U32("graphics/oak_speech/game_start_help_ui.4bpp.lz"); static const u32 sNewGameAdventureIntroTilemap[] = INCBIN_U32("graphics/oak_speech/new_game_adventure_intro_tilemap.bin.lz"); static const u32 sOakSpeechGfx_SolidColors[] = INCBIN_U32("graphics/oak_speech/solid_colors.4bpp.lz"); -static const u32 sOakSpeech_BackgroundTilemap[] = INCBIN_U32("graphics/oak_speech/oak_speech_background_tilemap.bin.lz"); +static const u32 sOakSpeech_BackgroundTilemap[] = INCBIN_U32("graphics/oak_speech/background_tilemap.bin.lz"); static const u16 sHelpDocsPage2Tilemap[] = INCBIN_U16("graphics/oak_speech/help_docs_page2_tilemap.bin"); static const u16 sHelpDocsPage3Tilemap[] = INCBIN_U16("graphics/oak_speech/help_docs_page3_tilemap.bin"); static const u16 sOakSpeechGfx_LeafPal[] = INCBIN_U16("graphics/oak_speech/leaf_pal.gbapal"); @@ -124,8 +124,8 @@ static const u16 sOakSpeechGfx_OakPal[] = INCBIN_U16("graphics/oak_speech/oak_pa static const u32 sOakSpeechGfx_OakPic[] = INCBIN_U32("graphics/oak_speech/oak_pic.8bpp.lz"); static const u16 sOakSpeechGfx_RivalPal[] = INCBIN_U16("graphics/oak_speech/rival_pal.gbapal"); static const u32 sOakSpeechGfx_RivalPic[] = INCBIN_U32("graphics/oak_speech/rival_pic.8bpp.lz"); -static const u16 sOakSpeech_GrassPlatformPalette[] = INCBIN_U16("graphics/oak_speech/oak_speech_grass_platform_palette.gbapal"); -static const u16 sOakSpeech_PikaPalette[] = INCBIN_U16("graphics/oak_speech/oak_speech_pika_palette.gbapal"); +static const u16 sOakSpeech_GrassPlatformPalette[] = INCBIN_U16("graphics/oak_speech/grass_platform_palette.gbapal"); +static const u16 sOakSpeech_PikaPalette[] = INCBIN_U16("graphics/oak_speech/pika_palette.gbapal"); static const u32 sOakSpeechGfx_GrassPlatform[] = INCBIN_U32("graphics/oak_speech/grass_platform.4bpp.lz"); static const u32 sOakSpeechGfx_Pika1[] = INCBIN_U32("graphics/oak_speech/pika1.4bpp.lz"); static const u32 sOakSpeechGfx_Pika2[] = INCBIN_U32("graphics/oak_speech/pika2.4bpp.lz"); -- cgit v1.2.3