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/dungeon_util_1.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/dungeon_util_1.c')
| -rw-r--r-- | src/dungeon_util_1.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/dungeon_util_1.c b/src/dungeon_util_1.c index 51ec765..32cc3ff 100644 --- a/src/dungeon_util_1.c +++ b/src/dungeon_util_1.c @@ -1,11 +1,12 @@ #include "global.h" -#include "constants/direction.h" #include "dungeon_util_1.h" + +#include "constants/direction.h" #include "dungeon_global_data.h" +#include "dungeon_util.h" #include "random.h" extern struct DungeonGlobalData *gDungeonGlobalData; -extern bool8 EntityExists(struct DungeonEntity *); extern void sub_806CE68(struct DungeonEntity *, s32); extern s32 sub_803F994(void); @@ -16,7 +17,7 @@ extern void sub_803E46C(u32); void sub_8085860(s32 x, s32 y) { - + sub_803F4A0(0); sub_803F878(x * 0x1800 + 0xc00, y * 0x1800 + 0x1000); } @@ -33,7 +34,7 @@ void sub_80858AC(s32 *param_1, s32 param_2) s32 iVar2; s32 iVar3; s32 iVar4; - + iVar1 = sub_803F994(); iVar2 = sub_803F9B0(); iVar3 = (param_1[0] - iVar1) / param_2; @@ -54,7 +55,7 @@ void sub_80858AC(s32 *param_1, s32 param_2) void SetFacingDirection(struct DungeonEntity *pokemon, s32 direction) { - pokemon->entityData->facingDir = direction & DIRECTION_MASK; + pokemon->entityData->action.facingDir = direction & DIRECTION_MASK; sub_806CE68(pokemon, direction); } @@ -73,7 +74,7 @@ void sub_8085930(s32 direction) } else { - entity->entityData->facingDir = direction & DIRECTION_MASK; + entity->entityData->action.facingDir = direction & DIRECTION_MASK; sub_806CE68(entity, direction); } } @@ -91,7 +92,7 @@ void sub_8085930(s32 direction) } else { - entity->entityData->facingDir = direction & DIRECTION_MASK; + entity->entityData->action.facingDir = direction & DIRECTION_MASK; sub_806CE68(entity, direction); } } @@ -114,7 +115,7 @@ void sub_80859F0(s32 direction) } else { - entity->entityData->facingDir = direction & DIRECTION_MASK; + entity->entityData->action.facingDir = direction & DIRECTION_MASK; sub_806CE68(entity, direction); } } |