falso
/
mm
mirror of https://github.com/zeldaret/mm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename to SetupRiseThroughFloor

This commit is contained in:
JordanLongstaff 2025-12-11 09:32:36 -05:00
parent bc889e13f7
commit 2cf0e1574b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/overlays/actors/ovl_En_Maruta/z_en_maruta.c
View File

@ -17,7 +17,7 @@ void EnMaruta_Draw(Actor* thisx, PlayState* play);
void EnMaruta_SetInPositionWhole(EnMaruta* this);
void EnMaruta_SittingWhole(EnMaruta* this, PlayState* play);
void EnMaruta_StartUnderFloor(EnMaruta* this);
void EnMaruta_SetupRiseThroughFloor(EnMaruta* this);
void EnMaruta_RiseThroughFloor(EnMaruta* this, PlayState* play);
void EnMaruta_StartRetracting(EnMaruta* this);
void EnMaruta_RetractWhole(EnMaruta* this, PlayState* play);
@ -276,7 +276,7 @@ void EnMaruta_Init(Actor* thisx, PlayState* play) {
if (ENMARUTA_GET_TYPE(&this->actor) == ENMARUTA_INIT_ON_FLOOR) {
EnMaruta_SetInPositionWhole(this);
} else {
EnMaruta_StartUnderFloor(this);
EnMaruta_SetupRiseThroughFloor(this);
}
} else {
EnMaruta_SetupRecoilAfterCut(this, play);
@ -315,7 +315,7 @@ void EnMaruta_SittingWhole(EnMaruta* this, PlayState* play) {
}
}
void EnMaruta_StartUnderFloor(EnMaruta* this) {
void EnMaruta_SetupRiseThroughFloor(EnMaruta* this) {
this->actor.world.pos.y = this->actor.home.pos.y - 630.0f;
this->actionFunc = EnMaruta_RiseThroughFloor;
}

2
tools/disasm/n64-us/functions.txt
View File

@ -13531,7 +13531,7 @@ EnMaruta_Init = 0x80B37080; // type:func
EnMaruta_Destroy = 0x80B37280; // type:func
EnMaruta_SetInPositionWhole = 0x80B372B8; // type:func
EnMaruta_SittingWhole = 0x80B372CC; // type:func
EnMaruta_StartUnderFloor = 0x80B37364; // type:func
EnMaruta_SetupRiseThroughFloor = 0x80B37364; // type:func
EnMaruta_RiseThroughFloor = 0x80B3738C; // type:func
EnMaruta_StartRetracting = 0x80B373F4; // type:func
EnMaruta_RetractWhole = 0x80B37428; // type:func