1 files changed, 9 insertions, 9 deletions

diff --git a/mappers/mapper_011_0.c b/mappers/mapper_011_0.c
index e5db02c..d324fcf 100644
--- a/mappers/mapper_011_0.c
+++ b/mappers/mapper_011_0.c
@@ -1,7 +1,7 @@
 
 __attribute__((section(".mapper_011_0")))
-static uint8_t mapper_011_0_prg_read(struct nes_state *state, uint32_t addr) {
-	struct mapper_011_0 *mapper = (struct mapper_011_0 *)&state->map;
+static uint8_t mapper_011_0_prg_rom_read(struct nes_state *state, uint32_t addr) {
+	struct mapper_011_0 *mapper = &state->mapper_data.m011_0;
 
 	if(addr >= 0x8000) {
 		return mapper->prg_rom[addr - 0x8000];
@@ -10,8 +10,8 @@ static uint8_t mapper_011_0_prg_read(struct nes_state *state, uint32_t addr) {
 }
 
 __attribute__((section(".mapper_011_0")))
-static void mapper_011_0_prg_write(struct nes_state *state, uint32_t addr, uint8_t value) {
-	struct mapper_011_0 *mapper = (struct mapper_011_0 *)&state->map;
+static void mapper_011_0_prg_rom_write(struct nes_state *state, uint32_t addr, uint8_t value) {
+	struct mapper_011_0 *mapper = &state->mapper_data.m011_0;
 
 	if(addr >= 0x8000) {
 		mapper->prg_rom = state->prg_rom + ((value >> 4) & 7) * 0x8000;
@@ -21,20 +21,20 @@ static void mapper_011_0_prg_write(struct nes_state *state, uint32_t addr, uint8
 
 __attribute__((section(".mapper_011_0")))
 static uint8_t mapper_011_0_chr_read(struct nes_state *state, uint32_t addr) {
-	struct mapper_011_0 *mapper = (struct mapper_011_0 *)&state->map;
+	struct mapper_011_0 *mapper = &state->mapper_data.m011_0;
 
 	return mapper->chr_ptr[addr];
 }
 
 __attribute__((section(".mapper_011_0")))
 static void mapper_011_0_init(struct nes_state *state) {
-	struct mapper_011_0 *mapper = (struct mapper_011_0 *)&state->map;
+	struct mapper_011_0 *mapper = &state->mapper_data.m011_0;
 
 	mapper->prg_rom = state->prg_rom;
 	mapper->chr_ptr = state->chr_rom;
 
-	state->mapper.prg_read		= mapper_011_0_prg_read;
-	state->mapper.prg_write		= mapper_011_0_prg_write;
-	state->mapper.chr_read		= mapper_011_0_chr_read;
+	state->mapper_function.prg_rom_read		= mapper_011_0_prg_rom_read;
+	state->mapper_function.prg_rom_write	= mapper_011_0_prg_rom_write;
+	state->mapper_function.chr_read			= mapper_011_0_chr_read;
 }