Renamed dungeon AI files

This commit is contained in:
AnonymousRandomPerson 2024-11-20 22:50:41 -05:00
parent b15a85ad02
commit a4f1fc6d1d
4 changed files with 17 additions and 11 deletions

View File

@ -1,5 +1,5 @@
#ifndef PMDSKY_OVERLAY_29_02308340_H
#define PMDSKY_OVERLAY_29_02308340_H
#ifndef PMDSKY_DUNGEON_AI_H
#define PMDSKY_DUNGEON_AI_H
#include "dungeon_mode.h"
@ -9,4 +9,4 @@
// unused: Unused
void RunMonsterAi(struct entity *pokemon, u32 unused);
#endif //PMDSKY_OVERLAY_29_02308340_H
#endif //PMDSKY_DUNGEON_AI_H

11
include/dungeon_util.h Normal file
View File

@ -0,0 +1,11 @@
#ifndef PMDSKY_DUNGEON_UTIL_H
#define PMDSKY_DUNGEON_UTIL_H
#include "dungeon.h"
static inline struct monster *GetEntInfo(struct entity *ent)
{
return ent->info;
}
#endif // PMDSKY_DUNGEON_UTIL_H

View File

@ -266,7 +266,7 @@ Overlay OVY_29
Object asm/overlay_29_02307F1C.o
Object src/overlay_29_0230827C.o
Object asm/overlay_29_023082A0.o
Object src/overlay_29_02308340.o
Object src/dungeon_ai.o
Object asm/overlay_29_023085DC.o
Object src/overlay_29_02308FBC.o
Object asm/overlay_29_02308FE0.o

View File

@ -1,5 +1,5 @@
#include "overlay_29_02308340.h"
#include "dungeon.h"
#include "dungeon_ai.h"
#include "dungeon_util.h"
#ifdef JAPAN
#define CANNOT_USE_ITEM_MESSAGE 0xB2D
@ -28,11 +28,6 @@ extern void AiMovement(struct entity *pokemon, bool8 show_run_away_effect);
extern void SetDecoyAiTracker(struct entity* entity);
extern bool8 CanSeeTarget(struct entity *entity, struct entity *target_entity);
static inline struct monster *GetEntInfo(struct entity *ent)
{
return ent->info;
}
void RunMonsterAi(struct entity *pokemon, u32 unused)
{
struct monster *pokemon_info = GetEntInfo(pokemon);