Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Fix] GS Token giveItemId bleed between rando and vanilla saves #3925

Merged
merged 1 commit into from
Feb 16, 2024
Merged

[Fix] GS Token giveItemId bleed between rando and vanilla saves #3925

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion soh/src/overlays/actors/ovl_En_Si/z_en_si.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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);

Expand Down
Loading