izzy/2ship2harkinian-Android
0
0
Fork 0
mirror of https://github.com/izzy2lost/2ship2harkinian-Android.git synced 2026-06-19 01:20:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

reset milk bar door and race dog selected (#269)

Browse Source
This commit is contained in:
Archez
2024-05-22 09:05:03 -05:00
committed by Garrett Cox
parent 0004a8c896
commit 1b9e49b52d
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mm/src/overlays/actors/ovl_En_Dg/z_en_dg.c
+1
View File
@@ -1443,4 +1443,5 @@ void EnDg_Draw(Actor* thisx, PlayState* play) {
void EnDg_Reset(void) {
sIsAnyDogHeld = false;
sBremenMaskFollowerIndex = ENDG_INDEX_NO_BREMEN_MASK_FOLLOWER;
sSelectedRacetrackDogInfo.index = -1;
}
mm/src/overlays/actors/ovl_En_Door/z_en_door.c
+9 -1
View File
@@ -27,6 +27,7 @@ void EnDoor_Init(Actor* thisx, PlayState* play2);
void EnDoor_Destroy(Actor* thisx, PlayState* play);
void EnDoor_Update(Actor* thisx, PlayState* play);
void EnDoor_Draw(Actor* thisx, PlayState* play);
void EnDoor_Reset(void);
void func_80866B20(EnDoor*, PlayState*);
void func_8086704C(EnDoor*, PlayState*);
@@ -286,6 +287,7 @@ ActorInit En_Door_InitVars = {
/**/ EnDoor_Destroy,
/**/ EnDoor_Update,
/**/ EnDoor_Draw,
/**/ EnDoor_Reset,
};
typedef struct {
@@ -497,8 +499,10 @@ void func_80866A5C(EnDoor* this, PlayState* play) {
}
}
// 2S2H [Port] Moved static vars out of function scope so they can be cleared in actor reset
static s32 D_80867BC0;
void func_80866B20(EnDoor* this, PlayState* play) {
static s32 D_80867BC0;
Player* player = GET_PLAYER(play);
if (Actor_ProcessTalkRequest(&this->knobDoor.dyna.actor, &play->state) &&
@@ -713,3 +717,7 @@ void EnDoor_Draw(Actor* thisx, PlayState* play) {
CLOSE_DISPS(play->state.gfxCtx);
}
}
void EnDoor_Reset(void) {
D_80867BC0 = false;
}