diff options
| author | Tom Overton <tom-overton@users.noreply.github.com> | 2023-07-03 10:12:51 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-03 13:12:51 -0400 |
| commit | fe1b59eccc1d0eb37d106475528376b2e558fff5 (patch) | |
| tree | b03ba28c782e0a854ddef5445f01e24c5dfa8f20 /src | |
| parent | 477f193db92da967e58d0a4713a6f8bf70fce7b0 (diff) | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c | 3 | ||||
| -rw-r--r-- | src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c | 4 | ||||
| -rw-r--r-- | src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c | 2 | ||||
| -rw-r--r-- | src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c | 4 | ||||
| -rw-r--r-- | src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c | 4 | ||||
| -rw-r--r-- | src/overlays/actors/ovl_Boss_Va/z_boss_va.c | 2 |
6 files changed, 9 insertions, 10 deletions
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 a32b7967e..e22de53ac 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 d06cf76e9..bb739b45b 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 11c191dec..463c45a73 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 8f9aad30f..ef7b74aa5 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 939495375..67b9086c1 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 b79795f44..9a7d0c55b 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) { |
