diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2019-04-12 14:23:19 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-04-12 14:23:19 -0400 |
commit | fcf6ad0fb53204ad36bdbc4bebc11fdbe6466dbe (patch) | |
tree | 25920833f944bc6525b8b0ecae531844c503fbe7 | |
parent | fcc77d3b96ef6f8c314f6427b4f0c17ce66ac6f7 (diff) |
Rename oak speech assets
-rw-r--r-- | data/oak_speech/help_docs_page2_tilemap.bin (renamed from data/oak_speech/unk_8460D94.bin) | bin | 160 -> 160 bytes | |||
-rw-r--r-- | data/oak_speech/help_docs_page3_tilemap.bin (renamed from data/oak_speech/unk_8460E34.bin) | bin | 160 -> 160 bytes | |||
-rw-r--r-- | data/oak_speech/help_docs_palette.pal (renamed from data/oak_speech/unk_8460568.pal) | 0 | ||||
-rw-r--r-- | data/oak_speech/new_game_adventure_intro_tilemap.bin (renamed from data/oak_speech/unk_8460BA8.bin) | 0 | ||||
-rw-r--r-- | data/oak_speech/oak_speech_background_tilemap.bin (renamed from data/oak_speech/unk_8460CE8.bin) | bin | 1280 -> 1280 bytes | |||
-rw-r--r-- | data/oak_speech/oak_speech_gfx_game_start_help_u_i.png (renamed from data/oak_speech/unk_84605E8.png) | bin | 1118 -> 1118 bytes | |||
-rw-r--r-- | data/oak_speech/oak_speech_gfx_grass_platform.png (renamed from data/oak_speech/unk_8462A10.png) | bin | 341 -> 341 bytes | |||
-rw-r--r-- | data/oak_speech/oak_speech_gfx_leaf_pal.pal (renamed from data/oak_speech/unk_8460ED4.pal) | 0 | ||||
-rw-r--r-- | data/oak_speech/oak_speech_gfx_leaf_pic.png (renamed from data/oak_speech/unk_8460F14.png) | bin | 1219 -> 1219 bytes | |||
-rw-r--r-- | data/oak_speech/oak_speech_gfx_oak_pal.pal (renamed from data/oak_speech/unk_8461CD4.pal) | 0 | ||||
-rw-r--r-- | data/oak_speech/oak_speech_gfx_oak_pic.png (renamed from data/oak_speech/unk_8461D14.png) | bin | 1172 -> 1172 bytes | |||
-rw-r--r-- | data/oak_speech/oak_speech_gfx_pika1.png (renamed from data/oak_speech/unk_8462B74.png) | bin | 414 -> 414 bytes | |||
-rw-r--r-- | data/oak_speech/oak_speech_gfx_pika2.png (renamed from data/oak_speech/unk_8462D34.png) | bin | 297 -> 297 bytes | |||
-rw-r--r-- | data/oak_speech/oak_speech_gfx_pika_eyes.png (renamed from data/oak_speech/unk_8462E18.png) | bin | 187 -> 187 bytes | |||
-rw-r--r-- | data/oak_speech/oak_speech_gfx_red_pal.pal (renamed from data/oak_speech/unk_84615FC.pal) | 0 | ||||
-rw-r--r-- | data/oak_speech/oak_speech_gfx_red_pic.png (renamed from data/oak_speech/unk_846163C.png) | bin | 1087 -> 1087 bytes | |||
-rw-r--r-- | data/oak_speech/oak_speech_gfx_rival_pal.pal (renamed from data/oak_speech/unk_84623AC.pal) | 0 | ||||
-rw-r--r-- | data/oak_speech/oak_speech_gfx_rival_pic.png (renamed from data/oak_speech/unk_84623EC.png) | bin | 970 -> 970 bytes | |||
-rw-r--r-- | data/oak_speech/oak_speech_gfx_solid_colors.png (renamed from data/oak_speech/unk_8460CA4.png) | bin | 110 -> 110 bytes | |||
-rw-r--r-- | data/oak_speech/oak_speech_grass_platform_palette.pal (renamed from data/oak_speech/unk_84629D0.pal) | 0 | ||||
-rw-r--r-- | data/oak_speech/oak_speech_pika_palette.pal (renamed from data/oak_speech/unk_84629F0.pal) | 0 | ||||
-rw-r--r-- | src/oak_speech.c | 42 |
22 files changed, 21 insertions, 21 deletions
diff --git a/data/oak_speech/unk_8460D94.bin b/data/oak_speech/help_docs_page2_tilemap.bin Binary files differindex 6d3cd42f1..6d3cd42f1 100644 --- a/data/oak_speech/unk_8460D94.bin +++ b/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 Binary files differindex 24805c96e..24805c96e 100644 --- a/data/oak_speech/unk_8460E34.bin +++ b/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 index b6905b913..b6905b913 100644 --- a/data/oak_speech/unk_8460568.pal +++ b/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 index ad1c8216c..ad1c8216c 100644 --- a/data/oak_speech/unk_8460BA8.bin +++ b/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 Binary files differindex 64374cd24..64374cd24 100644 --- a/data/oak_speech/unk_8460CE8.bin +++ b/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 Binary files differindex 419858b1b..419858b1b 100644 --- a/data/oak_speech/unk_84605E8.png +++ b/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 Binary files differindex 2c8e425d2..2c8e425d2 100644 --- a/data/oak_speech/unk_8462A10.png +++ b/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 index feb1214a1..feb1214a1 100644 --- a/data/oak_speech/unk_8460ED4.pal +++ b/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 Binary files differindex 1825f9960..1825f9960 100644 --- a/data/oak_speech/unk_8460F14.png +++ b/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 index a0b648b2b..a0b648b2b 100644 --- a/data/oak_speech/unk_8461CD4.pal +++ b/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 Binary files differindex 9ac602944..9ac602944 100644 --- a/data/oak_speech/unk_8461D14.png +++ b/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 Binary files differindex 71644c355..71644c355 100644 --- a/data/oak_speech/unk_8462B74.png +++ b/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 Binary files differindex e85cbfa9c..e85cbfa9c 100644 --- a/data/oak_speech/unk_8462D34.png +++ b/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 Binary files differindex 5e2fd80c0..5e2fd80c0 100644 --- a/data/oak_speech/unk_8462E18.png +++ b/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 index 7eec09831..7eec09831 100644 --- a/data/oak_speech/unk_84615FC.pal +++ b/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 Binary files differindex edf5cf9b1..edf5cf9b1 100644 --- a/data/oak_speech/unk_846163C.png +++ b/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 index 8240527a6..8240527a6 100644 --- a/data/oak_speech/unk_84623AC.pal +++ b/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 Binary files differindex 317cbc038..317cbc038 100644 --- a/data/oak_speech/unk_84623EC.png +++ b/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 Binary files differindex 30066cdd8..30066cdd8 100644 --- a/data/oak_speech/unk_8460CA4.png +++ b/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 index 4fb339128..4fb339128 100644 --- a/data/oak_speech/unk_84629D0.pal +++ b/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 index 4d2e92c74..4d2e92c74 100644 --- a/data/oak_speech/unk_84629F0.pal +++ b/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] = { { |