falso
/
oot
mirror of https://github.com/zeldaret/oot.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into z64-remove

This commit is contained in:
Dragorn421 2025-05-19 17:46:07 +02:00
parent 4100858bde 1e556e3a3d
commit 0d9c64a7ab
No known key found for this signature in database
GPG Key ID: 381AEBAF3D429335
485 changed files with 14826 additions and 48703 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
Makefile
View File

@ -536,7 +536,7 @@ endif
$(BUILD_DIR)/src/boot/build.o: CPP_DEFINES += -DBUILD_CREATOR="\"$(BUILD_CREATOR)\"" -DBUILD_DATE="\"$(BUILD_DATE)\"" -DBUILD_TIME="\"$(BUILD_TIME)\""
$(BUILD_DIR)/src/audio/lib/seqplayer.o: CPP_DEFINES += -DMML_VERSION=MML_VERSION_OOT
$(BUILD_DIR)/src/audio/internal/seqplayer.o: CPP_DEFINES += -DMML_VERSION=MML_VERSION_OOT
ifeq ($(COMPILER),ido)
$(BUILD_DIR)/src/boot/driverominit.o: OPTFLAGS := -O2
@ -620,15 +620,15 @@ $(BUILD_DIR)/src/libu64/%.o: OPTFLAGS := -O2
$(BUILD_DIR)/src/audio/%.o: OPTFLAGS := -O2
# Use signed chars instead of unsigned for this audio file (needed to match AudioDebug_ScrPrt)
$(BUILD_DIR)/src/audio/general.o: CFLAGS += -signed
$(BUILD_DIR)/src/audio/game/general.o: CFLAGS += -signed
ifeq ($(PLATFORM),N64)
$(BUILD_DIR)/src/audio/general.o: CFLAGS += -DNO_SQRTF_INTRINSIC
$(BUILD_DIR)/src/audio/game/general.o: CFLAGS += -DNO_SQRTF_INTRINSIC
endif
# Put string literals in .data for some audio files (needed to match these files with literals)
$(BUILD_DIR)/src/audio/sfx.o: CFLAGS += -use_readwrite_const
$(BUILD_DIR)/src/audio/sequence.o: CFLAGS += -use_readwrite_const
$(BUILD_DIR)/src/audio/game/sfx.o: CFLAGS += -use_readwrite_const
$(BUILD_DIR)/src/audio/game/sequence.o: CFLAGS += -use_readwrite_const
ifeq ($(PLATFORM),IQUE)
$(BUILD_DIR)/src/libultra/%.o: CC := $(EGCS_CC)
@ -791,9 +791,9 @@ setup: venv
$(MAKE) -C tools
$(PYTHON) tools/decompress_baserom.py $(VERSION)
$(PYTHON) tools/extract_baserom.py $(BASEROM_DIR)/baserom-decompressed.z64 $(EXTRACTED_DIR)/baserom -v $(VERSION)
$(PYTHON) -m tools.assets.extract $(EXTRACTED_DIR)/baserom $(EXTRACTED_DIR) -v $(VERSION) -j$(N_THREADS)
$(PYTHON) tools/extract_incbins.py $(EXTRACTED_DIR)/baserom $(EXTRACTED_DIR)/incbin -v $(VERSION)
$(PYTHON) tools/extract_text.py $(EXTRACTED_DIR)/baserom $(EXTRACTED_DIR)/text -v $(VERSION)
$(PYTHON) tools/extract_assets.py $(EXTRACTED_DIR)/baserom $(EXTRACTED_DIR)/assets -v $(VERSION) -j$(N_THREADS)
$(PYTHON) tools/extract_audio.py -b $(EXTRACTED_DIR)/baserom -o $(EXTRACTED_DIR) -v $(VERSION) --read-xml
disasm:
@ -927,7 +927,7 @@ $(BUILD_DIR)/src/makerom/ipl3.o: $(EXTRACTED_DIR)/incbin/ipl3
$(BUILD_DIR)/src/%.o: src/%.s
ifeq ($(COMPILER),ido)
# For header dependencies
$(CPP) $(MIPS_BUILTIN_DEFS) -x assembler-with-cpp $(INC) -MD -MF $(@:.o=.d) -MT $@ $< -o /dev/null
$(CPP) $(MIPS_BUILTIN_DEFS) $(CPPFLAGS) -x assembler-with-cpp $(INC) -MD -MF $(@:.o=.d) -MT $@ $< -o /dev/null
$(CCAS) -c $(CCASFLAGS) $(MIPS_VERSION) $(ASOPTFLAGS) -o $(@:.o=.tmp.o) $<
# IDO generates bad symbol tables, fix the symbol table with strip..
$(STRIP) $(@:.o=.tmp.o) -N dummy-symbol-name
@ -961,7 +961,7 @@ $(BUILD_DIR)/src/%.o: src/%.c
$(POSTPROCESS_OBJ) $@
$(OBJDUMP_CMD)
$(BUILD_DIR)/src/audio/session_init.o: src/audio/session_init.c $(BUILD_DIR)/assets/audio/soundfont_sizes.h $(BUILD_DIR)/assets/audio/sequence_sizes.h
$(BUILD_DIR)/src/audio/game/session_init.o: src/audio/game/session_init.c $(BUILD_DIR)/assets/audio/soundfont_sizes.h $(BUILD_DIR)/assets/audio/sequence_sizes.h
$(CC_CHECK) $< -o $@
$(CC) -c $(CFLAGS) $(MIPS_VERSION) $(OPTFLAGS) -o $(@:.o=.tmp) $<
$(LD) -r -T linker_scripts/data_with_rodata.ld -o $@ $(@:.o=.tmp)
@ -979,21 +979,25 @@ $(BUILD_DIR)/src/overlays/%_reloc.o: $(BUILD_DIR)/spec
$(POSTPROCESS_OBJ) $(@:.o=.s)
$(AS) $(ASFLAGS) $(@:.o=.s) -o $@
$(BUILD_DIR)/assets/%.inc.c: assets/%.png
$(N64TEXCONV) $(subst .,,$(suffix $*)) "$(findstring u32,$(subst .,,$(suffix $(basename $*))))" $< $@ $(@:.inc.c=.pal.inc.c)
# Assets from assets/
$(BUILD_DIR)/assets/%.inc.c: $(EXTRACTED_DIR)/assets/%.png
$(N64TEXCONV) $(subst .,,$(suffix $*)) "$(findstring u32,$(subst .,,$(suffix $(basename $*))))" $< $@ $(@:.inc.c=.pal.inc.c)
$(BUILD_DIR)/assets/%.inc.c: assets/%.png
tools/assets/build_from_png/build_from_png $< $(dir $@) assets/$(dir $*) $(wildcard $(EXTRACTED_DIR)/assets/$(dir $*))
$(BUILD_DIR)/assets/%.bin.inc.c: assets/%.bin
$(BIN2C) -t 1 $< $@
$(BUILD_DIR)/assets/%.bin.inc.c: $(EXTRACTED_DIR)/assets/%.bin
$(BIN2C) -t 1 $< $@
$(BUILD_DIR)/assets/%.jpg.inc.c: assets/%.jpg
$(N64TEXCONV) JFIF "" $< $@
# Assets from extracted/
$(BUILD_DIR)/assets/%.inc.c: $(EXTRACTED_DIR)/assets/%.png
tools/assets/build_from_png/build_from_png $< $(dir $@) $(wildcard assets/$(dir $*)) $(EXTRACTED_DIR)/assets/$(dir $*)
$(BUILD_DIR)/assets/%.bin.inc.c: $(EXTRACTED_DIR)/assets/%.bin
$(BIN2C) -t 1 $< $@
$(BUILD_DIR)/assets/%.jpg.inc.c: $(EXTRACTED_DIR)/assets/%.jpg
$(N64TEXCONV) JFIF "" $< $@
@ -1068,7 +1072,7 @@ $(BUILD_DIR)/assets/audio/soundfonts/%.c $(BUILD_DIR)/assets/audio/soundfonts/%.
-include $(SOUNDFONT_DEP_FILES)
$(BUILD_DIR)/assets/audio/soundfonts/%.o: $(BUILD_DIR)/assets/audio/soundfonts/%.c $(BUILD_DIR)/assets/audio/soundfonts/%.name
$(CC_CHECK) -I include/audio $< -o $@
$(CPP) $(MIPS_BUILTIN_DEFS) $(CPPFLAGS) -x assembler-with-cpp $(INC) -I include/audio -MD -MF $(@:.o=.d) -MT $@ $< -o /dev/null
# compile c to unlinked object
$(CC) -c $(CFLAGS) $(MIPS_VERSION) $(OPTFLAGS) -I include/audio -o $(@:.o=.tmp) $<
# partial link

