diff options
| author | cadmic <cadmic24@gmail.com> | 2024-06-24 14:50:45 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-24 17:50:45 -0400 |
| commit | 4dc70fefeee8f6b587aa611da580141c6b9ea4be (patch) | |
| tree | ce0f2703ca320f29b5230c38855fa00a4ef92ae7 | |
| parent | 9def6f4d0d252e45a71d0d2ee5d9042023d84315 (diff) | |
Rename gTitleZeldaShieldLogoMQTex -> gTitleZeldaShieldLogoTex (#1974)
| -rw-r--r-- | assets/xml/objects/object_mag.xml | 2 | ||||
| -rw-r--r-- | assets/xml/objects/object_mag_mq.xml | 2 | ||||
| -rw-r--r-- | src/overlays/actors/ovl_En_Mag/z_en_mag.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/assets/xml/objects/object_mag.xml b/assets/xml/objects/object_mag.xml index 21f48d734..66874b0c0 100644 --- a/assets/xml/objects/object_mag.xml +++ b/assets/xml/objects/object_mag.xml @@ -1,6 +1,6 @@ <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="gTitleZeldaShieldLogoTex" OutName="title_zelda_shield_logo" 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="gTitleDiskTex" OutName="title_disk" Format="ia8" Width="48" Height="16" Offset="0x1A400"/> diff --git a/assets/xml/objects/object_mag_mq.xml b/assets/xml/objects/object_mag_mq.xml index d528754db..541dc6c38 100644 --- a/assets/xml/objects/object_mag_mq.xml +++ b/assets/xml/objects/object_mag_mq.xml @@ -1,6 +1,6 @@ <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="gTitleZeldaShieldLogoTex" OutName="title_zelda_shield_logo" 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"/> diff --git a/src/overlays/actors/ovl_En_Mag/z_en_mag.c b/src/overlays/actors/ovl_En_Mag/z_en_mag.c index fde43d48e..e32b01b4e 100644 --- a/src/overlays/actors/ovl_En_Mag/z_en_mag.c +++ b/src/overlays/actors/ovl_En_Mag/z_en_mag.c @@ -456,7 +456,7 @@ void EnMag_DrawInner(Actor* thisx, PlayState* play, Gfx** gfxP) { gDPSetPrimColor(gfx++, 0, 0, 255, 255, 255, (s16)this->mainAlpha); if ((s16)this->mainAlpha != 0) { - EnMag_DrawImageRGBA32(&gfx, 160 + LOGO_X_SHIFT, 100, (u8*)gTitleZeldaShieldLogoMQTex, 160, 160); + EnMag_DrawImageRGBA32(&gfx, 160 + LOGO_X_SHIFT, 100, (u8*)gTitleZeldaShieldLogoTex, 160, 160); } Gfx_SetupDL_39Ptr(&gfx); |