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
+2 -2
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);
+1 -1
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);
}
+1 -1
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);