mirror of
https://github.com/zeldaret/oot.git
synced 2025-08-08 07:20:16 +00:00
Extract the assets from most of the overlays (#985)
* remove fake match * Fire and Ice arrows * Light arrows * Ganon otyuka and end title * Oceff_Spot * Add missing Vtx to arrows * Update assets/xml/overlays/ovl_Arrow_Ice.xml Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com> * Update assets/xml/overlays/ovl_Arrow_Light.xml Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com> * Fix fire arrows * Update assets/xml/overlays/ovl_Arrow_Fire.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update ovl_Bg_Ganon_Otyuka.xml * Update src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Change a comment and rename a DList * rename DList * Jya cobra * shd and elf_msg * elf msg 2 * En Bili * Remove extern form ice piece * remove some externs * en holl * kanban * make * sda * ssh and some cleanup * replace undefined sym in en_kusa * st * oceff wipe 3 * oceff wipe * oceff spot * oceff spot * oceff wipe 4 * Update VTXDIS * update VTXDIS again * fix sun song * magic dark * magic wind and oceff wipe 2 * magic fire and oceff storm * Update src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/overlays/ovl_En_Sth.xml.ignore Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/overlays/ovl_Elf_Msg.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update assets/xml/overlays/ovl_Magic_Wind.xml Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * fix emptyDL, run formatter on en_ssh * run formatter * Update format.sh * update to VTXDIS * small change * textureDL -> materialDL, vtxDL -> modelDL * upper CASE * setupDL -> materialDL * GeometryDL->ModelDL and VisualDL->MaterialDL * revert rcp.c * revert holl.c * another revert in rcp.c * some u32 DL -> Gfx* DL * the rest of dragorns comments * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "3e9ed72e2" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "3e9ed72e2" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * start updating overlays with static * en sth OK * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "d0cd6b397" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "d0cd6b397" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "2f68596" * fix names of the overlays * remove segment 128, add gameplay keep to global config file * Fix end title and remove hex mode from VTXdis.c * add code assets Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com> Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
This commit is contained in:
louist103
GitHub
parent
fd512f02e9
commit
781d497264
105 changed files with 737 additions and 4801 deletions
|
|
@ -46,21 +46,21 @@
|
|||
<DList Name="gFishingStreamSplashDL" Offset="0x3230"/>
|
||||
|
||||
<Texture Name="gFishingBubbleTex" OutName="fishing_bubble" Format="ia8" Width="16" Height="16" Offset="0x3320"/>
|
||||
<DList Name="gFishingBubbleSetupDL" Offset="0x3460"/>
|
||||
<DList Name="gFishingBubbleVtxDL" Offset="0x34C0"/>
|
||||
<DList Name="gFishingBubbleMaterialDL" Offset="0x3460"/>
|
||||
<DList Name="gFishingBubbleModelDL" Offset="0x34C0"/>
|
||||
|
||||
<Texture Name="gFishingDustSplashTex" OutName="fishing_dust_splash" Format="i8" Width="16" Height="16" Offset="0x34E0"/>
|
||||
<DList Name="gFishingDustSplashSetupDL" Offset="0x3610"/>
|
||||
<DList Name="gFishingDustSplashVtxDL" Offset="0x3680"/>
|
||||
<DList Name="gFishingDustSplashMaterialDL" Offset="0x3610"/>
|
||||
<DList Name="gFishingDustSplashModelDL" Offset="0x3680"/>
|
||||
|
||||
<DList Name="gFishingUnusedSetupDL" Offset="0x36E0"/>
|
||||
<DList Name="gFishingLineVtxDL" Offset="0x3710"/>
|
||||
<DList Name="gFishingUnusedMaterialDL" Offset="0x36E0"/>
|
||||
<DList Name="gFishingLineModelDL" Offset="0x3710"/>
|
||||
|
||||
<DList Name="gFishingRainDropVtxDL" Offset="0x3760"/>
|
||||
<DList Name="gFishingRainDropModelDL" Offset="0x3760"/>
|
||||
|
||||
<Texture Name="gFishingRainSplashTex" OutName="fishing_rain_splash" Format="rgba16" Width="16" Height="16" Offset="0x3778"/>
|
||||
<DList Name="gFishingRainSplashSetupDL" Offset="0x39A8"/>
|
||||
<DList Name="gFishingRainSplashVtxDL" Offset="0x3A18"/>
|
||||
<DList Name="gFishingRainSplashMaterialDL" Offset="0x39A8"/>
|
||||
<DList Name="gFishingRainSplashModelDL" Offset="0x3A18"/>
|
||||
|
||||
<Animation Name="gFishingOwnerAnim" Offset="0x453C"/>
|
||||
<DList Name="gFishingOwnerDL_006F60" Offset="0x6F60"/>
|
||||
|
|
@ -83,12 +83,12 @@
|
|||
<Limb Name="gFishingOwnerLimb_0085CC" LimbType="Standard" Offset="0x85CC"/>
|
||||
<Skeleton Name="gFishingOwnerSkel" Type="Flex" LimbType="Standard" Offset="0x85F8"/>
|
||||
|
||||
<DList Name="gFishingRippleSetupDL" Offset="0x8610"/>
|
||||
<DList Name="gFishingRippleVtxDL" Offset="0x8678"/>
|
||||
<DList Name="gFishingRippleMaterialDL" Offset="0x8610"/>
|
||||
<DList Name="gFishingRippleModelDL" Offset="0x8678"/>
|
||||
|
||||
<Texture Name="gFishingWaterDustTex" OutName="fishing_water_dust" Format="i4" Width="32" Height="32" Offset="0x8690"/>
|
||||
<DList Name="gFishingWaterDustSetupDL" Offset="0x88C0"/>
|
||||
<DList Name="gFishingWaterDustVtxDL" Offset="0x8970"/>
|
||||
<DList Name="gFishingWaterDustMaterialDL" Offset="0x88C0"/>
|
||||
<DList Name="gFishingWaterDustModelDL" Offset="0x8970"/>
|
||||
|
||||
<Texture Name="gFishingOwnerTLUT" OutName="fishing_owner_tlut" Format="rgba16" Width="16" Height="16" Offset="0x8990"/>
|
||||
<Texture Name="gFishingOwnerSkinTex" OutName="fishing_owner_skin" Format="ci8" Width="8" Height="8" Offset="0x8B90"/>
|
||||
|
|
@ -107,12 +107,12 @@
|
|||
<Texture Name="gFishingOwnerVestTex" OutName="fishing_owner_vest" Format="ci8" Width="16" Height="16" Offset="0xA810"/>
|
||||
|
||||
<Texture Name="gFishingSinkingLureSegmentTex" OutName="fishing_sinking_lure_segment" Format="ia8" Width="64" Height="64" Offset="0xA910"/>
|
||||
<DList Name="gFishingSinkingLureSegmentSetupDL" Offset="0xB950"/>
|
||||
<DList Name="gFishingSinkingLureSegmentVtxDL" Offset="0xB9C0"/>
|
||||
<DList Name="gFishingSinkingLureSegmentMaterialDL" Offset="0xB950"/>
|
||||
<DList Name="gFishingSinkingLureSegmentModelDL" Offset="0xB9C0"/>
|
||||
|
||||
<Texture Name="gFishingGroupFishTex" OutName="fishing_group_fish" Format="rgba16" Width="64" Height="16" Offset="0xB9E0"/>
|
||||
<DList Name="gFishingGroupFishSetupDL" Offset="0xC220"/>
|
||||
<DList Name="gFishingGroupFishVtxDL" Offset="0xC298"/>
|
||||
<DList Name="gFishingGroupFishMaterialDL" Offset="0xC220"/>
|
||||
<DList Name="gFishingGroupFishModelDL" Offset="0xC298"/>
|
||||
|
||||
<DList Name="gFishingUnusedRockDL" Offset="0xC650"/>
|
||||
<Texture Name="gFishingUnusedRockTex" OutName="fishing_unused_rock" Format="rgba16" Width="32" Height="32" Offset="0xC780"/>
|
||||
|
|
@ -151,7 +151,7 @@
|
|||
<Texture Name="gFishingRodSegmentStripTex" OutName="fishing_rod_segment_strip" Format="rgba16" Width="16" Height="8" Offset="0x11070"/>
|
||||
<Texture Name="gFishingRodSegmentBlackTex" OutName="fishing_rod_segment_black" Format="rgba16" Width="16" Height="8" Offset="0x11170"/>
|
||||
<Texture Name="gFishingRodSegmentWhiteTex" OutName="fishing_rod_segment_white" Format="rgba16" Width="16" Height="8" Offset="0x11270"/>
|
||||
<DList Name="gFishingRodSetupDL" Offset="0x113D0"/>
|
||||
<DList Name="gFishingRodMaterialDL" Offset="0x113D0"/>
|
||||
<DList Name="gFishingRodSegmentDL" Offset="0x11410"/>
|
||||
|
||||
<Texture Name="gFishingLureHookTex" OutName="fishing_lure_hook" Format="rgba16" Width="32" Height="32" Offset="0x11440"/>
|
||||
|
|
@ -161,15 +161,15 @@
|
|||
|
||||
<Texture Name="gFishingLilyPadTex" OutName="fishing_lily_pad" Format="rgba16" Width="32" Height="32" Offset="0x122E0"/>
|
||||
<Texture Name="gFishingRockTex" OutName="fishing_rock" Format="rgba16" Width="32" Height="32" Offset="0x12AE0"/>
|
||||
<DList Name="gFishingLilyPadSetupDL" Offset="0x13330"/>
|
||||
<DList Name="gFishingLilyPadVtxDL" Offset="0x133B0"/>
|
||||
<DList Name="gFishingRockSetupDL" Offset="0x13590"/>
|
||||
<DList Name="gFishingRockVtxDL" Offset="0x13610"/>
|
||||
<DList Name="gFishingLilyPadMaterialDL" Offset="0x13330"/>
|
||||
<DList Name="gFishingLilyPadModelDL" Offset="0x133B0"/>
|
||||
<DList Name="gFishingRockMaterialDL" Offset="0x13590"/>
|
||||
<DList Name="gFishingRockModelDL" Offset="0x13610"/>
|
||||
<Texture Name="gFishingWoodPostTex" OutName="fishing_wood_post" Format="rgba16" Width="32" Height="32" Offset="0x13660"/>
|
||||
<DList Name="gFishingWoodPostSetupDL" Offset="0x13F50"/>
|
||||
<DList Name="gFishingWoodPostVtxDL" Offset="0x13FD0"/>
|
||||
<DList Name="gFishingReedSetupDL" Offset="0x14030"/>
|
||||
<DList Name="gFishingReedVtxDL" Offset="0x140B0"/>
|
||||
<DList Name="gFishingWoodPostMaterialDL" Offset="0x13F50"/>
|
||||
<DList Name="gFishingWoodPostModelDL" Offset="0x13FD0"/>
|
||||
<DList Name="gFishingReedMaterialDL" Offset="0x14030"/>
|
||||
<DList Name="gFishingReedModelDL" Offset="0x140B0"/>
|
||||
|
||||
<Texture Name="gFishingAquariumBottomTex" OutName="fishing_aquarium_bottom" Format="rgba16" Width="16" Height="16" Offset="0x140D0"/>
|
||||
<Texture Name="gFishingAquariumWaterTex" OutName="fishing_aquarium_water" Format="rgba16" Width="32" Height="32" Offset="0x142D0"/>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue