Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added ALG Rev A and other games to Rom Manager #212

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Added ALG Rev A and other games to Rom Manager #212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5b03dd7
Added ALG Rev A and other games
mrbabbage-hacks Mar 15, 2022
993e0cf
Merge branch 'tonioni:master' into master
mrbabbage-hacks Apr 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions arcadia.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1028,14 +1028,19 @@ uae_u8 alg_joystick_buttons(uae_u8 pra, uae_u8 dra, uae_u8 v)
return v;
}

void alg_map_banks(void)
void alg_map_banks(bool is_rev_a)
{
alg_flag = 1;
if (!algmemory_initialized) {
alg_nvram_read();
algmemory_initialized = 1;
}
map_banks(&alg_ram_bank, 0xf4, 4, 0);
if (is_rev_a) {
map_banks(&alg_ram_bank, 0xf5, 1, 0);
}
else {
map_banks(&alg_ram_bank, 0xf7, 1, 0);
}
pausevideograb(1);
ld_audio = 0;
ld_mode = 0;
Expand Down
2 changes: 1 addition & 1 deletion include/arcadia.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ extern int arcadia_flag, arcadia_coin[2];
#define ARCADIA_GAME 2

extern int alg_flag;
extern void alg_map_banks(void);
extern void alg_map_banks(bool is_rev_a);
extern bool alg_ld_active(void);

extern int alg_get_player(uae_u16);
Expand Down
52 changes: 42 additions & 10 deletions memory.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1060,7 +1060,10 @@ static int extendedkickmem_type;
#define EXTENDED_ROM_CDTV 2
#define EXTENDED_ROM_KS 3
#define EXTENDED_ROM_ARCADIA 4
#define EXTENDED_ROM_ALG 5
#define EXTENDED_ROM_ALG_A 5
#define EXTENDED_ROM_ALG_B 6

bool alg_r2_override = false;

static void REGPARAM3 extendedkickmem_lput (uaecptr, uae_u32) REGPARAM;
static void REGPARAM3 extendedkickmem_wput (uaecptr, uae_u32) REGPARAM;
Expand Down Expand Up @@ -1420,12 +1423,20 @@ void a3000_fakekick (int map)
protect_roms (true);
}

static bool is_alg_rom(const TCHAR *name)
static bool is_alg_a_rom(const TCHAR *name)
{
struct romdata *rd = getromdatabypath(name);
if (!rd)
return false;
return (rd->type & ROMTYPE_ALG) != 0;
return ((rd->type & ROMTYPE_ALG) != 0 && (rd->size == 0x10000));
}

static bool is_alg_b_rom(const TCHAR* name)
{
struct romdata* rd = getromdatabypath(name);
if (!rd)
return false;
return ((rd->type & ROMTYPE_ALG) != 0 && (rd->size == 0x20000));
}

static void descramble_alg(uae_u8 *data, int size)
Expand Down Expand Up @@ -1568,10 +1579,18 @@ static bool load_extendedkickstart (const TCHAR *romextfile, int type)
extendedkickmem_type = EXTENDED_ROM_ARCADIA;
return false;
}
if (is_alg_rom(romextfile)) {
type = EXTENDED_ROM_ALG;
if (is_alg_a_rom(romextfile)) {
type = EXTENDED_ROM_ALG_A;

}
else if (is_alg_b_rom(romextfile)) {
type = EXTENDED_ROM_ALG_B;
alg_r2_override = false;
struct romdata* rd = getromdatabypath(romextfile);
if ( (rd->id == 182) || (rd->id == 273)) {
alg_r2_override = true;
}
}
f = read_rom_name (romextfile);
if (!f) {
notify_user (NUMSG_NOEXTROM);
Expand Down Expand Up @@ -1615,16 +1634,24 @@ static bool load_extendedkickstart (const TCHAR *romextfile, int type)
mapped_malloc (&extendedkickmem_bank);
extendedkickmem_bank.start = 0xe00000;
break;
case EXTENDED_ROM_ALG:
case EXTENDED_ROM_ALG_A:
extendedkickmem_bank.label = _T("rom_f0");
mapped_malloc(&extendedkickmem_bank);
extendedkickmem_bank.start = 0xf00000;
break;
case EXTENDED_ROM_ALG_B:
extendedkickmem_bank.label = _T("rom_f0");
mapped_malloc(&extendedkickmem_bank);
extendedkickmem_bank.start = 0xf00000;
break;
}
if (extendedkickmem_bank.baseaddr) {
if (extendedkickmem_bank.baseaddr) {
read_kickstart (f, extendedkickmem_bank.baseaddr, extendedkickmem_bank.allocated_size, 0, 1);
if (extendedkickmem_type == EXTENDED_ROM_ALG)
if (extendedkickmem_type == EXTENDED_ROM_ALG_A)
descramble_alg(extendedkickmem_bank.baseaddr, 131072);
else if (extendedkickmem_type == EXTENDED_ROM_ALG_B)
descramble_alg(extendedkickmem_bank.baseaddr, 262144);

extendedkickmem_bank.mask = extendedkickmem_bank.allocated_size - 1;
ret = true;
}
Expand Down Expand Up @@ -2895,10 +2922,15 @@ void memory_reset (void)
map_banks_set(&extendedkickmem_bank, 0xE0, 8, 0);
break;
#endif
case EXTENDED_ROM_ALG:
case EXTENDED_ROM_ALG_A:
map_banks_set(&extendedkickmem_bank, 0xF0, 2, 0);
alg_map_banks(true);
break;
case EXTENDED_ROM_ALG_B:
map_banks_set(&extendedkickmem_bank, 0xF0, 4, 0);
alg_map_banks();
alg_map_banks(alg_r2_override); // If true, this is Space PIrates 1.4 or the Rev A -> B hack that uses the old NVRAM location
break;

}

#ifdef AUTOCONFIG
Expand Down
60 changes: 57 additions & 3 deletions rommgr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ struct romdata *getromdatabypath (const TCHAR *path)
return NULL;
}

