falso
/
mm
mirror of https://github.com/zeldaret/mm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Some partial objects cleanup (#1313) 

* tanron1

* gm

* tanron4

* sekihi

* dkjail

* dor02

* dor04

* blobs

* comments

* parens

* Unknown
This commit is contained in:
Derek Hensley 2023-07-02 07:31:54 -07:00 committed by GitHub
parent f54a9b2831
commit 5c7d745102
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 109 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
assets/xml/objects/object_dkjail_obj.xml
View File

@ -1,9 +1,10 @@
<Root>
<!-- Assets for the ivy jail -->
<File Name="object_dkjail_obj" Segment="6">
<DList Name="gDkjailIvyDL" Offset="0x80" /> <!-- Original name is "m2_Mn_TUTA_modelT" -->
<DList Name="object_dkjail_obj_DL_000150" Offset="0x150" />
<Texture Name="object_dkjail_obj_Tex_000158" OutName="tex_000158" Format="rgba16" Width="32" Height="32" Offset="0x158" />
<Texture Name="object_dkjail_obj_Tex_000958" OutName="tex_000958" Format="ia8" Width="32" Height="64" Offset="0x958" />
<Collision Name="object_dkjail_obj_Colheader_0011A8" Offset="0x11A8" /> <!-- Original name is "m2_Mn_TUTA_bgdatainfo" -->
<DList Name="gDkjailEmptyDL" Offset="0x150" />
<Texture Name="gDkjailIvyTex" OutName="dkjail_ivy" Format="rgba16" Width="32" Height="32" Offset="0x158" />
<Texture Name="gDkjailMaskTex" OutName="dkjail_mask" Format="ia8" Width="32" Height="64" Offset="0x958" />
<Collision Name="gDkjailCol" Offset="0x11A8" /> <!-- Original name is "m2_Mn_TUTA_bgdatainfo" -->
</File>
</Root>

3
assets/xml/objects/object_dor02.xml
View File

@ -1,6 +1,7 @@
<Root>
<!-- Assets for a zora hall door -->
<File Name="object_dor02" Segment="6">
<DList Name="object_dor02_DL_000420" Offset="0x420"/> <!-- Original name is "z2_dor02_modelT" -->
<DList Name="gZoraHallDoorEmptyDL" Offset="0x420"/> <!-- Original name is "z2_dor02_modelT" -->
<DList Name="gZoraHallDoorDL" Offset="0x428"/> <!-- Original name is "z2_dor02_model" -->
<Texture Name="gZoraHallDoorTex" OutName="zora_hall_door" Format="rgba16" Width="32" Height="64" Offset="0x610"/>
</File>

3
assets/xml/objects/object_dor04.xml
View File

@ -1,6 +1,7 @@
<Root>
<!-- Assets for the magic hag potion shop door -->
<File Name="object_dor04" Segment="6">
<DList Name="gMagicHagPotionShopDoorEndDL" Offset="0x460"/> <!-- Original name is "z2_dor04_modelT" -->
<DList Name="gMagicHagPotionShopDoorEmptyDL" Offset="0x460"/> <!-- Original name is "z2_dor04_modelT" -->
<DList Name="gMagicHagPotionShopDoorDL" Offset="0x468"/> <!-- Original name is "z2_dor04_model" -->
<Texture Name="gMagicHagPotionShopDoorTex" OutName="magic_hag_potion_shop_door" Format="rgba16" Width="64" Height="32" Offset="0x658"/>
</File>

4
assets/xml/objects/object_gm.xml
View File

@ -1,6 +1,6 @@
<Root>
<!-- This file is empty -->
<File Name="object_gm" Segment="6">
<!-- This file is empty -->
<Blob Name="object_gm_Blob_000000" Size="0x10" Offset="0x0" />
<Blob Name="gGmEmptyBlob" Size="0x10" Offset="0x0" />
</File>
</Root>

27
assets/xml/objects/object_sekihig.xml
View File

