mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-08-13 17:03:47 -04:00
Code Issues Projects Releases Wiki Activity

Wraps up a few missed type changes.

Browse Source
This commit is contained in:
Christopher Leggett 2022-08-14 11:54:43 -04:00
parent 0604dbfef8
commit 6d7498829d
No known key found for this signature in database
GPG Key ID: 7093AE5FF7037D79
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
soh/src/code/code_800EC960.c
View File

@ -1246,7 +1246,7 @@ void Audio_StepFreqLerp(FreqLerp* lerp);
void func_800F56A8(void);
void Audio_PlayNatureAmbienceSequence(u8 natureAmbienceId);
s32 Audio_SetGanonDistVol(u8 targetVol);
void Audio_PlayFanfare_Rando(ItemID getItemId);
void Audio_PlayFanfare_Rando(GetItemEntry getItem);
// Function originally not called, so repurposing for DPad input
void func_800EC960(u8 dpad) {

11
soh/src/overlays/actors/ovl_En_Si/z_en_si.c
View File

@ -21,6 +21,7 @@ void func_80AFB950(EnSi* this, GlobalContext* globalCtx);
s32 textId = 0xB4;
s32 giveItemId = ITEM_SKULL_TOKEN;
s32 getItemId;
GetItemEntry getItem;
static ColliderCylinderInit sCylinderInit = {
{
@ -98,7 +99,7 @@ void func_80AFB768(EnSi* this, GlobalContext* globalCtx) {
if (this->collider.base.ocFlags2 & OC2_HIT_PLAYER) {
this->collider.base.ocFlags2 &= ~OC2_HIT_PLAYER;
if (gSaveContext.n64ddFlag) {
GetItemEntry getItem = Randomizer_GetRandomizedItem(GI_SKULL_TOKEN, this->actor.id, this->actor.params, globalCtx->sceneNum);
getItem = Randomizer_GetRandomizedItem(GI_SKULL_TOKEN, this->actor.id, this->actor.params, globalCtx->sceneNum);
getItemId = getItem.getItemId;
if (getItem.getItemId == RG_ICE_TRAP) {
player->pendingIceTrap = true;
@ -123,7 +124,7 @@ void func_80AFB768(EnSi* this, GlobalContext* globalCtx) {
Message_StartTextbox(globalCtx, textId, NULL);
if (gSaveContext.n64ddFlag) {
Audio_PlayFanfare_Rando(getItemId);
Audio_PlayFanfare_Rando(getItem);
} else {
Audio_PlayFanfare(NA_BGM_SMALL_ITEM_GET);
}
@ -146,7 +147,7 @@ void func_80AFB89C(EnSi* this, GlobalContext* globalCtx) {
if (!CHECK_FLAG_ALL(this->actor.flags, ACTOR_FLAG_13)) {
if (gSaveContext.n64ddFlag) {
GetItemEntry getItem = Randomizer_GetRandomizedItem(GI_SKULL_TOKEN, this->actor.id, this->actor.params, globalCtx->sceneNum);
getItem = Randomizer_GetRandomizedItem(GI_SKULL_TOKEN, this->actor.id, this->actor.params, globalCtx->sceneNum);
getItemId = getItem.getItemId;
if (getItemId == RG_ICE_TRAP) {
player->pendingIceTrap = true;
@ -167,7 +168,7 @@ void func_80AFB89C(EnSi* this, GlobalContext* globalCtx) {
}
Message_StartTextbox(globalCtx, textId, NULL);
if (gSaveContext.n64ddFlag) {
Audio_PlayFanfare_Rando(getItemId);
Audio_PlayFanfare_Rando(getItem);
} else {
Audio_PlayFanfare(NA_BGM_SMALL_ITEM_GET);
}
@ -205,7 +206,7 @@ void EnSi_Draw(Actor* thisx, GlobalContext* globalCtx) {
if (!gSaveContext.n64ddFlag) {
GetItem_Draw(globalCtx, GID_SKULL_TOKEN_2);
} else {
GetItemEntry getItem = Randomizer_GetRandomizedItem(GI_SKULL_TOKEN, this->actor.id, this->actor.params, globalCtx->sceneNum);
getItem = Randomizer_GetRandomizedItem(GI_SKULL_TOKEN, this->actor.id, this->actor.params, globalCtx->sceneNum);
EnItem00_CustomItemsParticles(&this->actor, globalCtx, getItem);
if (getItem.itemId != ITEM_SKULL_TOKEN) {
f32 mtxScale = 1.5f;

4
soh/src/overlays/actors/ovl_player_actor/z_player.c
View File

@ -12581,7 +12581,7 @@ s32 func_8084DFF4(GlobalContext* globalCtx, Player* this) {
// Use this if we do have a getItemEntry
if (giEntry.modIndex == MOD_NONE) {
if (gSaveContext.n64ddFlag) {
Audio_PlayFanfare_Rando(this->getItemId);
Audio_PlayFanfare_Rando(giEntry);
} else if (((giEntry.itemId >= ITEM_RUPEE_GREEN) && (giEntry.itemId <= ITEM_RUPEE_RED)) ||
((giEntry.itemId >= ITEM_RUPEE_PURPLE) && (giEntry.itemId <= ITEM_RUPEE_GOLD)) ||
(giEntry.itemId == ITEM_HEART)) {
@ -12599,7 +12599,7 @@ s32 func_8084DFF4(GlobalContext* globalCtx, Player* this) {
}
} else if (giEntry.modIndex == MOD_RANDOMIZER) {
if (gSaveContext.n64ddFlag) {
Audio_PlayFanfare_Rando(this->getItemId);
Audio_PlayFanfare_Rando(giEntry);
} else if (giEntry.itemId == RG_DOUBLE_DEFENSE || giEntry.itemId == RG_MAGIC_SINGLE ||
giEntry.itemId == RG_MAGIC_DOUBLE) {
Audio_PlayFanfare(NA_BGM_HEART_GET | 0x900);