From dc51bb6541f37f26dec1960aef4f53f80e1ddedd Mon Sep 17 00:00:00 2001
From: Vas Crabb <vas@vastheman.com>
Date: Tue, 4 Oct 2022 23:56:13 +1100
Subject: [PATCH] ekara_japan_m.xml: Fix element order.

---
 hash/ekara_japan_m.xml    |  2 +-
 src/mame/misc/musclem.cpp | 22 +++++++++++-----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/hash/ekara_japan_m.xml b/hash/ekara_japan_m.xml
index 2a4f3907e86..0f7e48bd17e 100644
--- a/hash/ekara_japan_m.xml
+++ b/hash/ekara_japan_m.xml
@@ -160,8 +160,8 @@ license:CC0
 	<software name="mc0015">
 		<description>TV Pop Mini Vol.1 (Japan) (MC0015-TPM)</description>
 		<year>2003</year>
-		<info name="alt_title" value="TV POPミニ mini vol.1"/>
 		<publisher>Takara</publisher>
+		<info name="alt_title" value="TV POPミニ mini vol.1"/>
 		<part name="cart" interface="ekara_cart">
 			<dataarea name="rom" size="0x080000">
 				<rom name="mc0015-tpm.u1" size="0x080000" crc="c0e87576" sha1="c239c22499591b85bdb2737d22417489a02ffb44"/>
diff --git a/src/mame/misc/musclem.cpp b/src/mame/misc/musclem.cpp
index 5b7acccca0f..e83ab3146d8 100644
--- a/src/mame/misc/musclem.cpp
+++ b/src/mame/misc/musclem.cpp
@@ -60,9 +60,9 @@ private:
 
 	uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 	void draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
-	template<int which> TILE_GET_INFO_MEMBER(get_tile_info);
-	template<int which> void vram_w(offs_t offset, uint16_t data, uint16_t mem_mask);
-	template<int base> void palette_w(offs_t offset, u16 data, u16 mem_mask);
+	template <int Which> TILE_GET_INFO_MEMBER(get_tile_info);
+	template <int Which> void vram_w(offs_t offset, uint16_t data, uint16_t mem_mask);
+	template <int Base> void palette_w(offs_t offset, u16 data, u16 mem_mask);
 
 	void oki1_bank_w(uint16_t data);
 	void lamps_w(uint16_t data);
@@ -126,24 +126,24 @@ void musclem_state::draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, co
 	}
 }
 
-template<int which>
+template <int Which>
 TILE_GET_INFO_MEMBER(musclem_state::get_tile_info)
 {
-	int data = m_vram[which][tile_index];
-	tileinfo.set(which, data, 0, 0);
+	int data = m_vram[Which][tile_index];
+	tileinfo.set(Which, data, 0, 0);
 }
 
-template<int which>
+template <int Which>
 void musclem_state::vram_w(offs_t offset, uint16_t data, uint16_t mem_mask)
 {
-	m_vram[which][offset] = data;
-	m_tilemap[which]->mark_tile_dirty(offset);
+	m_vram[Which][offset] = data;
+	m_tilemap[Which]->mark_tile_dirty(offset);
 }
 
-template<int base>
+template <int Base>
 void musclem_state::palette_w(offs_t offset, u16 data, u16 mem_mask)
 {
-	m_palette->write16(base + offset, data, mem_mask);
+	m_palette->write16(Base + offset, data, mem_mask);
 }