3
assets/xml/code/fbdemo_circle.xml
View File

@ -7,7 +7,6 @@
<Array Name="sTransCircleVtx" Count="34" Offset="0x1000">
<Vtx/>
</Array>
<!-- ZAPD isn't finding symbols correctly, instead finding them much later in `code`-->
<!--<DList Name="sTransCircleDL" Offset="0x1220"/>-->
<DList Name="sTransCircleDL" Offset="0x1220"/>
</File>
</Root>

3
assets/xml/code/fbdemo_wipe1.xml
View File

@ -4,7 +4,6 @@
<Vtx/>
</Array>
<Texture Name="sTransWipeTex" OutName="trans_wipe" Format="i4" Width="64" Height="64" Offset="0x190"/>
<!-- ZAPD isn't finding symbols correctly, instead finding them much later in `code`-->
<!-- <DList Name="sTransWipeDL" Offset="0x990"/> -->
<DList Name="sTransWipeDL" Offset="0x990"/>
</File>
</Root>

2
assets/xml/objects/gameplay_keep.xml
View File

@ -1,5 +1,5 @@
<Root>
<ExternalFile XmlPath="misc/link_animetion.xml" OutPath="assets/misc/link_animetion/"/>
<ExternalFile OutPath="assets/misc/link_animetion/"/>
<File Name="gameplay_keep" Segment="4">
<Texture Name="gHilite1Tex" OutName="hilite_1" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
<Texture Name="gHilite2Tex" OutName="hilite_2" Format="rgba16" Width="16" Height="16" Offset="0x200"/>

2
assets/xml/objects/gameplay_keep_pal.xml
View File

@ -1,5 +1,5 @@
<Root>
<ExternalFile XmlPath="misc/link_animetion.xml" OutPath="assets/misc/link_animetion/"/>
<ExternalFile OutPath="assets/misc/link_animetion/"/>
<File Name="gameplay_keep" Segment="4">
<Texture Name="gHilite1Tex" OutName="hilite_1" Format="rgba16" Width="16" Height="16" Offset="0x0"/>
<Texture Name="gHilite2Tex" OutName="hilite_2" Format="rgba16" Width="16" Height="16" Offset="0x200"/>

2
assets/xml/objects/object_bdoor.xml
View File

@ -1,5 +1,5 @@
<Root>
<ExternalFile XmlPath="objects/gameplay_dangeon_keep.xml" OutPath="assets/objects/gameplay_dangeon_keep/"/>
<ExternalFile OutPath="assets/objects/gameplay_dangeon_keep/"/>
<File Name="object_bdoor" Segment="6">
<!-- One of the Boss Door Textures -->
<Texture Name="gBossDoorGanonsCastleTex" OutName="boss_door_ganons_castle" Format="rgba16" Width="32" Height="64" Offset="0x0"/>

1
assets/xml/objects/object_demo_6k.xml
View File

@ -1,4 +1,5 @@
<Root>
<ExternalFile OutPath="assets/objects/gameplay_keep"/>
<File Name="object_demo_6k" Segment="6">
<Texture Name="object_demo_6k_Tex_000000" OutName="tex_00000000" Format="i8" Width="64" Height="64" Offset="0x0"/>
<DList Name="object_demo_6k_DL_001040" Offset="0x1040"/>

1
assets/xml/objects/object_demo_kekkai.xml
View File

@ -1,4 +1,5 @@
<Root>
<ExternalFile OutPath="assets/objects/gameplay_keep"/>
<File Name="object_demo_kekkai" Segment="6">
<!-- Demo_Kekkai -->
<DList Name="gTowerBarrierDL" Offset="0x4930"/>

1
assets/xml/objects/object_efc_erupc.xml
View File

