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

Merge pull request #26 from MelonSpeedruns/melon-randomizer

Browse source 
freestanding keys done + bombchu 5 fix
This commit is contained in:
briaguya 2022-05-31 20:28:01 -04:00 • committed by GitHub
commit 9d9cce9fa8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 300 additions and 280 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1238,6 +1238,8 @@ GetItemID Randomizer::GetItemFromGet(RandomizerGet randoGet, GetItemID ogItemId)
return GI_SWORD_KOKIRI; return GI_SWORD_KOKIRI;
case DEKU_SHIELD: case DEKU_SHIELD:
return GI_SHIELD_DEKU; return GI_SHIELD_DEKU;
case BOMBCHUS_5:
return GI_BOMBCHUS_5;
case BOMBCHUS_20: case BOMBCHUS_20:
return GI_BOMBCHUS_20; return GI_BOMBCHUS_20;
case ICE_TRAP: case ICE_TRAP:
@ -1752,6 +1754,8 @@ RandomizerCheck Randomizer::GetCheckFromActor(s16 sceneNum, s16 actorId, s16 act
} }
case 8: case 8:
switch(actorParams) { switch(actorParams) {
case 273:
return BOTTOM_OF_THE_WELL_FREESTANDING_KEY;
case 22600: case 22600:
return BOTTOM_OF_THE_WELL_FRONT_LEFT_FAKE_WALL_CHEST; return BOTTOM_OF_THE_WELL_FRONT_LEFT_FAKE_WALL_CHEST;
case 20578: case 20578:
@ -1864,6 +1868,8 @@ RandomizerCheck Randomizer::GetCheckFromActor(s16 sceneNum, s16 actorId, s16 act
} }
case 7: case 7:
switch(actorParams) { switch(actorParams) {
case 273:
return SHADOW_TEMPLE_FREESTANDING_KEY;
case 6177: case 6177:
return SHADOW_TEMPLE_MAP_CHEST; return SHADOW_TEMPLE_MAP_CHEST;
case 5607: case 5607:
@ -1956,6 +1962,8 @@ RandomizerCheck Randomizer::GetCheckFromActor(s16 sceneNum, s16 actorId, s16 act
} }
case 11: case 11:
switch(actorParams) { switch(actorParams) {
case 273:
return GERUDO_TRAINING_GROUND_FREESTANDING_KEY;
case -30573: case -30573:
return GERUDO_TRAINING_GROUND_LOBBY_LEFT_CHEST; return GERUDO_TRAINING_GROUND_LOBBY_LEFT_CHEST;
case -30393: case -30393:

572
soh/src/code/z_en_item00.c
View file

@ -360,33 +360,33 @@ void EnItem00_Init(Actor* thisx, GlobalContext* globalCtx) {
switch (this->actor.params) { switch (this->actor.params) {
case ITEM00_RUPEE_GREEN: case ITEM00_RUPEE_GREEN:
if (CVar_GetS32("gNewDrops", 0) !=0) { if (CVar_GetS32("gNewDrops", 0) != 0) {
Actor_SetScale(&this->actor, 0.3f); Actor_SetScale(&this->actor, 0.3f);
this->scale = 0.3f; this->scale = 0.3f;
yOffset = 50.0f; yOffset = 50.0f;
shadowScale = 0.3f; shadowScale = 0.3f;
this->actor.world.rot.x = 0x4000; this->actor.world.rot.x = 0x4000;
break; break;
} }
case ITEM00_RUPEE_BLUE: case ITEM00_RUPEE_BLUE:
if (CVar_GetS32("gNewDrops", 0) !=0) { if (CVar_GetS32("gNewDrops", 0) != 0) {
Actor_SetScale(&this->actor, 0.3f); Actor_SetScale(&this->actor, 0.3f);
this->scale = 0.3f; this->scale = 0.3f;
yOffset = 50.0f; yOffset = 50.0f;
shadowScale = 0.3f; shadowScale = 0.3f;
this->actor.world.rot.x = 0x4000; this->actor.world.rot.x = 0x4000;
} }
case ITEM00_RUPEE_RED: case ITEM00_RUPEE_RED:
if (CVar_GetS32("gNewDrops", 0) !=0) { if (CVar_GetS32("gNewDrops", 0) != 0) {
Actor_SetScale(&this->actor, 0.3f); Actor_SetScale(&this->actor, 0.3f);
this->scale = 0.3f; this->scale = 0.3f;
yOffset = 50.0f; yOffset = 50.0f;
shadowScale = 0.3f; shadowScale = 0.3f;
this->actor.world.rot.x = 0x4000; this->actor.world.rot.x = 0x4000;
} else { } else {
Actor_SetScale(&this->actor, 0.015f); Actor_SetScale(&this->actor, 0.015f);
this->scale = 0.015f; this->scale = 0.015f;
yOffset = 750.0f; yOffset = 750.0f;
} }
break; break;
case ITEM00_SMALL_KEY: case ITEM00_SMALL_KEY:
@ -402,17 +402,17 @@ void EnItem00_Init(Actor* thisx, GlobalContext* globalCtx) {
this->scale = 0.02f; this->scale = 0.02f;
break; break;
case ITEM00_HEART: case ITEM00_HEART:
if (CVar_GetS32("gNewDrops", 0) !=0) { if (CVar_GetS32("gNewDrops", 0) != 0) {
this->actor.home.rot.z = Rand_CenteredFloat(65535.0f); this->actor.home.rot.z = Rand_CenteredFloat(65535.0f);
yOffset = 25.0f; yOffset = 25.0f;
Actor_SetScale(&this->actor, 0.3f); Actor_SetScale(&this->actor, 0.3f);
this->scale = 0.3f; this->scale = 0.3f;
shadowScale = 0.5f; shadowScale = 0.5f;
} else { } else {
this->actor.home.rot.z = Rand_CenteredFloat(65535.0f); this->actor.home.rot.z = Rand_CenteredFloat(65535.0f);
yOffset = 430.0f; yOffset = 430.0f;
Actor_SetScale(&this->actor, 0.02f); Actor_SetScale(&this->actor, 0.02f);
this->scale = 0.02f; this->scale = 0.02f;
} }
break; break;
case ITEM00_HEART_CONTAINER: case ITEM00_HEART_CONTAINER:
@ -422,153 +422,153 @@ void EnItem00_Init(Actor* thisx, GlobalContext* globalCtx) {
this->scale = 0.02f; this->scale = 0.02f;
break; break;
case ITEM00_ARROWS_SINGLE: case ITEM00_ARROWS_SINGLE:
if (CVar_GetS32("gNewDrops", 0) !=0) { if (CVar_GetS32("gNewDrops", 0) != 0) {
Actor_SetScale(&this->actor, 0.2f); Actor_SetScale(&this->actor, 0.2f);
this->scale = 0.2f; this->scale = 0.2f;
yOffset = 50.0f; yOffset = 50.0f;
shadowScale = 0.5f; shadowScale = 0.5f;
this->actor.world.rot.x = 0x4000; this->actor.world.rot.x = 0x4000;
} else {
yOffset = 400.0f;
Actor_SetScale(&this->actor, 0.02f);
this->scale = 0.02f;
}
break;
case ITEM00_ARROWS_SMALL:
if (CVar_GetS32("gNewDrops", 0) !=0) {
Actor_SetScale(&this->actor, 0.2f);
this->scale = 0.2f;
yOffset = 50.0f;
shadowScale = 0.5f;
this->actor.world.rot.x = 0x4000;
break;
}
case ITEM00_ARROWS_MEDIUM:
if (CVar_GetS32("gNewDrops", 0) !=0) {
Actor_SetScale(&this->actor, 0.2f);
this->scale = 0.2f;
yOffset = 50.0f;
shadowScale = 0.5f;
this->actor.world.rot.x = 0x4000;
break;
}
case ITEM00_ARROWS_LARGE:
if (CVar_GetS32("gNewDrops", 0) !=0) {
Actor_SetScale(&this->actor, 0.2f);
this->scale = 0.2f;
yOffset = 50.0f;
shadowScale = 0.5f;
this->actor.world.rot.x = 0x4000;
} else {
Actor_SetScale(&this->actor, 0.035f);
this->scale = 0.035f;
yOffset = 250.0f;
}
break;
case ITEM00_BOMBS_A:
if (CVar_GetS32("gNewDrops", 0) !=0) {
Actor_SetScale(&this->actor, 0.2f);
this->scale = 0.2f;
yOffset = 50.0f;
shadowScale = 0.5f;
this->actor.world.rot.x = 0x4000;
break;
}
case ITEM00_BOMBS_B:
if (CVar_GetS32("gNewDrops", 0) !=0) {
Actor_SetScale(&this->actor, 0.2f);
this->scale = 0.2f;
yOffset = 50.0f;
shadowScale = 0.5f;
this->actor.world.rot.x = 0x4000;
break;
}
case ITEM00_NUTS:
if (CVar_GetS32("gNewDrops", 0) !=0) {
Actor_SetScale(&this->actor, 0.2f);
this->scale = 0.2f;
yOffset = 50.0f;
shadowScale = 0.5f;
this->actor.world.rot.x = 0x4000;
break;
}
case ITEM00_STICK:
if (CVar_GetS32("gNewDrops", 0) !=0) {
Actor_SetScale(&this->actor, 0.2f);
this->scale = 0.2f;
yOffset = 50.0f;
shadowScale = 0.5f;
this->actor.world.rot.x = 0x4000;
break;
}
case ITEM00_MAGIC_SMALL:
if (CVar_GetS32("gNewDrops", 0) !=0) {
Actor_SetScale(&this->actor, 0.2f);
this->scale = 0.2f;
yOffset = 50.0f;
shadowScale = 0.5f;
this->actor.world.rot.x = 0x4000;
break;
}
case ITEM00_SEEDS:
if (CVar_GetS32("gNewDrops", 0) !=0) {
Actor_SetScale(&this->actor, 0.2f);
this->scale = 0.2f;
yOffset = 50.0f;
shadowScale = 0.5f;
this->actor.world.rot.x = 0x4000;
break;
}
case ITEM00_BOMBS_SPECIAL:
if (CVar_GetS32("gNewDrops", 0) !=0) {
Actor_SetScale(&this->actor, 0.2f);
this->scale = 0.2f;
yOffset = 50.0f;
shadowScale = 0.5f;
this->actor.world.rot.x = 0x4000;
} else {
Actor_SetScale(&this->actor, 0.03f);
this->scale = 0.03f;
yOffset = 320.0f;
}
break;
case ITEM00_MAGIC_LARGE:
if (CVar_GetS32("gNewDrops", 0) !=0) {
Actor_SetScale(&this->actor, 0.2f);
this->scale = 0.2f;
yOffset = 50.0f;
shadowScale = 0.5f;
this->actor.world.rot.x = 0x4000;
} else {
Actor_SetScale(&this->actor, 0.045 - 1e-10);
this->scale = 0.045 - 1e-10;
yOffset = 320.0f;
}
break;
case ITEM00_RUPEE_ORANGE:
if (CVar_GetS32("gNewDrops", 0) !=0) {
Actor_SetScale(&this->actor, 0.45f);
this->scale = 0.45f;
yOffset = 50.0f;
shadowScale = 0.3f;
this->actor.world.rot.x = 0x4000;
} else { } else {
Actor_SetScale(&this->actor, 0.045 - 1e-10); yOffset = 400.0f;
this->scale = 0.045 - 1e-10; Actor_SetScale(&this->actor, 0.02f);
yOffset = 750.0f; this->scale = 0.02f;
}
break;
case ITEM00_ARROWS_SMALL:
if (CVar_GetS32("gNewDrops", 0) != 0) {
Actor_SetScale(&this->actor, 0.2f);
this->scale = 0.2f;
yOffset = 50.0f;
shadowScale = 0.5f;
this->actor.world.rot.x = 0x4000;
break;
}
case ITEM00_ARROWS_MEDIUM:
if (CVar_GetS32("gNewDrops", 0) != 0) {
Actor_SetScale(&this->actor, 0.2f);
this->scale = 0.2f;
yOffset = 50.0f;
shadowScale = 0.5f;
this->actor.world.rot.x = 0x4000;
break;
}
case ITEM00_ARROWS_LARGE:
if (CVar_GetS32("gNewDrops", 0) != 0) {
Actor_SetScale(&this->actor, 0.2f);
this->scale = 0.2f;
yOffset = 50.0f;
shadowScale = 0.5f;
this->actor.world.rot.x = 0x4000;
} else {
Actor_SetScale(&this->actor, 0.035f);
this->scale = 0.035f;
yOffset = 250.0f;
}
break;
case ITEM00_BOMBS_A:
if (CVar_GetS32("gNewDrops", 0) != 0) {
Actor_SetScale(&this->actor, 0.2f);
this->scale = 0.2f;
yOffset = 50.0f;
shadowScale = 0.5f;
this->actor.world.rot.x = 0x4000;
break;
}
case ITEM00_BOMBS_B:
if (CVar_GetS32("gNewDrops", 0) != 0) {
Actor_SetScale(&this->actor, 0.2f);
this->scale = 0.2f;
yOffset = 50.0f;
shadowScale = 0.5f;
this->actor.world.rot.x = 0x4000;
break;
}
case ITEM00_NUTS:
if (CVar_GetS32("gNewDrops", 0) != 0) {
Actor_SetScale(&this->actor, 0.2f);
this->scale = 0.2f;
yOffset = 50.0f;
shadowScale = 0.5f;
this->actor.world.rot.x = 0x4000;
break;
}
case ITEM00_STICK:
if (CVar_GetS32("gNewDrops", 0) != 0) {
Actor_SetScale(&this->actor, 0.2f);
this->scale = 0.2f;
yOffset = 50.0f;
shadowScale = 0.5f;
this->actor.world.rot.x = 0x4000;
break;
}
case ITEM00_MAGIC_SMALL:
if (CVar_GetS32("gNewDrops", 0) != 0) {
Actor_SetScale(&this->actor, 0.2f);
this->scale = 0.2f;
yOffset = 50.0f;
shadowScale = 0.5f;
this->actor.world.rot.x = 0x4000;
break;
}
case ITEM00_SEEDS:
if (CVar_GetS32("gNewDrops", 0) != 0) {
Actor_SetScale(&this->actor, 0.2f);
this->scale = 0.2f;
yOffset = 50.0f;
shadowScale = 0.5f;
this->actor.world.rot.x = 0x4000;
break;
}
case ITEM00_BOMBS_SPECIAL:
if (CVar_GetS32("gNewDrops", 0) != 0) {
Actor_SetScale(&this->actor, 0.2f);
this->scale = 0.2f;
yOffset = 50.0f;
shadowScale = 0.5f;
this->actor.world.rot.x = 0x4000;
} else {
Actor_SetScale(&this->actor, 0.03f);
this->scale = 0.03f;
yOffset = 320.0f;
}
break;
case ITEM00_MAGIC_LARGE:
if (CVar_GetS32("gNewDrops", 0) != 0) {
Actor_SetScale(&this->actor, 0.2f);
this->scale = 0.2f;
yOffset = 50.0f;
shadowScale = 0.5f;
this->actor.world.rot.x = 0x4000;
} else {
Actor_SetScale(&this->actor, 0.045 - 1e-10);
this->scale = 0.045 - 1e-10;
yOffset = 320.0f;
}
break;
case ITEM00_RUPEE_ORANGE:
if (CVar_GetS32("gNewDrops", 0) != 0) {
Actor_SetScale(&this->actor, 0.45f);
this->scale = 0.45f;
yOffset = 50.0f;
shadowScale = 0.3f;
this->actor.world.rot.x = 0x4000;
} else {
Actor_SetScale(&this->actor, 0.045 - 1e-10);
this->scale = 0.045 - 1e-10;
yOffset = 750.0f;
} }
break; break;
case ITEM00_RUPEE_PURPLE: case ITEM00_RUPEE_PURPLE:
if (CVar_GetS32("gNewDrops", 0) !=0) { if (CVar_GetS32("gNewDrops", 0) != 0) {
Actor_SetScale(&this->actor, 0.4f); Actor_SetScale(&this->actor, 0.4f);
this->scale = 0.4f; this->scale = 0.4f;
yOffset = 50.0f; yOffset = 50.0f;
shadowScale = 0.3f; shadowScale = 0.3f;
this->actor.world.rot.x = 0x4000; this->actor.world.rot.x = 0x4000;
} else { } else {
Actor_SetScale(&this->actor, 0.03f); Actor_SetScale(&this->actor, 0.03f);
this->scale = 0.03f; this->scale = 0.03f;
yOffset = 750.0f; yOffset = 750.0f;
} }
break; break;
case ITEM00_FLEXIBLE: case ITEM00_FLEXIBLE:
@ -691,8 +691,8 @@ void EnItem00_Init(Actor* thisx, GlobalContext* globalCtx) {
break; break;
} }
if ((getItemId != GI_NONE) && !Actor_HasParent(&this->actor, globalCtx)) { if ((gSaveContext.n64ddFlag || getItemId != GI_NONE) && !Actor_HasParent(&this->actor, globalCtx)) {
getItemId = GetRandomizedItemId(this->getItemId, this->actor.id, this->ogParams, globalCtx->sceneNum); getItemId = GetRandomizedItemId(getItemId, this->actor.id, this->ogParams, globalCtx->sceneNum);
func_8002F554(&this->actor, globalCtx, getItemId); func_8002F554(&this->actor, globalCtx, getItemId);
} }
@ -721,7 +721,8 @@ void func_8001DFC8(EnItem00* this, GlobalContext* globalCtx) {
} }
if ((this->actor.params <= ITEM00_RUPEE_RED) || ((this->actor.params == ITEM00_HEART) && (this->unk_15A < 0)) || if ((this->actor.params <= ITEM00_RUPEE_RED) || ((this->actor.params == ITEM00_HEART) && (this->unk_15A < 0)) ||
(this->actor.params == ITEM00_HEART_PIECE)) { (this->actor.params == ITEM00_HEART_PIECE) ||
(gSaveContext.n64ddFlag && this->actor.params == ITEM00_SMALL_KEY)) {
this->actor.shape.rot.y += 960; this->actor.shape.rot.y += 960;
} else { } else {
if ((this->actor.params >= ITEM00_SHIELD_DEKU) && (this->actor.params != ITEM00_BOMBS_SPECIAL)) { if ((this->actor.params >= ITEM00_SHIELD_DEKU) && (this->actor.params != ITEM00_BOMBS_SPECIAL)) {
@ -744,6 +745,10 @@ void func_8001DFC8(EnItem00* this, GlobalContext* globalCtx) {
this->actor.shape.yOffset = Math_SinS(this->actor.shape.rot.y) * 150.0f + 850.0f; this->actor.shape.yOffset = Math_SinS(this->actor.shape.rot.y) * 150.0f + 850.0f;
} }
if (gSaveContext.n64ddFlag && this->actor.params == ITEM00_SMALL_KEY) {
this->actor.shape.yOffset = 600.0f;
}
Math_SmoothStepToF(&this->actor.speedXZ, 0.0f, 1.0f, 0.5f, 0.0f); Math_SmoothStepToF(&this->actor.speedXZ, 0.0f, 1.0f, 0.5f, 0.0f);
if (this->unk_154 == 0) { if (this->unk_154 == 0) {
@ -1053,7 +1058,7 @@ void EnItem00_Update(Actor* thisx, GlobalContext* globalCtx) {
if ((getItemId != GI_NONE) && !Actor_HasParent(&this->actor, globalCtx)) { if ((getItemId != GI_NONE) && !Actor_HasParent(&this->actor, globalCtx)) {
if (gSaveContext.n64ddFlag) { if (gSaveContext.n64ddFlag) {
getItemId = GetRandomizedItemId(this->getItemId, this->actor.id, this->ogParams, globalCtx->sceneNum); getItemId = GetRandomizedItemId(getItemId, this->actor.id, this->ogParams, globalCtx->sceneNum);
} }
func_8002F554(&this->actor, globalCtx, getItemId); func_8002F554(&this->actor, globalCtx, getItemId);
} }
@ -1103,35 +1108,35 @@ void EnItem00_Update(Actor* thisx, GlobalContext* globalCtx) {
void EnItem00_Draw(Actor* thisx, GlobalContext* globalCtx) { void EnItem00_Draw(Actor* thisx, GlobalContext* globalCtx) {
EnItem00* this = (EnItem00*)thisx; EnItem00* this = (EnItem00*)thisx;
f32 mtxScale; f32 mtxScale;
if (!(this->unk_156 & this->unk_158)) { if (!(this->unk_156 & this->unk_158)) {
switch (this->actor.params) { switch (this->actor.params) {
case ITEM00_RUPEE_GREEN: case ITEM00_RUPEE_GREEN:
if (CVar_GetS32("gNewDrops", 0) !=0) { if (CVar_GetS32("gNewDrops", 0) != 0) {
GetItem_Draw(globalCtx, GID_RUPEE_GREEN); GetItem_Draw(globalCtx, GID_RUPEE_GREEN);
break; break;
} }
case ITEM00_RUPEE_BLUE: case ITEM00_RUPEE_BLUE:
if (CVar_GetS32("gNewDrops", 0) !=0) { if (CVar_GetS32("gNewDrops", 0) != 0) {
GetItem_Draw(globalCtx, GID_RUPEE_BLUE); GetItem_Draw(globalCtx, GID_RUPEE_BLUE);
break; break;
} }
case ITEM00_RUPEE_RED: case ITEM00_RUPEE_RED:
if (CVar_GetS32("gNewDrops", 0) !=0) { if (CVar_GetS32("gNewDrops", 0) != 0) {
GetItem_Draw(globalCtx, GID_RUPEE_RED); GetItem_Draw(globalCtx, GID_RUPEE_RED);
break; break;
} }
case ITEM00_RUPEE_ORANGE: case ITEM00_RUPEE_ORANGE:
if (CVar_GetS32("gNewDrops", 0) !=0) { if (CVar_GetS32("gNewDrops", 0) != 0) {
GetItem_Draw(globalCtx, GID_RUPEE_GOLD); GetItem_Draw(globalCtx, GID_RUPEE_GOLD);
break; break;
} }
case ITEM00_RUPEE_PURPLE: case ITEM00_RUPEE_PURPLE:
if (CVar_GetS32("gNewDrops", 0) !=0) { if (CVar_GetS32("gNewDrops", 0) != 0) {
GetItem_Draw(globalCtx, GID_RUPEE_PURPLE); GetItem_Draw(globalCtx, GID_RUPEE_PURPLE);
} else { } else {
EnItem00_DrawRupee(this, globalCtx); EnItem00_DrawRupee(this, globalCtx);
} }
break; break;
case ITEM00_HEART_PIECE: case ITEM00_HEART_PIECE:
EnItem00_DrawHeartPiece(this, globalCtx); EnItem00_DrawHeartPiece(this, globalCtx);
@ -1140,85 +1145,85 @@ void EnItem00_Draw(Actor* thisx, GlobalContext* globalCtx) {
EnItem00_DrawHeartContainer(this, globalCtx); EnItem00_DrawHeartContainer(this, globalCtx);
break; break;
case ITEM00_HEART: case ITEM00_HEART:
if (CVar_GetS32("gNewDrops", 0) !=0) { if (CVar_GetS32("gNewDrops", 0) != 0) {
GetItem_Draw(globalCtx, GID_HEART); GetItem_Draw(globalCtx, GID_HEART);
mtxScale = 16.0f; mtxScale = 16.0f;
Matrix_Scale(mtxScale, mtxScale, mtxScale, MTXMODE_APPLY); Matrix_Scale(mtxScale, mtxScale, mtxScale, MTXMODE_APPLY);
break; break;
} else { } else {
if (this->unk_15A < 0) { if (this->unk_15A < 0) {
if (this->unk_15A == -1) { if (this->unk_15A == -1) {
s8 bankIndex = Object_GetIndex(&globalCtx->objectCtx, OBJECT_GI_HEART); s8 bankIndex = Object_GetIndex(&globalCtx->objectCtx, OBJECT_GI_HEART);
if (Object_IsLoaded(&globalCtx->objectCtx, bankIndex)) { if (Object_IsLoaded(&globalCtx->objectCtx, bankIndex)) {
this->actor.objBankIndex = bankIndex; this->actor.objBankIndex = bankIndex;
Actor_SetObjectDependency(globalCtx, &this->actor); Actor_SetObjectDependency(globalCtx, &this->actor);
this->unk_15A = -2; this->unk_15A = -2;
} }
} else { } else {
mtxScale = 16.0f; mtxScale = 16.0f;
Matrix_Scale(mtxScale, mtxScale, mtxScale, MTXMODE_APPLY); Matrix_Scale(mtxScale, mtxScale, mtxScale, MTXMODE_APPLY);
GetItem_Draw(globalCtx, GID_HEART); GetItem_Draw(globalCtx, GID_HEART);
} }
break; break;
} }
} }
case ITEM00_BOMBS_A: case ITEM00_BOMBS_A:
if (CVar_GetS32("gNewDrops", 0) !=0) { if (CVar_GetS32("gNewDrops", 0) != 0) {
GetItem_Draw(globalCtx, GID_BOMB); GetItem_Draw(globalCtx, GID_BOMB);
break; break;
} }
case ITEM00_BOMBS_B: case ITEM00_BOMBS_B:
if (CVar_GetS32("gNewDrops", 0) !=0) { if (CVar_GetS32("gNewDrops", 0) != 0) {
GetItem_Draw(globalCtx, GID_BOMB); GetItem_Draw(globalCtx, GID_BOMB);
break; break;
} }
case ITEM00_BOMBS_SPECIAL: case ITEM00_BOMBS_SPECIAL:
case ITEM00_ARROWS_SINGLE: case ITEM00_ARROWS_SINGLE:
if (CVar_GetS32("gNewDrops", 0) !=0) { if (CVar_GetS32("gNewDrops", 0) != 0) {
GetItem_Draw(globalCtx, GID_ARROWS_SMALL); GetItem_Draw(globalCtx, GID_ARROWS_SMALL);
break; break;
} }
case ITEM00_ARROWS_SMALL: case ITEM00_ARROWS_SMALL:
if (CVar_GetS32("gNewDrops", 0) !=0) { if (CVar_GetS32("gNewDrops", 0) != 0) {
GetItem_Draw(globalCtx, GID_ARROWS_SMALL); GetItem_Draw(globalCtx, GID_ARROWS_SMALL);
break; break;
} }
case ITEM00_ARROWS_MEDIUM: case ITEM00_ARROWS_MEDIUM:
if (CVar_GetS32("gNewDrops", 0) !=0) { if (CVar_GetS32("gNewDrops", 0) != 0) {
GetItem_Draw(globalCtx, GID_ARROWS_MEDIUM); GetItem_Draw(globalCtx, GID_ARROWS_MEDIUM);
break; break;
} }
case ITEM00_ARROWS_LARGE: case ITEM00_ARROWS_LARGE:
if (CVar_GetS32("gNewDrops", 0) !=0) { if (CVar_GetS32("gNewDrops", 0) != 0) {
GetItem_Draw(globalCtx, GID_ARROWS_LARGE); GetItem_Draw(globalCtx, GID_ARROWS_LARGE);
break; break;
} }
case ITEM00_NUTS: case ITEM00_NUTS:
if (CVar_GetS32("gNewDrops", 0) !=0) { if (CVar_GetS32("gNewDrops", 0) != 0) {
GetItem_Draw(globalCtx, GID_NUTS); GetItem_Draw(globalCtx, GID_NUTS);
break; break;
} }
case ITEM00_STICK: case ITEM00_STICK:
if (CVar_GetS32("gNewDrops", 0) !=0) { if (CVar_GetS32("gNewDrops", 0) != 0) {
GetItem_Draw(globalCtx, GID_STICK); GetItem_Draw(globalCtx, GID_STICK);
break; break;
} }
case ITEM00_MAGIC_LARGE: case ITEM00_MAGIC_LARGE:
if (CVar_GetS32("gNewDrops", 0) !=0) { if (CVar_GetS32("gNewDrops", 0) != 0) {
GetItem_Draw(globalCtx, GID_MAGIC_LARGE); GetItem_Draw(globalCtx, GID_MAGIC_LARGE);
break; break;
} }
case ITEM00_MAGIC_SMALL: case ITEM00_MAGIC_SMALL:
if (CVar_GetS32("gNewDrops", 0) !=0) { if (CVar_GetS32("gNewDrops", 0) != 0) {
GetItem_Draw(globalCtx, GID_MAGIC_SMALL); GetItem_Draw(globalCtx, GID_MAGIC_SMALL);
break; break;
} }
case ITEM00_SEEDS: case ITEM00_SEEDS:
if (CVar_GetS32("gNewDrops", 0) !=0) { if (CVar_GetS32("gNewDrops", 0) != 0) {
GetItem_Draw(globalCtx, GID_SEEDS); GetItem_Draw(globalCtx, GID_SEEDS);
break; break;
} }
case ITEM00_SMALL_KEY: case ITEM00_SMALL_KEY:
EnItem00_DrawCollectible(this, globalCtx); EnItem00_DrawCollectible(this, globalCtx);
break; break;
@ -1272,27 +1277,34 @@ void EnItem00_DrawRupee(EnItem00* this, GlobalContext* globalCtx) {
* Draw Function used for most collectible types of En_Item00 (ammo, bombs, sticks, nuts, magic...). * Draw Function used for most collectible types of En_Item00 (ammo, bombs, sticks, nuts, magic...).
*/ */
void EnItem00_DrawCollectible(EnItem00* this, GlobalContext* globalCtx) { void EnItem00_DrawCollectible(EnItem00* this, GlobalContext* globalCtx) {
s32 texIndex = this->actor.params - 3; if ((gSaveContext.n64ddFlag && this->getItemId != GI_NONE) || this->actor.params == ITEM00_SMALL_KEY) {
f32 mtxScale = 16.0f;
Matrix_Scale(mtxScale, mtxScale, mtxScale, MTXMODE_APPLY);
GetItem_Draw(globalCtx, GetItemModelFromId(GetRandomizedItemId(this->getItemId, this->actor.id, this->ogParams,
globalCtx->sceneNum)));
} else {
s32 texIndex = this->actor.params - 3;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_item00.c", 1594); OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_item00.c", 1594);
POLY_OPA_DISP = Gameplay_SetFog(globalCtx, POLY_OPA_DISP); POLY_OPA_DISP = Gameplay_SetFog(globalCtx, POLY_OPA_DISP);
if (this->actor.params == ITEM00_BOMBS_SPECIAL) { if (this->actor.params == ITEM00_BOMBS_SPECIAL) {
texIndex = 1; texIndex = 1;
} else if (this->actor.params >= ITEM00_ARROWS_SMALL) { } else if (this->actor.params >= ITEM00_ARROWS_SMALL) {
texIndex -= 3; texIndex -= 3;
}
POLY_OPA_DISP = func_800946E4(POLY_OPA_DISP);
gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sItemDropTex[texIndex]));
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_item00.c", 1607),
G_MTX_MODELVIEW | G_MTX_LOAD);
gSPDisplayList(POLY_OPA_DISP++, gItemDropDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_item00.c", 1611);
} }
POLY_OPA_DISP = func_800946E4(POLY_OPA_DISP);
gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sItemDropTex[texIndex]));
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_item00.c", 1607),
G_MTX_MODELVIEW | G_MTX_LOAD);
gSPDisplayList(POLY_OPA_DISP++, gItemDropDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_item00.c", 1611);
} }
/** /**