dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Give Oak Speech graphics files more accurate names

Browse Source
This commit is contained in:
SphericalIce
2023-01-05 09:25:40 +00:00
parent f683ffa628
commit ef4ee97e26
7 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
graphics/oak_speech/controls_guide/palette.pal → graphics/oak_speech/bg_pals.pal
View File
graphics/oak_speech/controls_guide/tiles.png → graphics/oak_speech/bg_tiles.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

graphics/oak_speech/controls_guide/page_2.bin → graphics/oak_speech/controls_guide_page_2.bin
View File
graphics/oak_speech/controls_guide/page_3.bin → graphics/oak_speech/controls_guide_page_3.bin
View File
graphics/oak_speech/background.bin → graphics/oak_speech/oak_speech_bg.bin
View File
graphics/oak_speech/background.png → graphics/oak_speech/oak_speech_bg.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 110 B

After

Width:  |  Height:  |  Size: 110 B

src/oak_speech.c
+11 -11
View File
@@ -114,13 +114,13 @@ extern const struct OamData gOamData_AffineOff_ObjNormal_32x32;
extern const struct OamData gOamData_AffineOff_ObjNormal_32x16; extern const struct OamData gOamData_AffineOff_ObjNormal_32x16;
extern const struct OamData gOamData_AffineOff_ObjNormal_16x8; extern const struct OamData gOamData_AffineOff_ObjNormal_16x8;
static const u16 sControlsGuide_Pal[] = INCBIN_U16("graphics/oak_speech/controls_guide/palette.gbapal"); static const u16 sOakSpeech_Background_Pals[] = INCBIN_U16("graphics/oak_speech/bg_pals.gbapal"); // Shared by the Controls Guide, Pikachu Intro and Oak Speech scenes
static const u32 sControlsGuide_Tiles[] = INCBIN_U32("graphics/oak_speech/controls_guide/tiles.4bpp.lz"); static const u32 sControlsGuide_PikachuIntro_Background_Tiles[] = INCBIN_U32("graphics/oak_speech/bg_tiles.4bpp.lz");
static const u32 sPikachuIntro_Tilemap[] = INCBIN_U32("graphics/oak_speech/pikachu_intro/tilemap.bin.lz"); static const u32 sPikachuIntro_Background_Tilemap[] = INCBIN_U32("graphics/oak_speech/pikachu_intro/tilemap.bin.lz");
static const u32 sOakSpeech_Background_Tiles[] = INCBIN_U32("graphics/oak_speech/background.4bpp.lz"); static const u32 sOakSpeech_Background_Tiles[] = INCBIN_U32("graphics/oak_speech/oak_speech_bg.4bpp.lz");
static const u32 sOakSpeech_Background_Tilemap[] = INCBIN_U32("graphics/oak_speech/background.bin.lz"); static const u32 sOakSpeech_Background_Tilemap[] = INCBIN_U32("graphics/oak_speech/oak_speech_bg.bin.lz");
static const u16 sControlsGuide_Tilemap_Page2[] = INCBIN_U16("graphics/oak_speech/controls_guide/page_2.bin"); static const u16 sControlsGuide_Tilemap_Page2[] = INCBIN_U16("graphics/oak_speech/controls_guide_page_2.bin");
static const u16 sControlsGuide_Tilemap_Page3[] = INCBIN_U16("graphics/oak_speech/controls_guide/page_3.bin"); static const u16 sControlsGuide_Tilemap_Page3[] = INCBIN_U16("graphics/oak_speech/controls_guide_page_3.bin");
static const u16 sOakSpeech_Leaf_Pal[] = INCBIN_U16("graphics/oak_speech/leaf/pal.gbapal"); static const u16 sOakSpeech_Leaf_Pal[] = INCBIN_U16("graphics/oak_speech/leaf/pal.gbapal");
static const u32 sOakSpeech_Leaf_Tiles[] = INCBIN_U32("graphics/oak_speech/leaf/pic.8bpp.lz"); static const u32 sOakSpeech_Leaf_Tiles[] = INCBIN_U32("graphics/oak_speech/leaf/pic.8bpp.lz");
static const u16 sOakSpeech_Red_Pal[] = INCBIN_U16("graphics/oak_speech/red/pal.gbapal"); static const u16 sOakSpeech_Red_Pal[] = INCBIN_U16("graphics/oak_speech/red/pal.gbapal");
@@ -752,13 +752,13 @@ static void Task_NewGameScene(u8 taskId)
InitStandardTextBoxWindows(); InitStandardTextBoxWindows();
InitTextBoxGfxAndPrinters(); InitTextBoxGfxAndPrinters();
Menu_LoadStdPalAt(0xD0); Menu_LoadStdPalAt(0xD0);
LoadPalette(sControlsGuide_Pal, 0, 0x80); LoadPalette(sOakSpeech_Background_Pals, 0, 0x80);
LoadPalette(GetTextWindowPalette(2) + 15, 0, 2); LoadPalette(GetTextWindowPalette(2) + 15, 0, 2);
break; break;
case 5: case 5:
sOakSpeechResources->textSpeed = GetTextSpeedSetting(); sOakSpeechResources->textSpeed = GetTextSpeedSetting();
gTextFlags.canABSpeedUpPrint = TRUE; gTextFlags.canABSpeedUpPrint = TRUE;
DecompressAndCopyTileDataToVram(1, sControlsGuide_Tiles, 0, 0, 0); DecompressAndCopyTileDataToVram(1, sControlsGuide_PikachuIntro_Background_Tiles, 0, 0, 0);
break; break;
case 6: case 6:
if (FreeTempTileDataBuffersIfPossible()) if (FreeTempTileDataBuffersIfPossible())
@@ -950,7 +950,7 @@ static void Task_PikachuIntro_LoadPage1(u8 taskId)
PlayBGM(MUS_NEW_GAME_INTRO); PlayBGM(MUS_NEW_GAME_INTRO);
ClearTopBarWindow(); ClearTopBarWindow();
TopBarWindowPrintString(gText_ABUTTONNext, 0, 1); TopBarWindowPrintString(gText_ABUTTONNext, 0, 1);
sOakSpeechResources->pikachuIntroTilemap = MallocAndDecompress(sPikachuIntro_Tilemap, &size); sOakSpeechResources->pikachuIntroTilemap = MallocAndDecompress(sPikachuIntro_Background_Tilemap, &size);
CopyToBgTilemapBufferRect(1, sOakSpeechResources->pikachuIntroTilemap, 0, 2, 30, 19); CopyToBgTilemapBufferRect(1, sOakSpeechResources->pikachuIntroTilemap, 0, 2, 30, 19);
CopyBgTilemapBufferToVram(1); CopyBgTilemapBufferToVram(1);
Free(sOakSpeechResources->pikachuIntroTilemap); Free(sOakSpeechResources->pikachuIntroTilemap);
@@ -1823,7 +1823,7 @@ static void CB2_ReturnFromNamingScreen(void)
FreeAllWindowBuffers(); FreeAllWindowBuffers();
InitStandardTextBoxWindows(); InitStandardTextBoxWindows();
InitTextBoxGfxAndPrinters(); InitTextBoxGfxAndPrinters();
LoadPalette(sControlsGuide_Pal, 0, 0xE0); LoadPalette(sOakSpeech_Background_Pals, 0, 0xE0);
break; break;
case 4: case 4:
DecompressAndCopyTileDataToVram(1, sOakSpeech_Background_Tiles, 0, 0, 0); DecompressAndCopyTileDataToVram(1, sOakSpeech_Background_Tiles, 0, 0, 0);