@ -1,16 +1,19 @@
<Root>
<!-- Assets for a suns song grave with a goron symbol on it -->
<File Name="object_sekihig" Segment="6">
<DList Name="gSunSongGoronSymbolBaseDL" Offset="0x340" />
<DList Name="gSunSongGoronSymbolDL" Offset="0x4A8" />
<DList Name="gSekihigGraveBaseDL" Offset="0x4B8" />
<DList Name="gGraveGoronSymbolDL" Offset="0x5C8" />
<Texture Name="gSekihigTLUT" OutName="sekihig_tlut" Format="rgba16" Width="4" Height="4" Offset="0x5E0" />
<!-- <Blob Name="object_sekihig_Blob_000600" Size="0x60" Offset="0x600" /> -->
<Texture Name="gSekihigGraniteTex" OutName="sekihig_granite" Format="rgba16" Width="32" Height="32" Offset="0x660" />
<Texture Name="gSekihigMarbleTex" OutName="sekihig_marble" Format="rgba16" Width="32" Height="64" Offset="0xE60" />
<Texture Name="gSekihigGoronSymbolTex" OutName="sekihig_goron_symbol" Format="ci4" Width="64" Height="64" Offset="0x1E60" />
<Texture Name="gSekihigStoneInscriptionTex" OutName="sekihig_stone_inscription" Format="ia4" Width="128" Height="16" Offset="0x2660" />
<Texture Name="gSekihigStaffNotesTex" OutName="sekihig_staff_notes" Format="ia4" Width="128" Height="32" Offset="0x2A60" />
<Collision Name="gSekihigCol" Offset="0x33D8" />
<DList Name="gSunsSongGraveGoronSymbolsBaseDL" Offset="0x340" />
<DList Name="gSunsSongGraveGoronSymbolsDL" Offset="0x4A8" />
<DList Name="gSunsSongGraveGoronStoneDL" Offset="0x4B8" />
<DList Name="gSunsSongGraveGoronDL" Offset="0x5C8" />
<Texture Name="gSunsSongGraveGoronTLUT" OutName="sun_song_grave_goron_tlut" Format="rgba16" Width="4" Height="4" Offset="0x5E0" />
<Texture Name="gSunsSongGraveGoronKokiriTLUT" OutName="suns_song_grave_goron_kokiri_tlut" Format="rgba16" Width="4" Height="4" Offset="0x600" />
<Texture Name="gSunsSongGraveGoronUnknownTLUT" OutName="suns_song_grave_goron_unknown_tlut" Format="rgba16" Width="4" Height="4" Offset="0x620" />
<Texture Name="gSunsSongGraveGoronTriforceTLUT" OutName="suns_song_grave_goron_triforce_tlut" Format="rgba16" Width="4" Height="4" Offset="0x640" />
<Texture Name="gSunsSongGraveGoronGraniteTex" OutName="sun_song_grave_goron_granite" Format="rgba16" Width="32" Height="32" Offset="0x660" />
<Texture Name="gSunsSongGraveGoronMarbleTex" OutName="sun_song_grave_goron_marble" Format="rgba16" Width="32" Height="64" Offset="0xE60" />
<Texture Name="gSunsSongGraveGoronSymbolTex" OutName="sun_song_grave_goron_symbol" Format="ci4" Width="64" Height="64" Offset="0x1E60" />
<Texture Name="gSunsSongGraveGoronStoneInscriptionTex" OutName="sun_song_grave_goron_stone_inscription" Format="ia4" Width="128" Height="16" Offset="0x2660" />
<Texture Name="gSunsSongGraveGoronStaffNotesTex" OutName="sun_song_grave_goron_staff_notes" Format="ia4" Width="128" Height="32" Offset="0x2A60" />
<Collision Name="gSunsSongGraveGoronCol" Offset="0x33D8" />
</File>
</Root>

27
assets/xml/objects/object_sekihil.xml
View File

