From 0f3fd1fb5d40831b2a45b0fbb665c59081a7c6bf Mon Sep 17 00:00:00 2001
From: scawful <justin.scofield@outlook.com>
Date: Sun, 10 Nov 2024 22:14:15 -0500
Subject: [PATCH] Rename staircase_rooms_vec_ to z3_staircases for clarity and
 update related usages

---
 src/app/zelda3/dungeon/room.cc |  6 +++---
 src/app/zelda3/dungeon/room.h  | 11 ++++-------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/app/zelda3/dungeon/room.cc b/src/app/zelda3/dungeon/room.cc
index 1987973b..8e72781b 100644
--- a/src/app/zelda3/dungeon/room.cc
+++ b/src/app/zelda3/dungeon/room.cc
@@ -301,7 +301,7 @@ void Room::LoadObjects() {
 
   LoadChests();
 
-  staircase_rooms_vec_.clear();
+  z3_staircases_.clear();
   int nbr_of_staircase = 0;
 
   int pos = objects_location + 2;
@@ -375,7 +375,7 @@ void Room::LoadObjects() {
           if (nbr_of_staircase < 4) {
             tile_objects_.back().set_options(ObjectOption::Stairs |
                                              tile_objects_.back().options());
-            staircase_rooms_vec_.push_back(z3_staircase(
+            z3_staircases_.push_back(z3_staircase(
                 posX, posY,
                 absl::StrCat("To ", staircase_rooms_[nbr_of_staircase])
                     .data()));
@@ -383,7 +383,7 @@ void Room::LoadObjects() {
           } else {
             tile_objects_.back().set_options(ObjectOption::Stairs |
                                              tile_objects_.back().options());
-            staircase_rooms_vec_.push_back(z3_staircase(posX, posY, "To ???"));
+            z3_staircases_.push_back(z3_staircase(posX, posY, "To ???"));
           }
         }
       }
diff --git a/src/app/zelda3/dungeon/room.h b/src/app/zelda3/dungeon/room.h
index 9cf2de7c..2fe1e0b3 100644
--- a/src/app/zelda3/dungeon/room.h
+++ b/src/app/zelda3/dungeon/room.h
@@ -159,10 +159,13 @@ class Room : public SharedRom {
   int64_t room_size_pointer_;
 
   std::array<uint8_t, 16> blocks_;
+  std::array<uchar, 16> chest_list_;
 
   std::array<gfx::Bitmap, 3> background_bmps_;
+  std::vector<RoomObject> tile_objects_;
   std::vector<zelda3::Sprite> sprites_;
-  std::vector<z3_staircase> staircase_rooms_vec_;
+  std::vector<z3_staircase> z3_staircases_;
+  std::vector<z3_chest_data> chests_in_room_;
 
   z3_dungeon_background2 bg2_;
   z3_dungeon_destination pits_;
@@ -170,12 +173,6 @@ class Room : public SharedRom {
   z3_dungeon_destination stair2_;
   z3_dungeon_destination stair3_;
   z3_dungeon_destination stair4_;
-
-  std::array<uchar, 16> chest_list_;
-  std::vector<z3_chest_data> chests_in_room_;
-  std::vector<RoomObject> tile_objects_;
-
-  std::vector<int> room_addresses_;
 };
 
 constexpr std::string_view kRoomNames[] = {