diff options
Diffstat (limited to 'src/mame/machine/rbisland.cpp')
-rw-r--r-- | src/mame/machine/rbisland.cpp | 84 |
1 files changed, 42 insertions, 42 deletions
diff --git a/src/mame/machine/rbisland.cpp b/src/mame/machine/rbisland.cpp index 951b97225f8..7b1baf800b9 100644 --- a/src/mame/machine/rbisland.cpp +++ b/src/mame/machine/rbisland.cpp @@ -61,11 +61,11 @@ struct CBANK { - const UINT8* data; + const uint8_t* data; size_t size; }; -static const UINT8 CROM_BANK1[] = +static const uint8_t CROM_BANK1[] = { 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x0A, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, @@ -96,7 +96,7 @@ static const UINT8 CROM_BANK1[] = 0x82, 0x86, 0x86, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A, 0x8A }; -static const UINT8 CROM_BANK2[] = +static const uint8_t CROM_BANK2[] = { 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, @@ -109,7 +109,7 @@ static const UINT8 CROM_BANK2[] = 0x22, 0x22 }; -static const UINT8 CROM_BANK4_WORLD0[] = +static const uint8_t CROM_BANK4_WORLD0[] = { 0x28, 0x00, 0x2C, 0x00, 0x30, 0x00, 0x34, 0x00, 0x38, 0x00, 0x3C, 0x00, 0x40, 0x00, 0x44, 0x00, 0x48, 0x00, 0x54, 0x00, 0x58, 0x00, 0x5C, 0x00, @@ -125,7 +125,7 @@ static const UINT8 CROM_BANK4_WORLD0[] = 0xC9, 0x02, 0xC8, 0x02 }; -static const UINT8 CROM_BANK4_WORLD1[] = +static const uint8_t CROM_BANK4_WORLD1[] = { 0x24, 0x00, 0x28, 0x00, 0x2C, 0x00, 0x30, 0x00, 0x34, 0x00, 0x38, 0x00, 0x3C, 0x00, 0x42, 0x00, 0x48, 0x00, 0x4C, 0x00, 0x50, 0x00, 0x54, 0x00, @@ -138,7 +138,7 @@ static const UINT8 CROM_BANK4_WORLD1[] = 0x28, 0x10, 0x28, 0x10, 0x8E, 0x02, 0x90, 0x02 }; -static const UINT8 CROM_BANK4_WORLD2[] = +static const uint8_t CROM_BANK4_WORLD2[] = { 0x2A, 0x00, 0x32, 0x00, 0x3A, 0x00, 0x3E, 0x00, 0x46, 0x00, 0x4E, 0x00, 0x52, 0x00, 0x56, 0x00, 0x5A, 0x00, 0x5E, 0x00, 0x60, 0x00, 0x62, 0x00, @@ -154,7 +154,7 @@ static const UINT8 CROM_BANK4_WORLD2[] = 0xAD, 0x03, 0xAF, 0x03, 0xC1, 0x03, 0xC5, 0x03, 0xC3, 0x03 }; -static const UINT8 CROM_BANK4_WORLD3[] = +static const uint8_t CROM_BANK4_WORLD3[] = { 0x30, 0x00, 0x34, 0x00, 0x38, 0x00, 0x3C, 0x00, 0x40, 0x00, 0x44, 0x00, 0x48, 0x00, 0x4A, 0x00, 0x4C, 0x00, 0x50, 0x00, 0x54, 0x00, 0x58, 0x00, @@ -174,7 +174,7 @@ static const UINT8 CROM_BANK4_WORLD3[] = 0xDF, 0x04, 0xE0, 0x04, 0xE1, 0x04, 0xE2, 0x04, 0x12, 0x05, 0x11, 0x05 }; -static const UINT8 CROM_BANK4_WORLD4[] = +static const uint8_t CROM_BANK4_WORLD4[] = { 0x24, 0x00, 0x24, 0x00, 0x34, 0x00, 0x38, 0x00, 0x38, 0x00, 0x60, 0x00, 0x64, 0x00, 0x64, 0x00, 0x7C, 0x00, 0x80, 0x00, 0x80, 0x00, 0x90, 0x00, @@ -194,7 +194,7 @@ static const UINT8 CROM_BANK4_WORLD4[] = 0x82, 0x05 }; -static const UINT8 CROM_BANK4_WORLD5[] = +static const uint8_t CROM_BANK4_WORLD5[] = { 0x24, 0x00, 0x2C, 0x00, 0x34, 0x00, 0x38, 0x00, 0x40, 0x00, 0x48, 0x00, 0x4C, 0x00, 0x54, 0x00, 0x5C, 0x00, 0x60, 0x00, 0x64, 0x00, 0x68, 0x00, @@ -211,7 +211,7 @@ static const UINT8 CROM_BANK4_WORLD5[] = 0xE5, 0x06, 0xE3, 0x06 }; -static const UINT8 CROM_BANK4_WORLD6[] = +static const uint8_t CROM_BANK4_WORLD6[] = { 0x2A, 0x00, 0x32, 0x00, 0x3A, 0x00, 0x3E, 0x00, 0x46, 0x00, 0x4E, 0x00, 0x52, 0x00, 0x5A, 0x00, 0x62, 0x00, 0x66, 0x00, 0x6A, 0x00, 0x6E, 0x00, @@ -228,7 +228,7 @@ static const UINT8 CROM_BANK4_WORLD6[] = 0xDF, 0x08, 0xE1, 0x08, 0xC7, 0x08, 0xC7, 0x08 }; -static const UINT8 CROM_BANK4_WORLD7[] = +static const uint8_t CROM_BANK4_WORLD7[] = { 0x2A, 0x00, 0x32, 0x00, 0x3A, 0x00, 0x3E, 0x00, 0x42, 0x00, 0x46, 0x00, 0x4A, 0x00, 0x4E, 0x00, 0x52, 0x00, 0x56, 0x00, 0x5E, 0x00, 0x66, 0x00, @@ -244,7 +244,7 @@ static const UINT8 CROM_BANK4_WORLD7[] = 0x9D, 0x05, 0x78, 0x10, 0x9D, 0x05 }; -static const UINT8 CROM_BANK4_WORLD8[] = +static const uint8_t CROM_BANK4_WORLD8[] = { 0x30, 0x00, 0x34, 0x00, 0x38, 0x00, 0x3C, 0x00, 0x3E, 0x00, 0x40, 0x00, 0x42, 0x00, 0x46, 0x00, 0x4A, 0x00, 0x4E, 0x00, 0x5C, 0x00, 0x6A, 0x00, @@ -262,7 +262,7 @@ static const UINT8 CROM_BANK4_WORLD8[] = 0x36, 0x0A }; -static const UINT8 CROM_BANK4_WORLD9[] = +static const uint8_t CROM_BANK4_WORLD9[] = { 0x30, 0x00, 0x34, 0x00, 0x38, 0x00, 0x40, 0x00, 0x48, 0x00, 0x50, 0x00, 0x58, 0x00, 0x60, 0x00, 0x68, 0x00, 0x70, 0x00, 0x78, 0x00, 0x80, 0x00, @@ -285,7 +285,7 @@ static const UINT8 CROM_BANK4_WORLD9[] = 0xFB, 0x0F, 0xFC, 0x0F, 0xDC, 0x02, 0xDD, 0x02 }; -static const UINT8 CROM_BANK5_WORLD0[] = +static const uint8_t CROM_BANK5_WORLD0[] = { 0x1C, 0x00, 0x1C, 0x00, 0x32, 0x00, 0x32, 0x00, 0x48, 0x00, 0x48, 0x00, 0xB6, 0x00, 0x5E, 0x00, 0xA0, 0x00, 0xA0, 0x00, 0x74, 0x00, 0x74, 0x00, @@ -306,7 +306,7 @@ static const UINT8 CROM_BANK5_WORLD0[] = 0xC7, 0x18, 0xC3, 0x5A, 0xB7, 0x6E, 0x3C, 0x00, 0x00, 0x01, 0xFF, 0xFF }; -static const UINT8 CROM_BANK5_WORLD1[] = +static const uint8_t CROM_BANK5_WORLD1[] = { 0x0C, 0x00, 0x22, 0x00, 0x38, 0x00, 0x4E, 0x00, 0x64, 0x00, 0x7A, 0x00, 0x01, 0x08, 0xC4, 0x19, 0x49, 0x08, 0xC4, 0x19, 0x84, 0x08, 0xC7, 0x18, @@ -322,7 +322,7 @@ static const UINT8 CROM_BANK5_WORLD1[] = 0xC7, 0x18, 0xC3, 0x5A, 0xB7, 0x6E, 0x58, 0x02, 0x00, 0x01, 0xFF, 0xFF }; -static const UINT8 CROM_BANK5_WORLD2[] = +static const uint8_t CROM_BANK5_WORLD2[] = { 0x0E, 0x00, 0x24, 0x00, 0x3A, 0x00, 0x50, 0x00, 0x66, 0x00, 0x7C, 0x00, 0x92, 0x00, 0x01, 0x18, 0xC7, 0x39, 0x49, 0x18, 0xC5, 0x39, 0x84, 0x08, @@ -340,7 +340,7 @@ static const UINT8 CROM_BANK5_WORLD2[] = 0xC7, 0x18, 0xC3, 0x5A, 0xB7, 0x6E, 0xE0, 0x01, 0x00, 0x01, 0xFF, 0xFF }; -static const UINT8 CROM_BANK5_WORLD3[] = +static const uint8_t CROM_BANK5_WORLD3[] = { 0x10, 0x00, 0x26, 0x00, 0x3C, 0x00, 0x52, 0x00, 0x68, 0x00, 0x7E, 0x00, 0x94, 0x00, 0xAA, 0x00, 0x01, 0x08, 0xC1, 0x39, 0x49, 0x08, 0xC1, 0x39, @@ -360,7 +360,7 @@ static const UINT8 CROM_BANK5_WORLD3[] = 0xC7, 0x18, 0xC3, 0x5A, 0xB7, 0x6E, 0x68, 0x01, 0x00, 0x01, 0xFF, 0xFF }; -static const UINT8 CROM_BANK5_WORLD4[] = +static const uint8_t CROM_BANK5_WORLD4[] = { 0x0C, 0x00, 0x22, 0x00, 0x38, 0x00, 0x4E, 0x00, 0x64, 0x00, 0x7A, 0x00, 0x00, 0x38, 0xC6, 0x18, 0x48, 0x38, 0xC6, 0x18, 0x84, 0x08, 0xC7, 0x18, @@ -376,7 +376,7 @@ static const UINT8 CROM_BANK5_WORLD4[] = 0xC7, 0x18, 0xC3, 0x5A, 0xB7, 0x6E, 0x68, 0x01, 0x00, 0x01, 0xFF, 0xFF }; -static const UINT8 CROM_BANK5_WORLD5[] = +static const uint8_t CROM_BANK5_WORLD5[] = { 0x0C, 0x00, 0x22, 0x00, 0x38, 0x00, 0x4E, 0x00, 0x64, 0x00, 0x7A, 0x00, 0x01, 0x18, 0x43, 0x39, 0x49, 0x18, 0x43, 0x39, 0x85, 0x08, 0xC7, 0x18, @@ -392,7 +392,7 @@ static const UINT8 CROM_BANK5_WORLD5[] = 0xC7, 0x18, 0xC3, 0x5A, 0xB7, 0x6E, 0x68, 0x01, 0x00, 0x01, 0xFF, 0xFF }; -static const UINT8 CROM_BANK5_WORLD6[] = +static const uint8_t CROM_BANK5_WORLD6[] = { 0x0E, 0x00, 0x24, 0x00, 0x3A, 0x00, 0x50, 0x00, 0x66, 0x00, 0x7C, 0x00, 0x92, 0x00, 0x01, 0x18, 0x45, 0x39, 0x49, 0x18, 0x43, 0x39, 0x85, 0x08, @@ -410,7 +410,7 @@ static const UINT8 CROM_BANK5_WORLD6[] = 0xC7, 0x18, 0xC3, 0x5A, 0xB7, 0x6E, 0x68, 0x01, 0x00, 0x01, 0xFF, 0xFF }; -static const UINT8 CROM_BANK5_WORLD7[] = +static const uint8_t CROM_BANK5_WORLD7[] = { 0x0E, 0x00, 0x24, 0x00, 0x3A, 0x00, 0x50, 0x00, 0x66, 0x00, 0x7C, 0x00, 0x92, 0x00, 0x01, 0x18, 0xC5, 0x41, 0x49, 0x18, 0xC3, 0x41, 0x85, 0x08, @@ -428,7 +428,7 @@ static const UINT8 CROM_BANK5_WORLD7[] = 0xC7, 0x18, 0xC3, 0x5A, 0xB7, 0x6E, 0xE0, 0x01, 0x00, 0x01, 0xFF, 0xFF }; -static const UINT8 CROM_BANK5_WORLD8[] = +static const uint8_t CROM_BANK5_WORLD8[] = { 0x10, 0x00, 0x26, 0x00, 0x3C, 0x00, 0x52, 0x00, 0x68, 0x00, 0x7E, 0x00, 0x94, 0x00, 0xAA, 0x00, 0x01, 0x08, 0x43, 0x49, 0x49, 0x08, 0x43, 0x49, @@ -448,7 +448,7 @@ static const UINT8 CROM_BANK5_WORLD8[] = 0xC7, 0x18, 0xC3, 0x5A, 0xB7, 0x6E, 0x68, 0x01, 0x00, 0x01, 0xFF, 0xFF }; -static const UINT8 CROM_BANK5_WORLD9[] = +static const uint8_t CROM_BANK5_WORLD9[] = { 0x10, 0x00, 0x26, 0x00, 0x3C, 0x00, 0x52, 0x00, 0x68, 0x00, 0x7E, 0x00, 0x94, 0x00, 0xAA, 0x00, 0x01, 0x08, 0x03, 0x1A, 0x49, 0x08, 0x03, 0x1A, @@ -468,7 +468,7 @@ static const UINT8 CROM_BANK5_WORLD9[] = 0xC7, 0x18, 0xC3, 0x5A, 0xB7, 0x6E, 0x00, 0x05, 0x00, 0x01, 0xFF, 0xFF }; -static const UINT8 CROM_BANK6[] = +static const uint8_t CROM_BANK6[] = { 0x05, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x04, 0x82, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x21, 0x30, 0x05, 0x00, 0x00, @@ -499,7 +499,7 @@ static const UINT8 CROM_BANK6[] = 0x30, 0x00, 0x02, 0x11, 0x00, 0x00, 0x00, 0x00 }; -static const UINT8 CROM_BANK6_EXTRA[] = +static const uint8_t CROM_BANK6_EXTRA[] = { 0x05, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, @@ -530,16 +530,16 @@ static const UINT8 CROM_BANK6_EXTRA[] = 0x30, 0x00, 0x02, 0x11, 0x00, 0x00, 0x00, 0x00 }; -static const UINT8 CROM_BANK7_WORLD0[] = { 0x03, 0x03, 0x03, 0x03, 0x0C, 0x0C, 0x0A, 0x07, 0x0A, 0x0A, 0x08, 0x08, 0x08, 0x08 }; -static const UINT8 CROM_BANK7_WORLD1[] = { 0x03, 0x05, 0x01, 0x02, 0x04, 0x04 }; -static const UINT8 CROM_BANK7_WORLD2[] = { 0x03, 0x05, 0x07, 0x07, 0x08, 0x08, 0x01 }; -static const UINT8 CROM_BANK7_WORLD3[] = { 0x07, 0x07, 0x07, 0x08, 0x05, 0x08, 0x07, 0x0B }; -static const UINT8 CROM_BANK7_WORLD4[] = { 0x0A, 0x0B, 0x0A, 0x0A, 0x10, 0x10 }; -static const UINT8 CROM_BANK7_WORLD5[] = { 0x05, 0x08, 0x04, 0x08, 0x08, 0x07 }; -static const UINT8 CROM_BANK7_WORLD6[] = { 0x04, 0x07, 0x05, 0x08, 0x06, 0x08, 0x03 }; -static const UINT8 CROM_BANK7_WORLD7[] = { 0x07, 0x06, 0x06, 0x05, 0x08, 0x07, 0x0A }; -static const UINT8 CROM_BANK7_WORLD8[] = { 0x06, 0x05, 0x01, 0x08, 0x05, 0x05, 0x06, 0x08 }; -static const UINT8 CROM_BANK7_WORLD9[] = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08 }; +static const uint8_t CROM_BANK7_WORLD0[] = { 0x03, 0x03, 0x03, 0x03, 0x0C, 0x0C, 0x0A, 0x07, 0x0A, 0x0A, 0x08, 0x08, 0x08, 0x08 }; +static const uint8_t CROM_BANK7_WORLD1[] = { 0x03, 0x05, 0x01, 0x02, 0x04, 0x04 }; +static const uint8_t CROM_BANK7_WORLD2[] = { 0x03, 0x05, 0x07, 0x07, 0x08, 0x08, 0x01 }; +static const uint8_t CROM_BANK7_WORLD3[] = { 0x07, 0x07, 0x07, 0x08, 0x05, 0x08, 0x07, 0x0B }; +static const uint8_t CROM_BANK7_WORLD4[] = { 0x0A, 0x0B, 0x0A, 0x0A, 0x10, 0x10 }; +static const uint8_t CROM_BANK7_WORLD5[] = { 0x05, 0x08, 0x04, 0x08, 0x08, 0x07 }; +static const uint8_t CROM_BANK7_WORLD6[] = { 0x04, 0x07, 0x05, 0x08, 0x06, 0x08, 0x03 }; +static const uint8_t CROM_BANK7_WORLD7[] = { 0x07, 0x06, 0x06, 0x05, 0x08, 0x07, 0x0A }; +static const uint8_t CROM_BANK7_WORLD8[] = { 0x06, 0x05, 0x01, 0x08, 0x05, 0x05, 0x06, 0x08 }; +static const uint8_t CROM_BANK7_WORLD9[] = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08 }; static const struct CBANK CROM_BANK4[] = { @@ -589,7 +589,7 @@ static const struct CBANK CROM_BANK7[] = * *************************************/ -static const UINT16 cchip_extra_patch[][8] = +static const uint16_t cchip_extra_patch[][8] = { { 0x0168, 0x0078, 0x0168, 0x0168, 0x0168, 0x02D0, 0x0168, 0x003C }, { 0x0258, 0x0258, 0x0258, 0x0258, 0x0258, 0x0258, 0x0000, 0x0000 }, @@ -603,7 +603,7 @@ static const UINT16 cchip_extra_patch[][8] = { 0x0500, 0x0500, 0x0500, 0x0500, 0x0500, 0x0500, 0x0500, 0x0500 } }; -static const UINT8 cchip_goalin[15][6] = +static const uint8_t cchip_goalin[15][6] = { { 0x00, 0x00, 0x28, 0x28, 0x50, 0x50 }, { 0x00, 0x00, 0x00, 0x00, 0x50, 0x50 }, @@ -622,7 +622,7 @@ static const UINT8 cchip_goalin[15][6] = { 0x50, 0x50, 0x50, 0x50, 0x00, 0x00 } }; -static const UINT16 cchip_round_height[] = +static const uint16_t cchip_round_height[] = { 0x02DC, 0x03B4, 0x0444, 0x04BC, 0x03B4, 0x0444, 0x05DC, 0x050C, 0x0594, 0x06B4, 0x06B4, 0x0894, 0x065C, 0x06CC, 0x07BC, 0x08BC, @@ -633,7 +633,7 @@ static const UINT16 cchip_round_height[] = 0x0999, 0x0999 }; -static const UINT32 cchip_round_address[] = +static const uint32_t cchip_round_address[] = { 0x030000, 0x030360, 0x030798, 0x030CA8, 0x0311B8, 0x0315F0, 0x031B00, 0x0321C0, 0x032880, 0x032E68, 0x033600, 0x033D98, 0x0347B8, 0x034E78, 0x035610, 0x035E80, @@ -672,7 +672,7 @@ void rbisland_state::request_world_data( ) if (m_extra_version) { - static const UINT8 world_swap[] = + static const uint8_t world_swap[] = { 8, 7, 6, 4, 0, 2, 3, 5, 1, 9 }; @@ -694,7 +694,7 @@ void rbisland_state::request_world_data( ) for (i = 0; i < 8; i++) { - UINT16 patch = cchip_extra_patch[world][i]; + uint16_t patch = cchip_extra_patch[world][i]; if (patch != 0) { @@ -821,7 +821,7 @@ void rbisland_state::rbisland_cchip_init( int version ) for (i = 0; i < 8; i++) { - m_CRAM[i] = std::make_unique<UINT8[]>(0x400); + m_CRAM[i] = std::make_unique<uint8_t[]>(0x400); save_pointer(m_CRAM[i].get(), "cchip/m_CRAM[i]", 0x400, i); } |