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 remote-tracking branch 'upstream/main' into sys_math3d_bss

Browse Source
This commit is contained in:
Derek Hensley
2023-10-20 07:35:40 -07:00
parent aef3a76e04 1d3f38dcaa
commit 55c8ec6b40
1063 changed files with 32909 additions and 13833 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile
Vendored
+2 -2
View File
@@ -84,7 +84,7 @@ pipeline {
}
stage('Report Progress') {
when {
branch 'master'
branch 'main'
}
steps {
sh 'mkdir reports'
@@ -96,7 +96,7 @@ pipeline {
}
stage('Update Progress') {
when {
branch 'master'
branch 'main'
}
agent{
label 'zeldaret_website'
Makefile
+11 -6
View File
@@ -23,6 +23,8 @@ FULL_DISASM ?= 0
RUN_CC_CHECK ?= 1
# Dump build object files
OBJDUMP_BUILD ?= 0
# Force asm processor to run on every file
ASM_PROC_FORCE ?= 0
# Number of threads to disassmble, extract, and compress with
N_THREADS ?= $(shell nproc)
@@ -92,6 +94,10 @@ ASM_PROC := python3 tools/asm-processor/build.py
ASM_PROC_FLAGS := --input-enc=utf-8 --output-enc=euc-jp --convert-statics=global-with-filename
ifneq ($(ASM_PROC_FORCE), 0)
ASM_PROC_FLAGS += --force
endif
IINC := -Iinclude -Isrc -Iassets -Ibuild -I.
ifeq ($(KEEP_MDEBUG),0)
@@ -201,8 +207,7 @@ DEP_FILES := $(O_FILES:.o=.asmproc.d) $(OVL_RELOC_FILES:.o=.d)
$(shell mkdir -p build/baserom $(foreach dir,$(SRC_DIRS) $(ASM_DIRS) $(ASSET_BIN_DIRS),build/$(dir)))
# directory flags
build/src/boot_O2/%.o: OPTFLAGS := -O2
build/src/boot_O2_g3/%.o: OPTFLAGS := -O2 -g3
build/src/boot/O2/%.o: OPTFLAGS := -O2
build/src/libultra/os/%.o: OPTFLAGS := -O1
build/src/libultra/voice/%.o: OPTFLAGS := -O2
@@ -219,8 +224,8 @@ build/assets/%.o: OPTFLAGS := -O1
build/assets/%.o: ASM_PROC_FLAGS :=
# file flags
build/src/boot_O2_g3/fault.o: CFLAGS += -trapuv
build/src/boot_O2_g3/fault_drawer.o: CFLAGS += -trapuv
build/src/boot/fault.o: CFLAGS += -trapuv
build/src/boot/fault_drawer.o: CFLAGS += -trapuv
build/src/code/jpegutils.o: OPTFLAGS := -O2
build/src/code/jpegdecoder.o: OPTFLAGS := -O2
@@ -233,8 +238,8 @@ build/src/libultra/libc/llcvt.o: OPTFLAGS := -O1
build/src/libultra/libc/llcvt.o: MIPS_VERSION := -mips3 -32
# cc & asm-processor
build/src/boot_O2/%.o: CC := $(ASM_PROC) $(ASM_PROC_FLAGS) $(CC) -- $(AS) $(ASFLAGS) --
build/src/boot_O2_g3/%.o: CC := $(ASM_PROC) $(ASM_PROC_FLAGS) $(CC) -- $(AS) $(ASFLAGS) --
build/src/boot/%.o: CC := $(ASM_PROC) $(ASM_PROC_FLAGS) $(CC) -- $(AS) $(ASFLAGS) --
build/src/boot/O2/%.o: CC := $(ASM_PROC) $(ASM_PROC_FLAGS) $(CC) -- $(AS) $(ASFLAGS) --
build/src/libultra/%.o: CC := $(CC_OLD)
# Needed at least until voice is decompiled
README.md
+2 -2
View File
@@ -2,8 +2,8 @@
[![Build Status][jenkins-badge]][jenkins] [![Decompilation Progress][progress-badge]][progress] [![Contributors][contributors-badge]][contributors] [![Discord Channel][discord-badge]][discord]
[jenkins]: https://jenkins.deco.mp/job/MM/job/master
[jenkins-badge]: https://img.shields.io/jenkins/build?jobUrl=https%3A%2F%2Fjenkins.deco.mp%2Fjob%2FMM%2Fjob%2Fmaster
[jenkins]: https://jenkins.deco.mp/job/MM/job/main
[jenkins-badge]: https://img.shields.io/jenkins/build?jobUrl=https%3A%2F%2Fjenkins.deco.mp%2Fjob%2FMM%2Fjob%2Fmain
[progress]: https://zelda64.dev/games/mm
[progress-badge]: https://img.shields.io/endpoint?url=https://zelda64.dev/assets/csv/progress-mm-shield.json
assets/xml/interface/week_static.xml
+3 -3
View File
@@ -1,7 +1,7 @@
<Root>
<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"/>
<Texture Name="gClockDay1stTex" OutName="clock_day_1st" Format="i8" Width="48" Height="27" Offset="0x0"/>
<Texture Name="gClockDay2ndTex" OutName="clock_day_2nd" Format="i8" Width="48" Height="27" Offset="0x510"/>
<Texture Name="gClockDayFinalTex" OutName="clock_day_final" Format="i8" Width="48" Height="27" Offset="0xA20"/>
</File>
</Root>
assets/xml/objects/gameplay_keep.xml
+7 -7
View File
@@ -1159,7 +1159,7 @@
<Texture Name="gElegyShellGoronPlatformTex" OutName="elegy_shell_goron_platform" Format="ci8" Width="8" Height="16" Offset="0x4E1A0" />
<Texture Name="gHookshotReticleTex" OutName="tex_04E220" Format="i8" Width="64" Height="64" Offset="0x4E220" />
<DList Name="gHookshotReticleDL" Offset="0x4F250" />
<DList Name="gHookshotReticleDL" Offset="0x4F250" /> <!-- Original name might be "pointer_modelT" -->
<Texture Name="gameplay_keep_Tex_04F2C0" OutName="tex_04F2C0" Format="ia16" Width="32" Height="64" Offset="0x4F2C0" />
<DList Name="gEffIceFragment1DL" Offset="0x50550" />
<DList Name="gEffIceFragment2MaterialDL" Offset="0x50648" />
@@ -1223,8 +1223,8 @@
<Limb Name="gameplay_keep_Standardlimb_05272C" Type="Standard" EnumName="BUG_LIMB_16" Offset="0x5272C" />
<Limb Name="gameplay_keep_Standardlimb_052738" Type="Standard" EnumName="BUG_LIMB_17" Offset="0x52738" />
<Skeleton Name="gameplay_keep_Skel_0527A0" Type="Normal" LimbType="Standard" LimbNone="BUG_LIMB_NONE" LimbMax="BUG_LIMB_MAX" EnumName="BugLimb" Offset="0x527A0" />
<DList Name="gKakeraLeafMiddle" Offset="0x527F0" />
<DList Name="gKakeraLeafTip" Offset="0x528B0" />
<DList Name="gKakeraLeafMiddleDL" Offset="0x527F0" />
<DList Name="gKakeraLeafTipDL" Offset="0x528B0" />
<Texture Name="gameplay_keep_Tex_052940" OutName="tex_052940" Format="rgba16" Width="32" Height="32" Offset="0x52940" />
<Texture Name="gameplay_keep_Tex_053140" OutName="tex_053140" Format="rgba16" Width="32" Height="32" Offset="0x53140" />
<Texture Name="gameplay_keep_Tex_053940" OutName="tex_053940" Format="i4" Width="64" Height="64" Offset="0x53940" />
@@ -1281,7 +1281,7 @@
<Texture Name="gDropArrows3Tex" OutName="drop_arrows_3" Format="rgba16" Width="32" Height="32" Offset="0x5C6F0" />
<Texture Name="gDropBombTex" OutName="drop_bomb" Format="rgba16" Width="32" Height="32" Offset="0x5CEF0" />
<Texture Name="gDropBombchuTex" OutName="drop_bombchu" Format="rgba16" Width="32" Height="32" Offset="0x5D6F0" />
<Texture Name="gDropUnknownPouch" OutName="drop_unknown_pouch" Format="rgba16" Width="32" Height="32" Offset="0x5DEF0" />
<Texture Name="gDropUnknownPouchTex" OutName="drop_unknown_pouch" Format="rgba16" Width="32" Height="32" Offset="0x5DEF0" />
<Texture Name="gDropRecoveryHeartTex" OutName="drop_recovery_heart" Format="rgba16" Width="32" Height="32" Offset="0x5E6F0" />
<Texture Name="gDropHeartPieceTex" OutName="drop_heart_piece" Format="rgba16" Width="32" Height="32" Offset="0x5EEF0" />
<DList Name="gItemDropDL" Offset="0x5F6F0" />
@@ -1486,9 +1486,9 @@
<Texture Name="gElegyShellZoraFinTex" OutName="elegy_shell_zora_fin" Format="ci8" Width="16" Height="16" Offset="0x8C1E0" />
<Texture Name="gElegyShellZoraEyeTex" OutName="elegy_shell_zora_eye" Format="ci8" Width="32" Height="32" Offset="0x8C2E0" />
<Texture Name="gElegyShellZoraMouthTex" OutName="elegy_shell_zora_mouth" Format="ci8" Width="32" Height="32" Offset="0x8C6E0" />
<Texture Name="gElegyShellZoraRibsTattoo" OutName="elegy_shell_zora_ribs_tattoo" Format="ci8" Width="16" Height="32" Offset="0x8CAE0" />
<Texture Name="gElegyShellZoraArrowTattoo" OutName="elegy_shell_zora_arrow_tattoo" Format="ci8" Width="16" Height="32" Offset="0x8CCE0" />
<Texture Name="gElegyShellZoraRightShoulderTattoo" OutName="elegy_shell_zora_right_shoulder_tattoo" Format="ci8" Width="32" Height="32" Offset="0x8CEE0" />
<Texture Name="gElegyShellZoraRibsTattooTex" OutName="elegy_shell_zora_ribs_tattoo" Format="ci8" Width="16" Height="32" Offset="0x8CAE0" />
<Texture Name="gElegyShellZoraArrowTattooTex" OutName="elegy_shell_zora_arrow_tattoo" Format="ci8" Width="16" Height="32" Offset="0x8CCE0" />
<Texture Name="gElegyShellZoraRightShoulderTattooTex" OutName="elegy_shell_zora_right_shoulder_tattoo" Format="ci8" Width="32" Height="32" Offset="0x8CEE0" />
<Texture Name="gElegyShellZoraPlatformTex" OutName="elegy_shell_zora_platform" Format="rgba16" Width="8" Height="16" Offset="0x8D2E0" />
<Texture Name="gameplay_keep_Tex_08D3E0" OutName="tex_08D3E0" Format="i8" Width="64" Height="32" Offset="0x8D3E0" />
assets/xml/objects/object_ani.xml
+5 -5
View File
@@ -8,10 +8,10 @@
<Animation Name="gAniTreeHangingReachAnim" Offset="0x27A0" /> <!-- Original name is "Ani_ki02" -->
<Limb Name="gAniPelvisLimb" Type="Standard" EnumName="ANI_LIMB_PELVIS" Offset="0x27B0" />
<Limb Name="gAniLeftThighLimb" Type="Standard" EnumName="ANI_LIMB_LEFT_THIGH" Offset="0x27BC" />
<Limb Name="gAniLeftCalfLimb" Type="Standard" EnumName="ANI_LIMB_LEFT_CALF" Offset="0x27C8" />
<Limb Name="gAniLeftShinLimb" Type="Standard" EnumName="ANI_LIMB_LEFT_SHIN" Offset="0x27C8" />
<Limb Name="gAniLeftFootLimb" Type="Standard" EnumName="ANI_LIMB_LEFT_FOOT" Offset="0x27D4" />
<Limb Name="gAniRightThighLimb" Type="Standard" EnumName="ANI_LIMB_RIGHT_THIGH" Offset="0x27E0" />
<Limb Name="gAniRightCalfLimb" Type="Standard" EnumName="ANI_LIMB_RIGHT_CALF" Offset="0x27EC" />
<Limb Name="gAniRightShinLimb" Type="Standard" EnumName="ANI_LIMB_RIGHT_SHIN" Offset="0x27EC" />
<Limb Name="gAniRightFootLimb" Type="Standard" EnumName="ANI_LIMB_RIGHT_FOOT" Offset="0x27F8" />
<Limb Name="gAniTorsoLimb" Type="Standard" EnumName="ANI_LIMB_TORSO" Offset="0x2804" />
<Limb Name="gAniLeftUpperArmLimb" Type="Standard" EnumName="ANI_LIMB_LEFT_UPPER_ARM" Offset="0x2810" />
@@ -21,7 +21,7 @@
<Limb Name="gAniRightForearmLimb" Type="Standard" EnumName="ANI_LIMB_RIGHT_FOREARM" Offset="0x2840" />
<Limb Name="gAniRightHandLimb" Type="Standard" EnumName="ANI_LIMB_RIGHT_HAND" Offset="0x284C" />
<Limb Name="gAniHeadLimb" Type="Standard" EnumName="ANI_LIMB_HEAD" Offset="0x2858" />
<Skeleton Name="gAniSkeleton" Type="Flex" LimbType="Standard" LimbNone="ANI_LIMB_NONE" LimbMax="ANI_LIMB_MAX" EnumName="AniLimb" Offset="0x28A0" />
<Skeleton Name="gAniSkel" Type="Flex" LimbType="Standard" LimbNone="ANI_LIMB_NONE" LimbMax="ANI_LIMB_MAX" EnumName="AniLimb" Offset="0x28A0" />
<DList Name="gAniRightHandDL" Offset="0x4860" />
<DList Name="gAniRightForearmDL" Offset="0x4A50" />
<DList Name="gAniRightUpperArmDL" Offset="0x4B38" />
@@ -30,10 +30,10 @@
<DList Name="gAniLeftUpperArmDL" Offset="0x4F08" />
<DList Name="gAniTorsoDL" Offset="0x5000" />
<DList Name="gAniRightFootDL" Offset="0x5270" />
<DList Name="gAniRightCalfDL" Offset="0x5420" />
<DList Name="gAniRightShinDL" Offset="0x5420" />
<DList Name="gAniRightThighDL" Offset="0x5668" />
<DList Name="gAniLeftFootDL" Offset="0x5778" />
<DList Name="gAniLeftCalfDL" Offset="0x5928" />
<DList Name="gAniLeftShinDL" Offset="0x5928" />
<DList Name="gAniLeftThighDL" Offset="0x5C50" />
<DList Name="gAniPelvisDL" Offset="0x5D60" />
<Texture Name="gAniGeneralTLUT" OutName="ani_general_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5E58" />
assets/xml/objects/object_az.xml
+2 -2
View File
@@ -64,8 +64,8 @@
<Animation Name="gBeaverGlitchyLimbSpinAnim" Offset="0x750C" /> <!-- Original name might be "bea_wait". Unused -->
<Animation Name="gBeaverLaughLeftAnim" Offset="0x7D3C" /> <!-- Original name is "bev_chukletoL" -->
<Animation Name="gBeaverLaughRightAnim" Offset="0x86AC" /> <!-- Original name is "bev_chukletoR" -->
<Animation Name="gBeaverSwimWithSpinningTail" Offset="0x8960" /> <!-- Original name is "bev_propellerswim" -->
<Animation Name="gBeaverSwimWithRaisedTail" Offset="0x8BB4" /> <!-- Original name is "bev_propellerswim2". Unused variation of gBeaverSwimWithSpinningTail where the tail just stays upright. -->
<Animation Name="gBeaverSwimWithSpinningTailAnim" Offset="0x8960" /> <!-- Original name is "bev_propellerswim" -->
<Animation Name="gBeaverSwimWithRaisedTailAnim" Offset="0x8BB4" /> <!-- Unused variation of gBeaverSwimWithSpinningTailAnim where the tail just stays upright. Original name is "bev_propellerswim2" -->
<Animation Name="gBeaverSwimAnim" Offset="0x8EAC" /> <!-- Original name is "bev_swim" -->
<Animation Name="gBeaverTalkAnim" Offset="0x925C" /> <!-- Original name is "bev_talk1" -->
<Animation Name="gBeaverTalkWaveArmsAnim" Offset="0x9B4C" /> <!-- Original name is "bev_talk2" -->
assets/xml/objects/object_bg.xml
+72 -49
View File
@@ -1,62 +1,79 @@
<Root>
<File Name="object_bg" Segment="6">
<!-- Animations -->
<Animation Name="object_bg_Anim_000968" Offset="0x968" /> <!-- Original name is "bg_asking" -->
<Animation Name="object_bg_Anim_000A00" Offset="0xA00" /> <!-- Original name is "bg_getup" -->
<Animation Name="object_bg_Anim_001384" Offset="0x1384" /> <!-- Original name is "bg_kunekune" ("wiggling; waving; swaying; twisting and turning​") -->
<DList Name="object_bg_DL_003F50" Offset="0x3F50" />
<DList Name="object_bg_DL_004558" Offset="0x4558" />
<DList Name="object_bg_DL_004768" Offset="0x4768" />
<DList Name="object_bg_DL_004A38" Offset="0x4A38" />
<DList Name="object_bg_DL_004BC0" Offset="0x4BC0" />
<DList Name="object_bg_DL_004EE0" Offset="0x4EE0" />
<DList Name="object_bg_DL_0051B0" Offset="0x51B0" />
<DList Name="object_bg_DL_005338" Offset="0x5338" />
<DList Name="object_bg_DL_005658" Offset="0x5658" />
<DList Name="object_bg_DL_005978" Offset="0x5978" />
<DList Name="object_bg_DL_005B80" Offset="0x5B80" />
<DList Name="object_bg_DL_005F20" Offset="0x5F20" />
<DList Name="object_bg_DL_006090" Offset="0x6090" />
<DList Name="object_bg_DL_006298" Offset="0x6298" />
<DList Name="object_bg_DL_006638" Offset="0x6638" />
<DList Name="object_bg_DL_0067A8" Offset="0x67A8" />
<Texture Name="object_bg_TLUT_0068D8" OutName="tlut_0068D8" Format="rgba16" Width="16" Height="16" Offset="0x68D8" />
<Texture Name="object_bg_Tex_006AD8" OutName="tex_006AD8" Format="ci8" Width="32" Height="32" Offset="0x6AD8" />
<Texture Name="object_bg_Tex_006ED8" OutName="tex_006ED8" Format="ci8" Width="8" Height="16" Offset="0x6ED8" />
<!-- <Blob Name="object_bg_Blob_006F58" Size="0x1400" Offset="0x6F58" /> -->
<Texture Name="object_bg_Tex_008358" OutName="tex_008358" Format="ci8" Width="32" Height="32" Offset="0x8358" />
<Texture Name="object_bg_Tex_008758" OutName="tex_008758" Format="ci8" Width="16" Height="16" Offset="0x8758" />
<Texture Name="object_bg_Tex_008858" OutName="tex_008858" Format="ci8" Width="16" Height="16" Offset="0x8858" />
<Texture Name="object_bg_Tex_008958" OutName="tex_008958" Format="ci8" Width="32" Height="32" Offset="0x8958" />
<Texture Name="object_bg_Tex_008D58" OutName="tex_008D58" Format="ci8" Width="16" Height="16" Offset="0x8D58" />
<Limb Name="object_bg_Standardlimb_008E58" Type="Standard" EnumName="OBJECT_BG_1_LIMB_01" Offset="0x8E58" />
<Limb Name="object_bg_Standardlimb_008E64" Type="Standard" EnumName="OBJECT_BG_1_LIMB_02" Offset="0x8E64" />
<Limb Name="object_bg_Standardlimb_008E70" Type="Standard" EnumName="OBJECT_BG_1_LIMB_03" Offset="0x8E70" />
<Limb Name="object_bg_Standardlimb_008E7C" Type="Standard" EnumName="OBJECT_BG_1_LIMB_04" Offset="0x8E7C" />
<Limb Name="object_bg_Standardlimb_008E88" Type="Standard" EnumName="OBJECT_BG_1_LIMB_05" Offset="0x8E88" />
<Limb Name="object_bg_Standardlimb_008E94" Type="Standard" EnumName="OBJECT_BG_1_LIMB_06" Offset="0x8E94" />
<Limb Name="object_bg_Standardlimb_008EA0" Type="Standard" EnumName="OBJECT_BG_1_LIMB_07" Offset="0x8EA0" />
<Limb Name="object_bg_Standardlimb_008EAC" Type="Standard" EnumName="OBJECT_BG_1_LIMB_08" Offset="0x8EAC" />
<Limb Name="object_bg_Standardlimb_008EB8" Type="Standard" EnumName="OBJECT_BG_1_LIMB_09" Offset="0x8EB8" />
<Limb Name="object_bg_Standardlimb_008EC4" Type="Standard" EnumName="OBJECT_BG_1_LIMB_0A" Offset="0x8EC4" />
<Limb Name="object_bg_Standardlimb_008ED0" Type="Standard" EnumName="OBJECT_BG_1_LIMB_0B" Offset="0x8ED0" />
<Limb Name="object_bg_Standardlimb_008EDC" Type="Standard" EnumName="OBJECT_BG_1_LIMB_0C" Offset="0x8EDC" />
<Limb Name="object_bg_Standardlimb_008EE8" Type="Standard" EnumName="OBJECT_BG_1_LIMB_0D" Offset="0x8EE8" />
<Limb Name="object_bg_Standardlimb_008EF4" Type="Standard" EnumName="OBJECT_BG_1_LIMB_0E" Offset="0x8EF4" />
<Limb Name="object_bg_Standardlimb_008F00" Type="Standard" EnumName="OBJECT_BG_1_LIMB_0F" Offset="0x8F00" />
<Limb Name="object_bg_Standardlimb_008F0C" Type="Standard" EnumName="OBJECT_BG_1_LIMB_10" Offset="0x8F0C" />
<Limb Name="object_bg_Standardlimb_008F18" Type="Standard" EnumName="OBJECT_BG_1_LIMB_11" Offset="0x8F18" />
<Limb Name="object_bg_Standardlimb_008F24" Type="Standard" EnumName="OBJECT_BG_1_LIMB_12" Offset="0x8F24" />
<Limb Name="object_bg_Standardlimb_008F30" Type="Standard" EnumName="OBJECT_BG_1_LIMB_13" Offset="0x8F30" />
<Limb Name="object_bg_Standardlimb_008F3C" Type="Standard" EnumName="OBJECT_BG_1_LIMB_14" Offset="0x8F3C" />
<Limb Name="object_bg_Standardlimb_008F48" Type="Standard" EnumName="OBJECT_BG_1_LIMB_15" Offset="0x8F48" />
<Limb Name="object_bg_Standardlimb_008F54" Type="Standard" EnumName="OBJECT_BG_1_LIMB_16" Offset="0x8F54" />
<Limb Name="object_bg_Standardlimb_008F60" Type="Standard" EnumName="OBJECT_BG_1_LIMB_17" Offset="0x8F60" />
<Skeleton Name="object_bg_Skel_008FC8" Type="Flex" LimbType="Standard" LimbNone="OBJECT_BG_1_LIMB_NONE" LimbMax="OBJECT_BG_1_LIMB_MAX" EnumName="ObjectBg1Limb" Offset="0x8FC8" />
<!-- Treasure Chest Shop Gal Limb DisplayLists -->
<DList Name="gTreasureChestShopGalHeadDL" Offset="0x3F50" />
<DList Name="gTreasureChestShopGalNeckDL" Offset="0x4558" />
<DList Name="gTreasureChestShopGalLeftHandDL" Offset="0x4768" />
<DList Name="gTreasureChestShopGalLeftForearmDL" Offset="0x4A38" />
<DList Name="gTreasureChestShopGalLeftUpperArmDL" Offset="0x4BC0" />
<DList Name="gTreasureChestShopGalRightHandDL" Offset="0x4EE0" />
<DList Name="gTreasureChestShopGalRightForearmDL" Offset="0x51B0" />
<DList Name="gTreasureChestShopGalRightUpperArmDL" Offset="0x5338" />
<DList Name="gTreasureChestShopGalTorsoDL" Offset="0x5658" />
<DList Name="gTreasureChestShopGalLeftFootDL" Offset="0x5978" />
<DList Name="gTreasureChestShopGalLeftShinDL" Offset="0x5B80" />
<DList Name="gTreasureChestShopGalLeftThighDL" Offset="0x5F20" />
<DList Name="gTreasureChestShopGalRightFootDL" Offset="0x6090" />
<DList Name="gTreasureChestShopGalRightShinDL" Offset="0x6298" />
<DList Name="gTreasureChestShopGalRightThighDL" Offset="0x6638" />
<DList Name="gTreasureChestShopGalHipsDL" Offset="0x67A8" />
<!-- Treasure Chest Shop Gal Textures -->
<Texture Name="gTreasureChestShopGalTLUT" OutName="treasure_cheat_shop_gal_tlut" Format="rgba16" Width="16" Height="16" Offset="0x68D8" />
<Texture Name="gTreasureChestShopGalHairTex" OutName="treasure_cheat_shop_gal_hair" Format="ci8" Width="32" Height="32" Offset="0x6AD8" />
<Texture Name="gTreasureChestShopGalHair2Tex" OutName="treasure_cheat_shop_gal_hair2" Format="ci8" Width="8" Height="16" Offset="0x6ED8" />
<Texture Name="gTreasureChestShopGalEyeOpenUpTex" OutName="treasure_cheat_shop_gal_eye_open_up" Format="ci8" Width="32" Height="32" Offset="0x6F58" />
<Texture Name="gTreasureChestShopGalEyeHalfUpTex" OutName="treasure_cheat_shop_gal_eye_half_up" Format="ci8" Width="32" Height="32" Offset="0x7358" />
<Texture Name="gTreasureChestShopGalEyeClosedTex" OutName="treasure_cheat_shop_gal_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x7758" />
<Texture Name="gTreasureChestShopGalEyeOpenDownTex" OutName="treasure_cheat_shop_gal_eye_open_down" Format="ci8" Width="32" Height="32" Offset="0x7B58" />
<Texture Name="gTreasureChestShopGalEyeHalfDownTex" OutName="treasure_cheat_shop_gal_eye_half_down" Format="ci8" Width="32" Height="32" Offset="0x7F58" />
<Texture Name="gTreasureChestShopGalMouthTex" OutName="treasure_cheat_shop_gal_mouth" Format="ci8" Width="32" Height="32" Offset="0x8358" />
<Texture Name="gTreasureChestShopGalEarAndBellyButtonTex" OutName="treasure_cheat_shop_gal_ear_and_belly_button" Format="ci8" Width="16" Height="16" Offset="0x8758" />
<Texture Name="gTreasureChestShopGalSkinTex" OutName="treasure_cheat_shop_gal_skin" Format="ci8" Width="16" Height="16" Offset="0x8858" />
<Texture Name="gTreasureChestShopGalClothesTex" OutName="treasure_cheat_shop_gal_clothes" Format="ci8" Width="32" Height="32" Offset="0x8958" />
<Texture Name="gTreasureChestShopGalFingersTex" OutName="treasure_cheat_shop_gal_fingers" Format="ci8" Width="16" Height="16" Offset="0x8D58" />
<!-- Treasure Chest Shop Gal Limbs -->
<Limb Name="gTreasureChestShopGalRootLimb" Type="Standard" EnumName="TREASURE_CHEST_SHOP_GAL_LIMB_ROOT" Offset="0x8E58" />
<Limb Name="gTreasureChestShopGalHipsLimb" Type="Standard" EnumName="TREASURE_CHEST_SHOP_GAL_LIMB_HIPS" Offset="0x8E64" />
<Limb Name="gTreasureChestShopGalTorsoLimb" Type="Standard" EnumName="TREASURE_CHEST_SHOP_GAL_LIMB_TORSO" Offset="0x8E70" />
<Limb Name="gTreasureChestShopGalNeckLimb" Type="Standard" EnumName="TREASURE_CHEST_SHOP_GAL_LIMB_NECK" Offset="0x8E7C" />
<Limb Name="gTreasureChestShopGalHeadLimb" Type="Standard" EnumName="TREASURE_CHEST_SHOP_GAL_LIMB_HEAD" Offset="0x8E88" />
<Limb Name="gTreasureChestShopGalLeftArmRootLimb" Type="Standard" EnumName="TREASURE_CHEST_SHOP_GAL_LIMB_LEFT_ARM_ROOT" Offset="0x8E94" />
<Limb Name="gTreasureChestShopGalLeftUpperArmLimb" Type="Standard" EnumName="TREASURE_CHEST_SHOP_GAL_LIMB_LEFT_UPPER_ARM" Offset="0x8EA0" />
<Limb Name="gTreasureChestShopGalLeftForearmLimb" Type="Standard" EnumName="TREASURE_CHEST_SHOP_GAL_LIMB_LEFT_FOREARM" Offset="0x8EAC" />
<Limb Name="gTreasureChestShopGalLeftHandLimb" Type="Standard" EnumName="TREASURE_CHEST_SHOP_GAL_LIMB_LEFT_HAND" Offset="0x8EB8" />
<Limb Name="gTreasureChestShopGalRightArmRootLimb" Type="Standard" EnumName="TREASURE_CHEST_SHOP_GAL_LIMB_RIGHT_ARM_ROOT" Offset="0x8EC4" />
<Limb Name="gTreasureChestShopGalRightUpperArmLimb" Type="Standard" EnumName="TREASURE_CHEST_SHOP_GAL_LIMB_RIGHT_UPPER_ARM" Offset="0x8ED0" />
<Limb Name="gTreasureChestShopGalRightForearmLimb" Type="Standard" EnumName="TREASURE_CHEST_SHOP_GAL_LIMB_RIGHT_FOREARM" Offset="0x8EDC" />
<Limb Name="gTreasureChestShopGalRightHandLimb" Type="Standard" EnumName="TREASURE_CHEST_SHOP_GAL_LIMB_RIGHT_HAND" Offset="0x8EE8" />
<Limb Name="gTreasureChestShopGalRightLegRootLimb" Type="Standard" EnumName="TREASURE_CHEST_SHOP_GAL_LIMB_RIGHT_LEG_ROOT" Offset="0x8EF4" />
<Limb Name="gTreasureChestShopGalRightThighLimb" Type="Standard" EnumName="TREASURE_CHEST_SHOP_GAL_LIMB_RIGHT_THIGH" Offset="0x8F00" />
<Limb Name="gTreasureChestShopGalRightShinLimb" Type="Standard" EnumName="TREASURE_CHEST_SHOP_GAL_LIMB_RIGHT_SHIN" Offset="0x8F0C" />
<Limb Name="gTreasureChestShopGalRightFootRootLimb" Type="Standard" EnumName="TREASURE_CHEST_SHOP_GAL_LIMB_RIGHT_FOOT_ROOT" Offset="0x8F18" />
<Limb Name="gTreasureChestShopGalRightFootLimb" Type="Standard" EnumName="TREASURE_CHEST_SHOP_GAL_LIMB_RIGHT_FOOT" Offset="0x8F24" />
<Limb Name="gTreasureChestShopGalLeftLegRootLimb" Type="Standard" EnumName="TREASURE_CHEST_SHOP_GAL_LIMB_LEFT_LEG_ROOT" Offset="0x8F30" />
<Limb Name="gTreasureChestShopGalLeftThighLimb" Type="Standard" EnumName="TREASURE_CHEST_SHOP_GAL_LIMB_LEFT_THIGH" Offset="0x8F3C" />
<Limb Name="gTreasureChestShopGalLeftShinLimb" Type="Standard" EnumName="TREASURE_CHEST_SHOP_GAL_LIMB_LEFT_SHIN" Offset="0x8F48" />
<Limb Name="gTreasureChestShopGalLeftFootRootLimb" Type="Standard" EnumName="TREASURE_CHEST_SHOP_GAL_LIMB_LEFT_FOOT_ROOT" Offset="0x8F54" />
<Limb Name="gTreasureChestShopGalLeftFootLimb" Type="Standard" EnumName="TREASURE_CHEST_SHOP_GAL_LIMB_LEFT_FOOT" Offset="0x8F60" />
<!-- Treasure Chest Shop Gal Skeleton -->
<Skeleton Name="gTreasureChestShopGalSkel" Type="Flex" LimbType="Standard" LimbNone="TREASURE_CHEST_SHOP_GAL_LIMB_NONE" LimbMax="TREASURE_CHEST_SHOP_GAL_LIMB_MAX" EnumName="TreasureChestShopGalLimb" Offset="0x8FC8" />
<!-- Animations -->
<Animation Name="object_bg_Anim_009890" Offset="0x9890" /> <!-- Original name is "bg_newwait" -->
<Animation Name="object_bg_Anim_009F20" Offset="0x9F20" /> <!-- Original name is "bg_sleeping" -->
<Animation Name="object_bg_Anim_00A280" Offset="0xA280" /> <!-- Original name is "bg_tokune" (probably the English word "to" and "kunekune") -->
<Animation Name="object_bg_Anim_00AD98" Offset="0xAD98" /> <!-- Original name is "bg_up" -->
<Animation Name="object_bg_Anim_00B19C" Offset="0xB19C" /> <!-- Original name is "bg_wait" -->
<!-- Mayor's receptionist DisplayLists -->
<DList Name="object_bg_DL_00D5E0" Offset="0xD5E0" />
<DList Name="object_bg_DL_00D780" Offset="0xD780" />
<DList Name="object_bg_DL_00DB38" Offset="0xDB38" />
@@ -73,6 +90,8 @@
<DList Name="object_bg_DL_00F1F0" Offset="0xF1F0" />
<DList Name="object_bg_DL_00F350" Offset="0xF350" />
<DList Name="object_bg_DL_00F4E8" Offset="0xF4E8" />
<!-- Mayor's receptionist Textures -->
<Texture Name="object_bg_TLUT_00F6F0" OutName="tlut_00F6F0" Format="rgba16" Width="16" Height="16" Offset="0xF6F0" />
<Texture Name="object_bg_Tex_00F8F0" OutName="tex_00F8F0" Format="ci8" Width="32" Height="32" Offset="0xF8F0" />
<Texture Name="object_bg_Tex_00FCF0" OutName="tex_00FCF0" Format="ci8" Width="32" Height="32" Offset="0xFCF0" />
@@ -84,6 +103,8 @@
<Texture Name="object_bg_Tex_0110F0" OutName="tex_0110F0" Format="ci8" Width="32" Height="32" Offset="0x110F0" />
<Texture Name="object_bg_Tex_0114F0" OutName="tex_0114F0" Format="ci8" Width="16" Height="16" Offset="0x114F0" />
<Texture Name="object_bg_Tex_0115F0" OutName="tex_0115F0" Format="ci8" Width="32" Height="32" Offset="0x115F0" />
<!-- Mayor's receptionist Limbs -->
<Limb Name="object_bg_Standardlimb_0119F0" Type="Standard" EnumName="OBJECT_BG_2_LIMB_01" Offset="0x119F0" />
<Limb Name="object_bg_Standardlimb_0119FC" Type="Standard" EnumName="OBJECT_BG_2_LIMB_02" Offset="0x119FC" />
<Limb Name="object_bg_Standardlimb_011A08" Type="Standard" EnumName="OBJECT_BG_2_LIMB_03" Offset="0x11A08" />
@@ -107,6 +128,8 @@
<Limb Name="object_bg_Standardlimb_011AE0" Type="Standard" EnumName="OBJECT_BG_2_LIMB_15" Offset="0x11AE0" />
<Limb Name="object_bg_Standardlimb_011AEC" Type="Standard" EnumName="OBJECT_BG_2_LIMB_16" Offset="0x11AEC" />
<Limb Name="object_bg_Standardlimb_011AF8" Type="Standard" EnumName="OBJECT_BG_2_LIMB_17" Offset="0x11AF8" />
<!--Mayor's receptionist Skeleton -->
<Skeleton Name="object_bg_Skel_011B60" Type="Flex" LimbType="Standard" LimbNone="OBJECT_BG_2_LIMB_NONE" LimbMax="OBJECT_BG_2_LIMB_MAX" EnumName="ObjectBg2Limb" Offset="0x11B60" />
</File>
</Root>
assets/xml/objects/object_big_fwall.xml
+3 -2
View File
@@ -1,6 +1,7 @@
<Root>
<!-- Ring Of Fire used during Garo's encounters -->
<File Name="object_big_fwall" Segment="6">
<Texture Name="object_big_fwall_Tex_000000" OutName="tex_000000" Format="i8" Width="32" Height="64" Offset="0x0" />
<DList Name="object_big_fwall_DL_0009A0" Offset="0x9A0" /> <!-- Original name is "big_firewall_modelT" -->
<Texture Name="gRingOfFireTex" OutName="ring_of_fire" Format="i8" Width="32" Height="64" Offset="0x0" />
<DList Name="gRingOfFireDL" Offset="0x9A0" /> <!-- Original name is "big_firewall_modelT" -->
</File>
</Root>
assets/xml/objects/object_bigpo.xml
+4 -4
View File
@@ -7,13 +7,13 @@
<Animation Name="gBigPoeFloatAnim" Offset="0x924" /> <!-- Original name is "pog_fly" -->
<Animation Name="gBigPoeAwakenSpawnAnim" Offset="0xF9C" /> <!-- Original name is "pog_start" -->
<Animation Name="gBigPoeAwakenStretchAnim" Offset="0x1360" /> <!-- Original name is "pog_wait" -->
<Texture Name="gBigPoeSoulFace" OutName="bigpo_soul_face" Format="i8" Width="32" Height="64" Offset="0x1370" />
<Texture Name="gBigPoeSoulFaceTex" OutName="bigpo_soul_face" Format="i8" Width="32" Height="64" Offset="0x1370" />
<DList Name="gBigPoeSoulDL" Offset="0x1BB0" /> <!-- Original name is "bigpo_soul_modelT" -->
<Texture Name="gBigPoeNecklaceSkullHalfTex" OutName="bigpo_skull_necklace" Format="rgba16" Width="16" Height="16" Offset="0x1C70" />
<Texture Name="gBigPoeLanternGlassTex" OutName="bigpo_lantern_glass" Format="rgba16" Width="16" Height="16" Offset="0x1E70" />
<Texture Name="gBigPoeTornRobeTex" OutName="bigpo_torn_robe" Format="rgba16" Width="32" Height="32" Offset="0x2070" />
<Texture Name="gBigPoeArmSectionTex" OutName="bigpo_arm_section" Format="rgba16" Width="16" Height="16" Offset="0x2870" />
<Texture Name="gBigPoeHoodEdge" OutName="bigpo_hood_edge" Format="rgba16" Width="8" Height="8" Offset="0x2A70" />
<Texture Name="gBigPoeHoodEdgeTex" OutName="bigpo_hood_edge" Format="rgba16" Width="8" Height="8" Offset="0x2A70" />
<Texture Name="gBigPoeNecklaceBeadsTex" OutName="bigpo_necklace_beads" Format="rgba16" Width="16" Height="8" Offset="0x2AF0" />
<Texture Name="gBigPoeShawlTex" OutName="bigpo_shawl" Format="rgba16" Width="16" Height="16" Offset="0x2BF0" />
<Texture Name="gBigPoeGlowingEyeTex" OutName="bigpo_glowing_eye" Format="rgba16" Width="16" Height="16" Offset="0x2DF0" />
@@ -57,7 +57,7 @@
<Limb Name="gBigPoeRightHandLimb" Type="Standard" EnumName="BIG_POE_LIMB_RIGHT_HAND" Offset="0x5BC4" />
<Limb Name="gBigPoeLanternLimb" Type="Standard" EnumName="BIG_POE_LIMB_LANTERN" Offset="0x5BD0" />
<Limb Name="gBigPoeHatAndCloakLimb" Type="Standard" EnumName="BIG_POE_LIMB_HAT_AND_CLOAK" Offset="0x5BDC" />
<Limb Name="gBigPoeLowerRobe" Type="Standard" EnumName="BIG_POE_LIMB_LOWER_ROBE" Offset="0x5BE8" />
<Skeleton Name="gBigPoeSkeleton" Type="Normal" LimbType="Standard" LimbNone="BIG_POE_LIMB_NONE" LimbMax="BIG_POE_LIMB_MAX" EnumName="BigPoeLimb" Offset="0x5C18" />
<Limb Name="gBigPoeLowerRobeLimb" Type="Standard" EnumName="BIG_POE_LIMB_LOWER_ROBE" Offset="0x5BE8" />
<Skeleton Name="gBigPoeSkel" Type="Normal" LimbType="Standard" LimbNone="BIG_POE_LIMB_NONE" LimbMax="BIG_POE_LIMB_MAX" EnumName="BigPoeLimb" Offset="0x5C18" />
</File>
</Root>
assets/xml/objects/object_boss03.xml
+4 -4
View File
@@ -5,7 +5,7 @@
whip assets, along with an unused duplicate of the small fishes.
-->
<File Name="object_boss03" Segment="6">
<Animation Name="gGyorgIdleAnim" Offset="0x88" /> <!-- Original name is "bus_base". Maybe unused? -->
<Animation Name="gGyorgIdleAnim" Offset="0x88" /> <!-- Unused. Original name is "bus_base" -->
<!-- Unused Majora's Wrath Whip Texture -->
<Texture Name="gGyorgUnusedMajorasWrathWhipTex" OutName="unused_majoras_wrath_whip" Format="rgba16" Width="8" Height="16" Offset="0xA0" />
@@ -69,12 +69,12 @@
<!-- Gyorg Animations -->
<Animation Name="gGyorgFloppingAnim" Offset="0x9554" /> <!-- Original name is "bus_dead" -->
<Animation Name="gGyorgJumpingAnim" Offset="0x98F0" /> <!-- Original name is "bus_jump". Maybe unused? -->
<Animation Name="gGyorgJumpingAnim" Offset="0x98F0" /> <!-- Unused. Original name is "bus_jump" -->
<Animation Name="gGyorgStunnedAnim" Offset="0x99D0" /> <!-- Original name is "bus_sibire" ("paralyzed") -->
<Animation Name="gGyorgBackingUpAnim" Offset="0x9C14" /> <!-- Original name is "bus_stop" -->
<Animation Name="gGyorgFastSwimmingAnim" Offset="0x9CF8" /> <!-- Original name is "bus_swim" -->
<Animation Name="gGyorgGentleSwimmingAnim" Offset="0xA020" /> <!-- Maybe unused? -->
<Animation Name="gGyorgTailSweepAnim" Offset="0xA134" /> <!-- Maybe unused? -->
<Animation Name="gGyorgGentleSwimmingAnim" Offset="0xA020" /> <!-- Unused -->
<Animation Name="gGyorgTailSweepAnim" Offset="0xA134" /> <!-- Unused -->
<Animation Name="gGyorgCrawlingAnim" Offset="0xA6C8" />
<!-- Seaweed DisplayLists -->
assets/xml/objects/object_boss07.xml
+7 -7
View File
@@ -10,7 +10,7 @@
<Animation Name="gMajorasIncarnationPumpingUpAnim" Offset="0x31E4" /> <!-- Original name is "last2_hensin3" -->
<Animation Name="gMajorasIncarnationFinalHitAnim" Offset="0x3854" /> <!-- Original name is "last2_hensin4" -->
<Animation Name="gMajorasIncarnationSquattingDanceAnim" Offset="0x3A64" /> <!-- Original name is "last2_kd" (probably short for "kosakku (Cossack) dance") -->
<Animation Name="gMajorasIncarnationStationaryAnim" Offset="0x3B3C" /> <!-- Original name is "last2_kihon" ("basic"). Unused -->
<Animation Name="gMajorasIncarnationStationaryAnim" Offset="0x3B3C" /> <!-- Unused. Original name is "last2_kihon" ("basic") -->
<!-- Majora's Incarnation Limb DisplayLists -->
<DList Name="gMajorasIncarnationEyestalkDL" Offset="0x7930" />
@@ -68,7 +68,7 @@
<!-- Majora's Mask Animations -->
<Animation Name="gMajorasMaskJerkingAnim" Offset="0xAE40" /> <!-- Original name is "last3_dam" -->
<Animation Name="gMajorasMaskStationaryAnim" Offset="0xAEDC" /> <!-- Original name is "last3_kihon" ("basic"). Unused -->
<Animation Name="gMajorasMaskStationaryAnim" Offset="0xAEDC" /> <!-- Unused. Original name is "last3_kihon" ("basic") -->
<!-- Majora's Mask Tentacle Texture and DisplayLists -->
<Texture Name="gMajorasMaskTentacleTex" OutName="majoras_mask_tentacle" Format="rgba16" Width="8" Height="8" Offset="0xAEF0" />
@@ -150,13 +150,13 @@
<Animation Name="gMajorasMaskFloatingAnim" Offset="0x19E48" /> <!-- Original name is "last3_stop" -->
<!-- Majora's Wrath Animations. For unused animations, we don't know what the whips are supposed to do, since their physics are controlled by the Boss07 actor. -->
<Animation Name="gMajorasWrathFlipLeftAndSpin" Offset="0x1AE1C" /> <!-- Original name is "last_ac01". Unused -->
<Animation Name="gMajorasWrathDoubleKickAndJumpBackAnim" Offset="0x1C430" /> <!-- Original name is "last_ac02". Unused -->
<Animation Name="gMajorasWrathBackflipUppercutAttackAnim" Offset="0x1CFF0" /> <!-- Original name is "last_ac03". Unused -->
<Animation Name="gMajorasWrathHighKickAnim" Offset="0x1D974" /> <!-- Original name is "last_ac04". Unused and almost identical to gMajorasWrathKickAnim -->
<Animation Name="gMajorasWrathFlipLeftAndSpinAnim" Offset="0x1AE1C" /> <!-- Unused. Original name is "last_ac01" -->
<Animation Name="gMajorasWrathDoubleKickAndJumpBackAnim" Offset="0x1C430" /> <!-- Unused. Original name is "last_ac02" -->
<Animation Name="gMajorasWrathBackflipUppercutAttackAnim" Offset="0x1CFF0" /> <!-- Unused. Original name is "last_ac03" -->
<Animation Name="gMajorasWrathHighKickAnim" Offset="0x1D974" /> <!-- Unused and almost identical to gMajorasWrathKickAnim. Original name is "last_ac04" -->
<Animation Name="gMajorasWrathDamageAnim" Offset="0x1DEB4" /> <!-- Original name is "last_dam" -->
<Animation Name="gMajorasWrathDeathAnim" Offset="0x22BB4" /> <!-- Original name is "last_dead" -->
<Animation Name="gMajorasWrathTiptoeWhipAttackAnim" Offset="0x23A44" /> <!-- Original name is "last_def". Unused -->
<Animation Name="gMajorasWrathTiptoeWhipAttackAnim" Offset="0x23A44" /> <!-- Unused. Original name is "last_def" -->
<Animation Name="gMajorasWrathHeavyBreathingAnim" Offset="0x23DAC" /> <!-- Original name is "last_hen" (short for "metamorphosis/transformation") -->
<Animation Name="gMajorasWrathIntroAnim" Offset="0x25018" /> <!-- Original name is "last_hen2" -->
<Animation Name="gMajorasWrathBackflipAnim" Offset="0x25878" /> <!-- Original name is "last_jump" -->
assets/xml/objects/object_box.xml
+7 -7
View File
@@ -11,12 +11,12 @@
<DList Name="gBoxChestLidDL" Offset="0x12E8" />
<DList Name="gBoxChestLidGildedDL" Offset="0x1850" />
<DList Name="gBoxChestLidOrnateDL" Offset="0x1D58" />
<Texture Name="gBoxChestLockTex" OutName="chest_lock_tex" Format="rgba16" Width="32" Height="64" Offset="0x1E60" />
<Texture Name="gBoxChestCornerTex" OutName="chest_corner_tex" Format="rgba16" Width="32" Height="32" Offset="0x2E60" />
<Texture Name="gBoxChestLockGildedTex" OutName="chest_lock_gilded_tex" Format="rgba16" Width="32" Height="64" Offset="0x3660" />
<Texture Name="gBoxChestCornerGildedTex" OutName="chest_corner_gilded_tex" Format="rgba16" Width="32" Height="32" Offset="0x4660" />
<Texture Name="gBoxChestLockOrnateTex" OutName="chest_lock_ornate_tex" Format="rgba16" Width="32" Height="64" Offset="0x4E60" />
<Texture Name="gBoxChestCornerOrnateTex" OutName="chest_corner_ornate_tex" Format="rgba16" Width="32" Height="32" Offset="0x5E60" />
<Texture Name="gBoxChestLockTex" OutName="chest_lock" Format="rgba16" Width="32" Height="64" Offset="0x1E60" />
<Texture Name="gBoxChestCornerTex" OutName="chest_corner" Format="rgba16" Width="32" Height="32" Offset="0x2E60" />
<Texture Name="gBoxChestLockGildedTex" OutName="chest_lock_gilded" Format="rgba16" Width="32" Height="64" Offset="0x3660" />
<Texture Name="gBoxChestCornerGildedTex" OutName="chest_corner_gilded" Format="rgba16" Width="32" Height="32" Offset="0x4660" />
<Texture Name="gBoxChestLockOrnateTex" OutName="chest_lock_ornate" Format="rgba16" Width="32" Height="64" Offset="0x4E60" />
<Texture Name="gBoxChestCornerOrnateTex" OutName="chest_corner_ornate" Format="rgba16" Width="32" Height="32" Offset="0x5E60" />
<Limb Name="object_box_Standardlimb_006660" Type="Standard" EnumName="OBJECT_BOX_CHEST_LIMB_01" Offset="0x6660" />
<Limb Name="object_box_Standardlimb_00666C" Type="Standard" EnumName="OBJECT_BOX_CHEST_LIMB_02" Offset="0x666C" />
<Limb Name="object_box_Standardlimb_006678" Type="Standard" EnumName="OBJECT_BOX_CHEST_LIMB_03" Offset="0x6678" />
@@ -24,7 +24,7 @@
<Skeleton Name="gBoxChestSkel" Type="Normal" LimbType="Standard" LimbNone="OBJECT_BOX_CHEST_LIMB_NONE" LimbMax="OBJECT_BOX_CHEST_LIMB_MAX" EnumName="ObjectBoxChestLimb" Offset="0x66A0" />
<CurveAnimation Name="gBoxLightAdultCurveAnim" SkelOffset="0x7D78" Offset="0x6A20"/> <!-- Original name is "demo_tre_lgt_c_fcurve_data" -->
<CurveAnimation Name="gBoxLightChildCurveAnim" SkelOffset="0x7D78" Offset="0x6E30"/> <!-- Original name is "demo_tre_lgt_fcurve_data" -->
<Texture Name="gBoxLightTex" OutName="box_light_tex" Format="i8" Width="64" Height="32" Offset="0x6E40" />
<Texture Name="gBoxLightTex" OutName="box_light" Format="i8" Width="64" Height="32" Offset="0x6E40" />
<DList Name="object_box_DL_007890" Offset="0x7890" />
<DList Name="object_box_DL_007978" Offset="0x7978" />
<DList Name="object_box_DL_007A40" Offset="0x7A40" />
assets/xml/objects/object_comb.xml
+8 -4
View File
@@ -1,8 +1,12 @@
<Root>
<!-- Object for Beehive -->
<File Name="object_comb" Segment="6">
<Texture Name="object_comb_Tex_000000" OutName="tex_000000" Format="rgba16" Width="32" Height="32" Offset="0x0" />
<DList Name="object_comb_DL_000CB0" Offset="0xCB0" /> <!-- Original name is "hatisu_model" ("hive; beehive") -->
<Texture Name="object_comb_Tex_000E10" OutName="tex_000E10" Format="rgba16" Width="16" Height="16" Offset="0xE10" />
<DList Name="object_comb_DL_001040" Offset="0x1040" /> <!-- Original name is "hatisu_hahen_model" ("hahen" = "fragment; broken piece") -->
<!-- Beehive -->
<Texture Name="gBeehiveTex" OutName="beehive" Format="rgba16" Width="32" Height="32" Offset="0x0" />
<DList Name="gBeehiveDL" Offset="0xCB0" /> <!-- Original name is "hatisu_model" ("hive; beehive") -->
<!-- Beehive Fragment -->
<Texture Name="gBeehiveFragmentTex" OutName="beehive_fragment" Format="rgba16" Width="16" Height="16" Offset="0xE10" />
<DList Name="gBeehiveFragmentDL" Offset="0x1040" /> <!-- Original name is "hatisu_hahen_model" ("hahen" = "fragment; broken piece") -->
</File>
</Root>
assets/xml/objects/object_dblue_object.xml
+1 -1
View File
@@ -14,7 +14,7 @@
<!-- DisplayLists and Collision for the ice stalactites that can be thawed with Fire Arrows. -->
<DList Name="gGreatBayTempleObjectIceStalactiteRimDL" Offset="0x3250" />
<DList Name="gGreatBayTempleObjectIceStalactiteDL" Offset="0x3358" /> <!-- Original name is "m2_KON_ICE_model" -->
<Collision Name="gGreatBayTempleObjectIceStalactiteCol" Offset="0x3540" /> <!-- Original name is "m2_KON_ICE_bgdatainfo". Unused -->
<Collision Name="gGreatBayTempleObjectIceStalactiteCol" Offset="0x3540" /> <!-- Unused. Original name is "m2_KON_ICE_bgdatainfo" -->
<!-- DisplayLists for the frozen version of the waterfall that briefly appears when you hit it with an Ice Arrow. -->
<DList Name="gGreatBayTempleObjectFrozenWaterfallDL" Offset="0x3770" />
assets/xml/objects/object_dinofos.xml
+3 -3
View File
@@ -36,8 +36,8 @@
<Texture Name="gDinolfosScaleTex" OutName="dinolfos_scale" Format="rgba16" Width="16" Height="16" Offset="0x84B0" />
<Texture Name="gDinolfosArmorTex" OutName="dinolfos_armor" Format="rgba16" Width="16" Height="16" Offset="0x86B0" />
<Texture Name="gDinolfosSpikeTex" OutName="dinolfos_spike" Format="rgba16" Width="8" Height="8" Offset="0x88B0" />
<Texture Name="gDinolfosInnerMouth" OutName="dinolfos_inner_mouth" Format="rgba16" Width="16" Height="16" Offset="0x8930" />
<Texture Name="gDinolfosKnifeHole" OutName="dinolfos_knife_hole" Format="rgba16" Width="8" Height="8" Offset="0x8B30" />
<Texture Name="gDinolfosInnerMouthTex" OutName="dinolfos_inner_mouth" Format="rgba16" Width="16" Height="16" Offset="0x8930" />
<Texture Name="gDinolfosKnifeHoleTex" OutName="dinolfos_knife_hole" Format="rgba16" Width="8" Height="8" Offset="0x8B30" />
<Texture Name="gDinolfosJawTex" OutName="dinolfos_jaw" Format="rgba16" Width="8" Height="16" Offset="0x8BB0" />
<Texture Name="gDinolfosEyeHoleTex" OutName="dinolfos_eye_hole" Format="rgba16" Width="16" Height="8" Offset="0x8CB0" />
<Texture Name="gDinolfosClawTex" OutName="dinolfos_claw" Format="rgba16" Width="8" Height="8" Offset="0x8DB0" />
@@ -64,7 +64,7 @@
<Limb Name="gDinolfosJawLimb" Type="Standard" EnumName="DINOLFOS_LIMB_JAW" Offset="0x94F0" />
<Limb Name="gDinolfosUpperTailLimb" Type="Standard" EnumName="DINOLFOS_LIMB_UPPER_TAIL" Offset="0x94FC" />
<Limb Name="gDinolfosLowerTailLimb" Type="Standard" EnumName="DINOLFOS_LIMB_LOWER_TAIL" Offset="0x9508" />
<Limb Name="gDinolfosKnife" Type="Standard" EnumName="DINOLFOS_LIMB_KNIFE" Offset="0x9514" />
<Limb Name="gDinolfosKnifeLimb" Type="Standard" EnumName="DINOLFOS_LIMB_KNIFE" Offset="0x9514" />
<Skeleton Name="gDinolfosSkel" Type="Flex" LimbType="Standard" LimbNone="DINOLFOS_LIMB_NONE" LimbMax="DINOLFOS_LIMB_MAX" EnumName="DinolfosLimb" Offset="0x9570" />
<Animation Name="gDinolfosCryAnim" Offset="0x9B70" /> <!-- Original name is "zf2_sakebi" -->
assets/xml/objects/object_dnj.xml
+1 -1
View File
@@ -59,7 +59,7 @@
<Texture Name="gDekuButlerParasolPetalTex" OutName="deku_butler_parasol_petal" Format="rgba16" Width="16" Height="32" Offset="0xD848" />
<Texture Name="gDekuButlerCandleTex" OutName="deku_butler_candle" Format="rgba16" Width="16" Height="8" Offset="0xDC48" />
<Texture Name="gDekuButlerHairTex" OutName="deku_butler_hair" Format="rgba16" Width="16" Height="16" Offset="0xDD48" />
<Texture Name="gDekuButlerBowtieCenter" OutName="deku_butler_bowtie_center" Format="rgba16" Width="8" Height="16" Offset="0xDF48" />
<Texture Name="gDekuButlerBowtieCenterTex" OutName="deku_butler_bowtie_center" Format="rgba16" Width="8" Height="16" Offset="0xDF48" />
<!-- Deku Butler Limbs -->
<Limb Name="gDekuButlerRootLimb" Type="Standard" EnumName="DEKU_BUTLER_LIMB_ROOT" Offset="0xE048" />
assets/xml/objects/object_dnk.xml
+1 -1
View File
@@ -33,7 +33,7 @@
<DList Name="gDekuPalaceGuardHead2DL" Offset="0x2400" />
<DList Name="gDekuPalaceGuardSnoutDL" Offset="0x2410" />
<DList Name="gDekuPalaceGuardSnout2DL" Offset="0x2510" />
<DList Name="gDekuPalaceGuardFlower" Offset="0x2700" />
<DList Name="gDekuPalaceGuardFlowerDL" Offset="0x2700" />
<Limb Name="gDekuPalaceGuardTorsoLimb" Type="Standard" EnumName="DEKU_PALACE_GUARD_LIMB_TORSO" Offset="0x27A8" />
<Limb Name="gDekuPalaceGuardHeadLimb" Type="Standard" EnumName="DEKU_PALACE_GUARD_LIMB_HEAD" Offset="0x27B4" />
<Limb Name="gDekuPalaceGuardLeftLeafLimb" Type="Standard" EnumName="DEKU_PALACE_GUARD_LIMB_LEFT_LEAF" Offset="0x27C0" />
assets/xml/objects/object_dns.xml
+1 -1
View File
@@ -25,7 +25,7 @@
<Texture Name="gKingsChamberDekuGuardEyeOpenTex" OutName="kings_chamber_deku_guard_eye_open" Format="rgba16" Width="8" Height="8" Offset="0x28E8" />" Format="rgba16" Width="8" Height="8" Offset="0x28E8" />
<Texture Name="gKingsChamberDekuGuardEyeHalfTex" OutName="kings_chamber_deku_guard_eye_half" Format="rgba16" Width="8" Height="8" Offset="0x2968" />
<Texture Name="gKingsChamberDekuGuardEyeClosedTex" OutName="kings_chamber_deku_guard_eye_closed" Format="rgba16" Width="8" Height="8" Offset="0x29E8" />
<DList Name="gKingsChamberDekuGuardDekuFlower" Offset="0x2C48" />
<DList Name="gKingsChamberDekuGuardDekuFlowerDL" Offset="0x2C48" />
<Limb Name="gKingsChamberDekuGuardTorsoLimb" Type="Standard" EnumName="KINGS_CHAMBER_DEKU_GUARD_LIMB_TORSO" Offset="0x2D18" />
<Limb Name="gKingsChamberDekuGuardHeadLimb" Type="Standard" EnumName="KINGS_CHAMBER_DEKU_GUARD_LIMB_HEAD" Offset="0x2D24" />
<Limb Name="gKingsChamberDekuGuardStalkLimb" Type="Standard" EnumName="KINGS_CHAMBER_DEKU_GUARD_LIMB_STALK" Offset="0x2D30" />
assets/xml/objects/object_dog.xml
+2 -2
View File
@@ -3,13 +3,13 @@
<File Name="object_dog" Segment="6">
<!-- Unused Selection Arrow with a Texture Animation -->
<DList Name="gDogSelectionArrowAnimatedDL" Offset="0x170" /> <!-- Original name is "cursor_00_anim_model" -->
<DList Name="gDogSelectionArrowAnimatedEmptyDL" Offset="0x250" /> <!-- Original name is "cursor_00_anim_modelT". Probably meant "transparent" at one point -->
<DList Name="gDogSelectionArrowAnimatedEmptyDL" Offset="0x250" /> <!-- Original name is "cursor_00_anim_modelT" -->
<Texture Name="gDogSelectionArrowAnimatedTex" OutName="dog_selection_arrow_animated" Format="i8" Width="8" Height="32" Offset="0x258" />
<TextureAnimation Name="gDogSelectionArrowTexAnim" Offset="0x3C4" />
<!-- Selection Arrow DisplayLists and Texture -->
<DList Name="gDogSelectionArrowDL" Offset="0x550" /> <!-- Original name is "cursor_00_none_model" -->
<DList Name="gDogSelectionArrowEmptyDL" Offset="0x618" /> <!-- Original name is "cursor_00_none_modelT". Probably meant "transparent" at one point-->
<DList Name="gDogSelectionArrowEmptyDL" Offset="0x618" /> <!-- Original name is "cursor_00_none_modelT" -->
<Texture Name="gDogSelectionArrowTex" OutName="dog_selection_arrow" Format="i4" Width="16" Height="32" Offset="0x620" />
<!-- Dog Animations -->

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