Skip to content

Commit

Permalink
v12 support
Browse files Browse the repository at this point in the history
  • Loading branch information
@Deinonychus71
Deinonychus71 committed Jun 30, 2021
1 parent ccfcd1b commit 9fda698
Show file tree
Hide file tree
Showing 9 changed files with 16,480 additions and 133 deletions.
16,439 changes: 16,347 additions & 92 deletions Resources/ParamLabels.csv
View file

Large diffs are not rendered by default.

41 changes: 41 additions & 0 deletions Resources/nusbank_ids.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1191,3 +1191,44 @@ ID,NUS3Bank Name,Volume
0x0518,bgm_rr33_xbd2_marveni,4
0x0519,bgm_rr34_xbd2_sentou_ira,2.2
0x051a,bgm_zz06_f_element,8
0x051c,bgm_zz07_f_demon,-90
0x051d,bgm_tk01_tk1_marinestadium_japan,4.0
0x051e,bgm_tk02_tk1_chicago_usa,3.3
0x051f,bgm_tk03_tk1_kyoto_japan,3.9
0x0520,bgm_tk04_tk2_heihachi_mishima_thekingof_ironfist,3.5
0x0521,bgm_tk05_tk2_kazuya_mishima_devil_kazuya,5.4
0x0522,bgm_tk06_tk2_emotionless_passion,3.8
0x0523,bgm_tk07_tk3_attractembu_characterselect,4.4
0x0524,bgm_tk08_tk3_hwoarang,4.9
0x0525,bgm_tk09_tk3_jin_kazama,4.3
0x0526,bgm_tk10_tk3_heihachi_mishima,4.2
0x0527,bgm_tk11_tt1_opening_movie,3.9
0x0528,bgm_tk12_tt1_jin_stage,4.1
0x0529,bgm_tk13_tk4_kitsch,4.3
0x052a,bgm_tk14_tk4_bitcrusher,5.2
0x052b,bgm_tk15_tk5_redhotfist,4.3
0x052c,bgm_tk16_tk5_moonlit_wilderness,4.2
0x052d,bgm_tk17_tk5_poolside,3.8
0x052e,bgm_tk18_tk5dr_snowcastle,5.2
0x052f,bgm_tk19_tk5dr_into_nirvana,4.5
0x0530,bgm_tk20_tk5dr_resurrection,5.6
0x0531,bgm_tk21_tk6_ethno_evening,4.0
0x0532,bgm_tk22_tk6_yuki,4.1
0x0533,bgm_tk23_tk6_only_one_fight,3.4
0x0534,bgm_tk24_tk6_dist_thins_out,5.1
0x0535,bgm_tk25_tk6br_karma,4.4
0x0536,bgm_tk26_tk6br_arisa,4.7
0x0537,bgm_tk27_tk6br_yodeling_in_meadowhill,3.8
0x0538,bgm_tk28_tt2_abyss_of_time,3.5
0x0539,bgm_tk29_tt2_plucking_tulips,3.8
0x053a,bgm_tk30_tt2_landscape_under_the_ghost_kaminano,4.6
0x053b,bgm_tk31_tkrv_new_world_order,4.9
0x053c,bgm_tk32_tkrv_no_easy_way_out,4.5
0x053d,bgm_tk33_tk7_heat_haze_shadow,5.5
0x053e,bgm_tk34_tk7_dojo,5.5
0x053f,bgm_tk35_tk7_duomo_di_sirio,4.8
0x0540,bgm_tk36_tk7_moonsiders,4.4
0x0541,bgm_tk37_tk7_desperate_struggle,5.7
0x0542,bgm_tk38_tk7_aloneness,4.1
0x0543,bgm_tk39_tk2_kazuya_mishima_devil_kazuya,3.9
0x0544,bgm_rr35_shgh_burningtown,4.2
3 changes: 2 additions & 1 deletion Resources/valid_series.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,5 @@ persona
dragonquest
banjokazooie
fatalfury
minecraft
minecraft
tekken
7 changes: 5 additions & 2 deletions Sma5h/Core/Sma5h.Core/Helpers/CoreConstants.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ public class CoreConstants
"ui_series_dragonquest",
"ui_series_banjokazooie",
"ui_series_fatalfury",
"ui_series_minecraft"
"ui_series_minecraft",
"ui_series_demon"
};

public static string[] DLC_STAGES = new string[]
Expand All @@ -55,7 +56,8 @@ public class CoreConstants
"ui_stage_tantan",
"ui_stage_pickel",
"ui_stage_edge",
"ui_stage_xeno_alst"
"ui_stage_xeno_alst",
"ui_stage_demon_dojo"
};

