sm64-mirrors/Saturn
1
0
Fork 0
mirror of https://github.com/Llennpie/Saturn.git synced 2025-01-22 15:43:05 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix loading screen

Browse source
This commit is contained in:
Dominicentek 2023-12-19 17:17:09 +01:00
parent 9fe586a903
commit b7eb1eef92
3 changed files with 26 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/pc/pc_main.c
View file

@ -310,7 +310,7 @@ int main(int argc, char *argv[]) {
saturn_extract_rom(EXTRACT_TYPE_ALL);
return 0;
} else {
int result = saturn_extract_rom(EXTRACT_TYPE_SOUND | EXTRACT_TYPE_SATURN | EXTRACT_TYPE_FONT);
int result = saturn_extract_rom(~EXTRACT_TYPE_TEXTURES);
// Start game
if (result == 0)
main_func();

23
src/saturn/saturn_assets.h
View file

@ -304821,6 +304821,29 @@ std::vector<Asset> assets = {
{ "sound/bank_sets", -1, 8177184, 160, { } },
};
std::vector<std::string> menu_font = {
"gfx/levels/menu/main_menu_seg7_us.0AC40.ia8.png",
"gfx/levels/menu/main_menu_seg7_us.0AC80.ia8.png",
"gfx/levels/menu/main_menu_seg7_us.0ACC0.ia8.png",
"gfx/levels/menu/main_menu_seg7_us.0AD00.ia8.png",
"gfx/levels/menu/main_menu_seg7_us.0AD40.ia8.png",
"gfx/levels/menu/main_menu_seg7_us.0AD80.ia8.png",
"gfx/levels/menu/main_menu_seg7_us.0ADC0.ia8.png",
"gfx/levels/menu/main_menu_seg7_us.0AE00.ia8.png",
"gfx/levels/menu/main_menu_seg7_us.0AE40.ia8.png",
"gfx/levels/menu/main_menu_seg7_us.0AE80.ia8.png",
"gfx/levels/menu/main_menu_seg7_us.0AEC0.ia8.png",
"gfx/levels/menu/main_menu_seg7_us.0AF40.ia8.png",
"gfx/levels/menu/main_menu_seg7_us.0AFC0.ia8.png",
"gfx/levels/menu/main_menu_seg7_us.0B040.ia8.png",
"gfx/levels/menu/main_menu_seg7_us.0B0C0.ia8.png",
"gfx/levels/menu/main_menu_seg7_us.0B200.ia8.png",
"gfx/levels/menu/main_menu_seg7_us.0B300.ia8.png",
"gfx/levels/menu/main_menu_seg7_us.0B340.ia8.png",
"gfx/levels/menu/main_menu_seg7_us.0B380.ia8.png",
"gfx/levels/menu/main_menu_seg7_us.0B480.ia8.png",
};
std::vector<SaturnAsset> saturn_assets = {
{ "gfx/textures/saturn/mario_logo.rgba16.png", mario_logo_rgba16, { 32, 32 } },
{ "gfx/textures/saturn/white.rgba16.png", white_rgba16, { 32, 32 } },

4
src/saturn/saturn_rom_extract.cpp
View file

@ -275,9 +275,9 @@ int saturn_rom_status(std::filesystem::path extract_dest, std::vector<std::strin
for (const auto& entry : assets) {
if ((entry.metadata.size() == 0) && !(type & EXTRACT_TYPE_SOUND)) continue;
int textype = TEXTYPE_OTHER;
if (entry.path.find("font_graphics") != std::string::npos) textype = TEXTYPE_FONT;
if (std::find(menu_font.begin(), menu_font.end(), entry.path) != menu_font.end()) textype = TEXTYPE_FONT;
if (entry.path.find("segment2.0F458.ia8") != std::string::npos ||
entry.path.find("segment2.0FC58.ia8") != std::string::npos) textype = TEXTYPE_FONT;
entry.path.find("segment2.0FC58.ia8") != std::string::npos) textype = TEXTYPE_TRANSITION;
if (textype == TEXTYPE_OTHER && (entry.metadata.size() != 0) && !(type & EXTRACT_TYPE_TEXTURES )) continue;
if (textype == TEXTYPE_FONT && (entry.metadata.size() != 0) && !(type & EXTRACT_TYPE_FONT )) continue;
if (textype == TEXTYPE_TRANSITION && (entry.metadata.size() != 0) && !(type & EXTRACT_TYPE_TRANSITION)) continue;