diff options
author | Cheng Hann Gan <chenghanngan.us@gmail.com> | 2021-12-09 13:56:12 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-12-09 10:56:12 -0800 |
commit | a34c9ab91b553fcb1f72b94eb912b94bea58885b (patch) | |
tree | a31d0805938a56d1552f952db6ec6ab2defdebe5 /src/code_806CD90.c | |
parent | 4fc272fea6bc7332fae031ebeb12362cff1c35de (diff) |
AI decomp + type cleanup (#82)
* Decomped SetAction()
* Changed MapTile.tileType to u16 bit field
* Decomped FindStraightThrowableTargets()
* Cleaned up CannotAttack()
* Cleaned up some externs
* Converted dungeon action to substruct
Diffstat (limited to 'src/code_806CD90.c')
-rw-r--r-- | src/code_806CD90.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/code_806CD90.c b/src/code_806CD90.c index 30ca41d..e11f253 100644 --- a/src/code_806CD90.c +++ b/src/code_806CD90.c @@ -1,14 +1,13 @@ #include "global.h" -#include "dungeon_global_data.h" -#include "dungeon_entity.h" #include "constants/direction.h" +#include "dungeon_entity.h" +#include "dungeon_global_data.h" +#include "dungeon_util.h" extern struct DungeonGlobalData *gDungeonGlobalData; extern u8 sub_806CEBC(struct DungeonEntity *); -extern bool8 EntityExists(struct DungeonEntity *); extern void sub_806CCB4(struct DungeonEntity *, u8); -extern u32 GetEntityType(struct DungeonEntity *); void sub_806CD90(void) { @@ -57,7 +56,7 @@ void sub_806CE34(struct DungeonEntity *r0, u32 newDir) r0->unk6A = sub_806CEBC(r0); if(newDir < NUM_DIRECTIONS) { - r0->entityData->facingDir = newDir & DIRECTION_MASK; + r0->entityData->action.facingDir = newDir & DIRECTION_MASK; r0->facingDir = newDir & DIRECTION_MASK; } } |