mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright synced 2026-08-16 13:37:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

insert witty commit message here

Browse Source
This commit is contained in:
Ralphie Morell
2023-10-18 01:30:49 -04:00
parent 8357c2aa1b
commit 582771ab48
25 changed files with 413 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
soh/src/code/z_parameter.c
+7
View File
@@ -2543,6 +2543,13 @@ u16 Randomizer_Item_Give(PlayState* play, GetItemEntry giEntry) {
return Return_Item_Entry(giEntry, RG_NONE);
}
if (item >= RG_GOHMA_SOUL && item <= RG_GANON_SOUL) {
u8 index = item - RG_GOHMA_SOUL;
Flags_SetRandomizerInf(RAND_INF_GOHMA_SOUL + index);
return Return_Item_Entry(giEntry, RG_NONE);
}
if (item == RG_PROGRESSIVE_BOMBCHUS) {
if (INV_CONTENT(ITEM_BOMBCHU) == ITEM_NONE) {
INV_CONTENT(ITEM_BOMBCHU) = ITEM_BOMBCHU;
soh/src/overlays/actors/ovl_Boss_Va/z_boss_va.c
+4
View File
@@ -652,6 +652,9 @@ void BossVa_Init(Actor* thisx, PlayState* play2) {
this->actor.colChkInfo.damageTable = sDamageTable;
sPhase2Timer = 0xFFFF;
if (Flags_GetEventChkInf(EVENTCHKINF_BEGAN_BARINA_BATTLE)) {
if (Randomizer_GetSettingValue(RSK_SHUFFLE_BOSS_SOULS) && !Flags_GetRandomizerInf(RAND_INF_BARINADE_SOUL)) {
sCsState = BOSSVA_BATTLE;
} else {
sCsState = INTRO_CALL_BARI;
sDoorState = 100;
func_8002DF54(play, &this->actor, 1);
@@ -682,6 +685,7 @@ void BossVa_Init(Actor* thisx, PlayState* play2) {
}
sCameraAtMaxVel = sCameraEyeMaxVel = sZeroVec;
}
} else {
sCsState = INTRO_START;