@ -1,16 +1,19 @@
<Root>
<!-- Assets for a suns song grave with a triforce symbol on it -->
<File Name="object_sekihil" Segment="6">
<DList Name="object_sekihil_DL_000340" Offset="0x340" />
<DList Name="gSunSongTriforceSymbolDL" Offset="0x4C0" />
<DList Name="object_sekihil_DL_0004D0" Offset="0x4D0" />
<DList Name="gGraveTriforceSymbolDL" Offset="0x5E0" />
<!-- <Blob Name="object_sekihil_Blob_0005F8" Size="0x60" Offset="0x5F8" /> -->
<Texture Name="gSekihilTLUT" OutName="sekihil_tlut" Format="rgba16" Width="4" Height="4" Offset="0x658" />
<Texture Name="gSekihilGraniteTex" OutName="sekihil_granite" Format="rgba16" Width="32" Height="32" Offset="0x678" />
<Texture Name="gSekihilMarbleTex" OutName="sekihil_marble" Format="rgba16" Width="32" Height="64" Offset="0xE78" />
<Texture Name="gSekihilTriforceSymbolTex" OutName="sekihil_triforce_symbol" Format="ia4" Width="128" Height="16" Offset="0x1E78" />
<Texture Name="gSekihilStoneInscriptionTex" OutName="sekihil_stone_inscription" Format="ci4" Width="64" Height="64" Offset="0x2278" />
<Texture Name="gSekihilStaffNotesTex" OutName="sekihil_staff_notes" Format="ia4" Width="128" Height="32" Offset="0x2A78" />
<Collision Name="gSekihilCol" Offset="0x33F8" />
<DList Name="gSunsSongGraveTriforceSymbolsBaseDL" Offset="0x340" />
<DList Name="gSunsSongGraveTriforceSymbolsDL" Offset="0x4C0" />
<DList Name="gSunsSongGraveTriforceStoneDL" Offset="0x4D0" />
<DList Name="gSunsSongGraveTriforceDL" Offset="0x5E0" />
<Texture Name="gSunsSongGraveTriforceGoronTLUT" OutName="suns_song_grave_triforce_goron_tlut" Format="rgba16" Width="4" Height="4" Offset="0x5F8" />
<Texture Name="gSunsSongGraveTriforceKokiriTLUT" OutName="suns_song_grave_triforce_kokiri_tlut" Format="rgba16" Width="4" Height="4" Offset="0x618" />
<Texture Name="gSunsSongGraveTriforceUnknownTLUT" OutName="suns_song_grave_triforce_unknown_tlut" Format="rgba16" Width="4" Height="4" Offset="0x638" />
<Texture Name="gSunsSongGraveTriforceTLUT" OutName="sun_song_grave_triforce_tlut" Format="rgba16" Width="4" Height="4" Offset="0x658" />
<Texture Name="gSunsSongGraveTriforceGraniteTex" OutName="sun_song_grave_triforce_granite" Format="rgba16" Width="32" Height="32" Offset="0x678" />
<Texture Name="gSunsSongGraveTriforceMarbleTex" OutName="sun_song_grave_triforce_marble" Format="rgba16" Width="32" Height="64" Offset="0xE78" />
<Texture Name="gSunsSongGraveTriforceSymbolTex" OutName="sun_song_grave_triforce_symbol" Format="ia4" Width="128" Height="16" Offset="0x1E78" />
<Texture Name="gSunsSongGraveTriforceStoneInscriptionTex" OutName="sun_song_grave_triforce_stone_inscription" Format="ci4" Width="64" Height="64" Offset="0x2278" />
<Texture Name="gSunsSongGraveTriforceStaffNotesTex" OutName="sun_song_grave_triforce_staff_notes" Format="ia4" Width="128" Height="32" Offset="0x2A78" />
<Collision Name="gSunsSongGraveTriforceCol" Offset="0x33F8" />
</File>
</Root>

28
assets/xml/objects/object_sekihin.xml
View File

