pbwraith/gopher64-netplay
Archived
1
0
Fork 0
Code Issues Pull Requests 3 Actions Packages Projects Releases Wiki Activity

shift jis support

Browse Source
This commit is contained in:
Logan McNaughton 2023-10-15 19:56:54 +03:00
parent 77d9f65196
commit a75e7a08cb
2 changed files with 36 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.toml
View File

@ -9,6 +9,7 @@ edition = "2021"
dirs = "5.0"
zip = "0.6"
governor = "0.6"
encoding_rs = "0.8"
sevenz-rust = "0.5"
chrono = "0.4"
sha2 = "0.10"

40
src/device/cart_rom.rs
View File

@ -7,6 +7,7 @@ pub enum CicType {
CicNus6103,
CicNus6105,
CicNus6106,
CicNus5167,
}
pub const CART_MASK: usize = 0xFFFFFFF;
@ -69,8 +70,14 @@ pub fn write_mem(device: &mut device::Device, _address: u64, value: u32, mask: u
);
}
pub fn dma_read(device: &mut device::Device, _cart_addr: u32, _dram_addr: u32, length: u32) -> u64 {
return device::pi::calculate_cycles(device, 1, length);
pub fn dma_read(
_device: &mut device::Device,
_cart_addr: u32,
_dram_addr: u32,
_length: u32,
) -> u64 {
panic!("cart rom write");
// return device::pi::calculate_cycles(device, 1, length);
}
// cart is big endian, rdram is native endian
@ -102,10 +109,28 @@ pub fn init(device: &mut device::Device, rom_file: Vec<u8>) {
set_system_region(device, device.cart.rom[0x3E]);
set_cic(device);
let data =
std::str::from_utf8(&device.cart.rom[0x20 as usize..(0x20 + 0x14) as usize]).unwrap();
let decoded_game_name;
let jis_string;
let utf8_result = std::str::from_utf8(&device.cart.rom[0x20 as usize..(0x20 + 0x14) as usize]);
if utf8_result.is_ok() {
decoded_game_name = utf8_result.unwrap()
} else {
let (jis_result, _enc, jis_errors) =
encoding_rs::SHIFT_JIS.decode(&device.cart.rom[0x20 as usize..(0x20 + 0x14) as usize]);
if jis_errors {
decoded_game_name = "Unknown"
} else {
jis_string = jis_result.to_string();
decoded_game_name = jis_string.as_str();
}
}
let hash = calculate_hash(&device.cart.rom);
device.ui.game_name = format!("{}-{}", data.trim().trim_matches(char::from(0)), hash);
device.ui.game_name = format!(
"{}-{}",
decoded_game_name.trim().trim_matches(char::from(0)),
hash
);
device.ui.game_id = String::from_utf8(device.cart.rom[0x3B..0x3E].to_vec()).unwrap();
}
@ -146,6 +171,11 @@ pub fn set_cic(device: &mut device::Device) {
device.cart.cic_seed = 0x85;
device.cart.rdram_size_offset = 0x318;
}
"53C0088FB777870D0AF32F0251E964030E2E8B72E830C26042FD191169508C05" => {
device.cart.cic_type = CicType::CicNus5167;
device.cart.cic_seed = 0xdd;
device.cart.rdram_size_offset = 0x318;
}
_ => {
device.cart.cic_type = CicType::CicNus6102;
device.cart.cic_seed = 0x3F;