github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-19 21:03:42 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

use deku nut icon for now

Browse source
This commit is contained in:
Demur Rumed 2025-08-01 23:54:53 +00:00
commit aed3cdcd87
3 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
soh/include/z64item.h
View file

@ -589,8 +589,8 @@ typedef enum {
/* 0x7A */ GID_SONG_TIME,
/* 0x7B */ GID_SONG_STORM,
/* 0x7C */ GID_TRIFORCE_PIECE,
/* */ GID_FISHING_POLE,
/* 0x7C */ GID_MAXIMUM
/* 0x7D */ GID_FISHING_POLE,
/* 0x7E */ GID_MAXIMUM
} GetItemDrawID;

2
soh/soh/Enhancements/randomizer/item_list.cpp
View file

@ -349,7 +349,7 @@ void Rando::StaticData::InitItemTable() {
itemTable[RG_OCARINA_C_RIGHT_BUTTON] = Item(RG_OCARINA_C_RIGHT_BUTTON, Text{ "Ocarina C Right Button", "Touche C-Droit de l'Ocarina", "C-Rechts-Taste der Okarina" }, ITEMTYPE_ITEM, GI_MAP, true, LOGIC_OCARINA_C_RIGHT_BUTTON, RHT_OCARINA_C_RIGHT_BUTTON, RG_OCARINA_C_RIGHT_BUTTON, OBJECT_GI_MAP, GID_STONE_OF_AGONY, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG, ITEM_CATEGORY_MAJOR, MOD_RANDOMIZER);
itemTable[RG_OCARINA_C_RIGHT_BUTTON].SetCustomDrawFunc(Randomizer_DrawOcarinaButton);
itemTable[RG_BRONZE_SCALE] = Item(RG_BRONZE_SCALE, Text{ "Bronze Scale", "Écaille de Bronze", "Bronzene Schuppe" }, ITEMTYPE_ITEM, GI_SCALE_SILVER, true, LOGIC_PROGRESSIVE_WALLET, RHT_BRONZE_SCALE, RG_BRONZE_SCALE, OBJECT_GI_SCALE, GID_SCALE_SILVER, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG, ITEM_CATEGORY_MAJOR, MOD_RANDOMIZER);
itemTable[RG_BRONZE_SCALE] = Item(RG_BRONZE_SCALE, Text{ "Bronze Scale", "Écaille de Bronze", "Bronzene Schuppe" }, ITEMTYPE_ITEM, GI_SCALE_SILVER, true, LOGIC_NONE, RHT_BRONZE_SCALE, RG_BRONZE_SCALE, OBJECT_GI_SCALE, GID_SCALE_SILVER, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG, ITEM_CATEGORY_MAJOR, MOD_RANDOMIZER);
itemTable[RG_BRONZE_SCALE].SetCustomDrawFunc(Randomizer_DrawBronzeScale);
itemTable[RG_SPEAK_DEKU] = Item(RG_SPEAK_DEKU, Text{ "Deku Jabbernut", "Parler", "" }, ITEMTYPE_ITEM, GI_SCALE_SILVER, true, LOGIC_NONE, RHT_SPEAK, RG_SPEAK_DEKU, OBJECT_GI_SCALE, GID_SCALE_SILVER, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG, ITEM_CATEGORY_MAJOR, MOD_RANDOMIZER);

12
soh/soh/Enhancements/randomizer/randomizer.cpp
View file

@ -5715,15 +5715,15 @@ void Randomizer::CreateCustomMessages() {
GIMESSAGE(RG_BRONZE_SCALE, ITEM_SCALE_SILVER, "You got the %rBronze Scale%w!&The power of buoyancy is yours!",
"Du hast die %rBronzene Schuppe%w&erhalten! Die Fähigkeit zu&Schwimmen ist nun dein!",
"Vous obtenez l'%rÉcaille de Bronze%w!&Le pouvoir de la flottabilité est&à vous!"),
GIMESSAGE(RG_SPEAK_DEKU, ITEM_SCALE_SILVER, "You got the %rDeku Jabbernut%w!&Use your words!", "!!!", "!!!"),
GIMESSAGE(RG_SPEAK_GERUDO, ITEM_SCALE_SILVER, "You got the %rGerudo Jabbernut%w!&Use your words!", "!!!",
GIMESSAGE(RG_SPEAK_DEKU, ITEM_NUT, "You got the %rDeku Jabbernut%w!&Use your words!", "!!!", "!!!"),
GIMESSAGE(RG_SPEAK_GERUDO, ITEM_NUT, "You got the %rGerudo Jabbernut%w!&Use your words!", "!!!",
"!!!"),
GIMESSAGE(RG_SPEAK_GORON, ITEM_SCALE_SILVER, "You got the %rGoron Jabbernut%w!&Use your words!", "!!!", "!!!"),
GIMESSAGE(RG_SPEAK_HYLIAN, ITEM_SCALE_SILVER,
GIMESSAGE(RG_SPEAK_GORON, ITEM_NUT, "You got the %rGoron Jabbernut%w!&Use your words!", "!!!", "!!!"),
GIMESSAGE(RG_SPEAK_HYLIAN, ITEM_NUT,
"You got the %rHylian Jabbernut%w!&Use your words! You can also speak with owls.", "!!!", "!!!"),
GIMESSAGE(RG_SPEAK_KOKIRI, ITEM_SCALE_SILVER, "You got the %rKokiri Jabbernut%w!&Use your words!", "!!!",
GIMESSAGE(RG_SPEAK_KOKIRI, ITEM_NUT, "You got the %rKokiri Jabbernut%w!&Use your words!", "!!!",
"!!!"),
GIMESSAGE(RG_SPEAK_ZORA, ITEM_SCALE_SILVER, "You got the %rZora Jabbernut%w!&Use your words!", "!!!", "!!!"),
GIMESSAGE(RG_SPEAK_ZORA, ITEM_NUT, "You got the %rZora Jabbernut%w!&Use your words!", "!!!", "!!!"),
GIMESSAGE(RG_FISHING_POLE, ITEM_FISHING_POLE, "You found a lost %rFishing Pole%w!&Time to hit the pond!",
"Du hast eine verlorene %rAngelrute%w&gefunden!&Zeit, im Teich&zu angeln!",
"Vous obtenez une %rCanne à pêche%w&perdue!&Il est temps d'aller à %gl'étang%w!"),