@ -1,17 +1,19 @@
<Root>
<!-- Assets for a suns song grave with a kokiri symbol on it -->
<File Name="object_sekihin" Segment="6">
<DList Name="gSunSongKokiriSymbolBaseDL" Offset="0x340" />
<DList Name="gSunSongKokiriSymbolDL" Offset="0x4A8" />
<DList Name="gSekihinGraveBaseDL" Offset="0x4B8" />
<DList Name="gGraveKokiriSymbolDL" Offset="0x5C8" />
<!-- <Blob Name="object_sekihin_Blob_0005E0" Size="0x20" Offset="0x5E0" /> -->
<Texture Name="gSekihinTLUT" OutName="sekihil_tlut" Format="rgba16" Width="4" Height="4" Offset="0x600" />
<!-- <Blob Name="object_sekihin_Blob_000620" Size="0x40" Offset="0x620" /> -->
<Texture Name="gSekihinGraniteTex" OutName="sekihin_granite" Format="rgba16" Width="32" Height="32" Offset="0x660" />
<Texture Name="gSekihinMarbleTex" OutName="sekihin_marble" Format="rgba16" Width="32" Height="64" Offset="0xE60" />
<Texture Name="gSekihinKokiriSymbolTex" OutName="sekihin_kokiri_symbol" Format="ci4" Width="64" Height="64" Offset="0x1E60" />
<Texture Name="gSekihinStoneInscriptionTex" OutName="sekihin_stone_inscription" Format="ia4" Width="128" Height="16" Offset="0x2660" />
<Texture Name="gSekihinStaffNotesTex" OutName="sekihin_staff_notes" Format="ia4" Width="128" Height="32" Offset="0x2A60" />
<Collision Name="gSekihinCol" Offset="0x33D8" />
<DList Name="gSunsSongGraveKokiriSymbolsBaseDL" Offset="0x340" />
<DList Name="gSunsSongGraveKokiriSymbolsDL" Offset="0x4A8" />
<DList Name="gSunsSongGraveKokiriStoneDL" Offset="0x4B8" />
<DList Name="gSunsSongGraveKokiriDL" Offset="0x5C8" />
<Texture Name="gSunsSongGraveKokiriGoronTLUT" OutName="suns_song_grave_kokiri_goron_tlut" Format="rgba16" Width="4" Height="4" Offset="0x5E0" />
<Texture Name="gSunsSongGraveKokiriTLUT" OutName="suns_song_grave_kokiri_tlut" Format="rgba16" Width="4" Height="4" Offset="0x600" />
<Texture Name="gSunsSongGraveKokiriUnknownTLUT" OutName="suns_song_grave_kokiri_unknown_tlut" Format="rgba16" Width="4" Height="4" Offset="0x620" />
<Texture Name="gSunsSongGraveKokiriTriforceTLUT" OutName="suns_song_grave_kokiri_triforce_tlut" Format="rgba16" Width="4" Height="4" Offset="0x640" />
<Texture Name="gSunsSongGraveKokiriGraniteTex" OutName="suns_song_grave_kokiri_granite" Format="rgba16" Width="32" Height="32" Offset="0x660" />
<Texture Name="gSunsSongGraveKokiriMarbleTex" OutName="suns_song_grave_kokiri_marble" Format="rgba16" Width="32" Height="64" Offset="0xE60" />
<Texture Name="gSunsSongGraveKokiriSymbolTex" OutName="suns_song_grave_kokiri_symbol" Format="ci4" Width="64" Height="64" Offset="0x1E60" />
<Texture Name="gSunsSongGraveKokiriStoneInscriptionTex" OutName="suns_song_grave_kokiri_stone_inscription" Format="ia4" Width="128" Height="16" Offset="0x2660" />
<Texture Name="gSunsSongGraveKokiriStaffNotesTex" OutName="suns_song_grave_kokiri_staff_notes" Format="ia4" Width="128" Height="32" Offset="0x2A60" />
<Collision Name="gSunsSongGraveKokiriCol" Offset="0x33D8" />
</File>
</Root>

11
assets/xml/objects/object_sekihiz.xml
View File

