Game-Decompilation/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-23 22:09:43 +00:00
Code Issues Actions Packages 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
assets/xml/objects/object_ahg.xml
View File

@ -1,7 +1,6 @@
<Root>
<File Name="object_ahg" Segment="6">
<!-- The textures used by these limbs aren't 64-bit aligned, so this won't compile to a matching ROM. -->
<!--
<!-- The textures used by these limbs aren't 64-bit aligned -->
<Limb Name="object_ahg_Limb_000000" LimbType="Standard" Offset="0x0"/>
<Limb Name="object_ahg_Limb_00000C" LimbType="Standard" Offset="0xC"/>
<Limb Name="object_ahg_Limb_000018" LimbType="Standard" Offset="0x18"/>
@ -17,28 +16,24 @@
<Limb Name="object_ahg_Limb_000090" LimbType="Standard" Offset="0x90"/>
<Limb Name="object_ahg_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
<Limb Name="object_ahg_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
-->
<!--
<Skeleton Name="object_ahg_Skel_0000F0" Type="Flex" LimbType="Standard" Offset="0xF0"/>
-->
<!-- 32-bit aligned textures. -->
<!--
<Texture Name="object_ahg_TLUT_0000FC" OutName="tlut_000000FC" Format="rgba16" Width="16" Height="16" Offset="0xFC"/>
<Texture Name="object_ahg_Tex_0002FC" OutName="tex_000002FC" Format="ci8" Width="16" Height="16" Offset="0x2FC"/>
<Texture Name="object_ahg_Tex_0003FC" OutName="tex_000003FC" Format="ci8" Width="16" Height="16" Offset="0x3FC"/>
<Texture Name="object_ahg_Tex_0004FC" OutName="tex_000004FC" Format="ci8" Width="8" Height="8" Offset="0x4FC"/>
<Texture Name="object_ahg_Tex_00053C" OutName="tex_0000053C" Format="ci8" Width="8" Height="8" Offset="0x53C"/>
<Blob Name="object_ahg_Blob_00057C" Size="0x300" Offset="0x57C"/>
<Texture Name="object_ahg_Tex_00057C" OutName="tex_0000057C" Format="ci8" Width="16" Height="16" Offset="0x57C" TlutOffset="0xFC"/>
<Texture Name="object_ahg_Tex_00067C" OutName="tex_0000067C" Format="ci8" Width="16" Height="16" Offset="0x67C" TlutOffset="0xFC"/>
<Texture Name="object_ahg_Tex_00077C" OutName="tex_0000077C" Format="ci8" Width="16" Height="16" Offset="0x77C" TlutOffset="0xFC"/>
<Texture Name="object_ahg_Tex_00087C" OutName="tex_0000087C" Format="ci8" Width="16" Height="16" Offset="0x87C"/>
<Texture Name="object_ahg_Tex_00097C" OutName="tex_0000097C" Format="i8" Width="8" Height="8" Offset="0x97C"/>
<Texture Name="object_ahg_Tex_0009BC" OutName="tex_000009BC" Format="i8" Width="8" Height="8" Offset="0x9BC"/>
<Texture Name="object_ahg_Tex_0009FC" OutName="tex_000009FC" Format="ci8" Width="32" Height="16" Offset="0x9FC"/>
<Texture Name="object_ahg_Tex_000BFC" OutName="tex_00000BFC" Format="ci8" Width="16" Height="16" Offset="0xBFC"/>
-->
<!--
<DList Name="object_ahg_DL_0030F0" Offset="0x30F0"/>
<DList Name="object_ahg_DL_003500" Offset="0x3500"/>
<DList Name="object_ahg_DL_003670" Offset="0x3670"/>
@ -54,7 +49,6 @@
<DList Name="object_ahg_DL_0043C0" Offset="0x43C0"/>
<DList Name="object_ahg_DL_0044F0" Offset="0x44F0"/>
<DList Name="object_ahg_DL_004628" Offset="0x4628"/>
-->
<!-- <Blob Name="object_ahg_Blob_0047C8" Size="0x180" Offset="0x47C8"/> -->
<Texture Name="object_ahg_Tex_004948" OutName="tex_00004948" Format="ci8" Width="8" Height="8" Offset="0x4948"/>

14
assets/xml/objects/object_bji.xml
View File

