diff options
| author | Roman971 <32455037+Roman971@users.noreply.github.com> | 2022-06-07 06:42:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-07 00:42:03 -0400 |
| commit | e978351e84b9004ba88b56147653df98887aa77c (patch) | |
| tree | 11ac385f97d3d2c203d4b95337c694054375a641 /src/code | |
| parent | 04ade9a255ac2429238cdb3e6b076a4989f5d2f0 (diff) | |
Cleanup undefined syms and mark bug in z_en_a_keep.c (#1262)
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/z_en_a_keep.c | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/src/code/z_en_a_keep.c b/src/code/z_en_a_keep.c index e7243473b..3b20cec82 100644 --- a/src/code/z_en_a_keep.c +++ b/src/code/z_en_a_keep.c @@ -1,6 +1,7 @@ #include "global.h" #include "vt.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" +#include "assets/objects/object_d_hsblock/object_d_hsblock.h" #define FLAGS ACTOR_FLAG_4 @@ -52,7 +53,9 @@ static ColliderCylinderInit sCylinderInit = { { 25, 60, 0, { 0, 0, 0 } }, }; -extern CollisionHeader D_06000730; // gHookshotTargetCol ? +//! @bug gHookshotPostCol and gHookshotPostDL are referenced below for type A_OBJ_UNKNOWN_6 but they aren't available +//! since object_d_hsblock isn't a dependency of this actor. +//! This doesn't cause issues in the base game because A_OBJ_UNKNOWN_6 is never used. static CollisionHeader* sColHeaders[] = { &gLargerCubeCol, // A_OBJ_GRASS_CLUMP, A_OBJ_TREE_STUMP @@ -60,22 +63,12 @@ static CollisionHeader* sColHeaders[] = { &gSmallerFlatBlockCol, // unused &gLargerFlatBlockCol, // A_OBJ_BLOCK_SMALL_ROT, A_OBJ_BLOCK_LARGE_ROT &gSmallerCubeCol, // unused - &D_06000730, // A_OBJ_UNKNOWN_6 + &gHookshotPostCol, // A_OBJ_UNKNOWN_6 }; static Gfx* sDLists[] = { - gFlatBlockDL, - gFlatBlockDL, - gFlatBlockDL, - gFlatRotBlockDL, - gFlatRotBlockDL, - gSmallCubeDL, - /* gHookshotPostDL ? */ 0x06000210, - gGrassBladesDL, - gTreeStumpDL, - gSignRectangularDL, - gSignDirectionalDL, - gBoulderFragmentsDL, + gFlatBlockDL, gFlatBlockDL, gFlatBlockDL, gFlatRotBlockDL, gFlatRotBlockDL, gSmallCubeDL, + gHookshotPostDL, gGrassBladesDL, gTreeStumpDL, gSignRectangularDL, gSignDirectionalDL, gBoulderFragmentsDL, }; void EnAObj_SetupAction(EnAObj* this, EnAObjActionFunc actionFunc) { |