@ -1,4 +1,5 @@
<Root>
<ExternalFile OutPath="assets/objects/gameplay_keep"/>
<File Name="object_efc_erupc" Segment="6">
<Texture Name="object_efc_erupc_Tex_000000" OutName="tex_00000000" Format="i8" Width="32" Height="64" Offset="0x0"/>
<Texture Name="object_efc_erupc_Tex_000800" OutName="tex_00000800" Format="i4" Width="64" Height="64" Offset="0x800"/>

1
assets/xml/objects/object_fish.xml
View File

@ -1,4 +1,5 @@
<Root>
<ExternalFile OutPath="assets/objects/gameplay_keep"/>
<File Name="object_fish" Segment="6">
<Animation Name="gFishingFishAnim" Offset="0x7C"/>
<DList Name="gFishingFishDL_000940" Offset="0x940"/>

1
assets/xml/objects/object_fz.xml
View File

@ -1,4 +1,5 @@
<Root>
<ExternalFile OutPath="assets/objects/gameplay_keep"/>
<File Name="object_fz" Segment="6">
<DList Name="gFreezardIntactDL" Offset="0x1130"/>
<DList Name="gFreezardTopRightHornChippedDL" Offset="0x21A0"/>

1
assets/xml/objects/object_gi_arrow.xml
View File

@ -1,4 +1,5 @@
<Root>
<ExternalFile OutPath="assets/objects/gameplay_keep"/>
<File Name="object_gi_arrow" Segment="6">
<DList Name="gGiArrowSmallDL" Offset="0x0340"/>
<DList Name="gGiArrowMediumDL" Offset="0x0B90"/>

1
assets/xml/objects/object_gi_arrowcase.xml
View File

@ -1,4 +1,5 @@
<Root>
<ExternalFile OutPath="assets/objects/gameplay_keep"/>
<File Name="object_gi_arrowcase" Segment="6">
<DList Name="gGiQuiver30InnerColorDL" Offset="0x08D0"/>
<DList Name="gGiQuiver40InnerColorDL" Offset="0x08F0"/>

1
assets/xml/objects/object_gi_bean.xml
View File

@ -1,4 +1,5 @@
<Root>
<ExternalFile OutPath="assets/objects/gameplay_keep"/>
<File Name="object_gi_bean" Segment="6">
<DList Name="gGiBeanDL" Offset="0x0580"/>
</File>

1
assets/xml/objects/object_gi_bomb_1.xml
View File

@ -1,4 +1,5 @@
<Root>
<ExternalFile OutPath="assets/objects/gameplay_keep"/>
<File Name="object_gi_bomb_1" Segment="6">
<DList Name="gGiBombDL" Offset="0x09A0"/>
</File>

1
assets/xml/objects/object_gi_bomb_2.xml
View File

@ -1,4 +1,5 @@
<Root>
<ExternalFile OutPath="assets/objects/gameplay_keep"/>
<File Name="object_gi_bomb_2" Segment="6">
<DList Name="gGiBombchuDL" Offset="0x04B0"/>
</File>

1
assets/xml/objects/object_gi_bombpouch.xml
View File

@ -1,4 +1,5 @@
<Root>
<ExternalFile OutPath="assets/objects/gameplay_keep"/>
<File Name="object_gi_bombpouch" Segment="6">
<DList Name="gGiBombBag20BagColorDL" Offset="0x0AD0"/>
<DList Name="gGiBombBag30BagColorDL" Offset="0x0AF0"/>

1
assets/xml/objects/object_gi_boomerang.xml
View File

@ -1,4 +1,5 @@
<Root>
<ExternalFile OutPath="assets/objects/gameplay_keep"/>
<File Name="object_gi_boomerang" Segment="6">
<DList Name="gGiBoomerangDL" Offset="0x0A30"/>
</File>

1
assets/xml/objects/object_gi_boots_2.xml
View File

@ -1,4 +1,5 @@
<Root>
<ExternalFile OutPath="assets/objects/gameplay_keep"/>
<File Name="object_gi_boots_2" Segment="6">
<DList Name="gGiIronBootsDL" Offset="0x1630"/>
<DList Name="gGiIronBootsRivetsDL" Offset="0x1A98"/>

1
assets/xml/objects/object_gi_bosskey.xml
View File

@ -1,4 +1,5 @@
<Root>
<ExternalFile OutPath="assets/objects/gameplay_keep"/>
<File Name="object_gi_bosskey" Segment="6">
<DList Name="gGiBossKeyDL" Offset="0x0CA0"/>
<DList Name="gGiBossKeyGemDL" Offset="0x0F08"/>

1
assets/xml/objects/object_gi_bottle.xml
View File

@ -1,4 +1,5 @@
<Root>
<ExternalFile OutPath="assets/objects/gameplay_keep"/>
<File Name="object_gi_bottle" Segment="6">
<DList Name="gGiBottleStopperDL" Offset="0x0670"/>
<DList Name="gGiBottleDL" Offset="0x0750"/>

1
assets/xml/objects/object_gi_bottle_letter.xml
View File

@ -1,4 +1,5 @@
<Root>
<ExternalFile OutPath="assets/objects/gameplay_keep"/>
<File Name="object_gi_bottle_letter" Segment="6">
<DList Name="gGiLetterBottleContentsDL" Offset="0x08E0"/>
<DList Name="gGiLetterBottleDL" Offset="0x0AE0"/>

1
assets/xml/objects/object_gi_bow.xml
View File

@ -1,4 +1,5 @@
<Root>
<ExternalFile OutPath="assets/objects/gameplay_keep"/>
<File Name="object_gi_bow" Segment="6">
<DList Name="gGiBowDL" Offset="0x0990"/>
</File>

1
assets/xml/objects/object_gi_bracelet.xml
View File

@ -1,4 +1,5 @@
<Root>
<ExternalFile OutPath="assets/objects/gameplay_keep"/>
<File Name="object_gi_bracelet" Segment="6">
<DList Name="gGiGoronBraceletDL" Offset="0x0960"/>
</File>

1
assets/xml/objects/object_gi_brokensword.xml
View File

@ -1,4 +1,5 @@
<Root>
<ExternalFile OutPath="assets/objects/gameplay_keep"/>
<File Name="object_gi_brokensword" Segment="6">
<DList Name="gGiBrokenGoronSwordDL" Offset="0x06E0"/>
</File>

