From fcf6ad0fb53204ad36bdbc4bebc11fdbe6466dbe Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 12 Apr 2019 14:23:19 -0400 Subject: [PATCH] Rename oak speech assets --- ...460D94.bin => help_docs_page2_tilemap.bin} | Bin ...460E34.bin => help_docs_page3_tilemap.bin} | Bin ...{unk_8460568.pal => help_docs_palette.pal} | 0 ...n => new_game_adventure_intro_tilemap.bin} | 0 ....bin => oak_speech_background_tilemap.bin} | Bin ...=> oak_speech_gfx_game_start_help_u_i.png} | Bin ....png => oak_speech_gfx_grass_platform.png} | Bin ...460ED4.pal => oak_speech_gfx_leaf_pal.pal} | 0 ...460F14.png => oak_speech_gfx_leaf_pic.png} | Bin ...8461CD4.pal => oak_speech_gfx_oak_pal.pal} | 0 ...8461D14.png => oak_speech_gfx_oak_pic.png} | Bin ...k_8462B74.png => oak_speech_gfx_pika1.png} | Bin ...k_8462D34.png => oak_speech_gfx_pika2.png} | Bin ...62E18.png => oak_speech_gfx_pika_eyes.png} | Bin ...84615FC.pal => oak_speech_gfx_red_pal.pal} | 0 ...846163C.png => oak_speech_gfx_red_pic.png} | Bin ...623AC.pal => oak_speech_gfx_rival_pal.pal} | 0 ...623EC.png => oak_speech_gfx_rival_pic.png} | Bin ...A4.png => oak_speech_gfx_solid_colors.png} | Bin ... => oak_speech_grass_platform_palette.pal} | 0 ...4629F0.pal => oak_speech_pika_palette.pal} | 0 src/oak_speech.c | 42 +++++++++--------- 22 files changed, 21 insertions(+), 21 deletions(-) rename data/oak_speech/{unk_8460D94.bin => help_docs_page2_tilemap.bin} (100%) rename data/oak_speech/{unk_8460E34.bin => help_docs_page3_tilemap.bin} (100%) rename data/oak_speech/{unk_8460568.pal => help_docs_palette.pal} (100%) rename data/oak_speech/{unk_8460BA8.bin => new_game_adventure_intro_tilemap.bin} (100%) rename data/oak_speech/{unk_8460CE8.bin => oak_speech_background_tilemap.bin} (100%) rename data/oak_speech/{unk_84605E8.png => oak_speech_gfx_game_start_help_u_i.png} (100%) rename data/oak_speech/{unk_8462A10.png => oak_speech_gfx_grass_platform.png} (100%) rename data/oak_speech/{unk_8460ED4.pal => oak_speech_gfx_leaf_pal.pal} (100%) rename data/oak_speech/{unk_8460F14.png => oak_speech_gfx_leaf_pic.png} (100%) rename data/oak_speech/{unk_8461CD4.pal => oak_speech_gfx_oak_pal.pal} (100%) rename data/oak_speech/{unk_8461D14.png => oak_speech_gfx_oak_pic.png} (100%) rename data/oak_speech/{unk_8462B74.png => oak_speech_gfx_pika1.png} (100%) rename data/oak_speech/{unk_8462D34.png => oak_speech_gfx_pika2.png} (100%) rename data/oak_speech/{unk_8462E18.png => oak_speech_gfx_pika_eyes.png} (100%) rename data/oak_speech/{unk_84615FC.pal => oak_speech_gfx_red_pal.pal} (100%) rename data/oak_speech/{unk_846163C.png => oak_speech_gfx_red_pic.png} (100%) rename data/oak_speech/{unk_84623AC.pal => oak_speech_gfx_rival_pal.pal} (100%) rename data/oak_speech/{unk_84623EC.png => oak_speech_gfx_rival_pic.png} (100%) rename data/oak_speech/{unk_8460CA4.png => oak_speech_gfx_solid_colors.png} (100%) rename data/oak_speech/{unk_84629D0.pal => oak_speech_grass_platform_palette.pal} (100%) rename data/oak_speech/{unk_84629F0.pal => oak_speech_pika_palette.pal} (100%) diff --git a/data/oak_speech/unk_8460D94.bin b/data/oak_speech/help_docs_page2_tilemap.bin similarity index 100% rename from data/oak_speech/unk_8460D94.bin rename to data/oak_speech/help_docs_page2_tilemap.bin diff --git a/data/oak_speech/unk_8460E34.bin b/data/oak_speech/help_docs_page3_tilemap.bin similarity index 100% rename from data/oak_speech/unk_8460E34.bin rename to data/oak_speech/help_docs_page3_tilemap.bin diff --git a/data/oak_speech/unk_8460568.pal b/data/oak_speech/help_docs_palette.pal similarity index 100% rename from data/oak_speech/unk_8460568.pal rename to data/oak_speech/help_docs_palette.pal diff --git a/data/oak_speech/unk_8460BA8.bin b/data/oak_speech/new_game_adventure_intro_tilemap.bin similarity index 100% rename from data/oak_speech/unk_8460BA8.bin rename to data/oak_speech/new_game_adventure_intro_tilemap.bin diff --git a/data/oak_speech/unk_8460CE8.bin b/data/oak_speech/oak_speech_background_tilemap.bin similarity index 100% rename from data/oak_speech/unk_8460CE8.bin rename to data/oak_speech/oak_speech_background_tilemap.bin diff --git a/data/oak_speech/unk_84605E8.png b/data/oak_speech/oak_speech_gfx_game_start_help_u_i.png similarity index 100% rename from data/oak_speech/unk_84605E8.png rename to data/oak_speech/oak_speech_gfx_game_start_help_u_i.png diff --git a/data/oak_speech/unk_8462A10.png b/data/oak_speech/oak_speech_gfx_grass_platform.png similarity index 100% rename from data/oak_speech/unk_8462A10.png rename to data/oak_speech/oak_speech_gfx_grass_platform.png diff --git a/data/oak_speech/unk_8460ED4.pal b/data/oak_speech/oak_speech_gfx_leaf_pal.pal similarity index 100% rename from data/oak_speech/unk_8460ED4.pal rename to data/oak_speech/oak_speech_gfx_leaf_pal.pal diff --git a/data/oak_speech/unk_8460F14.png b/data/oak_speech/oak_speech_gfx_leaf_pic.png similarity index 100% rename from data/oak_speech/unk_8460F14.png rename to data/oak_speech/oak_speech_gfx_leaf_pic.png diff --git a/data/oak_speech/unk_8461CD4.pal b/data/oak_speech/oak_speech_gfx_oak_pal.pal similarity index 100% rename from data/oak_speech/unk_8461CD4.pal rename to data/oak_speech/oak_speech_gfx_oak_pal.pal diff --git a/data/oak_speech/unk_8461D14.png b/data/oak_speech/oak_speech_gfx_oak_pic.png similarity index 100% rename from data/oak_speech/unk_8461D14.png rename to data/oak_speech/oak_speech_gfx_oak_pic.png diff --git a/data/oak_speech/unk_8462B74.png b/data/oak_speech/oak_speech_gfx_pika1.png similarity index 100% rename from data/oak_speech/unk_8462B74.png rename to data/oak_speech/oak_speech_gfx_pika1.png diff --git a/data/oak_speech/unk_8462D34.png b/data/oak_speech/oak_speech_gfx_pika2.png similarity index 100% rename from data/oak_speech/unk_8462D34.png rename to data/oak_speech/oak_speech_gfx_pika2.png diff --git a/data/oak_speech/unk_8462E18.png b/data/oak_speech/oak_speech_gfx_pika_eyes.png similarity index 100% rename from data/oak_speech/unk_8462E18.png rename to data/oak_speech/oak_speech_gfx_pika_eyes.png diff --git a/data/oak_speech/unk_84615FC.pal b/data/oak_speech/oak_speech_gfx_red_pal.pal similarity index 100% rename from data/oak_speech/unk_84615FC.pal rename to data/oak_speech/oak_speech_gfx_red_pal.pal diff --git a/data/oak_speech/unk_846163C.png b/data/oak_speech/oak_speech_gfx_red_pic.png similarity index 100% rename from data/oak_speech/unk_846163C.png rename to data/oak_speech/oak_speech_gfx_red_pic.png diff --git a/data/oak_speech/unk_84623AC.pal b/data/oak_speech/oak_speech_gfx_rival_pal.pal similarity index 100% rename from data/oak_speech/unk_84623AC.pal rename to data/oak_speech/oak_speech_gfx_rival_pal.pal diff --git a/data/oak_speech/unk_84623EC.png b/data/oak_speech/oak_speech_gfx_rival_pic.png similarity index 100% rename from data/oak_speech/unk_84623EC.png rename to data/oak_speech/oak_speech_gfx_rival_pic.png diff --git a/data/oak_speech/unk_8460CA4.png b/data/oak_speech/oak_speech_gfx_solid_colors.png similarity index 100% rename from data/oak_speech/unk_8460CA4.png rename to data/oak_speech/oak_speech_gfx_solid_colors.png diff --git a/data/oak_speech/unk_84629D0.pal b/data/oak_speech/oak_speech_grass_platform_palette.pal similarity index 100% rename from data/oak_speech/unk_84629D0.pal rename to data/oak_speech/oak_speech_grass_platform_palette.pal diff --git a/data/oak_speech/unk_84629F0.pal b/data/oak_speech/oak_speech_pika_palette.pal similarity index 100% rename from data/oak_speech/unk_84629F0.pal rename to data/oak_speech/oak_speech_pika_palette.pal diff --git a/src/oak_speech.c b/src/oak_speech.c index b24faee0e..f00d683cf 100644 --- a/src/oak_speech.c +++ b/src/oak_speech.c @@ -113,27 +113,27 @@ extern const u8 gText_Girl[]; extern const struct CompressedSpriteSheet gUnknown_8235194[]; extern const struct CompressedSpritePalette gUnknown_82373F4; -ALIGNED(4) const u16 sHelpDocsPalette[] = INCBIN_U16("data/oak_speech/unk_8460568.gbapal"); -static const u32 sOakSpeechGfx_GameStartHelpUI[] = INCBIN_U32("data/oak_speech/unk_84605E8.4bpp.lz"); -static const u32 sNewGameAdventureIntroTilemap[] = INCBIN_U32("data/oak_speech/unk_8460BA8.bin.lz"); -static const u32 sOakSpeechGfx_SolidColors[] = INCBIN_U32("data/oak_speech/unk_8460CA4.4bpp.lz"); -static const u32 sOakSpeech_BackgroundTilemap[] = INCBIN_U32("data/oak_speech/unk_8460CE8.bin.lz"); -static const u16 sHelpDocsPage2Tilemap[] = INCBIN_U16("data/oak_speech/unk_8460D94.bin"); -static const u16 sHelpDocsPage3Tilemap[] = INCBIN_U16("data/oak_speech/unk_8460E34.bin"); -static const u16 sOakSpeechGfx_LeafPal[] = INCBIN_U16("data/oak_speech/unk_8460ED4.gbapal"); -static const u32 sOakSpeechGfx_LeafPic[] = INCBIN_U32("data/oak_speech/unk_8460F14.8bpp.lz"); -static const u16 sOakSpeechGfx_RedPal[] = INCBIN_U16("data/oak_speech/unk_84615FC.gbapal"); -static const u32 sOakSpeechGfx_RedPic[] = INCBIN_U32("data/oak_speech/unk_846163C.8bpp.lz"); -static const u16 sOakSpeechGfx_OakPal[] = INCBIN_U16("data/oak_speech/unk_8461CD4.gbapal"); -static const u32 sOakSpeechGfx_OakPic[] = INCBIN_U32("data/oak_speech/unk_8461D14.8bpp.lz"); -static const u16 sOakSpeechGfx_RivalPal[] = INCBIN_U16("data/oak_speech/unk_84623AC.gbapal"); -static const u32 sOakSpeechGfx_RivalPic[] = INCBIN_U32("data/oak_speech/unk_84623EC.8bpp.lz"); -static const u16 sOakSpeech_GrassPlatformPalette[] = INCBIN_U16("data/oak_speech/unk_84629D0.gbapal"); -static const u16 sOakSpeech_PikaPalette[] = INCBIN_U16("data/oak_speech/unk_84629F0.gbapal"); -static const u32 sOakSpeechGfx_GrassPlatform[] = INCBIN_U32("data/oak_speech/unk_8462A10.4bpp.lz"); -static const u32 sOakSpeechGfx_Pika1[] = INCBIN_U32("data/oak_speech/unk_8462B74.4bpp.lz"); -static const u32 sOakSpeechGfx_Pika2[] = INCBIN_U32("data/oak_speech/unk_8462D34.4bpp.lz"); -static const u32 sOakSpeechGfx_PikaEyes[] = INCBIN_U32("data/oak_speech/unk_8462E18.4bpp.lz"); +ALIGNED(4) static const u16 sHelpDocsPalette[] = INCBIN_U16("data/oak_speech/help_docs_palette.gbapal"); +static const u32 sOakSpeechGfx_GameStartHelpUI[] = INCBIN_U32("data/oak_speech/oak_speech_gfx_game_start_help_u_i.4bpp.lz"); +static const u32 sNewGameAdventureIntroTilemap[] = INCBIN_U32("data/oak_speech/new_game_adventure_intro_tilemap.bin.lz"); +static const u32 sOakSpeechGfx_SolidColors[] = INCBIN_U32("data/oak_speech/oak_speech_gfx_solid_colors.4bpp.lz"); +static const u32 sOakSpeech_BackgroundTilemap[] = INCBIN_U32("data/oak_speech/oak_speech_background_tilemap.bin.lz"); +static const u16 sHelpDocsPage2Tilemap[] = INCBIN_U16("data/oak_speech/help_docs_page2_tilemap.bin"); +static const u16 sHelpDocsPage3Tilemap[] = INCBIN_U16("data/oak_speech/help_docs_page3_tilemap.bin"); +static const u16 sOakSpeechGfx_LeafPal[] = INCBIN_U16("data/oak_speech/oak_speech_gfx_leaf_pal.gbapal"); +static const u32 sOakSpeechGfx_LeafPic[] = INCBIN_U32("data/oak_speech/oak_speech_gfx_leaf_pic.8bpp.lz"); +static const u16 sOakSpeechGfx_RedPal[] = INCBIN_U16("data/oak_speech/oak_speech_gfx_red_pal.gbapal"); +static const u32 sOakSpeechGfx_RedPic[] = INCBIN_U32("data/oak_speech/oak_speech_gfx_red_pic.8bpp.lz"); +static const u16 sOakSpeechGfx_OakPal[] = INCBIN_U16("data/oak_speech/oak_speech_gfx_oak_pal.gbapal"); +static const u32 sOakSpeechGfx_OakPic[] = INCBIN_U32("data/oak_speech/oak_speech_gfx_oak_pic.8bpp.lz"); +static const u16 sOakSpeechGfx_RivalPal[] = INCBIN_U16("data/oak_speech/oak_speech_gfx_rival_pal.gbapal"); +static const u32 sOakSpeechGfx_RivalPic[] = INCBIN_U32("data/oak_speech/oak_speech_gfx_rival_pic.8bpp.lz"); +static const u16 sOakSpeech_GrassPlatformPalette[] = INCBIN_U16("data/oak_speech/oak_speech_grass_platform_palette.gbapal"); +static const u16 sOakSpeech_PikaPalette[] = INCBIN_U16("data/oak_speech/oak_speech_pika_palette.gbapal"); +static const u32 sOakSpeechGfx_GrassPlatform[] = INCBIN_U32("data/oak_speech/oak_speech_gfx_grass_platform.4bpp.lz"); +static const u32 sOakSpeechGfx_Pika1[] = INCBIN_U32("data/oak_speech/oak_speech_gfx_pika1.4bpp.lz"); +static const u32 sOakSpeechGfx_Pika2[] = INCBIN_U32("data/oak_speech/oak_speech_gfx_pika2.4bpp.lz"); +static const u32 sOakSpeechGfx_PikaEyes[] = INCBIN_U32("data/oak_speech/oak_speech_gfx_pika_eyes.4bpp.lz"); static const struct BgTemplate sBgTemplates[3] = { {