diff options
| author | Tom Overton <tom-overton@users.noreply.github.com> | 2022-09-24 12:15:18 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-24 16:15:18 -0300 |
| commit | 3d24a8be68c4f0c518153746bbf5466d021c5ee2 (patch) | |
| tree | c338c1d224f2bdce13f83bc8045cea822c17b440 /src | |
| parent | fc94be22aca82deee28566ab72f2542ab4430f0d (diff) | |
Document object_bdoor (Boss Doors) (#1087)
Diffstat (limited to 'src')
| -rw-r--r-- | src/code/z_actor.c | 6 | ||||
| -rw-r--r-- | src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c | 5 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/code/z_actor.c b/src/code/z_actor.c index 3669dd136..c367e75e9 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -3814,9 +3814,9 @@ typedef struct { } DoorLockInfo; // size = 0x1C DoorLockInfo sDoorLocksInfo[DOORLOCK_MAX] = { - /* DOORLOCK_NORMAL */ { 0.54f, 6000.0f, 5000.0, 1.0f, 0.0f, gDoorChainsDL, gDoorLockDL }, - /* DOORLOCK_BOSS */ { 0.644f, 12000.0f, 8000.0f, 1.0f, 0.0f, object_bdoor_DL_000530, object_bdoor_DL_000400 }, - /* DOORLOCK_2 */ { 0.6400000453f, 8500.0f, 8000.0f, 1.75f, 0.1f, gDoorChainsDL, gDoorLockDL }, + /* DOORLOCK_NORMAL */ { 0.54f, 6000.0f, 5000.0, 1.0f, 0.0f, gDoorChainDL, gDoorLockDL }, + /* DOORLOCK_BOSS */ { 0.644f, 12000.0f, 8000.0f, 1.0f, 0.0f, gBossDoorChainDL, gBossDoorLockDL }, + /* DOORLOCK_2 */ { 0.6400000453f, 8500.0f, 8000.0f, 1.75f, 0.1f, gDoorChainDL, gDoorLockDL }, }; /** diff --git a/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c b/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c index 691f00e60..b5f75efaa 100644 --- a/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c +++ b/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c @@ -74,7 +74,7 @@ typedef struct { } ShutterInfo; // size = 0xC ShutterInfo D_808A21B0[] = { - { object_bdoor_DL_0000C0, NULL, 130, 12, 50, 15 }, + { gBossDoorDL, NULL, 130, 12, 50, 15 }, { gameplay_keep_DL_077990, gameplay_keep_DL_078A80, 130, 12, 20, 15 }, { object_numa_obj_DL_007150, gameplay_keep_DL_078A80, 130, 12, 20, 15 }, { object_hakugin_obj_DL_000128, gameplay_keep_DL_078A80, 130, 12, 20, 15 }, @@ -129,8 +129,7 @@ Vec3f D_808A22C4 = { 120.0f, 0.0f, 0.0f }; Vec3f D_808A22D0 = { -90.0f, 0.0f, 0.0f }; TexturePtr D_808A22DC[] = { - object_bdoor_Tex_006BA0, object_bdoor_Tex_005BA0, object_bdoor_Tex_0005C0, - object_bdoor_Tex_004BA0, object_bdoor_Tex_003BA0, + gBossDoorDefaultTex, gBossDoorWoodfallTex, gBossDoorSnowheadTex, gBossDoorGreatBayTex, gBossDoorStoneTowerTex, }; void DoorShutter_SetupAction(DoorShutter* this, DoorShutterActionFunc actionFunc) { |