diff options
| author | balloondude2 <55861555+balloondude2@users.noreply.github.com> | 2026-03-19 19:40:46 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-03-19 21:40:46 -0400 |
| commit | 8b9615ca51e4cd2fa45c2b54b04227fcc6d67817 (patch) | |
| tree | 36be8d56cd1163cc08ad2af39e93e10ebc2f2d33 | |
| parent | acfd617302ebb74e63f26f0049b53400a644c8e8 (diff) | |
reset rail skb (#1602)
| -rw-r--r-- | mm/src/overlays/actors/ovl_En_Rail_Skb/z_en_rail_skb.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/mm/src/overlays/actors/ovl_En_Rail_Skb/z_en_rail_skb.c b/mm/src/overlays/actors/ovl_En_Rail_Skb/z_en_rail_skb.c index f8e054df1..366088985 100644 --- a/mm/src/overlays/actors/ovl_En_Rail_Skb/z_en_rail_skb.c +++ b/mm/src/overlays/actors/ovl_En_Rail_Skb/z_en_rail_skb.c @@ -14,6 +14,7 @@ void EnRailSkb_Init(Actor* thisx, PlayState* play); void EnRailSkb_Destroy(Actor* thisx, PlayState* play); void EnRailSkb_Update(Actor* thisx, PlayState* play); void EnRailSkb_Draw(Actor* thisx, PlayState* play); +void EnRailSkb_Reset(void); void func_80B70FA0(EnRailSkb* this); void func_80B70FF8(EnRailSkb* this, PlayState* play); @@ -58,6 +59,7 @@ ActorProfile En_Rail_Skb_Profile = { /**/ EnRailSkb_Destroy, /**/ EnRailSkb_Update, /**/ EnRailSkb_Draw, + /**/ EnRailSkb_Reset, }; typedef enum EnRailSkbAnimation { @@ -169,8 +171,10 @@ static DamageTable sDamageTable = { /* Powder Keg */ DMG_ENTRY(1, 0xF), }; +// 2S2H [Port] Moved this variable out of func_80B708C0 so reset function can access +static s32 D_80B7348C = 0; + void func_80B708C0(EnRailSkb* this, PlayState* play) { - static s32 D_80B7348C = 0; Path* path = &play->setupPathList[ENRAILSKB_GET_PATH_INDEX(&this->actor)]; Vec3f sp70; s32 phi_a3; @@ -1182,3 +1186,7 @@ void EnRailSkb_Draw(Actor* thisx, PlayState* play) { this->unk_402 |= 0x80; } } + +void EnRailSkb_Reset(void) { + D_80B7348C = 0; +} |