mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-02-22 21:51:55 -05:00
Code Issues Projects Releases Wiki Activity

Merge branch 'rando-next', remote-tracking branch 'origin' into get-item-rework-rando-next

Browse Source
This commit is contained in:
Christopher Leggett 2022-08-21 16:42:15 -04:00
commit 5298bda0e2
No known key found for this signature in database
GPG Key ID: 7093AE5FF7037D79
2 changed files with 76 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
soh/soh/Enhancements/bootcommands.c
View File

@ -25,8 +25,8 @@ void BootCommands_Init()
CVar_RegisterS32("gDebugEnabled", 0);
CVar_RegisterS32("gLanguages", 0); //0 = English / 1 = German / 2 = French
CVar_RegisterS32("gHudColors", 1); //0 = N64 / 1 = NGC / 2 = Custom
#ifdef __SWITCH__
CVar_RegisterS32("gControlNav", 1); // always enable controller nav on switch
#if defined(__SWITCH__) || defined(__WIIU__)
CVar_RegisterS32("gControlNav", 1); // always enable controller nav on switch/wii u
#endif
}

74
soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_exclude_overworld.cpp
View File

@ -293,6 +293,80 @@ void HintTable_Init_Exclude_Overworld() {
//obscure text
Text{"#frogs in a storm# gift", /*french*/"#des grenouilles mouillées# donnent", /*spanish*/"las #ancas bajo la tormenta# otorgan"},
});
hintTable[ZR_FROGS_ZELDAS_LULLABY] = HintText::Exclude(
{
// obscure text
Text{ "#sleepy frogs# gift", /*french*/ "#les grenouilles somnolentes# donnent",
/*spanish*/ "las #ranas somnolientas# regalan" },
Text{ "#the Froggish Tenor in the back-left# gifts",
/*french*/ "#le ténor grenouillesque au fond à gauche# donne",
/*spanish*/ "el #Sapo Tenore al fondo, a la izquierda#, regala" },
},
{},
// clear text
Text{ "after hearing #Zelda's Lullaby, the frogs# gift",
/*french*/ "à l'écoute de #la berceuse de Zelda, les grenouilles# donnent",
/*spanish*/ "después de escuchar #la Nana de Zelda, las ranas# regalan" });
hintTable[ZR_FROGS_EPONAS_SONG] = HintText::Exclude(
{
// obscure text
Text{ "#equine frogs# gift", /*french*/ "#les grenouilles équestres# donnent",
/*spanish*/ "las #ranas equinas# regalan" },
Text{ "#the Froggish Tenor in the back-right# gifts",
/*french*/ "#le ténor grenouillesque au fond à droite# donne",
/*spanish*/ "el #Sapo Tenore al fondo, a la derecha#, regala" },
},
{},
// clear text
Text{ "after hearing #Epona's Song, the frogs# gift",
/*french*/ "à l'écoute du #chant d'Epona, les grenouilles# donnent",
/*spanish*/ "después de escuchar #la Canción de Epona, las ranas# regalan" });
hintTable[ZR_FROGS_SARIAS_SONG] = HintText::Exclude(
{
// obscure text
Text{ "#sylvan frogs# gift", /*french*/ "#les grenouilles sylvestres# donnent",
/*spanish*/ "las #ranas silvestres# regalan" },
Text{ "#the Froggish Tenor in the center# gifts",
/*french*/ "#le ténor grenouillesque dans le centre# donne",
/*spanish*/ "el #Sapo Tenore en el centro# regala" },
},
{},
// clear text
Text{ "after hearing #Saria's Song, the frogs# gift",
/*french*/ "à l'écoute du #chant de Saria, les grenouilles# donnent",
/*spanish*/ "después de escuchar #la Canción de Saria, las ranas# regalan" });
hintTable[ZR_FROGS_SUNS_SONG] = HintText::Exclude(
{
// obscure text
Text{ "#enlightened frogs# gift", /*french*/ "#les grenouilles éclairées# donnent",
/*spanish*/ "las #ranas alumbradas# regalan" },
Text{ "#the Froggish Tenor in the front-left# gifts",
/*french*/ "#le ténor grenouillesque à l'avant gauche# donne",
/*spanish*/ "el #Sapo Tenore al frente, a la izquierda#, regala" },
},
{},
// clear text
Text{ "after hearing #the Sun's Song, the frogs# gift",
/*french*/ "à l'écoute du #chant du soleil, les grenouilles# donnent",
/*spanish*/ "después de escuchar #la Canción del Sol, las ranas# regalan" });
hintTable[ZR_FROGS_SONG_OF_TIME] = HintText::Exclude(
{
// obscure text
Text{ "#time-traveling frogs# gift", /*french*/ "#les grenouilles voyageuses dans le temps# donnent",
/*spanish*/ "las #ranas viajeras del tiempo# regalan" },
Text{ "#the Froggish Tenor in the front-right# gifts",
/*french*/ "#le ténor grenouillesque à l'avant droite# donne",
/*spanish*/ "el #Sapo Tenore al frente, a la derecha#, regala" },
},
{},
// clear text
Text{ "after hearing #the Song of Time, the frogs# gift",
/*french*/ "à l'écoute du #chant du temps, les grenouilles# donnent",
/*spanish*/ "después de escuchar #la Canción del tiempo, las ranas# regalan" });
hintTable[GF_HBA_1000_POINTS] = HintText::Exclude({
//obscure text