From ad3b2ee1906dfddd921c230f623662f6fb65edff Mon Sep 17 00:00:00 2001
From: tom-overton <tom.overton@outlook.com>
Date: Mon, 3 Jan 2022 12:34:21 -0800
Subject: [PATCH] Standardize on "staircase to rooftop"

---
 assets/xml/objects/object_obj_tokeidai.xml           | 12 ++++++------
 .../actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c         | 10 +++++-----
 .../actors/ovl_Obj_Tokeidai/z_obj_tokeidai.h         |  2 +-
 tools/disasm/functions.txt                           |  2 +-
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/assets/xml/objects/object_obj_tokeidai.xml b/assets/xml/objects/object_obj_tokeidai.xml
index 72b9b6adc3..bef0e3c8cf 100644
--- a/assets/xml/objects/object_obj_tokeidai.xml
+++ b/assets/xml/objects/object_obj_tokeidai.xml
@@ -8,7 +8,7 @@
         <!-- Clock Tower Spotlight Shine Texture -->
         <Texture Name="gClockTowerSpotlightShineTex" OutName="clock_tower_spotlight_shine" Format="i8" Width="64" Height="64" Offset="0x40" />
 
-        <!-- Generic brick texture used for multiple pieces of the Clock Tower (counterweight, unused tower wall, staircase to interior) -->
+        <!-- Generic brick texture used for multiple pieces of the Clock Tower (counterweight, unused tower wall, staircase to rooftop) -->
         <Texture Name="gClockTowerBrickTex" OutName="clock_tower_bricks" Format="rgba16" Width="32" Height="32" Offset="0x1040" />
 
         <!-- Clock Tower Counterweight Textures -->
@@ -54,8 +54,8 @@
         <!-- Clock Tower Unused Tower Wall Texture -->
         <Texture Name="gClockTowerUnusedTowerWallMaskTex" OutName="clock_tower_unused_tower_wall_mask" Format="i4" Width="64" Height="64" Offset="0x86C0" />
 
-        <!-- Clock Tower Staircase to Interior Texture -->
-        <Texture Name="gClockTowerStaircaseToInteriorMaskTex" OutName="clock_tower_staircase_to_interior_mask" Format="i4" Width="64" Height="64" Offset="0x8EC0" />
+        <!-- Clock Tower Staircase to Rooftop Texture -->
+        <Texture Name="gClockTowerStaircaseToRooftopMaskTex" OutName="clock_tower_staircase_to_rooftop_mask" Format="i4" Width="64" Height="64" Offset="0x8EC0" />
 
         <!-- Empty DisplayList, probably intended to be used as the xluDList for Clock Tower Termina Field Walls -->
         <DList Name="gClockTowerUnusedEmptyDL1" Offset="0x9A00" />
@@ -106,11 +106,11 @@
         <!-- Clock Tower Unused Tower Wall DisplayList -->
         <DList Name="gClockTowerUnusedTowerWallDL" Offset="0xD388" />
 
-        <!-- Empty DisplayList used as the xluDList for Staircase to Interior -->
+        <!-- Empty DisplayList used as the xluDList for Staircase to Rooftop -->
         <DList Name="gClockTowerEmptyDL" Offset="0xD8E0" />
 
-        <!-- Clock Tower Staircase to Interior DisplayList -->
-        <DList Name="gClockTowerStaircaseToInteriorDL" Offset="0xD8E8" />
+        <!-- Clock Tower Staircase to Rooftop DisplayList -->
+        <DList Name="gClockTowerStaircaseToRooftopDL" Offset="0xD8E8" />
 
         <!-- Clock Tower Clock Face Back Texture -->
         <Texture Name="gClockTowerClockFaceBackTex" OutName="clock_tower_clock_face_back" Format="rgba16" Width="16" Height="32" Offset="0xDAC0" />
diff --git a/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c b/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c
index 3c10ca0ef2..d97625e186 100644
--- a/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c
+++ b/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c
@@ -40,7 +40,7 @@ void ObjTokeidai_WallClock_Idle(ObjTokeidai* this, GlobalContext* globalCtx);
 void ObjTokeidai_TowerGear_Idle(ObjTokeidai* this, GlobalContext* globalCtx);
 void ObjTokeidai_Counterweight_Idle(ObjTokeidai* this, GlobalContext* globalCtx);
 void ObjTokeidai_Walls_Idle(ObjTokeidai* this, GlobalContext* globalCtx);
