mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-25 09:45:02 +00:00
Code Issues Projects Releases Wiki Activity

Doc object_rs (#1439)

Browse source
This commit is contained in:
Derek Hensley 2022-11-21 03:12:54 -08:00 committed by GitHub
parent 9cdd1678e2
commit 83c3b64b1c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 30 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
assets/xml/objects/object_rs.xml
View file

@ -1,32 +1,35 @@
<Root> <Root>
<File Name="object_rs" Segment="6"> <File Name="object_rs" Segment="6">
<Animation Name="object_rs_Anim_00065C" Offset="0x65C"/> <Animation Name="gBombchuShopkeeperIdleAnim" Offset="0x65C"/>
<DList Name="object_rs_DL_001FA0" Offset="0x1FA0"/>
<DList Name="object_rs_DL_0021F8" Offset="0x21F8"/> <DList Name="gBombchuShopkeeperTorsoDL" Offset="0x1FA0"/>
<DList Name="object_rs_DL_0025F8" Offset="0x25F8"/> <DList Name="gBombchuShopkeeperHeadDL" Offset="0x21F8"/>
<DList Name="object_rs_DL_002730" Offset="0x2730"/> <DList Name="gBombchuShopkeeperRightUpperArmDL" Offset="0x25F8"/>
<DList Name="object_rs_DL_002860" Offset="0x2860"/> <DList Name="gBombchuShopkeeperRightForearmDL" Offset="0x2730"/>
<DList Name="object_rs_DL_002A70" Offset="0x2A70"/> <DList Name="gBombchuShopkeeperRightHandDL" Offset="0x2860"/>
<DList Name="object_rs_DL_002BA8" Offset="0x2BA8"/> <DList Name="gBombchuShopkeeperLeftUpperArmDL" Offset="0x2A70"/>
<DList Name="object_rs_DL_002CD8" Offset="0x2CD8"/> <DList Name="gBombchuShopkeeperLeftForearmDL" Offset="0x2BA8"/>
<Texture Name="object_rs_TLUT_002EE8" OutName="tlut_00002EE8" Format="rgba16" Width="16" Height="16" Offset="0x2EE8"/> <DList Name="gBombchuShopkeeperLeftHandDL" Offset="0x2CD8"/>
<Texture Name="object_rs_Tex_0030E8" OutName="tex_000030E8" Format="ci8" Width="8" Height="8" Offset="0x30E8" TlutOffset="0x2EE8"/>
<Texture Name="object_rs_Tex_003128" OutName="tex_00003128" Format="ci8" Width="8" Height="8" Offset="0x3128" TlutOffset="0x2EE8"/> <Texture Name="gBombchuShopkeeperTLUT" OutName="tlut" Format="rgba16" Width="16" Height="16" Offset="0x2EE8"/>
<Texture Name="object_rs_Tex_003168" OutName="tex_00003168" Format="ci8" Width="32" Height="64" Offset="0x3168" TlutOffset="0x2EE8"/> <Texture Name="gBombchuShopkeeperSkinTex" OutName="skin" Format="ci8" Width="8" Height="8" Offset="0x30E8" TlutOffset="0x2EE8"/>
<Texture Name="gBombchuShopkeeperEarTex" OutName="ear" Format="ci8" Width="8" Height="8" Offset="0x3128" TlutOffset="0x2EE8"/>
<Texture Name="gBombchuShopkeeperTattooTex" OutName="tattoo" Format="ci8" Width="32" Height="64" Offset="0x3168" TlutOffset="0x2EE8"/>
<Texture Name="gBombchuShopkeeperEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x3968" TlutOffset="0x2EE8"/> <Texture Name="gBombchuShopkeeperEyeOpenTex" OutName="eye_open" Format="ci8" Width="32" Height="32" Offset="0x3968" TlutOffset="0x2EE8"/>
<Texture Name="gBombchuShopkeeperEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x3D68" TlutOffset="0x2EE8"/> <Texture Name="gBombchuShopkeeperEyeHalfTex" OutName="eye_half" Format="ci8" Width="32" Height="32" Offset="0x3D68" TlutOffset="0x2EE8"/>
<Texture Name="gBombchuShopkeeperEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x4168" TlutOffset="0x2EE8"/> <Texture Name="gBombchuShopkeeperEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x4168" TlutOffset="0x2EE8"/>
<Texture Name="object_rs_Tex_004568" OutName="tex_00004568" Format="ci8" Width="16" Height="16" Offset="0x4568" TlutOffset="0x2EE8"/> <Texture Name="gBombchuShopkeeperFingersTex" OutName="fingers" Format="ci8" Width="16" Height="16" Offset="0x4568" TlutOffset="0x2EE8"/>
<Texture Name="object_rs_Tex_004668" OutName="tex_00004668" Format="i8" Width="8" Height="16" Offset="0x4668"/> <Texture Name="gBombchuShopkeeperVestTex" OutName="vest" Format="i8" Width="8" Height="16" Offset="0x4668"/>
<Texture Name="object_rs_Tex_0046E8" OutName="tex_000046E8" Format="ci8" Width="8" Height="32" Offset="0x46E8" TlutOffset="0x2EE8"/> <Texture Name="gBombchuShopkeeperTorsoTex" OutName="torso" Format="ci8" Width="8" Height="32" Offset="0x46E8" TlutOffset="0x2EE8"/>
<Limb Name="object_rs_Limb_0047E8" LimbType="Standard" Offset="0x47E8"/>
<Limb Name="object_rs_Limb_0047F4" LimbType="Standard" Offset="0x47F4"/> <Limb Name="gBombchuShopkeeperTorsoLimb" LimbType="Standard" Offset="0x47E8"/>
<Limb Name="object_rs_Limb_004800" LimbType="Standard" Offset="0x4800"/> <Limb Name="gBombchuShopkeeperLeftUpperArmLimb" LimbType="Standard" Offset="0x47F4"/>
<Limb Name="object_rs_Limb_00480C" LimbType="Standard" Offset="0x480C"/> <Limb Name="gBombchuShopkeeperLeftForearmLimb" LimbType="Standard" Offset="0x4800"/>
<Limb Name="object_rs_Limb_004818" LimbType="Standard" Offset="0x4818"/> <Limb Name="gBombchuShopkeeperLeftHandLimb" LimbType="Standard" Offset="0x480C"/>
<Limb Name="object_rs_Limb_004824" LimbType="Standard" Offset="0x4824"/> <Limb Name="gBombchuShopkeeperRightUpperArmLimb" LimbType="Standard" Offset="0x4818"/>
<Limb Name="object_rs_Limb_004830" LimbType="Standard" Offset="0x4830"/> <Limb Name="gBombchuShopkeeperRightForearmLimb" LimbType="Standard" Offset="0x4824"/>
<Limb Name="object_rs_Limb_00483C" LimbType="Standard" Offset="0x483C"/> <Limb Name="gBombchuShopkeeperRightHandLimb" LimbType="Standard" Offset="0x4830"/>
<Skeleton Name="object_rs_Skel_004868" Type="Flex" LimbType="Standard" Offset="0x4868"/> <Limb Name="gBombchuShopkeeperHeadLimb" LimbType="Standard" Offset="0x483C"/>
<Skeleton Name="gBombchuShopkeeperSkel" Type="Flex" LimbType="Standard" Offset="0x4868"/>
</File> </File>
</Root> </Root>

2
src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c
View file

@ -1097,7 +1097,7 @@ void DemoEc_DrawFishingOwner(DemoEc* this, PlayState* play) {
void DemoEc_InitBombchuShopOwner(DemoEc* this, PlayState* play) { void DemoEc_InitBombchuShopOwner(DemoEc* this, PlayState* play) {
DemoEc_UseDrawObject(this, play); DemoEc_UseDrawObject(this, play);
DemoEc_InitSkelAnime(this, play, &object_rs_Skel_004868); DemoEc_InitSkelAnime(this, play, &gBombchuShopkeeperSkel);
DemoEc_UseAnimationObject(this, play); DemoEc_UseAnimationObject(this, play);
DemoEc_ChangeAnimation(this, &gDemoEcPotionShopOwnerAnim, 0, 0.0f, false); DemoEc_ChangeAnimation(this, &gDemoEcPotionShopOwnerAnim, 0, 0.0f, false);
func_8096D5D4(this, play); func_8096D5D4(this, play);

2
src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
View file

@ -2029,7 +2029,7 @@ void EnOssan_InitHappyMaskShopkeeper(EnOssan* this, PlayState* play) {
} }
void EnOssan_InitBombchuShopkeeper(EnOssan* this, PlayState* play) { void EnOssan_InitBombchuShopkeeper(EnOssan* this, PlayState* play) {
SkelAnime_InitFlex(play, &this->skelAnime, &object_rs_Skel_004868, &object_rs_Anim_00065C, NULL, NULL, 0); SkelAnime_InitFlex(play, &this->skelAnime, &gBombchuShopkeeperSkel, &gBombchuShopkeeperIdleAnim, NULL, NULL, 0);
this->actor.draw = EnOssan_DrawBombchuShopkeeper; this->actor.draw = EnOssan_DrawBombchuShopkeeper;
this->obj3ToSeg6Func = NULL; this->obj3ToSeg6Func = NULL;
} }