diff options
author | AnonymousRandomPerson <chenghanngan.us@gmail.com> | 2022-02-13 23:13:47 -0500 |
---|---|---|
committer | AnonymousRandomPerson <chenghanngan.us@gmail.com> | 2022-02-13 23:15:33 -0500 |
commit | 2a2a0805b481b8425b4d1047d868fb1159993e6c (patch) | |
tree | aacd438bd14b32c816c54a564785fd9716e70fae /src/code_8041AD0.c | |
parent | 3bbb6035e746cdb83b128b1d6153436756cb3be0 (diff) |
Decomped HasType()
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) |