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

Use PlayerControlMode in a few places

This commit is contained in:
Tal Hayon 2022-01-29 15:54:09 +02:00
parent fd9049f598
commit 1f2a791e49
9 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/enemy/gleerok.c
View File

@ -313,7 +313,7 @@ NONMATCH("asm/non_matching/gleerok/sub_0802D3B8.inc", void sub_0802D3B8(GleerokE
heap->filler[0x35] = 0;
}
#ifndef EU
gPlayerState.controlMode = 3;
gPlayerState.controlMode = CONTROL_DISABLED;
#endif
InitializeAnimation(super, 0x4c);
break;
@ -462,7 +462,7 @@ void sub_0802D7B4(GleerokEntity* this) {
this->unk_84->ent2->actionDelay = 0x18;
gRoomControls.camera_target = &gPlayerEntity;
#ifndef EU
gPlayerState.controlMode = 1;
gPlayerState.controlMode = CONTROL_1;
#endif
gUnk_02034490[0] = 0;
SoundReq(BGM_BOSS_THEME);

2
src/enemy/mazaalHead.c
View File

@ -224,7 +224,7 @@ void sub_08033FFC(Entity* this) {
if (((*(Entity**)&this->field_0x74)->flags & 0x80) != 0) {
gRoomControls.camera_target = &gPlayerEntity;
sub_08034420(this);
gPlayerState.controlMode = 1;
gPlayerState.controlMode = CONTROL_1;
ResetPlayerAnimationAndAction();
SoundReq(BGM_BOSS_THEME);
}

2
src/enemy/vaatiWrath.c
View File

@ -218,7 +218,7 @@ void VaatiWrathType0Action1(Entity* this) {
this->actionDelay = 0x1e;
gRoomTransition.field_0x38 |= 1;
gRoomControls.camera_target = &gPlayerEntity;
gPlayerState.controlMode = 1;
gPlayerState.controlMode = CONTROL_1;
break;
default:
sub_08042004(this);

2
src/manager/manager39.c
View File

@ -57,7 +57,7 @@ void sub_0805E18C(Manager39* this) {
if (this->manager.unk_0b) {
if (!--this->manager.unk_0f) {
this->manager.unk_0b = 0;
gPlayerState.controlMode = 1;
gPlayerState.controlMode = CONTROL_1;
ResetSystemPriority();
}
}

2
src/manager/managerA.c
View File

@ -135,7 +135,7 @@ static void sub_08058514(ManagerA* this) {
case 3:
/* wait for player to finish talking */
if (gPlayerEntity.action == PLAYER_NORMAL || gPlayerEntity.action == PLAYER_MINISH) {
gPlayerState.controlMode = 1;
gPlayerState.controlMode = CONTROL_1;
ResetPlayerEventPriority();
SetFlag(this->flag1);
DeleteThisEntity();

6
src/npcUtils.c
View File

@ -309,7 +309,7 @@ void sub_0806F118(Entity* ent) {
u32 idx = sub_08002632(ent);
NPCData* data = gUnk_08001A7C[idx];
sub_0801DFB4(ent, data->_0, data->_2, data->_4);
gPlayerState.controlMode = 3;
gPlayerState.controlMode = CONTROL_DISABLED;
}
u32 UpdateFuseInteraction(Entity* ent) {
@ -321,11 +321,11 @@ u32 UpdateFuseInteraction(Entity* ent) {
ret = 0;
break;
case 2:
gPlayerState.controlMode = 3;
gPlayerState.controlMode = CONTROL_DISABLED;
ret = 1;
case 1:
sub_0807919C();
gPlayerState.controlMode = 1;
gPlayerState.controlMode = CONTROL_1;
break;
}
return ret;

2
src/object/cloud.c
View File

@ -115,7 +115,7 @@ void sub_0809F69C(Entity* this) {
void sub_0809F6CC(Entity* this) {
if (((gRoomControls.scroll_flags & 4) == 0) && (--this->actionDelay == 0)) {
gPlayerState.controlMode = 1;
gPlayerState.controlMode = CONTROL_1;
DeleteThisEntity();
}
}

2
src/player.c
View File

@ -325,7 +325,7 @@ extern ScriptExecutionContext gPlayerScriptExecutionContext;
NONMATCH("asm/non_matching/playerItemPacciCane/CheckPlayerInactive.inc", u32 CheckPlayerInactive(void)) {
if (!((gInput.newKeys & START_BUTTON) == 0 || gFadeControl.active || gUnk_02034490[0] ||
(gMessage.doTextBox & 0x7F) || gSave.stats.health == 0 || !gSave.fillerD0[34] ||
gPlayerState.controlMode != 0 || gPriorityHandler.priority_timer != 0)) {
gPlayerState.controlMode != CONTROL_ENABLED || gPriorityHandler.priority_timer != 0)) {
u32 tmp = gPlayerState.framestate ? gPlayerState.framestate : gPlayerState.framestate_last;
switch (tmp) {
case PL_STATE_DIE:

4
src/script.c
View File

@ -1059,7 +1059,7 @@ void ScriptCommand_SetPlayerIdle(Entity* entity, ScriptExecutionContext* context
}
void ScriptCommand_EnablePlayerControl(Entity* entity, ScriptExecutionContext* context) {
gPlayerState.controlMode = 1;
gPlayerState.controlMode = CONTROL_1;
}
void ScriptCommand_DisablePlayerControl(Entity* entity, ScriptExecutionContext* context) {
@ -1169,7 +1169,7 @@ void ScriptCommand_0807E9F0(Entity* entity, ScriptExecutionContext* context) {
}
if (tmp) {
sub_0807919C();
gPlayerState.controlMode = 1;
gPlayerState.controlMode = CONTROL_1;
} else {
lbl:
gActiveScriptInfo.commandSize = 0;