mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-11-24 18:32:19 -05:00
Code Issues Projects Releases Wiki Activity

Adds reset function to z_en_si (GS Token) to set getItemId to vanilla after resetting SoH. (#3925)

Browse Source
This commit is contained in:
Malkierian 2024-02-15 18:53:18 -07:00 committed by GitHub
parent 43fed2d77e
commit 0cb4cd158a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,6 +16,7 @@ void EnSi_Init(Actor* thisx, PlayState* play);
void EnSi_Destroy(Actor* thisx, PlayState* play); void EnSi_Destroy(Actor* thisx, PlayState* play);
void EnSi_Update(Actor* thisx, PlayState* play); void EnSi_Update(Actor* thisx, PlayState* play);
void EnSi_Draw(Actor* thisx, PlayState* play); void EnSi_Draw(Actor* thisx, PlayState* play);
void EnSi_Reset();
s32 func_80AFB748(EnSi* this, PlayState* play); s32 func_80AFB748(EnSi* this, PlayState* play);
void func_80AFB768(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_Destroy,
(ActorFunc)EnSi_Update, (ActorFunc)EnSi_Update,
(ActorFunc)EnSi_Draw, (ActorFunc)EnSi_Draw,
NULL, (ActorResetFunc)EnSi_Reset,
}; };
void EnSi_Init(Actor* thisx, PlayState* play) { 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) { void Randomizer_UpdateSkullReward(EnSi* this, PlayState* play) {
Player* player = GET_PLAYER(play); Player* player = GET_PLAYER(play);