Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/asset_reference.md
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ A build of the game.
| Name | Description | Type | Required | Games |
| - | - | - | - | - |
| game | The game being built. Possible values: "rac", "gc", "uya", "dl". | String | Yes | RAC/GC/UYA/DL |
| region | The region. Possible values: "us", "eu", "japan". | String | Yes | RAC/GC/UYA/DL |
| region | The region. Possible values: "us", "eu", "japan", "korea". | String | Yes | RAC/GC/UYA/DL |
| version | The version number, as specified in the SYSTEM.CNF file. | String | Yes | RAC/GC/UYA/DL |
| ps2_logo_key | The key used to "encrypt" the PS2 logo. | Integer | No | RAC/GC/UYA/DL |

Expand Down
2 changes: 1 addition & 1 deletion src/assetmgr/asset_schema.wtf
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ AssetType Build {
games: [1 2 3 4]
}
StringAttribute region {
desc: "The region. Possible values: \"us\", \"eu\", \"japan\"."
desc: "The region. Possible values: \"us\", \"eu\", \"japan\, \"korea\"."
required: true
games: [1 2 3 4]
}
Expand Down
2 changes: 2 additions & 0 deletions src/core/build_config.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ Region region_from_string(const std::string& region)
if (region == "us") return Region::US;
if (region == "eu") return Region::EU;
if (region == "japan") return Region::JAPAN;
if (region == "korea") return Region::KOREA;
return Region::UNKNOWN;
}

Expand All @@ -96,6 +97,7 @@ std::string region_to_string(Region region)
case Region::US: return "us";
case Region::EU: return "eu";
case Region::JAPAN: return "japan";
case Region::KOREA: return "korea";
default: return "unknown";
}
}
2 changes: 1 addition & 1 deletion src/core/build_config.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ enum

enum class Region : u8
{
UNKNOWN = 0, US = 1, EU = 2, JAPAN = 3
UNKNOWN = 0, US = 1, EU = 2, JAPAN = 3, KOREA = 4
};

class BuildConfig
Expand Down
15 changes: 9 additions & 6 deletions src/core/release.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,29 +25,32 @@ static const Release RELEASES[] = {
{"scus_971.99", Game::RAC, Region::US, "Ratchet & Clank"}, // us original/greatest hits
{"scus_972.09", Game::RAC, Region::US, "Ratchet & Clank"}, // us demo 1
{"scus_972.40", Game::RAC, Region::US, "Ratchet & Clank"}, // us demo 2
{"scps_150.56", Game::GC, Region::JAPAN, "Ratchet & Clank: Going Commando"}, // japan original
{"scps_150.56", Game::GC, Region::JAPAN, "Ratchet & Clank: Gagaga! Ginga no Commando ssu"}, // japan original
{"sces_516.07", Game::GC, Region::EU, "Ratchet & Clank 2"}, // eu original/platinum
{"scus_972.68", Game::GC, Region::US, "Ratchet & Clank: Going Commando"}, // us greatest hits
{"scus_972.68", Game::GC, Region::US, "Ratchet & Clank: Going Commando"}, // us original
{"scus_973.22", Game::GC, Region::US, "Ratchet & Clank: Going Commando"}, // us demo
{"scus_973.23", Game::GC, Region::US, "Ratchet & Clank: Going Commando"}, // us retail employees demo
{"scus_973.74", Game::GC, Region::US, "Ratchet & Clank: Going Commando"}, // us rac2 + jak demo
{"scka_200.11", Game::GC, Region::KOREA, "Ratchet & Clank: Gonggu Jeonsa Daebak Moli"}, // korea original
{"papx_905.20", Game::UYA, Region::JAPAN, "Ratchet & Clank: Up Your Arsenal"}, // japan promotional
{"sced_528.47", Game::UYA, Region::EU, "Ratchet & Clank 3"}, // eu demo
{"sced_528.48", Game::UYA, Region::EU, "Ratchet & Clank 3"}, // r&c3 + sly 2 demo
{"sces_524.56", Game::UYA, Region::EU, "Ratchet & Clank 3"}, // eu original/plantinum
{"scps_150.84", Game::UYA, Region::JAPAN, "Ratchet & Clank: Up Your Arsenal"}, // japan original
{"scps_150.84", Game::UYA, Region::JAPAN, "Ratchet & Clank 3: Totsugeki! Galactic Rangers"}, // japan original
{"scus_973.53", Game::UYA, Region::US, "Ratchet & Clank: Up Your Arsenal"}, // us original
{"scus_974.11", Game::UYA, Region::US, "Ratchet & Clank: Up Your Arsenal"}, // us demo
{"scus_974.13", Game::UYA, Region::US, "Ratchet & Clank: Up Your Arsenal"}, // us beta
{"tces_524.56", Game::UYA, Region::EU, "Ratchet & Clank 3"}, // eu beta trial code
{"pcpx_980.17", Game::DL, Region::JAPAN, "Ratchet & Clank 4"}, // japan demo
{"sced_536.60", Game::DL, Region::EU, "Ratchet: Gladiator"}, // jak x glaiator demo
{"scka_200.37", Game::UYA, Region::KOREA, "Ratchet & Clank: Gonggu Jeonsa Reloaded"}, // korea original
{"pcpx_980.17", Game::DL, Region::JAPAN, "Ratchet & Clank 4th: Giri Giri Ginga no Giga Battle"}, // japan demo
{"sced_536.60", Game::DL, Region::EU, "Ratchet: Gladiator"}, // jak x gladiator demo
{"sces_532.85", Game::DL, Region::EU, "Ratchet: Gladiator"}, // eu original/platinum
{"scps_150.99", Game::DL, Region::JAPAN, "Ratchet & Clank 4"}, // japan special gift package
{"scps_151.00", Game::DL, Region::JAPAN, "Ratchet & Clank 4"}, // japan reprint
{"scps_150.99", Game::DL, Region::JAPAN, "Ratchet & Clank 4th: Giri Giri Ginga no Giga Battle"}, // japan special gift package
{"scps_151.00", Game::DL, Region::JAPAN, "Ratchet & Clank 4th: Giri Giri Ginga no Giga Battle"}, // japan reprint
{"scus_974.65", Game::DL, Region::US, "Ratchet: Deadlocked"}, // us original
{"scus_974.85", Game::DL, Region::US, "Ratchet: Deadlocked"}, // us demo
{"scka_200.60", Game::DL, Region::KOREA, "Ratchet & Clank: Gonggu Jeonsa Wigi Ilbal"}, // korea original
{"scus_974.87", Game::DL, Region::US, "Ratchet: Deadlocked"} // us public beta
};

