mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-02-27 19:44:40 +00:00
Code Issues Projects Releases Wiki Activity

name Hot Rodder consistently

Browse source 
https://github.com/zeldaret/oot/pull/2295#discussion_r1841188972
This commit is contained in:
feacur 2024-11-14 00:02:44 +01:00
parent 011cf6a5d1
commit 46648b4ab7
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/overlays/actors/ovl_En_Go2/z_en_go2.c
View file

@ -46,7 +46,7 @@ void EnGo2_CurledUp(EnGo2* this, PlayState* play);
void EnGo2_Standing(EnGo2* this, PlayState* play); void EnGo2_Standing(EnGo2* this, PlayState* play);
void EnGo2_GoronDmtBombFlower(EnGo2* this, PlayState* play); void EnGo2_GoronDmtBombFlower(EnGo2* this, PlayState* play);
void EnGo2_GoronRollingBig(EnGo2* this, PlayState* play); void EnGo2_GoronHotRodder(EnGo2* this, PlayState* play);
void EnGo2_RollingStart(EnGo2* this, PlayState* play); void EnGo2_RollingStart(EnGo2* this, PlayState* play);
void EnGo2_RollingSlow(EnGo2* this, PlayState* play); void EnGo2_RollingSlow(EnGo2* this, PlayState* play);
void EnGo2_GroundRolling(EnGo2* this, PlayState* play); void EnGo2_GroundRolling(EnGo2* this, PlayState* play);
@ -340,7 +340,7 @@ u16 EnGo2_GoronFireGenericGetTextId(EnGo2* this) {
} }
} }
u16 EnGo2_GetTextIdGoronCityRollingBig(PlayState* play, EnGo2* this) { u16 EnGo2_GetTextIdGoronCityHotRodder(PlayState* play, EnGo2* this) {
if (GET_INFTABLE(INFTABLE_11E)) { if (GET_INFTABLE(INFTABLE_11E)) {
return 0x3013; return 0x3013;
} else if (CUR_CAPACITY(UPG_BOMB_BAG) >= 20 && this->waypoint > 7 && this->waypoint < 12) { } else if (CUR_CAPACITY(UPG_BOMB_BAG) >= 20 && this->waypoint > 7 && this->waypoint < 12) {
@ -350,7 +350,7 @@ u16 EnGo2_GetTextIdGoronCityRollingBig(PlayState* play, EnGo2* this) {
} }
} }
s16 EnGo2_UpdateTalkStateGoronCityRollingBig(PlayState* play, EnGo2* this) { s16 EnGo2_UpdateTalkStateGoronCityHotRodder(PlayState* play, EnGo2* this) {
s32 bombBagUpgrade; s32 bombBagUpgrade;
switch (Message_GetState(&play->msgCtx)) { switch (Message_GetState(&play->msgCtx)) {
@ -769,7 +769,7 @@ u16 EnGo2_GetTextId(PlayState* play, Actor* thisx) {
} else { } else {
switch (ENGO2_GET_TYPE(this)) { switch (ENGO2_GET_TYPE(this)) {
case GORON_CITY_HOT_RODDER: case GORON_CITY_HOT_RODDER:
return EnGo2_GetTextIdGoronCityRollingBig(play, this); return EnGo2_GetTextIdGoronCityHotRodder(play, this);
case GORON_CITY_LINK: case GORON_CITY_LINK:
return EnGo2_GetTextIdGoronCityLink(play, this); return EnGo2_GetTextIdGoronCityLink(play, this);
case GORON_DMT_BIGGORON: case GORON_DMT_BIGGORON:
@ -807,7 +807,7 @@ s16 EnGo2_UpdateTalkState(PlayState* play, Actor* thisx) {
EnGo2* this = (EnGo2*)thisx; EnGo2* this = (EnGo2*)thisx;
switch (ENGO2_GET_TYPE(this)) { switch (ENGO2_GET_TYPE(this)) {
case GORON_CITY_HOT_RODDER: case GORON_CITY_HOT_RODDER:
return EnGo2_UpdateTalkStateGoronCityRollingBig(play, this); return EnGo2_UpdateTalkStateGoronCityHotRodder(play, this);
case GORON_CITY_LINK: case GORON_CITY_LINK:
return EnGo2_UpdateTalkStateGoronCityLink(play, this); return EnGo2_UpdateTalkStateGoronCityLink(play, this);
case GORON_DMT_BIGGORON: case GORON_DMT_BIGGORON:
@ -1452,13 +1452,13 @@ s32 EnGo2_IsGoronDmtBombFlower(EnGo2* this) {
return true; return true;
} }
s32 EnGo2_IsGoronRollingBig(EnGo2* this, PlayState* play) { s32 EnGo2_IsGoronHotRodder(EnGo2* this, PlayState* play) {
if (ENGO2_GET_TYPE(this) != GORON_CITY_HOT_RODDER || (this->interactInfo.talkState != NPC_TALK_STATE_ACTION)) { if (ENGO2_GET_TYPE(this) != GORON_CITY_HOT_RODDER || (this->interactInfo.talkState != NPC_TALK_STATE_ACTION)) {
return false; return false;
} }
this->interactInfo.talkState = NPC_TALK_STATE_IDLE; this->interactInfo.talkState = NPC_TALK_STATE_IDLE;
EnGo2_AnimateRolling(this, play); EnGo2_AnimateRolling(this, play);
this->actionFunc = EnGo2_GoronRollingBig; this->actionFunc = EnGo2_GoronHotRodder;
return true; return true;
} }
@ -1715,7 +1715,7 @@ void EnGo2_Standing(EnGo2* this, PlayState* play) {
EnGo2_AnimateGoronLinkAndDoSfx(this, play); EnGo2_AnimateGoronLinkAndDoSfx(this, play);
EnGo2_SetupUncurledFlags(this); EnGo2_SetupUncurledFlags(this);
if (!EnGo2_IsGoronRollingBig(this, play) && !EnGo2_IsGoronFireGeneric(this)) { if (!EnGo2_IsGoronHotRodder(this, play) && !EnGo2_IsGoronFireGeneric(this)) {
if (EnGo2_IsGoronDmtBombFlower(this)) { if (EnGo2_IsGoronDmtBombFlower(this)) {
return; return;
} }
@ -1751,7 +1751,7 @@ void EnGo2_GoronDmtBombFlower(EnGo2* this, PlayState* play) {
} }
} }
void EnGo2_GoronRollingBig(EnGo2* this, PlayState* play) { void EnGo2_GoronHotRodder(EnGo2* this, PlayState* play) {
if (Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) { if (Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) {
EnGo2_SpawnDust(this, 1); EnGo2_SpawnDust(this, 1);
this->skelAnime.playSpeed = 0.0f; this->skelAnime.playSpeed = 0.0f;
@ -1868,7 +1868,7 @@ void EnGo2_HandleOfferParented(EnGo2* this, PlayState* play) {
case GI_BOMB_BAG_30: case GI_BOMB_BAG_30:
case GI_BOMB_BAG_40: case GI_BOMB_BAG_40:
EnGo2_AnimateRolling(this, play); EnGo2_AnimateRolling(this, play);
this->actionFunc = EnGo2_GoronRollingBig; this->actionFunc = EnGo2_GoronHotRodder;
return; return;
} }
this->actionFunc = EnGo2_Standing; this->actionFunc = EnGo2_Standing;