diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-10-06 08:20:41 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-06 08:20:41 -0500 |
| commit | b9e38a569eac79572fa0676b82e2d755e30b1357 (patch) | |
| tree | 9d3b25dec0536b47a88cc190773794ff53c1b95c /include/battle.h | |
| parent | 3d50d01a93314569a3b647bf52c87b52c1dcf41c (diff) | |
| parent | 17c5b4089ae0477c8500f6d2ccd686a75aab784e (diff) | |
Merge pull request #320 from DizzyEggg/anims
Document battle animation scripts
Diffstat (limited to 'include/battle.h')
| -rw-r--r-- | include/battle.h | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/include/battle.h b/include/battle.h index ae1eccf57..3e638c6ef 100644 --- a/include/battle.h +++ b/include/battle.h @@ -38,17 +38,6 @@ #define MAX_TRAINER_ITEMS 4 #define MAX_MON_MOVES 4 -#define BATTLE_TERRAIN_GRASS 0 -#define BATTLE_TERRAIN_LONG_GRASS 1 -#define BATTLE_TERRAIN_SAND 2 -#define BATTLE_TERRAIN_UNDERWATER 3 -#define BATTLE_TERRAIN_WATER 4 -#define BATTLE_TERRAIN_POND 5 -#define BATTLE_TERRAIN_MOUNTAIN 6 -#define BATTLE_TERRAIN_CAVE 7 -#define BATTLE_TERRAIN_BUILDING 8 -#define BATTLE_TERRAIN_PLAIN 9 - // array entries for battle communication #define MULTIUSE_STATE 0x0 #define CURSOR_POSITION 0x1 @@ -609,7 +598,7 @@ struct BattleScripting // rom_80A5C6C u8 GetBattlerSide(u8 battler); u8 GetBattlerPosition(u8 battler); -u8 GetBattlerAtPosition(u8 battler); +u8 GetBattlerAtPosition(u8 position); struct BattleSpriteInfo { |