1
assets/xml/objects/object_gi_butterfly.xml
View File

@ -1,4 +1,5 @@
<Root>
<ExternalFile OutPath="assets/objects/gameplay_keep"/>
<File Name="object_gi_butterfly" Segment="6">
<DList Name="gGiButterflyContainerDL" Offset="0x0830"/>
<DList Name="gGiButterflyGlassDL" Offset="0x0A70"/>

1
assets/xml/objects/object_gi_coin.xml
View File

@ -1,4 +1,5 @@
<Root>
<ExternalFile OutPath="assets/objects/gameplay_keep"/>
<File Name="object_gi_coin" Segment="6">
<DList Name="gGiYellowCoinColorDL" Offset="0x0560"/>
<DList Name="gGiRedCoinColorDL" Offset="0x0580"/>

1
assets/xml/objects/object_gi_compass.xml
View File

@ -1,4 +1,5 @@
<Root>
<ExternalFile OutPath="assets/objects/gameplay_keep"/>
<File Name="object_gi_compass" Segment="6">
<DList Name="gGiCompassDL" Offset="0x0960"/>
<DList Name="gGiCompassGlassDL" Offset="0x0C50"/>

1
assets/xml/objects/object_gi_dekupouch.xml
View File

@ -1,4 +1,5 @@
<Root>
<ExternalFile OutPath="assets/objects/gameplay_keep"/>
<File Name="object_gi_dekupouch" Segment="6">
<DList Name="gGiBulletBagColorDL" Offset="0x0AF0"/>
<DList Name="gGiBulletBag50ColorDL" Offset="0x0B10"/>

1
assets/xml/objects/object_gi_egg.xml
View File

@ -1,4 +1,5 @@
<Root>
<ExternalFile OutPath="assets/objects/gameplay_keep"/>
<File Name="object_gi_egg" Segment="6">
<DList Name="gGiEggMaterialDL" Offset="0x0FD0"/>
<DList Name="gGiEggDL" Offset="0x1008"/>

1
assets/xml/objects/object_gi_eye_lotion.xml
View File

@ -1,4 +1,5 @@
<Root>
<ExternalFile OutPath="assets/objects/gameplay_keep"/>
<File Name="object_gi_eye_lotion" Segment="6">
<DList Name="gGiEyeDropsCapDL" Offset="0x0680"/>
<DList Name="gGiEyeDropsBottleDL" Offset="0x0768"/>

1
assets/xml/objects/object_gi_fire.xml
View File

@ -1,4 +1,5 @@
<Root>
<ExternalFile OutPath="assets/objects/gameplay_keep"/>
<File Name="object_gi_fire" Segment="6">
<DList Name="gGiBlueFireChamberstickDL" Offset="0x0C60"/>
<DList Name="gGiBlueFireFlameDL" Offset="0x0F08"/>

1
assets/xml/objects/object_gi_fish.xml
View File

@ -1,4 +1,5 @@
<Root>
<ExternalFile OutPath="assets/objects/gameplay_keep"/>
<File Name="object_gi_fish" Segment="6">
<DList Name="gGiFishDL" Offset="0x0600"/>
</File>

1
assets/xml/objects/object_gi_frog.xml
View File

@ -1,4 +1,5 @@
<Root>
<ExternalFile OutPath="assets/objects/gameplay_keep"/>
<File Name="object_gi_frog" Segment="6">
<DList Name="gGiFrogDL" Offset="0x0D60"/>
<DList Name="gGiFrogEyesDL" Offset="0x1060"/>

1
assets/xml/objects/object_gi_gerudo.xml
View File

@ -1,4 +1,5 @@
<Root>
<ExternalFile OutPath="assets/objects/gameplay_keep"/>
<File Name="object_gi_gerudo" Segment="6">
<DList Name="gGiGerudoCardDL" Offset="0x0F60"/>
</File>

1
assets/xml/objects/object_gi_ghost.xml
View File

@ -1,4 +1,5 @@
<Root>
<ExternalFile OutPath="assets/objects/gameplay_keep"/>
<File Name="object_gi_ghost" Segment="6">
<DList Name="gGiPoeColorDL" Offset="0x0950"/>
<DList Name="gGiBigPoeColorDL" Offset="0x0970"/>

1
assets/xml/objects/object_gi_glasses.xml
View File

@ -1,4 +1,5 @@
<Root>
<ExternalFile OutPath="assets/objects/gameplay_keep"/>
<File Name="object_gi_glasses" Segment="6">
<DList Name="gGiLensDL" Offset="0x0D80"/>
<DList Name="gGiLensGlassDL" Offset="0x1010"/>

1
assets/xml/objects/object_gi_gloves.xml
View File

@ -1,4 +1,5 @@
<Root>
<ExternalFile OutPath="assets/objects/gameplay_keep"/>
<File Name="object_gi_gloves" Segment="6">
<DList Name="gGiSilverGauntletsColorDL" Offset="0x14C0"/>
<DList Name="gGiGoldenGauntletsColorDL" Offset="0x14E0"/>

1
assets/xml/objects/object_gi_goddess.xml
View File

@ -1,4 +1,5 @@
<Root>
<ExternalFile OutPath="assets/objects/gameplay_keep"/>
<File Name="object_gi_goddess" Segment="6">
<DList Name="gGiMagicSpellDiamondDL" Offset="0x0920"/>
<DList Name="gGiDinsFireColorDL" Offset="0x09E0"/>

1
assets/xml/objects/object_gi_grass.xml
View File

@ -1,4 +1,5 @@
<Root>
<ExternalFile OutPath="assets/objects/gameplay_keep"/>
<File Name="object_gi_grass" Segment="6">
<DList Name="gGiGrassDL" Offset="0x08E0"/>
</File>

1
assets/xml/objects/object_gi_hammer.xml
View File

@ -1,4 +1,5 @@
<Root>
<ExternalFile OutPath="assets/objects/gameplay_keep"/>
<File Name="object_gi_hammer" Segment="6">
<DList Name="gGiHammerDL" Offset="0x09D0"/>
</File>

1
assets/xml/objects/object_gi_heart.xml
View File