#define NEXT_ROM_ID 269
#define NEXT_ROM_ID 274

#define ALTROM(id,grp,num,size,flags,crc32,a,b,c,d,e) \
{ _T("X"), 0, 0, 0, 0, 0, size, id, 0, 0, flags, (grp << 16) | num, 0, NULL, crc32, a, b, c, d, e },
Expand Down Expand Up @@ -786,6 +786,12 @@ static struct romdata roms[] = {
0x09c2cfcb, 0x93ad6a25,0x77fa7870,0x971890f2,0x6af11382, 0xa433f80b },
ALTROMPN(183, 1, 1, 131072, ROMTYPE_EVEN | ROMTYPE_8BIT, NULL, 0x10d162a2, 0x26833d5b,0xe1057be8,0x639c00a7,0xbe18be33,0x404ea751)
ALTROMPN(183, 1, 2, 131072, ROMTYPE_ODD | ROMTYPE_8BIT, NULL, 0xc0975188, 0xfd7643dc,0x972e7861,0x249ab7e7,0x61999759,0x84888ae4)
// sp_14b_u1.bin, sp_14b_u2.bin
{ _T("American Laser Games Space Pirates v1.4 (Rev B PCB hack)"), 0, 0, 0, 0, _T("ALG\0"), 262144, 271, 0, 0, ROMTYPE_ALG, 0, 0, NULL,
0x024092d3, 0xd5e04a80, 0xabeb1ffe, 0xff089539, 0x01e398d8, 0xadce9bb2 },
ALTROMPN(271, 1, 1, 131072, ROMTYPE_EVEN | ROMTYPE_8BIT, NULL, 0x0b77952b, 0xc1497f16, 0xe042a248, 0x224f8527, 0xdff69d7a, 0xdc00f46c)
ALTROMPN(271, 1, 2, 131072, ROMTYPE_ODD | ROMTYPE_8BIT, NULL, 0x1e6ec8d6, 0x9472613e, 0x209cab7d, 0xc73940f8, 0x1030c857, 0xd3d6a47c)

