fix bad merge
This commit is contained in:
parent
33972b5493
commit
768598b154
@ -48,7 +48,6 @@ struct TypePower
|
||||
extern const struct TypePower gNaturalGiftTable[];
|
||||
|
||||
void HandleAction_ThrowBall(void);
|
||||
bool32 IsAffectedByFollowMe(u32 battlerAtk, u32 defSide);
|
||||
bool32 IsAffectedByFollowMe(u32 battlerAtk, u32 defSide, u32 move);
|
||||
void HandleAction_UseMove(void);
|
||||
void HandleAction_Switch(void);
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user