@ -1,4 +1,5 @@
<Root>
<ExternalFile OutPath="assets/objects/gameplay_keep"/>
<File Name="object_gi_heart" Segment="6">
<DList Name="gGiRecoveryHeartDL" Offset="0x00E0"/>
</File>

1
assets/xml/objects/object_gi_hearts.xml
View File

@ -1,4 +1,5 @@
<Root>
<ExternalFile OutPath="assets/objects/gameplay_keep"/>
<File Name="object_gi_hearts" Segment="6">
<DList Name="gGiHeartBorderDL" Offset="0x1290"/>
<DList Name="gGiHeartContainerDL" Offset="0x1470"/>

1
assets/xml/objects/object_gi_hookshot.xml
View File

@ -1,4 +1,5 @@
<Root>
<ExternalFile OutPath="assets/objects/gameplay_keep"/>
<File Name="object_gi_hookshot" Segment="6">
<DList Name="gGiHookshotDL" Offset="0x0750"/>
<DList Name="gGiLongshotDL" Offset="0x1240"/>

1
assets/xml/objects/object_gi_hoverboots.xml
View File

@ -1,4 +1,5 @@
<Root>
<ExternalFile OutPath="assets/objects/gameplay_keep"/>
<File Name="object_gi_hoverboots" Segment="6">
<DList Name="gGiHoverBootsDL" Offset="0x1850"/>
</File>

1
assets/xml/objects/object_gi_insect.xml
View File

@ -1,4 +1,5 @@
<Root>
<ExternalFile OutPath="assets/objects/gameplay_keep"/>
<File Name="object_gi_insect" Segment="6">
<DList Name="gGiBugsContainerDL" Offset="0x0830"/>
<DList Name="gGiBugsGlassDL" Offset="0x0B20"/>

1
assets/xml/objects/object_gi_jewel.xml
View File

@ -1,4 +1,5 @@
<Root>
<ExternalFile OutPath="assets/objects/gameplay_keep"/>
<File Name="object_gi_jewel" Segment="6">
<Texture Name="gGiKokiriEmeraldScintillationTex" OutName="kokiri_emerald_scintillation" Format="i4" Width="64" Height="64" Offset="0x0000"/>
<DList Name="gGiKokiriEmeraldSettingDL" Offset="0x10E0"/>

1
assets/xml/objects/object_gi_key.xml
View File

@ -1,4 +1,5 @@
<Root>
<ExternalFile OutPath="assets/objects/gameplay_keep"/>
<File Name="object_gi_key" Segment="6">
<DList Name="gGiSmallKeyDL" Offset="0x0800"/>
</File>

1
assets/xml/objects/object_gi_ki_tan_mask.xml
View File

@ -1,4 +1,5 @@
<Root>
<ExternalFile OutPath="assets/objects/gameplay_keep"/>
<File Name="object_gi_ki_tan_mask" Segment="6">
<DList Name="gGiKeatonMaskDL" Offset="0x0AC0"/>
<DList Name="gGiKeatonMaskEyesDL" Offset="0x0D50"/>

1
assets/xml/objects/object_gi_liquid.xml
View File

@ -1,4 +1,5 @@
<Root>
<ExternalFile OutPath="assets/objects/gameplay_keep"/>
<File Name="object_gi_liquid" Segment="6">
<DList Name="gGiGreenPotColorDL" Offset="0x1270"/>
<DList Name="gGiRedPotColorDL" Offset="0x1290"/>

1
assets/xml/objects/object_gi_longsword.xml
View File

@ -1,4 +1,5 @@
<Root>
<ExternalFile OutPath="assets/objects/gameplay_keep"/>
<File Name="object_gi_longsword" Segment="6">
<DList Name="gGiBiggoronSwordDL" Offset="0x0600"/>
</File>

1
assets/xml/objects/object_gi_m_arrow.xml
View File

@ -1,4 +1,5 @@
<Root>
<ExternalFile OutPath="assets/objects/gameplay_keep"/>
<File Name="object_gi_m_arrow" Segment="6">
<DList Name="gGiMagicArrowDL" Offset="0x0AE0"/>
<DList Name="gGiFireArrowColorDL" Offset="0x0CA0"/>

1
assets/xml/objects/object_gi_magicpot.xml
View File

@ -1,4 +1,5 @@
<Root>
<ExternalFile OutPath="assets/objects/gameplay_keep"/>
<File Name="object_gi_magicpot" Segment="6">
<DList Name="gGiMagicJarSmallDL" Offset="0x0580"/>
<DList Name="gGiMagicJarLargeDL" Offset="0x0EE0"/>

1
assets/xml/objects/object_gi_map.xml
View File

@ -1,4 +1,5 @@
<Root>
<ExternalFile OutPath="assets/objects/gameplay_keep"/>
<File Name="object_gi_map" Segment="6">
<DList Name="gGiDungeonMapDL" Offset="0x03C0"/>
<DList Name="gGiStoneOfAgonyDL" Offset="0x0B70"/>

1
assets/xml/objects/object_gi_medal.xml
View File

@ -1,4 +1,5 @@
<Root>
<ExternalFile OutPath="assets/objects/gameplay_keep"/>
<File Name="object_gi_medal" Segment="6">
<DList Name="gGiForestMedallionFaceDL" Offset="0x0CB0"/>
<DList Name="gGiMedallionDL" Offset="0x0E18"/>

1
assets/xml/objects/object_gi_melody.xml
View File

@ -1,4 +1,5 @@
<Root>
<ExternalFile OutPath="assets/objects/gameplay_keep"/>
<File Name="object_gi_melody" Segment="6">
<DList Name="gGiMinuetColorDL" Offset="0x0A80"/>
<DList Name="gGiBoleroColorDL" Offset="0x0A90"/>

1
assets/xml/objects/object_gi_milk.xml
View File

@ -1,4 +1,5 @@
<Root>
<ExternalFile OutPath="assets/objects/gameplay_keep"/>
<File Name="object_gi_milk" Segment="6">
<DList Name="gGiMilkBottleContentsDL" Offset="0x1060"/>
<DList Name="gGiMilkBottleDL" Offset="0x1288"/>

1
assets/xml/objects/object_gi_mushroom.xml
View File

