diff --git a/lang/Czech.ini b/lang/Czech.ini index 7f27310f4..2cc3e555c 100644 --- a/lang/Czech.ini +++ b/lang/Czech.ini @@ -214,7 +214,11 @@ MISC = "Různé" ROMHACKS = "Romhacks" GAMEMODES = "Herní režimy" MOVESETS = "Sady pohybů" -CHARACTER_SELECT = "Character Select" +GRAPHICS = "Grafika" +QOL = "Vylepšení" +UTILITY = "Nástroje" +AUDIO = "Zvuk" +CHARACTERS = "Postavy" [HOST_SAVE] SAVE_TITLE = "UKLADACI SLOT" diff --git a/lang/Dutch.ini b/lang/Dutch.ini index e5ed7ed26..5500beaab 100644 --- a/lang/Dutch.ini +++ b/lang/Dutch.ini @@ -214,7 +214,11 @@ MISC = "Diverse" ROMHACKS = "Romhacks" GAMEMODES = "Spelmodi" MOVESETS = "Bewegingssets" -CHARACTER_SELECT = "Character Select" +GRAPHICS = "Grafische instellingen" +QOL = "Gebruiksgemak" +UTILITY = "Hulpmiddelen" +AUDIO = "Audio" +CHARACTERS = "Personages" [HOST_SAVE] SAVE_TITLE = "OPSLAAN" diff --git a/lang/English.ini b/lang/English.ini index 693919540..c8ec4a056 100644 --- a/lang/English.ini +++ b/lang/English.ini @@ -214,7 +214,11 @@ MISC = "Misc" ROMHACKS = "Romhacks" GAMEMODES = "Gamemodes" MOVESETS = "Movesets" -CHARACTER_SELECT = "Character Select" +GRAPHICS = "Graphics" +QOL = "QoL" +UTILITY = "Utility" +AUDIO = "Audio" +CHARACTERS = "Characters" [HOST_SAVE] SAVE_TITLE = "SAVE" diff --git a/lang/French.ini b/lang/French.ini index af48eeed9..f353a16d8 100644 --- a/lang/French.ini +++ b/lang/French.ini @@ -214,7 +214,11 @@ MISC = "Autres" ROMHACKS = "Romhacks" GAMEMODES = "Modes de jeu" MOVESETS = "Movesets" -CHARACTER_SELECT = "Character Select" +GRAPHICS = "Graphismes" +QOL = "Confort de jeu" +UTILITY = "Utilitaires" +AUDIO = "Audio" +CHARACTERS = "Personnages" [HOST_SAVE] SAVE_TITLE = "SAUVEGARDE" diff --git a/lang/German.ini b/lang/German.ini index 5393dd853..d31dfa97f 100644 --- a/lang/German.ini +++ b/lang/German.ini @@ -214,7 +214,11 @@ MISC = "Sonstiges" ROMHACKS = "Rom-Hacks" GAMEMODES = "Spielmodi" MOVESETS = "Movesets" -CHARACTER_SELECT = "Charakterauswahl" +GRAPHICS = "Grafik" +QOL = "Komfortfunktionen" +UTILITY = "Dienstprogramme" +AUDIO = "Audio" +CHARACTERS = "Charaktere" [HOST_SAVE] SAVE_TITLE = "SPEICHERN" diff --git a/lang/Italian.ini b/lang/Italian.ini index e13d3c9c0..0085a3a59 100644 --- a/lang/Italian.ini +++ b/lang/Italian.ini @@ -212,7 +212,11 @@ MISC = "Varie" ROMHACKS = "Romhack" GAMEMODES = "Modalità di gioco" MOVESETS = "Set di spostamenti" -CHARACTER_SELECT = "Character Select" +GRAPHICS = "Grafica" +QOL = "Miglioramenti" +UTILITY = "Utilità" +AUDIO = "Audio" +CHARACTERS = "Personaggi" [HOST_SAVE] SAVE_TITLE = "SALVATAGGI" diff --git a/lang/Japanese.ini b/lang/Japanese.ini index 2777b5359..2d4749398 100644 --- a/lang/Japanese.ini +++ b/lang/Japanese.ini @@ -214,7 +214,11 @@ MISC = "その他" ROMHACKS = "ロムハック系" GAMEMODES = "ゲームモード系" MOVESETS = "ムーブセット系" -CHARACTER_SELECT = "追加キャラクター系" +GRAPHICS = "グラフィック" +QOL = "快適性" +UTILITY = "ユーティリティ" +AUDIO = "オーディオ" +CHARACTERS = "キャラクター" [HOST_SAVE] SAVE_TITLE = "SAVE" diff --git a/lang/Polish.ini b/lang/Polish.ini index 02c8647c8..519be61d0 100644 --- a/lang/Polish.ini +++ b/lang/Polish.ini @@ -214,7 +214,11 @@ MISC = "Pozostałe" ROMHACKS = "ROM hacki" GAMEMODES = "Tryby gry" MOVESETS = "Zestawy ruchów" -CHARACTER_SELECT = "Character Select" +GRAPHICS = "Grafika" +QOL = "Ułatwienia" +UTILITY = "Narzędzia" +AUDIO = "Audio" +CHARACTERS = "Postacie" [HOST_SAVE] SAVE_TITLE = "ZAPISY" diff --git a/lang/Portuguese.ini b/lang/Portuguese.ini index 08342a212..17af45c10 100644 --- a/lang/Portuguese.ini +++ b/lang/Portuguese.ini @@ -214,7 +214,11 @@ MISC = "Outros" ROMHACKS = "Romhacks" GAMEMODES = "Modos de jogo" MOVESETS = "Movesets" -CHARACTER_SELECT = "Character Select" +GRAPHICS = "Gráficos" +QOL = "Qualidade de Vida" +UTILITY = "Utilitários" +AUDIO = "Áudio" +CHARACTERS = "Personagens" [HOST_SAVE] SAVE_TITLE = "ARQUIVO" diff --git a/lang/Russian.ini b/lang/Russian.ini index 09bff01c0..2e6a340d9 100644 --- a/lang/Russian.ini +++ b/lang/Russian.ini @@ -213,7 +213,11 @@ MISC = "Разное" ROMHACKS = "Romhacks" GAMEMODES = "Игровые режимы" MOVESETS = "Наборы движений" -CHARACTER_SELECT = "Character Select" +GRAPHICS = "Графика" +QOL = "Улучшения" +UTILITY = "Утилиты" +AUDIO = "Аудио" +CHARACTERS = "Персонажи" [HOST_SAVE] SAVE_TITLE = "SAVE" diff --git a/lang/Spanish.ini b/lang/Spanish.ini index 1983d8a11..e8ecc71fb 100644 --- a/lang/Spanish.ini +++ b/lang/Spanish.ini @@ -214,7 +214,11 @@ MISC = "Otros" ROMHACKS = "Romhacks" GAMEMODES = "Modos de juego" MOVESETS = "Movimientos" -CHARACTER_SELECT = "Character Select" +GRAPHICS = "Gráficos" +QOL = "Mejoras calidad de vida" +UTILITY = "Utilidades" +AUDIO = "Audio" +CHARACTERS = "Personajes" [HOST_SAVE] SAVE_TITLE = "ARCHIVOS DE\nGUARDADO" diff --git a/src/pc/djui/djui_panel_host_mods.c b/src/pc/djui/djui_panel_host_mods.c index 9d6bd3491..719ca1ba7 100644 --- a/src/pc/djui/djui_panel_host_mods.c +++ b/src/pc/djui/djui_panel_host_mods.c @@ -37,7 +37,11 @@ struct ModCategory sCategories[] = { { "ROMHACKS", "romhack" }, { "GAMEMODES", "gamemode" }, { "MOVESETS", "moveset" }, - { "CHARACTER_SELECT", "cs" }, + { "GRAPHICS", "graphics" }, + { "QOL", "qol" }, + { "UTILITY", "utility" }, + { "AUDIO", "audio" }, + { "CHARACTERS", "character" } }; static const int numCategories = sizeof(sCategories) / sizeof(sCategories[0]); @@ -95,7 +99,7 @@ static void djui_mod_checkbox_on_hover_end(UNUSED struct DjuiBase* base) { static void djui_mod_checkbox_on_value_change(UNUSED struct DjuiBase* base) { mods_update_selectable(); - if (mods_get_enabled_count() - mods_get_character_select_count() >= 10) { + if (mods_get_enabled_count() >= 10) { if (!sWarned) { sWarned = true; djui_popup_create(DLANG(HOST_MODS, WARNING), 3); @@ -135,6 +139,10 @@ void djui_panel_host_mods_add_mods(struct DjuiBase* layoutBase) { for (int i = 0; i < gLocalMods.entryCount; i++) { struct Mod* mod = gLocalMods.entries[i]; char* category = mod->category != NULL ? mod->category : mod->incompatible; + if (category != NULL) { + category = !strcmp(category, "cs") ? "character" : category; + } + switch (sSelectedCategory) { case MOD_CATEGORY_ALL: { break; } case MOD_CATEGORY_MISC: { diff --git a/src/pc/mods/mods.c b/src/pc/mods/mods.c index 84b8fb497..8508de3e7 100644 --- a/src/pc/mods/mods.c +++ b/src/pc/mods/mods.c @@ -56,19 +56,6 @@ u16 mods_get_enabled_count(void) { return enabled; } -u16 mods_get_character_select_count(void) { - u16 enabled = 0; - - for (u16 i = 0; i < gLocalMods.entryCount; i++) { - struct Mod* mod = gLocalMods.entries[i]; - if (mod->enabled && mod->category && strcmp(mod->category, "cs") == 0) { - enabled++; - } - } - - return enabled; -} - bool mods_get_all_pausable(void) { bool pausable = true; diff --git a/src/pc/mods/mods.h b/src/pc/mods/mods.h index 4f4a7de4a..c66a06a05 100644 --- a/src/pc/mods/mods.h +++ b/src/pc/mods/mods.h @@ -24,7 +24,6 @@ extern char gRemoteModsBasePath[]; void mods_get_main_mod_name(char* destination, u32 maxSize); u16 mods_get_enabled_count(void); -u16 mods_get_character_select_count(void); bool mods_get_all_pausable(void); bool mods_generate_remote_base_path(void); void mods_activate(struct Mods* mods);