From 5f4eefab5852d1c832ad8ffdf514fef8c217f1ac Mon Sep 17 00:00:00 2001 From: Flyinghead Date: Tue, 6 May 2025 20:04:11 +0200 Subject: [PATCH] naomi: add pjustic (rev b) and pjustica. fix gunsur2 and gunsur2j Issue #716 --- core/hw/naomi/naomi_roms.cpp | 117 +++++++++++++++++++++-------------- 1 file changed, 72 insertions(+), 45 deletions(-) diff --git a/core/hw/naomi/naomi_roms.cpp b/core/hw/naomi/naomi_roms.cpp index bc21b61be..f875908f2 100644 --- a/core/hw/naomi/naomi_roms.cpp +++ b/core/hw/naomi/naomi_roms.cpp @@ -2076,21 +2076,21 @@ const Game Games[] = M2, ROT0, { - { "bhf2vere.2f", 0x0000000, 0x0800000 }, - { "bhf1ma2.4m", 0x2000000, 0x1000000 }, - { "bhf1ma3.4l", 0x3000000, 0x1000000 }, - { "bhf1ma4.4k", 0x4000000, 0x1000000 }, - { "bhf1ma5.4j", 0x5000000, 0x1000000 }, - { "bhf1ma6.4h", 0x6000000, 0x1000000 }, - { "bhf1ma7.4f", 0x7000000, 0x1000000 }, - { "bhf1ma8.4d", 0x8000000, 0x1000000 }, - { "bhf1ma9.4e", 0x9000000, 0x1000000 }, - { "bhf1ma10.4c", 0xa000000, 0x1000000 }, - { "bhf1ma11.4b", 0xb000000, 0x1000000 }, - { "bhf1ma12.6p", 0xc000000, 0x1000000 }, - { "bhf1ma13.6n", 0xd000000, 0x1000000 }, - { "bhf1ma14.6m", 0xe000000, 0x1000000 }, - { "bhf1ma15.6l", 0xf000000, 0x1000000 }, + { "bhf2vere.2f", 0x0000000, 0x0800000, 0x756e0de6 }, + { "bhf1ma2.4m", 0x2000000, 0x1000000, 0x8073dec7 }, + { "bhf1ma3.4l", 0x3000000, 0x1000000, 0x43cd16a4 }, + { "bhf1ma4.4k", 0x4000000, 0x1000000, 0xf6aebed8 }, + { "bhf1ma5.4j", 0x5000000, 0x1000000, 0xb5e1b582 }, + { "bhf1ma6.4h", 0x6000000, 0x1000000, 0x345fd824 }, + { "bhf1ma7.4f", 0x7000000, 0x1000000, 0x465ecff1 }, + { "bhf1ma8.4e", 0x8000000, 0x1000000, 0x76c92354 }, + { "bhf1ma9.4d", 0x9000000, 0x1000000, 0xd45a46ee }, + { "bhf1ma10.4c", 0xa000000, 0x1000000, 0x8c38d1f7 }, + { "bhf1ma11.4b", 0xb000000, 0x1000000, 0xf49153c4 }, + { "bhf1ma12.6p", 0xc000000, 0x1000000, 0x0e2bdd9a }, + { "bhf1ma13.6n", 0xd000000, 0x1000000, 0x055718ad }, + { "bhf1ma14.6m", 0xe000000, 0x1000000, 0xd06c9bd7 }, + { "bhf1ma15.6l", 0xf000000, 0x1000000, 0xdb3c396b }, }, NULL, &gunsur2_inputs, @@ -2107,21 +2107,21 @@ const Game Games[] = M2, ROT0, { - { "bhf1vere.2f", 0x0000000, 0x0800000 }, - { "bhf1ma2.4m", 0x2000000, 0x1000000 }, - { "bhf1ma3.4l", 0x3000000, 0x1000000 }, - { "bhf1ma4.4k", 0x4000000, 0x1000000 }, - { "bhf1ma5.4j", 0x5000000, 0x1000000 }, - { "bhf1ma6.4h", 0x6000000, 0x1000000 }, - { "bhf1ma7.4f", 0x7000000, 0x1000000 }, - { "bhf1ma8.4d", 0x8000000, 0x1000000 }, - { "bhf1ma9.4e", 0x9000000, 0x1000000 }, - { "bhf1ma10.4c", 0xa000000, 0x1000000 }, - { "bhf1ma11.4b", 0xb000000, 0x1000000 }, - { "bhf1ma12.6p", 0xc000000, 0x1000000 }, - { "bhf1ma13.6n", 0xd000000, 0x1000000 }, - { "bhf1ma14.6m", 0xe000000, 0x1000000 }, - { "bhf1ma15.6l", 0xf000000, 0x1000000 }, + { "bhf1vere.2f", 0x0000000, 0x0800000, 0x121ea283 }, + { "bhf1ma2.4m", 0x2000000, 0x1000000, 0x8073dec7 }, + { "bhf1ma3.4l", 0x3000000, 0x1000000, 0x43cd16a4 }, + { "bhf1ma4.4k", 0x4000000, 0x1000000, 0xf6aebed8 }, + { "bhf1ma5.4j", 0x5000000, 0x1000000, 0xb5e1b582 }, + { "bhf1ma6.4h", 0x6000000, 0x1000000, 0x345fd824 }, + { "bhf1ma7.4f", 0x7000000, 0x1000000, 0x465ecff1 }, + { "bhf1ma8.4e", 0x8000000, 0x1000000, 0x76c92354 }, + { "bhf1ma9.4d", 0x9000000, 0x1000000, 0xd45a46ee }, + { "bhf1ma10.4c", 0xa000000, 0x1000000, 0x8c38d1f7 }, + { "bhf1ma11.4b", 0xb000000, 0x1000000, 0xf49153c4 }, + { "bhf1ma12.6p", 0xc000000, 0x1000000, 0x0e2bdd9a }, + { "bhf1ma13.6n", 0xd000000, 0x1000000, 0x055718ad }, + { "bhf1ma14.6m", 0xe000000, 0x1000000, 0xd06c9bd7 }, + { "bhf1ma15.6l", 0xf000000, 0x1000000, 0xdb3c396b }, }, NULL, &gunsur2_inputs, @@ -2773,27 +2773,54 @@ const Game Games[] = }, // Moero! Justice Gakuen (JPN) / Project Justice (USA, EXP, KOR, AUS) (Rev A) { + "pjustica", "pjustic", - NULL, - "Project Justice / Moero! Justice Gakuen", + "Project Justice / Moero! Justice Gakuen (Rev A)", 0x0b800000, 0x000725d0, - NULL, + "naomi", M2, ROT0, { - { "epr-23548a.ic22", 0x0000000, 0x0400000 }, - { "mpr-23537.ic1", 0x0800000, 0x1000000 }, - { "mpr-23538.ic2", 0x1800000, 0x1000000 }, - { "mpr-23539.ic3", 0x2800000, 0x1000000 }, - { "mpr-23540.ic4", 0x3800000, 0x1000000 }, - { "mpr-23541.ic5", 0x4800000, 0x1000000 }, - { "mpr-23542.ic6", 0x5800000, 0x1000000 }, - { "mpr-23543.ic7", 0x6800000, 0x1000000 }, - { "mpr-23544.ic8", 0x7800000, 0x1000000 }, - { "mpr-23545.ic9", 0x8800000, 0x1000000 }, - { "mpr-23546.ic10", 0x9800000, 0x1000000 }, - { "mpr-23547.ic11", 0xa800000, 0x1000000 }, + { "epr-23548a.ic22", 0x0000000, 0x0400000, 0xf4ccf1ec }, + { "mpr-23537.ic1", 0x0800000, 0x1000000, 0xa2462770 }, + { "mpr-23538.ic2", 0x1800000, 0x1000000, 0xe4480832 }, + { "mpr-23539.ic3", 0x2800000, 0x1000000, 0x97e3f7f5 }, + { "mpr-23540.ic4", 0x3800000, 0x1000000, 0xb9e92d21 }, + { "mpr-23541.ic5", 0x4800000, 0x1000000, 0x95b8a9c6 }, + { "mpr-23542.ic6", 0x5800000, 0x1000000, 0xdfd490f5 }, + { "mpr-23543.ic7", 0x6800000, 0x1000000, 0x66847ebd }, + { "mpr-23544.ic8", 0x7800000, 0x1000000, 0xd1f5b460 }, + { "mpr-23545.ic9", 0x8800000, 0x1000000, 0x60bd692f }, + { "mpr-23546.ic10", 0x9800000, 0x1000000, 0x85db2248 }, + { "mpr-23547.ic11", 0xa800000, 0x1000000, 0x18b369c7 }, + }, + nullptr, + &capcom_4btn_inputs, + }, + // Moero! Justice Gakuen (JPN) / Project Justice (USA, EXP, KOR, AUS) (Rev B) + { + "pjustic", + nullptr, + "Project Justice / Moero! Justice Gakuen", + 0x0b800000, + 0x000725d0, + "naomi", + M2, + ROT0, + { + { "epr-23548b.ic22", 0x0000000, 0x0400000, 0xd0dbdf40 }, + { "mpr-23537.ic1", 0x0800000, 0x1000000, 0xa2462770 }, + { "mpr-23538.ic2", 0x1800000, 0x1000000, 0xe4480832 }, + { "mpr-23539.ic3", 0x2800000, 0x1000000, 0x97e3f7f5 }, + { "mpr-23540.ic4", 0x3800000, 0x1000000, 0xb9e92d21 }, + { "mpr-23541.ic5", 0x4800000, 0x1000000, 0x95b8a9c6 }, + { "mpr-23542.ic6", 0x5800000, 0x1000000, 0xdfd490f5 }, + { "mpr-23543.ic7", 0x6800000, 0x1000000, 0x66847ebd }, + { "mpr-23544.ic8", 0x7800000, 0x1000000, 0xd1f5b460 }, + { "mpr-23545.ic9", 0x8800000, 0x1000000, 0x60bd692f }, + { "mpr-23546.ic10", 0x9800000, 0x1000000, 0x85db2248 }, + { "mpr-23547.ic11", 0xa800000, 0x1000000, 0x18b369c7 }, }, nullptr, &capcom_4btn_inputs,