@ -1,4 +1,5 @@
<Root>
<ExternalFile OutPath="assets/objects/gameplay_keep"/>
<File Name="object_gi_mushroom" Segment="6">
<DList Name="gGiOddMushroomDL" Offset="0x09D0"/>
</File>

1
assets/xml/objects/object_gi_niwatori.xml
View File

@ -1,4 +1,5 @@
<Root>
<ExternalFile OutPath="assets/objects/gameplay_keep"/>
<File Name="object_gi_niwatori" Segment="6">
<DList Name="gGiChickenColorDL" Offset="0x15F0"/>
<DList Name="gGiCojiroColorDL" Offset="0x1610"/>

1
assets/xml/objects/object_gi_nuts.xml
View File

@ -1,4 +1,5 @@
<Root>
<ExternalFile OutPath="assets/objects/gameplay_keep"/>
<File Name="object_gi_nuts" Segment="6">
<DList Name="gGiNutDL" Offset="0x0E90"/>
</File>

1
assets/xml/objects/object_gi_ocarina.xml
View File

@ -1,4 +1,5 @@
<Root>
<ExternalFile OutPath="assets/objects/gameplay_keep"/>
<File Name="object_gi_ocarina" Segment="6">
<DList Name="gGiOcarinaTimeDL" Offset="0x08C0"/>
<DList Name="gGiOcarinaTimeHolesDL" Offset="0x0AF8"/>

1
assets/xml/objects/object_gi_ocarina_0.xml
View File

@ -1,4 +1,5 @@
<Root>
<ExternalFile OutPath="assets/objects/gameplay_keep"/>
<File Name="object_gi_ocarina_0" Segment="6">
<DList Name="gGiOcarinaFairyDL" Offset="0x08E0"/>
<DList Name="gGiOcarinaFairyHolesDL" Offset="0x0B58"/>

1
assets/xml/objects/object_gi_pachinko.xml
View File

@ -1,4 +1,5 @@
<Root>
<ExternalFile OutPath="assets/objects/gameplay_keep"/>
<File Name="object_gi_pachinko" Segment="6">
<DList Name="gGiSlingshotDL" Offset="0x0940"/>
</File>

1
assets/xml/objects/object_gi_powder.xml
View File

@ -1,4 +1,5 @@
<Root>
<ExternalFile OutPath="assets/objects/gameplay_keep"/>
<File Name="object_gi_powder" Segment="6">
<DList Name="gGiOddPotionDL" Offset="0x08B0"/>
</File>

1
assets/xml/objects/object_gi_prescription.xml
View File

@ -1,4 +1,5 @@
<Root>
<ExternalFile OutPath="assets/objects/gameplay_keep"/>
<File Name="object_gi_prescription" Segment="6">
<DList Name="gGiPrescriptionDL" Offset="0x09C0"/>
<DList Name="gGiPrescriptionWritingDL" Offset="0x0AF0"/>

1
assets/xml/objects/object_gi_rabit_mask.xml
View File

@ -1,4 +1,5 @@
<Root>
<ExternalFile OutPath="assets/objects/gameplay_keep"/>
<File Name="object_gi_rabit_mask" Segment="6">
<DList Name="gGiBunnyHoodDL" Offset="0x0BC0"/>
<DList Name="gGiBunnyHoodEyesDL" Offset="0x0E58"/>

1
assets/xml/objects/object_gi_redead_mask.xml
View File

@ -1,4 +1,5 @@
<Root>
<ExternalFile OutPath="assets/objects/gameplay_keep"/>
<File Name="object_gi_redead_mask" Segment="6">
<DList Name="gGiSpookyMaskDL" Offset="0x07E0"/>
</File>

1
assets/xml/objects/object_gi_rupy.xml
View File

@ -1,4 +1,5 @@
<Root>
<ExternalFile OutPath="assets/objects/gameplay_keep"/>
<File Name="object_gi_rupy" Segment="6">
<DList Name="gGiGreenRupeeInnerColorDL" Offset="0x04A0"/>
<DList Name="gGiBlueRupeeInnerColorDL" Offset="0x04C0"/>

1
assets/xml/objects/object_gi_saw.xml
View File

@ -1,4 +1,5 @@
<Root>
<ExternalFile OutPath="assets/objects/gameplay_keep"/>
<File Name="object_gi_saw" Segment="6">
<DList Name="gGiSawDL" Offset="0x07E0"/>
</File>

1
assets/xml/objects/object_gi_scale.xml
View File

@ -1,4 +1,5 @@
<Root>
<ExternalFile OutPath="assets/objects/gameplay_keep"/>
<File Name="object_gi_scale" Segment="6">
<DList Name="gGiSilverScaleWaterColorDL" Offset="0x0A20"/>
<DList Name="gGiGoldenScaleWaterColorDL" Offset="0x0A40"/>

1
assets/xml/objects/object_gi_seed.xml
View File

@ -1,4 +1,5 @@
<Root>
<ExternalFile OutPath="assets/objects/gameplay_keep"/>
<File Name="object_gi_seed" Segment="6">
<DList Name="gGiSeedDL" Offset="0x0810"/>
</File>

1
assets/xml/objects/object_gi_shield_1.xml
View File

@ -1,4 +1,5 @@
<Root>
<ExternalFile OutPath="assets/objects/gameplay_keep"/>
<File Name="object_gi_shield_1" Segment="6">
<DList Name="gGiDekuShieldDL" Offset="0x0A50"/>
</File>

1
assets/xml/objects/object_gi_shield_2.xml
View File

@ -1,4 +1,5 @@
<Root>
<ExternalFile OutPath="assets/objects/gameplay_keep"/>
<File Name="object_gi_shield_2" Segment="6">
<DList Name="gGiHylianShieldDL" Offset="0x0C70"/>
</File>

1
assets/xml/objects/object_gi_shield_3.xml
View File

@ -1,4 +1,5 @@
<Root>
<ExternalFile OutPath="assets/objects/gameplay_keep"/>
<File Name="object_gi_shield_3" Segment="6">
<DList Name="gGiMirrorShieldDL" Offset="0x0FB0"/>
<DList Name="gGiMirrorShieldSymbolDL" Offset="0x11C8"/>

1
assets/xml/objects/object_gi_skj_mask.xml
View File

