summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--soh/assets/custom/lang/en_US.json38
-rw-r--r--soh/include/z64item.h5
-rw-r--r--soh/soh/Enhancements/randomizer/3drando/hint_list.cpp5
-rw-r--r--soh/soh/Enhancements/randomizer/draw.cpp4
-rw-r--r--soh/soh/Enhancements/randomizer/hint.cpp4
-rw-r--r--soh/soh/Enhancements/randomizer/item_list.cpp2
-rw-r--r--soh/soh/Enhancements/randomizer/randomizerEnums/RandomizerHintTextKey.h1
-rw-r--r--soh/src/code/z_draw.c36
8 files changed, 77 insertions, 18 deletions
diff --git a/soh/assets/custom/lang/en_US.json b/soh/assets/custom/lang/en_US.json
index 4e9bf0c42..2d989173c 100644
--- a/soh/assets/custom/lang/en_US.json
+++ b/soh/assets/custom/lang/en_US.json
@@ -1159,6 +1159,38 @@
"rewards on slider does not change."
]
},
+ "wincon": {
+ "name": "Win Condition",
+ "description": [
+ "Defeat Ganon - Defeat Ganon to complete the game.\n",
+ "\n",
+ "Anywhere - Collect the Triforce to complete the game. It can appear anywhere in the world.\n",
+ "\n",
+ "Trigger - These settings put the completing the game on a trigger, ",
+ "playing the credits when the requirements are met:\n",
+ "- Stones: Obtain the specified amount of Spiritual Stones.\n",
+ "- Medallions: Obtain the specified amount of medallions.\n",
+ "- Dungeon rewards: Obtain the specified total sum of Spiritual Stones or medallions.\n",
+ "- Dungeons: Complete the specified amount of dungeons. Dungeons are considered complete after stepping into ",
+ "the blue warp after the boss.\n",
+ "- Tokens: Obtain the specified amount of Skulltula tokens.\n",
+ "- Triforce Pieces: Obtain the specified number of Triforce Pieces."
+ ]
+ },
+ "wincon_options": {
+ "name": "Win Condition Options",
+ "description": [
+ "Standard Rewards - Greg does not change logic, Greg does not help obtain Ganon's Soul, max ",
+ "number of rewards on slider does not change.\n",
+ "\n",
+ "Greg as Reward - Greg does change logic (can be part of expected path for obtaining ",
+ "Ganon's Soul), Greg helps obtain Ganon's Soul, max number of rewards on slider increases by 1 to ",
+ "account for Greg.\n",
+ "\n",
+ "Greg as Wildcard - Greg does not change logic, Greg helps obtain Ganon's Soul, max number of ",
+ "rewards on slider does not change."
+ ]
+ },
"big_poe_count": {
"name": "Big Poe Target Count",
"description": "The Poe collector will give a reward for turning in this many Big Poes."
@@ -1549,12 +1581,6 @@
"ganons_soul_triforce_count": {
"name": "Ganon's Soul Triforce Piece Count"
},
- "wincon": {
- "name": "Win Condition"
- },
- "wincon_options": {
- "name": "Win Condition Reward Options"
- },
"wincon_medallion_count": {
"name": "Win Condition Medallion Count"
},
diff --git a/soh/include/z64item.h b/soh/include/z64item.h
index 137ed09a8..2e21a9c2f 100644
--- a/soh/include/z64item.h
+++ b/soh/include/z64item.h
@@ -594,8 +594,9 @@ typedef enum {
/* 0x7A */ GID_SONG_TIME,
/* 0x7B */ GID_SONG_STORM,
/* 0x7C */ GID_TRIFORCE_PIECE,
- /* 0x7D */ GID_FISHING_POLE,
- /* 0x7E */ GID_MAXIMUM
+ /* 0x7D */ GID_TRIFORCE,
+ /* 0x7E */ GID_FISHING_POLE,
+ /* 0x7F */ GID_MAXIMUM
} GetItemDrawID;
diff --git a/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp b/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp
index 2cbff54b2..38db0742c 100644
--- a/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp
@@ -2152,6 +2152,11 @@ void StaticData::HintTable_Init() {
| WINCON HINT TEXT |
---------------------------*/
+ hintTextTable[RHT_WINCON_DEFEAT_GANON_HINT] = HintText(CustomMessage("$wAnd the #Triforce# will be granted once #the evil one# is defeated.^",
+ /*german*/ "$wUnd das #Triforce# wird gewährt, sobald #der Böse# besiegt wurde.^",
+ /*french*/ "$wAussi, la #Triforce# sera accordée une fois que #le Malin# aura été vaincu.^",
+ {QM_YELLOW, QM_PINK}));
+
hintTextTable[RHT_WINCON_ANYWHERE_HINT] = HintText(CustomMessage("$wAnd the #Triforce# will be hidden somewhere&#in Hyrule#.^",
/*german*/ "$wUnd das #Triforce# wird irgendwo #in Hyrule# zu finden sein.^",
/*french*/ "$wAussi, la #Triforce# se trouve quelque part #dans Hyrule#.^",
diff --git a/soh/soh/Enhancements/randomizer/draw.cpp b/soh/soh/Enhancements/randomizer/draw.cpp
index 334f84e8e..370f2ba47 100644
--- a/soh/soh/Enhancements/randomizer/draw.cpp
+++ b/soh/soh/Enhancements/randomizer/draw.cpp
@@ -357,6 +357,10 @@ extern "C" void Randomizer_DrawTriforcePieceGI(PlayState* play, GetItemEntry get
if (rando->GetRandoSettingValue(RSK_GANONS_SOUL) == RO_GANONS_SOUL_TRIFORCE_PIECES) {
fullTriforce = fullTriforce || (rando->GetRandoSettingValue(RSK_GANONS_SOUL_TRIFORCE_COUNT) == current);
}
+ if (getItemEntry.getItemId == RG_TRIFORCE) {
+ fullTriforce = true;
+ triforcePieceScale = 0.035f;
+ }
Matrix_Scale(triforcePieceScale, triforcePieceScale, triforcePieceScale, MTXMODE_APPLY);
diff --git a/soh/soh/Enhancements/randomizer/hint.cpp b/soh/soh/Enhancements/randomizer/hint.cpp
index d5f52a4dd..45639dd47 100644
--- a/soh/soh/Enhancements/randomizer/hint.cpp
+++ b/soh/soh/Enhancements/randomizer/hint.cpp
@@ -650,7 +650,9 @@ CustomMessage Hint::GetWinconText() {
auto ctx = Rando::Context::GetInstance();
CustomMessage winconMessage;
- if (ctx->GetOption(RSK_WINCON).Is(RO_WINCON_ANYWHERE)) {
+ if (ctx->GetOption(RSK_WINCON).Is(RO_WINCON_DEFEAT_GANON)) {
+ return StaticData::hintTextTable[RHT_WINCON_DEFEAT_GANON_HINT].GetHintMessage();
+ } else if (ctx->GetOption(RSK_WINCON).Is(RO_WINCON_ANYWHERE)) {
return StaticData::hintTextTable[RHT_WINCON_ANYWHERE_HINT].GetHintMessage();
} else if (ctx->GetOption(RSK_WINCON).Is(RO_WINCON_STONES)) {
winconMessage = StaticData::hintTextTable[RHT_WINCON_STONES_HINT].GetHintMessage();
diff --git a/soh/soh/Enhancements/randomizer/item_list.cpp b/soh/soh/Enhancements/randomizer/item_list.cpp
index 7f4e8b1d0..b54ee3d5f 100644
--- a/soh/soh/Enhancements/randomizer/item_list.cpp
+++ b/soh/soh/Enhancements/randomizer/item_list.cpp
@@ -472,7 +472,7 @@ void Rando::StaticData::InitItemTable() {
itemTable[RG_DEKU_NUT_BAG] = Item(RG_DEKU_NUT_BAG, Text{ "Deku Nut Bag", "Sac de Noix Mojo", "Deku-Nuß-Tasche" }, ITEMTYPE_ITEM, GI_NUT_UPGRADE_30, true, LOGIC_PROGRESSIVE_NUT_BAG, RHT_NONE, RG_DEKU_NUT_BAG, OBJECT_GI_NUTS, GID_NUTS, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG, ITEM_CATEGORY_MAJOR, MOD_RANDOMIZER, {"a ", "un ", "eine "}).CustomIcon(gItemIconDekuNutTex);
itemTable[RG_DEKU_NUT_BAG].SetCustomDrawFunc(Randomizer_DrawNutBag);
- itemTable[RG_TRIFORCE] = Item(RG_TRIFORCE, Text{ "Triforce", "Triforce", "Triforce" }, ITEMTYPE_ITEM, RG_TRIFORCE, true, LOGIC_NONE, RHT_NONE, RG_TRIFORCE, OBJECT_GI_BOMB_2, GID_TRIFORCE_PIECE, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG, ITEM_CATEGORY_MAJOR, MOD_RANDOMIZER, {"the ", "la ", "die "}).CustomIcon(gTriforcePieceTex);;
+ itemTable[RG_TRIFORCE] = Item(RG_TRIFORCE, Text{ "Triforce", "Triforce", "Triforce" }, ITEMTYPE_ITEM, RG_TRIFORCE, true, LOGIC_NONE, RHT_NONE, RG_TRIFORCE, OBJECT_GI_BOMB_2, GID_TRIFORCE, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG, ITEM_CATEGORY_MAJOR, MOD_RANDOMIZER, {"the ", "la ", "die "}).CustomIcon(gTriforcePieceTex);;
itemTable[RG_HINT] = Item(RG_HINT, Text{ "Hint", "Indice", "Hinweis" }, ITEMTYPE_EVENT, RG_HINT, false, LOGIC_NONE, RHT_NONE, ITEM_CATEGORY_LESSER);
// Individual stages of progressive items (only here for GetItemEntry purposes, not for use in seed gen)
itemTable[RG_HOOKSHOT] = Item(RG_HOOKSHOT, Text{ "Hookshot", "Grappin", "Fanghaken" }, ITEMTYPE_ITEM, GI_HOOKSHOT, true, LOGIC_PROGRESSIVE_HOOKSHOT, RHT_HOOKSHOT, ITEM_HOOKSHOT, OBJECT_GI_HOOKSHOT, GID_HOOKSHOT, 0x36, 0x80, CHEST_ANIM_LONG, ITEM_CATEGORY_MAJOR, MOD_NONE, {"the ", "le ", "den "});
diff --git a/soh/soh/Enhancements/randomizer/randomizerEnums/RandomizerHintTextKey.h b/soh/soh/Enhancements/randomizer/randomizerEnums/RandomizerHintTextKey.h
index a17a71818..46b0e5247 100644
--- a/soh/soh/Enhancements/randomizer/randomizerEnums/RandomizerHintTextKey.h
+++ b/soh/soh/Enhancements/randomizer/randomizerEnums/RandomizerHintTextKey.h
@@ -1258,6 +1258,7 @@ RANDO_ENUM_ITEM(RHT_GANONS_SOUL_DUNGEONS_HINT)
RANDO_ENUM_ITEM(RHT_GANONS_SOUL_TOKENS_HINT)
RANDO_ENUM_ITEM(RHT_GANONS_SOUL_TRIFORCE_PIECES_HINT)
// Wincon
+RANDO_ENUM_ITEM(RHT_WINCON_DEFEAT_GANON_HINT)
RANDO_ENUM_ITEM(RHT_WINCON_ANYWHERE_HINT)
RANDO_ENUM_ITEM(RHT_WINCON_STONES_HINT)
RANDO_ENUM_ITEM(RHT_WINCON_MEDALLIONS_HINT)
diff --git a/soh/src/code/z_draw.c b/soh/src/code/z_draw.c
index 4706aaf7a..06a719078 100644
--- a/soh/src/code/z_draw.c
+++ b/soh/src/code/z_draw.c
@@ -114,6 +114,7 @@ void GetItem_DrawJewelGoron(PlayState* play, s16 drawId);
void GetItem_DrawJewelZora(PlayState* play, s16 drawId);
void GetItem_DrawGenericMusicNote(PlayState* play, s16 drawId);
void GetItem_DrawTriforcePiece(PlayState* play, s16 drawId);
+void GetItem_DrawTriforce(PlayState* play, s16 drawId);
void GetItem_DrawFishingPole(PlayState* play, s16 drawId);
typedef struct {
@@ -384,14 +385,15 @@ DrawItemTableEntry sDrawItemTable[] = {
{ GetItem_DrawGenericMusicNote, { gGiSongNoteDL } }, // Generic
- { GetItem_DrawGenericMusicNote, { gGiSongNoteDL } }, // Zelda's Lullaby
- { GetItem_DrawGenericMusicNote, { gGiSongNoteDL } }, // Epona's song
- { GetItem_DrawGenericMusicNote, { gGiSongNoteDL } }, // Saria's song
- { GetItem_DrawGenericMusicNote, { gGiSongNoteDL } }, // Sun's song
- { GetItem_DrawGenericMusicNote, { gGiSongNoteDL } }, // Song of time
- { GetItem_DrawGenericMusicNote, { gGiSongNoteDL } }, // Song of storms
- { GetItem_DrawTriforcePiece, { gTriforcePiece0DL } }, // Triforce Piece
- { GetItem_DrawFishingPole, { gGiFishingPoleDL } }, // Fishing Pole
+ { GetItem_DrawGenericMusicNote, { gGiSongNoteDL } }, // Zelda's Lullaby
+ { GetItem_DrawGenericMusicNote, { gGiSongNoteDL } }, // Epona's song
+ { GetItem_DrawGenericMusicNote, { gGiSongNoteDL } }, // Saria's song
+ { GetItem_DrawGenericMusicNote, { gGiSongNoteDL } }, // Sun's song
+ { GetItem_DrawGenericMusicNote, { gGiSongNoteDL } }, // Song of time
+ { GetItem_DrawGenericMusicNote, { gGiSongNoteDL } }, // Song of storms
+ { GetItem_DrawTriforcePiece, { gTriforcePiece0DL } }, // Triforce Piece
+ { GetItem_DrawTriforce, { gTriforcePieceCompletedDL } }, // Triforce
+ { GetItem_DrawFishingPole, { gGiFishingPoleDL } }, // Fishing Pole
};
/**
@@ -1027,6 +1029,24 @@ void GetItem_DrawTriforcePiece(PlayState* play, s16 drawId) {
CLOSE_DISPS(play->state.gfxCtx);
}
+void GetItem_DrawTriforce(PlayState* play, s16 drawId) {
+ OPEN_DISPS(play->state.gfxCtx);
+
+ Gfx_SetupDL_25Opa(play->state.gfxCtx);
+
+ Matrix_Scale(0.035f, 0.035f, 0.035f, MTXMODE_APPLY);
+
+ uint8_t index = gSaveContext.ship.quest.data.randomizer.triforcePiecesCollected % 3;
+ Gfx* triforceDL = (Gfx*)gTriforcePieceCompletedDL;
+
+ gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx, (char*)__FILE__, __LINE__),
+ G_MTX_MODELVIEW | G_MTX_LOAD);
+
+ gSPDisplayList(POLY_OPA_DISP++, triforceDL);
+
+ CLOSE_DISPS(play->state.gfxCtx);
+}
+
void GetItem_DrawFishingPole(PlayState* play, s16 drawId) {
Vec3f pos;
OPEN_DISPS(play->state.gfxCtx);
generated by cgit v1.2.3 (git 2.25.1) at 2026-10-08 20:31:51 +0000