From b7a8b3ce54355da62d8cfafc4c10f2bd1cd4b099 Mon Sep 17 00:00:00 2001 From: scawful Date: Tue, 13 Aug 2024 23:58:16 -0400 Subject: [PATCH] Refactor Rom for improved readability --- src/app/rom.h | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/app/rom.h b/src/app/rom.h index 7711b585..98a10e0b 100644 --- a/src/app/rom.h +++ b/src/app/rom.h @@ -119,7 +119,7 @@ static const std::map kVersionConstantsMap = { }}}; constexpr uint32_t kNumGfxSheets = 223; -constexpr uint32_t kNumLinkSheets = 14; +constexpr uint32_t kNumLinkSheets = 14; constexpr uint32_t kNormalGfxSpaceStart = 0x87000; constexpr uint32_t kNormalGfxSpaceEnd = 0xC4200; constexpr uint32_t kFontSpriteLocation = 0x70000; @@ -520,11 +520,17 @@ class Rom : public core::ExperimentFlags { // All graphics sheets for Link std::array link_graphics_; - Z3_Version version_ = Z3_Version::US; - - gfx::SnesPalette link_palette_; - gfx::PaletteGroupMap palette_groups_; + // Label manager for unique resource names. core::ResourceLabelManager resource_label_manager_; + + // Link's palette + gfx::SnesPalette link_palette_; + + // All palette groups in the game + gfx::PaletteGroupMap palette_groups_; + + // Version of the game + Z3_Version version_ = Z3_Version::US; }; /**