@ -1,9 +1,10 @@
<Root>
<!-- Assets for the song of soaring pedestal -->
<File Name="object_sekihiz" Segment="6">
<DList Name="gSekihizEmptyDL" Offset="0x510" />
<DList Name="gTombSongOfSoaringDL" Offset="0x518" />
<Texture Name="gSekihizStaffNotesTex" OutName="sekihiz_staff_notes" Format="i8" Width="32" Height="32" Offset="0x728" />
<Texture Name="gSekihizGraniteTex" OutName="sekihiz_granite" Format="i8" Width="32" Height="32" Offset="0xB28" />
<Collision Name="gSekihizCol" Offset="0x1010" />
<DList Name="gSongOfSoaringPedestalEmptyDL" Offset="0x510" />
<DList Name="gSongOfSoaringPedestalDL" Offset="0x518" />
<Texture Name="gSongOfSoaringPedestalStaffNotesTex" OutName="song_of_soaring_pedestal_staff_notes" Format="i8" Width="32" Height="32" Offset="0x728" />
<Texture Name="gSongOfSoaringPedestalGraniteTex" OutName="song_of_soaring_pedestal_granite" Format="i8" Width="32" Height="32" Offset="0xB28" />
<Collision Name="gSongOfSoaringPedestalCol" Offset="0x1010" />
</File>
</Root>

4
assets/xml/objects/object_tanron1.xml
View File

@ -1,6 +1,6 @@
<Root>
<!-- This file is empty -->
<File Name="object_tanron1" Segment="6">
<!-- This file is empty -->
<Blob Name="object_tanron1_Blob_000000" Size="0x10" Offset="0x0" />
<DList Name="gTanron1EmptyDL" Offset="0x0" />
</File>
</Root>

38
assets/xml/objects/object_tanron4.xml
View File