@ -1,4 +1,5 @@
<Root>
<ExternalFile OutPath="assets/objects/gameplay_keep"/>
<File Name="object_gi_skj_mask" Segment="6">
<DList Name="gGiSkullMaskDL" Offset="0x09D0"/>
</File>

1
assets/xml/objects/object_gi_soul.xml
View File

@ -1,4 +1,5 @@
<Root>
<ExternalFile OutPath="assets/objects/gameplay_keep"/>
<File Name="object_gi_soul" Segment="6">
<DList Name="gGiFairyContainerBaseCapDL" Offset="0x0BD0"/>
<DList Name="gGiFairyContainerGlassDL" Offset="0x0DB8"/>

1
assets/xml/objects/object_gi_stick.xml
View File

@ -1,4 +1,5 @@
<Root>
<ExternalFile OutPath="assets/objects/gameplay_keep"/>
<File Name="object_gi_stick" Segment="6">
<DList Name="gGiStickDL" Offset="0x04D0"/>
</File>

1
assets/xml/objects/object_gi_sutaru.xml
View File

@ -1,4 +1,5 @@
<Root>
<ExternalFile OutPath="assets/objects/gameplay_keep"/>
<File Name="object_gi_sutaru" Segment="6">
<DList Name="gGiSkulltulaTokenDL" Offset="0x0330"/>
<DList Name="gGiSkulltulaTokenFlameDL" Offset="0x0438"/>

1
assets/xml/objects/object_gi_sword_1.xml
View File

@ -1,4 +1,5 @@
<Root>
<ExternalFile OutPath="assets/objects/gameplay_keep"/>
<File Name="object_gi_sword_1" Segment="6">
<DList Name="gGiKokiriSwordDL" Offset="0x0960"/>
</File>

1
assets/xml/objects/object_gi_ticketstone.xml
View File

@ -1,4 +1,5 @@
<Root>
<ExternalFile OutPath="assets/objects/gameplay_keep"/>
<File Name="object_gi_ticketstone" Segment="6">
<DList Name="gGiClaimCheckDL" Offset="0x0F00"/>
<DList Name="gGiClaimCheckWritingDL" Offset="0x1188"/>

1
assets/xml/objects/object_gi_truth_mask.xml
View File

@ -1,4 +1,5 @@
<Root>
<ExternalFile OutPath="assets/objects/gameplay_keep"/>
<File Name="object_gi_truth_mask" Segment="6">
<DList Name="gGiMaskOfTruthDL" Offset="0x13D0"/>
<DList Name="gGiMaskOfTruthAccentsDL" Offset="0x16B0"/>

1
assets/xml/objects/object_god_lgt.xml
View File

@ -1,4 +1,5 @@
<Root>
<ExternalFile OutPath="assets/objects/gameplay_keep"/>
<File Name="object_god_lgt" Segment="6">
<DList Name="gGoldenGoddessAuraDL" Offset="0x0330"/>
<Texture Name="gGoldenGoddessAuraHTailTex" OutName="golden_goddess_aura_tail" Format="i8" Width="32" Height="32" Offset="0x0530"/>

1
assets/xml/objects/object_kanban.xml
View File

@ -1,4 +1,5 @@
<Root>
<ExternalFile OutPath="assets/objects/gameplay_keep"/>
<File Name="object_kanban" Segment="6">
<DList Name="object_kanban_DL_000C30" Offset="0xC30"/>
<DList Name="object_kanban_DL_000CB0" Offset="0xCB0"/>

1
assets/xml/objects/object_kusa.xml
View File

@ -1,4 +1,5 @@
<Root>
<ExternalFile OutPath="assets/objects/gameplay_keep"/>
<File Name="object_kusa" Segment="6">
<DList Name="object_kusa_DL_000140" Offset="0x140"/>
<DList Name="object_kusa_DL_0002E0" Offset="0x2E0"/>

1
assets/xml/objects/object_link_boy.xml
View File

@ -1,4 +1,5 @@
<Root>
<ExternalFile OutPath="assets/objects/gameplay_keep"/>
<File Name="object_link_boy" Segment="6">
<Skeleton Name="gLinkAdultSkel" Type="Flex" LimbType="LOD" Offset="0x377F4"/>

1
assets/xml/objects/object_link_child.xml
View File

@ -1,4 +1,5 @@
<Root>
<ExternalFile OutPath="assets/objects/gameplay_keep"/>
<File Name="object_link_child" Segment="6">
<Skeleton Name="gLinkChildSkel" Type="Flex" LimbType="LOD" Offset="0x2CF6C"/>

1
assets/xml/objects/object_medal.xml
View File

@ -1,4 +1,5 @@
<Root>
<ExternalFile OutPath="assets/objects/gameplay_keep"/>
<File Name="object_medal" Segment="6">
<DList Name="object_medal_DL_000360" Offset="0x360"/>
<DList Name="object_medal_DL_000840" Offset="0x840"/>

2
assets/xml/objects/object_mori_hineri1.xml
View File

@ -1,5 +1,5 @@
<Root>
<ExternalFile XmlPath="objects/object_mori_tex.xml" OutPath="assets/objects/object_mori_tex/"/>
<ExternalFile OutPath="assets/objects/object_mori_tex/"/>
<File Name="object_mori_hineri1" Segment="6">
<DList Name="object_mori_hineri1_DL_0024E0" Offset="0x24E0"/>
<Collision Name="object_mori_hineri1_Col_0054B8" Offset="0x54B8"/>

2
assets/xml/objects/object_mori_hineri1a.xml
View File

@ -1,5 +1,5 @@
<Root>
<ExternalFile XmlPath="objects/object_mori_tex.xml" OutPath="assets/objects/object_mori_tex/"/>
<ExternalFile OutPath="assets/objects/object_mori_tex/"/>
<File Name="object_mori_hineri1a" Segment="6">
<DList Name="object_mori_hineri1a_DL_001980" Offset="0x1980"/>
<Collision Name="object_mori_hineri1a_Col_003490" Offset="0x3490"/>

2
assets/xml/objects/object_mori_hineri2.xml
View File

