diff options
| author | Seth Barberee <seth.barberee@gmail.com> | 2021-10-19 17:48:38 -0700 |
|---|---|---|
| committer | Seth Barberee <seth.barberee@gmail.com> | 2021-11-02 16:31:16 -0700 |
| commit | 3a1db3dfac99d017b592afa4e7e3fc7325e060cc (patch) | |
| tree | aa9bf96f0d1d91f06220e670b660f5fcf829b945 /src/code_8057824.c | |
| parent | f99f00b180561afeeb4b9c9918135c2db607fd52 (diff) | |
Moves and some friend_area_action_menu
Diffstat (limited to 'src/code_8057824.c')
| -rw-r--r-- | src/code_8057824.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/code_8057824.c b/src/code_8057824.c index 9d0e673..7f02fd5 100644 --- a/src/code_8057824.c +++ b/src/code_8057824.c @@ -1,6 +1,7 @@ #include "global.h" #include "dungeon_global_data.h" #include "dungeon_entity.h" +#include "constants/move.h" extern struct DungeonGlobalData *gDungeonGlobalData; @@ -31,7 +32,7 @@ extern void sub_806F370(struct DungeonEntity *r0, struct DungeonEntity *r1, u32, extern u32 gUnknown_80FD018; extern s16 sub_8057600(void*, u32); -extern u32 sub_8092B00(void*); +extern u32 GetMoveType(void*); bool32 sub_8057824(struct DungeonEntity *param_1, struct DungeonEntity *param_2) { @@ -100,7 +101,7 @@ bool32 sub_8057954(struct DungeonEntity *param_1, struct DungeonEntity *param_2, return TRUE; } -bool32 sub_8057974(struct DungeonEntity *param_1, struct DungeonEntity *param_2, void* param_3, u32 param_4) +bool32 sub_8057974(struct DungeonEntity *param_1, struct DungeonEntity *param_2, struct PokemonMove *param_3, u32 param_4) { s32 newHP; u8 local_24; @@ -108,7 +109,7 @@ bool32 sub_8057974(struct DungeonEntity *param_1, struct DungeonEntity *param_2, newHP = param_2->entityData->HP / 2; local_24 = 0; if (newHP != 0) { - sub_806F370(param_1,param_2,newHP,1,&local_24,sub_8092B00(param_3),sub_8057600(param_3,param_4),0,1,0); + sub_806F370(param_1,param_2,newHP,1,&local_24,GetMoveType(param_3),sub_8057600(param_3,param_4),0,1,0); local_24 = local_24 == 0; } else |