@ -1,30 +1,30 @@
<Root>
<!-- Assets for seagulls -->
<File Name="object_tanron4" Segment="6">
<!-- The glide animation goes unused, instead the flap animation is frozen while it glides-->
<!-- The glide animation goes unused, instead the flap animation is frozen while it glides -->
<Animation Name="gSeagullGlideAnim" Offset="0x58" />
<Animation Name="gSeagullFlapAnim" Offset="0x168" />
<DList Name="object_tanron4_DL_000300" Offset="0x300" />
<DList Name="object_tanron4_DL_0003A0" Offset="0x3A0" />
<DList Name="object_tanron4_DL_000440" Offset="0x440" />
<DList Name="object_tanron4_DL_0004B0" Offset="0x4B0" />
<DList Name="object_tanron4_DL_000550" Offset="0x550" />
<DList Name="gSeagullBodyDL" Offset="0x300" />
<DList Name="gSeagullRightWingEndDL" Offset="0x3A0" />
<DList Name="gSeagullRightWingStartDL" Offset="0x440" />
<DList Name="gSeagullLeftWingEndDL" Offset="0x4B0" />
<DList Name="gSeagullLeftWingStartDL" Offset="0x550" />
<Texture Name="object_tanron4_Tex_0005C8" OutName="tex_0005C8" Format="rgba16" Width="32" Height="16" Offset="0x5C8" />
<Texture Name="object_tanron4_Tex_0009C8" OutName="tex_0009C8" Format="rgba16" Width="32" Height="16" Offset="0x9C8" />
<Texture Name="gSeagullBodyTex" OutName="seagull_body" Format="rgba16" Width="32" Height="16" Offset="0x5C8" />
<Texture Name="gSeagullWingTex" OutName="seagull_wing" Format="rgba16" Width="32" Height="16" Offset="0x9C8" />
<Limb Name="object_tanron4_Standardlimb_000DC8" Type="Standard" EnumName="OBJECT_TANRON4_LIMB_01" Offset="0xDC8" />
<Limb Name="object_tanron4_Standardlimb_000DD4" Type="Standard" EnumName="OBJECT_TANRON4_LIMB_02" Offset="0xDD4" />
<Limb Name="object_tanron4_Standardlimb_000DE0" Type="Standard" EnumName="OBJECT_TANRON4_LIMB_03" Offset="0xDE0" />
<Limb Name="object_tanron4_Standardlimb_000DEC" Type="Standard" EnumName="OBJECT_TANRON4_LIMB_04" Offset="0xDEC" />
<Limb Name="object_tanron4_Standardlimb_000DF8" Type="Standard" EnumName="OBJECT_TANRON4_LIMB_05" Offset="0xDF8" />
<Limb Name="object_tanron4_Standardlimb_000E04" Type="Standard" EnumName="OBJECT_TANRON4_LIMB_06" Offset="0xE04" />
<Limb Name="object_tanron4_Standardlimb_000E10" Type="Standard" EnumName="OBJECT_TANRON4_LIMB_07" Offset="0xE10" />
<Limb Name="object_tanron4_Standardlimb_000E1C" Type="Standard" EnumName="OBJECT_TANRON4_LIMB_08" Offset="0xE1C" />
<Limb Name="object_tanron4_Standardlimb_000E28" Type="Standard" EnumName="OBJECT_TANRON4_LIMB_09" Offset="0xE28" />
<Limb Name="object_tanron4_Standardlimb_000E34" Type="Standard" EnumName="OBJECT_TANRON4_LIMB_0A" Offset="0xE34" />
<Limb Name="gSeagullRootLimb" Type="Standard" EnumName="SEAGULL_LIMB_ROOT" Offset="0xDC8" />
<Limb Name="gSeagullBodyLimb" Type="Standard" EnumName="SEAGULL_LIMB_BODY" Offset="0xDD4" />
<Limb Name="gSeagullLeftWingRootLimb" Type="Standard" EnumName="SEAGULL_LIMB_LEFT_WING_ROOT" Offset="0xDE0" />
<Limb Name="gSeagullLeftWingWrapperLimb" Type="Standard" EnumName="SEAGULL_LIMB_LEFT_WING_WRAPPER" Offset="0xDEC" />
<Limb Name="gSeagullLeftWingStartLimb" Type="Standard" EnumName="SEAGULL_LIMB_LEFT_WING_START" Offset="0xDF8" />
<Limb Name="gSeagullLeftWingEndLimb" Type="Standard" EnumName="SEAGULL_LIMB_LEFT_WING_END" Offset="0xE04" />
<Limb Name="gSeagullRightWingRootLimb" Type="Standard" EnumName="SEAGULL_LIMB_RIGHT_WING_ROOT" Offset="0xE10" />
<Limb Name="gSeagullRightWingWrapperLimb" Type="Standard" EnumName="SEAGULL_LIMB_RIGHT_WING_WRAPPER" Offset="0xE1C" />
<Limb Name="gSeagullRightWingStartLimb" Type="Standard" EnumName="SEAGULL_LIMB_RIGHT_WING_START" Offset="0xE28" />
<Limb Name="gSeagullRightWingEndLimb" Type="Standard" EnumName="SEAGULL_LIMB_RIGHT_WING_END" Offset="0xE34" />
<Skeleton Name="gSeagullSkel" Type="Flex" LimbType="Standard" LimbNone="OBJECT_TANRON4_LIMB_NONE" LimbMax="OBJECT_TANRON4_LIMB_MAX" EnumName="ObjectTanron4Limb" Offset="0xE68" />
<Skeleton Name="gSeagullSkel" Type="Flex" LimbType="Standard" LimbNone="SEAGULL_LIMB_RIGHT_WING_NONE" LimbMax="SEAGULL_LIMB_RIGHT_WING_MAX" EnumName="ObjectTanron4Limb" Offset="0xE68" />
</File>
</Root>

2
assets/xml/objects/object_zog.xml
View File

@ -19,7 +19,7 @@
<Texture Name="gMikauGraveBoneTex" OutName="mikau_grave_bone" Format="rgba16" Width="16" Height="32" Offset="0x7DD0" />
<Texture Name="gMikauGraveWoodenStickTex" OutName="mikau_grave_wooden_stick" Format="rgba16" Width="32" Height="8" Offset="0x81D0" />
<Texture Name="gMikauGraveCordTex" OutName="mikau_grave_cord" Format="rgba16" Width="16" Height="8" Offset="0x83D0" />
<Collision Name="gObjectZogCol" Offset="0x8670" />
<Collision Name="gMikauGraveCol" Offset="0x8670" />
<Animation Name="object_zog_Anim_008EB8" Offset="0x8EB8" />
<Animation Name="object_zog_Anim_00931C" Offset="0x931C" />
<Animation Name="object_zog_Anim_0099A4" Offset="0x99A4" />

