summaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
author R. Belmont <rb6502@users.noreply.github.com>2010-03-07 15:57:48 +0000
committer R. Belmont <rb6502@users.noreply.github.com>2010-03-07 15:57:48 +0000
commit254c6be63f84ca76b77a70b4376c1b1eeafde5e0 (patch)
tree10cb5bb54a2c7c444016c1e24906b3440c1a81e4 /src
parent50ea406c70bee81260c1912a9360a4539b1967d7 (diff)
Correct one bit of merge weirdness (no credit)
Diffstat (limited to 'src')
-rw-r--r--src/mame/drivers/namcos23.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mame/drivers/namcos23.c b/src/mame/drivers/namcos23.c
index c57df973778..30c378b0be9 100644
--- a/src/mame/drivers/namcos23.c
+++ b/src/mame/drivers/namcos23.c
@@ -2767,8 +2767,8 @@ ROM_START( gunwars )
ROM_REGION32_LE( 0x2000000, "pointrom", 0 ) /* 3D model data */
ROM_LOAD32_WORD( "gm1pt0l.7c", 0x000000, 0x400000, CRC(62e9bedb) SHA1(7043c5e6f26139c9e6e18d4f35fac6a16d4dabd1) )
ROM_LOAD32_WORD( "gm1pt0h.7a", 0x000002, 0x400000, CRC(5ebd658c) SHA1(9e7b89a726b11b6da3327d72ec6adcc30fbb384d) )
- ROM_LOAD32_WORD( "gm1pt1h.5a", 0x800000, 0x400000, CRC(5f6cebab) SHA1(95bd30d30ea25509b66a107fb255d0af1e6a357e) )
- ROM_LOAD32_WORD( "gm1pt1l.5c", 0x800002, 0x400000, CRC(f44c149f) SHA1(9f995de02ea6ac35ccbabbba5bb473a10e1ec667) )
+ ROM_LOAD32_WORD( "gm1pt1l.5c", 0x800000, 0x400000, CRC(f44c149f) SHA1(9f995de02ea6ac35ccbabbba5bb473a10e1ec667) )
+ ROM_LOAD32_WORD( "gm1pt1h.5a", 0x800002, 0x400000, CRC(5f6cebab) SHA1(95bd30d30ea25509b66a107fb255d0af1e6a357e) )
ROM_REGION( 0x800000, "c352", 0 ) /* C352 PCM samples */
ROM_LOAD( "gm1wave.2c", 0x000000, 0x800000, CRC(7d5c79a4) SHA1(b800a46bcca10cb0d0d9e0acfa68af63ae64dcaf) )