mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-10 19:20:13 +00:00
Code Issues Projects Releases Wiki Activity

Cleanup undefined syms and mark bug in z_en_a_keep.c (#1262)

Browse source
This commit is contained in:
Roman971 2022-06-07 06:42:03 +02:00 committed by GitHub
parent 04ade9a255
commit e978351e84
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/code/z_en_a_keep.c
View file

@ -1,6 +1,7 @@
#include "global.h" #include "global.h"
#include "vt.h" #include "vt.h"
#include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/gameplay_keep/gameplay_keep.h"
#include "assets/objects/object_d_hsblock/object_d_hsblock.h"
#define FLAGS ACTOR_FLAG_4 #define FLAGS ACTOR_FLAG_4
@ -52,7 +53,9 @@ static ColliderCylinderInit sCylinderInit = {
{ 25, 60, 0, { 0, 0, 0 } }, { 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[] = { static CollisionHeader* sColHeaders[] = {
&gLargerCubeCol, // A_OBJ_GRASS_CLUMP, A_OBJ_TREE_STUMP &gLargerCubeCol, // A_OBJ_GRASS_CLUMP, A_OBJ_TREE_STUMP
@ -60,22 +63,12 @@ static CollisionHeader* sColHeaders[] = {
&gSmallerFlatBlockCol, // unused &gSmallerFlatBlockCol, // unused
&gLargerFlatBlockCol, // A_OBJ_BLOCK_SMALL_ROT, A_OBJ_BLOCK_LARGE_ROT &gLargerFlatBlockCol, // A_OBJ_BLOCK_SMALL_ROT, A_OBJ_BLOCK_LARGE_ROT
&gSmallerCubeCol, // unused &gSmallerCubeCol, // unused
&D_06000730, // A_OBJ_UNKNOWN_6 &gHookshotPostCol, // A_OBJ_UNKNOWN_6
}; };
static Gfx* sDLists[] = { static Gfx* sDLists[] = {
gFlatBlockDL, gFlatBlockDL, gFlatBlockDL, gFlatBlockDL, gFlatRotBlockDL, gFlatRotBlockDL, gSmallCubeDL,
gFlatBlockDL, gHookshotPostDL, gGrassBladesDL, gTreeStumpDL, gSignRectangularDL, gSignDirectionalDL, gBoulderFragmentsDL,
gFlatBlockDL,
gFlatRotBlockDL,
gFlatRotBlockDL,
gSmallCubeDL,
/* gHookshotPostDL ? */ 0x06000210,
gGrassBladesDL,
gTreeStumpDL,
gSignRectangularDL,
gSignDirectionalDL,
gBoulderFragmentsDL,
}; };
void EnAObj_SetupAction(EnAObj* this, EnAObjActionFunc actionFunc) { void EnAObj_SetupAction(EnAObj* this, EnAObjActionFunc actionFunc) {

3
undefined_syms.txt
View file

@ -7,8 +7,5 @@ D_0E000000 = 0x0E000000;
// z_vismono // z_vismono
D_0F000000 = 0x0F000000; D_0F000000 = 0x0F000000;
// z_en_a_keep or en_a_obj
D_06000730 = 0x06000730;
// z_bg_mjin // z_bg_mjin
D_06000000 = 0x06000000; D_06000000 = 0x06000000;