public static string[] VALID_STAGES = new string[]
Expand Down Expand Up @@ -194,6 +196,7 @@ public class CoreConstants
"ui_stage_pickel_world",
"ui_stage_ff_cave",
"ui_stage_xeno_alst",
"ui_stage_demon_dojo",
"ui_stage_battle_field_s"
};
}
Expand Down
66 changes: 33 additions & 33 deletions Sma5h/Mods/Sma5h.Mods.Music/Helpers/GameResourcesCrcHelper.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,41 +87,41 @@ public class GameResourcesCrcHelper
},
new GameCrcSet()
{
Version = 11.0,
Version = 12.0,
CrcResources = new Dictionary<string, uint>()
{
{ BgmPropertyFileConstants.BGM_PROPERTY_PATH, 0xBA5AA485 },
{ PrcExtConstants.PRC_UI_BGM_DB_PATH, 0x8C9C8CFA },
{ PrcExtConstants.PRC_UI_GAMETITLE_DB_PATH, 0xD8DF6BB7 },
{ PrcExtConstants.PRC_UI_STAGE_DB_PATH, 0x166F5A24 },
{ string.Format(MsbtExtConstants.MSBT_BGM, "eu_de"), 0x2B7F6EFC },
{ string.Format(MsbtExtConstants.MSBT_BGM, "eu_en"), 0x0523E68A },
{ string.Format(MsbtExtConstants.MSBT_BGM, "eu_es"), 0x0952278B },
{ string.Format(MsbtExtConstants.MSBT_BGM, "eu_fr"), 0x1633E38E },
{ string.Format(MsbtExtConstants.MSBT_BGM, "eu_it"), 0x35C08CC7 },
{ string.Format(MsbtExtConstants.MSBT_BGM, "eu_nl"), 0x66B153D0 },
{ string.Format(MsbtExtConstants.MSBT_BGM, "eu_ru"), 0x5A5FDC42 },
{ string.Format(MsbtExtConstants.MSBT_BGM, "jp_ja"), 0x91A3C495 },
{ string.Format(MsbtExtConstants.MSBT_BGM, "kr_ko"), 0xABA748D1 },
{ string.Format(MsbtExtConstants.MSBT_BGM, "us_en"), 0xA928A9A2 },
{ string.Format(MsbtExtConstants.MSBT_BGM, "us_es"), 0x34B84DCB },
{ string.Format(MsbtExtConstants.MSBT_BGM, "us_fr"), 0xB52AB6BA },
{ string.Format(MsbtExtConstants.MSBT_BGM, "zh_cn"), 0x8DB138DC },
{ string.Format(MsbtExtConstants.MSBT_BGM, "zh_tw"), 0x68E1C851 },
{ string.Format(MsbtExtConstants.MSBT_TITLE, "eu_de"), 0x9691CD0B },
{ string.Format(MsbtExtConstants.MSBT_TITLE, "eu_en"), 0xE92A0719 },
{ string.Format(MsbtExtConstants.MSBT_TITLE, "eu_es"), 0x9A71A59C },
{ string.Format(MsbtExtConstants.MSBT_TITLE, "eu_fr"), 0xB4A176A9 },
{ string.Format(MsbtExtConstants.MSBT_TITLE, "eu_it"), 0xF2E9436F },
{ string.Format(MsbtExtConstants.MSBT_TITLE, "eu_nl"), 0xB3079C50 },
{ string.Format(MsbtExtConstants.MSBT_TITLE, "eu_ru"), 0xC3CF90AC },
{ string.Format(MsbtExtConstants.MSBT_TITLE, "jp_ja"), 0x942D6AD1 },
{ string.Format(MsbtExtConstants.MSBT_TITLE, "kr_ko"), 0x3C424CE3 },
{ string.Format(MsbtExtConstants.MSBT_TITLE, "us_en"), 0xB2F1BD5E },
{ string.Format(MsbtExtConstants.MSBT_TITLE, "us_es"), 0x42EC88D6 },
{ string.Format(MsbtExtConstants.MSBT_TITLE, "us_fr"), 0xA9C3A0FC },
{ string.Format(MsbtExtConstants.MSBT_TITLE, "zh_cn"), 0xB4E54C6C },
{ string.Format(MsbtExtConstants.MSBT_TITLE, "zh_tw"), 0xEFEABC47 }
{ BgmPropertyFileConstants.BGM_PROPERTY_PATH, 0xC785C580 },
{ PrcExtConstants.PRC_UI_BGM_DB_PATH, 0x3320B289 },
{ PrcExtConstants.PRC_UI_GAMETITLE_DB_PATH, 0x533664E1 },
{ PrcExtConstants.PRC_UI_STAGE_DB_PATH, 0x7084D2D8 },
{ string.Format(MsbtExtConstants.MSBT_BGM, "eu_de"), 0x84016BE6 },
{ string.Format(MsbtExtConstants.MSBT_BGM, "eu_en"), 0xF1571085 },
{ string.Format(MsbtExtConstants.MSBT_BGM, "eu_es"), 0xDED83EC6 },
{ string.Format(MsbtExtConstants.MSBT_BGM, "eu_fr"), 0x766048A9 },
{ string.Format(MsbtExtConstants.MSBT_BGM, "eu_it"), 0xA4BA3D7F },
{ string.Format(MsbtExtConstants.MSBT_BGM, "eu_nl"), 0x9A371627 },
{ string.Format(MsbtExtConstants.MSBT_BGM, "eu_ru"), 0x75C1E6B5 },
{ string.Format(MsbtExtConstants.MSBT_BGM, "jp_ja"), 0xFB7BA083 },
{ string.Format(MsbtExtConstants.MSBT_BGM, "kr_ko"), 0x1C36486B },
{ string.Format(MsbtExtConstants.MSBT_BGM, "us_en"), 0x3E9F6E4B },
{ string.Format(MsbtExtConstants.MSBT_BGM, "us_es"), 0xC0C48C07 },
{ string.Format(MsbtExtConstants.MSBT_BGM, "us_fr"), 0x4901DF63 },
{ string.Format(MsbtExtConstants.MSBT_BGM, "zh_cn"), 0x1DDB42E7 },
{ string.Format(MsbtExtConstants.MSBT_BGM, "zh_tw"), 0xDDFE32FE },
{ string.Format(MsbtExtConstants.MSBT_TITLE, "eu_de"), 0x7C355694 },
{ string.Format(MsbtExtConstants.MSBT_TITLE, "eu_en"), 0x0084328C },
{ string.Format(MsbtExtConstants.MSBT_TITLE, "eu_es"), 0x0D716895 },
{ string.Format(MsbtExtConstants.MSBT_TITLE, "eu_fr"), 0x84795FD1 },
{ string.Format(MsbtExtConstants.MSBT_TITLE, "eu_it"), 0xA7891AC9 },
{ string.Format(MsbtExtConstants.MSBT_TITLE, "eu_nl"), 0x744FBDEB },
{ string.Format(MsbtExtConstants.MSBT_TITLE, "eu_ru"), 0x057D7B2E },
{ string.Format(MsbtExtConstants.MSBT_TITLE, "jp_ja"), 0x62B96EBA },
{ string.Format(MsbtExtConstants.MSBT_TITLE, "kr_ko"), 0x10DB3A17 },
{ string.Format(MsbtExtConstants.MSBT_TITLE, "us_en"), 0x1235AB87 },
{ string.Format(MsbtExtConstants.MSBT_TITLE, "us_es"), 0x118E70A3 },
{ string.Format(MsbtExtConstants.MSBT_TITLE, "us_fr"), 0x791364CF },
{ string.Format(MsbtExtConstants.MSBT_TITLE, "zh_cn"), 0xEC7F7A1D },
{ string.Format(MsbtExtConstants.MSBT_TITLE, "zh_tw"), 0x87F06A90 }
}
},
};
Expand Down
4 changes: 2 additions & 2 deletions Sma5h/Mods/Sma5h.Mods.Music/Helpers/MusicConstants.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ namespace Sma5h.Mods.Music.Helpers
{
public class MusicConstants
{
public const double VersionSma5hMusic = 1.42;
public const double VersionSma5hMusicOverride = 1.42;
public const double VersionSma5hMusic = 1.50;
public const double VersionSma5hMusicOverride = 1.50;

public class MusicModFiles
{
Expand Down
3 changes: 3 additions & 0 deletions Sma5h/Mods/Sma5h.Mods.Music/Sma5hMusic.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,9 @@ public override bool Build(bool useCache)
//Persist DB changes
_audioStateService.SaveBgmEntriesToStateManager();

if (useCache)
Directory.CreateDirectory(_config.Value.Sma5hMusic.CachePath);

//Save NUS3Audio/Nus3Bank
foreach (var bgmPropertyEntry in _audioStateService.GetModBgmPropertyEntries())
{
Expand Down
7 changes: 5 additions & 2 deletions Sma5hMusic.GUI/Helpers/Constants.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ namespace Sma5hMusic.GUI.Helpers
{
public static class Constants
{
public const double GUIVersion = 1.42;
public const double GUIVersion = 1.50;

public const float DefaultVolume = 0.8f;
public const float MinimumGameVolume = -20.0f;
Expand Down Expand Up @@ -67,7 +67,8 @@ public class SpecialCategories
{ "ui_series_dragonquest", "Dragon Quest" },
{ "ui_series_banjokazooie", "Banjo-Kazooie" },
{ "ui_series_fatalfury", "Fatal Fury" },
{ "ui_series_minecraft", "Minecraft" }
{ "ui_series_minecraft", "Minecraft" },
{ "ui_series_tekken", "Tekken" }
};

public readonly static Dictionary<string, string> CONVERTER_RECORD_TYPE = new Dictionary<string, string>()
Expand Down Expand Up @@ -143,6 +144,7 @@ public class SpecialCategories
{"bgmpickel", "Minecraft" },
{"bgmedge", "Final Fantasy (Sephiroth)" },
{"bgmelement", "Xenoblade 2 (Pyra & Mythra)" },
{"bgmdemon", "Tekken" },
{"bgmplaylist", "Playlist" },
};

Expand Down Expand Up @@ -282,6 +284,7 @@ public class SpecialCategories
{"ui_stage_pickel_world","Minecraft World"},
{"ui_stage_ff_cave","Northern Cave"},
{"ui_stage_xeno_alst","Cloud Sea of Alrest"},
{"ui_stage_demon_dojo","Mishima Dojo"},
{"ui_stage_battle_field_s", "Small Battlefield"}
};

Expand Down
43 changes: 42 additions & 1 deletion Tools/BgmProperty/bgm_hashes.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -849,6 +849,7 @@ rr31_xbd2_superbiateikoku
rr32_xbd2_raigou_ultimate
rr33_xbd2_marveni
rr34_xbd2_sentou_ira
rr35_shgh_burningtown
s01_rm2_medley
s02_rm2_airman_stage
s03_rm3_sparkman_stage
Expand Down Expand Up @@ -1003,6 +1004,45 @@ t24_sb_duelzone
t25a_sb_shuuten_introcut
t25_sb_shuuten
t27_sb_ending_staffroll
tk01_tk1_marinestadium_japan
tk02_tk1_chicago_usa
tk03_tk1_kyoto_japan
tk04_tk2_heihachi_mishima_thekingof_ironfist
tk05_tk2_kazuya_mishima_devil_kazuya
tk06_tk2_emotionless_passion
tk07_tk3_attractembu_characterselect
tk08_tk3_hwoarang
tk09_tk3_jin_kazama
tk10_tk3_heihachi_mishima
tk11_tt1_opening_movie
tk12_tt1_jin_stage
tk13_tk4_kitsch
tk14_tk4_bitcrusher
tk15_tk5_redhotfist
tk16_tk5_moonlit_wilderness
tk17_tk5_poolside
tk18_tk5dr_snowcastle
tk19_tk5dr_into_nirvana
tk20_tk5dr_resurrection
tk21_tk6_ethno_evening
tk22_tk6_yuki
tk23_tk6_only_one_fight
tk24_tk6_dist_thins_out
tk25_tk6br_karma
tk26_tk6br_arisa
tk27_tk6br_yodeling_in_meadowhill
tk28_tt2_abyss_of_time
tk29_tt2_plucking_tulips
tk30_tt2_landscape_under_the_ghost_kaminano
tk31_tkrv_new_world_order
tk32_tkrv_no_easy_way_out
tk33_tk7_heat_haze_shadow
tk34_tk7_dojo
tk35_tk7_duomo_di_sirio
tk36_tk7_moonsiders
tk37_tk7_desperate_struggle
tk38_tk7_aloneness
tk39_tk2_kazuya_mishima_devil_kazuya
u01_snc_greenhillzone
u02_snc_scrapbrainzone
u03_snc2_emeraldhillzone
Expand Down Expand Up @@ -1189,4 +1229,5 @@ zz03_f_tantan
zz04_f_pickel
zz05_f_edge
zz05a_f_edge_challenge
zz06_f_element
zz06_f_element
zz07_f_demon

0 comments on commit 9fda698

Please sign in to comment.