mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-08-01 08:17:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #333 from hatal175/playercontrolmode

Browse Source
This commit is contained in:
notyourav
2022-02-01 14:41:13 -08:00
committed by GitHub
parent 2b8d880ffc 1f2a791e49
commit 9d96c00ae9
9 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/manager/manager39.c
+1 -1
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();
}
}
src/manager/managerA.c
+1 -1
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();