diff options
| author | Dragorn421 <Dragorn421@users.noreply.github.com> | 2026-02-22 19:08:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-02-22 19:08:12 +0100 |
| commit | abdae818bda2f397c23e41078a4d89079b9fa7b8 (patch) | |
| tree | 852c49d60db6b6c763dd4cd4168fff56546dce7a /assets/xml/objects | |
| parent | f2cb5ecb2f7c174d69c61ab1dfa6f7784050014e (diff) | |
Fix misc 23 (#2699)
* remove noop macros Fault_SetFontColor Fault_SetCharPad under PLATFORM_N64
* remove duplicate declarations in sfx.h
* use render mode presets more
* decimal for alpha values
* fix some z_camera comments typos
* fix references to preprocess.sh (used to be preprocess.py)
* remove outdated comment on deps in makefile
* code_800AD920 was renamed to z_viszbuf
* fix capitalization typo: gOcarinaofTimeDesignTex -> gOcarinaOfTimeDesignTex
* fix typo: gLinkAdultEyesClosedfTex, gLinkChildEyesClosedfTex -> remove extra f
* fix typo: gCrstalSwitchRedTex, gCrstalSwitchBlueTex -> gCrystal
* fix PARAMS_GET_U amount of bits
Diffstat (limited to 'assets/xml/objects')
| -rw-r--r-- | assets/xml/objects/gameplay_dangeon_keep.xml | 4 | ||||
| -rw-r--r-- | assets/xml/objects/gameplay_keep.xml | 2 | ||||
| -rw-r--r-- | assets/xml/objects/gameplay_keep_pal.xml | 2 | ||||
| -rw-r--r-- | assets/xml/objects/object_link_boy.xml | 2 | ||||
| -rw-r--r-- | assets/xml/objects/object_link_child.xml | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/assets/xml/objects/gameplay_dangeon_keep.xml b/assets/xml/objects/gameplay_dangeon_keep.xml index 015e400e4..debafa33e 100644 --- a/assets/xml/objects/gameplay_dangeon_keep.xml +++ b/assets/xml/objects/gameplay_dangeon_keep.xml @@ -135,8 +135,8 @@ <Texture Name="gameplay_dangeon_keep_0134A0_Tex" Format="rgba16" Width="32" Height="32" Offset="0x134A0"/> <Texture Name="gameplay_dangeon_keep_013CA0_Tex" Format="ia8" Width="4" Height="4" Offset="0x13CA0"/> <Texture Name="gameplay_dangeon_keep_013CB0_Tex" Format="i4" Width="64" Height="64" Offset="0x13CB0"/> - <Texture Name="gCrstalSwitchRedTex" Format="rgba16" Width="32" Height="32" Offset="0x144B0"/> - <Texture Name="gCrstalSwitchBlueTex" Format="rgba16" Width="32" Height="32" Offset="0x14CB0"/> + <Texture Name="gCrystalSwitchRedTex" Format="rgba16" Width="32" Height="32" Offset="0x144B0"/> + <Texture Name="gCrystalSwitchBlueTex" Format="rgba16" Width="32" Height="32" Offset="0x14CB0"/> <Texture Name="gameplay_dangeon_keep_0154B0_Tex" Format="rgba16" Width="32" Height="32" Offset="0x154B0"/> <Texture Name="gameplay_dangeon_keep_015CB0_Tex" Format="rgba16" Width="32" Height="32" Offset="0x15CB0"/> <Texture Name="gameplay_dangeon_keep_0164B0_Tex" Format="rgba16" Width="32" Height="32" Offset="0x164B0"/> diff --git a/assets/xml/objects/gameplay_keep.xml b/assets/xml/objects/gameplay_keep.xml index b8e20ab42..973d4c3ce 100644 --- a/assets/xml/objects/gameplay_keep.xml +++ b/assets/xml/objects/gameplay_keep.xml @@ -4,7 +4,7 @@ <Texture Name="gHilite1Tex" Format="rgba16" Width="16" Height="16" Offset="0x0"/> <Texture Name="gHilite2Tex" Format="rgba16" Width="16" Height="16" Offset="0x200"/> <Texture Name="gHylianShieldDesignTex" Format="rgba16" Width="32" Height="64" Offset="0x400"/> - <Texture Name="gOcarinaofTimeDesignTex" Format="rgba16" Width="32" Height="16" Offset="0x1400"/> + <Texture Name="gOcarinaOfTimeDesignTex" Format="rgba16" Width="32" Height="16" Offset="0x1400"/> <Texture Name="gBottleGlassTex" Format="rgba16" Width="16" Height="16" Offset="0x1800"/> <Texture Name="gDekuStickTex" Format="i8" Width="8" Height="8" Offset="0x1A00"/> <Texture Name="gLinkHairTex" Format="rgba16" Width="16" Height="16" Offset="0x1A40"/> diff --git a/assets/xml/objects/gameplay_keep_pal.xml b/assets/xml/objects/gameplay_keep_pal.xml index 04387392f..d09be36fd 100644 --- a/assets/xml/objects/gameplay_keep_pal.xml +++ b/assets/xml/objects/gameplay_keep_pal.xml @@ -4,7 +4,7 @@ <Texture Name="gHilite1Tex" Format="rgba16" Width="16" Height="16" Offset="0x0"/> <Texture Name="gHilite2Tex" Format="rgba16" Width="16" Height="16" Offset="0x200"/> <Texture Name="gHylianShieldDesignTex" Format="rgba16" Width="32" Height="64" Offset="0x400"/> - <Texture Name="gOcarinaofTimeDesignTex" Format="rgba16" Width="32" Height="16" Offset="0x1400"/> + <Texture Name="gOcarinaOfTimeDesignTex" Format="rgba16" Width="32" Height="16" Offset="0x1400"/> <Texture Name="gBottleGlassTex" Format="rgba16" Width="16" Height="16" Offset="0x1800"/> <Texture Name="gDekuStickTex" Format="i8" Width="8" Height="8" Offset="0x1A00"/> <Texture Name="gLinkHairTex" Format="rgba16" Width="16" Height="16" Offset="0x1A40"/> diff --git a/assets/xml/objects/object_link_boy.xml b/assets/xml/objects/object_link_boy.xml index 21a1d407c..eab6ae3ab 100644 --- a/assets/xml/objects/object_link_boy.xml +++ b/assets/xml/objects/object_link_boy.xml @@ -526,7 +526,7 @@ <!-- Eyes --> <Texture Name="gLinkAdultEyesOpenTex" Format="ci8" Width="64" Height="32" Offset="0x0000" TlutOffset="0x5C00"/> <Texture Name="gLinkAdultEyesHalfTex" Format="ci8" Width="64" Height="32" Offset="0x0800" TlutOffset="0x5C00"/> - <Texture Name="gLinkAdultEyesClosedfTex" Format="ci8" Width="64" Height="32" Offset="0x1000" TlutOffset="0x5C00"/> + <Texture Name="gLinkAdultEyesClosedTex" Format="ci8" Width="64" Height="32" Offset="0x1000" TlutOffset="0x5C00"/> <Texture Name="gLinkAdultEyesRightTex" Format="ci8" Width="64" Height="32" Offset="0x1800" TlutOffset="0x5C00"/> <Texture Name="gLinkAdultEyesLeftTex" Format="ci8" Width="64" Height="32" Offset="0x2000" TlutOffset="0x5C00"/> <Texture Name="gLinkAdultEyesWideTex" Format="ci8" Width="64" Height="32" Offset="0x2800" TlutOffset="0x5C00"/> diff --git a/assets/xml/objects/object_link_child.xml b/assets/xml/objects/object_link_child.xml index 25ad178c3..99492de10 100644 --- a/assets/xml/objects/object_link_child.xml +++ b/assets/xml/objects/object_link_child.xml @@ -436,7 +436,7 @@ <!--Eyes--> <Texture Name="gLinkChildEyesOpenTex" Format="ci8" Width="64" Height="32" Offset="0x0000" TlutOffset="0x5500"/> <Texture Name="gLinkChildEyesHalfTex" Format="ci8" Width="64" Height="32" Offset="0x0800" TlutOffset="0x5500"/> - <Texture Name="gLinkChildEyesClosedfTex" Format="ci8" Width="64" Height="32" Offset="0x1000" TlutOffset="0x5500"/> + <Texture Name="gLinkChildEyesClosedTex" Format="ci8" Width="64" Height="32" Offset="0x1000" TlutOffset="0x5500"/> <Texture Name="gLinkChildEyesLeftTex" Format="ci8" Width="64" Height="32" Offset="0x1800" TlutOffset="0x5500"/> <Texture Name="gLinkChildEyesRightTex" Format="ci8" Width="64" Height="32" Offset="0x2000" TlutOffset="0x5500"/> <Texture Name="gLinkChildEyesWideTex" Format="ci8" Width="64" Height="32" Offset="0x2800" TlutOffset="0x5500"/> |
