mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright synced 2026-08-20 06:26:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3945 from HarbourMasters/develop-macready

Browse Source 
macready -> develop
This commit is contained in:
Garrett Cox
2024-02-15 21:21:18 -06:00
committed by GitHub
parent e0d502b696 30a063b75d
commit 10b6f8cf80
9 changed files with 74 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
soh/src/overlays/actors/ovl_En_Si/z_en_si.c
+7 -1
View File
@@ -16,6 +16,7 @@ void EnSi_Init(Actor* thisx, PlayState* play);
void EnSi_Destroy(Actor* thisx, PlayState* play);
void EnSi_Update(Actor* thisx, PlayState* play);
void EnSi_Draw(Actor* thisx, PlayState* play);
void EnSi_Reset();
s32 func_80AFB748(EnSi* this, PlayState* play);
void func_80AFB768(EnSi* this, PlayState* play);
@@ -61,7 +62,7 @@ const ActorInit En_Si_InitVars = {
(ActorFunc)EnSi_Destroy,
(ActorFunc)EnSi_Update,
(ActorFunc)EnSi_Draw,
NULL,
(ActorResetFunc)EnSi_Reset,
};
void EnSi_Init(Actor* thisx, PlayState* play) {
@@ -224,6 +225,11 @@ void EnSi_Draw(Actor* thisx, PlayState* play) {
}
}
void EnSi_Reset() {
textId = 0xB4;
giveItemId = ITEM_SKULL_TOKEN;
}
void Randomizer_UpdateSkullReward(EnSi* this, PlayState* play) {
Player* player = GET_PLAYER(play);