@ -1,7 +1,6 @@
<Root>
<File Name="object_bji" Segment="6">
<!-- The textures used by these limbs aren't 64-bit aligned, so this won't compile to a matching ROM. -->
<!--
<!-- The textures used by these limbs aren't 64-bit aligned -->
<Limb Name="object_bji_Limb_000000" LimbType="Standard" Offset="0x0"/>
<Limb Name="object_bji_Limb_00000C" LimbType="Standard" Offset="0xC"/>
<Limb Name="object_bji_Limb_000018" LimbType="Standard" Offset="0x18"/>
@ -17,14 +16,10 @@
<Limb Name="object_bji_Limb_000090" LimbType="Standard" Offset="0x90"/>
<Limb Name="object_bji_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
<Limb Name="object_bji_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
-->
<!--
<Skeleton Name="object_bji_Skel_0000F0" Type="Flex" LimbType="Standard" Offset="0xF0"/>
-->
<!-- 32-bit aligned textures. -->
<!--
<Texture Name="object_bji_TLUT_0000FC" OutName="tlut_000000FC" Format="rgba16" Width="16" Height="16" Offset="0xFC"/>
<Texture Name="object_bji_Tex_0002FC" OutName="tex_000002FC" Format="ci8" Width="8" Height="8" Offset="0x2FC"/>
<Texture Name="object_bji_Tex_00033C" OutName="tex_0000033C" Format="ci8" Width="8" Height="8" Offset="0x33C"/>
@ -32,11 +27,11 @@
<Texture Name="object_bji_Tex_00047C" OutName="tex_0000047C" Format="ci8" Width="8" Height="8" Offset="0x47C"/>
<Texture Name="object_bji_Tex_0004BC" OutName="tex_000004BC" Format="ci8" Width="8" Height="8" Offset="0x4BC"/>
<Texture Name="object_bji_Tex_0004FC" OutName="tex_000004FC" Format="i8" Width="16" Height="16" Offset="0x4FC"/>
<Blob Name="object_bji_Blob_0005FC" Size="0xC00" Offset="0x5FC"/>
<Texture Name="object_bji_Tex_0005FC" OutName="tex_000005FC" Format="ci8" Width="32" Height="32" Offset="0x5FC" TlutOffset="0xFC"/>
<Texture Name="object_bji_Tex_0009FC" OutName="tex_000009FC" Format="ci8" Width="32" Height="32" Offset="0x9FC" TlutOffset="0xFC"/>
<Texture Name="object_bji_Tex_000DFC" OutName="tex_00000DFC" Format="ci8" Width="32" Height="32" Offset="0xDFC" TlutOffset="0xFC"/>
<Texture Name="object_bji_Tex_0011FC" OutName="tex_000011FC" Format="i8" Width="8" Height="8" Offset="0x11FC"/>
-->
<!--
<DList Name="object_bji_DL_002560" Offset="0x2560"/>
<DList Name="object_bji_DL_002B88" Offset="0x2B88"/>
<DList Name="object_bji_DL_002C50" Offset="0x2C50"/>
@ -52,7 +47,6 @@
<DList Name="object_bji_DL_003648" Offset="0x3648"/>
<DList Name="object_bji_DL_003710" Offset="0x3710"/>
<DList Name="object_bji_DL_0037D8" Offset="0x37D8"/>
-->
<Texture Name="object_bji_Tex_003908" OutName="tex_00003908" Format="rgba16" Width="8" Height="8" Offset="0x3908"/>
<Texture Name="object_bji_Tex_003988" OutName="tex_00003988" Format="rgba16" Width="8" Height="8" Offset="0x3988"/>

12
assets/xml/objects/object_boj.xml
View File

