refactor: change constant name

This commit is contained in:
Justin Scofield
2022-08-03 20:01:02 -04:00
parent f17d2aa923
commit e86ddfc7c0
2 changed files with 4 additions and 4 deletions

View File

@@ -84,10 +84,10 @@ constexpr int NumberOfSheets = 223;
constexpr int LimitOfMap32 = 8864; constexpr int LimitOfMap32 = 8864;
constexpr int NumberOfRooms = 296; constexpr int NumberOfRooms = 296;
constexpr int NumberOfOWMaps = 160; constexpr int kNumOverworldMaps = 160;
constexpr int Map32PerScreen = 256; constexpr int Map32PerScreen = 256;
constexpr int NumberOfMap16 = 3752; // 4096 constexpr int NumberOfMap16 = 3752; // 4096
constexpr int NumberOfMap32 = Map32PerScreen * NumberOfOWMaps; constexpr int NumberOfMap32 = Map32PerScreen * kNumOverworldMaps;
constexpr int NumberOfOWSprites = 352; constexpr int NumberOfOWSprites = 352;
constexpr int NumberOfColors = 3143; constexpr int NumberOfColors = 3143;

View File

@@ -18,13 +18,13 @@ absl::Status Overworld::Load(ROM &rom, uchar *ow_blockset) {
return decompression_status; return decompression_status;
} }
for (int map_index = 0; map_index < core::NumberOfOWMaps; ++map_index) for (int map_index = 0; map_index < core::kNumOverworldMaps; ++map_index)
overworld_maps_.emplace_back(map_index, rom_, tiles16); overworld_maps_.emplace_back(map_index, rom_, tiles16);
FetchLargeMaps(); FetchLargeMaps();
auto size = tiles16.size(); auto size = tiles16.size();
for (int i = 0; i < core::NumberOfOWMaps; ++i) { for (int i = 0; i < core::kNumOverworldMaps; ++i) {
auto map_status = auto map_status =
overworld_maps_[i].BuildMapV2(size, game_state_, map_parent_); overworld_maps_[i].BuildMapV2(size, game_state_, map_parent_);
if (!map_status.ok()) { if (!map_status.ok()) {