From 914ac2a932ce21575e42b2e8bffa56925e3db546 Mon Sep 17 00:00:00 2001 From: Ivan Vangelista Date: Sat, 26 Oct 2024 07:51:12 +0200 Subject: igs/pgmprot_igs027a_type*: fixed some regressions --- src/mame/igs/pgmprot_igs027a_type1.cpp | 34 +++++++++++++++++----------------- src/mame/igs/pgmprot_igs027a_type3.cpp | 10 +++++----- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/mame/igs/pgmprot_igs027a_type1.cpp b/src/mame/igs/pgmprot_igs027a_type1.cpp index 35b3a9148f1..07bd5e1ef86 100644 --- a/src/mame/igs/pgmprot_igs027a_type1.cpp +++ b/src/mame/igs/pgmprot_igs027a_type1.cpp @@ -344,7 +344,7 @@ void pgm_arm_type1_state::init_kovshxas() void pgm_arm_type1_state::pgm_decode_kovlsqh2_tiles() { - u16 *src = (u16 *)(memregion("tiles")->base() + 0x180000); + u16 *src = (u16 *)(memregion("igs023")->base() + 0x180000); std::vector dst(0x800000); for (int i = 0; i < 0x800000 / 2; i++) @@ -418,14 +418,14 @@ void pgm_arm_type1_state::init_kovlsqh2() pgm_decode_kovqhsgs2_program(); pgm_decode_kovlsqh2_tiles(); - pgm_decode_kovlsqh2_sprites(memregion("sprcol")->base() + 0x0000000); - pgm_decode_kovlsqh2_sprites(memregion("sprcol")->base() + 0x0800000); - pgm_decode_kovlsqh2_sprites(memregion("sprcol")->base() + 0x1000000); - pgm_decode_kovlsqh2_sprites(memregion("sprcol")->base() + 0x1800000); - pgm_decode_kovlsqh2_sprites(memregion("sprcol")->base() + 0x2000000); - pgm_decode_kovlsqh2_sprites(memregion("sprcol")->base() + 0x2800000); - pgm_decode_kovlsqh2_sprites(memregion("sprmask")->base() + 0x0000000); - pgm_decode_kovlsqh2_sprites(memregion("sprmask")->base() + 0x0800000); + pgm_decode_kovlsqh2_sprites(memregion("igs023:sprcol")->base() + 0x0000000); + pgm_decode_kovlsqh2_sprites(memregion("igs023:sprcol")->base() + 0x0800000); + pgm_decode_kovlsqh2_sprites(memregion("igs023:sprcol")->base() + 0x1000000); + pgm_decode_kovlsqh2_sprites(memregion("igs023:sprcol")->base() + 0x1800000); + pgm_decode_kovlsqh2_sprites(memregion("igs023:sprcol")->base() + 0x2000000); + pgm_decode_kovlsqh2_sprites(memregion("igs023:sprcol")->base() + 0x2800000); + pgm_decode_kovlsqh2_sprites(memregion("igs023:sprmask")->base() + 0x0000000); + pgm_decode_kovlsqh2_sprites(memregion("igs023:sprmask")->base() + 0x0800000); pgm_decode_kovlsqh2_samples(); pgm_basic_init(); @@ -439,14 +439,14 @@ void pgm_arm_type1_state::init_kovqhsgs() pgm_decode_kovqhsgs_program(); pgm_decode_kovlsqh2_tiles(); - pgm_decode_kovlsqh2_sprites(memregion("sprcol")->base() + 0x0000000); - pgm_decode_kovlsqh2_sprites(memregion("sprcol")->base() + 0x0800000); - pgm_decode_kovlsqh2_sprites(memregion("sprcol")->base() + 0x1000000); - pgm_decode_kovlsqh2_sprites(memregion("sprcol")->base() + 0x1800000); - pgm_decode_kovlsqh2_sprites(memregion("sprcol")->base() + 0x2000000); - pgm_decode_kovlsqh2_sprites(memregion("sprcol")->base() + 0x2800000); - pgm_decode_kovlsqh2_sprites(memregion("sprmask")->base() + 0x0000000); - pgm_decode_kovlsqh2_sprites(memregion("sprmask")->base() + 0x0800000); + pgm_decode_kovlsqh2_sprites(memregion("igs023:sprcol")->base() + 0x0000000); + pgm_decode_kovlsqh2_sprites(memregion("igs023:sprcol")->base() + 0x0800000); + pgm_decode_kovlsqh2_sprites(memregion("igs023:sprcol")->base() + 0x1000000); + pgm_decode_kovlsqh2_sprites(memregion("igs023:sprcol")->base() + 0x1800000); + pgm_decode_kovlsqh2_sprites(memregion("igs023:sprcol")->base() + 0x2000000); + pgm_decode_kovlsqh2_sprites(memregion("igs023:sprcol")->base() + 0x2800000); + pgm_decode_kovlsqh2_sprites(memregion("igs023:sprmask")->base() + 0x0000000); + pgm_decode_kovlsqh2_sprites(memregion("igs023:sprmask")->base() + 0x0800000); pgm_decode_kovlsqh2_samples(); pgm_basic_init(); diff --git a/src/mame/igs/pgmprot_igs027a_type3.cpp b/src/mame/igs/pgmprot_igs027a_type3.cpp index 4bcfc025e95..eccc7f4eaa5 100644 --- a/src/mame/igs/pgmprot_igs027a_type3.cpp +++ b/src/mame/igs/pgmprot_igs027a_type3.cpp @@ -840,23 +840,23 @@ INPUT_PORTS_END void pgm_arm_type3_state::init_happy6() { - u8 *src = (u8 *)(machine().root_device().memregion("tiles")->base()) + 0x180000; + u8 *src = (u8 *)(memregion("igs023")->base()) + 0x180000; pgm_descramble_happy6(src); pgm_descramble_happy6_2(src); - src = (u8 *)(machine().root_device().memregion("sprcol")->base()) + 0x000000; + src = (u8 *)(memregion("igs023:sprcol")->base()) + 0x000000; pgm_descramble_happy6(src); pgm_descramble_happy6_2(src); - src = (u8 *)(machine().root_device().memregion("sprcol")->base()) + 0x0800000; + src = (u8 *)(memregion("igs023:sprcol")->base()) + 0x0800000; pgm_descramble_happy6(src); pgm_descramble_happy6_2(src); - src = (u8 *)(machine().root_device().memregion("sprmask")->base()); + src = (u8 *)(memregion("igs023:sprmask")->base()); pgm_descramble_happy6(src); pgm_descramble_happy6_2(src); - src = (u8 *)(machine().root_device().memregion("ics")->base()) + 0x400000; + src = (u8 *)(memregion("ics")->base()) + 0x400000; pgm_descramble_happy6(src); pgm_descramble_happy6_2(src); -- cgit v1.2.3