diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-03-31 18:57:50 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-03-31 18:57:50 -0400 |
| commit | 6d70b8adb194b1939f41e0f5cc3d9c480b2ee45b (patch) | |
| tree | 449989f49fd1808f5b7248f7a0c63d0f8d0bb599 /include/battle.h | |
| parent | 5a0142da08a85d80bd3f562fdad9fca2227e180a (diff) | |
| parent | 93c4e35d844046d12c7d8bcc64e8fc3e03e85e0d (diff) | |
Merge branch 'master' into mystery_gift
Diffstat (limited to 'include/battle.h')
| -rw-r--r-- | include/battle.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/battle.h b/include/battle.h index 38bce0e61..13c1851cf 100644 --- a/include/battle.h +++ b/include/battle.h @@ -564,9 +564,7 @@ struct BattleScripting }; // rom_80A5C6C -u8 GetBattlerSide(u8 battler); -u8 GetBattlerPosition(u8 battler); -u8 GetBattlerAtPosition(u8 position); + struct BattleSpriteInfo { |