From 8cc85d1cbc7e19d6339c87abe47a735a33adf134 Mon Sep 17 00:00:00 2001
From: David Haywood <mamehaze@users.noreply.github.com>
Date: Sun, 24 Jan 2016 20:13:39 +0000
Subject: [PATCH] new softlist additions (not working) casloopy.xml: Loopy Town
 no Oheya ga Hoshii! [TeamEurope, Steve] casloopy.xml: Lupiton no Wonder
 Palette  [TeamEurope, Steve]

---
 hash/casloopy.xml             | 30 ++++++++++++++++++++++++++++--
 src/mame/drivers/casloopy.cpp | 12 ++++++------
 2 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/hash/casloopy.xml b/hash/casloopy.xml
index cd8936c5202..b479df44575 100644
--- a/hash/casloopy.xml
+++ b/hash/casloopy.xml
@@ -3,9 +3,7 @@
 <softwarelist name="casloopy" description="Casio Loopy cartridges">
 
 <!-- Undumped titles:
-- Loopy Town no Oheya ga Hoshii! (ルーピータウンのおへやがほしい!)
 - Little Romance (リトルロマンス)
-- Lupiton no Wonder Palette (ルピトンのワンダーパレット)
 - Chakura-kun no Omajinai Paradise (チャクラくんのおまじないパラダイス)
 - Magical Shop [add-on to extract images from vhs/dvd?]
 -->
@@ -87,4 +85,32 @@
 			</dataarea>
 		</part>
 	</software>
+
+	<software name="loopytwn">
+		<description>Loopy Town no Oheya ga Hoshii!</description>
+		<year>1996</year>
+ 		<publisher>Casio</publisher>
+		<info name="serial" value="XK-504"/> 
+    <info name="alt_name" value="ルーピータウンのおへやがほしい!"/>
+		<part name="cart" interface="loopy_cart">
+			<dataarea name="rom" size="0x300000">
+				<rom name="CHIP1.IC104" size="0x200000" crc="bae71d45" sha1="79628715ccedd9bc3fd72d21fa9ea6513b88cf51" offset="0x000000" />
+ 				<rom name="CHIP2.IC105" size="0x100000" crc="e0514d03" sha1="4dd02faa1ebf6754da0ade417e488512f3502620" offset="0x200000" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="lupiton">
+		<description>Lupiton no Wonder Palette</description>
+		<year>1995</year>
+		<publisher>Casio</publisher>
+		<info name="serial" value="XK-701"/>
+		<info name="alt_name" value="ルピトンのワンダーパレット"/>
+		<part name="cart" interface="loopy_cart">
+			<dataarea name="rom" size="0x200000">
+				<rom name="lupiton.bin" size="0x200000" crc="338a5af7" sha1="ddb3e2b363ef0325a1370511f3692ca47031cb46" offset="0x000000" />
+			</dataarea>
+		</part>
+	</software>
+
 </softwarelist>
diff --git a/src/mame/drivers/casloopy.cpp b/src/mame/drivers/casloopy.cpp
index c3639d185d5..e4ae08cfd30 100644
--- a/src/mame/drivers/casloopy.cpp
+++ b/src/mame/drivers/casloopy.cpp
@@ -320,8 +320,8 @@ READ16_MEMBER(casloopy_state::vregs_r)
 
 WRITE16_MEMBER(casloopy_state::vregs_w)
 {
-	if(offset != 6/2)
-		printf("%08x %08x\n",offset*2,data);
+//	if(offset != 6/2)
+//		printf("%08x %08x\n",offset*2,data);
 }
 
 READ16_MEMBER(casloopy_state::pal_r)
@@ -422,10 +422,10 @@ static ADDRESS_MAP_START( casloopy_map, AS_PROGRAM, 32, casloopy_state )
 	AM_RANGE(0x0405b000, 0x0405b00f) AM_RAM AM_SHARE("vregs") // RGB555 brightness control plus scrolling
 //  AM_RANGE(0x05ffff00, 0x05ffffff) AM_READWRITE16(sh7021_r, sh7021_w, 0xffffffff)
 //  AM_RANGE(0x05ffff00, 0x05ffffff) - SH7021 internal i/o
-	AM_RANGE(0x06000000, 0x061fffff) AM_READ(cart_r)
+	AM_RANGE(0x06000000, 0x062fffff) AM_READ(cart_r)
 	AM_RANGE(0x07000000, 0x070003ff) AM_RAM AM_SHARE("oram")// on-chip RAM, actually at 0xf000000 (1 kb)
 	AM_RANGE(0x09000000, 0x0907ffff) AM_RAM AM_SHARE("wram")
-	AM_RANGE(0x0e000000, 0x0e1fffff) AM_READ(cart_r)
+	AM_RANGE(0x0e000000, 0x0e2fffff) AM_READ(cart_r)
 	AM_RANGE(0x0f000000, 0x0f0003ff) AM_RAM AM_SHARE("oram")
 ADDRESS_MAP_END
 
@@ -479,7 +479,7 @@ DEVICE_IMAGE_LOAD_MEMBER( casloopy_state, loopy_cart )
 	UINT32 size = m_cart->common_get_size("rom");
 	UINT8 *SRC, *DST;
 	dynamic_buffer temp;
-	temp.resize(0x200000);
+	temp.resize(size);
 
 	m_cart->rom_alloc(size, GENERIC_ROM32_WIDTH, ENDIANNESS_LITTLE);
 
@@ -488,7 +488,7 @@ DEVICE_IMAGE_LOAD_MEMBER( casloopy_state, loopy_cart )
 	m_cart->common_load_rom(&temp[0], size, "rom");
 
 	// fix endianness
-	for (int i = 0; i < 0x200000; i += 4)
+	for (int i = 0; i < size; i += 4)
 	{
 		UINT8 tempa = SRC[i + 0];
 		UINT8 tempb = SRC[i + 1];