-void ObjTokeidai_StaircaseIntoTower_Idle(ObjTokeidai* this, GlobalContext* globalCtx);
+void ObjTokeidai_StaircaseToRooftop_Idle(ObjTokeidai* this, GlobalContext* globalCtx);
 void ObjTokeidai_SetupTowerOpening(ObjTokeidai* this);
 void ObjTokeidai_Clock_Draw(Actor* thisx, GlobalContext* globalCtx);
 void ObjTokeidai_Counterweight_Draw(Actor* thisx, GlobalContext* globalCtx);
@@ -245,10 +245,10 @@ void ObjTokeidai_Init(Actor* thisx, GlobalContext* globalCtx) {
         case OBJ_TOKEIDAI_TYPE_COUNTERWEIGHT_CLOCK_TOWN:
             ObjTokeidai_Counterweight_Init(this, globalCtx);
             break;
-        case OBJ_TOKEIDAI_TYPE_STAIRCASE_INTO_TOWER:
-            this->opaDList = gClockTowerStaircaseToInteriorDL;
+        case OBJ_TOKEIDAI_TYPE_STAIRCASE_TO_ROOFTOP:
+            this->opaDList = gClockTowerStaircaseToRooftopDL;
             this->xluDList = gClockTowerEmptyDL;
-            this->actionFunc = ObjTokeidai_StaircaseIntoTower_Idle;
+            this->actionFunc = ObjTokeidai_StaircaseToRooftop_Idle;
             break;
     }
 }
@@ -580,7 +580,7 @@ void ObjTokeidai_SetupTowerOpening(ObjTokeidai* this) {
 void ObjTokeidai_DoNothing(ObjTokeidai* this, GlobalContext* globalCtx) {
 }
 
-void ObjTokeidai_StaircaseIntoTower_Idle(ObjTokeidai* this, GlobalContext* globalCtx) {
+void ObjTokeidai_StaircaseToRooftop_Idle(ObjTokeidai* this, GlobalContext* globalCtx) {
     if (((CURRENT_DAY == 3 && gSaveContext.time < CLOCK_TIME(6, 0)) || CURRENT_DAY >= 4) ||
         (gSaveContext.weekEventReg[8] & 0x40)) {
         this->actor.draw = ObjTokeidai_Draw;
diff --git a/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.h b/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.h
index 9f3962e9f8..cffcfa0a58 100644
--- a/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.h
+++ b/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.h
@@ -16,7 +16,7 @@ typedef enum {
     /*  8 */ OBJ_TOKEIDAI_TYPE_TOWER_WALLS_TERMINA_FIELD = 8,
     /*  9 */ OBJ_TOKEIDAI_TYPE_WALL_CLOCK,
     /* 10 */ OBJ_TOKEIDAI_TYPE_SMALL_WALL_CLOCK,
-    /* 11 */ OBJ_TOKEIDAI_TYPE_STAIRCASE_INTO_TOWER,
+    /* 11 */ OBJ_TOKEIDAI_TYPE_STAIRCASE_TO_ROOFTOP,
 } ObjTokeidaiType;
 
 struct ObjTokeidai;
diff --git a/tools/disasm/functions.txt b/tools/disasm/functions.txt
index 3fc19cd159..9ffad329e6 100644
--- a/tools/disasm/functions.txt
+++ b/tools/disasm/functions.txt
@@ -11694,7 +11694,7 @@
     0x80AB3B34:("ObjTokeidai_TowerOpening_Start",),
     0x80AB3BB0:("ObjTokeidai_SetupTowerOpening",),
     0x80AB3BD8:("ObjTokeidai_DoNothing",),
-    0x80AB3BE8:("ObjTokeidai_StaircaseIntoTower_Idle",),
+    0x80AB3BE8:("ObjTokeidai_StaircaseToRooftop_Idle",),
     0x80AB3C50:("ObjTokeidai_IsPostFirstCycleFinalHours",),
     0x80AB3CCC:("ObjTokeidai_RotateOnHourChange",),
     0x80AB3ED0:("ObjTokeidai_TowerClock_Idle",),