@ -1,5 +1,5 @@
<Root>
<ExternalFile XmlPath="objects/object_mori_tex.xml" OutPath="assets/objects/object_mori_tex/"/>
<ExternalFile OutPath="assets/objects/object_mori_tex/"/>
<File Name="object_mori_hineri2" Segment="6">
<DList Name="object_mori_hineri2_DL_0020F0" Offset="0x20F0"/>
<Collision Name="object_mori_hineri2_Col_0043D0" Offset="0x43D0"/>

2
assets/xml/objects/object_mori_hineri2a.xml
View File

@ -1,5 +1,5 @@
<Root>
<ExternalFile XmlPath="objects/object_mori_tex.xml" OutPath="assets/objects/object_mori_tex/"/>
<ExternalFile OutPath="assets/objects/object_mori_tex/"/>
<File Name="object_mori_hineri2a" Segment="6">
<DList Name="object_mori_hineri2a_DL_002B70" Offset="0x2B70"/>
<Collision Name="object_mori_hineri2a_Col_006078" Offset="0x6078"/>

2
assets/xml/objects/object_mori_objects.xml
View File

@ -1,5 +1,5 @@
<Root>
<ExternalFile XmlPath="objects/object_mori_tex.xml" OutPath="assets/objects/object_mori_tex/"/>
<ExternalFile OutPath="assets/objects/object_mori_tex/"/>
<File Name="object_mori_objects" Segment="6">
<Texture Name="gMoriHashiraTLUT" OutName="hashira_tlut" Format="rgba16" Width="112" Height="1" Offset="0x0000"/>
<Texture Name="gMoriHashiraTex" OutName="hashira" Format="ci8" Width="32" Height="32" Offset="0x00E0" TlutOffset="0x0000"/>

1
assets/xml/objects/object_nwc.xml
View File

@ -1,4 +1,5 @@
<Root>
<ExternalFile OutPath="assets/objects/gameplay_keep"/>
<File Name="object_nwc" Segment="6">
<Texture Name="gCuccoChickBodyTex" OutName="body" Format="rgba16" Width="32" Height="32" Offset="0x0"/>
<Texture Name="gCuccoChickEyeTex" OutName="eye" Format="rgba16" Width="16" Height="16" Offset="0x8E0"/>

5
assets/xml/objects/object_ny.xml
View File

@ -1,10 +1,11 @@
<Root>
<ExternalFile OutPath="assets/objects/gameplay_keep"/>
<File Name="object_ny" Segment="6">
<Texture Name="gEnNyRockBodyTex" OutName="rock_body" Format="rgba16" Width="16" Height="16" Offset="0x0000"/>
<Texture Name="gEnNySpikeTex" OutName="spike" Format="rgba16" Width="32" Height="32" Offset="0x0200"/>
<Texture Name="gEnNyMetalBodyTex" OutName="metal_body" Format="rgba16" Width="32" Height="32" Offset="0x0A00"/>
<DList Name="gEnNyRockBodyDL" Offset="0x1DD0"/>
<DList Name="gEnNyMetalBodyDL" Offset="0x1EA8"/>
<DList Name="gEnNySpikeDL" Offset="0x1FC8"/>
<DList Name="gEnNyMetalBodyDL" Offset="0x1EA8" RawPointers="0x07000000"/>
<DList Name="gEnNySpikeDL" Offset="0x1FC8" RawPointers="0x07000000"/>
</File>
</Root>

2
assets/xml/objects/object_owl.xml
View File

@ -61,7 +61,7 @@
<!-- TLUT used in gOwlPerchingSkel -->
<Texture Name="object_owl_TLUT_006DA8" OutName="tlut_00006DA8" Format="rgba16" Width="16" Height="16" Offset="0x6DA8"/>
<!-- TLUT used in gOwlFlyingSkel -->
<Texture Name="object_owl_TLUT_006FA8" OutName="tlut_00006FA8" Format="rgba16" Width="16" Height="16" Offset="0x6FA8"/>
<Texture Name="object_owl_TLUT_006FA8" OutName="tlut_00006FA8" Format="rgba16" Width="16" Height="16" Offset="0x6FA8" HackMode="ignore_orphaned_tlut"/>
<!-- Eye Textures -->
<Texture Name="gObjOwlEyeOpenTex" OutName="owl_eye_open" Format="ci8" Width="32" Height="32" Offset="0x89A8" TlutOffset="0x6DA8"/>

1
assets/xml/objects/object_po_composer.xml
View File

@ -1,4 +1,5 @@
<Root>
<ExternalFile OutPath="assets/objects/gameplay_keep"/>
<File Name="object_po_composer" Segment="6">
<Animation Name="gPoeComposerAttackAnim" Offset="0x020C"/>
<Animation Name="gPoeComposerDamagedAnim" Offset="0x0570"/>

1
assets/xml/objects/object_po_field.xml
View File

@ -1,4 +1,5 @@
<Root>
<ExternalFile OutPath="assets/objects/gameplay_keep"/>
<File Name="object_po_field" Segment="6">
<Animation Name="gPoeFieldAttackAnim" Offset="0x0158"/>
<Animation Name="gPoeFieldDamagedAnim" Offset="0x0454"/>

1
assets/xml/objects/object_poh.xml
View File

@ -1,4 +1,5 @@
<Root>
<ExternalFile OutPath="assets/objects/gameplay_keep"/>
<File Name="object_poh" Segment="6">
<Animation Name="gPoeAttackAnim" Offset="0x01A8"/>
<Animation Name="gPoeDamagedAnim" Offset="0x04EC"/>

1
assets/xml/objects/object_ps.xml
View File

@ -1,4 +1,5 @@
<Root>
<ExternalFile OutPath="assets/objects/gameplay_keep"/>
<File Name="object_ps" Segment="6">
<Animation Name="gPoeSellerIdleAnim" Offset="0x049C"/>
<Texture Name="gPoeSellerMetalFrameTex" OutName="poe_seller_metal_frame" Format="rgba16" Width="8" Height="8" Offset="0x5A80"/>

1
assets/xml/objects/object_sb.xml
View File

@ -1,4 +1,5 @@
<Root>
<ExternalFile OutPath="assets/objects/gameplay_keep"/>
<File Name="object_sb" Segment="6">
<Animation Name="object_sb_Anim_00004C" Offset="0x4C"/>
<Animation Name="object_sb_Anim_0000B4" Offset="0xB4"/>

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