create enemy struct and enemy flags

This commit is contained in:
theo3
2023-12-30 20:05:32 -08:00
parent 3771464496
commit 201955ea05
88 changed files with 375 additions and 345 deletions
+2 -1
View File
@@ -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) {
+1 -1
View File
@@ -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);