From 613e26d8ce6376aaa71cd4c1cbdbcc00fdb9c621 Mon Sep 17 00:00:00 2001 From: scawful Date: Sun, 12 Nov 2023 10:17:35 -0500 Subject: [PATCH] Remove gfx groups fns from Room class --- src/app/zelda3/dungeon/room.cc | 66 ---------------------------------- src/app/zelda3/dungeon/room.h | 3 -- 2 files changed, 69 deletions(-) diff --git a/src/app/zelda3/dungeon/room.cc b/src/app/zelda3/dungeon/room.cc index cdd6395e..5c6366a6 100644 --- a/src/app/zelda3/dungeon/room.cc +++ b/src/app/zelda3/dungeon/room.cc @@ -78,72 +78,6 @@ void DrawDungeonRoomBG2(std::vector& tiles_bg2_buffer, } } -// ================================================================== - -void Room::LoadGfxGroups() { - auto rom_data = rom()->vector(); - int gfxPointer = - (rom_data[gfx_groups_pointer + 1] << 8) + rom_data[gfx_groups_pointer]; - gfxPointer = core::SnesToPc(gfxPointer); - - for (int i = 0; i < 37; i++) { - for (int j = 0; j < 8; j++) { - mainGfx[i][j] = rom_data[gfxPointer + (i * 8) + j]; - } - } - - for (int i = 0; i < 82; i++) { - for (int j = 0; j < 4; j++) { - roomGfx[i][j] = rom_data[entrance_gfx_group + (i * 4) + j]; - } - } - - for (int i = 0; i < 144; i++) { - for (int j = 0; j < 4; j++) { - spriteGfx[i][j] = rom_data[sprite_blockset_pointer + (i * 4) + j]; - } - } - - for (int i = 0; i < 72; i++) { - for (int j = 0; j < 4; j++) { - paletteGfx[i][j] = rom_data[dungeons_palettes_groups + (i * 4) + j]; - } - } -} - -bool Room::SaveGroupsToROM() { - auto rom_data = rom()->vector(); - int gfxPointer = - (rom_data[gfx_groups_pointer + 1] << 8) + rom_data[gfx_groups_pointer]; - gfxPointer = core::SnesToPc(gfxPointer); - - for (int i = 0; i < 37; i++) { - for (int j = 0; j < 8; j++) { - rom()->Write(gfxPointer + (i * 8) + j, mainGfx[i][j]); - } - } - - for (int i = 0; i < 82; i++) { - for (int j = 0; j < 4; j++) { - rom()->Write(entrance_gfx_group + (i * 4) + j, roomGfx[i][j]); - } - } - - for (int i = 0; i < 144; i++) { - for (int j = 0; j < 4; j++) { - rom()->Write(sprite_blockset_pointer + (i * 4) + j, spriteGfx[i][j]); - } - } - - for (int i = 0; i < 72; i++) { - for (int j = 0; j < 4; j++) { - rom()->Write(dungeons_palettes_groups + (i * 4) + j, paletteGfx[i][j]); - } - } - - return false; -} - void Room::LoadSprites() { auto rom_data = rom()->vector(); int spritePointer = (0x04 << 16) + (rom_data[rooms_sprite_pointer + 1] << 8) + diff --git a/src/app/zelda3/dungeon/room.h b/src/app/zelda3/dungeon/room.h index 13bab770..c610f939 100644 --- a/src/app/zelda3/dungeon/room.h +++ b/src/app/zelda3/dungeon/room.h @@ -111,9 +111,6 @@ struct StaircaseRooms {}; class Room : public SharedROM { public: - void LoadGfxGroups(); - bool SaveGroupsToROM(); - void LoadSprites(); void LoadChests();