diff options
| author | mzxrules <mzxrules@gmail.com> | 2024-06-20 21:21:37 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-20 18:21:37 -0700 |
| commit | 2c680efa9169eaaddae97330fa3ea9586a273b57 (patch) | |
| tree | ce5df566d1079693852420d0276750f8939da18f /assets/xml | |
| parent | b55f8ffe6e60ed2335acbe7d428049ea1056f4b5 (diff) | |
z_map decompiled (#1032)
* First batch of functions
* more ok
* z_map_data OK
* More OKs, MinimapList ZAPD breaking change
* func_80103A58 improvements, more OK
* func_80106D5C and func_801091F0 decomped
* func_801031D0 decomped and some fixes
* house cleaning, more OKs more decomp
* Even more OKs
* func_80105C40 almost OK, more OKs
* func_80108AF8 OK and more
* All functions attempted
* func_8010534C OK
* Start documentation, rename DoorCtx
* More OKs, split map_data.data, more doc
* incremental clean-up, more function names
* more function names
* func_801068FC OK
* old uncommitted changes
* minor tweaks
* implement easy fixes
* more fixes
* z_map_disp OK, implement more suggestions
* delete utility program
* migrate data
* TransiActor ->TransitionActor
* Major documentation pass
* first pass of changes
* warning fix attempt, revert ZFile.cpp
* Fix FAKE match
* Easy fixes
* implement gDPLoadTextureBlock_Runtime
* z_demo bss patch
* Extract white square texture
* Implement more suggestions
* rework MapIndex/DungeonIndex
* revert dungeonSceneIndex -> mapIndex in some spots, implement suggestions
* more suggestions
* minor nits
* fix #include
Diffstat (limited to 'assets/xml')
| -rw-r--r-- | assets/xml/code/z_map_disp.xml | 5 | ||||
| -rw-r--r-- | assets/xml/objects/gameplay_dangeon_keep.xml | 6 | ||||
| -rw-r--r-- | assets/xml/objects/gameplay_keep.xml | 8 | ||||
| -rw-r--r-- | assets/xml/overlays/ovl_En_Mm2.xml | 2 | ||||
| -rw-r--r-- | assets/xml/overlays/ovl_Oceff_Wipe7.xml | 2 |
5 files changed, 16 insertions, 7 deletions
diff --git a/assets/xml/code/z_map_disp.xml b/assets/xml/code/z_map_disp.xml new file mode 100644 index 000000000..e165feb4e --- /dev/null +++ b/assets/xml/code/z_map_disp.xml @@ -0,0 +1,5 @@ +<Root> + <File Name="code" OutName="z_map_disp" BaseAddress="0x800A5AC0" RangeStart="0x119078" RangeEnd="0x1190F8" > + <Texture Name="sWhiteSquareTex" OutName="white_square" Format="i4" Width="16" Height="16" Offset="0x119078"/> + </File> +</Root> diff --git a/assets/xml/objects/gameplay_dangeon_keep.xml b/assets/xml/objects/gameplay_dangeon_keep.xml index 493290604..b4c92432d 100644 --- a/assets/xml/objects/gameplay_dangeon_keep.xml +++ b/assets/xml/objects/gameplay_dangeon_keep.xml @@ -5,7 +5,11 @@ <Texture Name="gDoorLockTex" OutName="door_lock" Format="rgba16" Width="32" Height="32" Offset="0x2C0" /> <Texture Name="gBossDoorLockTex" OutName="boss_door_lock" Format="rgba16" Width="32" Height="32" Offset="0xAC0" /> <Texture Name="gDoorChainTex" OutName="door_chain" Format="rgba16" Width="16" Height="128" Offset="0x12C0" /> - <Blob Name="gameplay_dangeon_keep_Blob_0022C0" Size="0x5000" Offset="0x22C0" /> + <Texture Name="gameplay_dangeon_keep_Tex_0022C8" OutName="tex_0022C8" Format="i4" Width="96" Height="85" Offset="0x22C8" /> + <Texture Name="gameplay_dangeon_keep_Tex_0032C8" OutName="tex_0032C8" Format="i4" Width="96" Height="85" Offset="0x32C8" /> + <Texture Name="gameplay_dangeon_keep_Tex_0042C8" OutName="tex_0042C8" Format="i4" Width="96" Height="85" Offset="0x42C8" /> + <Texture Name="gameplay_dangeon_keep_Tex_0052C8" OutName="tex_0052C8" Format="i4" Width="96" Height="85" Offset="0x52C8" /> + <Texture Name="gameplay_dangeon_keep_Tex_0062C8" OutName="tex_0062C8" Format="i4" Width="96" Height="85" Offset="0x62C8" /> <DList Name="gameplay_dangeon_keep_DL_007300" Offset="0x7300" /> <Collision Name="gameplay_dangeon_keep_Colheader_007498" Offset="0x7498" /> <DList Name="gameplay_dangeon_keep_DL_007650" Offset="0x7650" /> diff --git a/assets/xml/objects/gameplay_keep.xml b/assets/xml/objects/gameplay_keep.xml index 831dff61e..49b2eacb9 100644 --- a/assets/xml/objects/gameplay_keep.xml +++ b/assets/xml/objects/gameplay_keep.xml @@ -880,7 +880,7 @@ <!-- Bombchu --> <Texture Name="gBombchuBodyTex" OutName="bombchu_body" Format="rgba16" Width="8" Height="8" Offset="0x16060" /> <DList Name="gBombchuDL" Offset="0x16360" /> - + <Texture Name="gEffBombExplosion1Tex" OutName="eff_bomb_explosion_1" Format="ia16" Width="32" Height="32" Offset="0x164D0" /> <Texture Name="gEffBombExplosion2Tex" OutName="eff_bomb_explosion_2" Format="ia16" Width="32" Height="32" Offset="0x16CD0" /> <Texture Name="gEffBombExplosion3Tex" OutName="eff_bomb_explosion_3" Format="ia16" Width="32" Height="32" Offset="0x174D0" /> @@ -908,7 +908,7 @@ <Texture Name="gElegyShellBeltAndTunicTex" OutName="elegy_shell_human_belt_and_tunic" Format="rgba16" Width="32" Height="16" Offset="0x1E6F8" /> <Texture Name="gElegyShellHumanHairTex" OutName="elegy_shell_human_hair" Format="rgba16" Width="16" Height="16" Offset="0x1EAF8" /> - <DList Name="gameplay_keep_DL_01ED00" Offset="0x1ED00" /> + <DList Name="gCompassArrowDL" Offset="0x1ED00" /> <DList Name="gameplay_keep_DL_01ED90" Offset="0x1ED90" /> <DList Name="gZTargetArrowDL" Offset="0x1F0F0" /> <Texture Name="gameplay_keep_Tex_01F200" OutName="tex_01F200" Format="i8" Width="8" Height="8" Offset="0x1F200" /> @@ -1296,7 +1296,7 @@ <Texture Name="gDropDekuNutTex" OutName="drop_deku_nut" Format="rgba16" Width="32" Height="32" Offset="0x607C0" /> <Texture Name="gDropDekuStickTex" OutName="drop_deku_stick" Format="rgba16" Width="32" Height="32" Offset="0x60FC0" /> <Texture Name="gDropMagicLargeTex" OutName="drop_magic_large" Format="rgba16" Width="32" Height="32" Offset="0x617C0" /> - + <!-- Rupees --> <Texture Name="gRupeeGreenTex" OutName="rupee_green" Format="rgba16" Width="4" Height="4" Offset="0x61FC0" /> <Texture Name="gRupeeBlueTex" OutName="rupee_blue" Format="rgba16" Width="4" Height="4" Offset="0x61FE0" /> @@ -1312,7 +1312,7 @@ <Texture Name="gRupeeLightRedTex" OutName="rupee_light_red" Format="rgba16" Width="4" Height="4" Offset="0x63B90" /> <Texture Name="gRupeeLightBlueTex" OutName="rupee_light_blue" Format="rgba16" Width="4" Height="4" Offset="0x63BB0" /> <Texture Name="gHeartContainerTex" OutName="heart_container" Format="rgba16" Width="32" Height="32" Offset="0x63BD0" /> - + <Texture Name="gameplay_keep_Tex_0643D0" OutName="tex_0643D0" Format="rgba16" Width="32" Height="32" Offset="0x643D0" /> <Texture Name="gameplay_keep_Tex_064BD0" OutName="tex_064BD0" Format="rgba16" Width="32" Height="32" Offset="0x64BD0" /> <Texture Name="gameplay_keep_Tex_0653D0" OutName="tex_0653D0" Format="rgba16" Width="32" Height="32" Offset="0x653D0" /> diff --git a/assets/xml/overlays/ovl_En_Mm2.xml b/assets/xml/overlays/ovl_En_Mm2.xml index 81457d849..979b8fc5a 100644 --- a/assets/xml/overlays/ovl_En_Mm2.xml +++ b/assets/xml/overlays/ovl_En_Mm2.xml @@ -1,7 +1,7 @@ <Root> <File Name="ovl_En_Mm2" BaseAddress="0x809A2030" RangeStart="0x240" RangeEnd="0xAD0"> <Texture Name="sEnMm2EnvelopeTex" OutName="mm2_envelope" Format="i8" Width="32" Height="32" Offset="0x240"/> - <Texture Name="sEnMm2LetterTex" OutName="mm2_letter" Format="i8" Width="16" Height="16" Offset="0x640"/> + <Texture Name="sEnMm2LetterTex" OutName="mm2_letter" Format="rgba16" Width="16" Height="16" Offset="0x640"/> <Array Name="sEnMm21Vtx" Count="10" Offset="0x840"> <Vtx/> </Array> diff --git a/assets/xml/overlays/ovl_Oceff_Wipe7.xml b/assets/xml/overlays/ovl_Oceff_Wipe7.xml index 682bd0c98..4a49fedcb 100644 --- a/assets/xml/overlays/ovl_Oceff_Wipe7.xml +++ b/assets/xml/overlays/ovl_Oceff_Wipe7.xml @@ -1,6 +1,6 @@ <Root> <File Name="ovl_Oceff_Wipe7" BaseAddress="0x80BCDCB0" RangeStart="0x330" RangeEnd="0xDB8"> - <Texture Name="sSongofHealingEffectTex" OutName="song_of_healing_effect" Format="i8" Width="32" Height="32" Offset="0x330"/> + <Texture Name="sSongofHealingEffectTex" OutName="song_of_healing_effect" Format="i8" Width="32" Height="64" Offset="0x330"/> <TextureAnimation Name="sSongofHealingEffectTexAnim" Offset="0xB38" /> <Array Name="sSongofHealingEffectFrustrumVtx" Count="22" Offset="0xB40"> <Vtx/> |
