izzy/2ship2harkinian-Android
0
0
Fork 0
mirror of https://github.com/izzy2lost/2ship2harkinian-Android.git synced 2026-06-19 01:20:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into parameter

Browse Source
This commit is contained in:
engineer124
2022-05-23 16:42:19 +10:00
parent 43278f57c3 e67fb5cf16
commit 59e14829c5
55 changed files with 2758 additions and 969 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/xml/interface/do_action_static.xml
+57
View File
@@ -0,0 +1,57 @@
<Root>
<File Name="do_action_static" Segment="9">
<Texture Name="gDoActionAttackENGTex" OutName="attack_eng" Format="ia4" Width="48" Height="16" Offset="0x0"/>
<Texture Name="gDoActionCheckENGTex" OutName="check_eng" Format="ia4" Width="48" Height="16" Offset="0x180"/>
<Texture Name="gDoActionEnterENGTex" OutName="enter_eng" Format="ia4" Width="48" Height="16" Offset="0x300"/>
<Texture Name="gDoActionReturnENGTex" OutName="return_eng" Format="ia4" Width="48" Height="16" Offset="0x480"/>
<Texture Name="gDoActionOpenENGTex" OutName="open_eng" Format="ia4" Width="48" Height="16" Offset="0x600"/>
<Texture Name="gDoActionJumpENGTex" OutName="jump_eng" Format="ia4" Width="48" Height="16" Offset="0x780"/>
<Texture Name="gDoActionDecideENGTex" OutName="decide_eng" Format="ia4" Width="48" Height="16" Offset="0x900"/>
<Texture Name="gDoActionDiveENGTex" OutName="dive_eng" Format="ia4" Width="48" Height="16" Offset="0xA80"/>
<Texture Name="gDoActionFasterENGTex" OutName="faster_eng" Format="ia4" Width="48" Height="16" Offset="0xC00"/>
<Texture Name="gDoActionThrowENGTex" OutName="throw_eng" Format="ia4" Width="48" Height="16" Offset="0xD80"/>
<!-- Unused and left untranslated from Japanese -->
<Texture Name="gDoActionNaviENGTex" OutName="navi_eng" Format="ia4" Width="48" Height="16" Offset="0xF00"/>
<Texture Name="gDoActionClimbENGTex" OutName="climb_eng" Format="ia4" Width="48" Height="16" Offset="0x1080"/>
<Texture Name="gDoActionDropENGTex" OutName="drop_eng" Format="ia4" Width="48" Height="16" Offset="0x1200"/>
<Texture Name="gDoActionDownENGTex" OutName="down_eng" Format="ia4" Width="48" Height="16" Offset="0x1380"/>
<Texture Name="gDoActionQuitENGTex" OutName="quit_eng" Format="ia4" Width="48" Height="16" Offset="0x1500"/>
<Texture Name="gDoActionSpeakENGTex" OutName="speak_eng" Format="ia4" Width="48" Height="16" Offset="0x1680"/>
<Texture Name="gDoActionNextENGTex" OutName="next_eng" Format="ia4" Width="48" Height="16" Offset="0x1800"/>
<Texture Name="gDoActionGrabENGTex" OutName="grab_eng" Format="ia4" Width="48" Height="16" Offset="0x1980"/>
<Texture Name="gDoActionStopENGTex" OutName="stop_eng" Format="ia4" Width="48" Height="16" Offset="0x1B00"/>
<Texture Name="gDoActionPutAwayENGTex" OutName="put_away_eng" Format="ia4" Width="48" Height="16" Offset="0x1C80"/>
<!-- Unused and left untranslated from Japanese -->
<Texture Name="gDoActionReelENGTex" OutName="reel_eng" Format="ia4" Width="48" Height="16" Offset="0x1E00"/>
<Texture Name="gDoActionInfoENGTex" OutName="info_eng" Format="ia4" Width="48" Height="16" Offset="0x1F80"/>
<Texture Name="gDoActionWarpENGTex" OutName="warp_eng" Format="ia4" Width="48" Height="16" Offset="0x2100"/>
<Texture Name="gDoActionSnapENGTex" OutName="snap_eng" Format="ia4" Width="48" Height="16" Offset="0x2280"/>
<Texture Name="gDoActionExplodeENGTex" OutName="explode_eng" Format="ia4" Width="48" Height="16" Offset="0x2400"/>
<Texture Name="gDoActionDanceENGTex" OutName="dance_eng" Format="ia4" Width="48" Height="16" Offset="0x2580"/>
<Texture Name="gDoActionMarchENGTex" OutName="march_eng" Format="ia4" Width="48" Height="16" Offset="0x2700"/>
<Texture Name="gDoActionNum1ENGTex" OutName="num_1_eng" Format="ia4" Width="48" Height="16" Offset="0x2880"/>
<Texture Name="gDoActionNum2ENGTex" OutName="num_2_eng" Format="ia4" Width="48" Height="16" Offset="0x2A00"/>
<Texture Name="gDoActionNum3ENGTex" OutName="num_3_eng" Format="ia4" Width="48" Height="16" Offset="0x2B80"/>
<Texture Name="gDoActionNum4ENGTex" OutName="num_4_eng" Format="ia4" Width="48" Height="16" Offset="0x2D00"/>
<Texture Name="gDoActionNum5ENGTex" OutName="num_5_eng" Format="ia4" Width="48" Height="16" Offset="0x2E80"/>
<Texture Name="gDoActionNum6ENGTex" OutName="num_6_eng" Format="ia4" Width="48" Height="16" Offset="0x3000"/>
<Texture Name="gDoActionNum7ENGTex" OutName="num_7_eng" Format="ia4" Width="48" Height="16" Offset="0x3180"/>
<Texture Name="gDoActionNum8ENGTex" OutName="num_8_eng" Format="ia4" Width="48" Height="16" Offset="0x3300"/>
<Texture Name="gDoActionCurlENGTex" OutName="curl_eng" Format="ia4" Width="48" Height="16" Offset="0x3480"/>
<Texture Name="gDoActionSurfaceENGTex" OutName="surface_eng" Format="ia4" Width="48" Height="16" Offset="0x3600"/>
<Texture Name="gDoActionSwimENGTex" OutName="swim_eng" Format="ia4" Width="48" Height="16" Offset="0x3780"/>
<Texture Name="gDoActionPunchENGTex" OutName="punch_eng" Format="ia4" Width="48" Height="16" Offset="0x3900"/>
<Texture Name="gDoActionPoundENGTex" OutName="pound_eng" Format="ia4" Width="48" Height="16" Offset="0x3A80"/>
<!-- Unused and left untranslated from Japanese -->
<Texture Name="gDoActionHookENGTex" OutName="hook_eng" Format="ia4" Width="48" Height="16" Offset="0x3C00"/>
<Texture Name="gDoActionShootENGTex" OutName="shoot_eng" Format="ia4" Width="48" Height="16" Offset="0x3D80"/>
</File>
</Root>
assets/xml/interface/week_static.xml
+1 -1
View File
@@ -1,5 +1,5 @@
<Root>
<File Name="week_static">
<File Name="week_static" Segment="9">
<Texture Name="gClockDay1stTex" OutName="clock_day_1st_tex" Format="i8" Width="48" Height="27" Offset="0x0"/>
<Texture Name="gClockDay2ndTex" OutName="clock_day_2nd_tex" Format="i8" Width="48" Height="27" Offset="0x510"/>
<Texture Name="gClockDayFinalTex" OutName="clock_day_final_tex" Format="i8" Width="48" Height="27" Offset="0xA20"/>
assets/xml/misc/story_static.xml
+1 -1
View File
@@ -1,5 +1,5 @@
<Root>
<File Name="story_static">
<File Name="story_static" Segment="7">
<Texture Name="gStoryMaskFestivalTex" OutName="story_mask_festival" Format="ci8" Width="320" Height="240" TlutOffset="0x25800" Offset="0x0"/>
<Texture Name="gStoryGiantsLeavingTex" OutName="story_giants_leaving" Format="ci8" Width="320" Height="240" TlutOffset="0x25A00" Offset="0x12C00"/>
<Texture Name="gStoryMaskFestivalTLUT" OutName="story_mask_festival_tlut" Format="rgba16" Width="16" Height="16" Offset="0x25800"/>
assets/xml/objects/object_efc_tw.xml
+7 -4
View File
@@ -1,10 +1,13 @@
<Root>
<File Name="object_efc_tw" Segment="6">
<!-- <Blob Name="object_efc_tw_Blob_000000" Size="0x60" Offset="0x0" /> -->
<CurveAnimation Name="object_efc_tw_CurveAnim_000050" SkelOffset="0x12E8" Offset="0x50" />
<Array Name="object_efc_tw_Vtx_000060" Count="21" Offset="0x60" >
<Vtx/>
</Array>
<DList Name="object_efc_tw_DL_0001B0" Offset="0x1B0" />
<Texture Name="object_efc_tw_Tex_0002C8" OutName="tex_0002C8" Format="i8" Width="64" Height="64" Offset="0x2C8" />
<Limb Name="object_efc_tw_Standardlimb_0012C8" Type="Standard" EnumName="OBJECT_EFC_TW_LIMB_01" Offset="0x12C8" />
<Limb Name="object_efc_tw_Standardlimb_0012D4" Type="Standard" EnumName="OBJECT_EFC_TW_LIMB_02" Offset="0x12D4" />
<Skeleton Name="object_efc_tw_Skel_0012E8" Type="Normal" LimbType="Standard" LimbNone="OBJECT_EFC_TW_LIMB_NONE" LimbMax="OBJECT_EFC_TW_LIMB_MAX" EnumName="object_efc_tw_Limbs" Offset="0x12E8" />
<Limb Name="object_efc_tw_Curvelimb_0012C8" Type="Curve" EnumName="OBJECT_EFC_TW_LIMB_01" Offset="0x12C8" />
<Limb Name="object_efc_tw_Curvelimb_0012D4" Type="Curve" EnumName="OBJECT_EFC_TW_LIMB_02" Offset="0x12D4" />
<Skeleton Name="object_efc_tw_Skel_0012E8" Type="Curve" LimbType="Curve" LimbNone="OBJECT_EFC_TW_LIMB_NONE" LimbMax="OBJECT_EFC_TW_LIMB_MAX" EnumName="object_efc_tw_Limbs" Offset="0x12E8" />
</File>
</Root>
assets/xml/objects/object_okuta.xml
+68 -55
View File
@@ -1,59 +1,72 @@
<Root>
<!-- Assets for Octoroks -->
<File Name="object_okuta" Segment="6">
<Animation Name="object_okuta_Anim_00044C" Offset="0x44C" />
<DList Name="object_okuta_DL_000DC0" Offset="0xDC0" />
<DList Name="object_okuta_DL_000E70" Offset="0xE70" />
<DList Name="object_okuta_DL_000F28" Offset="0xF28" />
<DList Name="object_okuta_DL_000FD8" Offset="0xFD8" />
<DList Name="object_okuta_DL_001088" Offset="0x1088" />
<DList Name="object_okuta_DL_001140" Offset="0x1140" />
<DList Name="object_okuta_DL_0011F0" Offset="0x11F0" />
<DList Name="object_okuta_DL_0012A0" Offset="0x12A0" />
<DList Name="object_okuta_DL_001358" Offset="0x1358" />
<DList Name="object_okuta_DL_001408" Offset="0x1408" />
<DList Name="object_okuta_DL_0014B8" Offset="0x14B8" />
<DList Name="object_okuta_DL_001570" Offset="0x1570" />
<DList Name="object_okuta_DL_001620" Offset="0x1620" />
<DList Name="object_okuta_DL_001730" Offset="0x1730" />
<DList Name="object_okuta_DL_0017F0" Offset="0x17F0" />
<DList Name="object_okuta_DL_0018B0" Offset="0x18B0" />
<DList Name="object_okuta_DL_001970" Offset="0x1970" />
<DList Name="object_okuta_DL_001A38" Offset="0x1A38" />
<DList Name="object_okuta_DL_001B18" Offset="0x1B18" />
<DList Name="object_okuta_DL_001BE8" Offset="0x1BE8" />
<DList Name="object_okuta_DL_001C20" Offset="0x1C20" />
<Texture Name="object_okuta_Tex_001D20" OutName="tex_001D20" Format="rgba16" Width="16" Height="16" Offset="0x1D20" />
<Texture Name="object_okuta_Tex_001F20" OutName="tex_001F20" Format="rgba16" Width="8" Height="16" Offset="0x1F20" />
<Texture Name="object_okuta_Tex_002020" OutName="tex_002020" Format="rgba16" Width="16" Height="32" Offset="0x2020" />
<Texture Name="object_okuta_Tex_002420" OutName="tex_002420" Format="rgba16" Width="16" Height="16" Offset="0x2420" />
<Texture Name="object_okuta_Tex_002620" OutName="tex_002620" Format="rgba16" Width="16" Height="16" Offset="0x2620" />
<Texture Name="object_okuta_Tex_002820" OutName="tex_002820" Format="rgba16" Width="8" Height="16" Offset="0x2820" />
<Texture Name="object_okuta_Tex_002920" OutName="tex_002920" Format="rgba32" Width="16" Height="16" Offset="0x2920" />
<!-- <Blob Name="object_okuta_Blob_002D20" Size="0x200" Offset="0x2D20" /> -->
<Texture Name="object_okuta_Tex_002F20" OutName="tex_002F20" Format="rgba16" Width="8" Height="8" Offset="0x2F20" />
<Texture Name="object_okuta_Tex_002FA0" OutName="tex_002FA0" Format="rgba16" Width="8" Height="8" Offset="0x2FA0" />
<Texture Name="object_okuta_Tex_003020" OutName="tex_003020" Format="rgba16" Width="16" Height="16" Offset="0x3020" />
<DList Name="object_okuta_DL_003250" Offset="0x3250" />
<Limb Name="object_okuta_Standardlimb_0032E0" Type="Standard" EnumName="OBJECT_OKUTA_LIMB_01" Offset="0x32E0" />
<Limb Name="object_okuta_Standardlimb_0032EC" Type="Standard" EnumName="OBJECT_OKUTA_LIMB_02" Offset="0x32EC" />
<Limb Name="object_okuta_Standardlimb_0032F8" Type="Standard" EnumName="OBJECT_OKUTA_LIMB_03" Offset="0x32F8" />
<Limb Name="object_okuta_Standardlimb_003304" Type="Standard" EnumName="OBJECT_OKUTA_LIMB_04" Offset="0x3304" />
<Limb Name="object_okuta_Standardlimb_003310" Type="Standard" EnumName="OBJECT_OKUTA_LIMB_05" Offset="0x3310" />
<Limb Name="object_okuta_Standardlimb_00331C" Type="Standard" EnumName="OBJECT_OKUTA_LIMB_06" Offset="0x331C" />
<Limb Name="object_okuta_Standardlimb_003328" Type="Standard" EnumName="OBJECT_OKUTA_LIMB_07" Offset="0x3328" />
<Limb Name="object_okuta_Standardlimb_003334" Type="Standard" EnumName="OBJECT_OKUTA_LIMB_08" Offset="0x3334" />
<Limb Name="object_okuta_Standardlimb_003340" Type="Standard" EnumName="OBJECT_OKUTA_LIMB_09" Offset="0x3340" />
<Limb Name="object_okuta_Standardlimb_00334C" Type="Standard" EnumName="OBJECT_OKUTA_LIMB_0A" Offset="0x334C" />
<Limb Name="object_okuta_Standardlimb_003358" Type="Standard" EnumName="OBJECT_OKUTA_LIMB_0B" Offset="0x3358" />
<Limb Name="object_okuta_Standardlimb_003364" Type="Standard" EnumName="OBJECT_OKUTA_LIMB_0C" Offset="0x3364" />
<Limb Name="object_okuta_Standardlimb_003370" Type="Standard" EnumName="OBJECT_OKUTA_LIMB_0D" Offset="0x3370" />
<Limb Name="object_okuta_Standardlimb_00337C" Type="Standard" EnumName="OBJECT_OKUTA_LIMB_0E" Offset="0x337C" />
<Limb Name="object_okuta_Standardlimb_003388" Type="Standard" EnumName="OBJECT_OKUTA_LIMB_0F" Offset="0x3388" />
<Skeleton Name="object_okuta_Skel_0033D0" Type="Normal" LimbType="Standard" LimbNone="OBJECT_OKUTA_LIMB_NONE" LimbMax="OBJECT_OKUTA_LIMB_MAX" EnumName="object_okuta_Limbs" Offset="0x33D0" />
<Animation Name="object_okuta_Anim_003958" Offset="0x3958" />
<Animation Name="object_okuta_Anim_003B24" Offset="0x3B24" />
<Animation Name="object_okuta_Anim_003EE4" Offset="0x3EE4" />
<Animation Name="object_okuta_Anim_004204" Offset="0x4204" />
<Animation Name="object_okuta_Anim_00466C" Offset="0x466C" />
<Animation Name="gOctorokShootAnim" Offset="0x44C" /> <!-- Original name is "oc_atack" -->
<!-- Octorok Limb DisplayLists -->
<DList Name="gFrontRightArmBaseDL" Offset="0xDC0" />
<DList Name="gFrontRightArmMiddleDL" Offset="0xE70" />
<DList Name="gFrontRightArmEndDL" Offset="0xF28" />
<DList Name="gBackRightArmBaseDL" Offset="0xFD8" />
<DList Name="gBackRightArmMiddleDL" Offset="0x1088" />
<DList Name="gBackRightArmEndDL" Offset="0x1140" />
<DList Name="gBackLeftArmBaseDL" Offset="0x11F0" />
<DList Name="gBackLeftArmMiddleDL" Offset="0x12A0" />
<DList Name="gBackLeftArmEndDL" Offset="0x1358" />
<DList Name="gFrontLeftArmBaseDL" Offset="0x1408" />
<DList Name="gFrontLeftArmMiddleDL" Offset="0x14B8" />
<DList Name="gFrontLeftArmEndDL" Offset="0x1570" />
<DList Name="gOctorokSnoutDL" Offset="0x1620" />
<DList Name="gOctorokUnderEyeTrianglesDL" Offset="0x1730" /> <!-- Used as part of the head displaylist -->
<DList Name="gOctorokHeadBottomDL" Offset="0x17F0" /> <!-- Used as part of the head displaylist -->
<DList Name="gOctorokHeadFrontDL" Offset="0x18B0" /> <!-- Used as part of the head displaylist -->
<DList Name="gOctorokHeadTopDL" Offset="0x1970" /> <!-- Used as part of the head displaylist -->
<DList Name="gOctorokHeadBackDL" Offset="0x1A38" /> <!-- Used as part of the head displaylist -->
<DList Name="gOctorokEyesDL" Offset="0x1B18" /> <!-- Used as part of the head displaylist -->
<DList Name="gOctorokHeadDL" Offset="0x1BE8" />
<DList Name="gOctorokBodyDL" Offset="0x1C20" />
<!-- Octorok Textures -->
<Texture Name="gOctorokRoughSkinTex" OutName="octorok_rough_skin" Format="rgba16" Width="16" Height="16" Offset="0x1D20" />
<Texture Name="gOctorokMouthTex" OutName="octorok_mouth" Format="rgba16" Width="8" Height="16" Offset="0x1F20" />
<Texture Name="gOctorokArmTex" OutName="octorok_arm" Format="rgba16" Width="16" Height="32" Offset="0x2020" />
<Texture Name="gOctorokFinTex" OutName="octorok_fin" Format="rgba16" Width="16" Height="16" Offset="0x2420" />
<Texture Name="gOctorokEyeTex" OutName="octorok_eye" Format="rgba16" Width="16" Height="16" Offset="0x2620" />
<Texture Name="gOctorokStripesTex" OutName="octorok_stripes" Format="rgba16" Width="8" Height="16" Offset="0x2820" />
<Texture Name="gOctorokScalesTex" OutName="octorok_scales" Format="rgba32" Width="16" Height="16" Offset="0x2920" />
<Texture Name="gOctorokScalesOoTTex" OutName="octorok_scales_oot" Format="rgba16" Width="16" Height="16" Offset="0x2D20" /> <!-- Unused OoT leftover -->
<Texture Name="gOctorokHeadBottomTex" OutName="octorok_head_bottom" Format="rgba16" Width="8" Height="8" Offset="0x2F20" />
<Texture Name="gOctorokShadedSkinTex" OutName="octorok_shaded_skin" Format="rgba16" Width="8" Height="8" Offset="0x2FA0" />
<!-- Octorok Projectile Texture and DisplayList -->
<Texture Name="gOctorokProjectileTex" OutName="octorok_projectile" Format="rgba16" Width="16" Height="16" Offset="0x3020" />
<DList Name="gOctorokProjectileDL" Offset="0x3250" />
<!-- Octorok Limbs -->
<Limb Name="gOctorokBodyLimb" Type="Standard" EnumName="OCTOROK_LIMB_BODY" Offset="0x32E0" />
<Limb Name="gFrontLeftArmBaseLimb" Type="Standard" EnumName="OCTOROK_LIMB_FRONT_LEFT_ARM_BASE" Offset="0x32EC" />
<Limb Name="gFrontLeftArmMiddleLimb" Type="Standard" EnumName="OCTOROK_LIMB_FRONT_LEFT_ARM_MIDDLE" Offset="0x32F8" />
<Limb Name="gFrontLeftArmEndLimb" Type="Standard" EnumName="OCTOROK_LIMB_FRONT_LEFT_ARM_END" Offset="0x3304" />
<Limb Name="gFrontRightArmBaseLimb" Type="Standard" EnumName="OCTOROK_LIMB_FRONT_RIGHT_ARM_BASE" Offset="0x3310" />
<Limb Name="gFrontRightArmMiddleLimb" Type="Standard" EnumName="OCTOROK_LIMB_FRONT_RIGHT_ARM_MIDDLE" Offset="0x331C" />
<Limb Name="gFrontRightArmEndLimb" Type="Standard" EnumName="OCTOROK_LIMB_FRONT_RIGHT_ARM_END" Offset="0x3328" />
<Limb Name="gBackLeftArmBaseLimb" Type="Standard" EnumName="OCTOROK_LIMB_BACK_LEFT_ARM_BASE" Offset="0x3334" />
<Limb Name="gBackLeftArmMiddleLimb" Type="Standard" EnumName="OCTOROK_LIMB_BACK_LEFT_ARM_MIDDLE" Offset="0x3340" />
<Limb Name="gBackLeftArmEndLimb" Type="Standard" EnumName="OCTOROK_LIMB_BACK_LEFT_ARM_END" Offset="0x334C" />
<Limb Name="gBackRightArmBaseLimb" Type="Standard" EnumName="OCTOROK_LIMB_BACK_RIGHT_ARM_BASE" Offset="0x3358" />
<Limb Name="gBackRightArmMiddleLimb" Type="Standard" EnumName="OCTOROK_LIMB_BACK_RIGHT_ARM_MIDDLE" Offset="0x3364" />
<Limb Name="gBackRightArmEndLimb" Type="Standard" EnumName="OCTOROK_LIMB_BACK_RIGHT_ARM_END" Offset="0x3370" />
<Limb Name="gOctorokHeadLimb" Type="Standard" EnumName="OCTOROK_LIMB_HEAD" Offset="0x337C" />
<Limb Name="gOctorokSnoutLimb" Type="Standard" EnumName="OCTOROK_LIMB_SNOUT" Offset="0x3388" />
<!-- Octorok Skeleton -->
<Skeleton Name="gOctorokSkel" Type="Normal" LimbType="Standard" LimbNone="OCTOROK_LIMB_NONE" LimbMax="OCTOROK_LIMB_MAX" EnumName="OctorokLimbs" Offset="0x33D0" />
<!-- Octorok Animations -->
<Animation Name="gOctorokDieAnim" Offset="0x3958" /> <!-- Original name is "oc_dead" -->
<Animation Name="gOctorokHideAnim" Offset="0x3B24" /> <!-- Original name is "oc_down" -->
<Animation Name="gOctorokFloatAnim" Offset="0x3EE4" /> <!-- Original name is "oc_float" -->
<Animation Name="gOctorokHitAnim" Offset="0x4204" /> <!-- Original name is "oc_predead" -->
<Animation Name="gOctorokAppearAnim" Offset="0x466C" /> <!-- Original name is "oc_up" -->
</File>
</Root>
assets/xml/objects/object_open_obj.xml
+5 -5
View File
@@ -4,11 +4,11 @@
<DList Name="object_open_obj_DL_0003E8" Offset="0x3E8" />
<Texture Name="object_open_obj_Tex_000558" OutName="tex_000558" Format="rgba16" Width="32" Height="64" Offset="0x558" />
<Collision Name="object_open_obj_Colheader_001640" Offset="0x1640" />
<DList Name="object_open_obj_DL_001A60" Offset="0x1A60" />
<DList Name="object_open_obj_DL_001B40" Offset="0x1B40" />
<Texture Name="object_open_obj_Tex_001CD0" OutName="tex_001CD0" Format="rgba16" Width="32" Height="32" Offset="0x1CD0" />
<Texture Name="object_open_obj_Tex_0024D0" OutName="tex_0024D0" Format="ia8" Width="32" Height="64" Offset="0x24D0" />
<TextureAnimation Name="object_open_obj_Matanimheader_002CE0" Offset="0x2CE0" />
<DList Name="gSpotlightLeftDL" Offset="0x1A60" />
<DList Name="gSpotlightRightDL" Offset="0x1B40" />
<Texture Name="gSpotlightShapesTex" OutName="spotlight_shapes" Format="rgba16" Width="32" Height="32" Offset="0x1CD0" />
<Texture Name="gSpotlightFloorTex" OutName="spotlight_floor" Format="ia8" Width="32" Height="64" Offset="0x24D0" />
<TextureAnimation Name="gSpotlightTexAnim" Offset="0x2CE0" />
<DList Name="object_open_obj_DL_002D30" Offset="0x2D30" />
<DList Name="object_open_obj_DL_002DC0" Offset="0x2DC0" />
<!-- <Blob Name="object_open_obj_Blob_002DC8" Size="0xE608" Offset="0x2DC8" /> -->
assets/xml/objects/object_shn.xml
+121 -93
View File
@@ -1,97 +1,125 @@
<Root>
<!-- Assets for the Shooting Gallery Men and the Swamp Guide. They all use the same body and just swap out the head. -->
<File Name="object_shn" Segment="6">
<DList Name="object_shn_DL_003510" Offset="0x3510" />
<DList Name="object_shn_DL_003600" Offset="0x3600" />
<DList Name="object_shn_DL_0039A0" Offset="0x39A0" />
<DList Name="object_shn_DL_003DA0" Offset="0x3DA0" />
<DList Name="object_shn_DL_004038" Offset="0x4038" />
<DList Name="object_shn_DL_0042E0" Offset="0x42E0" />
<DList Name="object_shn_DL_004620" Offset="0x4620" />
<DList Name="object_shn_DL_0048B8" Offset="0x48B8" />
<DList Name="object_shn_DL_004B60" Offset="0x4B60" />
<DList Name="object_shn_DL_004EA8" Offset="0x4EA8" />
<DList Name="object_shn_DL_004FC8" Offset="0x4FC8" />
<DList Name="object_shn_DL_0050D0" Offset="0x50D0" />
<DList Name="object_shn_DL_005298" Offset="0x5298" />
<DList Name="object_shn_DL_0053B8" Offset="0x53B8" />
<DList Name="object_shn_DL_0054C0" Offset="0x54C0" />
<Texture Name="object_shn_TLUT_005688" OutName="tlut_005688" Format="rgba16" Width="16" Height="16" Offset="0x5688" />
<Texture Name="object_shn_TLUT_005888" OutName="tlut_005888" Format="rgba16" Width="16" Height="16" Offset="0x5888" />
<Texture Name="object_shn_Tex_005A88" OutName="tex_005A88" Format="ci8" Width="8" Height="8" Offset="0x5A88" />
<Texture Name="object_shn_Tex_005AC8" OutName="tex_005AC8" Format="rgba16" Width="32" Height="32" Offset="0x5AC8" />
<Texture Name="object_shn_Tex_0062C8" OutName="tex_0062C8" Format="rgba16" Width="32" Height="32" Offset="0x62C8" />
<!-- <Blob Name="object_shn_Blob_006AC8" Size="0x800" Offset="0x6AC8" /> -->
<Texture Name="object_shn_Tex_0072C8" OutName="tex_0072C8" Format="ci8" Width="16" Height="16" Offset="0x72C8" />
<Texture Name="object_shn_Tex_0073C8" OutName="tex_0073C8" Format="ci8" Width="8" Height="8" Offset="0x73C8" />
<Texture Name="object_shn_Tex_007408" OutName="tex_007408" Format="ci8" Width="32" Height="32" Offset="0x7408" />
<Texture Name="object_shn_Tex_007808" OutName="tex_007808" Format="ci8" Width="16" Height="16" Offset="0x7808" />
<Texture Name="object_shn_Tex_007908" OutName="tex_007908" Format="ci8" Width="16" Height="16" Offset="0x7908" />
<Texture Name="object_shn_Tex_007A08" OutName="tex_007A08" Format="ci8" Width="32" Height="32" Offset="0x7A08" />
<Texture Name="object_shn_Tex_007E08" OutName="tex_007E08" Format="ci8" Width="16" Height="16" Offset="0x7E08" />
<Texture Name="object_shn_Tex_007F08" OutName="tex_007F08" Format="ci8" Width="8" Height="8" Offset="0x7F08" />
<Texture Name="object_shn_Tex_007F48" OutName="tex_007F48" Format="ci8" Width="16" Height="16" Offset="0x7F48" />
<!-- <Blob Name="object_shn_Blob_008050" Size="0x10" Offset="0x8050" /> -->
<DList Name="object_shn_DL_008BA0" Offset="0x8BA0" />
<DList Name="object_shn_DL_008C70" Offset="0x8C70" />
<DList Name="object_shn_DL_008D90" Offset="0x8D90" />
<DList Name="object_shn_DL_008E48" Offset="0x8E48" />
<DList Name="object_shn_DL_008F00" Offset="0x8F00" />
<DList Name="object_shn_DL_009040" Offset="0x9040" />
<Texture Name="object_shn_TLUT_0091D8" OutName="tlut_0091D8" Format="rgba16" Width="16" Height="16" Offset="0x91D8" />
<Texture Name="object_shn_TLUT_0093D8" OutName="tlut_0093D8" Format="rgba16" Width="16" Height="16" Offset="0x93D8" />
<Texture Name="object_shn_TLUT_0095D8" OutName="tlut_0095D8" Format="rgba16" Width="16" Height="16" Offset="0x95D8" />
<Texture Name="object_shn_TLUT_0097D8" OutName="tlut_0097D8" Format="rgba16" Width="16" Height="16" Offset="0x97D8" />
<Texture Name="object_shn_TLUT_0099D8" OutName="tlut_0099D8" Format="rgba16" Width="16" Height="16" Offset="0x99D8" />
<Texture Name="object_shn_TLUT_009BD8" OutName="tlut_009BD8" Format="rgba16" Width="16" Height="16" Offset="0x9BD8" />
<Texture Name="object_shn_Tex_009DD8" OutName="tex_009DD8" Format="ci8" Width="32" Height="32" Offset="0x9DD8" />
<Texture Name="object_shn_Tex_00A1D8" OutName="tex_00A1D8" Format="ci8" Width="16" Height="16" Offset="0xA1D8" />
<Texture Name="object_shn_Tex_00A2D8" OutName="tex_00A2D8" Format="ci8" Width="16" Height="16" Offset="0xA2D8" />
<Texture Name="object_shn_Tex_00A3D8" OutName="tex_00A3D8" Format="ci8" Width="8" Height="8" Offset="0xA3D8" />
<Texture Name="object_shn_Tex_00A418" OutName="tex_00A418" Format="ci8" Width="32" Height="32" Offset="0xA418" />
<Texture Name="object_shn_Tex_00A818" OutName="tex_00A818" Format="ci8" Width="8" Height="8" Offset="0xA818" />
<DList Name="object_shn_DL_00B730" Offset="0xB730" />
<DList Name="gObjectShnSwampGuideHead" Offset="0xB738" />
<Texture Name="object_shn_TLUT_00BCD8" OutName="tlut_00BCD8" Format="rgba16" Width="16" Height="16" Offset="0xBCD8" />
<Texture Name="object_shn_TLUT_00BED8" OutName="tlut_00BED8" Format="rgba16" Width="16" Height="16" Offset="0xBED8" />
<Texture Name="object_shn_Tex_00C0D8" OutName="tex_00C0D8" Format="ci8" Width="8" Height="8" Offset="0xC0D8" />
<Texture Name="object_shn_Tex_00C118" OutName="tex_00C118" Format="ci8" Width="16" Height="16" Offset="0xC118" />
<Texture Name="object_shn_Tex_00C218" OutName="tex_00C218" Format="ci8" Width="16" Height="16" Offset="0xC218" />
<Texture Name="object_shn_Tex_00C318" OutName="tex_00C318" Format="ci8" Width="32" Height="16" Offset="0xC318" />
<Texture Name="object_shn_Tex_00C518" OutName="tex_00C518" Format="ci8" Width="32" Height="32" Offset="0xC518" />
<Texture Name="object_shn_Tex_00C918" OutName="tex_00C918" Format="ci8" Width="16" Height="16" Offset="0xC918" />
<Texture Name="object_shn_Tex_00CA18" OutName="tex_00CA18" Format="rgba16" Width="8" Height="8" Offset="0xCA18" />
<Texture Name="object_shn_Tex_00CA98" OutName="tex_00CA98" Format="ci8" Width="16" Height="32" Offset="0xCA98" />
<Animation Name="object_shn_Anim_00D2F8" Offset="0xD2F8" />
<Animation Name="object_shn_Anim_00D3AC" Offset="0xD3AC" />
<Animation Name="object_shn_Anim_00D9D0" Offset="0xD9D0" />
<Animation Name="object_shn_Anim_00DFEC" Offset="0xDFEC" />
<Animation Name="object_shn_Anim_00E6C4" Offset="0xE6C4" />
<Limb Name="gObjectShnLimbWaist" Type="Standard" EnumName="OBJECT_SHN_LIMB_WAIST" Offset="0xE6E0" />
<Limb Name="gObjectShnLimbLegLeft" Type="Standard" EnumName="OBJECT_SHN_LIMB_LEG_LEFT" Offset="0xE6EC" />
<Limb Name="gObjectShnLimbShinLeft" Type="Standard" EnumName="OBJECT_SHN_LIMB_SHIN_LEFT" Offset="0xE6F8" />
<Limb Name="gObjectShnLimbFootLeft" Type="Standard" EnumName="OBJECT_SHN_LIMB_FOOT_LEFT" Offset="0xE704" />
<Limb Name="gObjectShnLimbLegRight" Type="Standard" EnumName="OBJECT_SHN_LIMB_LEG_RIGHT" Offset="0xE710" />
<Limb Name="gObjectShnLimbShinRight" Type="Standard" EnumName="OBJECT_SHN_LIMB_SHIN_RIGHT" Offset="0xE71C" />
<Limb Name="gObjectShnLimbFootRight" Type="Standard" EnumName="OBJECT_SHN_LIMB_FOOT_RIGHT" Offset="0xE728" />
<Limb Name="gObjectShnLimbTorso" Type="Standard" EnumName="OBJECT_SHN_LIMB_TORSO" Offset="0xE734" />
<Limb Name="gObjectShnLimbShoulderLeft" Type="Standard" EnumName="OBJECT_SHN_LIMB_SHOULDER_LEFT" Offset="0xE740" />
<Limb Name="gObjectShnLimbForearmLeft" Type="Standard" EnumName="OBJECT_SHN_LIMB_FOREARM_LEFT" Offset="0xE74C" />
<Limb Name="gObjectShnLimbHandLeft" Type="Standard" EnumName="OBJECT_SHN_LIMB_HAND_LEFT" Offset="0xE758" />
<Limb Name="gObjectShnLimbShoulderRight" Type="Standard" EnumName="OBJECT_SHN_LIMB_SHOULDER_RIGHT" Offset="0xE764" />
<Limb Name="gObjectShnLimbForearmRight" Type="Standard" EnumName="OBJECT_SHN_LIMB_FOREARM_RIGHT" Offset="0xE770" />
<Limb Name="gObjectShnLimbHandRight" Type="Standard" EnumName="OBJECT_SHN_LIMB_HAND_RIGHT" Offset="0xE77C" />
<Limb Name="gObjectShnLimbHead" Type="Standard" EnumName="OBJECT_SHN_LIMB_HEAD" Offset="0xE788" />
<Skeleton Name="gObjectShnSkel" Type="Flex" LimbType="Standard" LimbNone="OBJECT_SHN_LIMB_NONE" LimbMax="OBJECT_SHN_LIMB_MAX" EnumName="ObjectShnLimbs" Offset="0xE7D0" />
<DList Name="object_shn_DL_00F2D0" Offset="0xF2D0" />
<Texture Name="object_shn_TLUT_00F790" OutName="tlut_00F790" Format="rgba16" Width="16" Height="16" Offset="0xF790" />
<Texture Name="object_shn_TLUT_00F990" OutName="tlut_00F990" Format="rgba16" Width="16" Height="16" Offset="0xF990" />
<Texture Name="object_shn_Tex_00FB90" OutName="tex_00FB90" Format="rgba16" Width="32" Height="32" Offset="0xFB90" />
<Texture Name="object_shn_Tex_010390" OutName="tex_010390" Format="rgba16" Width="32" Height="32" Offset="0x10390" />
<Texture Name="object_shn_Tex_010B90" OutName="tex_010B90" Format="ci8" Width="32" Height="32" Offset="0x10B90" />
<Texture Name="object_shn_Tex_010F90" OutName="tex_010F90" Format="ci8" Width="8" Height="8" Offset="0x10F90" />
<Texture Name="object_shn_Tex_010FD0" OutName="tex_010FD0" Format="ci8" Width="16" Height="16" Offset="0x10FD0" />
<Texture Name="object_shn_Tex_0110D0" OutName="tex_0110D0" Format="ci8" Width="16" Height="16" Offset="0x110D0" />
<Texture Name="object_shn_Tex_0111D0" OutName="tex_0111D0" Format="ci8" Width="8" Height="8" Offset="0x111D0" />
<!-- <Blob Name="object_shn_Blob_011210" Size="0x10" Offset="0x11210" /> -->
<!-- Burly Guy Limb DisplayLists. Includes the Swamp Shooting Gallery Man's head -->
<DList Name="gBurlyGuyWaistDL" Offset="0x3510" />
<DList Name="gBurlyGuyTorsoDL" Offset="0x3600" />
<DList Name="gSwampShootingGalleryManHeadDL" Offset="0x39A0" />
<DList Name="gBurlyGuyRightShoulderDL" Offset="0x3DA0" />
<DList Name="gBurlyGuyRightForearmDL" Offset="0x4038" />
<DList Name="gBurlyGuyRightHandDL" Offset="0x42E0" />
<DList Name="gBurlyGuyLeftShoulderDL" Offset="0x4620" />
<DList Name="gBurlyGuyLeftForearmDL" Offset="0x48B8" />
<DList Name="gBurlyGuyLeftHandDL" Offset="0x4B60" />
<DList Name="gBurlyGuyRightThighDL" Offset="0x4EA8" />
<DList Name="gBurlyGuyRightShinDL" Offset="0x4FC8" />
<DList Name="gBurlyGuyRightFootDL" Offset="0x50D0" />
<DList Name="gBurlyGuyLeftThighDL" Offset="0x5298" />
<DList Name="gBurlyGuyLeftShinDL" Offset="0x53B8" />
<DList Name="gBurlyGuyLeftFootDL" Offset="0x54C0" />
<!-- Textures for Burly Guy's body, as well as the Swamp Shooting Gallery Man's head -->
<Texture Name="gSwampShootingGalleryManNoseTLUT" OutName="swamp_shooting_gallery_man_nose_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5688" />
<Texture Name="gBurlyGuyTLUT" OutName="shooting_gallery_man_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5888" />
<Texture Name="gBurlyGuySkinTex" OutName="shooting_gallery_man_skin" Format="ci8" Width="8" Height="8" Offset="0x5A88" />
<Texture Name="gSwampShootingGalleryManEyeOpenTex" OutName="swamp_shooting_gallery_man_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x5AC8" />
<Texture Name="gSwampShootingGalleryManEyeHalfTex" OutName="swamp_shooting_gallery_man_eye_half" Format="rgba16" Width="32" Height="32" Offset="0x62C8" />
<Texture Name="gSwampShootingGalleryManEyeClosedTex" OutName="swamp_shooting_gallery_man_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x6AC8" />
<Texture Name="gSwampShootingGalleryManEarTex" OutName="swamp_shooting_gallery_man_ear" Format="ci8" Width="16" Height="16" Offset="0x72C8" />
<Texture Name="gSwampShootingGalleryManNoseTex" OutName="swamp_shooting_gallery_man_nose" Format="ci8" Width="8" Height="8" Offset="0x73C8" />
<Texture Name="gSwampShootingGalleryManBeardAndLipsTex" OutName="swamp_shooting_gallery_man_beard_and_lips" Format="ci8" Width="32" Height="32" Offset="0x7408" />
<Texture Name="gSwampShootingGalleryManHairTex" OutName="swamp_shooting_gallery_man_hair" Format="ci8" Width="16" Height="16" Offset="0x7808" />
<Texture Name="gBurlyGuyHandTex" OutName="shooting_gallery_man_hand" Format="ci8" Width="16" Height="16" Offset="0x7908" />
<Texture Name="gBurlyGuyBodyHairTex" OutName="shooting_gallery_man_body_hair" Format="ci8" Width="32" Height="32" Offset="0x7A08" />
<Texture Name="gBurlyGuyVestTex" OutName="shooting_gallery_man_vest" Format="ci8" Width="16" Height="16" Offset="0x7E08" />
<Texture Name="gBurlyGuyPantsTex" OutName="shooting_gallery_man_pants" Format="ci8" Width="8" Height="8" Offset="0x7F08" />
<Texture Name="gBurlyGuyShoesTex" OutName="shooting_gallery_man_shoes" Format="ci8" Width="16" Height="16" Offset="0x7F48" />
<!-- Unused Empty Texture Animation -->
<TextureAnimation Name="gBurlyGuyUnused8050TexAnim" Offset="0x8050" />
<!-- DisplayLists for an unused duplicate of the Town Shooting Gallery Man's head -->
<DList Name="gUnusedTownShootingGalleryManEyesDL" Offset="0x8BA0" />
<DList Name="gUnusedTownShootingGalleryManLipsDL" Offset="0x8C70" />
<DList Name="gUnusedTownShootingGalleryManNoseDL" Offset="0x8D90" />
<DList Name="gUnusedTownShootingGalleryManEarsDL" Offset="0x8E48" />
<DList Name="gUnusedTownShootingGalleryManHairAndSideburnsDL" Offset="0x8F00" />
<DList Name="gUnusedTownShootingGalleryManFaceAndChinDL" Offset="0x9040" />
<!-- Textures for an unused duplicate of the Town Shooting Gallery Man's head -->
<Texture Name="gUnusedTownShootingGalleryManBeardAndLipsTLUT" OutName="unused_town_shooting_gallery_man_beard_and_lips_tlut" Format="rgba16" Width="16" Height="16" Offset="0x91D8" />
<Texture Name="gUnusedTownShootingGalleryManHairTLUT" OutName="unused_town_shooting_gallery_man_hair_tlut" Format="rgba16" Width="16" Height="16" Offset="0x93D8" />
<Texture Name="gUnusedTownShootingGalleryManEarTLUT" OutName="unused_town_shooting_gallery_man_ear_tlut" Format="rgba16" Width="16" Height="16" Offset="0x95D8" />
<Texture Name="gUnusedTownShootingGalleryManNoseTLUT" OutName="unused_town_shooting_gallery_man_nose_tlut" Format="rgba16" Width="16" Height="16" Offset="0x97D8" />
<Texture Name="gUnusedTownShootingGalleryManEyeTLUT" OutName="unused_town_shooting_gallery_man_eye_tlut" Format="rgba16" Width="16" Height="16" Offset="0x99D8" />
<Texture Name="gUnusedTownShootingGalleryManSkinTLUT" OutName="unused_town_shooting_gallery_man_skin_tlut" Format="rgba16" Width="16" Height="16" Offset="0x9BD8" />
<Texture Name="gUnusedTownShootingGalleryManBeardAndLipsTex" OutName="unused_town_shooting_gallery_man_beard_and_lips" Format="ci8" Width="32" Height="32" Offset="0x9DD8" /> <!-- Used only for the lips -->
<Texture Name="gUnusedTownShootingGalleryManHairTex" OutName="unused_town_shooting_gallery_man_hair" Format="ci8" Width="16" Height="16" Offset="0xA1D8" />
<Texture Name="gUnusedTownShootingGalleryManEarTex" OutName="unused_town_shooting_gallery_man_ear" Format="ci8" Width="16" Height="16" Offset="0xA2D8" />
<Texture Name="gUnusedTownShootingGalleryManNoseTex" OutName="unused_town_shooting_gallery_man_nose" Format="ci8" Width="8" Height="8" Offset="0xA3D8" />
<Texture Name="gUnusedTownShootingGalleryManEyeTex" OutName="unused_town_shooting_gallery_man_eye" Format="ci8" Width="32" Height="32" Offset="0xA418" />
<Texture Name="gUnusedTownShootingGalleryManSkinTex" OutName="unused_town_shooting_gallery_man_skin" Format="ci8" Width="8" Height="8" Offset="0xA818" />
<!-- Unused Empty DisplayList -->
<DList Name="gBurlyGuyEmptyDL" Offset="0xB730" />
<!-- DisplayList for the Swamp Guide's head -->
<DList Name="gSwampGuideHeadDL" Offset="0xB738" />
<!-- Textures for the Swamp Guide's head -->
<Texture Name="gSwampGuideHairFabricAndSkinTLUT" OutName="swamp_guide_hair_fabric_and_skin_tlut" Format="rgba16" Width="16" Height="16" Offset="0xBCD8" />
<Texture Name="gSwampGuideMouthGoggleAndEyeTLUT" OutName="swamp_guide_mouth_goggle_and_eye_tlut" Format="rgba16" Width="16" Height="16" Offset="0xBED8" />
<Texture Name="gSwampGuideSkinTex" OutName="swamp_guide_skin" Format="ci8" Width="8" Height="8" Offset="0xC0D8" />
<Texture Name="gSwampGuideHatFabricTex" OutName="swamp_guide_hat_fabric" Format="ci8" Width="16" Height="16" Offset="0xC118" />
<Texture Name="gSwampGuideHairAndBeardTex" OutName="swamp_guide_hair_and_beard" Format="ci8" Width="16" Height="16" Offset="0xC218" />
<Texture Name="gSwampGuideHatAndGogglesMetalTex" OutName="swamp_guide_hat_and_goggles_metal" Format="ci8" Width="32" Height="16" Offset="0xC318" />
<Texture Name="gSwampGuideEyeTex" OutName="swamp_guide_eye" Format="ci8" Width="32" Height="32" Offset="0xC518" />
<Texture Name="gSwampGuideGoggleStrapTex" OutName="swamp_guide_goggle_strap" Format="ci8" Width="16" Height="16" Offset="0xC918" />
<Texture Name="gSwampGuideNoseTex" OutName="swamp_guide_nose" Format="rgba16" Width="8" Height="8" Offset="0xCA18" />
<Texture Name="gSwampGuideMouthTex" OutName="swamp_guide_mouth" Format="ci8" Width="16" Height="32" Offset="0xCA98" />
<!-- Burly Guy Animations -->
<Animation Name="gSwampShootingGalleryManHeadScratchEndAnim" Offset="0xD2F8" /> <!-- Original name is "shn_w02TOw01" ("wait02 to wait01"?) -->
<Animation Name="gBurlyGuyEmptyAnim" Offset="0xD3AC" /> <!-- Original name is "shn_wait". Unused and one frame long -->
<Animation Name="gBurlyGuyHandsOnTableAnim" Offset="0xD9D0" /> <!-- Original name is "shn_wait01" -->
<Animation Name="gSwampShootingGalleryManHeadScratchLoopAnim" Offset="0xDFEC" /> <!-- Original name is "shn_wait02" -->
<Animation Name="gSwampGuideChinScratchAnim" Offset="0xE6C4" /><!-- Original name is "shn_wait03" -->
<!-- Burly Guy Limbs -->
<Limb Name="gBurlyGuyWaistLimb" Type="Standard" EnumName="BURLY_GUY_LIMB_WAIST" Offset="0xE6E0" />
<Limb Name="gBurlyGuyLeftThighLimb" Type="Standard" EnumName="BURLY_GUY_LIMB_LEFT_THIGH" Offset="0xE6EC" />
<Limb Name="gBurlyGuyLeftShinLimb" Type="Standard" EnumName="BURLY_GUY_LIMB_LEFT_SHIN" Offset="0xE6F8" />
<Limb Name="gBurlyGuyLeftFootLimb" Type="Standard" EnumName="BURLY_GUY_LIMB_LEFT_FOOT" Offset="0xE704" />
<Limb Name="gBurlyGuyRightThighLimb" Type="Standard" EnumName="BURLY_GUY_LIMB_RIGHT_THIGH" Offset="0xE710" />
<Limb Name="gBurlyGuyRightShinLimb" Type="Standard" EnumName="BURLY_GUY_LIMB_RIGHT_SHIN" Offset="0xE71C" />
<Limb Name="gBurlyGuyRightFootLimb" Type="Standard" EnumName="BURLY_GUY_LIMB_RIGHT_FOOT" Offset="0xE728" />
<Limb Name="gBurlyGuyTorsoLimb" Type="Standard" EnumName="BURLY_GUY_LIMB_TORSO" Offset="0xE734" />
<Limb Name="gBurlyGuyLeftShoulderLimb" Type="Standard" EnumName="BURLY_GUY_LIMB_LEFT_SHOULDER" Offset="0xE740" />
<Limb Name="gBurlyGuyLeftForearmLimb" Type="Standard" EnumName="BURLY_GUY_LIMB_LEFT_FOREARM" Offset="0xE74C" />
<Limb Name="gBurlyGuyLeftHandLimb" Type="Standard" EnumName="BURLY_GUY_LIMB_LEFT_HAND" Offset="0xE758" />
<Limb Name="gBurlyGuyRightShoulderLimb" Type="Standard" EnumName="BURLY_GUY_LIMB_RIGHT_SHOULDER" Offset="0xE764" />
<Limb Name="gBurlyGuyRightForearmLimb" Type="Standard" EnumName="BURLY_GUY_LIMB_RIGHT_FOREARM" Offset="0xE770" />
<Limb Name="gBurlyGuyRightHandLimb" Type="Standard" EnumName="BURLY_GUY_LIMB_RIGHT_HAND" Offset="0xE77C" />
<Limb Name="gBurlyGuyHeadLimb" Type="Standard" EnumName="BURLY_GUY_LIMB_HEAD" Offset="0xE788" />
<!-- Burly Guy Skeleton -->
<Skeleton Name="gBurlyGuySkel" Type="Flex" LimbType="Standard" LimbNone="BURLY_GUY_LIMB_NONE" LimbMax="BURLY_GUY_LIMB_MAX" EnumName="BurlyGuyLimbs" Offset="0xE7D0" />
<!-- DisplayList for the Town Shooting Gallery Man's Head -->
<DList Name="gTownShootingGalleryManHeadDL" Offset="0xF2D0" />
<!-- Textures for the Town Shooting Gallery Man's Head -->
<Texture Name="gTownShootingGalleryManNoseTLUT" OutName="town_shooting_gallery_man_nose_tlut" Format="rgba16" Width="16" Height="16" Offset="0xF790" />
<Texture Name="gTownShootingGalleryManHeadTLUT" OutName="town_shooting_gallery_man_head_tlut" Format="rgba16" Width="16" Height="16" Offset="0xF990" />
<Texture Name="gTownShootingGalleryManEyeOpenTex" OutName="town_shooting_gallery_man_eye_open" Format="rgba16" Width="32" Height="32" Offset="0xFB90" />
<Texture Name="gTownShootingGalleryManEyeClosedTex" OutName="town_shooting_gallery_man_eye_closed" Format="rgba16" Width="32" Height="32" Offset="0x10390" />
<Texture Name="gTownShootingGalleryManBeardAndLipsTex" OutName="town_shooting_gallery_man_beard_and_lips" Format="ci8" Width="32" Height="32" Offset="0x10B90" /> <!-- Used only for the lips -->
<Texture Name="gTownShootingGalleryManNoseTex" OutName="town_shooting_gallery_man_nose" Format="ci8" Width="8" Height="8" Offset="0x10F90" />
<Texture Name="gTownShootingGalleryManEarTex" OutName="town_shooting_gallery_man_ear" Format="ci8" Width="16" Height="16" Offset="0x10FD0" />
<Texture Name="gTownShootingGalleryManHairTex" OutName="town_shooting_gallery_man_hair" Format="ci8" Width="16" Height="16" Offset="0x110D0" />
<Texture Name="gTownShootingGalleryManSkinTex" OutName="town_shooting_gallery_man_skin" Format="ci8" Width="8" Height="8" Offset="0x111D0" />
<!-- Unused Empty Texture Animation -->
<TextureAnimation Name="gBurlyGuyUnused11210TexAnim" Offset="0x11210" />
</File>
</Root>
assets/xml/objects/object_wf.xml
+138 -106
View File
@@ -1,110 +1,142 @@
<Root>
<!-- Assets for Wolfos and White Wolfos -->
<File Name="object_wf" Segment="6">
<Texture Name="object_wf_Tex_000000" OutName="tex_000000" Format="rgba16" Width="8" Height="16" Offset="0x0" />
<Texture Name="object_wf_Tex_000100" OutName="tex_000100" Format="rgba16" Width="8" Height="8" Offset="0x100" />
<Texture Name="object_wf_Tex_000180" OutName="tex_000180" Format="rgba16" Width="8" Height="8" Offset="0x180" />
<Texture Name="object_wf_Tex_000200" OutName="tex_000200" Format="rgba16" Width="8" Height="8" Offset="0x200" />
<Texture Name="object_wf_Tex_000280" OutName="tex_000280" Format="rgba16" Width="8" Height="8" Offset="0x280" />
<Texture Name="object_wf_Tex_000300" OutName="tex_000300" Format="rgba16" Width="16" Height="16" Offset="0x300" />
<DList Name="object_wf_DL_001A20" Offset="0x1A20" />
<DList Name="object_wf_DL_001AE8" Offset="0x1AE8" />
<DList Name="object_wf_DL_001BD8" Offset="0x1BD8" />
<DList Name="object_wf_DL_001CC8" Offset="0x1CC8" />
<DList Name="object_wf_DL_001D98" Offset="0x1D98" />
<DList Name="object_wf_DL_001E98" Offset="0x1E98" />
<DList Name="object_wf_DL_001F88" Offset="0x1F88" />
<DList Name="object_wf_DL_002078" Offset="0x2078" />
<DList Name="object_wf_DL_002148" Offset="0x2148" />
<DList Name="object_wf_DL_002248" Offset="0x2248" />
<DList Name="object_wf_DL_002368" Offset="0x2368" />
<DList Name="object_wf_DL_002490" Offset="0x2490" />
<DList Name="object_wf_DL_0025A0" Offset="0x25A0" />
<DList Name="object_wf_DL_0026C8" Offset="0x26C8" />
<Texture Name="object_wf_Tex_0027D8" OutName="tex_0027D8" Format="rgba16" Width="16" Height="16" Offset="0x27D8" />
<Texture Name="object_wf_Tex_0029D8" OutName="tex_0029D8" Format="rgba16" Width="16" Height="16" Offset="0x29D8" />
<DList Name="object_wf_DL_003488" Offset="0x3488" />
<DList Name="object_wf_DL_003528" Offset="0x3528" />
<DList Name="object_wf_DL_0035F0" Offset="0x35F0" />
<DList Name="object_wf_DL_0036B8" Offset="0x36B8" />
<DList Name="object_wf_DL_0039D8" Offset="0x39D8" />
<Limb Name="object_wf_Standardlimb_003A70" Type="Standard" EnumName="OBJECT_WF_1_LIMB_01" Offset="0x3A70" />
<Limb Name="object_wf_Standardlimb_003A7C" Type="Standard" EnumName="OBJECT_WF_1_LIMB_02" Offset="0x3A7C" />
<Limb Name="object_wf_Standardlimb_003A88" Type="Standard" EnumName="OBJECT_WF_1_LIMB_03" Offset="0x3A88" />
<Limb Name="object_wf_Standardlimb_003A94" Type="Standard" EnumName="OBJECT_WF_1_LIMB_04" Offset="0x3A94" />
<Limb Name="object_wf_Standardlimb_003AA0" Type="Standard" EnumName="OBJECT_WF_1_LIMB_05" Offset="0x3AA0" />
<Limb Name="object_wf_Standardlimb_003AAC" Type="Standard" EnumName="OBJECT_WF_1_LIMB_06" Offset="0x3AAC" />
<Limb Name="object_wf_Standardlimb_003AB8" Type="Standard" EnumName="OBJECT_WF_1_LIMB_07" Offset="0x3AB8" />
<Limb Name="object_wf_Standardlimb_003AC4" Type="Standard" EnumName="OBJECT_WF_1_LIMB_08" Offset="0x3AC4" />
<Limb Name="object_wf_Standardlimb_003AD0" Type="Standard" EnumName="OBJECT_WF_1_LIMB_09" Offset="0x3AD0" />
<Limb Name="object_wf_Standardlimb_003ADC" Type="Standard" EnumName="OBJECT_WF_1_LIMB_0A" Offset="0x3ADC" />
<Limb Name="object_wf_Standardlimb_003AE8" Type="Standard" EnumName="OBJECT_WF_1_LIMB_0B" Offset="0x3AE8" />
<Limb Name="object_wf_Standardlimb_003AF4" Type="Standard" EnumName="OBJECT_WF_1_LIMB_0C" Offset="0x3AF4" />
<Limb Name="object_wf_Standardlimb_003B00" Type="Standard" EnumName="OBJECT_WF_1_LIMB_0D" Offset="0x3B00" />
<Limb Name="object_wf_Standardlimb_003B0C" Type="Standard" EnumName="OBJECT_WF_1_LIMB_0E" Offset="0x3B0C" />
<Limb Name="object_wf_Standardlimb_003B18" Type="Standard" EnumName="OBJECT_WF_1_LIMB_0F" Offset="0x3B18" />
<Limb Name="object_wf_Standardlimb_003B24" Type="Standard" EnumName="OBJECT_WF_1_LIMB_10" Offset="0x3B24" />
<Limb Name="object_wf_Standardlimb_003B30" Type="Standard" EnumName="OBJECT_WF_1_LIMB_11" Offset="0x3B30" />
<Limb Name="object_wf_Standardlimb_003B3C" Type="Standard" EnumName="OBJECT_WF_1_LIMB_12" Offset="0x3B3C" />
<Limb Name="object_wf_Standardlimb_003B48" Type="Standard" EnumName="OBJECT_WF_1_LIMB_13" Offset="0x3B48" />
<Limb Name="object_wf_Standardlimb_003B54" Type="Standard" EnumName="OBJECT_WF_1_LIMB_14" Offset="0x3B54" />
<Limb Name="object_wf_Standardlimb_003B60" Type="Standard" EnumName="OBJECT_WF_1_LIMB_15" Offset="0x3B60" />
<Skeleton Name="object_wf_Skel_003BC0" Type="Flex" LimbType="Standard" LimbNone="OBJECT_WF_1_LIMB_NONE" LimbMax="OBJECT_WF_1_LIMB_MAX" EnumName="object_wf_1_Limbs" Offset="0x3BC0" />
<Animation Name="object_wf_Anim_004638" Offset="0x4638" />
<Animation Name="object_wf_Anim_004A90" Offset="0x4A90" />
<Animation Name="object_wf_Anim_004C44" Offset="0x4C44" />
<Animation Name="object_wf_Anim_0053D0" Offset="0x53D0" />
<Animation Name="object_wf_Anim_005700" Offset="0x5700" />
<DList Name="object_wf_DL_006D10" Offset="0x6D10" />
<DList Name="object_wf_DL_006DD8" Offset="0x6DD8" />
<DList Name="object_wf_DL_006EC8" Offset="0x6EC8" />
<DList Name="object_wf_DL_006FB8" Offset="0x6FB8" />
<DList Name="object_wf_DL_007088" Offset="0x7088" />
<DList Name="object_wf_DL_007188" Offset="0x7188" />
<DList Name="object_wf_DL_007278" Offset="0x7278" />
<DList Name="object_wf_DL_007368" Offset="0x7368" />
<DList Name="object_wf_DL_007438" Offset="0x7438" />
<DList Name="object_wf_DL_007538" Offset="0x7538" />
<DList Name="object_wf_DL_007658" Offset="0x7658" />
<DList Name="object_wf_DL_007770" Offset="0x7770" />
<DList Name="object_wf_DL_007880" Offset="0x7880" />
<DList Name="object_wf_DL_007998" Offset="0x7998" />
<Texture Name="object_wf_Tex_007AA8" OutName="tex_007AA8" Format="rgba16" Width="16" Height="16" Offset="0x7AA8" />
<Texture Name="object_wf_Tex_007CA8" OutName="tex_007CA8" Format="rgba16" Width="16" Height="32" Offset="0x7CA8" />
<Texture Name="object_wf_Tex_0080A8" OutName="tex_0080A8" Format="rgba16" Width="8" Height="8" Offset="0x80A8" />
<Texture Name="object_wf_Tex_008128" OutName="tex_008128" Format="rgba16" Width="8" Height="8" Offset="0x8128" />
<Texture Name="object_wf_Tex_0081A8" OutName="tex_0081A8" Format="rgba16" Width="8" Height="8" Offset="0x81A8" />
<Texture Name="object_wf_Tex_008228" OutName="tex_008228" Format="rgba16" Width="8" Height="8" Offset="0x8228" />
<Texture Name="object_wf_Tex_0082A8" OutName="tex_0082A8" Format="rgba16" Width="16" Height="16" Offset="0x82A8" />
<Texture Name="object_wf_Tex_0084A8" OutName="tex_0084A8" Format="rgba16" Width="16" Height="16" Offset="0x84A8" />
<DList Name="object_wf_DL_008E98" Offset="0x8E98" />
<DList Name="object_wf_DL_008F38" Offset="0x8F38" />
<DList Name="object_wf_DL_009000" Offset="0x9000" />
<DList Name="object_wf_DL_0090C8" Offset="0x90C8" />
<DList Name="object_wf_DL_0093E8" Offset="0x93E8" />
<Limb Name="object_wf_Standardlimb_009480" Type="Standard" EnumName="OBJECT_WF_2_LIMB_01" Offset="0x9480" />
<Limb Name="object_wf_Standardlimb_00948C" Type="Standard" EnumName="OBJECT_WF_2_LIMB_02" Offset="0x948C" />
<Limb Name="object_wf_Standardlimb_009498" Type="Standard" EnumName="OBJECT_WF_2_LIMB_03" Offset="0x9498" />
<Limb Name="object_wf_Standardlimb_0094A4" Type="Standard" EnumName="OBJECT_WF_2_LIMB_04" Offset="0x94A4" />
<Limb Name="object_wf_Standardlimb_0094B0" Type="Standard" EnumName="OBJECT_WF_2_LIMB_05" Offset="0x94B0" />
<Limb Name="object_wf_Standardlimb_0094BC" Type="Standard" EnumName="OBJECT_WF_2_LIMB_06" Offset="0x94BC" />
<Limb Name="object_wf_Standardlimb_0094C8" Type="Standard" EnumName="OBJECT_WF_2_LIMB_07" Offset="0x94C8" />
<Limb Name="object_wf_Standardlimb_0094D4" Type="Standard" EnumName="OBJECT_WF_2_LIMB_08" Offset="0x94D4" />
<Limb Name="object_wf_Standardlimb_0094E0" Type="Standard" EnumName="OBJECT_WF_2_LIMB_09" Offset="0x94E0" />
<Limb Name="object_wf_Standardlimb_0094EC" Type="Standard" EnumName="OBJECT_WF_2_LIMB_0A" Offset="0x94EC" />
<Limb Name="object_wf_Standardlimb_0094F8" Type="Standard" EnumName="OBJECT_WF_2_LIMB_0B" Offset="0x94F8" />
<Limb Name="object_wf_Standardlimb_009504" Type="Standard" EnumName="OBJECT_WF_2_LIMB_0C" Offset="0x9504" />
<Limb Name="object_wf_Standardlimb_009510" Type="Standard" EnumName="OBJECT_WF_2_LIMB_0D" Offset="0x9510" />
<Limb Name="object_wf_Standardlimb_00951C" Type="Standard" EnumName="OBJECT_WF_2_LIMB_0E" Offset="0x951C" />
<Limb Name="object_wf_Standardlimb_009528" Type="Standard" EnumName="OBJECT_WF_2_LIMB_0F" Offset="0x9528" />
<Limb Name="object_wf_Standardlimb_009534" Type="Standard" EnumName="OBJECT_WF_2_LIMB_10" Offset="0x9534" />
<Limb Name="object_wf_Standardlimb_009540" Type="Standard" EnumName="OBJECT_WF_2_LIMB_11" Offset="0x9540" />
<Limb Name="object_wf_Standardlimb_00954C" Type="Standard" EnumName="OBJECT_WF_2_LIMB_12" Offset="0x954C" />
<Limb Name="object_wf_Standardlimb_009558" Type="Standard" EnumName="OBJECT_WF_2_LIMB_13" Offset="0x9558" />
<Limb Name="object_wf_Standardlimb_009564" Type="Standard" EnumName="OBJECT_WF_2_LIMB_14" Offset="0x9564" />
<Limb Name="object_wf_Standardlimb_009570" Type="Standard" EnumName="OBJECT_WF_2_LIMB_15" Offset="0x9570" />
<Skeleton Name="object_wf_Skel_0095D0" Type="Flex" LimbType="Standard" LimbNone="OBJECT_WF_2_LIMB_NONE" LimbMax="OBJECT_WF_2_LIMB_MAX" EnumName="object_wf_2_Limbs" Offset="0x95D0" />
<Animation Name="object_wf_Anim_009808" Offset="0x9808" />
<Animation Name="object_wf_Anim_009A50" Offset="0x9A50" />
<Animation Name="object_wf_Anim_00A3CC" Offset="0xA3CC" />
<!-- White Wolfos Textures -->
<Texture Name="gWolfosWhiteFurTex" OutName="wolfos_white_fur" Format="rgba16" Width="8" Height="16" Offset="0x0" />
<Texture Name="gWolfosWhiteToothClawTex" OutName="wolfos_white_tooth_claw" Format="rgba16" Width="8" Height="8" Offset="0x100" />
<Texture Name="gWolfosWhiteMouthTex" OutName="wolfos_white_mouth" Format="rgba16" Width="8" Height="8" Offset="0x180" />
<Texture Name="gWolfosWhiteTongueTex" OutName="wolfos_white_tongue" Format="rgba16" Width="8" Height="8" Offset="0x200" />
<Texture Name="gWolfosWhiteNostrilTex" OutName="wolfos_white_nostril" Format="rgba16" Width="8" Height="8" Offset="0x280" />
<!-- White Wolfos Eye Textures -->
<Texture Name="gWolfosWhiteEyeOpenTex" OutName="wolfos_white_eye_open" Format="rgba16" Width="16" Height="16" Offset="0x300" />
<!-- White Wolfos Limb DisplayLists -->
<DList Name="gWolfosWhiteAbdomenDL" Offset="0x1A20" />
<DList Name="gWolfosWhiteBackRightThighDL" Offset="0x1AE8" />
<DList Name="gWolfosWhiteBackRightShinDL" Offset="0x1BD8" />
<DList Name="gWolfosWhiteBackRightPasternDL" Offset="0x1CC8" />
<DList Name="gWolfosWhiteBackRightPawDL" Offset="0x1D98" />
<DList Name="gWolfosWhiteBackLeftThighDL" Offset="0x1E98" />
<DList Name="gWolfosWhiteBackLeftShinDL" Offset="0x1F88" />
<DList Name="gWolfosWhiteBackLeftPasternDL" Offset="0x2078" />
<DList Name="gWolfosWhiteBackLeftPawDL" Offset="0x2148" />
<DList Name="gWolfosWhiteThoraxDL" Offset="0x2248" />
<DList Name="gWolfosWhiteFrontLeftUpperLegDL" Offset="0x2368" />
<DList Name="gWolfosWhiteFrontLeftLowerLegDL" Offset="0x2490" />
<DList Name="gWolfosWhiteFrontRightUpperLegDL" Offset="0x25A0" />
<DList Name="gWolfosWhiteFrontRightLowerLegDL" Offset="0x26C8" />
<!-- White Wolfos Eye Textures -->
<Texture Name="gWolfosWhiteEyeHalfTex" OutName="wolfos_white_eye_half" Format="rgba16" Width="16" Height="16" Offset="0x27D8" />
<Texture Name="gWolfosWhiteEyeNarrowTex" OutName="wolfos_white_eye_narrow" Format="rgba16" Width="16" Height="16" Offset="0x29D8" />
<!-- White Wolfos Limb DisplayLists -->
<DList Name="gWolfosWhiteTailDL" Offset="0x3488" />
<DList Name="gWolfosWhiteFrontLeftClawDL" Offset="0x3528" />
<DList Name="gWolfosWhiteFrontRightClawDL" Offset="0x35F0" />
<DList Name="gWolfosWhiteHeadDL" Offset="0x36B8" />
<DList Name="gWolfosWhiteEyesDL" Offset="0x39D8" />
<!-- White Wolfos Limbs -->
<Limb Name="gWolfosWhiteRootLimb" Type="Standard" EnumName="WOLFOS_WHITE_LIMB_ROOT" Offset="0x3A70" />
<Limb Name="gWolfosWhiteBackLeftThighLimb" Type="Standard" EnumName="WOLFOS_WHITE_LIMB_BACK_LEFT_THIGH" Offset="0x3A7C" />
<Limb Name="gWolfosWhiteBackLeftShinLimb" Type="Standard" EnumName="WOLFOS_WHITE_LIMB_BACK_LEFT_SHIN" Offset="0x3A88" />
<Limb Name="gWolfosWhiteBackLeftPasternLimb" Type="Standard" EnumName="WOLFOS_WHITE_LIMB_BACK_LEFT_PASTERN" Offset="0x3A94" />
<Limb Name="gWolfosWhiteBackLeftPawLimb" Type="Standard" EnumName="WOLFOS_WHITE_LIMB_BACK_LEFT_PAW" Offset="0x3AA0" />
<Limb Name="gWolfosWhiteTailLimb" Type="Standard" EnumName="WOLFOS_WHITE_LIMB_TAIL" Offset="0x3AAC" />
<Limb Name="gWolfosWhiteAbdomenLimb" Type="Standard" EnumName="WOLFOS_WHITE_LIMB_ABDOMEN" Offset="0x3AB8" />
<Limb Name="gWolfosWhiteBackRightThighLimb" Type="Standard" EnumName="WOLFOS_WHITE_LIMB_BACK_RIGHT_THIGH" Offset="0x3AC4" />
<Limb Name="gWolfosWhiteBackRightShinLimb" Type="Standard" EnumName="WOLFOS_WHITE_LIMB_BACK_RIGHT_SHIN" Offset="0x3AD0" />
<Limb Name="gWolfosWhiteBackRightPasternLimb" Type="Standard" EnumName="WOLFOS_WHITE_LIMB_BACK_RIGHT_PASTERN" Offset="0x3ADC" />
<Limb Name="gWolfosWhiteBackRightPawLimb" Type="Standard" EnumName="WOLFOS_WHITE_LIMB_BACK_RIGHT_PAW" Offset="0x3AE8" />
<Limb Name="gWolfosWhiteThoraxLimb" Type="Standard" EnumName="WOLFOS_WHITE_LIMB_THORAX" Offset="0x3AF4" />
<Limb Name="gWolfosWhiteFrontRightUpperLegLimb" Type="Standard" EnumName="WOLFOS_WHITE_LIMB_FRONT_RIGHT_UPPER_LEG" Offset="0x3B00" />
<Limb Name="gWolfosWhiteFrontRightLowerLegLimb" Type="Standard" EnumName="WOLFOS_WHITE_LIMB_FRONT_RIGHT_LOWER_LEG" Offset="0x3B0C" />
<Limb Name="gWolfosWhiteFrontRightClawLimb" Type="Standard" EnumName="WOLFOS_WHITE_LIMB_FRONT_RIGHT_CLAW" Offset="0x3B18" />
<Limb Name="gWolfosWhiteHeadRootLimb" Type="Standard" EnumName="WOLFOS_WHITE_LIMB_HEAD_ROOT" Offset="0x3B24" />
<Limb Name="gWolfosWhiteHeadLimb" Type="Standard" EnumName="WOLFOS_WHITE_LIMB_HEAD" Offset="0x3B30" />
<Limb Name="gWolfosWhiteEyesLimb" Type="Standard" EnumName="WOLFOS_WHITE_LIMB_EYES" Offset="0x3B3C" />
<Limb Name="gWolfosWhiteFrontLeftUpperLegLimb" Type="Standard" EnumName="WOLFOS_WHITE_LIMB_FRONT_LEFT_UPPER_LEG" Offset="0x3B48" />
<Limb Name="gWolfosWhiteFrontLeftLowerLegLimb" Type="Standard" EnumName="WOLFOS_WHITE_LIMB_FRONT_LEFT_LOWER_LEG" Offset="0x3B54" />
<Limb Name="gWolfosWhiteFrontLeftClawLimb" Type="Standard" EnumName="WOLFOS_WHITE_LIMB_FRONT_LEFT_CLAW" Offset="0x3B60" />
<!-- White Wolfos Skeleton -->
<Skeleton Name="gWolfosWhiteSkel" Type="Flex" LimbType="Standard" LimbNone="WOLFOS_WHITE_LIMB_NONE" LimbMax="WOLFOS_WHITE_LIMB_MAX" EnumName="WolfosWhiteLimbs" Offset="0x3BC0" />
<!-- Wolfos/White Wolfos Animations -->
<Animation Name="gWolfosSlashingAnim" Offset="0x4638" /> <!-- Original name is "wolfman_attack" -->
<Animation Name="gWolfosBackflippingAnim" Offset="0x4A90" /> <!-- Original name is "wolfman_back_jump" -->
<Animation Name="gWolfosBlockingAnim" Offset="0x4C44" /> <!-- Original name is "wolfman_defense" -->
<Animation Name="gWolfosRearingUpFallingOverAnim" Offset="0x53D0" /> <!-- Original name is "wolfman_down" -->
<Animation Name="gWolfosRunningAnim" Offset="0x5700" /> <!-- Original name is "wolfman_run" -->
<!-- Wolfos Limb DisplayLists -->
<DList Name="gWolfosNormalAbdomenDL" Offset="0x6D10" />
<DList Name="gWolfosNormalBackRightThighDL" Offset="0x6DD8" />
<DList Name="gWolfosNormalBackRightShinDL" Offset="0x6EC8" />
<DList Name="gWolfosNormalBackRightPasternDL" Offset="0x6FB8" />
<DList Name="gWolfosNormalBackRightPawDL" Offset="0x7088" />
<DList Name="gWolfosNormalBackLeftThighDL" Offset="0x7188" />
<DList Name="gWolfosNormalBackLeftShinDL" Offset="0x7278" />
<DList Name="gWolfosNormalBackLeftPasternDL" Offset="0x7368" />
<DList Name="gWolfosNormalBackLeftPawDL" Offset="0x7438" />
<DList Name="gWolfosNormalThoraxDL" Offset="0x7538" />
<DList Name="gWolfosNormalFrontLeftUpperLegDL" Offset="0x7658" />
<DList Name="gWolfosNormalFrontLeftLowerLegDL" Offset="0x7770" />
<DList Name="gWolfosNormalFrontRightUpperLegDL" Offset="0x7880" />
<DList Name="gWolfosNormalFrontRightLowerLegDL" Offset="0x7998" />
<!-- Wolfos Eye Textures -->
<Texture Name="gWolfosNormalEyeOpenTex" OutName="wolfos_normal_eye_open" Format="rgba16" Width="16" Height="16" Offset="0x7AA8" />
<!-- Wolfos Textures -->
<Texture Name="gWolfosNormalFurTex" OutName="wolfos_normal_fur" Format="rgba16" Width="16" Height="32" Offset="0x7CA8" />
<Texture Name="gWolfosNormalMouthTex" OutName="wolfos_normal_mouth" Format="rgba16" Width="8" Height="8" Offset="0x80A8" />
<Texture Name="gWolfosNormalTongueTex" OutName="wolfos_normal_tongue" Format="rgba16" Width="8" Height="8" Offset="0x8128" />
<Texture Name="gWolfosNormalToothClawTex" OutName="wolfos_normal_tooth_claw" Format="rgba16" Width="8" Height="8" Offset="0x81A8" />
<Texture Name="gWolfosNormalNostrilTex" OutName="wolfos_normal_nostril" Format="rgba16" Width="8" Height="8" Offset="0x8228" />
<!-- Wolfos Eye Textures -->
<Texture Name="gWolfosNormalEyeHalfTex" OutName="wolfos_normal_eye_half" Format="rgba16" Width="16" Height="16" Offset="0x82A8" />
<Texture Name="gWolfosNormalEyeNarrowTex" OutName="wolfos_normal_eye_narrow" Format="rgba16" Width="16" Height="16" Offset="0x84A8" />
<!-- Wolfos Limb DisplayLists -->
<DList Name="gWolfosNormalTailDL" Offset="0x8E98" />
<DList Name="gWolfosNormalFrontLeftClawDL" Offset="0x8F38" />
<DList Name="gWolfosNormalFrontRightClawDL" Offset="0x9000" />
<DList Name="gWolfosNormalHeadDL" Offset="0x90C8" />
<DList Name="gWolfosNormalEyesDL" Offset="0x93E8" />
<!-- Wolfos Limbs -->
<Limb Name="gWolfosNormalRootLimb" Type="Standard" EnumName="WOLFOS_NORMAL_LIMB_ROOT" Offset="0x9480" />
<Limb Name="gWolfosNormalBackLeftThighLimb" Type="Standard" EnumName="WOLFOS_NORMAL_LIMB_BACK_LEFT_THIGH" Offset="0x948C" />
<Limb Name="gWolfosNormalBackLeftShinLimb" Type="Standard" EnumName="WOLFOS_NORMAL_LIMB_BACK_LEFT_SHIN" Offset="0x9498" />
<Limb Name="gWolfosNormalBackLeftPasternLimb" Type="Standard" EnumName="WOLFOS_NORMAL_LIMB_BACK_LEFT_PASTERN" Offset="0x94A4" />
<Limb Name="gWolfosNormalBackLeftPawLimb" Type="Standard" EnumName="WOLFOS_NORMAL_LIMB_BACK_LEFT_PAW" Offset="0x94B0" />
<Limb Name="gWolfosNormalTailLimb" Type="Standard" EnumName="WOLFOS_NORMAL_LIMB_TAIL" Offset="0x94BC" />
<Limb Name="gWolfosNormalAbdomenLimb" Type="Standard" EnumName="WOLFOS_NORMAL_LIMB_ABDOMEN" Offset="0x94C8" />
<Limb Name="gWolfosNormalBackRightThighLimb" Type="Standard" EnumName="WOLFOS_NORMAL_LIMB_BACK_RIGHT_THIGH" Offset="0x94D4" />
<Limb Name="gWolfosNormalBackRightShinLimb" Type="Standard" EnumName="WOLFOS_NORMAL_LIMB_BACK_RIGHT_SHIN" Offset="0x94E0" />
<Limb Name="gWolfosNormalBackRightPasternLimb" Type="Standard" EnumName="WOLFOS_NORMAL_LIMB_BACK_RIGHT_PASTERN" Offset="0x94EC" />
<Limb Name="gWolfosNormalBackRightPawLimb" Type="Standard" EnumName="WOLFOS_NORMAL_LIMB_BACK_RIGHT_PAW" Offset="0x94F8" />
<Limb Name="gWolfosNormalThoraxLimb" Type="Standard" EnumName="WOLFOS_NORMAL_LIMB_THORAX" Offset="0x9504" />
<Limb Name="gWolfosNormalFrontRightUpperLegLimb" Type="Standard" EnumName="WOLFOS_NORMAL_LIMB_FRONT_RIGHT_UPPER_LEG" Offset="0x9510" />
<Limb Name="gWolfosNormalFrontRightLowerLegLimb" Type="Standard" EnumName="WOLFOS_NORMAL_LIMB_FRONT_RIGHT_LOWER_LEG" Offset="0x951C" />
<Limb Name="gWolfosNormalFrontRightClawLimb" Type="Standard" EnumName="WOLFOS_NORMAL_LIMB_FRONT_RIGHT_CLAW" Offset="0x9528" />
<Limb Name="gWolfosNormalHeadRootLimb" Type="Standard" EnumName="WOLFOS_NORMAL_LIMB_HEAD_ROOT" Offset="0x9534" />
<Limb Name="gWolfosNormalHeadLimb" Type="Standard" EnumName="WOLFOS_NORMAL_LIMB_HEAD" Offset="0x9540" />
<Limb Name="gWolfosNormalEyesLimb" Type="Standard" EnumName="WOLFOS_NORMAL_LIMB_EYES" Offset="0x954C" />
<Limb Name="gWolfosNormalFrontLeftUpperLegLimb" Type="Standard" EnumName="WOLFOS_NORMAL_LIMB_FRONT_LEFT_UPPER_LEG" Offset="0x9558" />
<Limb Name="gWolfosNormalFrontLeftLowerLegLimb" Type="Standard" EnumName="WOLFOS_NORMAL_LIMB_FRONT_LEFT_LOWER_LEG" Offset="0x9564" />
<Limb Name="gWolfosNormalFrontLeftClawLimb" Type="Standard" EnumName="WOLFOS_NORMAL_LIMB_FRONT_LEFT_CLAW" Offset="0x9570" />
<!-- Wolfos Skeleton -->
<Skeleton Name="gWolfosNormalSkel" Type="Flex" LimbType="Standard" LimbNone="WOLFOS_NORMAL_LIMB_NONE" LimbMax="WOLFOS_NORMAL_LIMB_MAX" EnumName="WolfosNormalLimbs" Offset="0x95D0" />
<!-- Wolfos/White Wolfos Animations -->
<Animation Name="gWolfosSidesteppingAnim" Offset="0x9808" /> <!-- Original name is "wolfman_side_walk" -->
<Animation Name="gWolfosDamagedAnim" Offset="0x9A50" /> <!-- Originla name is "wolfman_tail_hit" -->
<Animation Name="gWolfosWaitingAnim" Offset="0xA3CC" /> <!-- Original name is "wolfman_wait" -->
</File>
</Root>
assets/xml/overlays/ovl_En_Syateki_Okuta.xml
+8 -8
View File
@@ -1,13 +1,13 @@
<Root>
<!-- Shooting Gallery Octorok assets -->
<File Name="ovl_En_Syateki_Okuta" BaseAddress="0x80A35FF0" RangeStart="0x1640" RangeEnd="0x1B98">
<DList Name="ovl_En_Syateki_Okuta_DL_001640" Offset="0x1640"/>
<Texture Name="ovl_En_Syateki_Okuta_Tex_001658" OutName="tex_001658" Format="ia16" Width="16" Height="16" Offset="0x1658"/>
<Texture Name="ovl_En_Syateki_Okuta_Tex_001858" OutName="tex_001858" Format="ia16" Width="16" Height="16" Offset="0x1858"/>
<Array Name="ovl_En_Syateki_Okuta_Vtx_001A58" Count="4" Offset="0x1A58">
<Vtx/>
</Array>
<DList Name="ovl_En_Syateki_Okuta_DL_001A98" Offset="0x1A98"/>
<DList Name="ovl_En_Syateki_Okuta_DL_001B18" Offset="0x1B18"/>
<!-- DisplayList that turns certain Octoroks blue -->
<DList Name="gShootingGalleryOctorokBlueMaterialDL" Offset="0x1640"/>
<!-- Textures and DisplayLists for the cross and circle indicators that appear when you shoot an Octorok -->
<Texture Name="gShootingGalleryOctorokCrossTex" OutName="shooting_gallery_octorok_cross" Format="ia16" Width="16" Height="16" Offset="0x1658"/>
<Texture Name="gShootingGalleryOctorokCircleTex" OutName="shooting_gallery_octorok_circle" Format="ia16" Width="16" Height="16" Offset="0x1858"/>
<DList Name="gShootingGalleryOctorokCrossDL" Offset="0x1A98"/>
<DList Name="gShootingGalleryOctorokCircleDL" Offset="0x1B18"/>
</File>
</Root>
include/functions.h
+3 -22
View File
@@ -2006,7 +2006,7 @@ s32 func_80123810(GlobalContext* globalCtx);
void func_80123AA4(Player* player, s32 arg1);
// void func_80123BD4(void);
// void func_80123C58(void);
void Player_SetEquipmentData(GlobalContext* globalCtx, Player* this);
void Player_SetEquipmentData(GlobalContext* globalCtx, Player* this);
void func_80123D50(GlobalContext* globalCtx, Player* player, UNK_TYPE arg2, UNK_TYPE arg3);
void func_80123DA4(Player* player);
// void func_80123DC0(void);
@@ -2298,26 +2298,7 @@ s32 Entrance_GetSceneNum(u16 entranceIndex);
s32 Entrance_GetSceneNumAbsolute(u16 entranceIndex);
s32 Entrance_GetSpawnNum(u16 entranceIndex);
s32 Entrance_GetTransitionFlags(u16 entranceIndex);
// void func_801323D0(void);
// void func_80132428(void);
// void func_80132494(void);
// void func_801326B8(void);
// void func_801328F0(void);
// void func_80132920(void);
// void func_80132938(void);
// void func_80132954(void);
// void func_8013296C(void);
// void func_80132A18(void);
// void func_80132A3C(void);
// void func_80132A80(void);
// void func_80132AD8(void);
// void func_80132B24(void);
// void func_80132B84(void);
// void func_80132D70(void);
// void func_80132E9C(void);
// void func_80132FDC(void);
// void func_80133000(void);
UNK_TYPE func_80133038(GlobalContext* globalCtx, UNK_TYPE* arg1, struct_80133038_arg2* arg2);
s32 Schedule_RunScript(GlobalContext* globalCtx, u8* script, ScheduleResult* result);
void SkelAnime_DrawLimbLod(GlobalContext* globalCtx, s32 limbIndex, void** skeleton, Vec3s* jointTable, OverrideLimbDrawOpa overrideLimbDraw, PostLimbDrawOpa postLimbDraw, Actor* actor, s32 lod);
void SkelAnime_DrawLod(GlobalContext* globalCtx, void** skeleton, Vec3s* jointTable, OverrideLimbDrawOpa overrideLimbDraw, PostLimbDrawOpa postLimbDraw, Actor* actor, s32 lod);
void SkelAnime_DrawFlexLimbLod(GlobalContext* globalCtx, s32 limbIndex, void** skeleton, Vec3s* jointTable, OverrideLimbDrawFlex overrideLimbDraw, PostLimbDrawFlex postLimbDraw, Actor* actor, s32 lod, Mtx** mtx);
@@ -2565,7 +2546,7 @@ s32 func_80142440(SkyboxContext* skyboxCtx, Vtx* vtx, s32 arg2, s32 arg3, s32 ar
void func_80143148(SkyboxContext* skyboxCtx, s32 arg1);
void func_801431E8(GameState* gameState, SkyboxContext* skyboxCtx, s16 skyType);
void func_80143324(GlobalContext* globalCtx, SkyboxContext* skyboxCtx, s16 skyType);
void func_801434E4(GameState* gameState, SkyboxContext* skyboxCtx, s16 skyType);
void func_801434E4(GameState* gameState, SkyboxContext* skyboxCtx, s16 skyType);
Mtx* SkyboxDraw_UpdateMatrix(SkyboxContext* skyboxCtx, f32 x, f32 y, f32 z);
void SkyboxDraw_SetColors(SkyboxContext* skyboxCtx, u8 primR, u8 primG, u8 primB, u8 envR, u8 envG, u8 envB);
void SkyboxDraw_Draw(SkyboxContext* skyboxCtx, GraphicsContext* gfxCtx, s16 skyboxId, s16 blend, f32 x, f32 y, f32 z);
include/z64.h
+3 -8
View File
@@ -39,6 +39,7 @@
#include "z64player.h"
#include "z64save.h"
#include "z64scene.h"
#include "z64schedule.h"
#include "z64skin.h"
#include "z64subs.h"
#include "z64transition.h"
@@ -932,7 +933,7 @@ typedef struct {
/* 0x12070 */ s32 unk12070;
/* 0x12074 */ UNK_TYPE1 pad12074[0x4];
/* 0x12078 */ s32 bankRupeesSelected;
/* 0x1207C */ s32 bankRupees;
/* 0x1207C */ s32 bankRupees;
/* 0x12080 */ MessageTableEntry* messageEntryTable;
/* 0x12084 */ MessageTableEntry* messageEntryTableNes;
/* 0x12088 */ UNK_TYPE4 unk12088;
@@ -1272,7 +1273,7 @@ typedef struct {
/* 0x12C */ UNK_TYPE1 pad_12C[0x4];
/* 0x130 */ OSThread thread;
} AudioMgr; // size = 0x2E0
typedef struct {
/* 0x00 */ MtxF displayMatrix;
/* 0x40 */ Actor* actor;
@@ -1448,12 +1449,6 @@ typedef struct {
/* 0x24 */ s16 unk_24;
} struct_800BD888_arg1; // size = 0x28
typedef struct {
/* 0x0 */ u8 unk0;
/* 0x4 */ s32 unk4;
/* 0x8 */ s32 unk8; // game script pointer?
} struct_80133038_arg2; // size = 0xC
typedef struct {
/* 0x00 */ u32 type;
/* 0x04 */ u32 setScissor;
include/z64schedule.h
+248
View File
@@ -0,0 +1,248 @@
#ifndef Z64SCHEDULE_H
#define Z64SCHEDULE_H
#include "ultra64.h"
/*
Schedule is a subsystem that acts as a way to make decisions based on the
time and scene (and a limited selection of items). It is utilized by writing
a script that is encoded into bytecode and ran, returning the result in a
struct. The returned result can be a value or a encoded time value.
The scripts contain 2 kinds of instructions:
- Checks with branches (relative offsets, either 1-byte offsets (short, *_S),
or 2-byte offsets (long, *_L))
- Returns
Scripts are stored as u8[]. They are built using the macros are the bottom of
this file. The scheduledis.py script can be used to convert any scripts in
actor data into the macros.
*/
// Macro to convert the time format used in the save struct into the format used in Schedule
#define SCHEDULE_CONVERT_TIME(time) ((time) - 0x10000 / 360 * 90)
#define SCHEDULE_TIME_NOW SCHEDULE_CONVERT_TIME(gSaveContext.save.time)
typedef enum {
/* 00 */ SCHEDULE_CMD_ID_CHECK_FLAG_S, // Checks if a weekEventReg flag is set and branches if so, short range branch
/* 01 */ SCHEDULE_CMD_ID_CHECK_FLAG_L, // Checks if a weekEventReg flag is set and branches if so, long range branch
/* 02 */ SCHEDULE_CMD_ID_CHECK_TIME_RANGE_S, // Checks if the current time is within the range of the two provided times and branches if so, short range branch
/* 03 */ SCHEDULE_CMD_ID_CHECK_TIME_RANGE_L, // Checks if the current time is within the range of the two provided times and branches if so, long range branch
/* 04 */ SCHEDULE_CMD_ID_RET_VAL_L, // Ends script and returns 2-byte value (Note: bugged as the return value size is only 1 byte in the struct)
/* 05 */ SCHEDULE_CMD_ID_RET_NONE, // Ends script without returning anything
/* 06 */ SCHEDULE_CMD_ID_RET_EMPTY, // Ends script and indicates return without changing existing value
/* 07 */ SCHEDULE_CMD_ID_NOP, // No-Op
/* 08 */ SCHEDULE_CMD_ID_CHECK_MISC_S, // Special check based on items or masks and branches if check passes, short range branch
/* 09 */ SCHEDULE_CMD_ID_RET_VAL_S, // Ends script and returns byte value
/* 10 */ SCHEDULE_CMD_ID_CHECK_NOT_IN_SCENE_S, // Checks if the current scene is not SceneNum and branches if so, short range branch
/* 11 */ SCHEDULE_CMD_ID_CHECK_NOT_IN_SCENE_L, // Checks if the current scene is not SceneNum and branches if so, long range branch
/* 12 */ SCHEDULE_CMD_ID_CHECK_NOT_IN_DAY_S, // Checks if the current day is not Day and branches if so, short range branch
/* 13 */ SCHEDULE_CMD_ID_CHECK_NOT_IN_DAY_L, // Checks if the current day is not Day and branches if so, long range branch
/* 14 */ SCHEDULE_CMD_ID_RET_TIME, // Returns 2 time values
/* 15 */ SCHEDULE_CMD_ID_CHECK_BEFORE_TIME_S, // Branches if the current time is less than the command time, short range branch
/* 16 */ SCHEDULE_CMD_ID_CHECK_BEFORE_TIME_L, // Branches if the current time is less than the command time, long range branch
/* 17 */ SCHEDULE_CMD_ID_BRANCH_S, // Always branch, short range branch
/* 18 */ SCHEDULE_CMD_ID_BRANCH_L, // Always branch, long range branch
} ScheduleCommandId;
typedef enum {
/* 0 */ SCHEDULE_CHECK_MISC_ROOM_KEY,
/* 1 */ SCHEDULE_CHECK_MISC_LETTER_TO_KAFEI,
/* 2 */ SCHEDULE_CHECK_MISC_MASK_ROMANI,
} ScheduleCheckMisc;
typedef struct {
/* 0x0 */ u8 result;
/* 0x4 */ s32 time0;
/* 0x8 */ s32 time1;
/* 0xC */ s32 hasResult;
} ScheduleResult; // size = 0x10
typedef struct {
/* 0x0 */ u8 cmd;
} ScheduleCmdBase; // size = 0x1
typedef struct {
/* 0x0 */ ScheduleCmdBase base;
/* 0x1 */ u8 flagByte;
/* 0x2 */ u8 flagMask;
/* 0x3 */ s8 offset;
} ScheduleCmdCheckFlagS; // size = 0x4
typedef struct {
/* 0x0 */ ScheduleCmdBase base;
/* 0x1 */ u8 flagByte;
/* 0x2 */ u8 flagMask;
/* 0x3 */ u8 offsetH;
/* 0x4 */ u8 offsetL;
} ScheduleCmdCheckFlagL; // size = 0x5
typedef struct {
/* 0x0 */ ScheduleCmdBase base;
/* 0x1 */ u8 startHr;
/* 0x2 */ u8 startMin;
/* 0x3 */ u8 endHr;
/* 0x4 */ u8 endMin;
/* 0x5 */ s8 offset;
} ScheduleCmdCheckTimeRangeS; // size = 0x6
typedef struct {
/* 0x0 */ ScheduleCmdBase base;
/* 0x1 */ u8 startHr;
/* 0x2 */ u8 startMin;
/* 0x3 */ u8 endHr;
/* 0x4 */ u8 endMin;
/* 0x5 */ u8 offsetH;
/* 0x6 */ u8 offsetL;
} ScheduleCmdCheckTimeRangeL; // size = 0x7
typedef struct {
/* 0x0 */ ScheduleCmdBase base;
/* 0x1 */ u8 retH;
/* 0x2 */ u8 retL;
} ScheduleCmdReturnValueL; // size = 0x3
typedef struct {
/* 0x0 */ ScheduleCmdBase base;
/* 0x1 */ u8 unk1;
/* 0x2 */ u8 unk2;
/* 0x3 */ u8 unk3;
} ScheduleCmdNop; // size = 0x4
typedef struct {
/* 0x0 */ ScheduleCmdBase base;
/* 0x1 */ u8 which;
/* 0x2 */ s8 offset;
} ScheduleCmdCheckMiscS; // size = 0x3
typedef struct {
/* 0x0 */ ScheduleCmdBase base;
/* 0x1 */ u8 result;
} ScheduleCmdReturnValueS; // size = 0x2
typedef struct {
/* 0x0 */ ScheduleCmdBase base;
/* 0x1 */ u8 sceneH;
/* 0x2 */ u8 sceneL;
/* 0x3 */ s8 offset;
} ScheduleCmdCheckNotInSceneS; // size = 0x4
typedef struct {
/* 0x0 */ ScheduleCmdBase base;
/* 0x1 */ u8 sceneH;
/* 0x2 */ u8 sceneL;
/* 0x3 */ u8 offsetH;
/* 0x4 */ u8 offsetL;
} ScheduleCmdCheckNotInSceneL; // size = 0x5
typedef struct {
/* 0x0 */ ScheduleCmdBase base;
/* 0x1 */ u8 dayH;
/* 0x2 */ u8 dayL;
/* 0x3 */ s8 offset;
} ScheduleCmdCheckNotInDayS; // size = 0x4
typedef struct {
/* 0x0 */ ScheduleCmdBase base;
/* 0x1 */ u8 dayH;
/* 0x2 */ u8 dayL;
/* 0x3 */ u8 offsetH;
/* 0x4 */ u8 offsetL;
} ScheduleCmdCheckNotInDayL; // size = 0x5
typedef struct {
/* 0x0 */ ScheduleCmdBase base;
/* 0x1 */ u8 time0Hr;
/* 0x2 */ u8 time0Min;
/* 0x3 */ u8 time1Hr;
/* 0x4 */ u8 time1Min;
/* 0x5 */ u8 result;
} ScheduleCmdReturnTime; // size = 0x6
typedef struct {
/* 0x0 */ ScheduleCmdBase base;
/* 0x1 */ u8 timeHr;
/* 0x2 */ u8 timeMin;
/* 0x3 */ s8 offset;
} ScheduleCmdCheckBeforeTimeS; // size = 0x4
typedef struct {
/* 0x0 */ ScheduleCmdBase base;
/* 0x1 */ u8 timeHr;
/* 0x2 */ u8 timeMin;
/* 0x3 */ u8 offsetH;
/* 0x4 */ u8 offsetL;
} ScheduleCmdCheckBeforeTimeL; // size = 0x5
typedef struct {
/* 0x0 */ ScheduleCmdBase base;
/* 0x1 */ s8 offset;
} ScheduleCmdBranchS; // size = 0x2
typedef struct {
/* 0x0 */ ScheduleCmdBase base;
/* 0x1 */ u8 offsetH;
/* 0x2 */ u8 offsetL;
} ScheduleCmdBranchL; // size = 0x3
#define SCHEDULE_PACK_S16(val) \
((val) >> 8) & 0xFF, (val) & 0xFF
#define SCHEDULE_CMD_CHECK_FLAG_S(index, mask, offset) \
SCHEDULE_CMD_ID_CHECK_FLAG_S, (index), (mask), (offset)
#define SCHEDULE_CMD_CHECK_FLAG_L(index, mask, offset) \
SCHEDULE_CMD_ID_CHECK_FLAG_L, (index), (mask), SCHEDULE_PACK_S16(offset)
#define SCHEDULE_CMD_CHECK_TIME_RANGE_S(startHr, startMin, endHr, endMin, offset) \
SCHEDULE_CMD_ID_CHECK_TIME_RANGE_S, (startHr), (startMin), (endHr), (endMin), (offset)
#define SCHEDULE_CMD_CHECK_TIME_RANGE_L(startHr, startMin, endHr, endMin, offset) \
SCHEDULE_CMD_ID_CHECK_TIME_RANGE_L, (startHr), (startMin), (endHr), (endMin), SCHEDULE_PACK_S16(offset)
#define SCHEDULE_CMD_RET_VAL_L(result) \
SCHEDULE_CMD_ID_RET_VAL_L, SCHEDULE_PACK_S16(result)
#define SCHEDULE_CMD_RET_NONE() \
SCHEDULE_CMD_ID_RET_NONE
#define SCHEDULE_CMD_RET_EMPTY() \
SCHEDULE_CMD_ID_RET_EMPTY,
#define SCHEDULE_CMD_NOP(unk0, unk1, unk2) \
SCHEDULE_CMD_ID_NOP, (unk0), (unk1), (unk2)
#define SCHEDULE_CMD_CHECK_MISC_S(which, offset) \
SCHEDULE_CMD_ID_CHECK_MISC_S, (which), (offset)
#define SCHEDULE_CMD_RET_VAL_S(result) \
SCHEDULE_CMD_ID_RET_VAL_S, (result)
#define SCHEDULE_CMD_CHECK_NOT_IN_SCENE_S(scene, offset) \
SCHEDULE_CMD_ID_CHECK_NOT_IN_SCENE_S, SCHEDULE_PACK_S16(scene), (offset)
#define SCHEDULE_CMD_CHECK_NOT_IN_SCENE_L(scene, offset) \
SCHEDULE_CMD_ID_CHECK_NOT_IN_SCENE_L, SCHEDULE_PACK_S16(scene), SCHEDULE_PACK_S16(offset)
#define SCHEDULE_CMD_CHECK_NOT_IN_DAY_S(day, offset) \
SCHEDULE_CMD_ID_CHECK_NOT_IN_DAY_S, SCHEDULE_PACK_S16(day), (offset)
#define SCHEDULE_CMD_CHECK_NOT_IN_DAY_L(day, offset) \
SCHEDULE_CMD_ID_CHECK_NOT_IN_DAY_L, SCHEDULE_PACK_S16(day), SCHEDULE_PACK_S16(offset)
#define SCHEDULE_CMD_RET_TIME(time0Hr, time0Min, time1Hr, time1Min, result) \
SCHEDULE_CMD_ID_RET_TIME, (time0Hr), (time0Min), (time1Hr), (time1Min), (result)
#define SCHEDULE_CMD_CHECK_BEFORE_TIME_S(timeHr, timeMin, offset) \
SCHEDULE_CMD_ID_CHECK_BEFORE_TIME_S, (timeHr), (timeMin), (offset)
#define SCHEDULE_CMD_CHECK_BEFORE_TIME_L(timeHr, timeMin, offset) \
SCHEDULE_CMD_ID_CHECK_BEFORE_TIME_L, (timeHr), (timeMin), SCHEDULE_PACK_S16(offset)
#define SCHEDULE_CMD_BRANCH_S(offset) \
SCHEDULE_CMD_ID_BRANCH_S, (offset)
#define SCHEDULE_CMD_BRANCH_L(offset) \
SCHEDULE_CMD_ID_BRANCH_L, SCHEDULE_PACK_S16(offset)
#endif
spec
+9 -9
View File
@@ -376,13 +376,15 @@ beginseg
name "story_static"
compress
romalign 0x1000
include "build/baserom/story_static.o"
include "build/assets/misc/story_static/story_static.o"
number 7
endseg
beginseg
name "do_action_static"
romalign 0x1000
include "build/baserom/do_action_static.o"
include "build/assets/interface/do_action_static/do_action_static.o"
number 9
endseg
beginseg
@@ -518,8 +520,7 @@ beginseg
include "build/data/code/code_801C2730.data.o"
include "build/src/code/z_scene_proc.o"
include "build/src/code/z_scene_table.o"
include "build/src/code/code_801323D0.o"
include "build/data/code/code_801C5C50.data.o"
include "build/src/code/z_schedule.o"
include "build/src/code/z_skelanime.o"
include "build/src/code/z_skin.o"
include "build/src/code/z_skin_awb.o"
@@ -1114,8 +1115,7 @@ beginseg
name "ovl_Demo_Effect"
compress
include "build/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.o"
include "build/data/ovl_Demo_Effect/ovl_Demo_Effect.data.o"
include "build/data/ovl_Demo_Effect/ovl_Demo_Effect.reloc.o"
include "build/src/overlays/actors/ovl_Demo_Effect/ovl_Demo_Effect_reloc.o"
endseg
beginseg
@@ -3436,8 +3436,7 @@ beginseg
name "ovl_Bg_Open_Spot"
compress
include "build/src/overlays/actors/ovl_Bg_Open_Spot/z_bg_open_spot.o"
include "build/data/ovl_Bg_Open_Spot/ovl_Bg_Open_Spot.data.o"
include "build/data/ovl_Bg_Open_Spot/ovl_Bg_Open_Spot.reloc.o"
include "build/src/overlays/actors/ovl_Bg_Open_Spot/ovl_Bg_Open_Spot_reloc.o"
endseg
beginseg
@@ -9144,7 +9143,8 @@ endseg
beginseg
name "week_static"
romalign 0x1000
include "build/baserom/week_static.o"
include "build/assets/interface/week_static/week_static.o"
number 9
endseg
beginseg
src/boot_O2_g3/idle.c
+1
View File
@@ -1,3 +1,4 @@
#include "prevent_bss_reordering.h"
#include "global.h"
u8 D_80096B20 = 1;
src/code/code_801323D0.c
-41
View File
@@ -1,41 +0,0 @@
#include "global.h"
#pragma GLOBAL_ASM("asm/non_matchings/code/code_801323D0/func_801323D0.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/code_801323D0/func_80132428.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/code_801323D0/func_80132494.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/code_801323D0/func_801326B8.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/code_801323D0/func_801328F0.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/code_801323D0/func_80132920.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/code_801323D0/func_80132938.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/code_801323D0/func_80132954.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/code_801323D0/func_8013296C.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/code_801323D0/func_80132A18.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/code_801323D0/func_80132A3C.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/code_801323D0/func_80132A80.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/code_801323D0/func_80132AD8.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/code_801323D0/func_80132B24.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/code_801323D0/func_80132B84.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/code_801323D0/func_80132D70.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/code_801323D0/func_80132E9C.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/code_801323D0/func_80132FDC.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/code_801323D0/func_80133000.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/code_801323D0/func_80133038.s")
src/code/z_bgcheck.c
-1
View File
@@ -1,4 +1,3 @@
#include "prevent_bss_reordering.h"
#include "global.h"
#include "vt.h"
src/code/z_collision_check.c
-1
View File
@@ -1,4 +1,3 @@
#include "prevent_bss_reordering.h"
#include "global.h"
Vec3f D_801EDE00;
src/code/z_demo.c
-1
View File
@@ -1,4 +1,3 @@
#include "prevent_bss_reordering.h"
#include "global.h"
#include "overlays/gamestates/ovl_daytelop/z_daytelop.h"
src/code/z_schedule.c
+283
View File
@@ -0,0 +1,283 @@
#include "global.h"
#define SCHEDULE_CALC_TIME(hour, minute, dest, temp) \
(temp) = (hour)*60.0f; \
(temp) += (minute); \
(dest) = (temp) * (0x10000 / 60 / 24.0f); \
(dest) = SCHEDULE_CONVERT_TIME(dest);
s32 Schedule_CheckFlagS(GlobalContext* globalCtx, u8** script, ScheduleResult* result) {
ScheduleCmdCheckFlagS* cmd = (ScheduleCmdCheckFlagS*)*script;
u16 flag = (cmd->flagByte << 8) | cmd->flagMask;
if (gSaveContext.save.weekEventReg[flag >> 8] & (flag & 0xFF)) {
*script += cmd->offset;
}
return false;
}
s32 Schedule_CheckFlagL(GlobalContext* globalCtx, u8** script, ScheduleResult* result) {
ScheduleCmdCheckFlagL* cmd = (ScheduleCmdCheckFlagL*)*script;
u16 flag = (cmd->flagByte << 8) | cmd->flagMask;
if (gSaveContext.save.weekEventReg[flag >> 8] & (flag & 0xFF)) {
*script += (s16)((cmd->offsetH << 8) | cmd->offsetL);
}
return false;
}
s32 Schedule_CheckTimeRangeS(GlobalContext* globalCtx, u8** script, ScheduleResult* result) {
s32 inRange = false;
ScheduleCmdCheckTimeRangeS* cmd = (ScheduleCmdCheckTimeRangeS*)*script;
f32 f;
u16 start;
u16 end;
u16 now;
SCHEDULE_CALC_TIME(cmd->startHr, cmd->startMin, start, f);
SCHEDULE_CALC_TIME(cmd->endHr, cmd->endMin, end, f);
end--;
now = SCHEDULE_TIME_NOW;
if ((start <= now) && (now <= end)) {
inRange = true;
}
if (inRange == true) {
*script += cmd->offset;
}
return false;
}
s32 Schedule_CheckTimeRangeL(GlobalContext* globalCtx, u8** script, ScheduleResult* result) {
s32 inRange = false;
ScheduleCmdCheckTimeRangeL* cmd = (ScheduleCmdCheckTimeRangeL*)*script;
f32 f;
u16 start;
u16 end;
u16 now;
SCHEDULE_CALC_TIME(cmd->startHr, cmd->startMin, start, f);
SCHEDULE_CALC_TIME(cmd->endHr, cmd->endMin, end, f);
end--;
now = SCHEDULE_TIME_NOW;
if ((start <= now) && (now <= end)) {
inRange = true;
}
if (inRange == true) {
*script += (s16)((cmd->offsetH << 8) | cmd->offsetL);
}
return false;
}
s32 Schedule_ReturnValueL(GlobalContext* globalCtx, u8** script, ScheduleResult* result) {
ScheduleCmdReturnValueL* cmd = (ScheduleCmdReturnValueL*)*script;
//! @bug result is a u8, value is truncated
result->result = (cmd->retH << 8) | cmd->retL;
result->hasResult = true;
return true;
}
s32 Schedule_ReturnNone(GlobalContext* globalCtx, u8** script, ScheduleResult* result) {
result->hasResult = false;
return true;
}
s32 Schedule_ReturnEmpty(GlobalContext* globalCtx, u8** script, ScheduleResult* result) {
result->hasResult = true;
return true;
}
s32 Schedule_Nop(GlobalContext* globalCtx, u8** script, ScheduleResult* result) {
return false;
}
s32 Schedule_CheckMiscS(GlobalContext* globalCtx, u8** script, ScheduleResult* result) {
ScheduleCmdCheckMiscS* cmd = (ScheduleCmdCheckMiscS*)*script;
if (((cmd->which == SCHEDULE_CHECK_MISC_ROOM_KEY) && (INV_CONTENT(ITEM_ROOM_KEY) == ITEM_ROOM_KEY)) ||
((cmd->which == SCHEDULE_CHECK_MISC_LETTER_TO_KAFEI) &&
(INV_CONTENT(ITEM_LETTER_TO_KAFEI) == ITEM_LETTER_TO_KAFEI)) ||
((cmd->which == SCHEDULE_CHECK_MISC_MASK_ROMANI) && (Player_GetMask(globalCtx) == PLAYER_MASK_ROMANI))) {
*script += cmd->offset;
}
return false;
}
s32 Schedule_ReturnValueS(GlobalContext* globalCtx, u8** script, ScheduleResult* result) {
ScheduleCmdReturnValueS* cmd = (ScheduleCmdReturnValueS*)*script;
result->result = cmd->result;
result->hasResult = true;
return true;
}
s32 Schedule_CheckNotInSceneS(GlobalContext* globalCtx, u8** script, ScheduleResult* result) {
ScheduleCmdCheckNotInSceneS* cmd = (ScheduleCmdCheckNotInSceneS*)*script;
s16 scene = (cmd->sceneH << 8) | cmd->sceneL;
if (scene != globalCtx->sceneNum) {
*script += cmd->offset;
}
return false;
}
s32 Schedule_CheckNotInSceneL(GlobalContext* globalCtx, u8** script, ScheduleResult* result) {
ScheduleCmdCheckNotInSceneL* cmd = (ScheduleCmdCheckNotInSceneL*)*script;
s16 scene = (cmd->sceneH << 8) | cmd->sceneL;
if (scene != globalCtx->sceneNum) {
*script = *script + (s16)((cmd->offsetH << 8) | cmd->offsetL);
}
return false;
}
s32 Schedule_CheckNotInDayS(GlobalContext* globalCtx, u8** script, ScheduleResult* result) {
ScheduleCmdCheckNotInDayS* cmd = (ScheduleCmdCheckNotInDayS*)*script;
s16 day = (cmd->dayH << 8) | cmd->dayL;
if (day != (s16)gSaveContext.save.day) {
*script += cmd->offset;
}
return false;
}
s32 Schedule_CheckNotInDayL(GlobalContext* globalCtx, u8** script, ScheduleResult* result) {
ScheduleCmdCheckNotInDayL* cmd = (ScheduleCmdCheckNotInDayL*)*script;
s16 day = (cmd->dayH << 8) | cmd->dayL;
if (day != (s16)gSaveContext.save.day) {
*script += (s16)((cmd->offsetH << 8) | cmd->offsetL);
}
return false;
}
s32 Schedule_ReturnTime(GlobalContext* globalCtx, u8** script, ScheduleResult* result) {
ScheduleCmdReturnTime* cmd = (ScheduleCmdReturnTime*)*script;
f32 f;
u16 time0;
u16 time1;
SCHEDULE_CALC_TIME(cmd->time0Hr, cmd->time0Min, time0, f);
SCHEDULE_CALC_TIME(cmd->time1Hr, cmd->time1Min, time1, f);
time1--;
result->result = cmd->result;
result->time0 = time0;
result->time1 = time1;
result->hasResult = true;
return true;
}
s32 Schedule_CheckBeforeTimeS(GlobalContext* globalCtx, u8** script, ScheduleResult* result) {
ScheduleCmdCheckBeforeTimeS* cmd = (ScheduleCmdCheckBeforeTimeS*)*script;
f32 f;
u16 testTime;
u16 now;
SCHEDULE_CALC_TIME(cmd->timeHr, cmd->timeMin, testTime, f);
now = SCHEDULE_TIME_NOW;
if (now < testTime) {
*script += cmd->offset;
}
return false;
}
s32 Schedule_CheckBeforeTimeL(GlobalContext* globalCtx, u8** script, ScheduleResult* result) {
ScheduleCmdCheckBeforeTimeL* cmd = (ScheduleCmdCheckBeforeTimeL*)*script;
f32 f;
u16 testTime;
u16 now;
SCHEDULE_CALC_TIME(cmd->timeHr, cmd->timeMin, testTime, f);
now = SCHEDULE_TIME_NOW;
if (now < testTime) {
*script += (s16)((cmd->offsetH << 8) | cmd->offsetL);
}
return false;
}
s32 Schedule_BranchS(GlobalContext* globalCtx, u8** script, ScheduleResult* result) {
ScheduleCmdBranchS* cmd = (ScheduleCmdBranchS*)*script;
*script += cmd->offset;
return false;
}
s32 Schedule_BranchL(GlobalContext* globalCtx, u8** script, ScheduleResult* result) {
ScheduleCmdBranchL* cmd = (ScheduleCmdBranchL*)*script;
*script += (s16)((cmd->offsetH << 8) | cmd->offsetL);
return false;
}
static s32 (*sScheduleCmdFuncs[])(GlobalContext*, u8**, ScheduleResult*) = {
Schedule_CheckFlagS, Schedule_CheckFlagL, Schedule_CheckTimeRangeS, Schedule_CheckTimeRangeL,
Schedule_ReturnValueL, Schedule_ReturnNone, Schedule_ReturnEmpty, Schedule_Nop,
Schedule_CheckMiscS, Schedule_ReturnValueS, Schedule_CheckNotInSceneS, Schedule_CheckNotInSceneL,
Schedule_CheckNotInDayS, Schedule_CheckNotInDayL, Schedule_ReturnTime, Schedule_CheckBeforeTimeS,
Schedule_CheckBeforeTimeL, Schedule_BranchS, Schedule_BranchL,
};
static u8 sScheduleCmdSizes[] = {
sizeof(ScheduleCmdCheckFlagS),
sizeof(ScheduleCmdCheckFlagL),
sizeof(ScheduleCmdCheckTimeRangeS),
sizeof(ScheduleCmdCheckTimeRangeL),
sizeof(ScheduleCmdReturnValueL),
sizeof(ScheduleCmdBase),
sizeof(ScheduleCmdBase),
sizeof(ScheduleCmdNop),
sizeof(ScheduleCmdCheckMiscS),
sizeof(ScheduleCmdReturnValueS),
sizeof(ScheduleCmdCheckNotInSceneS),
sizeof(ScheduleCmdCheckNotInSceneL),
sizeof(ScheduleCmdCheckNotInDayS),
sizeof(ScheduleCmdCheckNotInDayL),
sizeof(ScheduleCmdReturnTime),
sizeof(ScheduleCmdCheckBeforeTimeS),
sizeof(ScheduleCmdCheckBeforeTimeL),
sizeof(ScheduleCmdBranchS),
sizeof(ScheduleCmdBranchL),
};
s32 Schedule_RunScript(GlobalContext* globalCtx, u8* script, ScheduleResult* result) {
u8 size;
s32 stop;
do {
size = sScheduleCmdSizes[*script];
stop = (*sScheduleCmdFuncs[*script])(globalCtx, &script, result);
script += size;
} while (!stop);
return result->hasResult;
}
src/overlays/actors/ovl_Bg_Open_Spot/z_bg_open_spot.c
+38 -13
View File
@@ -1,10 +1,11 @@
/*
* File: z_bg_open_spot.c
* Overlay: ovl_Bg_Open_Spot
* Description: Star Light Rays in Intro Scene
* Description: Spotlights that shine on the Skull Kid when he turns Link
* into a Deku Scrub.
*/
#include "z_bg_open_spot.h"
#include "objects/object_open_obj/object_open_obj.h"
#define FLAGS (ACTOR_FLAG_10)
@@ -13,8 +14,8 @@
void BgOpenSpot_Init(Actor* thisx, GlobalContext* globalCtx);
void BgOpenSpot_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgOpenSpot_Update(Actor* thisx, GlobalContext* globalCtx);
void BgOpenSpot_Draw(Actor* thisx, GlobalContext* globalCtx);
#if 0
const ActorInit Bg_Open_Spot_InitVars = {
ACTOR_BG_OPEN_SPOT,
ACTORCAT_PROP,
@@ -27,25 +28,49 @@ const ActorInit Bg_Open_Spot_InitVars = {
(ActorFunc)NULL,
};
// static InitChainEntry sInitChain[] = {
static InitChainEntry D_80ACB3B0[] = {
static InitChainEntry sInitChain[] = {
ICHAIN_F32(uncullZoneForward, 4000, ICHAIN_CONTINUE),
ICHAIN_F32(uncullZoneScale, 560, ICHAIN_CONTINUE),
ICHAIN_F32(uncullZoneDownward, 800, ICHAIN_CONTINUE),
ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP),
};
#endif
void BgOpenSpot_Init(Actor* thisx, GlobalContext* globalCtx) {
BgOpenSpot* this = THIS;
extern InitChainEntry D_80ACB3B0[];
Actor_ProcessInitChain(&this->actor, sInitChain);
this->texScrolls = Lib_SegmentedToVirtual(gSpotlightTexAnim);
}
extern UNK_TYPE D_06001A60;
extern UNK_TYPE D_06002CE0;
void BgOpenSpot_Destroy(Actor* thisx, GlobalContext* globalCtx) {
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Open_Spot/BgOpenSpot_Init.s")
void BgOpenSpot_Update(Actor* thisx, GlobalContext* globalCtx) {
BgOpenSpot* this = THIS;
u32 action;
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Open_Spot/BgOpenSpot_Destroy.s")
if (Cutscene_CheckActorAction(globalCtx, 0x7D)) {
action = globalCtx->csCtx.actorActions[Cutscene_GetActorActionIndex(globalCtx, 0x7D)]->action;
if (action == 1) {
this->actor.draw = NULL;
} else if (action == 2) {
this->actor.draw = BgOpenSpot_Draw;
}
}
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Open_Spot/BgOpenSpot_Update.s")
void BgOpenSpot_Draw(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
BgOpenSpot* this = (BgOpenSpot*)thisx;
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Open_Spot/func_80ACB2B0.s")
AnimatedMat_Draw(globalCtx, this->texScrolls);
OPEN_DISPS(globalCtx->state.gfxCtx);
func_8012C2DC(globalCtx->state.gfxCtx);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD);
gDPSetColorDither(POLY_XLU_DISP++, G_CD_BAYER);
gSPDisplayList(POLY_XLU_DISP++, gSpotlightLeftDL);
gSPDisplayList(POLY_XLU_DISP++, gSpotlightRightDL);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}

Some files were not shown because too many files have changed in this diff Show More