From e9596e0095deed3460758ba097229cdddb7dee6c Mon Sep 17 00:00:00 2001 From: tom-overton Date: Sun, 26 Dec 2021 17:27:27 -0800 Subject: [PATCH] This is a legacy PR, so using autogenned object symbols --- .../actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c | 40 +++++++------------ undefined_syms.txt | 15 ------- 2 files changed, 14 insertions(+), 41 deletions(-) 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 c1e6b4d24a..2b7c8f07fa 100644 --- a/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c +++ b/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c @@ -15,6 +15,7 @@ */ #include "z_obj_tokeidai.h" +#include "objects/object_obj_tokeidai/object_obj_tokeidai.h" #define FLAGS 0x00000030 @@ -59,19 +60,6 @@ static InitChainEntry sInitChain[] = { ICHAIN_F32(uncullZoneForward, 1100, ICHAIN_STOP), }; -extern Gfx D_06009A08[]; // the tower's four walls, used in Termina Field -extern Gfx D_0600B0C0[]; // spotlight emitted from the counterweight at night -extern Gfx D_0600B208[]; // the tower's counterweight -extern Gfx D_0600BA78[]; // rotating gear on the side of the tower -extern Gfx D_0600BEE8[]; // clock center and "hand" -extern Gfx D_0600C368[]; // sun and moon disk -extern Gfx D_0600CF28[]; // outer ring of the clock face -extern Gfx D_0600D388[]; // unused tower wall -extern Gfx D_0600D8E0[]; // empty dlist -extern Gfx D_0600D8E8[]; // spiral staircase to tower interior -extern Gfx D_0600E818[]; // clock tower clock face -extern Gfx D_0600F518[]; // wall clock clock face - /** * Returns the angle necessary to show the correct side of * the sun and moon disk based on the time of day. The actual @@ -109,7 +97,7 @@ void ObjTokeidai_Clock_Init(ObjTokeidai* this) { void ObjTokeidai_TowerGear_Init(ObjTokeidai* this, GlobalContext* globalCtx) { this->actor.draw = ObjTokeidai_TowerGear_Draw; - this->opaDList = D_0600BA78; + this->opaDList = object_obj_tokeidai_DL_00BA78; ObjTokeidai_SetupClockOrGear(this); if (((globalCtx->sceneNum == SCENE_CLOCKTOWER) && (gSaveContext.sceneSetupIndex == 2) && @@ -155,8 +143,8 @@ void ObjTokeidai_Counterweight_Init(ObjTokeidai* this, GlobalContext* globalCtx) s32 type; this->actor.draw = ObjTokeidai_Counterweight_Draw; - this->opaDList = D_0600B208; - this->xluDList = D_0600B0C0; + this->opaDList = object_obj_tokeidai_DL_00B208; + this->xluDList = object_obj_tokeidai_DL_00B0C0; if (gSaveContext.isNight) { this->spotlightIntensity = 100; } else { @@ -219,11 +207,11 @@ void ObjTokeidai_Init(Actor* thisx, GlobalContext* globalCtx) { ObjTokeidai_TowerGear_Init(this, globalCtx); break; case OBJ_TOKEIDAI_TYPE_UNUSED_WALL: - this->opaDList = D_0600D388; + this->opaDList = object_obj_tokeidai_DL_00D388; break; case OBJ_TOKEIDAI_TYPE_TOWER_WALLS_TERMINA_FIELD: Actor_SetScale(&this->actor, 1.0f); - this->opaDList = D_06009A08; + this->opaDList = object_obj_tokeidai_DL_009A08; this->actionFunc = ObjTokeidai_Walls_Idle; break; case OBJ_TOKEIDAI_TYPE_TOWER_CLOCK_TERMINA_FIELD: @@ -253,8 +241,8 @@ void ObjTokeidai_Init(Actor* thisx, GlobalContext* globalCtx) { ObjTokeidai_Counterweight_Init(this, globalCtx); break; case OBJ_TOKEIDAI_TYPE_STAIRCASE_INTO_TOWER: - this->opaDList = D_0600D8E8; - this->xluDList = D_0600D8E0; + this->opaDList = object_obj_tokeidai_DL_00D8E8; + this->xluDList = object_obj_tokeidai_DL_00D8E0; this->actionFunc = ObjTokeidai_StaircaseIntoTower_Idle; break; } @@ -791,23 +779,23 @@ void ObjTokeidai_Clock_Draw(Actor* thisx, GlobalContext* globalCtx) { Matrix_StatePush(); Matrix_InsertZRotation_s(-this->outerRingOrGearRotation, MTXMODE_APPLY); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_OPA_DISP++, D_0600CF28); + gSPDisplayList(POLY_OPA_DISP++, object_obj_tokeidai_DL_00CF28); Matrix_StatePop(); Matrix_InsertTranslation(0.0f, 0.0f, this->clockFaceZTranslation, MTXMODE_APPLY); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_OPA_DISP++, D_0600BEE8); + gSPDisplayList(POLY_OPA_DISP++, object_obj_tokeidai_DL_00BEE8); Matrix_InsertZRotation_s(-this->clockFaceRotation * 2, MTXMODE_APPLY); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); if (OBJ_TOKEIDAI_TYPE(&this->actor) == OBJ_TOKEIDAI_TYPE_WALL_CLOCK || OBJ_TOKEIDAI_TYPE(&this->actor) == OBJ_TOKEIDAI_TYPE_SMALL_WALL_CLOCK) { - gSPDisplayList(POLY_OPA_DISP++, D_0600F518); + gSPDisplayList(POLY_OPA_DISP++, object_obj_tokeidai_DL_00F518); } else { - gSPDisplayList(POLY_OPA_DISP++, D_0600E818); + gSPDisplayList(POLY_OPA_DISP++, object_obj_tokeidai_DL_00E818); } Matrix_InsertTranslation(0.0f, -1112.0f, -19.6f, MTXMODE_APPLY); Matrix_RotateY((s16)this->sunMoonDiskRotation, MTXMODE_APPLY); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_OPA_DISP++, D_0600C368); + gSPDisplayList(POLY_OPA_DISP++, object_obj_tokeidai_DL_00C368); CLOSE_DISPS(globalCtx->state.gfxCtx); } @@ -853,7 +841,7 @@ void ObjTokeidai_TowerGear_Draw(Actor* thisx, GlobalContext* globalCtx) { Matrix_InsertZRotation_s(this->outerRingOrGearRotation, MTXMODE_APPLY); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); func_8012C28C(globalCtx->state.gfxCtx); - gSPDisplayList(POLY_OPA_DISP++, D_0600BA78); + gSPDisplayList(POLY_OPA_DISP++, object_obj_tokeidai_DL_00BA78); CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/undefined_syms.txt b/undefined_syms.txt index ba74050c01..441c2bcf21 100644 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -4421,21 +4421,6 @@ D_06001CB0 = 0x06001CB0; D_06001400 = 0x06001400; -// ovl_Obj_Tokeidai - -D_06009A08 = 0x06009A08; -D_0600B0C0 = 0x0600B0C0; -D_0600B208 = 0x0600B208; -D_0600BA78 = 0x0600BA78; -D_0600BEE8 = 0x0600BEE8; -D_0600C368 = 0x0600C368; -D_0600CF28 = 0x0600CF28; -D_0600D388 = 0x0600D388; -D_0600D8E0 = 0x0600D8E0; -D_0600D8E8 = 0x0600D8E8; -D_0600E818 = 0x0600E818; -D_0600F518 = 0x0600F518; - // ovl_Obj_Tokei_Step D_06000088 = 0x06000088;