mirror of https://github.com/zeldaret/mm.git
obj_tab (#1495)
* obj_tab * obj_tab update removed (actorfunc) and moved the LIMB enum * object_tab update * PR Review --------- Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
This commit is contained in:
Wimmer
GitHub
parent
fdd3f17385
commit
bd596f9869
|
|
@ -1,63 +1,64 @@
|
|||
<Root>
|
||||
<Root>
|
||||
<!-- Assets for Barten, the Milk Bar Bartender -->
|
||||
<File Name="object_tab" Segment="6">
|
||||
<Animation Name="object_tab_Anim_000758" Offset="0x758" />
|
||||
<DList Name="object_tab_DL_003E10" Offset="0x3E10" />
|
||||
<DList Name="object_tab_DL_003EF0" Offset="0x3EF0" />
|
||||
<DList Name="object_tab_DL_004270" Offset="0x4270" />
|
||||
<DList Name="object_tab_DL_004438" Offset="0x4438" />
|
||||
<DList Name="object_tab_DL_0046C8" Offset="0x46C8" />
|
||||
<DList Name="object_tab_DL_0047F8" Offset="0x47F8" />
|
||||
<DList Name="object_tab_DL_004B70" Offset="0x4B70" />
|
||||
<DList Name="object_tab_DL_004E00" Offset="0x4E00" />
|
||||
<DList Name="object_tab_DL_004F30" Offset="0x4F30" />
|
||||
<DList Name="object_tab_DL_005178" Offset="0x5178" />
|
||||
<DList Name="object_tab_DL_005668" Offset="0x5668" />
|
||||
<DList Name="object_tab_DL_005758" Offset="0x5758" />
|
||||
<DList Name="object_tab_DL_005840" Offset="0x5840" />
|
||||
<DList Name="object_tab_DL_005988" Offset="0x5988" />
|
||||
<DList Name="object_tab_DL_005A78" Offset="0x5A78" />
|
||||
<DList Name="object_tab_DL_005B60" Offset="0x5B60" />
|
||||
<Texture Name="object_tab_TLUT_005CA8" OutName="tlut_005CA8" Format="rgba16" Width="16" Height="16" Offset="0x5CA8" />
|
||||
<Texture Name="object_tab_Tex_005EA8" OutName="tex_005EA8" Format="rgba16" Width="16" Height="16" Offset="0x5EA8" />
|
||||
<Texture Name="object_tab_Tex_0060A8" OutName="tex_0060A8" Format="ci8" Width="8" Height="16" Offset="0x60A8" />
|
||||
<Texture Name="object_tab_Tex_006128" OutName="tex_006128" Format="ci8" Width="16" Height="32" Offset="0x6128" />
|
||||
<Texture Name="object_tab_Tex_006328" OutName="tex_006328" Format="ci8" Width="8" Height="8" Offset="0x6328" />
|
||||
<Texture Name="object_tab_Tex_006368" OutName="tex_006368" Format="ci8" Width="8" Height="16" Offset="0x6368" />
|
||||
<Texture Name="object_tab_Tex_0063E8" OutName="tex_0063E8" Format="ci8" Width="8" Height="8" Offset="0x63E8" />
|
||||
<Texture Name="object_tab_Tex_006428" OutName="tex_006428" Format="ci8" Width="32" Height="32" Offset="0x6428" />
|
||||
<Texture Name="object_tab_Tex_006828" OutName="tex_006828" Format="ci8" Width="16" Height="16" Offset="0x6828" />
|
||||
<Texture Name="object_tab_Tex_006928" OutName="tex_006928" Format="ci8" Width="32" Height="32" Offset="0x6928" />
|
||||
<Texture Name="object_tab_Tex_006D28" OutName="tex_006D28" Format="ci8" Width="32" Height="32" Offset="0x6D28" />
|
||||
<Texture Name="object_tab_Tex_007128" OutName="tex_007128" Format="ci8" Width="16" Height="16" Offset="0x7128" />
|
||||
<Texture Name="object_tab_Tex_007228" OutName="tex_007228" Format="ci8" Width="16" Height="16" Offset="0x7228" />
|
||||
<Texture Name="object_tab_Tex_007328" OutName="tex_007328" Format="i8" Width="32" Height="32" Offset="0x7328" />
|
||||
<Texture Name="object_tab_Tex_007728" OutName="tex_007728" Format="rgba16" Width="8" Height="16" Offset="0x7728" />
|
||||
<Texture Name="object_tab_Tex_007828" OutName="tex_007828" Format="ci8" Width="8" Height="8" Offset="0x7828" />
|
||||
<Texture Name="object_tab_Tex_007868" OutName="tex_007868" Format="ci8" Width="8" Height="16" Offset="0x7868" />
|
||||
<Texture Name="object_tab_Tex_0078E8" OutName="tex_0078E8" Format="i8" Width="16" Height="16" Offset="0x78E8" />
|
||||
<Texture Name="object_tab_Tex_0079E8" OutName="tex_0079E8" Format="i8" Width="8" Height="8" Offset="0x79E8" />
|
||||
<Texture Name="object_tab_Tex_007A28" OutName="tex_007A28" Format="rgba16" Width="16" Height="16" Offset="0x7A28" />
|
||||
<Animation Name="gBartenIdleAnim" Offset="0x758" />
|
||||
<DList Name="gBartenPelvisDL" Offset="0x3E10" />
|
||||
<DList Name="gBartenLeftHandDL" Offset="0x3EF0" />
|
||||
<DList Name="gBartenLeftBroomDL" Offset="0x4270" />
|
||||
<DList Name="gBartenLeftForearmDL" Offset="0x4438" />
|
||||
<DList Name="gBartenLeftUpperArmDL" Offset="0x46C8" />
|
||||
<DList Name="gBartenRightHandDL" Offset="0x47F8" />
|
||||
<DList Name="gBartenRightForearmDL" Offset="0x4B70" />
|
||||
<DList Name="gBartenRightUpperArmDL" Offset="0x4E00" />
|
||||
<DList Name="gBartenChestDL" Offset="0x4F30" />
|
||||
<DList Name="gBartenHeadDL" Offset="0x5178" />
|
||||
<DList Name="gBartenLeftThighDL" Offset="0x5668" />
|
||||
<DList Name="gBartenLeftLegDL" Offset="0x5758" />
|
||||
<DList Name="gBartenLeftFootDL" Offset="0x5840" />
|
||||
<DList Name="gBartenRightThighDL" Offset="0x5988" />
|
||||
<DList Name="gBartenRightLegDL" Offset="0x5A78" />
|
||||
<DList Name="gBartenRightFootDL" Offset="0x5B60" />
|
||||
<Texture Name="gBartenTLUT" OutName="barten_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5CA8" />
|
||||
<Texture Name="gBartenEyeTLUT" OutName="barten_eye_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5EA8" />
|
||||
<Texture Name="gBartenBeardTex" OutName="barten_beard" Format="ci8" Width="8" Height="16" Offset="0x60A8" />
|
||||
<Texture Name="gBartenArmTex" OutName="barten_arm" Format="ci8" Width="16" Height="32" Offset="0x6128" />
|
||||
<Texture Name="gBartenMouthTex" OutName="barten_mouth" Format="ci8" Width="8" Height="8" Offset="0x6328" />
|
||||
<Texture Name="gBartenHairTex" OutName="barten_hair" Format="ci8" Width="8" Height="16" Offset="0x6368" />
|
||||
<Texture Name="gBartenEarTex" OutName="barten_ear" Format="ci8" Width="8" Height="8" Offset="0x63E8" />
|
||||
<Texture Name="gBartenEyeOpenTex" OutName="barten_eye_open" Format="ci8" Width="32" Height="32" Offset="0x6428" />
|
||||
<Texture Name="gBartenHandTex" OutName="barten_hand" Format="ci8" Width="16" Height="16" Offset="0x6828" />
|
||||
<Texture Name="gBartenEyeHalfOpenTex" OutName="barten_eye_half_open" Format="ci8" Width="32" Height="32" Offset="0x6928" />
|
||||
<Texture Name="gBartenEyeClosedTex" OutName="barten_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x6D28" />
|
||||
<Texture Name="gBartenBroomTex" OutName="barten_broom" Format="ci8" Width="16" Height="16" Offset="0x7128" />
|
||||
<Texture Name="gBartenBroomHeadTex" OutName="barten_broom_head" Format="ci8" Width="16" Height="16" Offset="0x7228" />
|
||||
<Texture Name="gBartenPantsTex" OutName="barten_pants" Format="i8" Width="32" Height="32" Offset="0x7328" />
|
||||
<Texture Name="gBartenBowtieTex" OutName="barten_bowtie" Format="rgba16" Width="8" Height="16" Offset="0x7728" />
|
||||
<Texture Name="gBartenSkinTex" OutName="barten_skin" Format="ci8" Width="8" Height="8" Offset="0x7828" />
|
||||
<Texture Name="gBartenCollarTex" OutName="barten_collar" Format="ci8" Width="8" Height="16" Offset="0x7868" />
|
||||
<Texture Name="gBartenSleeveTex" OutName="barten_sleeve" Format="i8" Width="16" Height="16" Offset="0x78E8" />
|
||||
<Texture Name="gBartenJacketTex" OutName="barten_jacket" Format="i8" Width="8" Height="8" Offset="0x79E8" />
|
||||
<Texture Name="gBartenFootTex" OutName="barten_foot" Format="rgba16" Width="16" Height="16" Offset="0x7A28" />
|
||||
<!-- <Blob Name="object_tab_Blob_007C28" Size="0x220" Offset="0x7C28" /> -->
|
||||
<Limb Name="object_tab_Standardlimb_007E48" Type="Standard" EnumName="OBJECT_TAB_LIMB_01" Offset="0x7E48" />
|
||||
<Limb Name="object_tab_Standardlimb_007E54" Type="Standard" EnumName="OBJECT_TAB_LIMB_02" Offset="0x7E54" />
|
||||
<Limb Name="object_tab_Standardlimb_007E60" Type="Standard" EnumName="OBJECT_TAB_LIMB_03" Offset="0x7E60" />
|
||||
<Limb Name="object_tab_Standardlimb_007E6C" Type="Standard" EnumName="OBJECT_TAB_LIMB_04" Offset="0x7E6C" />
|
||||
<Limb Name="object_tab_Standardlimb_007E78" Type="Standard" EnumName="OBJECT_TAB_LIMB_05" Offset="0x7E78" />
|
||||
<Limb Name="object_tab_Standardlimb_007E84" Type="Standard" EnumName="OBJECT_TAB_LIMB_06" Offset="0x7E84" />
|
||||
<Limb Name="object_tab_Standardlimb_007E90" Type="Standard" EnumName="OBJECT_TAB_LIMB_07" Offset="0x7E90" />
|
||||
<Limb Name="object_tab_Standardlimb_007E9C" Type="Standard" EnumName="OBJECT_TAB_LIMB_08" Offset="0x7E9C" />
|
||||
<Limb Name="object_tab_Standardlimb_007EA8" Type="Standard" EnumName="OBJECT_TAB_LIMB_09" Offset="0x7EA8" />
|
||||
<Limb Name="object_tab_Standardlimb_007EB4" Type="Standard" EnumName="OBJECT_TAB_LIMB_0A" Offset="0x7EB4" />
|
||||
<Limb Name="object_tab_Standardlimb_007EC0" Type="Standard" EnumName="OBJECT_TAB_LIMB_0B" Offset="0x7EC0" />
|
||||
<Limb Name="object_tab_Standardlimb_007ECC" Type="Standard" EnumName="OBJECT_TAB_LIMB_0C" Offset="0x7ECC" />
|
||||
<Limb Name="object_tab_Standardlimb_007ED8" Type="Standard" EnumName="OBJECT_TAB_LIMB_0D" Offset="0x7ED8" />
|
||||
<Limb Name="object_tab_Standardlimb_007EE4" Type="Standard" EnumName="OBJECT_TAB_LIMB_0E" Offset="0x7EE4" />
|
||||
<Limb Name="object_tab_Standardlimb_007EF0" Type="Standard" EnumName="OBJECT_TAB_LIMB_0F" Offset="0x7EF0" />
|
||||
<Limb Name="object_tab_Standardlimb_007EFC" Type="Standard" EnumName="OBJECT_TAB_LIMB_10" Offset="0x7EFC" />
|
||||
<Limb Name="object_tab_Standardlimb_007F08" Type="Standard" EnumName="OBJECT_TAB_LIMB_11" Offset="0x7F08" />
|
||||
<Limb Name="object_tab_Standardlimb_007F14" Type="Standard" EnumName="OBJECT_TAB_LIMB_12" Offset="0x7F14" />
|
||||
<Limb Name="object_tab_Standardlimb_007F20" Type="Standard" EnumName="OBJECT_TAB_LIMB_13" Offset="0x7F20" />
|
||||
<Skeleton Name="object_tab_Skel_007F78" Type="Flex" LimbType="Standard" LimbNone="OBJECT_TAB_LIMB_NONE" LimbMax="OBJECT_TAB_LIMB_MAX" EnumName="ObjectTabLimb" Offset="0x7F78" />
|
||||
<Animation Name="object_tab_Anim_0086AC" Offset="0x86AC" />
|
||||
<Limb Name="gBartenPelvisLimb" Type="Standard" EnumName="BARTEN_LIMB_PELVIS" Offset="0x7E48" />
|
||||
<Limb Name="gBartenRightThighLimb" Type="Standard" EnumName="BARTEN_LIMB_RIGHT_THIGH" Offset="0x7E54" />
|
||||
<Limb Name="gBartenRightLegLimb" Type="Standard" EnumName="BARTEN_LIMB_RIGHT_LEG" Offset="0x7E60" />
|
||||
<Limb Name="gBartenRightFootLimb" Type="Standard" EnumName="BARTEN_LIMB_RIGHT_FOOT" Offset="0x7E6C" />
|
||||
<Limb Name="gBartenLeftThighLimb" Type="Standard" EnumName="BARTEN_LIMB_LEFT_THIGH" Offset="0x7E78" />
|
||||
<Limb Name="gBartenLeftLegLimb" Type="Standard" EnumName="BARTEN_LIMB_LEFT_LEG" Offset="0x7E84" />
|
||||
<Limb Name="gBartenLeftFootLimb" Type="Standard" EnumName="BARTEN_LIMB_LEFT_FOOT" Offset="0x7E90" />
|
||||
<Limb Name="gBartenChestLimb" Type="Standard" EnumName="BARTEN_LIMB_CHEST" Offset="0x7E9C" />
|
||||
<Limb Name="gBartenHeadLimb" Type="Standard" EnumName="BARTEN_LIMB_HEAD" Offset="0x7EA8" />
|
||||
<Limb Name="gBartenRightUpperArmLimb" Type="Standard" EnumName="BARTEN_LIMB_RIGHT_UPPER_ARM" Offset="0x7EB4" />
|
||||
<Limb Name="gBartenRightForearmRootLimb" Type="Standard" EnumName="BARTEN_LIMB_RIGHT_FOREARM_ROOT" Offset="0x7EC0" />
|
||||
<Limb Name="gBartenRightForearmLimb" Type="Standard" EnumName="BARTEN_LIMB_RIGHT_FOREARM" Offset="0x7ECC" />
|
||||
<Limb Name="gBartenRightHandLimb" Type="Standard" EnumName="BARTEN_LIMB_RIGHT_HAND" Offset="0x7ED8" />
|
||||
<Limb Name="gBartenLeftArmRootLimb" Type="Standard" EnumName="BARTEN_LIMB_LEFT_ARM_ROOT" Offset="0x7EE4" />
|
||||
<Limb Name="gBartenLeftUpperArmLimb" Type="Standard" EnumName="BARTEN_LIMB_LEFT_UPPER_ARM" Offset="0x7EF0" />
|
||||
<Limb Name="gBartenLeftForearmLimb" Type="Standard" EnumName="BARTEN_LIMB_LEFT_FOREARM" Offset="0x7EFC" />
|
||||
<Limb Name="gBartenLeftHandRootLimb" Type="Standard" EnumName="BARTEN_LIMB_LEFT_HAND_ROOT" Offset="0x7F08" />
|
||||
<Limb Name="gBartenLeftBroomLimb" Type="Standard" EnumName="BARTEN_LIMB_LEFT_BROOM" Offset="0x7F14" />
|
||||
<Limb Name="gBartenLeftHandLimb" Type="Standard" EnumName="BARTEN_LIMB_LEFT_HAND" Offset="0x7F20" />
|
||||
<Skeleton Name="gBartenSkel" Type="Flex" LimbType="Standard" LimbNone="BARTEN_LIMB_NONE" LimbMax="BARTEN_LIMB_MAX" EnumName="BartenLimb" Offset="0x7F78" />
|
||||
<Animation Name="gBartenIdleBarCounterAnim" Offset="0x86AC" />
|
||||
</File>
|
||||
</Root>
|
||||
|
|
|
|||
|
|
@ -85,8 +85,8 @@ static ColliderCylinderInit sCylinderInit = {
|
|||
static CollisionCheckInfoInit2 sColChkInfoInit = { 0, 0, 0, 0, MASS_IMMOVABLE };
|
||||
|
||||
AnimationInfoS D_80BE1AD0[] = {
|
||||
{ &object_tab_Anim_000758, 1.0f, 0, -1, 0, 0 },
|
||||
{ &object_tab_Anim_0086AC, 1.0f, 0, -1, 0, 0 },
|
||||
{ &gBartenIdleAnim, 1.0f, 0, -1, ANIMMODE_LOOP, 0 },
|
||||
{ &gBartenIdleBarCounterAnim, 1.0f, 0, -1, ANIMMODE_LOOP, 0 },
|
||||
};
|
||||
|
||||
Vec3f D_80BE1AF0 = { -28.0f, -8.0f, -195.0f };
|
||||
|
|
@ -99,11 +99,11 @@ Vec3s D_80BE1B10 = { 0, 0xC000, 0 };
|
|||
|
||||
Vec3f D_80BE1B18 = { 800.0f, 0.0f, 0.0f };
|
||||
|
||||
TexturePtr D_80BE1B24[] = {
|
||||
object_tab_Tex_006428,
|
||||
object_tab_Tex_006928,
|
||||
object_tab_Tex_006D28,
|
||||
object_tab_Tex_006928,
|
||||
static TexturePtr sEyeTextures[] = {
|
||||
gBartenEyeOpenTex,
|
||||
gBartenEyeHalfOpenTex,
|
||||
gBartenEyeClosedTex,
|
||||
gBartenEyeHalfOpenTex,
|
||||
};
|
||||
|
||||
Actor* EnTab_FindActor(EnTab* this, PlayState* play, u8 actorCategory, s16 actorId) {
|
||||
|
|
@ -497,7 +497,7 @@ void EnTab_Init(Actor* thisx, PlayState* play) {
|
|||
EnTab* this = THIS;
|
||||
|
||||
ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 14.0f);
|
||||
SkelAnime_InitFlex(play, &this->skelAnime, &object_tab_Skel_007F78, NULL, this->jointTable, this->morphTable, 20);
|
||||
SkelAnime_InitFlex(play, &this->skelAnime, &gBartenSkel, NULL, this->jointTable, this->morphTable, BARTEN_LIMB_MAX);
|
||||
this->unk_32C = -1;
|
||||
func_80BE05BC(this, 0);
|
||||
Collider_InitAndSetCylinder(play, &this->collider, &this->actor, &sCylinderInit);
|
||||
|
|
@ -605,7 +605,7 @@ void EnTab_Draw(Actor* thisx, PlayState* play) {
|
|||
|
||||
Gfx_SetupDL25_Opa(play->state.gfxCtx);
|
||||
|
||||
gSPSegment(POLY_OPA_DISP++, 0x08, Lib_SegmentedToVirtual(D_80BE1B24[this->unk_31E]));
|
||||
gSPSegment(POLY_OPA_DISP++, 0x08, Lib_SegmentedToVirtual(sEyeTextures[this->unk_31E]));
|
||||
|
||||
SkelAnime_DrawTransformFlexOpa(play, this->skelAnime.skeleton, this->skelAnime.jointTable,
|
||||
this->skelAnime.dListCount, EnTab_OverrideLimbDraw, EnTab_PostLimbDraw,
|
||||
|
|
|
|||
Loading…
Reference in New Issue