mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-21 22:41:14 +00:00
Code Issues Projects Releases Wiki Activity

Cleanup symbols 7 (#1073)

Browse source 
* Cleanup symbols, mostly from non-matching objects

* ZAPD supports unaligned textures!

* Uncomment `object_oF1s`
This commit is contained in:
Dragorn421 2022-01-18 00:50:18 +01:00 • committed by GitHub
parent 0a48548da7
commit 2a4fb604fb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 85 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/overlays/actors/ovl_En_Hy/z_en_hy.c
View file

@ -68,10 +68,10 @@ static CollisionCheckInfoInit2 sColChkInfoInit = { 0, 0, 0, 0, MASS_IMMOVABLE };
// NULL-terminated arrays of eye textures
static void* sEyeTexturesAOB[] = { gDogLadyEyeOpenTex, gDogLadyEyeHalfTex, gDogLadyEyeClosedTex, NULL };
static void* sEyeTexturesAHG7[] = { 0x0600057C, 0x0600067C, 0x0600077C, NULL };
static void* sEyeTexturesAHG7[] = { object_ahg_Tex_00057C, object_ahg_Tex_00067C, object_ahg_Tex_00077C, NULL };
static void* sEyeTexturesBBA[] = { object_bba_Tex_0004C8, NULL };
static void* sEyeTexturesBJI13[] = { 0x060005FC, 0x060009FC, 0x06000DFC, NULL };
static void* sEyeTexturesBOJ2[] = { 0x060005FC, 0x060006FC, 0x060007FC, NULL };
static void* sEyeTexturesBJI13[] = { object_bji_Tex_0005FC, object_bji_Tex_0009FC, object_bji_Tex_000DFC, NULL };
static void* sEyeTexturesBOJ2[] = { object_boj_Tex_0005FC, object_boj_Tex_0006FC, object_boj_Tex_0007FC, NULL };
static void* sEyeTexturesBOB[] = { object_bob_Tex_0007C8, object_bob_Tex_000FC8, object_bob_Tex_0017C8, NULL };
typedef struct {
@ -102,18 +102,18 @@ typedef enum {
static EnHyHeadInfo sHeadInfo[] = {
/* ENHY_HEAD_AOB */ { OBJECT_AOB, gDogLadyHeadDL, sEyeTexturesAOB },
/* ENHY_HEAD_BOB */ { OBJECT_BOB, object_bob_DL_003B78, sEyeTexturesBOB },
/* ENHY_HEAD_BOJ_2 */ { OBJECT_BOJ, 0x060026F0, sEyeTexturesBOJ2 },
/* ENHY_HEAD_BOJ_2 */ { OBJECT_BOJ, object_boj_DL_0026F0, sEyeTexturesBOJ2 },
/* ENHY_HEAD_BOJ_3 */ { OBJECT_BOJ, object_boj_DL_0052E0, NULL },
/* ENHY_HEAD_BOJ_4 */ { OBJECT_BOJ, object_boj_DL_005528, NULL },
/* ENHY_HEAD_BOJ_5 */ { OBJECT_BOJ, object_boj_DL_005738, NULL },
/* ENHY_HEAD_BOJ_6 */ { OBJECT_BOJ, object_boj_DL_0059B0, NULL },
/* ENHY_HEAD_AHG_7 */ { OBJECT_AHG, 0x060030F0, sEyeTexturesAHG7 },
/* ENHY_HEAD_AHG_7 */ { OBJECT_AHG, object_ahg_DL_0030F0, sEyeTexturesAHG7 },
/* ENHY_HEAD_AHG_8 */ { OBJECT_AHG, object_ahg_DL_005508, NULL },
/* ENHY_HEAD_AHG_9 */ { OBJECT_AHG, object_ahg_DL_005728, NULL },
/* ENHY_HEAD_BBA */ { OBJECT_BBA, object_bba_DL_002948, sEyeTexturesBBA },
/* ENHY_HEAD_CNE_11 */ { OBJECT_CNE, 0x06001300, NULL },
/* ENHY_HEAD_CNE_11 */ { OBJECT_CNE, object_cne_DL_001300, NULL },
/* ENHY_HEAD_CNE_12 */ { OBJECT_CNE, object_cne_DL_002860, NULL },
/* ENHY_HEAD_BJI_13 */ { OBJECT_BJI, 0x06002560, sEyeTexturesBJI13 },
/* ENHY_HEAD_BJI_13 */ { OBJECT_BJI, object_bji_DL_002560, sEyeTexturesBJI13 },
/* ENHY_HEAD_BJI_14 */ { OBJECT_BJI, object_bji_DL_003F68, NULL },
/* ENHY_HEAD_COB */ { OBJECT_COB, object_cob_DL_001300, NULL },
};
@ -137,11 +137,11 @@ typedef enum {
static EnHySkeletonInfo sSkeletonInfo[] = {
/* ENHY_SKEL_AOB */ { OBJECT_AOB, &gDogLadySkel },
/* ENHY_SKEL_BOB */ { OBJECT_BOB, &object_bob_Skel_0000F0 },
/* ENHY_SKEL_BOJ */ { OBJECT_BOJ, 0x060000F0 },
/* ENHY_SKEL_AHG */ { OBJECT_AHG, 0x060000F0 },
/* ENHY_SKEL_BOJ */ { OBJECT_BOJ, &object_boj_Skel_0000F0 },
/* ENHY_SKEL_AHG */ { OBJECT_AHG, &object_ahg_Skel_0000F0 },
/* ENHY_SKEL_BBA */ { OBJECT_BBA, &object_bba_Skel_0000F0 },
/* ENHY_SKEL_CNE */ { OBJECT_CNE, 0x060000F0 },
/* ENHY_SKEL_BJI */ { OBJECT_BJI, 0x060000F0 },
/* ENHY_SKEL_CNE */ { OBJECT_CNE, &object_cne_Skel_0000F0 },
/* ENHY_SKEL_BJI */ { OBJECT_BJI, &object_bji_Skel_0000F0 },
/* ENHY_SKEL_COB */ { OBJECT_COB, &object_cob_Skel_0021F8 },
};