// johnny_01.bin, johnny_02.bin
{ _T("American Laser Games Who Shot Johnny Rock? v1.6"), 0, 0, 0, 0, _T("ALG\0"), 131072, 184, 0, 0, ROMTYPE_ALG, 0, 0, NULL,
0xaeda7df4, 0xa612c4b9,0x2bd81ab9,0x564e58da,0x9a6a4d81,0x93c59acf },
Expand All @@ -796,6 +802,18 @@ static struct romdata roms[] = {
0x50eb4827, 0x72568673,0x4163aa16,0xd0ad3177,0xbd720187,0x125a63ec },
ALTROMPN(185, 1, 1, 65536, ROMTYPE_EVEN | ROMTYPE_8BIT, NULL, 0x8ab626dd, 0xe45561f7,0x7fc279b7,0x1dc1dd2e,0x15a0870c,0xb5c1cd89)
ALTROMPN(185, 1, 2, 65536, ROMTYPE_ODD | ROMTYPE_8BIT, NULL, 0x9beeb1d7, 0x3fe0265e,0x5d36103d,0x3d9557d7,0x5e5e3728,0xe0b30da7)
// wsjrU1A.bin,wsjrU2A.bin
{_T("American Laser Games Who Shot Johnny Rock? v1.6 (Maddog Rev A PCB hack)"), 0, 0, 0, 0, _T("ALG\0"), 131072, 272, 0, 0, ROMTYPE_ALG, 0, 0, NULL,
0xaa413638, 0x387e9613, 0xf7034ac2, 0x509f90dc, 0x796da9ca, 0x39e506f9
},
ALTROMPN(272, 1, 1, 65536, ROMTYPE_EVEN | ROMTYPE_8BIT, NULL, 0x2a9225a7, 0x644428b2, 0x000ce281, 0xbc0247dd, 0xa9276355, 0x92849717)
ALTROMPN(272, 1, 2, 65536, ROMTYPE_ODD | ROMTYPE_8BIT, NULL, 0x1e10eb58, 0x80cd169e, 0xf1959852, 0xf5b1ec3b, 0x2e2f995d, 0x588cf1df)
// wsjrU1B.bin,wsjrU2B.bin
{_T("American Laser Games Who Shot Johnny Rock? v1.6 (Rev B PCB hack)"), 0, 0, 0, 0, _T("ALG\0"), 262144, 273, 0, 0, ROMTYPE_ALG, 0, 0, NULL,
0xa8cb412c, 0x2059d37c, 0xf63fdeaf, 0x9c0fc83e, 0xad018a8f, 0x982dc11f
},
ALTROMPN(273, 1, 1, 131072, ROMTYPE_EVEN | ROMTYPE_8BIT, NULL, 0x0848dc29, 0x9b70ac17, 0x705f06d3, 0x8c8285bb, 0x7edead7d, 0x2b286fd2)
ALTROMPN(273, 1, 2, 131072, ROMTYPE_ODD | ROMTYPE_8BIT, NULL, 0xc6634148, 0x5c99ca64, 0x7b421383, 0xdf6e3391, 0xac685b35, 0x4a1a5539)
// gg_1.dat,gg_2.dat
{ _T("American Laser Games Gallagher's Gallery v2.2"), 0, 0, 0, 0, _T("ALG\0"), 262144, 186, 0, 0, ROMTYPE_ALG, 0, 0, NULL,
0xcbe791de, 0x17aa6f16,0x7e138409,0xe1ef039e,0x928fee5a,0xf43e91cb },
Expand All @@ -806,6 +824,12 @@ static struct romdata roms[] = {
0x9bfe35bb, 0x76c8cad8,0xd0f4758f,0x1adc0fc9,0x7cb6ad30,0x44b54d47 },
ALTROMPN(187, 1, 1, 131072, ROMTYPE_EVEN | ROMTYPE_8BIT, NULL, 0x70f887e5, 0xcd6cedc8,0x5bbe6767,0x4dfd140f,0xed901877,0x8f8cd8db)
ALTROMPN(187, 1, 2, 131072, ROMTYPE_ODD | ROMTYPE_8BIT, NULL, 0x4109f39e, 0x42d06de4,0x2c56f21e,0x4899b4c4,0x252baabb,0x51f24fda)
// gg_20_rom1.bin,gg_20_rom2.bin
{ _T("American Laser Games Gallagher's Gallery v2.0"), 0, 0, 0, 0, _T("ALG\0"), 262144, 269, 0, 0, ROMTYPE_ALG, 0, 0, NULL,
0xec0a948f, 0x97942bdf, 0x14e2bbe5, 0x5114c973, 0xd7d5bd98, 0x84795a51
},
ALTROMPN(269, 1, 1, 131072, ROMTYPE_EVEN | ROMTYPE_8BIT, NULL, 0x229dd4b8, 0x982b3c95, 0x4bbd6aeb, 0x71e7cfa0, 0xe1074264, 0x5d726332)
ALTROMPN(269, 1, 2, 131072, ROMTYPE_ODD | ROMTYPE_8BIT, NULL, 0xb7e96e7b, 0x7bfc5600, 0x15c94edc, 0x2c57b533, 0x95eebae4, 0x51c644ff)
// fd_131_u1.bin,fd_131_u2.bin
{ _T("American Laser Games Fast Draw Showdown v1.31"), 0, 0, 0, 0, _T("ALG\0"), 262144, 188, 0, 0, ROMTYPE_ALG, 0, 0, NULL,
0x6977addf, 0xdc845431,0xbb1a39bd,0x615afe5f,0x7cb7c8d0,0x3433ef8c },
Expand Down Expand Up @@ -841,6 +865,12 @@ static struct romdata roms[] = {
0x63e9f444, 0x6f2624a5,0x6a672f97,0xc751ae51,0xb4b834a5,0x097a855a },
ALTROMPN(194, 1, 1, 131072, ROMTYPE_EVEN | ROMTYPE_8BIT, NULL, 0x475e847a, 0x82fd1608,0x35758cd5,0x1ea22f90,0xb08921a4,0x0409f94d)
ALTROMPN(194, 1, 2, 131072, ROMTYPE_ODD | ROMTYPE_8BIT, NULL, 0x814f5777, 0x341a1d7b,0x64112af3,0xe8243bdb,0xfec72e7f,0xa85aa903)
// cp_10_rom1.bin, cp_10_rom2.bin
{ _T("American Laser Games Crime Patrol v1.0"), 0, 0, 0, 0, _T("ALG\0"), 262144, 270, 0, 0, ROMTYPE_ALG, 0, 0, NULL,
0xb3846a9f, 0x0157ff74, 0xb10b0bc2, 0x576ddcab, 0x80af6466, 0x6d49afc9
},
ALTROMPN(270, 1, 1, 131072, ROMTYPE_EVEN | ROMTYPE_8BIT, NULL, 0x6e4614cd, 0x0f73f477, 0xe13b3f18, 0x4e9a55f4, 0xbe954746, 0x61c912d5)
ALTROMPN(270, 1, 2, 131072, ROMTYPE_ODD | ROMTYPE_8BIT, NULL, 0xaac76488, 0xfabf4700, 0x610480a2, 0x8dad6e14, 0x83e58ec2, 0x27e465ff)
// cp2_1.3_1.bin, cp2_1.3_2.bin
{ _T("American Laser Games Crime Patrol 2: Drug Wars v1.3"), 0, 0, 0, 0, _T("ALG\0"), 262144, 195, 0, 0, ROMTYPE_ALG, 0, 0, NULL,
0x57d1f606, 0xffbee51c,0x9c52a9c6,0x6440cbf8,0x34144321,0x75036282 },
Expand Down Expand Up @@ -1922,7 +1952,7 @@ struct zfile *read_rom (struct romdata *prd)
}
if (ok) {
if (rd->id == 197) {
// ALG Platoon
// NOVA Platoon (Uses ALG Rev B board, but their own PAL)
uae_u8 *tmp = xmalloc(uae_u8, size);
if (tmp) {
memcpy(tmp, buf, size);
Expand All @@ -1933,7 +1963,7 @@ struct zfile *read_rom (struct romdata *prd)
xfree(tmp);
}
} else if (rd->id == 182) {
// ALG Space Pirates
// ALG Space Pirates (PAL R4?)
uae_u8 *tmp = xmalloc(uae_u8, size);
if (tmp) {
memcpy(tmp, buf, size);
Expand All @@ -1945,6 +1975,30 @@ struct zfile *read_rom (struct romdata *prd)
xfree(tmp);
}
}
else if ((rd->id == 184) || (rd->id == 185)) {
// ALG Johnny Rock (PAL R3)
uae_u8* tmp = xmalloc(uae_u8, size);
if (tmp) {
memcpy(tmp, buf, size);
static const int wsjr[] = { 0,1,3,2,4,5,7,6,8,9,11,10,12,13,15,14,16,17,19,18,20,21,23,22,24,25,27,26,28,29,31,30 };
for (int i = 0; i < 32; i++) {
memcpy(buf + i * 0x1000, tmp + wsjr[i] * 0x1000, 0x1000);
}
xfree(tmp);
}
}
else if ((rd->id == 175) || (rd->id == 272)) {
// ALG Mad Dog (Original Rev A board, PAL R1)
uae_u8* tmp = xmalloc(uae_u8, size);
if (tmp) {
memcpy(tmp, buf, size);
static const int mdm[] = { 0,1,3,2,4,5,7,6,12,13,15,14,8,9,11,10,16,17,19,18,20,21,23,22,28,29,31,30,24,25,27,26 };
for (int i = 0; i < 32; i++) {
memcpy(buf + i * 0x1000, tmp + mdm[i] * 0x1000, 0x1000);
}
xfree(tmp);
}
}
}
if (ok) {
struct zfile *zf = zfile_fopen_empty (NULL, name, size);
Expand Down