@ -1,7 +1,6 @@
<Root>
<File Name="object_boj" Segment="6">
<!-- The textures used by these limbs aren't 64-bit aligned, so this won't compile to a matching ROM. -->
<!--
<!-- The textures used by these limbs aren't 64-bit aligned -->
<Limb Name="object_boj_Limb_000000" LimbType="Standard" Offset="0x0"/>
<Limb Name="object_boj_Limb_00000C" LimbType="Standard" Offset="0xC"/>
<Limb Name="object_boj_Limb_000018" LimbType="Standard" Offset="0x18"/>
@ -17,20 +16,18 @@
<Limb Name="object_boj_Limb_000090" LimbType="Standard" Offset="0x90"/>
<Limb Name="object_boj_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
<Limb Name="object_boj_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
-->
<!--
<Skeleton Name="object_boj_Skel_0000F0" Type="Flex" LimbType="Standard" Offset="0xF0"/>
-->
<!-- 32-bit aligned textures. -->
<!--
<Texture Name="object_boj_TLUT_0000FC" OutName="tlut_000000FC" Format="rgba16" Width="16" Height="16" Offset="0xFC"/>
<Texture Name="object_boj_Tex_0002FC" OutName="tex_000002FC" Format="ci8" Width="8" Height="16" Offset="0x2FC"/>
<Texture Name="object_boj_Tex_00037C" OutName="tex_0000037C" Format="ci8" Width="8" Height="8" Offset="0x37C"/>
<Texture Name="object_boj_Tex_0003BC" OutName="tex_000003BC" Format="ci8" Width="32" Height="16" Offset="0x3BC"/>
<Texture Name="object_boj_Tex_0005BC" OutName="tex_000005BC" Format="ci8" Width="8" Height="8" Offset="0x5BC"/>
<Blob Name="object_boj_Blob_0005FC" Size="0x300" Offset="0x5FC"/>
<Texture Name="object_boj_Tex_0005FC" OutName="tex_000005FC" Format="ci8" Width="16" Height="16" Offset="0x5FC" TlutOffset="0xFC"/>
<Texture Name="object_boj_Tex_0006FC" OutName="tex_000006FC" Format="ci8" Width="16" Height="16" Offset="0x6FC" TlutOffset="0xFC"/>
<Texture Name="object_boj_Tex_0007FC" OutName="tex_000007FC" Format="ci8" Width="16" Height="16" Offset="0x7FC" TlutOffset="0xFC"/>
<Texture Name="object_boj_Tex_0008FC" OutName="tex_000008FC" Format="ci8" Width="8" Height="8" Offset="0x8FC"/>
<Texture Name="object_boj_Tex_00093C" OutName="tex_0000093C" Format="i8" Width="16" Height="16" Offset="0x93C"/>
<Texture Name="object_boj_Tex_000A3C" OutName="tex_00000A3C" Format="ci8" Width="8" Height="8" Offset="0xA3C"/>
@ -50,7 +47,6 @@
<DList Name="object_boj_DL_003798" Offset="0x3798"/>
<DList Name="object_boj_DL_0038A8" Offset="0x38A8"/>
<DList Name="object_boj_DL_0039B0" Offset="0x39B0"/>
-->
<!-- <Blob Name="object_boj_Blob_003B98" Size="0x1F8" Offset="0x3B98"/> -->
<Texture Name="object_boj_Tex_003D90" OutName="tex_00003D90" Format="ci8" Width="8" Height="8" Offset="0x3D90"/>

10
assets/xml/objects/object_cne.xml
View File

