scawful/yaze
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor Overworld blockset types and update related function signatures

Browse Source
This commit is contained in:
scawful
2024-12-31 16:40:01 -05:00
parent 9f67e0c399
commit 6d2de44b94
8 changed files with 86 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/app/zelda3/overworld/overworld_map.h
View File

@@ -1,6 +1,7 @@
#ifndef YAZE_APP_ZELDA3_OVERWORLD_MAP_H
#define YAZE_APP_ZELDA3_OVERWORLD_MAP_H
#include <array>
#include <cstddef>
#include <cstdint>
#include <vector>
@@ -54,6 +55,20 @@ constexpr int OverworldCustomTileGFXGroupArray = 0x140480;
// 1 byte, not 0 if enabled
constexpr int OverworldCustomTileGFXGroupEnabled = 0x140148;
/**
* @brief Represents tile32 data for the overworld.
*/
using OverworldBlockset = std::vector<std::vector<uint16_t>>;
/**
* @brief Overworld map tile32 data.
*/
typedef struct OverworldMapTiles {
OverworldBlockset light_world; // 64 maps
OverworldBlockset dark_world; // 64 maps
OverworldBlockset special_world; // 32 maps
} OverworldMapTiles;
/**
* @brief Represents a single Overworld map screen.
*/
@@ -64,13 +79,13 @@ class OverworldMap : public gfx::GfxContext {
absl::Status BuildMap(int count, int game_state, int world,
std::vector<gfx::Tile16>& tiles16,
OWBlockset& world_blockset);
OverworldBlockset& world_blockset);
void LoadAreaGraphics();
absl::Status LoadPalette();
absl::Status BuildTileset();
absl::Status BuildTiles16Gfx(std::vector<gfx::Tile16>& tiles16, int count);
absl::Status BuildBitmap(OWBlockset& world_blockset);
absl::Status BuildBitmap(OverworldBlockset& world_blockset);
void DrawAnimatedTiles();
@@ -148,6 +163,8 @@ class OverworldMap : public gfx::GfxContext {
int index, int previous_index,
int limit);
Rom rom_;
bool built_ = false;
bool large_map_ = false;
bool initialized_ = false;
@@ -167,19 +184,18 @@ class OverworldMap : public gfx::GfxContext {
uint8_t animated_gfx_ = 0; // Custom Overworld Animated ID
uint16_t subscreen_overlay_ = 0; // Custom Overworld Subscreen Overlay ID
uint8_t custom_gfx_ids_[8];
uchar sprite_graphics_[3];
uchar sprite_palette_[3];
uchar area_music_[4];
uchar static_graphics_[16];
std::array<uint8_t, 8> custom_gfx_ids_;
std::array<uint8_t, 3> sprite_graphics_;
std::array<uint8_t, 3> sprite_palette_;
std::array<uint8_t, 4> area_music_;
std::array<uint8_t, 16> static_graphics_;
Rom rom_;
std::vector<uint8_t> all_gfx_;
std::vector<uint8_t> current_blockset_;
std::vector<uint8_t> current_gfx_;
std::vector<uint8_t> bitmap_data_;
OWMapTiles map_tiles_;
OverworldMapTiles map_tiles_;
gfx::SnesPalette current_palette_;
};