summaryrefslogtreecommitdiff
path: root/include/battle.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/battle.h')
-rw-r--r--include/battle.h15
1 files changed, 2 insertions, 13 deletions
diff --git a/include/battle.h b/include/battle.h
index fae21908b..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
{
@@ -730,7 +719,7 @@ extern u8 gCurrMovePos;
extern u8 gChosenMovePos;
extern u16 gCurrentMove;
extern u16 gChosenMove;
-extern u16 gRandomMove;
+extern u16 gCalledMove;
extern s32 gBattleMoveDamage;
extern s32 gHpDealt;
extern s32 gTakenDmg[MAX_BATTLERS_COUNT];