From fe1b59eccc1d0eb37d106475528376b2e558fff5 Mon Sep 17 00:00:00 2001 From: Tom Overton Date: Mon, 3 Jul 2023 10:12:51 -0700 Subject: [PATCH] Ensure all boss title cards are extracted as IA8 (#1512) * Ensure all boss title cards are extracted as IA8 * Drop `Boss` from some of the title card names * Format --- assets/xml/objects/object_bv.xml | 2 +- assets/xml/objects/object_fd.xml | 2 +- assets/xml/objects/object_fhg.xml | 2 +- assets/xml/objects/object_ganon.xml | 2 +- assets/xml/objects/object_goma.xml | 2 +- assets/xml/objects/object_kingdodongo.xml | 2 +- assets/xml/objects/object_mo.xml | 2 +- assets/xml/objects/object_sst.xml | 2 +- assets/xml/objects/object_tw.xml | 2 +- src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c | 3 +-- src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c | 4 ++-- src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c | 2 +- src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c | 4 ++-- src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c | 4 ++-- src/overlays/actors/ovl_Boss_Va/z_boss_va.c | 2 +- 15 files changed, 18 insertions(+), 19 deletions(-) diff --git a/assets/xml/objects/object_bv.xml b/assets/xml/objects/object_bv.xml index b6ef9e45f9..204273fc01 100644 --- a/assets/xml/objects/object_bv.xml +++ b/assets/xml/objects/object_bv.xml @@ -1,7 +1,7 @@ - + diff --git a/assets/xml/objects/object_fd.xml b/assets/xml/objects/object_fd.xml index d915b38c2f..776a2ee494 100644 --- a/assets/xml/objects/object_fd.xml +++ b/assets/xml/objects/object_fd.xml @@ -1,7 +1,7 @@ - + diff --git a/assets/xml/objects/object_fhg.xml b/assets/xml/objects/object_fhg.xml index eb07d8eb34..d12a90cb08 100644 --- a/assets/xml/objects/object_fhg.xml +++ b/assets/xml/objects/object_fhg.xml @@ -18,7 +18,7 @@ - + diff --git a/assets/xml/objects/object_ganon.xml b/assets/xml/objects/object_ganon.xml index 79cba2ab36..094c1394fe 100644 --- a/assets/xml/objects/object_ganon.xml +++ b/assets/xml/objects/object_ganon.xml @@ -68,7 +68,7 @@ - + diff --git a/assets/xml/objects/object_goma.xml b/assets/xml/objects/object_goma.xml index e7a6d0a544..543d9ce2a1 100644 --- a/assets/xml/objects/object_goma.xml +++ b/assets/xml/objects/object_goma.xml @@ -159,7 +159,7 @@ - + diff --git a/assets/xml/objects/object_kingdodongo.xml b/assets/xml/objects/object_kingdodongo.xml index b3da9a6086..1aa1735cbe 100644 --- a/assets/xml/objects/object_kingdodongo.xml +++ b/assets/xml/objects/object_kingdodongo.xml @@ -48,7 +48,7 @@ - + diff --git a/assets/xml/objects/object_mo.xml b/assets/xml/objects/object_mo.xml index 165b4e112c..b191e8395e 100644 --- a/assets/xml/objects/object_mo.xml +++ b/assets/xml/objects/object_mo.xml @@ -1,7 +1,7 @@ - + diff --git a/assets/xml/objects/object_sst.xml b/assets/xml/objects/object_sst.xml index aa3c7d7d17..ba1fad8172 100644 --- a/assets/xml/objects/object_sst.xml +++ b/assets/xml/objects/object_sst.xml @@ -2,7 +2,7 @@ - + diff --git a/assets/xml/objects/object_tw.xml b/assets/xml/objects/object_tw.xml index b48c974872..126926356f 100644 --- a/assets/xml/objects/object_tw.xml +++ b/assets/xml/objects/object_tw.xml @@ -350,7 +350,7 @@ - + diff --git a/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c b/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c index a32b7967e5..e22de53ac7 100644 --- a/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c +++ b/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c @@ -404,8 +404,7 @@ void BossDodongo_IntroCutscene(BossDodongo* this, PlayState* play) { if (this->unk_198 == 0x5A) { if (!GET_EVENTCHKINF(EVENTCHKINF_71)) { TitleCard_InitBossName(play, &play->actorCtx.titleCtx, - SEGMENTED_TO_VIRTUAL(&object_kingdodongo_Blob_017410), 0xA0, 0xB4, 0x80, - 0x28); + SEGMENTED_TO_VIRTUAL(gKingDodongoTitleCardTex), 160, 180, 128, 40); } SEQCMD_PLAY_SEQUENCE(SEQ_PLAYER_BGM_MAIN, 0, 0, NA_BGM_FIRE_BOSS); } diff --git a/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c b/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c index d06cf76e94..bb739b45b9 100644 --- a/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c +++ b/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c @@ -489,8 +489,8 @@ void BossFd_Fly(BossFd* this, PlayState* play) { SEQCMD_PLAY_SEQUENCE(SEQ_PLAYER_BGM_MAIN, 0, 0, NA_BGM_FIRE_BOSS); } if ((this->timers[3] == 130) && !GET_EVENTCHKINF(EVENTCHKINF_73)) { - TitleCard_InitBossName(play, &play->actorCtx.titleCtx, - SEGMENTED_TO_VIRTUAL(gVolvagiaBossTitleCardTex), 0xA0, 0xB4, 0x80, 0x28); + TitleCard_InitBossName(play, &play->actorCtx.titleCtx, SEGMENTED_TO_VIRTUAL(gVolvagiaTitleCardTex), + 160, 180, 128, 40); } if (this->timers[3] <= 100) { this->subCamEyeVel.x = this->subCamEyeVel.y = this->subCamEyeVel.z = 2.0f; diff --git a/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c b/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c index 11c191dec3..463c45a737 100644 --- a/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c +++ b/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c @@ -921,7 +921,7 @@ void BossGoma_Encounter(BossGoma* this, PlayState* play) { if (!GET_EVENTCHKINF(EVENTCHKINF_70)) { TitleCard_InitBossName(play, &play->actorCtx.titleCtx, SEGMENTED_TO_VIRTUAL(gGohmaTitleCardTex), - 0xA0, 0xB4, 0x80, 0x28); + 160, 180, 128, 40); } SEQCMD_PLAY_SEQUENCE(SEQ_PLAYER_BGM_MAIN, 0, 0, NA_BGM_BOSS); diff --git a/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c b/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c index 8f9aad30f6..ef7b74aa55 100644 --- a/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c +++ b/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c @@ -1420,8 +1420,8 @@ void BossMo_IntroCs(BossMo* this, PlayState* play) { SEQCMD_PLAY_SEQUENCE(SEQ_PLAYER_BGM_MAIN, 0, 0, NA_BGM_BOSS); } if (this->timers[2] == 130) { - TitleCard_InitBossName(play, &play->actorCtx.titleCtx, SEGMENTED_TO_VIRTUAL(gMorphaTitleCardTex), 0xA0, - 0xB4, 0x80, 0x28); + TitleCard_InitBossName(play, &play->actorCtx.titleCtx, SEGMENTED_TO_VIRTUAL(gMorphaTitleCardTex), 160, + 180, 128, 40); SET_EVENTCHKINF(EVENTCHKINF_74); } break; diff --git a/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c b/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c index 939495375a..67b9086c11 100644 --- a/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c +++ b/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c @@ -2214,8 +2214,8 @@ void BossTw_TwinrovaIntroCS(BossTw* this, PlayState* play) { play->envCtx.prevLightSetting = 1; play->envCtx.lightSetting = 1; play->envCtx.lightBlend = 0.0f; - TitleCard_InitBossName(play, &play->actorCtx.titleCtx, SEGMENTED_TO_VIRTUAL(gTwinrovaTitleCardTex), - 0xA0, 0xB4, 0x80, 0x28); + TitleCard_InitBossName(play, &play->actorCtx.titleCtx, SEGMENTED_TO_VIRTUAL(gTwinrovaTitleCardTex), 160, + 180, 128, 40); SET_EVENTCHKINF(EVENTCHKINF_75); SEQCMD_PLAY_SEQUENCE(SEQ_PLAYER_BGM_MAIN, 0, 0, NA_BGM_BOSS); } diff --git a/src/overlays/actors/ovl_Boss_Va/z_boss_va.c b/src/overlays/actors/ovl_Boss_Va/z_boss_va.c index b79795f444..9a7d0c55bc 100644 --- a/src/overlays/actors/ovl_Boss_Va/z_boss_va.c +++ b/src/overlays/actors/ovl_Boss_Va/z_boss_va.c @@ -974,7 +974,7 @@ void BossVa_BodyIntro(BossVa* this, PlayState* play) { if (!GET_EVENTCHKINF(EVENTCHKINF_76)) { TitleCard_InitBossName(play, &play->actorCtx.titleCtx, SEGMENTED_TO_VIRTUAL(gBarinadeTitleCardTex), - 0xA0, 0xB4, 0x80, 0x28); + 160, 180, 128, 40); } if (Rand_ZeroOne() < 0.1f) {