mirror of
https://github.com/izzy2lost/2ship2harkinian-Android.git
synced 2026-06-19 01:20:08 -07:00
ovl_En_Nb OK (#1030)
* mips2c general pass * EnNb_Init * EnNb_Destroy * EnNb_Update * draw functions * func_80BBFE8C * func_80BC0D84 non_matching * func_80BBFE60 and minor fixes * a bunch of functions * And another bunch * An attempt to the last function * import data * Match func_80BC0D84 * Use extracted symbols instead of hardcoded ones * Match last function * format * Update the reloc in the spec * regconvert and draw * Small docs pass * actorfixer and format * Minor renames * schedule * cleanups * namefixer * minor cleanups * yeet printing stuff * Schedule and anims cleanup * stateFlags * Name limbs and anims * Name more stuff in the asset * Finish naming simple stuff * format * merge fixes * Update src/overlays/actors/ovl_En_Nb/z_en_nb.h Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * Update src/overlays/actors/ovl_En_Nb/z_en_nb.h Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * Update src/overlays/actors/ovl_En_Nb/z_en_nb.h Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * Update src/overlays/actors/ovl_En_Nb/z_en_nb.c Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * EnNb_UpdateSkelAnime Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * fix typo * Update src/overlays/actors/ovl_En_Nb/z_en_nb.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Nb/z_en_nb.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * review Co-authored-by: engineer124 <engineer124engineer124@gmail.com> * MTXMODE_APPLY * review Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * format * Update src/overlays/actors/ovl_En_Nb/z_en_nb.h Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * Update src/overlays/actors/ovl_En_Nb/z_en_nb.h Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * Update src/overlays/actors/ovl_En_Nb/z_en_nb.h Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * review Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * review Co-authored-by: engineer124 <engineer124engineer124@gmail.com> * clamps Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> Co-authored-by: engineer124 <engineer124engineer124@gmail.com> Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
This commit is contained in:
Anghelo Carvajal
co-authored by
Derek Hensley
engineer124
engineer124
EllipticEllipsis
Derek Hensley
engineer124
engineer124
EllipticEllipsis
parent
7b572e8c53
commit
92d93701a9
@@ -1,46 +1,58 @@
|
||||
<Root>
|
||||
<!-- Assets for Anju's Grandma -->
|
||||
<File Name="object_nb" Segment="6">
|
||||
<Animation Name="object_nb_Anim_000290" Offset="0x290" />
|
||||
<Animation Name="object_nb_Anim_00052C" Offset="0x52C" />
|
||||
<Animation Name="object_nb_Anim_0006D4" Offset="0x6D4" />
|
||||
<Animation Name="object_nb_Anim_000990" Offset="0x990" />
|
||||
<DList Name="object_nb_DL_004A70" Offset="0x4A70" />
|
||||
<DList Name="object_nb_DL_005170" Offset="0x5170" />
|
||||
<DList Name="object_nb_DL_005430" Offset="0x5430" />
|
||||
<DList Name="object_nb_DL_0056F0" Offset="0x56F0" />
|
||||
<DList Name="object_nb_DL_005988" Offset="0x5988" />
|
||||
<DList Name="object_nb_DL_005AA8" Offset="0x5AA8" />
|
||||
<DList Name="object_nb_DL_006390" Offset="0x6390" />
|
||||
<!-- Anju's Grandma Animations-->
|
||||
<Animation Name="gNbTalkAnim" Offset="0x290" />
|
||||
<Animation Name="gNbAngryAnim" Offset="0x52C" />
|
||||
<Animation Name="gNbRelievedAnim" Offset="0x6D4" />
|
||||
<Animation Name="gNbIdleAnim" Offset="0x990" />
|
||||
|
||||
<!-- Anju's Grandma DisplayLists -->
|
||||
<DList Name="gNbWheelchairDL" Offset="0x4A70" /> <!-- Includes legs -->
|
||||
<DList Name="gNbRightWheelDL" Offset="0x5170" />
|
||||
<DList Name="gNbLeftWheelDL" Offset="0x5430" />
|
||||
<DList Name="gNbTorsoDL" Offset="0x56F0" />
|
||||
<DList Name="gNbNeckDL" Offset="0x5988" />
|
||||
<DList Name="gNbHeadDL" Offset="0x5AA8" />
|
||||
<DList Name="gNbArmsBookDL" Offset="0x6390" />
|
||||
|
||||
<!-- Anju's Grandma TLUTs -->
|
||||
<Texture Name="object_nb_TLUT_006910" OutName="tlut_006910" Format="rgba16" Width="16" Height="16" Offset="0x6910" />
|
||||
<Texture Name="object_nb_TLUT_006B10" OutName="tlut_006B10" Format="rgba16" Width="16" Height="16" Offset="0x6B10" />
|
||||
<Texture Name="object_nb_TLUT_006D10" OutName="tlut_006D10" Format="rgba16" Width="16" Height="16" Offset="0x6D10" />
|
||||
<Texture Name="object_nb_Tex_006F10" OutName="tex_006F10" Format="ci8" Width="8" Height="8" Offset="0x6F10" />
|
||||
<Texture Name="object_nb_Tex_006F50" OutName="tex_006F50" Format="ci8" Width="16" Height="16" Offset="0x6F50" />
|
||||
<Texture Name="object_nb_Tex_007050" OutName="tex_007050" Format="ci8" Width="16" Height="16" Offset="0x7050" />
|
||||
<Texture Name="object_nb_Tex_007150" OutName="tex_007150" Format="ci8" Width="16" Height="8" Offset="0x7150" />
|
||||
<Texture Name="object_nb_Tex_0071D0" OutName="tex_0071D0" Format="ci8" Width="16" Height="32" Offset="0x71D0" />
|
||||
<Texture Name="object_nb_Tex_0073D0" OutName="tex_0073D0" Format="ci8" Width="16" Height="8" Offset="0x73D0" />
|
||||
<Texture Name="object_nb_Tex_007450" OutName="tex_007450" Format="ci8" Width="16" Height="8" Offset="0x7450" />
|
||||
<Texture Name="object_nb_Tex_0074D0" OutName="tex_0074D0" Format="ci8" Width="16" Height="8" Offset="0x74D0" />
|
||||
<Texture Name="object_nb_Tex_007550" OutName="tex_007550" Format="ci8" Width="16" Height="16" Offset="0x7550" />
|
||||
<Texture Name="gNbTigerTLUT" OutName="nb_tiger_tlut" Format="rgba16" Width="16" Height="16" Offset="0x6D10" />
|
||||
|
||||
<!-- Anju's Grandma Textures -->
|
||||
<Texture Name="gNbSkinTex" OutName="nb_skin" Format="ci8" Width="8" Height="8" Offset="0x6F10" TlutOffset="0x6910" />
|
||||
<Texture Name="gNbEarTex" OutName="nb_ear" Format="ci8" Width="16" Height="16" Offset="0x6F50" TlutOffset="0x6910" />
|
||||
<Texture Name="object_nb_Tex_007050" OutName="tex_007050" Format="ci8" Width="16" Height="16" Offset="0x7050" TlutOffset="0x6910" />
|
||||
<Texture Name="gNbUpperEyelidTex" OutName="nb_upper_eyelid" Format="ci8" Width="16" Height="8" Offset="0x7150" TlutOffset="0x6910" />
|
||||
<Texture Name="gNbHairTex" OutName="nb_hair" Format="ci8" Width="16" Height="32" Offset="0x71D0" TlutOffset="0x6B10" />
|
||||
<Texture Name="gNbEyeTex" OutName="nb_eye" Format="ci8" Width="16" Height="8" Offset="0x73D0" TlutOffset="0x6910" />
|
||||
<Texture Name="gNbLowerEyelidTex" OutName="nb_lower_eyelid" Format="ci8" Width="16" Height="8" Offset="0x7450" TlutOffset="0x6910" />
|
||||
<Texture Name="object_nb_Tex_0074D0" OutName="tex_0074D0" Format="ci8" Width="16" Height="8" Offset="0x74D0" TlutOffset="0x6D10" />
|
||||
<Texture Name="object_nb_Tex_007550" OutName="tex_007550" Format="ci8" Width="16" Height="16" Offset="0x7550" TlutOffset="0x6B10" />
|
||||
<Texture Name="object_nb_Tex_007650" OutName="tex_007650" Format="i8" Width="16" Height="16" Offset="0x7650" />
|
||||
<Texture Name="object_nb_Tex_007750" OutName="tex_007750" Format="rgba16" Width="8" Height="8" Offset="0x7750" />
|
||||
<Texture Name="object_nb_Tex_0077D0" OutName="tex_0077D0" Format="ci8" Width="16" Height="16" Offset="0x77D0" />
|
||||
<Texture Name="object_nb_Tex_0078D0" OutName="tex_0078D0" Format="ci8" Width="16" Height="16" Offset="0x78D0" />
|
||||
<Texture Name="object_nb_Tex_0079D0" OutName="tex_0079D0" Format="ci8" Width="32" Height="16" Offset="0x79D0" />
|
||||
<Texture Name="object_nb_Tex_007BD0" OutName="tex_007BD0" Format="ci8" Width="16" Height="16" Offset="0x7BD0" />
|
||||
<Texture Name="object_nb_Tex_007CD0" OutName="tex_007CD0" Format="ci8" Width="16" Height="16" Offset="0x7CD0" />
|
||||
<Texture Name="object_nb_Tex_007DD0" OutName="tex_007DD0" Format="ci8" Width="16" Height="16" Offset="0x7DD0" />
|
||||
<Texture Name="object_nb_Tex_007ED0" OutName="tex_007ED0" Format="ci8" Width="16" Height="16" Offset="0x7ED0" />
|
||||
<Texture Name="object_nb_Tex_007FD0" OutName="tex_007FD0" Format="ci8" Width="32" Height="64" Offset="0x7FD0" />
|
||||
<Texture Name="object_nb_Tex_0087D0" OutName="tex_0087D0" Format="ci8" Width="32" Height="32" Offset="0x87D0" />
|
||||
<Limb Name="object_nb_Standardlimb_008BD0" Type="Standard" EnumName="OBJECT_NB_LIMB_01" Offset="0x8BD0" />
|
||||
<Limb Name="object_nb_Standardlimb_008BDC" Type="Standard" EnumName="OBJECT_NB_LIMB_02" Offset="0x8BDC" />
|
||||
<Limb Name="object_nb_Standardlimb_008BE8" Type="Standard" EnumName="OBJECT_NB_LIMB_03" Offset="0x8BE8" />
|
||||
<Limb Name="object_nb_Standardlimb_008BF4" Type="Standard" EnumName="OBJECT_NB_LIMB_04" Offset="0x8BF4" />
|
||||
<Limb Name="object_nb_Standardlimb_008C00" Type="Standard" EnumName="OBJECT_NB_LIMB_05" Offset="0x8C00" />
|
||||
<Limb Name="object_nb_Standardlimb_008C0C" Type="Standard" EnumName="OBJECT_NB_LIMB_06" Offset="0x8C0C" />
|
||||
<Limb Name="object_nb_Standardlimb_008C18" Type="Standard" EnumName="OBJECT_NB_LIMB_07" Offset="0x8C18" />
|
||||
<Skeleton Name="object_nb_Skel_008C40" Type="Flex" LimbType="Standard" LimbNone="OBJECT_NB_LIMB_NONE" LimbMax="OBJECT_NB_LIMB_MAX" EnumName="ObjectNbLimb" Offset="0x8C40" />
|
||||
<Texture Name="object_nb_Tex_0077D0" OutName="tex_0077D0" Format="ci8" Width="16" Height="16" Offset="0x77D0" TlutOffset="0x6B10" />
|
||||
<Texture Name="object_nb_Tex_0078D0" OutName="tex_0078D0" Format="ci8" Width="16" Height="16" Offset="0x78D0" TlutOffset="0x6B10" />
|
||||
<Texture Name="object_nb_Tex_0079D0" OutName="tex_0079D0" Format="ci8" Width="32" Height="16" Offset="0x79D0" TlutOffset="0x6B10" />
|
||||
<Texture Name="gNbBookCoverTex" OutName="nb_book_cover" Format="ci8" Width="16" Height="16" Offset="0x7BD0" TlutOffset="0x6B10" />
|
||||
<Texture Name="gNbSkirtTex" OutName="nb_skirt" Format="ci8" Width="16" Height="16" Offset="0x7CD0" TlutOffset="0x6910" />
|
||||
<Texture Name="gNbBookPageTex" OutName="nb_book_page" Format="ci8" Width="16" Height="16" Offset="0x7DD0" TlutOffset="0x6D10" />
|
||||
<Texture Name="gNbFingersTex" OutName="nb_fingers" Format="ci8" Width="16" Height="16" Offset="0x7ED0" TlutOffset="0x6910" />
|
||||
<Texture Name="gNbTigerTex" OutName="nb_tiger" Format="ci8" Width="32" Height="64" Offset="0x7FD0" TlutOffset="0x6D10" />
|
||||
<Texture Name="object_nb_Tex_0087D0" OutName="tex_0087D0" Format="ci8" Width="32" Height="32" Offset="0x87D0" TlutOffset="0x6B10" />
|
||||
|
||||
<!-- Anju's Grandma Limbs -->
|
||||
<Limb Name="gNbWheelchairLimb" Type="Standard" EnumName="NB_LIMB_WHEELCHAIR" Offset="0x8BD0" />
|
||||
<Limb Name="gNbTorsoLimb" Type="Standard" EnumName="NB_LIMB_TORSO" Offset="0x8BDC" />
|
||||
<Limb Name="gNbArmsBookLimb" Type="Standard" EnumName="NB_LIMB_ARMS_BOOK" Offset="0x8BE8" />
|
||||
<Limb Name="gNbNeckLimb" Type="Standard" EnumName="NB_LIMB_NECK" Offset="0x8BF4" />
|
||||
<Limb Name="gNbHeadLimb" Type="Standard" EnumName="NB_LIMB_HEAD" Offset="0x8C00" />
|
||||
<Limb Name="gNbLeftWheelLimb" Type="Standard" EnumName="NB_LIMB_LEFT_WHEEL" Offset="0x8C0C" />
|
||||
<Limb Name="gNbRightWheelLimb" Type="Standard" EnumName="NB_LIMB_RIGHT_WHEEL" Offset="0x8C18" />
|
||||
|
||||
<!-- Anju's Grandma Skeleton -->
|
||||
<Skeleton Name="gNbSkel" Type="Flex" LimbType="Standard" LimbNone="NB_LIMB_NONE" LimbMax="NB_LIMB_MAX" EnumName="NbLimb" Offset="0x8C40" />
|
||||
</File>
|
||||
</Root>
|
||||
|
||||
Reference in New Issue
Block a user