2
src/overlays/actors/ovl_Bg_Dkjail_Ivy/z_bg_dkjail_ivy.c
View File

@ -123,7 +123,7 @@ void BgDkjailIvy_Init(Actor* thisx, PlayState* play) {
if (Flags_GetSwitch(play, BG_DKJAIL_GET_SWITCH(thisx))) {
Actor_Kill(&this->dyna.actor);
} else {
DynaPolyActor_LoadMesh(play, &this->dyna, &object_dkjail_obj_Colheader_0011A8);
DynaPolyActor_LoadMesh(play, &this->dyna, &gDkjailCol);
Collider_SetCylinder(play, &this->collider, &this->dyna.actor, &sCylinderInit);
Collider_UpdateCylinder(&this->dyna.actor, &this->collider);
this->alpha = 255;

37
src/overlays/actors/ovl_En_Sekihi/z_en_sekihi.c
View File

@ -39,40 +39,44 @@ ActorInit En_Sekihi_InitVars = {
static s16 sObjectIds[] = { OBJECT_SEKIHIL, OBJECT_SEKIHIG, OBJECT_SEKIHIN, OBJECT_SEKIHIZ, OBJECT_ZOG };
static Gfx* sOpaDLists[] = {
gGraveTriforceSymbolDL, gGraveGoronSymbolDL, gGraveKokiriSymbolDL, gTombSongOfSoaringDL, gMikauGraveDL,
gSunsSongGraveTriforceDL, gSunsSongGraveGoronDL, gSunsSongGraveKokiriDL, gSongOfSoaringPedestalDL, gMikauGraveDL,
};
static Gfx* sXluDLists[] = {
gSunSongTriforceSymbolDL, gSunSongGoronSymbolDL, gSunSongKokiriSymbolDL, gSekihizEmptyDL, gMikauGraveDirtDL,
gSunsSongGraveTriforceSymbolsDL,
gSunsSongGraveGoronSymbolsDL,
gSunsSongGraveKokiriSymbolsDL,
gSongOfSoaringPedestalEmptyDL,
gMikauGraveDirtDL,
};
static u16 sTextIds[] = { 0, 0, 0, 0, 0x1018 };
void EnSekihi_Init(Actor* thisx, PlayState* play) {
EnSekihi* this = THIS;
s32 params = ENSIKIHI_GET_TYPE(thisx);
s32 type = ENSIKIHI_GET_TYPE(thisx);
s32 objectIndex;
s32 pad;
if ((params < SEKIHI_TYPE_0 || params >= SEKIHI_TYPE_MAX) || sOpaDLists[params] == NULL) {
if (((type < SEKIHI_TYPE_0) || (type >= SEKIHI_TYPE_MAX)) || (sOpaDLists[type] == NULL)) {
Actor_Kill(&this->dyna.actor);
return;
}
if ((params == SEKIHI_TYPE_4) &&
if ((type == SEKIHI_TYPE_4) &&
((gSaveContext.save.saveInfo.skullTokenCount & 0xFFFF) >= SPIDER_HOUSE_TOKENS_REQUIRED)) {
// For some reason the mikau grave sets the flag instead of something in the spider house on exit.
SET_WEEKEVENTREG(WEEKEVENTREG_OCEANSIDE_SPIDER_HOUSE_BUYER_MOVED_IN);
}
objectIndex = Object_GetIndex(&play->objectCtx, sObjectIds[params]);
objectIndex = Object_GetIndex(&play->objectCtx, sObjectIds[type]);
if (objectIndex >= 0) {
this->objectIndex = objectIndex;
}
this->actionFunc = func_80A44DE8;
this->opaDList = sOpaDLists[params];
this->xluDList = sXluDLists[params];
this->dyna.actor.textId = sTextIds[params];
this->opaDList = sOpaDLists[type];
this->xluDList = sXluDLists[type];
this->dyna.actor.textId = sTextIds[type];
this->dyna.actor.focus.pos.y = this->dyna.actor.world.pos.y + 60.0f;
Actor_SetScale(&this->dyna.actor, 0.1f);
}
@ -85,16 +89,17 @@ void EnSekihi_Destroy(Actor* thisx, PlayState* play) {
void func_80A44DE8(EnSekihi* this, PlayState* play) {
CollisionHeader* colHeader = NULL;
s32 params;
s32 type;
CollisionHeader* colHeaders[] = {
&gSekihilCol, &gSekihigCol, &gSekihinCol, &gSekihizCol, &gObjectZogCol,
&gSunsSongGraveTriforceCol, &gSunsSongGraveGoronCol, &gSunsSongGraveKokiriCol,
&gSongOfSoaringPedestalCol, &gMikauGraveCol,
};
params = ENSIKIHI_GET_TYPE(&this->dyna.actor);
type = ENSIKIHI_GET_TYPE(&this->dyna.actor);
if (Object_IsLoaded(&play->objectCtx, this->objectIndex)) {
this->dyna.actor.objBankIndex = this->objectIndex;
this->dyna.actor.draw = EnSekihi_Draw;
if (params == SEKIHI_TYPE_4) {
if (type == SEKIHI_TYPE_4) {
this->actionFunc = func_80A450B0;
} else {
this->actionFunc = EnSekihi_DoNothing;
@ -102,12 +107,12 @@ void func_80A44DE8(EnSekihi* this, PlayState* play) {
Actor_SetObjectDependency(play, &this->dyna.actor);
DynaPolyActor_Init(&this->dyna, 0);
if (colHeaders[params] != NULL) {
CollisionHeader_GetVirtual(colHeaders[params], &colHeader);
if (colHeaders[type] != NULL) {
CollisionHeader_GetVirtual(colHeaders[type], &colHeader);
}
this->dyna.bgId = DynaPoly_SetBgActor(play, &play->colCtx.dyna, &this->dyna.actor, colHeader);
if ((params == SEKIHI_TYPE_4) && (INV_CONTENT(ITEM_MASK_ZORA) != ITEM_MASK_ZORA)) {
if ((type == SEKIHI_TYPE_4) && (INV_CONTENT(ITEM_MASK_ZORA) != ITEM_MASK_ZORA)) {
Actor_Kill(&this->dyna.actor);
}
}

2
src/overlays/actors/ovl_En_Tanron4/z_en_tanron4.c
View File

@ -48,7 +48,7 @@ void EnTanron4_Init(Actor* thisx, PlayState* play2) {
EnTanron4* this = THIS;
SkelAnime_InitFlex(play, &this->skelAnime, &gSeagullSkel, &gSeagullFlapAnim, this->jointTable, this->morphTable,
OBJECT_TANRON4_LIMB_MAX);
SEAGULL_LIMB_RIGHT_WING_MAX);
thisx->flags &= ~ACTOR_FLAG_1;
thisx->speed = 3.0f + KREG(48);

4
src/overlays/actors/ovl_En_Tanron4/z_en_tanron4.h
View File

@ -19,8 +19,8 @@ typedef struct EnTanron4 {
/* 0x15C */ s16 rollTarget;
/* 0x160 */ f32 timeInfluence;
/* 0x164 */ SkelAnime skelAnime;
/* 0x1A8 */ Vec3s jointTable[OBJECT_TANRON4_LIMB_MAX];
/* 0x1EA */ Vec3s morphTable[OBJECT_TANRON4_LIMB_MAX];
/* 0x1A8 */ Vec3s jointTable[SEAGULL_LIMB_RIGHT_WING_MAX];
/* 0x1EA */ Vec3s morphTable[SEAGULL_LIMB_RIGHT_WING_MAX];
/* 0x022C */ EnTanron4ActionFunc actionFunc;
} EnTanron4; // size = 0x230