mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright synced 2026-08-15 05:10:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

vb lh sun (#106)

Browse Source 
* underwater working pre func_80B858B4 replacement

* underwater item update handled by hookhandlers

* vb lh sun

* remove unused should
This commit is contained in:
briaguya
2024-04-09 23:57:07 -04:00
committed by GitHub
parent fe231147d5
commit bbbd2520b1
3 changed files with 47 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
soh/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c
+1 -13
View File
@@ -120,24 +120,13 @@ void func_80B857D0(ItemEtcetera* this, PlayState* play) {
void func_80B85824(ItemEtcetera* this, PlayState* play) {
if (Actor_HasParent(&this->actor, play)) {
if ((this->actor.params & 0xFF) == 7) {
if (IS_RANDO) {
Flags_SetTreasure(play, 0x1F);
}
}
if ((this->actor.params & 0xFF) == 1) {
Flags_SetEventChkInf(EVENTCHKINF_OBTAINED_RUTOS_LETTER);
Flags_SetSwitch(play, 0xB);
}
Actor_Kill(&this->actor);
} else {
if (!IS_RANDO) {
Actor_OfferGetItem(&this->actor, play, this->getItemId, 30.0f, 50.0f);
} else {
GetItemEntry getItemEntry = Randomizer_GetItemFromKnownCheck(RC_LH_SUN, GI_ARROW_FIRE);
GiveItemEntryFromActor(&this->actor, play, getItemEntry, 30.0f, 50.0f);
}
Actor_OfferGetItem(&this->actor, play, this->getItemId, 30.0f, 50.0f);
}
}
@@ -233,7 +222,6 @@ void ItemEtcetera_DrawThroughLens(Actor* thisx, PlayState* play) {
void ItemEtcetera_Draw(Actor* thisx, PlayState* play) {
ItemEtcetera* this = (ItemEtcetera*)thisx;
s32 type = this->actor.params & 0xFF;
func_8002EBCC(&this->actor, play, 0);
func_8002ED80(&this->actor, play, 0);
soh/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.h
+2
View File
@@ -38,4 +38,6 @@ typedef enum {
/* 0x0D */ ITEM_ETC_KEY_SMALL_CHEST_GAME
} ItemEtceteraType;
void ItemEtcetera_SpawnSparkles(ItemEtcetera* ItemEtcetera, PlayState* play);
#endif