diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2018-10-13 12:44:23 -0500 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2018-10-13 12:44:23 -0500 |
| commit | a26380663c5acc636fb8c163c014187129afae8f (patch) | |
| tree | 79eb899d0c0e3281a11f1d447879090dc208ef80 /include/battle.h | |
| parent | 35c69388140243c391b925fd8b9012d2d1703810 (diff) | |
| parent | a2a6700966cc802185577e44ba88a9154429c93b (diff) | |
Merge branch 'master' of github.com:pret/pokeemerald
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 { |