@ -1,7 +1,6 @@
<Root>
<File Name="object_cne" Segment="6">
<!-- The textures used by these limbs aren't 64-bit aligned, so this won't compile to a matching ROM. -->
<!--
<!-- The textures used by these limbs aren't 64-bit aligned -->
<Limb Name="object_cne_Limb_000000" LimbType="Standard" Offset="0x0"/>
<Limb Name="object_cne_Limb_00000C" LimbType="Standard" Offset="0xC"/>
<Limb Name="object_cne_Limb_000018" LimbType="Standard" Offset="0x18"/>
@ -17,14 +16,10 @@
<Limb Name="object_cne_Limb_000090" LimbType="Standard" Offset="0x90"/>
<Limb Name="object_cne_Limb_00009C" LimbType="Standard" Offset="0x9C"/>
<Limb Name="object_cne_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
-->
<!--
<Skeleton Name="object_cne_Skel_0000F0" Type="Flex" LimbType="Standard" Offset="0xF0"/>
-->
<!-- 32-bit aligned textures. -->
<!--
<Texture Name="object_cne_TLUT_0000FC" OutName="tlut_000000FC" Format="rgba16" Width="16" Height="16" Offset="0xFC"/>
<Texture Name="object_cne_Tex_0002FC" OutName="tex_000002FC" Format="ci8" Width="8" Height="8" Offset="0x2FC"/>
<Texture Name="object_cne_Tex_00033C" OutName="tex_0000033C" Format="ci8" Width="8" Height="8" Offset="0x33C"/>
@ -33,9 +28,7 @@
<Texture Name="object_cne_Tex_0003FC" OutName="tex_000003FC" Format="ci8" Width="8" Height="16" Offset="0x3FC"/>
<Texture Name="object_cne_Tex_00047C" OutName="tex_0000047C" Format="i8" Width="8" Height="8" Offset="0x47C"/>
<Texture Name="object_cne_Tex_0004BC" OutName="tex_000004BC" Format="ci8" Width="8" Height="8" Offset="0x4BC"/>
-->
<!--
<DList Name="object_cne_DL_001300" Offset="0x1300"/>
<DList Name="object_cne_DL_001608" Offset="0x1608"/>
<DList Name="object_cne_DL_0016E8" Offset="0x16E8"/>
@ -51,7 +44,6 @@
<DList Name="object_cne_DL_002170" Offset="0x2170"/>
<DList Name="object_cne_DL_002238" Offset="0x2238"/>
<DList Name="object_cne_DL_002300" Offset="0x2300"/>
-->
<Texture Name="object_cne_Tex_0023D0" OutName="tex_000023D0" Format="rgba16" Width="8" Height="16" Offset="0x23D0"/>
<Texture Name="object_cne_Tex_0024D0" OutName="tex_000024D0" Format="rgba16" Width="8" Height="8" Offset="0x24D0"/>

14
assets/xml/objects/object_oF1s.xml
View File

@ -1,10 +1,6 @@
<Root>
<File Name="object_oF1s" Segment="6">
<!-- This blob was added just to ensure the object will be extracted. Should be removed in the future. -->
<Blob Name="g_oF1sBlob_000000" Size="0x10" Offset="0x0"/>
<!-- The textures used by these limbs aren't 64-bit aligned, so this won't compile to a matching ROM. -->
<!--
<!-- The textures used by these limbs aren't 64-bit aligned -->
<Limb Name="object_oF1s_Limb_000000" LimbType="Standard" Offset="0x0"/>
<Limb Name="object_oF1s_Limb_00000C" LimbType="Standard" Offset="0xC"/>
<Limb Name="object_oF1s_Limb_000018" LimbType="Standard" Offset="0x18"/>
@ -22,16 +18,11 @@
<Limb Name="object_oF1s_Limb_0000A8" LimbType="Standard" Offset="0xA8"/>
<Limb Name="object_oF1s_Limb_0000B4" LimbType="Standard" Offset="0xB4"/>
<Limb Name="object_oF1s_Limb_0000C0" LimbType="Standard" Offset="0xC0"/>
-->
<!--
<Skeleton Name="object_oF1s_Skel_000110" Type="Flex" LimbType="Standard" Offset="0x110"/>
-->
<!-- 32-bit aligned textures. -->
<!--
<Texture Name="object_oF1s_TLUT_00011C" OutName="tlut_0000011C" Format="rgba16" Width="216" Height="1" Offset="0x11C"/>
<Blob Name="object_oF1s_Blob_00031C" Size="0x1A0" Offset="0x31C"/>
<Texture Name="object_oF1s_Tex_0004BC" OutName="tex_000004BC" Format="ci8" Width="32" Height="32" Offset="0x4BC"/>
<Texture Name="object_oF1s_Tex_0008BC" OutName="tex_000008BC" Format="rgba16" Width="64" Height="32" Offset="0x8BC"/>
<Texture Name="object_oF1s_Tex_0018BC" OutName="tex_000018BC" Format="ci8" Width="8" Height="8" Offset="0x18BC"/>
@ -45,9 +36,7 @@
<Texture Name="object_oF1s_Tex_0025BC" OutName="tex_000025BC" Format="ci8" Width="32" Height="32" Offset="0x25BC"/>
<Blob Name="object_oF1s_Blob_0029BC" Size="0x400" Offset="0x29BC"/>
<Texture Name="object_oF1s_Tex_002DBC" OutName="tex_00002DBC" Format="ci8" Width="32" Height="64" Offset="0x2DBC"/>
-->
<!--
<DList Name="object_oF1s_DL_006A40" Offset="0x6A40"/>
<DList Name="object_oF1s_DL_006DE8" Offset="0x6DE8"/>
<DList Name="object_oF1s_DL_006FF8" Offset="0x6FF8"/>
@ -64,6 +53,5 @@
<DList Name="object_oF1s_DL_0082C8" Offset="0x82C8"/>
<DList Name="object_oF1s_DL_008488" Offset="0x8488"/>
<DList Name="object_oF1s_DL_0084E0" Offset="0x84E0"/>
-->
</File>
</Root>