Expand Down
4 changes: 2 additions & 2 deletions src/wrenchbuild/globals/mpeg_wad.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,8 @@ static void unpack_gc_uya_dl_mpeg_wad(
} else {
unpack_asset(mpeg.video_pal(), src, header.mpegs[i].video, config, FMT_BINARY_PSS);
}
if (config.region() == Region::JAPAN) {
// The Japanese subtitles are in a different format, so just
if (config.region() == Region::JAPAN || config.region() == Region::KOREA) {
// The Japanese/Korean subtitles are in a different format, so just
// unpack them as binaries.
BinaryAsset& subtitles = mpeg.child<BinaryAsset>("subtitles");
unpack_asset(subtitles, src, header.mpegs[i].subtitles, config, FMT_NO_HINT);
Expand Down
4 changes: 2 additions & 2 deletions src/wrenchbuild/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -726,14 +726,14 @@ static void print_usage(bool developer_subcommands)
puts(" unpack <input file> -o <output dir> [-g <game>] [-r <region>] [-s]");
puts(" Unpack an ISO or WAD file to produce an asset bank of source files.");
puts(" If the file to be unpacked is a WAD, the game (rac, gc, uya or dl) should be");
puts(" specified and the region (us, eu or japan) must be specified.");
puts(" specified and the region (us, eu or japan, korea) must be specified.");
puts(" Optionally, files unpacked from an ISO can be placed in a subdirectory with a");
puts(" name based on the identified release of said ISO by passing -s.");
puts("");
puts(" pack <input asset banks> -a <asset link> -o <output iso> [-h <hint>] [-g <game>] [-r <region>]");
puts(" Pack an asset (e.g. a build) to produce a built file (e.g. an ISO file).");
puts(" If <asset link> is not a build, the game (rac, gc, uya or dl) and the region");
puts(" (us, eu or japan) must be specified.");
puts(" (us, eu or japan, korea) must be specified.");
puts(" A hint string used to specify the format of the asset can be set by");
puts(" passing -h, which is required for certain types of assets such as builds.");
puts(" These strings are documented in the asset reference.");
Expand Down