summaryrefslogtreecommitdiff
path: root/src/manager
diff options
context:
space:
mode:
Diffstat (limited to 'src/manager')
-rw-r--r--src/manager/fightManager.c3
-rw-r--r--src/manager/templeOfDropletsManager.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/src/manager/fightManager.c b/src/manager/fightManager.c
index 9d743f07..477d2112 100644
--- a/src/manager/fightManager.c
+++ b/src/manager/fightManager.c
@@ -16,6 +16,7 @@
#include "message.h"
#include "room.h"
#include "sound.h"
+#include "enemy.h"
enum FightManager_State { Init, WaitForFlag, WaitForDone };
@@ -112,7 +113,7 @@ void FightManager_LoadFight(FightManager* this) {
while (prop->kind != 0xFF) {
ent = LoadRoomEntity(prop++);
if ((ent != NULL) && (ent->kind == ENEMY)) {
- ((GenericEntity*)ent)->field_0x6c.HALF.HI |= 0x40;
+ ((Enemy*)ent)->enemyFlags |= EM_FLAG_MONITORED;
FightManagerHelper_Monitor(monitor, ent, counter++);
}
if (counter >= 7) {
diff --git a/src/manager/templeOfDropletsManager.c b/src/manager/templeOfDropletsManager.c
index bdec6a4a..4082f884 100644
--- a/src/manager/templeOfDropletsManager.c
+++ b/src/manager/templeOfDropletsManager.c
@@ -340,7 +340,7 @@ void TempleOfDropletsManager_Type6_Action2(TempleOfDropletsManager* this) {
case PL_STATE_WALK:
if (sub_0805A73C(this)) {
super->action++;
- sub_08004168(&gPlayerEntity.base);
+ SnapToTile(&gPlayerEntity.base);
gPlayerEntity.base.animationState = 4;
RequestPriorityDuration((Entity*)this, 600);
SetPlayerControl(0xFF);