renaming

1 files changed, 9 insertions, 9 deletions

diff --git a/mappers/mapper_066_0.c b/mappers/mapper_066_0.c
index 9629fb2..ccd00fe 100644
--- a/mappers/mapper_066_0.c
+++ b/mappers/mapper_066_0.c
@@ -1,7 +1,7 @@
 
 __attribute__((section(".mapper_066_0")))
-static uint8_t mapper_066_0_prg_read(struct nes_state *state, uint32_t addr) {
-	struct mapper_066_0 *mapper = (struct mapper_066_0 *)&state->map;
+static uint8_t mapper_066_0_prg_rom_read(struct nes_state *state, uint32_t addr) {
+	struct mapper_066_0 *mapper = &state->mapper_data.m066_0;
 
 	if(addr >= 0x8000) {
 		return state->prg_rom[addr & 0x7fff];
@@ -10,8 +10,8 @@ static uint8_t mapper_066_0_prg_read(struct nes_state *state, uint32_t addr) {
 }
 
 __attribute__((section(".mapper_066_0")))
-static void mapper_066_0_prg_write(struct nes_state *state, uint32_t addr, uint8_t value) {
-	struct mapper_066_0 *mapper = (struct mapper_066_0 *)&state->map;
+static void mapper_066_0_prg_rom_write(struct nes_state *state, uint32_t addr, uint8_t value) {
+	struct mapper_066_0 *mapper = &state->mapper_data.m066_0;
 
 	if(addr >= 0x8000) {
 		uint32_t prg_bank = (value >> 4) & 3;
@@ -24,19 +24,19 @@ static void mapper_066_0_prg_write(struct nes_state *state, uint32_t addr, uint8
 
 __attribute__((section(".mapper_066_0")))
 static uint8_t mapper_066_0_chr_read(struct nes_state *state, uint32_t addr) {
-	struct mapper_066_0 *mapper = (struct mapper_066_0 *)&state->map;
+	struct mapper_066_0 *mapper = &state->mapper_data.m066_0;
 	return mapper->chr_offset[addr];
 }
 
 __attribute__((section(".mapper_066_0")))
 static void mapper_066_0_init(struct nes_state *state) {
-	struct mapper_066_0 *mapper = (struct mapper_066_0 *)&state->map;
+	struct mapper_066_0 *mapper = &state->mapper_data.m066_0;
 
 	mapper->prg_offset = state->prg_rom;
 	mapper->chr_offset = state->chr_rom;
 
-	state->mapper.prg_read	= mapper_066_0_prg_read;
-	state->mapper.prg_write	= mapper_066_0_prg_write;
-	state->mapper.chr_read	= mapper_066_0_chr_read;
+	state->mapper_function.prg_rom_read		= mapper_066_0_prg_rom_read;
+	state->mapper_function.prg_rom_write	= mapper_066_0_prg_rom_write;
+	state->mapper_function.chr_read			= mapper_066_0_chr_read;
 }