diff options
author | GriffinR <griffin.g.richards@gmail.com> | 2020-07-15 00:40:47 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-07-15 00:40:47 -0400 |
commit | e129d04b931a4fc0e6584b4340dc57b9162264d5 (patch) | |
tree | a6ae1eb111f652b1cfffdd9a4bccba4a65a0de35 /include/battle_main.h | |
parent | ebb6c4ee661758874972956a94eb06d38eaa18a8 (diff) | |
parent | 3c356a1d7af543d84c06f28f670b6ddc4b27fdd6 (diff) |
Merge branch 'master' into doc-overworld
Diffstat (limited to 'include/battle_main.h')
-rw-r--r-- | include/battle_main.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/battle_main.h b/include/battle_main.h index e04db17bb..217b10b39 100644 --- a/include/battle_main.h +++ b/include/battle_main.h @@ -57,15 +57,15 @@ u32 sub_80397C4(u32 setId, u32 tableId); void SpriteCb_WildMon(struct Sprite *sprite); void SpriteCallbackDummy_2(struct Sprite *sprite); void SpriteCB_FaintOpponentMon(struct Sprite *sprite); -void sub_8039AD8(struct Sprite *sprite); -void sub_8039B2C(struct Sprite *sprite); -void sub_8039B58(struct Sprite *sprite); +void SpriteCb_ShowAsMoveTarget(struct Sprite *sprite); +void SpriteCb_HideAsMoveTarget(struct Sprite *sprite); +void SpriteCb_OpponentMonFromBall(struct Sprite *sprite); void sub_8039BB4(struct Sprite *sprite); void sub_80105DC(struct Sprite *sprite); void sub_8039C00(struct Sprite *sprite); void DoBounceEffect(u8 battlerId, u8 b, s8 c, s8 d); void EndBounceEffect(u8 battlerId, bool8 b); -void sub_8039E44(struct Sprite *sprite); +void SpriteCb_PlayerMonFromBall(struct Sprite *sprite); void sub_8039E60(struct Sprite *sprite); void sub_8039E84(struct Sprite *sprite); void sub_8039E9C(struct Sprite *sprite); |