mirror of
https://github.com/izzy2lost/2ship2harkinian-Android.git
synced 2026-06-19 01:20:08 -07:00
Merge branch 'master' into parameter
This commit is contained in:
engineer124
@@ -10,6 +10,8 @@ NON_MATCHING ?= 0
|
||||
ORIG_COMPILER ?= 0
|
||||
# Keep .mdebug section in build
|
||||
KEEP_MDEBUG ?= 0
|
||||
# Disassembles all asm from the ROM instead of skipping files which are entirely in C
|
||||
FULL_DISASM ?= 0
|
||||
|
||||
ifeq ($(NON_MATCHING),1)
|
||||
CFLAGS := -DNON_MATCHING
|
||||
@@ -17,6 +19,10 @@ ifeq ($(NON_MATCHING),1)
|
||||
COMPARE := 0
|
||||
endif
|
||||
|
||||
ifneq ($(FULL_DISASM), 0)
|
||||
DISASM_FLAGS += --full
|
||||
endif
|
||||
|
||||
PROJECT_DIR := $(dir $(realpath $(firstword $(MAKEFILE_LIST))))
|
||||
|
||||
MAKE = make
|
||||
@@ -246,7 +252,7 @@ setup:
|
||||
## Assembly generation
|
||||
disasm:
|
||||
$(RM) -rf asm data
|
||||
python3 tools/disasm/disasm.py -j $(N_THREADS)
|
||||
python3 tools/disasm/disasm.py -j $(N_THREADS) $(DISASM_FLAGS)
|
||||
|
||||
diff-init: uncompressed
|
||||
$(RM) -rf expected/
|
||||
|
||||
@@ -766,59 +766,62 @@
|
||||
<PlayerAnimation Name="gameplay_keep_Linkanim_00E4E8" Offset="0xE4E8" />
|
||||
<PlayerAnimation Name="gameplay_keep_Linkanim_00E4F0" Offset="0xE4F0" />
|
||||
<DList Name="gameplay_keep_DL_00E5C0" Offset="0xE5C0" />
|
||||
<Collision Name="gameplay_keep_Colheader_00E710" Offset="0xE710" />
|
||||
<Animation Name="gameplay_keep_Anim_00EB7C" Offset="0xEB7C" />
|
||||
<DList Name="gameplay_keep_DL_00ED80" Offset="0xED80" />
|
||||
<DList Name="gameplay_keep_DL_00F2B8" Offset="0xF2B8" />
|
||||
<DList Name="gameplay_keep_DL_00F350" Offset="0xF350" />
|
||||
<DList Name="gameplay_keep_DL_00F438" Offset="0xF438" />
|
||||
<DList Name="gameplay_keep_DL_00F4C0" Offset="0xF4C0" />
|
||||
<DList Name="gameplay_keep_DL_00F548" Offset="0xF548" />
|
||||
<DList Name="gameplay_keep_DL_00F5D0" Offset="0xF5D0" />
|
||||
<DList Name="gameplay_keep_DL_00F658" Offset="0xF658" />
|
||||
<DList Name="gameplay_keep_DL_00F6E0" Offset="0xF6E0" />
|
||||
<DList Name="gameplay_keep_DL_00F768" Offset="0xF768" />
|
||||
<DList Name="gameplay_keep_DL_00F7F0" Offset="0xF7F0" />
|
||||
<Texture Name="gameplay_keep_Tex_00F878" OutName="tex_00F878" Format="rgba16" Width="16" Height="32" Offset="0xF878" />
|
||||
<Texture Name="gameplay_keep_Tex_00FC78" OutName="tex_00FC78" Format="rgba16" Width="16" Height="32" Offset="0xFC78" />
|
||||
<Texture Name="gameplay_keep_Tex_010078" OutName="tex_010078" Format="rgba16" Width="32" Height="32" Offset="0x10078" />
|
||||
<Texture Name="gameplay_keep_Tex_010878" OutName="tex_010878" Format="rgba16" Width="16" Height="32" Offset="0x10878" />
|
||||
<Texture Name="gameplay_keep_Tex_010C78" OutName="tex_010C78" Format="rgba16" Width="32" Height="32" Offset="0x10C78" />
|
||||
<Limb Name="gameplay_keep_Standardlimb_011478" Type="Standard" Offset="0x11478" />
|
||||
<Limb Name="gameplay_keep_Standardlimb_011484" Type="Standard" Offset="0x11484" />
|
||||
<Limb Name="gameplay_keep_Standardlimb_011490" Type="Standard" Offset="0x11490" />
|
||||
<Limb Name="gameplay_keep_Standardlimb_01149C" Type="Standard" Offset="0x1149C" />
|
||||
<Limb Name="gameplay_keep_Standardlimb_0114A8" Type="Standard" Offset="0x114A8" />
|
||||
<Limb Name="gameplay_keep_Standardlimb_0114B4" Type="Standard" Offset="0x114B4" />
|
||||
<Limb Name="gameplay_keep_Standardlimb_0114C0" Type="Standard" Offset="0x114C0" />
|
||||
<Limb Name="gameplay_keep_Standardlimb_0114CC" Type="Standard" Offset="0x114CC" />
|
||||
<Limb Name="gameplay_keep_Standardlimb_0114D8" Type="Standard" Offset="0x114D8" />
|
||||
<Limb Name="gameplay_keep_Standardlimb_0114E4" Type="Standard" Offset="0x114E4" />
|
||||
<Skeleton Name="gameplay_keep_Skel_011518" Type="Normal" LimbType="Standard" Offset="0x11518" />
|
||||
<Animation Name="gameplay_keep_Anim_0117A8" Offset="0x117A8" />
|
||||
<Collision Name="gameplay_keep_Colheader_0118D8" Offset="0x118D8" />
|
||||
<DList Name="gameplay_keep_DL_011BD0" Offset="0x11BD0" />
|
||||
<DList Name="gameplay_keep_DL_0121B0" Offset="0x121B0" />
|
||||
<DList Name="gameplay_keep_DL_012260" Offset="0x12260" />
|
||||
<DList Name="gameplay_keep_DL_012308" Offset="0x12308" />
|
||||
<DList Name="gameplay_keep_DL_012390" Offset="0x12390" />
|
||||
<DList Name="gameplay_keep_DL_012418" Offset="0x12418" />
|
||||
<DList Name="gameplay_keep_DL_0124A0" Offset="0x124A0" />
|
||||
<DList Name="gameplay_keep_DL_012528" Offset="0x12528" />
|
||||
<DList Name="gameplay_keep_DL_0125B0" Offset="0x125B0" />
|
||||
<DList Name="gameplay_keep_DL_012638" Offset="0x12638" />
|
||||
<DList Name="gameplay_keep_DL_0126C0" Offset="0x126C0" />
|
||||
<Limb Name="gameplay_keep_Standardlimb_012748" Type="Standard" Offset="0x12748" />
|
||||
<Limb Name="gameplay_keep_Standardlimb_012754" Type="Standard" Offset="0x12754" />
|
||||
<Limb Name="gameplay_keep_Standardlimb_012760" Type="Standard" Offset="0x12760" />
|
||||
<Limb Name="gameplay_keep_Standardlimb_01276C" Type="Standard" Offset="0x1276C" />
|
||||
<Limb Name="gameplay_keep_Standardlimb_012778" Type="Standard" Offset="0x12778" />
|
||||
<Limb Name="gameplay_keep_Standardlimb_012784" Type="Standard" Offset="0x12784" />
|
||||
<Limb Name="gameplay_keep_Standardlimb_012790" Type="Standard" Offset="0x12790" />
|
||||
<Limb Name="gameplay_keep_Standardlimb_01279C" Type="Standard" Offset="0x1279C" />
|
||||
<Limb Name="gameplay_keep_Standardlimb_0127A8" Type="Standard" Offset="0x127A8" />
|
||||
<Limb Name="gameplay_keep_Standardlimb_0127B4" Type="Standard" Offset="0x127B4" />
|
||||
<Skeleton Name="gameplay_keep_Skel_0127E8" Type="Flex" LimbType="Standard" Offset="0x127E8" />
|
||||
|
||||
<!-- Deku Flower -->
|
||||
<Collision Name="gPinkDekuFlowerCol" Offset="0xE710" />
|
||||
<Animation Name="gDekuFlowerBounceAnim" Offset="0xEB7C" /> <!-- Original name is "dnp_boyoyon" ("bounce") -->
|
||||
<DList Name="gPinkDekuFlowerIdleDL" Offset="0xED80" />
|
||||
<DList Name="gPinkDekuFlowerBaseDL" Offset="0xF2B8" />
|
||||
<DList Name="gPinkDekuFlowerCenterDL" Offset="0xF350" />
|
||||
<DList Name="gPinkDekuFlowerBackLeftPetalDL" Offset="0xF438" />
|
||||
<DList Name="gPinkDekuFlowerLeftLeafDL" Offset="0xF4C0" />
|
||||
<DList Name="gPinkDekuFlowerFrontLeftPetalDL" Offset="0xF548" />
|
||||
<DList Name="gPinkDekuFlowerRightLeafDL" Offset="0xF5D0" />
|
||||
<DList Name="gPinkDekuFlowerBackRightPetalDL" Offset="0xF658" />
|
||||
<DList Name="gPinkDekuFlowerFrontRightPetalDL" Offset="0xF6E0" />
|
||||
<DList Name="gPinkDekuFlowerFrontLeafDL" Offset="0xF768" />
|
||||
<DList Name="gPinkDekuFlowerBackLeafDL" Offset="0xF7F0" />
|
||||
<Texture Name="gPinkDekuFlowerPetalAndCenterTex" OutName="pink_deku_flower_petal_and_center" Format="rgba16" Width="16" Height="32" Offset="0xF878" />
|
||||
<Texture Name="gPinkDekuFlowerLeafAndCenterTex" OutName="pink_deku_flower_leaf_and_center" Format="rgba16" Width="16" Height="32" Offset="0xFC78" />
|
||||
<Texture Name="gPinkDekuFlowerBaseLeafTex" OutName="pink_deku_flower_base_leaf" Format="rgba16" Width="32" Height="32" Offset="0x10078" />
|
||||
<Texture Name="gGoldDekuFlowerPetalAndCenterTex" OutName="gold_deku_flower_petal_and_center" Format="rgba16" Width="16" Height="32" Offset="0x10878" />
|
||||
<Texture Name="gGoldDekuFlowerBaseLeafTex" OutName="gold_deku_flower_base_leaf" Format="rgba16" Width="32" Height="32" Offset="0x10C78" />
|
||||
<Limb Name="gPinkDekuFlowerBaseLimb" Type="Standard" Offset="0x11478" />
|
||||
<Limb Name="gPinkDekuFlowerCenterLimb" Type="Standard" Offset="0x11484" />
|
||||
<Limb Name="gPinkDekuFlowerBackLeafLimb" Type="Standard" Offset="0x11490" />
|
||||
<Limb Name="gPinkDekuFlowerFrontLeafLimb" Type="Standard" Offset="0x1149C" />
|
||||
<Limb Name="gPinkDekuFlowerFrontRightPetalLimb" Type="Standard" Offset="0x114A8" />
|
||||
<Limb Name="gPinkDekuFlowerBackRightPetalLimb" Type="Standard" Offset="0x114B4" />
|
||||
<Limb Name="gPinkDekuFlowerRightLeafLimb" Type="Standard" Offset="0x114C0" />
|
||||
<Limb Name="gPinkDekuFlowerFrontLeftPetalLimb" Type="Standard" Offset="0x114CC" />
|
||||
<Limb Name="gPinkDekuFlowerLeftLeafLimb" Type="Standard" Offset="0x114D8" />
|
||||
<Limb Name="gPinkDekuFlowerBackLeftPetalLimb" Type="Standard" Offset="0x114E4" />
|
||||
<Skeleton Name="gPinkDekuFlowerSkel" Type="Normal" LimbType="Standard" Offset="0x11518" />
|
||||
<Animation Name="gDekuFlowerRustleAnim" Offset="0x117A8" /> <!-- Original name is "dnp_zawa" ("rustling") -->
|
||||
<Collision Name="gGoldDekuFlowerCol" Offset="0x118D8" />
|
||||
<DList Name="gGoldDekuFlowerIdleDL" Offset="0x11BD0" />
|
||||
<DList Name="gGoldDekuFlowerBaseDL" Offset="0x121B0" />
|
||||
<DList Name="gGoldDekuFlowerCenterDL" Offset="0x12260" />
|
||||
<DList Name="gGoldDekuFlowerBackLeftPetalDL" Offset="0x12308" />
|
||||
<DList Name="gGoldDekuFlowerLeftPetalDL" Offset="0x12390" />
|
||||
<DList Name="gGoldDekuFlowerFrontLeftPetalDL" Offset="0x12418" />
|
||||
<DList Name="gGoldDekuFlowerRightPetalDL" Offset="0x124A0" />
|
||||
<DList Name="gGoldDekuFlowerBackRightPetalDL" Offset="0x12528" />
|
||||
<DList Name="gGoldDekuFlowerFrontRightPetalDL" Offset="0x125B0" />
|
||||
<DList Name="gGoldDekuFlowerFrontPetalDL" Offset="0x12638" />
|
||||
<DList Name="gGoldDekuFlowerBackPetalDL" Offset="0x126C0" />
|
||||
<Limb Name="gGoldDekuFlowerBaseLimb" Type="Standard" Offset="0x12748" />
|
||||
<Limb Name="gGoldDekuFlowerCenterLimb" Type="Standard" Offset="0x12754" />
|
||||
<Limb Name="gGoldDekuFlowerBackPetalLimb" Type="Standard" Offset="0x12760" />
|
||||
<Limb Name="gGoldDekuFlowerFrontPetalLimb" Type="Standard" Offset="0x1276C" />
|
||||
<Limb Name="gGoldDekuFlowerFrontRightPetalLimb" Type="Standard" Offset="0x12778" />
|
||||
<Limb Name="gGoldDekuFlowerBackRightPetalLimb" Type="Standard" Offset="0x12784" />
|
||||
<Limb Name="gGoldDekuFlowerRightPetalLimb" Type="Standard" Offset="0x12790" />
|
||||
<Limb Name="gGoldDekuFlowerFrontLeftPetalLimb" Type="Standard" Offset="0x1279C" />
|
||||
<Limb Name="gGoldDekuFlowerLeftPetalLimb" Type="Standard" Offset="0x127A8" />
|
||||
<Limb Name="gGoldDekuFlowerBackLeftPetalLimb" Type="Standard" Offset="0x127B4" />
|
||||
<Skeleton Name="gGoldDekuFlowerSkel" Type="Flex" LimbType="Standard" Offset="0x127E8" />
|
||||
|
||||
<Animation Name="gameplay_keep_Anim_012860" Offset="0x12860" />
|
||||
<Animation Name="gameplay_keep_Anim_0128BC" Offset="0x128BC" />
|
||||
<Texture Name="gameplay_keep_Tex_0128D0" OutName="tex_0128D0" Format="rgba16" Width="16" Height="128" Offset="0x128D0" />
|
||||
@@ -939,36 +942,39 @@
|
||||
<Limb Name="gameplay_keep_Standardlimb_02AF34" Type="Standard" Offset="0x2AF34" />
|
||||
<Skeleton Name="gameplay_keep_Skel_02AF58" Type="Flex" LimbType="Standard" Offset="0x2AF58" />
|
||||
<Animation Name="gameplay_keep_Anim_02B2E8" Offset="0x2B2E8" />
|
||||
<Animation Name="gameplay_keep_Anim_02B494" Offset="0x2B494" />
|
||||
<DList Name="gameplay_keep_DL_02B6B0" Offset="0x2B6B0" />
|
||||
<DList Name="gameplay_keep_DL_02B748" Offset="0x2B748" />
|
||||
<DList Name="gameplay_keep_DL_02B7E0" Offset="0x2B7E0" />
|
||||
<DList Name="gameplay_keep_DL_02B888" Offset="0x2B888" />
|
||||
<DList Name="gameplay_keep_DL_02B920" Offset="0x2B920" />
|
||||
<DList Name="gameplay_keep_DL_02B9B8" Offset="0x2B9B8" />
|
||||
<DList Name="gameplay_keep_DL_02BA68" Offset="0x2BA68" />
|
||||
<DList Name="gameplay_keep_DL_02BB00" Offset="0x2BB00" />
|
||||
<DList Name="gameplay_keep_DL_02BB98" Offset="0x2BB98" />
|
||||
<Texture Name="gameplay_keep_Tex_02BC30" OutName="tex_02BC30" Format="ia8" Width="32" Height="32" Offset="0x2BC30" />
|
||||
<Texture Name="gameplay_keep_Tex_02C030" OutName="tex_02C030" Format="ia8" Width="16" Height="32" Offset="0x2C030" />
|
||||
<Texture Name="gameplay_keep_Tex_02C230" OutName="tex_02C230" Format="ia8" Width="32" Height="32" Offset="0x2C230" />
|
||||
<Texture Name="gameplay_keep_Tex_02C630" OutName="tex_02C630" Format="ia8" Width="16" Height="16" Offset="0x2C630" />
|
||||
<Texture Name="gameplay_keep_Tex_02C730" OutName="tex_02C730" Format="i4" Width="16" Height="16" Offset="0x2C730" />
|
||||
<TextureAnimation Name="gameplay_keep_Matanimheader_02C818" Offset="0x2C818" />
|
||||
<TextureAnimation Name="gameplay_keep_Matanimheader_02C890" Offset="0x2C890" />
|
||||
<TextureAnimation Name="gameplay_keep_Matanimheader_02C908" Offset="0x2C908" />
|
||||
<TextureAnimation Name="gameplay_keep_Matanimheader_02C980" Offset="0x2C980" />
|
||||
<TextureAnimation Name="gameplay_keep_Matanimheader_02C9F8" Offset="0x2C9F8" />
|
||||
<Limb Name="gameplay_keep_Standardlimb_02CA08" Type="Standard" Offset="0x2CA08" />
|
||||
<Limb Name="gameplay_keep_Standardlimb_02CA14" Type="Standard" Offset="0x2CA14" />
|
||||
<Limb Name="gameplay_keep_Standardlimb_02CA20" Type="Standard" Offset="0x2CA20" />
|
||||
<Limb Name="gameplay_keep_Standardlimb_02CA2C" Type="Standard" Offset="0x2CA2C" />
|
||||
<Limb Name="gameplay_keep_Standardlimb_02CA38" Type="Standard" Offset="0x2CA38" />
|
||||
<Limb Name="gameplay_keep_Standardlimb_02CA44" Type="Standard" Offset="0x2CA44" />
|
||||
<Limb Name="gameplay_keep_Standardlimb_02CA50" Type="Standard" Offset="0x2CA50" />
|
||||
<Limb Name="gameplay_keep_Standardlimb_02CA5C" Type="Standard" Offset="0x2CA5C" />
|
||||
<Limb Name="gameplay_keep_Standardlimb_02CA68" Type="Standard" Offset="0x2CA68" />
|
||||
<Skeleton Name="gameplay_keep_Skel_02CA98" Type="Flex" LimbType="Standard" Offset="0x2CA98" />
|
||||
|
||||
<!-- Stray Fairy -->
|
||||
<Animation Name="gStrayFairyFlyingAnim" Offset="0x2B494" /> <!-- Original name is "ys_fly01" -->
|
||||
<DList Name="gStrayFairyRightFacingHeadDL" Offset="0x2B6B0" />
|
||||
<DList Name="gStrayFairyLeftFacingHeadDL" Offset="0x2B748" />
|
||||
<DList Name="gStrayFairyGlowDL" Offset="0x2B7E0" />
|
||||
<DList Name="gStrayFairyTorsoDL" Offset="0x2B888" />
|
||||
<DList Name="gStrayFairyLeftArmDL" Offset="0x2B920" />
|
||||
<DList Name="gStrayFairyPelvisAndLegsDL" Offset="0x2B9B8" />
|
||||
<DList Name="gStrayFairyRightArmDL" Offset="0x2BA68" />
|
||||
<DList Name="gStrayFairyRightWingDL" Offset="0x2BB00" />
|
||||
<DList Name="gStrayFairyLeftWingDL" Offset="0x2BB98" />
|
||||
<Texture Name="gStrayFairyRightFacingHeadTex" OutName="stray_fairy_right_facing_head" Format="ia8" Width="32" Height="32" Offset="0x2BC30" />
|
||||
<Texture Name="gStrayFairyBodyTex" OutName="stray_fairy_body" Format="ia8" Width="16" Height="32" Offset="0x2C030" />
|
||||
<Texture Name="gStrayFairyLeftFacingHeadTex" OutName="stray_fairy_left_facing_head" Format="ia8" Width="32" Height="32" Offset="0x2C230" />
|
||||
<Texture Name="gStrayFairyWingTex" OutName="stray_fairy_wing" Format="ia8" Width="16" Height="16" Offset="0x2C630" />
|
||||
<Texture Name="gStrayFairyGlowTex" OutName="stray_fairy_glow" Format="i4" Width="16" Height="16" Offset="0x2C730" />
|
||||
<TextureAnimation Name="gStrayFairyClockTownTexAnim" Offset="0x2C818" />
|
||||
<TextureAnimation Name="gStrayFairySnowheadTexAnim" Offset="0x2C890" />
|
||||
<TextureAnimation Name="gStrayFairyWoodfallTexAnim" Offset="0x2C908" />
|
||||
<TextureAnimation Name="gStrayFairyGreatBayTexAnim" Offset="0x2C980" />
|
||||
<TextureAnimation Name="gStrayFairyStoneTowerTexAnim" Offset="0x2C9F8" />
|
||||
<Limb Name="gStrayFairyRightFacingHeadLimb" Type="Standard" Offset="0x2CA08" />
|
||||
<Limb Name="gStrayFairyLeftWingLimb" Type="Standard" Offset="0x2CA14" />
|
||||
<Limb Name="gStrayFairyRightWingLimb" Type="Standard" Offset="0x2CA20" />
|
||||
<Limb Name="gStrayFairyGlowLimb" Type="Standard" Offset="0x2CA2C" />
|
||||
<Limb Name="gStrayFairyTorsoLimb" Type="Standard" Offset="0x2CA38" />
|
||||
<Limb Name="gStrayFairyRightArmLimb" Type="Standard" Offset="0x2CA44" />
|
||||
<Limb Name="gStrayFairyPelvisAndLegsLimb" Type="Standard" Offset="0x2CA50" />
|
||||
<Limb Name="gStrayFairyLeftArmLimb" Type="Standard" Offset="0x2CA5C" />
|
||||
<Limb Name="gStrayFairyLeftFacingHeadLimb" Type="Standard" Offset="0x2CA68" />
|
||||
<Skeleton Name="gStrayFairySkel" Type="Flex" LimbType="Standard" Offset="0x2CA98" />
|
||||
|
||||
<Texture Name="gameplay_keep_Tex_02CAA8" OutName="tex_02CAA8" Format="i4" Width="16" Height="16" Offset="0x2CAA8" />
|
||||
<Texture Name="gameplay_keep_Tex_02CB30" OutName="tex_02CB30" Format="i8" Width="16" Height="16" Offset="0x2CB30" />
|
||||
<Texture Name="gameplay_keep_Tex_02CC30" OutName="tex_02CC30" Format="rgba16" Width="32" Height="32" Offset="0x2CC30" />
|
||||
|
||||
@@ -49,7 +49,7 @@
|
||||
<Texture Name="object_cs_Tex_00B9A0" OutName="tex_00B9A0" Format="ci8" Width="8" Height="8" Offset="0xB9A0" />
|
||||
<Texture Name="object_cs_Tex_00B9E0" OutName="tex_00B9E0" Format="ci8" Width="16" Height="16" Offset="0xB9E0" />
|
||||
<Texture Name="object_cs_Tex_00BAE0" OutName="tex_00BAE0" Format="ci8" Width="16" Height="16" Offset="0xBAE0" />
|
||||
<!-- <Blob Name="object_cs_Blob_00BBE0" Size="0x400" Offset="0xBBE0" /> -->
|
||||
<Blob Name="object_cs_Blob_00BBE0" Size="0x400" Offset="0xBBE0" />
|
||||
<Texture Name="object_cs_Tex_00BFE0" OutName="tex_00BFE0" Format="ci8" Width="8" Height="8" Offset="0xBFE0" />
|
||||
<Texture Name="object_cs_Tex_00C020" OutName="tex_00C020" Format="ci8" Width="8" Height="8" Offset="0xC020" />
|
||||
<Texture Name="object_cs_Tex_00C060" OutName="tex_00C060" Format="ci8" Width="8" Height="8" Offset="0xC060" />
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<Root>
|
||||
<File Name="object_fish" Segment="6">
|
||||
<Animation Name="object_fish_Anim_00007C" Offset="0x7C" />
|
||||
<Animation Name="gFishingFishAnim" Offset="0x7C" />
|
||||
<DList Name="object_fish_DL_000940" Offset="0x940" />
|
||||
<DList Name="object_fish_DL_0009E8" Offset="0x9E8" />
|
||||
<DList Name="object_fish_DL_000B00" Offset="0xB00" />
|
||||
@@ -35,29 +35,29 @@
|
||||
<Limb Name="object_fish_Standardlimb_002960" Type="Standard" Offset="0x2960" />
|
||||
<Limb Name="object_fish_Standardlimb_00296C" Type="Standard" Offset="0x296C" />
|
||||
<Limb Name="object_fish_Standardlimb_002978" Type="Standard" Offset="0x2978" />
|
||||
<Skeleton Name="object_fish_Skel_0029C0" Type="Flex" LimbType="Standard" Offset="0x29C0" />
|
||||
<Skeleton Name="gFishingFishSkel" Type="Flex" LimbType="Standard" Offset="0x29C0" />
|
||||
<Texture Name="object_fish_Tex_0029D0" OutName="tex_0029D0" Format="rgba16" Width="8" Height="16" Offset="0x29D0" />
|
||||
<Texture Name="object_fish_Tex_002AD0" OutName="tex_002AD0" Format="rgba16" Width="8" Height="8" Offset="0x2AD0" />
|
||||
<DList Name="object_fish_DL_002BD0" Offset="0x2BD0" />
|
||||
<Texture Name="object_fish_Tex_002CE0" OutName="tex_002CE0" Format="i4" Width="32" Height="64" Offset="0x2CE0" />
|
||||
<Texture Name="object_fish_Tex_0030E0" OutName="tex_0030E0" Format="i4" Width="16" Height="16" Offset="0x30E0" />
|
||||
<DList Name="object_fish_DL_003230" Offset="0x3230" />
|
||||
<DList Name="gFishingStreamSplashDL" Offset="0x3230" />
|
||||
<Texture Name="object_fish_Tex_003320" OutName="tex_003320" Format="ia8" Width="16" Height="16" Offset="0x3320" />
|
||||
<DList Name="object_fish_DL_003460" Offset="0x3460" />
|
||||
<DList Name="object_fish_DL_0034C0" Offset="0x34C0" />
|
||||
<DList Name="gFishingBubbleSetupDL" Offset="0x3460" />
|
||||
<DList Name="gFishingBubbleVtxDL" Offset="0x34C0" />
|
||||
<Texture Name="object_fish_Tex_0034E0" OutName="tex_0034E0" Format="i8" Width="16" Height="16" Offset="0x34E0" />
|
||||
<DList Name="object_fish_DL_003610" Offset="0x3610" />
|
||||
<DList Name="object_fish_DL_003680" Offset="0x3680" />
|
||||
<DList Name="gFishingDustSplashSetupDL" Offset="0x3610" />
|
||||
<DList Name="gFishingDustSplashVtxDL" Offset="0x3680" />
|
||||
<DList Name="object_fish_DL_0036E0" Offset="0x36E0" />
|
||||
<DList Name="object_fish_DL_003710" Offset="0x3710" />
|
||||
<DList Name="object_fish_DL_003760" Offset="0x3760" />
|
||||
<DList Name="gFishingLineVtxDL" Offset="0x3710" />
|
||||
<DList Name="gFishingRainDropVtxDL" Offset="0x3760" />
|
||||
<Texture Name="object_fish_Tex_003778" OutName="tex_003778" Format="rgba16" Width="16" Height="16" Offset="0x3778" />
|
||||
<DList Name="object_fish_DL_0039A8" Offset="0x39A8" />
|
||||
<DList Name="object_fish_DL_003A18" Offset="0x3A18" />
|
||||
<Animation Name="object_fish_Anim_00453C" Offset="0x453C" />
|
||||
<DList Name="gFishingRainSplashSetupDL" Offset="0x39A8" />
|
||||
<DList Name="gFishingRainSplashVtxDL" Offset="0x3A18" />
|
||||
<Animation Name="gFishingOwnerAnim" Offset="0x453C" />
|
||||
<DList Name="object_fish_DL_006F60" Offset="0x6F60" />
|
||||
<DList Name="object_fish_DL_007350" Offset="0x7350" />
|
||||
<DList Name="object_fish_DL_0074C8" Offset="0x74C8" />
|
||||
<DList Name="gFishingOwnerHairDL" Offset="0x7350" />
|
||||
<DList Name="gFishingOwnerHatDL" Offset="0x74C8" />
|
||||
<DList Name="object_fish_DL_0076B8" Offset="0x76B8" />
|
||||
<DList Name="object_fish_DL_007CF8" Offset="0x7CF8" />
|
||||
<DList Name="object_fish_DL_007E48" Offset="0x7E48" />
|
||||
@@ -73,12 +73,12 @@
|
||||
<Limb Name="object_fish_Standardlimb_0085B4" Type="Standard" Offset="0x85B4" />
|
||||
<Limb Name="object_fish_Standardlimb_0085C0" Type="Standard" Offset="0x85C0" />
|
||||
<Limb Name="object_fish_Standardlimb_0085CC" Type="Standard" Offset="0x85CC" />
|
||||
<Skeleton Name="object_fish_Skel_0085F8" Type="Flex" LimbType="Standard" Offset="0x85F8" />
|
||||
<DList Name="object_fish_DL_008610" Offset="0x8610" />
|
||||
<DList Name="object_fish_DL_008678" Offset="0x8678" />
|
||||
<Skeleton Name="gFishingOwnerSkel" Type="Flex" LimbType="Standard" Offset="0x85F8" />
|
||||
<DList Name="gFishingRippleSetupDL" Offset="0x8610" />
|
||||
<DList Name="gFishingRippleVtxDL" Offset="0x8678" />
|
||||
<Texture Name="object_fish_Tex_008690" OutName="tex_008690" Format="i4" Width="32" Height="32" Offset="0x8690" />
|
||||
<DList Name="object_fish_DL_0088C0" Offset="0x88C0" />
|
||||
<DList Name="object_fish_DL_008970" Offset="0x8970" />
|
||||
<DList Name="gFishingWaterDustSetupDL" Offset="0x88C0" />
|
||||
<DList Name="gFishingWaterDustVtxDL" Offset="0x8970" />
|
||||
<Texture Name="object_fish_TLUT_008990" OutName="tlut_008990" Format="rgba16" Width="16" Height="16" Offset="0x8990" />
|
||||
<Texture Name="object_fish_Tex_008B90" OutName="tex_008B90" Format="ci8" Width="8" Height="8" Offset="0x8B90" />
|
||||
<Texture Name="object_fish_Tex_008BD0" OutName="tex_008BD0" Format="ci8" Width="16" Height="16" Offset="0x8BD0" />
|
||||
@@ -86,21 +86,23 @@
|
||||
<Texture Name="object_fish_Tex_008DD0" OutName="tex_008DD0" Format="ci8" Width="8" Height="8" Offset="0x8DD0" />
|
||||
<Texture Name="object_fish_Tex_008E10" OutName="tex_008E10" Format="ci8" Width="32" Height="32" Offset="0x8E10" />
|
||||
<Texture Name="object_fish_Tex_009210" OutName="tex_009210" Format="ci8" Width="8" Height="8" Offset="0x9210" />
|
||||
<!-- <Blob Name="object_fish_Blob_009250" Size="0xC00" Offset="0x9250" /> -->
|
||||
<Texture Name="gFishingOwnerEyeOpenTex" OutName="tex_009250" Format="ci8" Width="32" Height="32" Offset="0x9250" />
|
||||
<Texture Name="gFishingOwnerEyeHalfTex" OutName="tex_009650" Format="ci8" Width="32" Height="32" Offset="0x9650" />
|
||||
<Texture Name="gFishingOwnerEyeClosedTex" OutName="tex_009A50" Format="ci8" Width="32" Height="32" Offset="0x9A50" />
|
||||
<Texture Name="object_fish_Tex_009E50" OutName="tex_009E50" Format="ci8" Width="64" Height="32" Offset="0x9E50" />
|
||||
<Texture Name="object_fish_Tex_00A650" OutName="tex_00A650" Format="ci8" Width="8" Height="8" Offset="0xA650" />
|
||||
<Texture Name="object_fish_Tex_00A690" OutName="tex_00A690" Format="ci8" Width="16" Height="16" Offset="0xA690" />
|
||||
<Texture Name="object_fish_Tex_00A790" OutName="tex_00A790" Format="ci8" Width="8" Height="16" Offset="0xA790" />
|
||||
<Texture Name="object_fish_Tex_00A810" OutName="tex_00A810" Format="ci8" Width="16" Height="16" Offset="0xA810" />
|
||||
<Texture Name="object_fish_Tex_00A910" OutName="tex_00A910" Format="ia8" Width="64" Height="64" Offset="0xA910" />
|
||||
<DList Name="object_fish_DL_00B950" Offset="0xB950" />
|
||||
<DList Name="object_fish_DL_00B9C0" Offset="0xB9C0" />
|
||||
<DList Name="gFishingSinkingLureSegmentSetupDL" Offset="0xB950" />
|
||||
<DList Name="gFishingSinkingLureSegmentVtxDL" Offset="0xB9C0" />
|
||||
<Texture Name="object_fish_Tex_00B9E0" OutName="tex_00B9E0" Format="rgba16" Width="64" Height="16" Offset="0xB9E0" />
|
||||
<DList Name="object_fish_DL_00C220" Offset="0xC220" />
|
||||
<DList Name="object_fish_DL_00C298" Offset="0xC298" />
|
||||
<DList Name="gFishingGroupFishSetupDL" Offset="0xC220" />
|
||||
<DList Name="gFishingGroupFishVtxDL" Offset="0xC298" />
|
||||
<DList Name="object_fish_DL_00C650" Offset="0xC650" />
|
||||
<Texture Name="object_fish_Tex_00C780" OutName="tex_00C780" Format="rgba16" Width="32" Height="32" Offset="0xC780" />
|
||||
<Animation Name="object_fish_Anim_00CFE0" Offset="0xCFE0" />
|
||||
<Animation Name="gFishingLoachAnim" Offset="0xCFE0" />
|
||||
<DList Name="object_fish_DL_00DED0" Offset="0xDED0" />
|
||||
<DList Name="object_fish_DL_00DFA8" Offset="0xDFA8" />
|
||||
<DList Name="object_fish_DL_00E048" Offset="0xE048" />
|
||||
@@ -129,29 +131,32 @@
|
||||
<Limb Name="object_fish_Standardlimb_011008" Type="Standard" Offset="0x11008" />
|
||||
<Limb Name="object_fish_Standardlimb_011014" Type="Standard" Offset="0x11014" />
|
||||
<Limb Name="object_fish_Standardlimb_011020" Type="Standard" Offset="0x11020" />
|
||||
<Skeleton Name="object_fish_Skel_011058" Type="Flex" LimbType="Standard" Offset="0x11058" />
|
||||
<!-- <Blob Name="object_fish_Blob_011064" Size="0x30C" Offset="0x11064" /> -->
|
||||
<DList Name="object_fish_DL_0113D0" Offset="0x113D0" />
|
||||
<DList Name="object_fish_DL_011410" Offset="0x11410" />
|
||||
<Skeleton Name="gFishingLoachSkel" Type="Flex" LimbType="Standard" Offset="0x11058" />
|
||||
<Blob Name="object_fish_Blob_011064" Size="0xC" Offset="0x11064" />
|
||||
<Texture Name="gFishingRodSegmentStripTex" OutName="tex_011070" Format="rgba16" Width="16" Height="8" Offset="0x11070" />
|
||||
<Texture Name="gFishingRodSegmentBlackTex" OutName="tex_011170" Format="rgba16" Width="16" Height="8" Offset="0x11170" />
|
||||
<Texture Name="gFishingRodSegmentWhiteTex" OutName="tex_011270" Format="rgba16" Width="16" Height="8" Offset="0x11270" />
|
||||
<DList Name="gFishingRodSetupDL" Offset="0x113D0" />
|
||||
<DList Name="gFishingRodSegmentDL" Offset="0x11410" />
|
||||
<Texture Name="object_fish_Tex_011440" OutName="tex_011440" Format="rgba16" Width="32" Height="32" Offset="0x11440" />
|
||||
<Texture Name="object_fish_Tex_011C40" OutName="tex_011C40" Format="rgba16" Width="32" Height="16" Offset="0x11C40" />
|
||||
<DList Name="object_fish_DL_012160" Offset="0x12160" />
|
||||
<DList Name="object_fish_DL_0121F0" Offset="0x121F0" />
|
||||
<DList Name="gFishingLureHookDL" Offset="0x12160" />
|
||||
<DList Name="gFishingLureFloatDL" Offset="0x121F0" />
|
||||
<Texture Name="object_fish_Tex_0122E0" OutName="tex_0122E0" Format="rgba16" Width="32" Height="32" Offset="0x122E0" />
|
||||
<Texture Name="object_fish_Tex_012AE0" OutName="tex_012AE0" Format="rgba16" Width="32" Height="32" Offset="0x12AE0" />
|
||||
<DList Name="object_fish_DL_013330" Offset="0x13330" />
|
||||
<DList Name="object_fish_DL_0133B0" Offset="0x133B0" />
|
||||
<DList Name="object_fish_DL_013590" Offset="0x13590" />
|
||||
<DList Name="object_fish_DL_013610" Offset="0x13610" />
|
||||
<DList Name="gFishingLilyPadSetupDL" Offset="0x13330" />
|
||||
<DList Name="gFishingLilyPadVtxDL" Offset="0x133B0" />
|
||||
<DList Name="gFishingRockSetupDL" Offset="0x13590" />
|
||||
<DList Name="gFishingRockVtxDL" Offset="0x13610" />
|
||||
<Texture Name="object_fish_Tex_013660" OutName="tex_013660" Format="rgba16" Width="32" Height="32" Offset="0x13660" />
|
||||
<DList Name="object_fish_DL_013F50" Offset="0x13F50" />
|
||||
<DList Name="object_fish_DL_013FD0" Offset="0x13FD0" />
|
||||
<DList Name="object_fish_DL_014030" Offset="0x14030" />
|
||||
<DList Name="object_fish_DL_0140B0" Offset="0x140B0" />
|
||||
<DList Name="gFishingWoodPostSetupDL" Offset="0x13F50" />
|
||||
<DList Name="gFishingWoodPostVtxDL" Offset="0x13FD0" />
|
||||
<DList Name="gFishingReedSetupDL" Offset="0x14030" />
|
||||
<DList Name="gFishingReedVtxDL" Offset="0x140B0" />
|
||||
<Texture Name="object_fish_Tex_0140D0" OutName="tex_0140D0" Format="rgba16" Width="16" Height="16" Offset="0x140D0" />
|
||||
<Texture Name="object_fish_Tex_0142D0" OutName="tex_0142D0" Format="rgba16" Width="32" Height="32" Offset="0x142D0" />
|
||||
<Texture Name="object_fish_Tex_014AD0" OutName="tex_014AD0" Format="i8" Width="32" Height="32" Offset="0x14AD0" />
|
||||
<DList Name="object_fish_DL_0153D0" Offset="0x153D0" />
|
||||
<DList Name="object_fish_DL_015470" Offset="0x15470" />
|
||||
<DList Name="gFishingAquariumBottomDL" Offset="0x153D0" />
|
||||
<DList Name="gFishingAquariumContainerDL" Offset="0x15470" />
|
||||
</File>
|
||||
</Root>
|
||||
|
||||
@@ -1,63 +1,90 @@
|
||||
<Root>
|
||||
<!-- Object for the Four Giants -->
|
||||
<File Name="object_giant" Segment="6">
|
||||
<Animation Name="object_giant_Anim_002168" Offset="0x2168" />
|
||||
<!-- <Blob Name="object_giant_Blob_003D40" Size="0x90" Offset="0x3D40" /> -->
|
||||
<DList Name="object_giant_DL_003DD0" Offset="0x3DD0" />
|
||||
<DList Name="object_giant_DL_0040C0" Offset="0x40C0" />
|
||||
<DList Name="object_giant_DL_004200" Offset="0x4200" />
|
||||
<DList Name="object_giant_DL_004438" Offset="0x4438" />
|
||||
<DList Name="object_giant_DL_004560" Offset="0x4560" />
|
||||
<DList Name="object_giant_DL_0046A0" Offset="0x46A0" />
|
||||
<DList Name="object_giant_DL_0048D8" Offset="0x48D8" />
|
||||
<DList Name="object_giant_DL_004A00" Offset="0x4A00" />
|
||||
<DList Name="object_giant_DL_004B10" Offset="0x4B10" />
|
||||
<DList Name="object_giant_DL_004C38" Offset="0x4C38" />
|
||||
<DList Name="object_giant_DL_004D58" Offset="0x4D58" />
|
||||
<DList Name="object_giant_DL_004EC0" Offset="0x4EC0" />
|
||||
<DList Name="object_giant_DL_004FD0" Offset="0x4FD0" />
|
||||
<DList Name="object_giant_DL_0050F8" Offset="0x50F8" />
|
||||
<DList Name="object_giant_DL_005218" Offset="0x5218" />
|
||||
<Texture Name="object_giant_TLUT_005380" OutName="tlut_005380" Format="rgba16" Width="16" Height="16" Offset="0x5380" />
|
||||
<Texture Name="object_giant_Tex_005580" OutName="tex_005580" Format="ci8" Width="16" Height="16" Offset="0x5580" />
|
||||
<Texture Name="object_giant_Tex_005680" OutName="tex_005680" Format="ci8" Width="16" Height="16" Offset="0x5680" />
|
||||
<Texture Name="object_giant_Tex_005780" OutName="tex_005780" Format="ci8" Width="16" Height="16" Offset="0x5780" />
|
||||
<Texture Name="object_giant_Tex_005880" OutName="tex_005880" Format="ci8" Width="16" Height="16" Offset="0x5880" />
|
||||
<Texture Name="object_giant_Tex_005980" OutName="tex_005980" Format="ci8" Width="16" Height="16" Offset="0x5980" />
|
||||
<!-- <Blob Name="object_giant_Blob_005A80" Size="0x1800" Offset="0x5A80" /> -->
|
||||
<Texture Name="object_giant_Tex_007280" OutName="tex_007280" Format="ci8" Width="16" Height="16" Offset="0x7280" />
|
||||
<Texture Name="object_giant_Tex_007380" OutName="tex_007380" Format="ci8" Width="16" Height="32" Offset="0x7380" />
|
||||
<DList Name="object_giant_DL_007610" Offset="0x7610" />
|
||||
<Texture Name="object_giant_Tex_0076C0" OutName="tex_0076C0" Format="rgba16" Width="16" Height="16" Offset="0x76C0" />
|
||||
<Limb Name="object_giant_Standardlimb_0078C0" Type="Standard" Offset="0x78C0" />
|
||||
<Limb Name="object_giant_Standardlimb_0078CC" Type="Standard" Offset="0x78CC" />
|
||||
<Limb Name="object_giant_Standardlimb_0078D8" Type="Standard" Offset="0x78D8" />
|
||||
<Limb Name="object_giant_Standardlimb_0078E4" Type="Standard" Offset="0x78E4" />
|
||||
<Limb Name="object_giant_Standardlimb_0078F0" Type="Standard" Offset="0x78F0" />
|
||||
<Limb Name="object_giant_Standardlimb_0078FC" Type="Standard" Offset="0x78FC" />
|
||||
<Limb Name="object_giant_Standardlimb_007908" Type="Standard" Offset="0x7908" />
|
||||
<Limb Name="object_giant_Standardlimb_007914" Type="Standard" Offset="0x7914" />
|
||||
<Limb Name="object_giant_Standardlimb_007920" Type="Standard" Offset="0x7920" />
|
||||
<Limb Name="object_giant_Standardlimb_00792C" Type="Standard" Offset="0x792C" />
|
||||
<Limb Name="object_giant_Standardlimb_007938" Type="Standard" Offset="0x7938" />
|
||||
<Limb Name="object_giant_Standardlimb_007944" Type="Standard" Offset="0x7944" />
|
||||
<Limb Name="object_giant_Standardlimb_007950" Type="Standard" Offset="0x7950" />
|
||||
<Limb Name="object_giant_Standardlimb_00795C" Type="Standard" Offset="0x795C" />
|
||||
<Limb Name="object_giant_Standardlimb_007968" Type="Standard" Offset="0x7968" />
|
||||
<Skeleton Name="object_giant_Skel_0079B0" Type="Flex" LimbType="Standard" Offset="0x79B0" />
|
||||
<Animation Name="object_giant_Anim_008394" Offset="0x8394" />
|
||||
<Animation Name="object_giant_Anim_0096E4" Offset="0x96E4" />
|
||||
<Animation Name="object_giant_Anim_00A1C4" Offset="0xA1C4" />
|
||||
<Animation Name="object_giant_Anim_00ACA4" Offset="0xACA4" />
|
||||
<Animation Name="object_giant_Anim_00B784" Offset="0xB784" />
|
||||
<Animation Name="object_giant_Anim_00C5D4" Offset="0xC5D4" />
|
||||
<Animation Name="object_giant_Anim_00D040" Offset="0xD040" />
|
||||
<Animation Name="object_giant_Anim_00DE84" Offset="0xDE84" />
|
||||
<Animation Name="object_giant_Anim_0102A4" Offset="0x102A4" />
|
||||
<Animation Name="object_giant_Anim_0116E4" Offset="0x116E4" />
|
||||
<Animation Name="object_giant_Anim_012A38" Offset="0x12A38" />
|
||||
<Animation Name="object_giant_Anim_013004" Offset="0x13004" />
|
||||
<Animation Name="object_giant_Anim_013FE8" Offset="0x13FE8" />
|
||||
<Animation Name="object_giant_Anim_015334" Offset="0x15334" />
|
||||
<Animation Name="object_giant_Anim_017944" Offset="0x17944" />
|
||||
<Animation Name="gGiantLargeStrideAnim" Offset="0x2168" /> <!-- Original name is "kya_testwalk" -->
|
||||
|
||||
<!-- Giant Body Vertices. Contains everything but the beard. -->
|
||||
<Array Name="gGiantBodyVtx" Count="444" Offset="0x2180">
|
||||
<Vtx/>
|
||||
</Array>
|
||||
|
||||
<!-- Giant Unused Beard Vertices. An exact duplicate of the beard vertices that are actually used. -->
|
||||
<Array Name="gGiantUnusedBeardVtx" Count="9" Offset="0x3D40">
|
||||
<Vtx/>
|
||||
</Array>
|
||||
|
||||
<!-- Giant Limb DisplayLists -->
|
||||
<DList Name="gGiantHeadDL" Offset="0x3DD0" />
|
||||
<DList Name="gGiantRightThighDL" Offset="0x40C0" />
|
||||
<DList Name="gGiantRightShinDL" Offset="0x4200" />
|
||||
<DList Name="gGiantRightFootDL" Offset="0x4438" />
|
||||
<DList Name="gGiantLeftThighDL" Offset="0x4560" />
|
||||
<DList Name="gGiantLeftShinDL" Offset="0x46A0" />
|
||||
<DList Name="gGiantLeftFootDL" Offset="0x48D8" />
|
||||
<DList Name="gGiantRightShoulderDL" Offset="0x4A00" />
|
||||
<DList Name="gGiantRightUpperArmDL" Offset="0x4B10" />
|
||||
<DList Name="gGiantRightForearmDL" Offset="0x4C38" />
|
||||
<DList Name="gGiantRightHandDL" Offset="0x4D58" />
|
||||
<DList Name="gGiantLeftShoulderDL" Offset="0x4EC0" />
|
||||
<DList Name="gGiantLeftUpperArmDL" Offset="0x4FD0" />
|
||||
<DList Name="gGiantLeftForearmDL" Offset="0x50F8" />
|
||||
<DList Name="gGiantLeftHandDL" Offset="0x5218" />
|
||||
|
||||
<!-- Giant Textures -->
|
||||
<Texture Name="gGiantTLUT" OutName="giant_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5380" />
|
||||
<Texture Name="gGiantFootTex" OutName="giant_foot" Format="ci8" Width="16" Height="16" Offset="0x5580" />
|
||||
<Texture Name="gGiantShinTex" OutName="giant_shin" Format="ci8" Width="16" Height="16" Offset="0x5680" />
|
||||
<Texture Name="gGiantForearmAndKneeTex" OutName="giant_forearm_and_knee" Format="ci8" Width="16" Height="16" Offset="0x5780" />
|
||||
<Texture Name="gGiantUpperArmAndThighTex" OutName="giant_upper_arm_and_thigh" Format="ci8" Width="16" Height="16" Offset="0x5880" />
|
||||
<Texture Name="gGiantHandTex" OutName="giant_hand" Format="ci8" Width="16" Height="16" Offset="0x5980" />
|
||||
<Texture Name="gGiantFaceEyeOpenTex" OutName="giant_face_eye_open" Format="ci8" Width="32" Height="64" Offset="0x5A80" TlutOffset="0x5380" />
|
||||
<Texture Name="gGiantFaceEyeHalfTex" OutName="giant_face_eye_half" Format="ci8" Width="32" Height="64" Offset="0x6280" TlutOffset="0x5380" />
|
||||
<Texture Name="gGiantFaceEyeClosedTex" OutName="giant_face_eye_closed" Format="ci8" Width="32" Height="64" Offset="0x6A80" TlutOffset="0x5380" />
|
||||
<Texture Name="gGiantGroinTex" OutName="giant_groin" Format="ci8" Width="16" Height="16" Offset="0x7280" />
|
||||
<Texture Name="gGiantHairTex" OutName="giant_hair" Format="ci8" Width="16" Height="32" Offset="0x7380" />
|
||||
|
||||
<!-- Giant Beard Vertices, DisplayList, and Texture -->
|
||||
<Array Name="gGiantBeardVtx" Count="9" Offset="0x7580">
|
||||
<Vtx/>
|
||||
</Array>
|
||||
<DList Name="gGiantBeardDL" Offset="0x7610" />
|
||||
<Texture Name="gGiantBeardTex" OutName="giant_beard" Format="rgba16" Width="16" Height="16" Offset="0x76C0" />
|
||||
|
||||
<!-- Giant Limbs -->
|
||||
<Limb Name="gGiantHeadLimb" Type="Standard" Offset="0x78C0" />
|
||||
<Limb Name="gGiantLeftThighLimb" Type="Standard" Offset="0x78CC" />
|
||||
<Limb Name="gGiantLeftShinLimb" Type="Standard" Offset="0x78D8" />
|
||||
<Limb Name="gGiantLeftFootLimb" Type="Standard" Offset="0x78E4" />
|
||||
<Limb Name="gGiantRightThighLimb" Type="Standard" Offset="0x78F0" />
|
||||
<Limb Name="gGiantRightShinLimb" Type="Standard" Offset="0x78FC" />
|
||||
<Limb Name="gGiantRightFootLimb" Type="Standard" Offset="0x7908" />
|
||||
<Limb Name="gGiantLeftShoulderLimb" Type="Standard" Offset="0x7914" />
|
||||
<Limb Name="gGiantLeftUpperArmLimb" Type="Standard" Offset="0x7920" />
|
||||
<Limb Name="gGiantLeftForearmLimb" Type="Standard" Offset="0x792C" />
|
||||
<Limb Name="gGiantLeftHandLimb" Type="Standard" Offset="0x7938" />
|
||||
<Limb Name="gGiantRightShoulderLimb" Type="Standard" Offset="0x7944" />
|
||||
<Limb Name="gGiantRightUpperArmLimb" Type="Standard" Offset="0x7950" />
|
||||
<Limb Name="gGiantRightForearmLimb" Type="Standard" Offset="0x795C" />
|
||||
<Limb Name="gGiantRightHandLimb" Type="Standard" Offset="0x7968" />
|
||||
|
||||
<!-- Giant Skeleton -->
|
||||
<Skeleton Name="gGiantSkel" Type="Flex" LimbType="Standard" Offset="0x79B0" />
|
||||
|
||||
<!-- Giant Animations -->
|
||||
<Animation Name="gGiantLookUpStartAnim" Offset="0x8394" /> <!-- Original name is "kyo_kaoage" ("raising face") -->
|
||||
<Animation Name="gGiantLookUpLoopAnim" Offset="0x96E4" /> <!-- Original name is "kyo_kaoage_loop" -->
|
||||
<Animation Name="gGiantBigCallStartAnim" Offset="0xA1C4" /> <!-- Original name is "kyo_sakebi" ("cry"). Stretches his arms outward -->
|
||||
<Animation Name="gGiantSmallCallStartAnim" Offset="0xACA4" /> <!-- Original name is "kyo_sakebi2" ("cry2"). Places his hands over his mouth -->
|
||||
<Animation Name="gGiantSmallCallLoopAnim" Offset="0xB784" /> <!-- Original name is "kyo_sakebi2_loop" -->
|
||||
<Animation Name="gGiantSmallCallEndAnim" Offset="0xC5D4" /> <!-- Original name is "kyo_sakebi2_modori" ("cry2 return") -->
|
||||
<Animation Name="gGiantBigCallLoopAnim" Offset="0xD040" /> <!-- Original name is "kyo_sakebi_loop" -->
|
||||
<Animation Name="gGiantBigCallEndAnim" Offset="0xDE84" /> <!-- Original name is "kyo_sakebi_modori" ("cry return") -->
|
||||
<Animation Name="gGiantFallingOverAnim" Offset="0x102A4" /> <!-- Original name is "kyo_taoreru" ("falling over") -->
|
||||
<Animation Name="gGiantRaisedArmsStartAnim" Offset="0x116E4" /> <!-- Original name is "kyo_teage" ("raising arm") -->
|
||||
<Animation Name="gGiantRaisedArmsLoopAnim" Offset="0x12A38" /> <!-- Original name is "kyo_teage_loop" -->
|
||||
<Animation Name="gGiantStruggleStartAnim" Offset="0x13004" /> <!-- Original name is "kyo_tukisasae" ("holding up the moon") -->
|
||||
<Animation Name="gGiantStruggleLoopAnim" Offset="0x13FE8" /> <!-- Original name is "kyo_tukisasae_loop" -->
|
||||
<Animation Name="gGiantIdleAnim" Offset="0x15334" /> <!-- Original name is "kyo_wait" -->
|
||||
<Animation Name="gGiantWalkingAnim" Offset="0x17944" /> <!-- Original name is "kyo_walk" -->
|
||||
</File>
|
||||
</Root>
|
||||
|
||||
@@ -1,8 +1,9 @@
|
||||
<Root>
|
||||
<!-- Object for small wooden crate -->
|
||||
<File Name="object_kibako" Segment="6">
|
||||
<Texture Name="object_kibako_Tex_000000" OutName="tex_000000" Format="rgba16" Width="32" Height="64" Offset="0x0" />
|
||||
<DList Name="object_kibako_DL_001180" Offset="0x1180" />
|
||||
<Texture Name="object_kibako_Tex_001240" OutName="tex_001240" Format="rgba16" Width="64" Height="16" Offset="0x1240" />
|
||||
<DList Name="object_kibako_DL_001A70" Offset="0x1A70" />
|
||||
<Texture Name="gSmallCrateTex" OutName="small_crate" Format="rgba16" Width="32" Height="64" Offset="0x0" />
|
||||
<DList Name="gSmallCrateDL" Offset="0x1180" />
|
||||
<Texture Name="gSmallCrateFragmentTex" OutName="small_crate_fragment" Format="rgba16" Width="64" Height="16" Offset="0x1240" />
|
||||
<DList Name="gSmallCrateFragmentDL" Offset="0x1A70" />
|
||||
</File>
|
||||
</Root>
|
||||
|
||||
@@ -1,13 +1,14 @@
|
||||
<Root>
|
||||
<!-- Object for large wooden crate -->
|
||||
<File Name="object_kibako2" Segment="6">
|
||||
<Texture Name="object_kibako2_TLUT_000000" OutName="tlut_000000" Format="rgba16" Width="4" Height="4" Offset="0x0" />
|
||||
<Texture Name="object_kibako2_Tex_000020" OutName="tex_000020" Format="ci4" Width="32" Height="64" Offset="0x20" />
|
||||
<Texture Name="object_kibako2_Tex_000420" OutName="tex_000420" Format="ci4" Width="32" Height="64" Offset="0x420" />
|
||||
<DList Name="object_kibako2_DL_000960" Offset="0x960" />
|
||||
<Collision Name="object_kibako2_Colheader_000B70" Offset="0xB70" />
|
||||
<Texture Name="object_kibako2_TLUT_000BA0" OutName="tlut_000BA0" Format="rgba16" Width="4" Height="4" Offset="0xBA0" />
|
||||
<Texture Name="object_kibako2_Tex_000BC0" OutName="tex_000BC0" Format="ci4" Width="32" Height="64" Offset="0xBC0" />
|
||||
<DList Name="object_kibako2_DL_001040" Offset="0x1040" />
|
||||
<DList Name="object_kibako2_DL_001100" Offset="0x1100" />
|
||||
<Texture Name="gLargeCrateTLUT" OutName="large_crate_tlut" Format="rgba16" Width="4" Height="4" Offset="0x0" />
|
||||
<Texture Name="gLargeCrateTopTex" OutName="large_crate_top" Format="ci4" Width="32" Height="64" Offset="0x20" />
|
||||
<Texture Name="gLargeCrateSidesTex" OutName="large_crate_sides" Format="ci4" Width="32" Height="64" Offset="0x420" />
|
||||
<DList Name="gLargeCrateDL" Offset="0x960" />
|
||||
<Collision Name="gLargeCrateCol" Offset="0xB70" />
|
||||
<Texture Name="gLargeCrateFragmentTLUT" OutName="large_crate_fragment_tlut" Format="rgba16" Width="4" Height="4" Offset="0xBA0" />
|
||||
<Texture Name="gLargeCrateFragmentTex" OutName="large_crate_fragment" Format="ci4" Width="32" Height="64" Offset="0xBC0" />
|
||||
<DList Name="gLargeCrateFragment1DL" Offset="0x1040" />
|
||||
<DList Name="gLargeCrateFragment2DL" Offset="0x1100" />
|
||||
</File>
|
||||
</Root>
|
||||
|
||||
@@ -7,9 +7,9 @@
|
||||
<DList Name="object_oF1d_map_DL_000D50" Offset="0xD50" />
|
||||
<DList Name="object_oF1d_map_DL_000DD8" Offset="0xDD8" />
|
||||
<DList Name="object_oF1d_map_DL_001560" Offset="0x1560" />
|
||||
<!-- <Blob Name="object_oF1d_map_Blob_001750" Size="0x20" Offset="0x1750" /> -->
|
||||
<Blob Name="object_oF1d_map_Blob_001750" Size="0x20" Offset="0x1750" />
|
||||
<Texture Name="object_oF1d_map_Tex_001770" OutName="tex_001770" Format="rgba16" Width="32" Height="64" Offset="0x1770" />
|
||||
<!-- <Blob Name="object_oF1d_map_Blob_002770" Size="0x800" Offset="0x2770" /> -->
|
||||
<Blob Name="object_oF1d_map_Blob_002770" Size="0x800" Offset="0x2770" />
|
||||
<Texture Name="object_oF1d_map_Tex_002F70" OutName="tex_002F70" Format="i4" Width="32" Height="32" Offset="0x2F70" />
|
||||
<DList Name="object_oF1d_map_DL_0031A0" Offset="0x31A0" />
|
||||
<DList Name="object_oF1d_map_DL_003258" Offset="0x3258" />
|
||||
|
||||
@@ -11,9 +11,11 @@
|
||||
<Texture Name="object_ssh_Tex_0017B0" OutName="tex_0017B0" Format="i8" Width="16" Height="16" Offset="0x17B0" />
|
||||
<Texture Name="object_ssh_Tex_0018B0" OutName="tex_0018B0" Format="ci8" Width="8" Height="16" Offset="0x18B0" />
|
||||
<Texture Name="object_ssh_Tex_001930" OutName="tex_001930" Format="ci8" Width="8" Height="8" Offset="0x1930" />
|
||||
<!-- <Blob Name="object_ssh_Blob_001970" Size="0x400" Offset="0x1970" /> -->
|
||||
<Texture Name="object_ssh_Tex_001970" OutName="tex_001970" Format="ci8" Width="32" Height="32" Offset="0x1970" />
|
||||
<Texture Name="object_ssh_Tex_001D70" OutName="tex_001D70" Format="ci8" Width="8" Height="16" Offset="0x1D70" />
|
||||
<!-- <Blob Name="object_ssh_Blob_001DF0" Size="0x800" Offset="0x1DF0" /> -->
|
||||
<Texture Name="object_ssh_Tex_001DF0" OutName="tex_001DF0" Format="ci8" Width="32" Height="32" Offset="0x1DF0" />
|
||||
<Texture Name="object_ssh_Tex_0021F0" OutName="tex_0021F0" Format="ci8" Width="32" Height="32" Offset="0x21F0" />
|
||||
<Blob Name="object_ssh_Blob_0025F0" Size="0x2870" Offset="0x25F0" />
|
||||
<DList Name="object_ssh_DL_004E60" Offset="0x4E60" />
|
||||
<DList Name="object_ssh_DL_005210" Offset="0x5210" />
|
||||
<DList Name="object_ssh_DL_0056A0" Offset="0x56A0" />
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
<Root>
|
||||
<!-- Used for the unused water vortex actor. -->
|
||||
<File Name="object_stream" Segment="6">
|
||||
<Texture Name="object_stream_Tex_000000" OutName="tex_000000" Format="i4" Width="64" Height="64" Offset="0x0" />
|
||||
<DList Name="object_stream_DL_000950" Offset="0x950" />
|
||||
<Texture Name="gWaterVortexTex" OutName="water_vortex" Format="i4" Width="64" Height="64" Offset="0x0" />
|
||||
<DList Name="gWaterVortexDL" Offset="0x950" />
|
||||
</File>
|
||||
</Root>
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
<Animation Name="object_wiz_Anim_0007B0" Offset="0x7B0" />
|
||||
<Texture Name="object_wiz_Tex_0007C0" OutName="tex_0007C0" Format="i4" Width="32" Height="64" Offset="0x7C0" />
|
||||
<Texture Name="object_wiz_Tex_000BC0" OutName="tex_000BC0" Format="i4" Width="32" Height="32" Offset="0xBC0" />
|
||||
<!-- <Blob Name="object_wiz_Blob_000DC0" Size="0x80" Offset="0xDC0" /> -->
|
||||
<Texture Name="object_wiz_Tex_000DC0" OutName="tex_000DC0" Format="i4" Width="16" Height="16" Offset="0xDC0" />
|
||||
<DList Name="object_wiz_DL_000E70" Offset="0xE70" />
|
||||
<DList Name="object_wiz_DL_000F28" Offset="0xF28" />
|
||||
<DList Name="object_wiz_DL_000FD8" Offset="0xFD8" />
|
||||
|
||||
@@ -0,0 +1,6 @@
|
||||
<Root>
|
||||
<File Name="ovl_En_Bomjima" BaseAddress="0x80BFE170" RangeStart="0x2998" RangeEnd="0x29B8">
|
||||
<DList Name="gEnBomjima_D_80C00B08" Offset="0x2998"/>
|
||||
<DList Name="gEnBomjima_D_80C00B18" Offset="0x29A8"/>
|
||||
</File>
|
||||
</Root>
|
||||
@@ -0,0 +1,14 @@
|
||||
<Root>
|
||||
<File Name="ovl_En_Mm2" BaseAddress="0x809A2030" RangeStart="0x240" RangeEnd="0xAD0">
|
||||
<Texture Name="sEnMm2EnvelopeTex" OutName="mm2_envelope" Format="i8" Width="32" Height="32" Offset="0x240"/>
|
||||
<Texture Name="sEnMm2LetterTex" OutName="mm2_letter" Format="i8" Width="16" Height="16" Offset="0x640"/>
|
||||
<Array Name="sEnMm21Vtx" Count="10" Offset="0x840">
|
||||
<Vtx/>
|
||||
</Array>
|
||||
<Array Name="sEnMm22Vtx" Count="12" Offset="0x8E0">
|
||||
<Vtx/>
|
||||
</Array>
|
||||
<DList Name="sEnMm2DL" Offset="0x9A8"/>
|
||||
</File>
|
||||
</Root>
|
||||
|
||||
+19
-18
@@ -305,8 +305,8 @@ void osViBlack(u8 active);
|
||||
s32 __osSiRawReadIo(u32 devAddr, u32* data);
|
||||
OSId osGetThreadId(OSThread* t);
|
||||
void osSpTaskYield(void);
|
||||
s32 __osPfsGetNextPage(OSPfs* param_1, __OSInode* param_2, u8 param_3, u8 param_4);
|
||||
s32 osPfsReadWriteFile(OSPfs* pfs, s32 file_no, u8 flag, s32 offset, s32 size_in_bytes, u8* data_buffer);
|
||||
s32 __osPfsGetNextPage(OSPfs* pfs, u8* bank, __OSInode* inode, __OSInodeUnit* page);
|
||||
s32 osPfsReadWriteFile(OSPfs* pfs, s32 fileNo, u8 flag, s32 offset, s32 size, u8* data);
|
||||
s32 __osPfsGetStatus(OSMesgQueue* queue, s32 channel);
|
||||
// void __osPfsRequestOneChannel(void);
|
||||
// void __osPfsGetOneChannelData(void);
|
||||
@@ -493,8 +493,8 @@ void* __osMemcpy(void* dst, void* src, size_t size);
|
||||
// void EnItem00_DrawHeartContainer(EnItem00* this, GlobalContext* globalCtx);
|
||||
// void EnItem00_DrawHeartPiece(EnItem00* this, GlobalContext* globalCtx);
|
||||
// s16 func_800A7650(s16 dropId);
|
||||
EnItem00* Item_DropCollectible(GlobalContext* globalCtx, Vec3f* spawnPos, u32 params);
|
||||
Actor* Item_DropCollectible2(GlobalContext* globalCtx, Vec3f* spawnPos, u32 params);
|
||||
Actor* Item_DropCollectible(GlobalContext* globalCtx, Vec3f* spawnPos, u32 params);
|
||||
Actor* Item_DropCollectible2(GlobalContext* globalCtx, Vec3f* spawnPos, s32 params);
|
||||
void Item_DropCollectibleRandom(GlobalContext* globalCtx, Actor* fromActor, Vec3f* spawnPos, s16 params);
|
||||
s32 func_800A8150(s32 index);
|
||||
s32 func_800A817C(s32 index);
|
||||
@@ -591,9 +591,10 @@ void EffectSsKiraKira_SpawnDispersed(GlobalContext* globalCtx, Vec3f* pos, Vec3f
|
||||
void EffectSsBomb2_SpawnLayered(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 scale,
|
||||
s16 scaleStep);
|
||||
// void EffectSsBlast_Spawn(UNK_TYPE4 uParm1, Vec3f* pzParm2, Vec3f* pzParm3, Vec3f* pzParm4, Color_RGBA8* param_5, Color_RGBA8* param_6, UNK_TYPE2 param_7, UNK_TYPE2 param_8, UNK_TYPE2 param_9, UNK_TYPE2 param_10);
|
||||
// void EffectSsBlast_SpawnWhiteCustomScale(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE2 param_5, UNK_TYPE2 param_6, UNK_TYPE2 param_7);
|
||||
void EffectSsBlast_SpawnWhiteCustomScale(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 scale,
|
||||
s16 scaleStep, s16 life);
|
||||
// void EffectSsBlast_SpawnShockwave(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5, UNK_TYPE4 param_6, UNK_TYPE2 param_7);
|
||||
// void EffectSsBlast_SpawnWhiteShockwave(void);
|
||||
void EffectSsBlast_SpawnWhiteShockwave(GlobalContext* globalCtx, Vec3f* arg1, Vec3f* arg2, Vec3f* arg3);
|
||||
// void EffectSsGSpk_SpawnAccel(UNK_TYPE4 uParm1, UNK_TYPE4 uParm2, Vec3f* pzParm3, Vec3f* pzParm4, Vec3f* param_5, Color_RGBA8* param_6, Color_RGBA8* param_7, UNK_TYPE2 param_8, UNK_TYPE2 param_9);
|
||||
// void EffectSsGSpk_SpawnNoAccel(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5, UNK_TYPE4 param_6, UNK_TYPE4 param_7, UNK_TYPE2 param_8, UNK_TYPE2 param_9);
|
||||
// void EffectSsGSpk_SpawnFuse(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5);
|
||||
@@ -1255,7 +1256,7 @@ s16 Camera_ClearFlags(Camera* camera, s16 flags);
|
||||
// void func_800E0238(void);
|
||||
void func_800E02AC(Camera* camera, Actor* actor);
|
||||
void func_800E0308(Camera* camera, Actor* actor);
|
||||
// void func_800E031C(void);
|
||||
f32 func_800E031C(Camera* camera);
|
||||
void func_800E0348(Camera* camera);
|
||||
DamageTable* DamageTable_Get(s32 index);
|
||||
void DamageTable_Clear(DamageTable* damageTable);
|
||||
@@ -1533,8 +1534,8 @@ void func_800EDF24(Actor* actor, GlobalContext* globalCtx, u32 arg2);
|
||||
void func_800EDF78(Actor* actor, GlobalContext* globalCtx, s32 iParm3);
|
||||
void func_800EE0CC(Actor* actor, GlobalContext* globalCtx, s32 iParm3);
|
||||
s32 func_800EE1D8(GlobalContext* globalCtx);
|
||||
u32 func_800EE200(GlobalContext* globalCtx, u32 uParm2);
|
||||
u32 func_800EE29C(GlobalContext* globalCtx, u32 uParm2);
|
||||
u32 func_800EE200(GlobalContext* globalCtx, u16 uParm2);
|
||||
u32 func_800EE29C(GlobalContext* globalCtx, u16 uParm2);
|
||||
u32 func_800EE2F4(GlobalContext* globalCtx);
|
||||
void GetItem_Draw(GlobalContext* globalCtx, s16 index);
|
||||
void func_800EE364(GlobalContext* globalCtx, s16 index);
|
||||
@@ -1658,7 +1659,7 @@ u32 func_800F5954(u8* param_1, u32 param_2, u32 param_3, u8 param_4, u8 param_5)
|
||||
f32 func_800F5A8C(u16 arg0, u16 arg1, u16 arg2, GlobalContext* globalContext);
|
||||
// void func_800F5B10(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE2 param_5);
|
||||
// void func_800F5CD0(void);
|
||||
// void func_800F6834(void);
|
||||
void func_800F6834(GlobalContext* globalCtx, s32 waterLightsIndex);
|
||||
// void func_800F694C(void);
|
||||
// void func_800F6A04(void);
|
||||
// void func_800F6A40(void);
|
||||
@@ -2160,7 +2161,7 @@ void func_80123F2C(GlobalContext* globalCtx, s32 arg1);
|
||||
// void func_80124020(void);
|
||||
u8 Player_GetMask(GlobalContext* globalCtx);
|
||||
void Player_RemoveMask(GlobalContext* globalCtx);
|
||||
// void func_8012405C(void);
|
||||
s32 func_8012405C(GlobalContext* globalCtx);
|
||||
// void func_80124088(void);
|
||||
s32 func_801240C8(Player* player);
|
||||
// void func_801240DC(void);
|
||||
@@ -2617,7 +2618,7 @@ void func_8013A46C(s32 flag);
|
||||
u32 func_8013A4C4(s32 flag);
|
||||
s16 func_8013A504(s16 val);
|
||||
s32 func_8013A530(GlobalContext* globalCtx, Actor* actor, s32 flag, Vec3f* pos, Vec3s* rot, f32 distanceMin, f32 distanceMax, s16 angleError);
|
||||
Actor* func_8013A7C0(GlobalContext* globalCtx, s32 arg1);
|
||||
struct EnDoor* SubS_FindDoor(GlobalContext* globalCtx, s32 unk_1A5);
|
||||
Gfx* func_8013A860(GlobalContext* globalCtx, s32 idx, void** skeleton, Vec3s* jointTable, OverrideLimbDraw overrideLimbDraw, PostLimbDraw postLimbDraw, UnkActorDraw unkActorDraw, Actor* actor, Mtx** mtx, Gfx* gfx);
|
||||
Gfx* func_8013AB00(GlobalContext* globalCtx, void** skeleton, Vec3s* jointTable, s32 dListCount, OverrideLimbDraw overrideLimbDraw, PostLimbDraw postLimbDraw, UnkActorDraw unkActorDraw, Actor* actor, Gfx* gfx);
|
||||
s32 func_8013AD6C(GlobalContext* globalCtx);
|
||||
@@ -2630,7 +2631,7 @@ void func_8013B350(Vec3f* arg0, f32* arg1, f32 arg2, s32 arg3, s32 arg4, Vec3s*
|
||||
s32 func_8013B6B0(Path* path, f32* arg1, s32* arg2, s32 arg3, s32 arg4, s32* arg5, f32* arg6, Vec3f* arg7, s32 arg8);
|
||||
void func_8013B878(GlobalContext* globalCtx, Path* path, s32 arg2, Vec3f* arg3);
|
||||
Path* func_8013BB34(GlobalContext* globalCtx, u8 arg1, s32 arg2);
|
||||
Actor* func_8013BB7C(Actor* actor, GlobalContext* globalCtx, u8 actorCategory, s16 actorId);
|
||||
Actor* SubS_FindNearestActor(Actor* actor, GlobalContext* globalCtx, u8 actorCategory, s16 actorId);
|
||||
s32 func_8013BC6C(SkelAnime* skelAnime, ActorAnimationEntryS* arg1, s32 arg2);
|
||||
s32 func_8013BD40(Actor* actor, Path* path, s32 arg2);
|
||||
Path* func_8013BEDC(GlobalContext* globalCtx, u8 arg1, u8 arg2, s32* arg3);
|
||||
@@ -2651,7 +2652,7 @@ s32 func_8013D768(Actor* actor, Vec3f* arg1, s16 arg2);
|
||||
s16 func_8013D83C(Path* path, s32 pointIdx, Vec3f* pos, f32* distSq);
|
||||
s8 func_8013D8DC(s8 arg0, GlobalContext* globalCtx);
|
||||
s8 func_8013D924(s16 arg0, GlobalContext* globalCtx);
|
||||
Actor* func_ActorCategoryIterateById(GlobalContext* globalCtx, Actor* actorListStart, u8 actorCategory, s16 actorId);
|
||||
Actor* SubS_FindActor(GlobalContext* globalCtx, Actor* actorListStart, u8 actorCategory, s16 actorId);
|
||||
s32 func_8013D9C8(GlobalContext* globalCtx, s16* arg1, s16* arg2, s32 arg3);
|
||||
s32 func_8013DB90(GlobalContext* globalCtx, Vec3f* arg1, f32 arg2);
|
||||
s32 func_8013DC40(Path* arg0, s32 arg1, s32 arg2, Vec3f* arg3);
|
||||
@@ -2666,17 +2667,17 @@ s32 func_8013E2D4(Actor* actor, s16 arg1, s16 arg2, s32 arg3);
|
||||
s32 func_8013E3B8(Actor* actor, s16 cutscenes[], s16 len);
|
||||
void func_8013E4B0(Vec3f* arg0, Vec3f* arg1, Vec3s* arg2, Plane* plane);
|
||||
s32 func_8013E5CC(Vec3f* arg0, Vec3s* arg1, Vec3f* arg2, Vec3f* arg3, Vec3f* arg4, Vec3f* arg5);
|
||||
Actor* func_8013E640(GlobalContext* globalCtx, Actor* arg1, Actor* actorListStart, u8 actorCategory, s16 actorId, void* arg5, func_8013E640_arg6 arg6);
|
||||
Actor* SubS_FindActorCustom(GlobalContext* globalCtx, Actor* actor, Actor* actorListStart, u8 actorCategory, s16 actorId, void* verifyData, VerifyActor verifyActor);
|
||||
s32 func_8013E748(Actor* actor, GlobalContext* globalCtx, f32 arg2, f32 arg3, s32 arg4, Vec3s* arg5, func_8013E748_arg6 arg6);
|
||||
s32 func_8013E7C0(GlobalContext* globalCtx, Actor* actor, Vec3s* arg2);
|
||||
void func_8013E8F8(Actor* actor, GlobalContext* globalCtx, f32 arg2, f32 arg3, s32 arg4, s16 arg5, s16 arg6);
|
||||
s32 func_8013E950(Vec3f* arg0, Vec3f* arg1, s16 arg2, Vec3f* arg3, Vec3f* arg4, s16* arg5, s16* arg6, s16* arg7, s16* arg8, u16 arg9, u16 arg10, u16 arg11, u16 arg12);
|
||||
// void func_8013EC10(void);
|
||||
void func_8013EC44(f32 arg0, u8 arg1, u8 arg2, u8 arg3);
|
||||
void func_8013EC44(f32 a, u8 b, u8 c, u8 d);
|
||||
void func_8013ECE0(f32 xyzDistToPlayerSq, u8 arg1, u8 arg2, u8 arg3);
|
||||
void func_8013ED9C(void);
|
||||
void func_8013EDD0(void);
|
||||
// void func_8013EE04(void);
|
||||
u32 func_8013EE04(void);
|
||||
void func_8013EE24(void);
|
||||
// void func_8013EE38(void);
|
||||
// void func_8013EE48(void);
|
||||
@@ -3802,7 +3803,7 @@ void func_8019F570(Vec3f* pos, s8 arg1);
|
||||
void func_8019F88C(Vec3f* arg0, u16 sfxId, UNK_TYPE arg2);
|
||||
// void func_8019F900(void);
|
||||
// void func_8019FA18(void);
|
||||
void func_8019FAD8(Vec3f* param_1, u16 param_2, f32 param_3);
|
||||
void func_8019FAD8(Vec3f* param_1, u16 sfxId, f32 param_3);
|
||||
// void func_8019FB0C(void);
|
||||
// void func_8019FC20(void);
|
||||
// void func_8019FCB8(void);
|
||||
|
||||
@@ -1,6 +1,39 @@
|
||||
#ifndef _INITVARS_H_
|
||||
#define _INITVARS_H_
|
||||
|
||||
extern EffectSsInit Effect_Ss_Dust_InitVars;
|
||||
extern EffectSsInit Effect_Ss_Kirakira_InitVars;
|
||||
extern EffectSsInit Effect_Ss_Bomb2_InitVars;
|
||||
extern EffectSsInit Effect_Ss_Blast_InitVars;
|
||||
extern EffectSsInit Effect_Ss_G_Spk_InitVars;
|
||||
extern EffectSsInit Effect_Ss_D_Fire_InitVars;
|
||||
extern EffectSsInit Effect_Ss_Bubble_InitVars;
|
||||
extern EffectSsInit Effect_Ss_G_Ripple_InitVars;
|
||||
extern EffectSsInit Effect_Ss_G_Splash_InitVars;
|
||||
extern EffectSsInit Effect_Ss_G_Fire_InitVars;
|
||||
extern EffectSsInit Effect_Ss_Lightning_InitVars;
|
||||
extern EffectSsInit Effect_Ss_Dt_Bubble_InitVars;
|
||||
extern EffectSsInit Effect_Ss_Hahen_InitVars;
|
||||
extern EffectSsInit Effect_Ss_Stick_InitVars;
|
||||
extern EffectSsInit Effect_Ss_Sibuki_InitVars;
|
||||
extern EffectSsInit Effect_Ss_Stone1_InitVars;
|
||||
extern EffectSsInit Effect_Ss_Hitmark_InitVars;
|
||||
extern EffectSsInit Effect_Ss_Fhg_Flash_InitVars;
|
||||
extern EffectSsInit Effect_Ss_K_Fire_InitVars;
|
||||
extern EffectSsInit Effect_Ss_Solder_Srch_Ball_InitVars;
|
||||
extern EffectSsInit Effect_Ss_Kakera_InitVars;
|
||||
extern EffectSsInit Effect_Ss_Ice_Piece_InitVars;
|
||||
extern EffectSsInit Effect_Ss_En_Ice_InitVars;
|
||||
extern EffectSsInit Effect_Ss_Fire_Tail_InitVars;
|
||||
extern EffectSsInit Effect_Ss_En_Fire_InitVars;
|
||||
extern EffectSsInit Effect_Ss_Extra_InitVars;
|
||||
extern EffectSsInit Effect_Ss_Dead_Db_InitVars;
|
||||
extern EffectSsInit Effect_Ss_Dead_Dd_InitVars;
|
||||
extern EffectSsInit Effect_Ss_Dead_Ds_InitVars;
|
||||
extern EffectSsInit Effect_Ss_Ice_Smoke_InitVars;
|
||||
extern EffectSsInit Effect_En_Ice_Block_InitVars;
|
||||
extern EffectSsInit Effect_Ss_Sbn_InitVars;
|
||||
|
||||
extern ActorInit Arms_Hook_InitVars;
|
||||
extern ActorInit Arrow_Fire_InitVars;
|
||||
extern ActorInit Arrow_Ice_InitVars;
|
||||
|
||||
@@ -99,8 +99,8 @@
|
||||
|
||||
typedef struct {
|
||||
/* 0x00 */ u32 ramarray[15];
|
||||
/* 0x3C */ u32 pifstatus;
|
||||
} OSPifRam;
|
||||
/* 0x3C */ u32 status;
|
||||
} OSPifRam; // size = 0x40
|
||||
|
||||
|
||||
typedef struct {
|
||||
|
||||
+15
-28
@@ -382,7 +382,7 @@ extern UNK_PTR D_801AE260[3];
|
||||
// extern UNK_TYPE4 D_801AE2BC;
|
||||
// extern UNK_TYPE4 D_801AE2CC;
|
||||
// extern UNK_TYPE4 D_801AE2DC;
|
||||
extern EffectSsInfo EffectSS2Info;
|
||||
// extern EffectSsInfo sEffectSsInfo;
|
||||
// extern UNK_TYPE1 D_801AE3B0;
|
||||
// extern UNK_TYPE1 D_801AE3B4;
|
||||
// extern UNK_TYPE4 D_801AE3B8;
|
||||
@@ -410,7 +410,7 @@ extern EffectSsInfo EffectSS2Info;
|
||||
// extern UNK_TYPE1 D_801AE48A;
|
||||
// extern UNK_TYPE1 D_801AE48C;
|
||||
// extern UNK_TYPE1 D_801AE490;
|
||||
extern EffectSsOverlay particleOverlayTable[39];
|
||||
extern EffectSsOverlay gParticleOverlayTable[39];
|
||||
// extern FlagSetEntry sFlagEntries[];
|
||||
// extern s32 sEntryIndex;
|
||||
// extern u32 sCurrentBit;
|
||||
@@ -3866,14 +3866,6 @@ extern UNK_TYPE D_0400E3D8;
|
||||
extern UNK_TYPE D_0400E408;
|
||||
extern UNK_TYPE D_0400E410;
|
||||
extern UNK_TYPE D_0400E418;
|
||||
extern CollisionHeader D_0400E710; // Pink Deku Flower collision
|
||||
extern AnimationHeader D_0400EB7C; // Deku Flower intense flutter animation
|
||||
extern Gfx D_0400ED80; // Pink Deku Flower display list
|
||||
extern SkeletonHeader D_04011518; // Pink Deku Flower skeleton
|
||||
extern AnimationHeader D_040117A8; // Deku Flower small flutter animation
|
||||
extern CollisionHeader D_040118D8; // Gold Deku Flower collision
|
||||
extern Gfx D_04011BD0; // Gold Deku Flower display list
|
||||
extern SkeletonHeader D_040127E8; // Gold Deku Flower skeleton
|
||||
extern UNK_TYPE D_04012860;
|
||||
extern UNK_TYPE D_040128BC;
|
||||
extern u64 D_04014570[];
|
||||
@@ -3895,7 +3887,8 @@ extern Gfx D_04023210[];
|
||||
extern UNK_TYPE D_04023288;
|
||||
extern Gfx D_04023348[];
|
||||
extern Gfx D_04023428[];
|
||||
extern UNK_TYPE D_04025850;
|
||||
extern Gfx D_04025850[];
|
||||
extern Gfx D_04025970[];
|
||||
extern UNK_TYPE D_04025DD0;
|
||||
extern UNK_TYPE D_040281DC;
|
||||
extern UNK_TYPE D_04028FEC;
|
||||
@@ -3903,16 +3896,9 @@ extern AnimationHeader D_04029140;
|
||||
extern Gfx D_04029CB0[];
|
||||
extern Gfx D_04029CF0[];
|
||||
extern UNK_TYPE D_04029D20;
|
||||
extern AnimationHeader D_0402B494;
|
||||
extern AnimatedMaterial D_0402C818;
|
||||
extern AnimatedMaterial D_0402C890;
|
||||
extern AnimatedMaterial D_0402C908;
|
||||
extern AnimatedMaterial D_0402C980;
|
||||
extern AnimatedMaterial D_0402C9F8;
|
||||
extern FlexSkeletonHeader D_0402CA98;
|
||||
extern Gfx D_0402E510[];
|
||||
extern UNK_TYPE D_0402E65C;
|
||||
extern UNK_TYPE D_0402F0EC;
|
||||
extern AnimationHeader D_0402E65C;
|
||||
extern AnimationHeader D_0402F0EC;
|
||||
extern Gfx D_04030100[]; // Floor shockwave ring
|
||||
extern Gfx D_040301B0[];
|
||||
extern UNK_TYPE D_04032270;
|
||||
@@ -3937,8 +3923,8 @@ extern UNK_TYPE D_04050D10;
|
||||
extern UNK_TYPE D_04051180;
|
||||
extern UNK_TYPE D_04051238;
|
||||
extern AnimationHeader D_0405140C;
|
||||
extern UNK_TYPE D_040527F0;
|
||||
extern UNK_TYPE D_040528B0;
|
||||
extern Gfx D_040527F0[];
|
||||
extern Gfx D_040528B0[];
|
||||
extern Gfx D_04054A90[];
|
||||
extern u64 D_04054F20[];
|
||||
extern UNK_TYPE D_04055628;
|
||||
@@ -3980,6 +3966,7 @@ extern Gfx D_0406AB30[];
|
||||
extern UNK_TYPE D_0406B730;
|
||||
extern UNK_TYPE D_0406BB0C;
|
||||
extern UNK_TYPE D_0406F380;
|
||||
extern Gfx D_040706E0[];
|
||||
extern UNK_TYPE D_04073F00;
|
||||
extern UNK_TYPE D_04075400;
|
||||
extern Gfx D_04075A40[];
|
||||
@@ -4001,13 +3988,13 @@ extern UNK_TYPE D_04091CE0;
|
||||
|
||||
extern Gfx D_05000C40[];
|
||||
extern UNK_TYPE D_05001D20;
|
||||
extern UNK_TYPE D_050061E8;
|
||||
extern UNK_TYPE D_05006420;
|
||||
extern UNK_TYPE D_050066B0;
|
||||
extern Gfx D_050061E8[];
|
||||
extern Gfx D_05006420[];
|
||||
extern Gfx D_050066B0[];
|
||||
extern UNK_TYPE D_05007498;
|
||||
extern Gfx D_05007890[];
|
||||
extern UNK_TYPE D_050078A0;
|
||||
extern UNK_TYPE D_05007938;
|
||||
extern Gfx D_050078A0[];
|
||||
extern Gfx D_05007938[];
|
||||
extern Gfx D_05007980[];
|
||||
extern UNK_TYPE D_05007E00;
|
||||
extern UNK_TYPE D_05008018;
|
||||
@@ -4024,7 +4011,7 @@ extern UNK_TYPE D_0502324C;
|
||||
|
||||
// other segments
|
||||
extern GfxMasterList D_0E000000;
|
||||
|
||||
extern Mtx D_01000000;
|
||||
extern UNK_TYPE D_0F000000;
|
||||
|
||||
|
||||
|
||||
+1
-1
@@ -1554,7 +1554,7 @@ typedef struct {
|
||||
|
||||
typedef s32 (*func_8013E748_arg6)(struct GlobalContext*, Actor*, Vec3s*);
|
||||
|
||||
typedef s32 (*func_8013E640_arg6)(struct GlobalContext*, Actor*, Actor*, void*);
|
||||
typedef s32 (*VerifyActor)(struct GlobalContext*, Actor*, Actor*, void*);
|
||||
|
||||
struct struct_8013DF3C_arg1;
|
||||
typedef void (*struct_8013DF3C_arg1_unk_func1)(struct GlobalContext*, struct struct_8013DF3C_arg1*);
|
||||
|
||||
@@ -15,6 +15,8 @@ struct GlobalContext;
|
||||
struct Lights;
|
||||
struct CollisionPoly;
|
||||
|
||||
struct EnDoor;
|
||||
|
||||
typedef void(*ActorFunc)(struct Actor* this, struct GlobalContext* globalCtx);
|
||||
|
||||
typedef struct {
|
||||
|
||||
+1
-22
@@ -254,7 +254,7 @@ typedef struct {
|
||||
/* 0x0C */ void* vramEnd;
|
||||
/* 0x10 */ void* loadedRamAddr;
|
||||
/* 0x14 */ EffectSsInit* initInfo;
|
||||
/* 0x18 */ u32 unk18; // Always 0x01000000?
|
||||
/* 0x18 */ u8 unk18; // Always 1?
|
||||
} EffectSsOverlay; // size = 0x1C
|
||||
|
||||
typedef struct EffectSs {
|
||||
@@ -279,27 +279,6 @@ typedef struct {
|
||||
/* 0x8 */ s32 size;
|
||||
} EffectSsInfo; // size = 0xC
|
||||
|
||||
typedef struct {
|
||||
/* 0x0 */ EffectSs* data_table; // Name from debug assert
|
||||
/* 0x4 */ s32 searchIndex;
|
||||
/* 0x8 */ s32 size;
|
||||
} EffectTableInfo; // size = 0xC
|
||||
|
||||
typedef struct {
|
||||
/* 0x0 */ UNK_TYPE4 unk0;
|
||||
/* 0x4 */ EffectSsInitFunc init;
|
||||
} ParticleOverlayInfo; // size = 0x8
|
||||
|
||||
typedef struct {
|
||||
/* 0x00 */ u32 vromStart;
|
||||
/* 0x04 */ u32 vromEnd;
|
||||
/* 0x08 */ void* vramStart;
|
||||
/* 0x0C */ void* vramEnd;
|
||||
/* 0x10 */ void* loadedRamAddr;
|
||||
/* 0x14 */ ParticleOverlayInfo* overlayInfo;
|
||||
/* 0x18 */ u32 unk18; // Always 0x01000000?
|
||||
} ParticleOverlay; // size = 0x1C
|
||||
|
||||
typedef enum {
|
||||
/* 0x00 */ EFFECT_SS_DUST,
|
||||
/* 0x01 */ EFFECT_SS_KIRAKIRA,
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user