-
Notifications
You must be signed in to change notification settings - Fork 595
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Set up multiversion assets with ZAPD and match gc-eu (#1967)
* Add ZAPD hack to deal with extracted/VERSION/ in include paths * Extract assets to extracted/VERSION * Add ZAPD flags to override virtual address / start offset / end offset * Configure offsets for code and overlay assets * Reorganize ZAPD configs * Match gc-eu-mq * Match gc-eu * Remove old asset dirs during distclean * Revert "Remove old asset dirs during distclean" This reverts commit fc8027a. * make zapd addresses globals int64_t so they can store uint32_t addresses and -1 * slight cleanup extract_assets.py * git subrepo pull --force tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "0285e11f0" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "0285e11f0" git-subrepo: version: "0.4.6" origin: "git@github.com:ingydotnet/git-subrepo.git" commit: "110b9eb" --------- Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
- Loading branch information
1 parent
b2d8056
commit 9def6f4
Showing
92 changed files
with
4,911 additions
and
487 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,13 @@ | ||
| <Root> | ||
| <File Name="code" OutName="z_fbdemo_circle" RangeStart="0x10ED48" RangeEnd="0x10FF68"> | ||
| <Texture Name="sTransCircleNormalTex" OutName="trans_circle_normal" Format="i8" Width="16" Height="64" Offset="0x10ED48"/> | ||
| <Texture Name="sTransCircleWaveTex" OutName="trans_circle_wave" Format="i8" Width="16" Height="64" Offset="0x10F148"/> | ||
| <Texture Name="sTransCircleRippleTex" OutName="trans_circle_ripple" Format="i8" Width="16" Height="64" Offset="0x10F548"/> | ||
| <Texture Name="sTransCircleStarburstTex" OutName="trans_circle_starburst" Format="i8" Width="16" Height="64" Offset="0x10F948"/> | ||
| <Array Name="sTransCircleVtx" Count="34" Offset="0x10FD48"> | ||
| <File Name="code" OutName="z_fbdemo_circle"> | ||
| <Texture Name="sTransCircleNormalTex" OutName="trans_circle_normal" Format="i8" Width="16" Height="64" Offset="0x0"/> | ||
| <Texture Name="sTransCircleWaveTex" OutName="trans_circle_wave" Format="i8" Width="16" Height="64" Offset="0x400"/> | ||
| <Texture Name="sTransCircleRippleTex" OutName="trans_circle_ripple" Format="i8" Width="16" Height="64" Offset="0x800"/> | ||
| <Texture Name="sTransCircleStarburstTex" OutName="trans_circle_starburst" Format="i8" Width="16" Height="64" Offset="0xC00"/> | ||
| <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="0x10FF68"/>--> | ||
| <!--<DList Name="sTransCircleDL" Offset="0x1220"/>--> | ||
| </File> | ||
| </Root> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,10 @@ | ||
| <Root> | ||
| <File Name="code" OutName="z_fbdemo_wipe1" RangeStart="0x10E2A0" RangeEnd="0x10EC30"> | ||
| <Array Name="sTransWipeVtx" Count="25" Offset="0x10E2A0"> | ||
| <File Name="code" OutName="z_fbdemo_wipe1"> | ||
| <Array Name="sTransWipeVtx" Count="25" Offset="0x0"> | ||
| <Vtx/> | ||
| </Array> | ||
| <Texture Name="sTransWipeTex" OutName="trans_wipe" Format="i4" Width="64" Height="64" Offset="0x10E430"/> | ||
| <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="0x10EC30"/> --> | ||
| <!-- <DList Name="sTransWipeDL" Offset="0x990"/> --> | ||
| </File> | ||
| </Root> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| <Root> | ||
| <File Name="object_mag" Segment="6"> | ||
| <Texture Name="gTitleZeldaShieldLogoMQTex" OutName="title_zelda_shield_logo_mq" Format="rgba32" Width="160" Height="160" Offset="0x0"/> | ||
| <Texture Name="gTitleCopyright19982002Tex" OutName="title_copyright_19982002" Format="ia8" Width="160" Height="16" Offset="0x19000"/> | ||
| <Texture Name="gTitleCopyright19982003Tex" OutName="title_copyright_19982003" Format="ia8" Width="160" Height="16" Offset="0x19A00"/> | ||
| <Texture Name="gTitleMasterQuestSubtitleTex" OutName="title_master_quest_subtitle" Format="rgba32" Width="128" Height="32" Offset="0x1A400"/> | ||
| <Texture Name="gTitleEffectMask00Tex" OutName="title_effect_mask_0_0" Format="i4" Width="64" Height="64" Offset="0x20000"/> | ||
| <Texture Name="gTitleEffectMask01Tex" OutName="title_effect_mask_0_1" Format="i4" Width="64" Height="64" Offset="0x20800"/> | ||
| <Texture Name="gTitleEffectMask02Tex" OutName="title_effect_mask_0_2" Format="i4" Width="64" Height="64" Offset="0x21000"/> | ||
| <Texture Name="gTitleEffectMask10Tex" OutName="title_effect_mask_1_0" Format="i4" Width="64" Height="64" Offset="0x21800"/> | ||
| <Texture Name="gTitleEffectMask11Tex" OutName="title_effect_mask_1_1" Format="i4" Width="64" Height="64" Offset="0x22000"/> | ||
| <Texture Name="gTitleEffectMask12Tex" OutName="title_effect_mask_1_2" Format="i4" Width="64" Height="64" Offset="0x22800"/> | ||
| <Texture Name="gTitleEffectMask20Tex" OutName="title_effect_mask_2_0" Format="i4" Width="64" Height="64" Offset="0x23000"/> | ||
| <Texture Name="gTitleEffectMask21Tex" OutName="title_effect_mask_2_1" Format="i4" Width="64" Height="64" Offset="0x23800"/> | ||
| <Texture Name="gTitleEffectMask22Tex" OutName="title_effect_mask_2_2" Format="i4" Width="64" Height="64" Offset="0x24000"/> | ||
| <Texture Name="gTitleFlameEffectTex" OutName="title_flame_effect" Format="i8" Width="32" Height="32" Offset="0x24800"/> | ||
| <Texture Name="gTitleTheLegendOfTextTex" OutName="title_the_legend_of_text" Format="i8" Width="72" Height="8" Offset="0x24C00"/> | ||
| <Texture Name="gTitleOcarinaOfTimeTMTextTex" OutName="title_ocarina_of_time_tm_text" Format="i8" Width="96" Height="8" Offset="0x24E40"/> | ||
| <Texture Name="gTitleUraLogoTex" OutName="title_ura_logo" Format="rgba32" Width="40" Height="40" Offset="0x1E400"/> | ||
| <Texture Name="gTitleDiskTex" OutName="title_disk" Format="ia8" Width="48" Height="16" Offset="0x1FD00"/> | ||
| <Texture Name="gTitleTitleJPNTex" OutName="title_title_jpn" Format="i8" Width="128" Height="16" Offset="0x25140"/> | ||
| </File> | ||
| </Root> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,11 @@ | ||
| <Root> | ||
| <File Name="ovl_Arrow_Fire" BaseAddress="0x80865d10" RangeStart="0x9D0" RangeEnd="0x1DF0"> | ||
| <Texture Name="s1Tex" OutName="fire_tex_1" Format="i8" Width="32" Height="64" Offset="0x9D0" Static="On"/> | ||
| <Texture Name="s2Tex" OutName="fire_tex_2" Format="i8" Width="32" Height="64" Offset="0x11D0" Static="On"/> | ||
| <Array Name="sVtx" Count="43" Offset="0x19D0" Static="On"> | ||
| <File Name="ovl_Arrow_Fire"> | ||
| <Texture Name="s1Tex" OutName="fire_tex_1" Format="i8" Width="32" Height="64" Offset="0x0" Static="On"/> | ||
| <Texture Name="s2Tex" OutName="fire_tex_2" Format="i8" Width="32" Height="64" Offset="0x800" Static="On"/> | ||
| <Array Name="sVtx" Count="43" Offset="0x1000" Static="On"> | ||
| <Vtx/> | ||
| </Array> | ||
| <DList Name="sMaterialDL" Offset="0x1C80" Static="On"/> | ||
| <DList Name="sModelDL" Offset="0x1D30" Static="On"/> | ||
| <DList Name="sMaterialDL" Offset="0x12B0" Static="On"/> | ||
| <DList Name="sModelDL" Offset="0x1360" Static="On"/> | ||
| </File> | ||
| </Root> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,11 @@ | ||
| <Root> | ||
| <File Name="ovl_Arrow_Ice" BaseAddress="0x80867cd0" RangeStart="0x9F0" RangeEnd="0x1E10"> | ||
| <Texture Name="s1Tex" OutName="ice_tex_1" Format="i8" Width="32" Height="64" Offset="0x9F0" Static="On"/> | ||
| <Texture Name="s2Tex" OutName="ice_tex_2" Format="i8" Width="32" Height="64" Offset="0x11F0" Static="On"/> | ||
| <Array Name="sVtx" Count="43" Offset="0x19F0" Static="On"> | ||
| <File Name="ovl_Arrow_Ice"> | ||
| <Texture Name="s1Tex" OutName="ice_tex_1" Format="i8" Width="32" Height="64" Offset="0x0" Static="On"/> | ||
| <Texture Name="s2Tex" OutName="ice_tex_2" Format="i8" Width="32" Height="64" Offset="0x800" Static="On"/> | ||
| <Array Name="sVtx" Count="43" Offset="0x1000" Static="On"> | ||
| <Vtx/> | ||
| </Array> | ||
| <DList Name="sMaterialDL" Offset="0x1CA0" Static="On"/> | ||
| <DList Name="sModelDL" Offset="0x1D50" Static="On"/> | ||
| <DList Name="sMaterialDL" Offset="0x12B0" Static="On"/> | ||
| <DList Name="sModelDL" Offset="0x1360" Static="On"/> | ||
| </File> | ||
| </Root> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,11 @@ | ||
| <Root> | ||
| <File Name="ovl_Arrow_Light" BaseAddress="0x80869cb0" RangeStart="0xA00" RangeEnd="0x1E20"> | ||
| <Texture Name="s1Tex" OutName="light_tex_1" Format="i8" Width="32" Height="64" Offset="0xA00" Static="On"/> | ||
| <Texture Name="s2Tex" OutName="light_tex_2" Format="i8" Width="32" Height="64" Offset="0x1200" Static="On"/> | ||
| <Array Name="sVtx" Count="43" Offset="0x1A00" Static="On"> | ||
| <File Name="ovl_Arrow_Light"> | ||
| <Texture Name="s1Tex" OutName="light_tex_1" Format="i8" Width="32" Height="64" Offset="0x0" Static="On"/> | ||
| <Texture Name="s2Tex" OutName="light_tex_2" Format="i8" Width="32" Height="64" Offset="0x800" Static="On"/> | ||
| <Array Name="sVtx" Count="43" Offset="0x1000" Static="On"> | ||
| <Vtx/> | ||
| </Array> | ||
| <DList Name="sMaterialDL" Offset="0x1CB0" Static="On"/> | ||
| <DList Name="sModelDL" Offset="0x1D60" Static="On"/> | ||
| <DList Name="sMaterialDL" Offset="0x12B0" Static="On"/> | ||
| <DList Name="sModelDL" Offset="0x1360" Static="On"/> | ||
| </File> | ||
| </Root> |
Oops, something went wrong.