Skip to content

Commit 613e26d

Browse files
committed
Remove gfx groups fns from Room class
1 parent 6ae969d commit 613e26d

File tree

2 files changed

+0
-69
lines changed

2 files changed

+0
-69
lines changed

Diff for: src/app/zelda3/dungeon/room.cc

-66
Original file line numberDiff line numberDiff line change
@@ -78,72 +78,6 @@ void DrawDungeonRoomBG2(std::vector<uint8_t>& tiles_bg2_buffer,
7878
}
7979
}
8080

81-
// ==================================================================
82-
83-
void Room::LoadGfxGroups() {
84-
auto rom_data = rom()->vector();
85-
int gfxPointer =
86-
(rom_data[gfx_groups_pointer + 1] << 8) + rom_data[gfx_groups_pointer];
87-
gfxPointer = core::SnesToPc(gfxPointer);
88-
89-
for (int i = 0; i < 37; i++) {
90-
for (int j = 0; j < 8; j++) {
91-
mainGfx[i][j] = rom_data[gfxPointer + (i * 8) + j];
92-
}
93-
}
94-
95-
for (int i = 0; i < 82; i++) {
96-
for (int j = 0; j < 4; j++) {
97-
roomGfx[i][j] = rom_data[entrance_gfx_group + (i * 4) + j];
98-
}
99-
}
100-
101-
for (int i = 0; i < 144; i++) {
102-
for (int j = 0; j < 4; j++) {
103-
spriteGfx[i][j] = rom_data[sprite_blockset_pointer + (i * 4) + j];
104-
}
105-
}
106-
107-
for (int i = 0; i < 72; i++) {
108-
for (int j = 0; j < 4; j++) {
109-
paletteGfx[i][j] = rom_data[dungeons_palettes_groups + (i * 4) + j];
110-
}
111-
}
112-
}
113-
114-
bool Room::SaveGroupsToROM() {
115-
auto rom_data = rom()->vector();
116-
int gfxPointer =
117-
(rom_data[gfx_groups_pointer + 1] << 8) + rom_data[gfx_groups_pointer];
118-
gfxPointer = core::SnesToPc(gfxPointer);
119-
120-
for (int i = 0; i < 37; i++) {
121-
for (int j = 0; j < 8; j++) {
122-
rom()->Write(gfxPointer + (i * 8) + j, mainGfx[i][j]);
123-
}
124-
}
125-
126-
for (int i = 0; i < 82; i++) {
127-
for (int j = 0; j < 4; j++) {
128-
rom()->Write(entrance_gfx_group + (i * 4) + j, roomGfx[i][j]);
129-
}
130-
}
131-
132-
for (int i = 0; i < 144; i++) {
133-
for (int j = 0; j < 4; j++) {
134-
rom()->Write(sprite_blockset_pointer + (i * 4) + j, spriteGfx[i][j]);
135-
}
136-
}
137-
138-
for (int i = 0; i < 72; i++) {
139-
for (int j = 0; j < 4; j++) {
140-
rom()->Write(dungeons_palettes_groups + (i * 4) + j, paletteGfx[i][j]);
141-
}
142-
}
143-
144-
return false;
145-
}
146-
14781
void Room::LoadSprites() {
14882
auto rom_data = rom()->vector();
14983
int spritePointer = (0x04 << 16) + (rom_data[rooms_sprite_pointer + 1] << 8) +

Diff for: src/app/zelda3/dungeon/room.h

-3
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,6 @@ struct StaircaseRooms {};
111111

112112
class Room : public SharedROM {
113113
public:
114-
void LoadGfxGroups();
115-
bool SaveGroupsToROM();
116-
117114
void LoadSprites();
118115
void LoadChests();
119116

0 commit comments

Comments
 (0)