mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-11-26 03:12:18 -05:00
Code Issues Projects Releases Wiki Activity

Fix Ganondorf title card (#2082)

Browse Source
This commit is contained in:
Amaro Martínez 2022-12-05 14:38:28 -05:00 committed by GitHub
parent 656dcd2021
commit 1a9898b918
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
soh/assets/xml/GC_MQ_D/objects/object_ganon.xml
View File

@ -68,7 +68,7 @@
<DList Name="gGanondorfRightHandOpenDL" Offset="0xC9E8"/> <DList Name="gGanondorfRightHandOpenDL" Offset="0xC9E8"/>
<!-- Ganondorf Title Card Texture --> <!-- Ganondorf Title Card Texture -->
<Texture Name="gGanondorfTitleCardTex" OutName="ganondorf_title_card" Format="i8" Width="128" Height="40" Offset="0xCF00"/> <Texture Name="gGanondorfTitleCardTex" OutName="ganondorf_title_card" Format="i8" Width="128" Height="120" Offset="0xCF00"/>
<!-- Ganondorf Animation --> <!-- Ganondorf Animation -->
<Animation Name="gGanondorfEndingFloatAnim" Offset="0x11348"/> <!-- Original name is "ONOLEE" (lit. "Curse you!" from his in-game dialogue) --> <Animation Name="gGanondorfEndingFloatAnim" Offset="0x11348"/> <!-- Original name is "ONOLEE" (lit. "Curse you!" from his in-game dialogue) -->

2
soh/assets/xml/GC_NMQ_D/objects/object_ganon.xml
View File

@ -68,7 +68,7 @@
<DList Name="gGanondorfRightHandOpenDL" Offset="0xC9E8"/> <DList Name="gGanondorfRightHandOpenDL" Offset="0xC9E8"/>
<!-- Ganondorf Title Card Texture --> <!-- Ganondorf Title Card Texture -->
<Texture Name="gGanondorfTitleCardTex" OutName="ganondorf_title_card" Format="i8" Width="128" Height="40" Offset="0xCF00"/> <Texture Name="gGanondorfTitleCardTex" OutName="ganondorf_title_card" Format="i8" Width="128" Height="120" Offset="0xCF00"/>
<!-- Ganondorf Animation --> <!-- Ganondorf Animation -->
<Animation Name="gGanondorfEndingFloatAnim" Offset="0x11348"/> <!-- Original name is "ONOLEE" (lit. "Curse you!" from his in-game dialogue) --> <Animation Name="gGanondorfEndingFloatAnim" Offset="0x11348"/> <!-- Original name is "ONOLEE" (lit. "Curse you!" from his in-game dialogue) -->

2
soh/assets/xml/GC_NMQ_PAL_F/objects/object_ganon.xml
View File

@ -68,7 +68,7 @@
<DList Name="gGanondorfRightHandOpenDL" Offset="0xC9E8"/> <DList Name="gGanondorfRightHandOpenDL" Offset="0xC9E8"/>
<!-- Ganondorf Title Card Texture --> <!-- Ganondorf Title Card Texture -->
<Texture Name="gGanondorfTitleCardTex" OutName="ganondorf_title_card" Format="i8" Width="128" Height="40" Offset="0xCF00"/> <Texture Name="gGanondorfTitleCardTex" OutName="ganondorf_title_card" Format="i8" Width="128" Height="120" Offset="0xCF00"/>
<!-- Ganondorf Animation --> <!-- Ganondorf Animation -->
<Animation Name="gGanondorfEndingFloatAnim" Offset="0x11348"/> <!-- Original name is "ONOLEE" (lit. "Curse you!" from his in-game dialogue) --> <Animation Name="gGanondorfEndingFloatAnim" Offset="0x11348"/> <!-- Original name is "ONOLEE" (lit. "Curse you!" from his in-game dialogue) -->

2
soh/include/functions.h
View File

@ -394,7 +394,7 @@ void Flags_UnsetTempClear(PlayState* play, s32 flag);
s32 Flags_GetCollectible(PlayState* play, s32 flag); s32 Flags_GetCollectible(PlayState* play, s32 flag);
void Flags_SetCollectible(PlayState* play, s32 flag); void Flags_SetCollectible(PlayState* play, s32 flag);
void TitleCard_InitBossName(PlayState* play, TitleCardContext* titleCtx, void* texture, s16 x, s16 y, u8 width, void TitleCard_InitBossName(PlayState* play, TitleCardContext* titleCtx, void* texture, s16 x, s16 y, u8 width,
u8 height, s16 hastranslation); u8 height, s16 hasTranslation);
void TitleCard_InitPlaceName(PlayState* play, TitleCardContext* titleCtx, void* texture, s32 x, s32 y, void TitleCard_InitPlaceName(PlayState* play, TitleCardContext* titleCtx, void* texture, s32 x, s32 y,
s32 width, s32 height, s32 delay); s32 width, s32 height, s32 delay);
s32 func_8002D53C(PlayState* play, TitleCardContext* titleCtx); s32 func_8002D53C(PlayState* play, TitleCardContext* titleCtx);

2
soh/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c
View File

@ -1082,7 +1082,7 @@ void BossGanon_IntroCutscene(BossGanon* this, PlayState* play) {
if (!(gSaveContext.eventChkInf[7] & 0x100)) { if (!(gSaveContext.eventChkInf[7] & 0x100)) {
TitleCard_InitBossName(play, &play->actorCtx.titleCtx, TitleCard_InitBossName(play, &play->actorCtx.titleCtx,
SEGMENTED_TO_VIRTUAL(gGanondorfTitleCardTex), 160, 180, 128, 40, false); SEGMENTED_TO_VIRTUAL(gGanondorfTitleCardTex), 160, 180, 128, 40, true);
} }
gSaveContext.eventChkInf[7] |= 0x100; gSaveContext.eventChkInf[7] |= 0x100;