diff options
| author | Alexey 'Cluster' Avdyukhin <clusterrr@clusterrr.com> | 2022-12-23 16:41:00 +0300 |
|---|---|---|
| committer | Alexey 'Cluster' Avdyukhin <clusterrr@clusterrr.com> | 2022-12-23 16:41:00 +0300 |
| commit | 2ca72c2e75241ef4139cd53cd697df6953446604 (patch) | |
| tree | 2197f3b441b1cafd14f96ab57bf9242023acc136 | |
| parent | d7948d3ea23ae6e26836489b70dcf65678b205b5 (diff) | |
Merged mappers 70 and 152, flag[0] to select
| -rw-r--r-- | CoolGirl_config.vh | 3 | ||||
| -rw-r--r-- | CoolGirl_mappers.vh | 15 | ||||
| -rw-r--r-- | CoolGirl_rev6.x/CoolGirl.qsf | 1 |
3 files changed, 8 insertions, 11 deletions
diff --git a/CoolGirl_config.vh b/CoolGirl_config.vh index a443f9a..4ff8b4b 100644 --- a/CoolGirl_config.vh +++ b/CoolGirl_config.vh @@ -18,7 +18,7 @@ parameter ENABLE_MAPPER_065 = 1, // mapper #065 - Irem's H3001 parameter ENABLE_MAPPER_066 = 1, // mapper #066 - GxROM parameter ENABLE_MAPPER_067 = 0, // mapper #067 - Sunsoft-3 parameter ENABLE_MAPPER_069 = 1, // mapper #069 - Sunsoft FME-7 -parameter ENABLE_MAPPER_070 = 1, // mapper #070 - Bandai: Family Trainer, Kamen Rider Club, Space Shadow +parameter ENABLE_MAPPER_070_152 = 1, // mappers #070, #152 parameter ENABLE_MAPPER_071 = 1, // mapper #071 - Camerica: for Fire Hawk only parameter ENABLE_MAPPER_073 = 0, // mapper #073 - VRC3 parameter ENABLE_MAPPER_075 = 0, // mapper #075 - VRC1 @@ -35,7 +35,6 @@ parameter ENABLE_MAPPER_097 = 0, // mapper #097 - Irem's TAM-S1: onl parameter ENABLE_MAPPER_112 = 0, // mapper #112 - NTDEC parameter ENABLE_MAPPER_118 = 1, // mapper #118 - TxSROM parameter ENABLE_MAPPER_133 = 0, // mapper #133 - Sachen, 72-pin version only -parameter ENABLE_MAPPER_152 = 1, // mapper #152 - Bandai parameter ENABLE_MAPPER_163 = 0, // mapper #163 - Nanjing parameter ENABLE_MAPPER_184 = 0, // mapper #184 parameter ENABLE_MAPPER_189 = 1, // mapper #189 - TXC diff --git a/CoolGirl_mappers.vh b/CoolGirl_mappers.vh index 35ec563..0d880ac 100644 --- a/CoolGirl_mappers.vh +++ b/CoolGirl_mappers.vh @@ -971,12 +971,16 @@ begin endcase end + // Mapper #70 // Mapper #152 - Bandai - if (ENABLE_MAPPER_152 && (mapper == 6'b010010)) + if (ENABLE_MAPPER_070_152 && (mapper == 6'b010010)) begin chr_bank_a[6:3] <= cpu_data_in[3:0]; prg_bank_a[3:1] <= cpu_data_in[6:4]; - mirroring <= {1'b1, cpu_data_in[7]}; + if (flags[0]) + mirroring <= {1'b1, cpu_data_in[7]}; // Mapper #152 + else + prg_bank_a[4] <= cpu_data_in[7]; // Mapper #70 end // Mapper #73 - VRC3 @@ -1249,13 +1253,6 @@ begin end end - // Mapper #70 - Bandai - if (ENABLE_MAPPER_070 && (mapper == 6'b011110)) - begin - prg_bank_a[4:1] <= cpu_data_in[7:4]; - chr_bank_a[6:3] <= cpu_data_in[3:0]; - end - // Mapper #75 - VRC1 if (ENABLE_MAPPER_075 && (mapper == 6'b100010)) begin diff --git a/CoolGirl_rev6.x/CoolGirl.qsf b/CoolGirl_rev6.x/CoolGirl.qsf index 21fc88a..69a5567 100644 --- a/CoolGirl_rev6.x/CoolGirl.qsf +++ b/CoolGirl_rev6.x/CoolGirl.qsf @@ -39,6 +39,7 @@ set_global_assignment -name FAMILY "MAX II"
set_global_assignment -name DEVICE EPM1270T144C5
+set_global_assignment -name FAMILY "MAX II"
set_global_assignment -name TOP_LEVEL_ENTITY CoolGirl
set_global_assignment -name ORIGINAL_QUARTUS_VERSION 15.1.0
set_global_assignment -name PROJECT_CREATION_TIME_DATE "19:53:22 MAY 05, 2016"
|