diff options
| author | Seth Barberee <seth.barberee@gmail.com> | 2022-02-17 21:45:57 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-17 21:45:57 -0800 |
| commit | 3555fb7c945ef5152910a84390ecbd1a38ea585d (patch) | |
| tree | 4237c0ab086005ea05539b8de7c10b867eec43db /src/code_8041AD0.c | |
| parent | 1d64db5214b455bbd6f50ad6369ec04420e03984 (diff) | |
| parent | ece475a4804a64790cfa86dfa0ba577a732adee8 (diff) | |
Merge pull request #96 from AnonymousRandomPerson/master
Attack AI decomp
Diffstat (limited to 'src/code_8041AD0.c')
| -rw-r--r-- | src/code_8041AD0.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/code_8041AD0.c b/src/code_8041AD0.c index 0091e9a..e1d3a1a 100644 --- a/src/code_8041AD0.c +++ b/src/code_8041AD0.c @@ -1,7 +1,9 @@ #include "global.h" +#include "constants/direction.h" +#include "constants/type.h" #include "dungeon_entity.h" #include "dungeon_global_data.h" -#include "constants/direction.h" +#include "dungeon_pokemon_attributes.h" struct unkStruct_80420E8 { @@ -16,7 +18,6 @@ extern void sub_804151C(struct DungeonEntity *r0, u32 r1, u8 r2); extern void sub_80416E0(struct DungeonEntity *r0, u32, u32); extern u8 sub_8042768(struct DungeonEntity *r0); extern void sub_806CDD4(struct DungeonEntity *r0, u8, u32); -extern u8 HasType(struct DungeonEntity *r0, u8); extern u32 sub_806F62C(u32); extern void PlaySoundEffect(u32); extern u8 sub_803F428(struct DungeonEntity *r0); @@ -343,10 +344,10 @@ void sub_8041DD8(struct DungeonEntity *r0, s16 r1) u32 temp; temp = r1; - if(HasType(r0, 0xE) != 0) + if(HasType(r0, TYPE_GHOST) != 0) sub_804151C(r0, temp, 1); else - sub_804151C(r0, 0xE, 1); + sub_804151C(r0, TYPE_GHOST, 1); } void nullsub_89(void) |