6
spec
View File

@ -4983,16 +4983,14 @@ endseg
beginseg
name "object_km1"
romalign 0x1000
include "build/baserom/object_km1.o"
//include "build/assets/objects/object_km1/object_km1.o"
include "build/assets/objects/object_km1/object_km1.o"
number 6
endseg
beginseg
name "object_kw1"
romalign 0x1000
include "build/baserom/object_kw1.o"
//include "build/assets/objects/object_kw1/object_kw1.o"
include "build/assets/objects/object_kw1/object_kw1.o"
number 6
endseg

2
src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.c
View File

@ -19,8 +19,6 @@ void BgYdanSp_FloorWebIdle(BgYdanSp* this, GlobalContext* globalCtx);
void BgYdanSp_BurnWallWeb(BgYdanSp* this, GlobalContext* globalCtx);
void BgYdanSp_WallWebIdle(BgYdanSp* this, GlobalContext* globalCtx);
extern CollisionHeader gDTWebWallCol;
typedef enum {
/* 0 */ WEB_FLOOR,
/* 1 */ WEB_WALL

52
src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c
View File

@ -148,9 +148,6 @@ static s16 sAnimationObjects[] = {
OBJECT_EC, OBJECT_EC, OBJECT_EC, OBJECT_EC, OBJECT_EC, OBJECT_EC, OBJECT_GM, OBJECT_MA2,
};
extern FlexSkeletonHeader object_bji_Skel_0000F0;
extern FlexSkeletonHeader object_ahg_Skel_0000F0;
void DemoEc_Destroy(Actor* thisx, GlobalContext* globalCtx) {
DemoEc* this = (DemoEc*)thisx;
@ -490,7 +487,11 @@ void DemoEc_UpdateDancingKokiriGirl(DemoEc* this, GlobalContext* globalCtx) {
}
void DemoEc_DrawKokiriGirl(DemoEc* this, GlobalContext* globalCtx) {
static void* eyeTextures[] = { 0x06000F4C, 0x06001A0C, 0x06001E0C };
static void* eyeTextures[] = {
gKw1EyeOpenTex,
gKw1EyeHalfTex,
gKw1EyeClosedTex,
};
static u8 color1[] = { 70, 190, 60, 255 };
static u8 color2[] = { 100, 30, 0, 255 };
s32 eyeTexIndex = this->eyeTexIndex;
@ -517,7 +518,11 @@ void DemoEc_UpdateOldMan(DemoEc* this, GlobalContext* globalCtx) {
}
void DemoEc_DrawOldMan(DemoEc* this, GlobalContext* globalCtx) {
static void* eyeTextures[] = { 0x060005FC, 0x060009FC, 0x06000DFC };
static void* eyeTextures[] = {
object_bji_Tex_0005FC,
object_bji_Tex_0009FC,
object_bji_Tex_000DFC,
};
static u8 color1[] = { 0, 50, 100, 255 };
static u8 color2[] = { 0, 50, 160, 255 };
s32 eyeTexIndex = this->eyeTexIndex;
@ -545,7 +550,11 @@ void DemoEc_UpdateBeardedMan(DemoEc* this, GlobalContext* globalCtx) {
}
void DemoEc_DrawBeardedMan(DemoEc* this, GlobalContext* globalCtx) {
static void* eyeTextures[] = { 0x0600057C, 0x0600067C, 0x0600077C };
static void* eyeTextures[] = {
object_ahg_Tex_00057C,
object_ahg_Tex_00067C,
object_ahg_Tex_00077C,
};
static u8 color1[] = { 255, 255, 255, 255 };
static u8 color2[] = { 255, 255, 255, 255 };
s32 eyeTexIndex = this->eyeTexIndex;
@ -573,7 +582,11 @@ void DemoEc_UpdateWoman(DemoEc* this, GlobalContext* globalCtx) {
}
void DemoEc_DrawWoman(DemoEc* this, GlobalContext* globalCtx) {
static Gfx* eyeTextures[] = { 0x060007C8, 0x06000FC8, 0x060017C8 };
static void* eyeTextures[] = {
object_bob_Tex_0007C8,
object_bob_Tex_000FC8,
object_bob_Tex_0017C8,
};
s32 eyeTexIndex = this->eyeTexIndex;
void* eyeTexture = eyeTextures[eyeTexIndex];
@ -739,7 +752,11 @@ void DemoEc_GerudoPostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dL
}
void DemoEc_DrawGerudo(DemoEc* this, GlobalContext* globalCtx) {
static void* eyeTextures[] = { 0x06000708, 0x06000F08, 0x06001708 };
static void* eyeTextures[] = {
gGerudoWhiteEyeOpenTex,
gGerudoWhiteEyeHalfTex,
gGerudoWhiteEyeClosedTex,
};
s32 eyeTexIndex = this->eyeTexIndex;
void* eyeTexture = eyeTextures[eyeTexIndex];
@ -916,7 +933,12 @@ void func_8096F640(DemoEc* this, GlobalContext* globalCtx) {
}
void DemoEc_DrawMido(DemoEc* this, GlobalContext* globalCtx) {
static void* eyeTextures[] = { 0x06004FF0, 0x06005930, 0x06005D30, 0x06006130 };
static void* eyeTextures[] = {
gMidoEyeOpenTex,
gMidoEyeHalfTex,
gMidoEyeClosedTex,
gMidoEyeAngryTex,
};
s32 eyeTexIndex = this->eyeTexIndex;
void* eyeTexture = eyeTextures[eyeTexIndex];
@ -974,7 +996,11 @@ void DemoEc_UpdateCuccoLady(DemoEc* this, GlobalContext* globalCtx) {
}
void DemoEc_DrawCuccoLady(DemoEc* this, GlobalContext* globalCtx) {
static void* eyeTextures[] = { 0x060008C8, 0x060010C8, 0x060018C8 };
static void* eyeTextures[] = {
gCuccoLadyEyeOpenTex,
gCuccoLadyEyeHalfTex,
gCuccoLadyEyeClosedTex,
};
s32 eyeTexIndex = this->eyeTexIndex;
void* eyeTexture = eyeTextures[eyeTexIndex];
@ -1000,7 +1026,11 @@ void DemoEc_UpdatePotionShopOwner(DemoEc* this, GlobalContext* globalCtx) {
}
void DemoEc_DrawPotionShopOwner(DemoEc* this, GlobalContext* globalCtx) {
static void* eyeTextures[] = { 0x060030D8, 0x060034D8, 0x060038D8 };
static void* eyeTextures[] = {
gPotionShopkeeperEyeOpenTex,
gPotionShopkeeperEyeHalfTex,
gPotionShopkeeperEyeClosedTex,
};
s32 eyeTexIndex = this->eyeTexIndex;
void* eyeTexture = eyeTextures[eyeTexIndex];

2
src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c
View File

@ -495,7 +495,7 @@ void EnExItem_DrawMagic(EnExItem* this, GlobalContext* globalCtx, s16 magicIndex
}
void EnExItem_DrawKey(EnExItem* this, GlobalContext* globalCtx, s32 index) {
static s32 keySegments[] = { 0x0403F140 };
static void* keySegments[] = { gDropKeySmallTex };
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_ex_item.c", 880);

8
src/overlays/actors/ovl_En_Guest/z_en_guest.c
View File

@ -49,8 +49,6 @@ static InitChainEntry sInitChain[] = {
ICHAIN_F32(targetArrowOffset, 500, ICHAIN_STOP),
};
extern FlexSkeletonHeader object_boj_Skel_0000F0;
void EnGuest_Init(Actor* thisx, GlobalContext* globalCtx) {
EnGuest* this = (EnGuest*)thisx;
@ -215,9 +213,9 @@ s32 EnGuest_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLis
void EnGuest_Draw(Actor* thisx, GlobalContext* globalCtx) {
static void* D_80A50BA4[] = {
0x060005FC,
0x060006FC,
0x060007FC,
object_boj_Tex_0005FC,
object_boj_Tex_0006FC,
object_boj_Tex_0007FC,
};
EnGuest* this = (EnGuest*)thisx;
s32 pad;

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 },
};

13
src/overlays/actors/ovl_En_Ko/z_en_ko.c
View File

@ -7,6 +7,8 @@
#include "z_en_ko.h"
#include "objects/object_fa/object_fa.h"
#include "objects/object_os_anime/object_os_anime.h"
#include "objects/object_km1/object_km1.h"
#include "objects/object_kw1/object_kw1.h"
#include "vt.h"
#define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3 | ACTOR_FLAG_4)
@ -63,8 +65,7 @@ static ColliderCylinderInit sCylinderInit = {
static CollisionCheckInfoInit2 sColChkInfoInit = { 0, 0, 0, 0, MASS_IMMOVABLE };
static void* sFaEyes[] = { gFaEyeOpenTex, gFaEyeHalfTex, gFaEyeClosedTex, NULL };
static void* sKw1Eyes[] = { /* gKw1EyeOpenTex */ 0x06000F4C, /* gKw1EyeHalfTex */ 0x06001A0C,
/* gKw1EyeClosedTex */ 0x06001E0C, NULL };
static void* sKw1Eyes[] = { gKw1EyeOpenTex, gKw1EyeHalfTex, gKw1EyeClosedTex, NULL };
typedef struct {
/* 0x0 */ s16 objectId;
@ -73,8 +74,8 @@ typedef struct {
} EnKoHead; // size = 0xC
static EnKoHead sHead[] = {
{ OBJECT_KM1, /* gKm1DL */ 0x06001890, NULL },
{ OBJECT_KW1, /* object_kw1_DL_002C10 */ 0x06002C10, sKw1Eyes },
{ OBJECT_KM1, gKm1DL, NULL },
{ OBJECT_KW1, object_kw1_DL_002C10, sKw1Eyes },
{ OBJECT_FA, gFaDL, sFaEyes },
};
@ -84,8 +85,8 @@ typedef struct {
} EnKoSkeleton; // size = 0x8
static EnKoSkeleton sSkeleton[2] = {
{ OBJECT_KM1, /* gKm1Skel */ 0x060000F0 },
{ OBJECT_KW1, /* gKw1Skel */ 0x060000F0 },
{ OBJECT_KM1, &gKm1Skel },
{ OBJECT_KW1, &gKw1Skel },
};
typedef enum {

12
src/overlays/actors/ovl_En_Sth/z_en_sth.c
View File

@ -61,12 +61,12 @@ static s16 sObjectIds[6] = {
};
static FlexSkeletonHeader* sSkeletons[6] = {
/* object_ahg_Skel_0000F0 */ 0x060000F0,
/* object_boj_Skel_0000F0 */ 0x060000F0,
/* object_boj_Skel_0000F0 */ 0x060000F0,
/* object_boj_Skel_0000F0 */ 0x060000F0,
/* object_boj_Skel_0000F0 */ 0x060000F0,
/* object_boj_Skel_0000F0 */ 0x060000F0,
&object_ahg_Skel_0000F0,
&object_boj_Skel_0000F0,
&object_boj_Skel_0000F0,
&object_boj_Skel_0000F0,
&object_boj_Skel_0000F0,
&object_boj_Skel_0000F0,
};
static AnimationHeader* sAnimations[6] = {

8
undefined_syms.txt
View File

@ -50,14 +50,6 @@ D_A4800004 = 0xA4800004; // SI_PIF_ADDR_RD64B_REG
D_A4800010 = 0xA4800010; // SI_PIF_ADDR_WR64B_REG
D_A4800018 = 0xA4800018; // SI_STATUS_REG
// until ZAPD can handle non-aligned textures,
// we can't use the built assets tied to some symbols
gKm1Skel = 0x060000F0;
gKw1Skel = 0x060000F0;
object_ahg_Skel_0000F0 = 0x060000F0;
object_bji_Skel_0000F0 = 0x060000F0;
object_boj_Skel_0000F0 = 0x060000F0;
// z_kankyo, z_demo_kankyo, z_en_viewer, z_object_kankyo, z_eff_ss_dead_dd
D_01000000 = 0x01000000;