From 7cca3bdbec289328b537c8256b43dcfedc5d56b8 Mon Sep 17 00:00:00 2001 From: Peter Fors Date: Tue, 27 May 2025 15:03:30 +0200 Subject: renaming --- mappers/mapper_003_1.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'mappers/mapper_003_1.c') diff --git a/mappers/mapper_003_1.c b/mappers/mapper_003_1.c index 0032fbc..68e67c7 100644 --- a/mappers/mapper_003_1.c +++ b/mappers/mapper_003_1.c @@ -1,12 +1,12 @@ __attribute__((section(".mapper_003_1"))) -static uint8_t mapper_003_1_prg_read(struct nes_state *state, uint32_t addr) { +static uint8_t mapper_003_1_prg_rom_read(struct nes_state *state, uint32_t addr) { return state->prg_rom[addr & 0x7fff]; } __attribute__((section(".mapper_003_1"))) -static void mapper_003_1_prg_write(struct nes_state *state, uint32_t addr, uint8_t value) { - struct mapper_003_1 *mapper = (struct mapper_003_1 *)&state->map; +static void mapper_003_1_prg_rom_write(struct nes_state *state, uint32_t addr, uint8_t value) { + struct mapper_003_1 *mapper = &state->mapper_data.m003_1; if(addr >= 0x8000) { mapper->chr_ptr = state->chr_rom + (value & 3) * 0x2000; @@ -15,17 +15,17 @@ static void mapper_003_1_prg_write(struct nes_state *state, uint32_t addr, uint8 __attribute__((section(".mapper_003_1"))) static uint8_t mapper_003_1_chr_read(struct nes_state *state, uint32_t addr) { - struct mapper_003_1 *mapper = (struct mapper_003_1 *)&state->map; + struct mapper_003_1 *mapper = &state->mapper_data.m003_1; return mapper->chr_ptr[addr]; } __attribute__((section(".mapper_003_1"))) static void mapper_003_1_init(struct nes_state *state) { - struct mapper_003_1 *mapper = (struct mapper_003_1 *)&state->map; + struct mapper_003_1 *mapper = &state->mapper_data.m003_1; mapper->chr_ptr = state->chr_rom; - state->mapper.prg_read = mapper_003_1_prg_read; - state->mapper.prg_write = mapper_003_1_prg_write; - state->mapper.chr_read = mapper_003_1_chr_read; + state->mapper_function.prg_rom_read = mapper_003_1_prg_rom_read; + state->mapper_function.prg_rom_write = mapper_003_1_prg_rom_write; + state->mapper_function.chr_read = mapper_003_1_chr_read; } -- cgit v1.2.3