diff options
| author | cadmic <cadmic24@gmail.com> | 2024-06-24 06:22:39 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-24 15:22:39 +0200 |
| commit | 9def6f4d0d252e45a71d0d2ee5d9042023d84315 (patch) | |
| tree | 23a40e0be68b09516bbfb2e897feb0c4308b7a39 /assets/xml/code | |
| parent | b2d80568b9f1a1e59e9e00f29d3936c7cd7e18c3 (diff) | |
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 fc8027a75f82289eee7b1822b82663b70789d63f.
* 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>
Diffstat (limited to 'assets/xml/code')
| -rw-r--r-- | assets/xml/code/fbdemo_circle.xml | 14 | ||||
| -rw-r--r-- | assets/xml/code/fbdemo_triforce.xml | 6 | ||||
| -rw-r--r-- | assets/xml/code/fbdemo_wipe1.xml | 8 |
3 files changed, 14 insertions, 14 deletions
diff --git a/assets/xml/code/fbdemo_circle.xml b/assets/xml/code/fbdemo_circle.xml index 1aa2de764..530506369 100644 --- a/assets/xml/code/fbdemo_circle.xml +++ b/assets/xml/code/fbdemo_circle.xml @@ -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> diff --git a/assets/xml/code/fbdemo_triforce.xml b/assets/xml/code/fbdemo_triforce.xml index a20e07075..613f7995d 100644 --- a/assets/xml/code/fbdemo_triforce.xml +++ b/assets/xml/code/fbdemo_triforce.xml @@ -1,7 +1,7 @@ <Root> - <File Name="code" OutName="z_fbdemo_triforce" RangeStart="0x10E1D0" RangeEnd="0x10E2A0"> - <DList Name="sTransTriforceDL" Offset="0x10E1D0"/> - <Array Name="sTransTriforceVtx" Count="10" Offset="0x10E200"> + <File Name="code" OutName="z_fbdemo_triforce"> + <DList Name="sTransTriforceDL" Offset="0x0"/> + <Array Name="sTransTriforceVtx" Count="10" Offset="0x30"> <Vtx/> </Array> </File> diff --git a/assets/xml/code/fbdemo_wipe1.xml b/assets/xml/code/fbdemo_wipe1.xml index f459c9f8e..74f129776 100644 --- a/assets/xml/code/fbdemo_wipe1.xml +++ b/assets/xml/code/fbdemo_wipe1.xml @@ -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> |