mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-12-26 01:58:51 -05:00
Code Issues Projects Releases Wiki Activity

Fixes incorrect key order in DrawSmallKeys.

Browse Source
This commit is contained in:
Christopher Leggett 2022-08-24 13:16:14 -04:00
parent 821c7948d6
commit 02a8ba8bb9
No known key found for this signature in database
GPG Key ID: 7093AE5FF7037D79
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
soh/soh/Enhancements/randomizer/draw.cpp
View File

@ -12,14 +12,15 @@ extern "C" void Randomizer_DrawSmallKey(GlobalContext* globalCtx, GetItemEntry*
s32 pad; s32 pad;
s16 color_slot = getItemEntry->getItemId - RG_FOREST_TEMPLE_SMALL_KEY; s16 color_slot = getItemEntry->getItemId - RG_FOREST_TEMPLE_SMALL_KEY;
s16 colors[8][3] = { s16 colors[9][3] = {
{ 4, 195, 46 }, // Forest Temple { 4, 195, 46 }, // Forest Temple
{ 237, 95, 95 }, // Fire Temple { 237, 95, 95 }, // Fire Temple
{ 85, 180, 223 }, // Water Temple { 85, 180, 223 }, // Water Temple
{ 222, 158, 47 }, // Spirit Temple { 222, 158, 47 }, // Spirit Temple
{ 126, 16, 177 }, // Shadow Temple { 126, 16, 177 }, // Shadow Temple
{ 221, 212, 60 }, // Gerudo Training Grounds
{ 227, 110, 255 }, // Bottom of the Well { 227, 110, 255 }, // Bottom of the Well
{ 221, 212, 60 }, // Gerudo Training Grounds
{ 255, 255, 255 }, // Theive's Hideout (unused)
{ 80, 80, 80 } // Ganon's Castle { 80, 80, 80 } // Ganon's Castle
}; };

3
soh/soh/Enhancements/randomizer/randomizer.cpp
View File

@ -4050,7 +4050,8 @@ void InitRandoItemTable() {
ItemTableManager::Instance->AddItemEntry(MOD_RANDOMIZER, extendedVanillaGetItemTable[i].getItemId, extendedVanillaGetItemTable[i]); ItemTableManager::Instance->AddItemEntry(MOD_RANDOMIZER, extendedVanillaGetItemTable[i].getItemId, extendedVanillaGetItemTable[i]);
} }
for (int i = 0; i < ARRAY_COUNT(randoGetItemTable); i++) { for (int i = 0; i < ARRAY_COUNT(randoGetItemTable); i++) {
if (randoGetItemTable[i].itemId >= RG_FOREST_TEMPLE_SMALL_KEY && randoGetItemTable[i].itemId <= RG_GANONS_CASTLE_SMALL_KEY) { if (randoGetItemTable[i].itemId >= RG_FOREST_TEMPLE_SMALL_KEY && randoGetItemTable[i].itemId <= RG_GANONS_CASTLE_SMALL_KEY
&& randoGetItemTable[i].itemId != RG_GERUDO_FORTRESS_SMALL_KEY) {
randoGetItemTable[i].drawFunc = (CustomDrawFunc)Randomizer_DrawSmallKey; randoGetItemTable[i].drawFunc = (CustomDrawFunc)Randomizer_DrawSmallKey;
} else if (randoGetItemTable[i].itemId >= RG_FOREST_TEMPLE_BOSS_KEY && randoGetItemTable[i].itemId <= RG_GANONS_CASTLE_BOSS_KEY) { } else if (randoGetItemTable[i].itemId >= RG_FOREST_TEMPLE_BOSS_KEY && randoGetItemTable[i].itemId <= RG_GANONS_CASTLE_BOSS_KEY) {
randoGetItemTable[i].drawFunc = (CustomDrawFunc)Randomizer_DrawBossKey; randoGetItemTable[i].drawFunc = (CustomDrawFunc)Randomizer_DrawBossKey;