diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2018-09-22 15:39:34 -0500 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2018-09-22 15:39:34 -0500 |
| commit | 58a5e4a261cd3001f5cb747dd13080192d8d2245 (patch) | |
| tree | 6100a56d4d90e9792a0a4a1c1064cd10f827f28b /src/battle_main.c | |
| parent | 9e840dc5fea3d732a347092c804afb3c6a86d61a (diff) | |
| parent | 925de13b448a650da5e725684f6f6ea9826966d6 (diff) | |
Merge branch 'master' of github.com:pret/pokeemerald
Diffstat (limited to 'src/battle_main.c')
| -rw-r--r-- | src/battle_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/battle_main.c b/src/battle_main.c index 12e49ee65..8f5d39055 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -219,7 +219,7 @@ EWRAM_DATA u8 gCurrMovePos = 0; EWRAM_DATA u8 gChosenMovePos = 0; EWRAM_DATA u16 gCurrentMove = 0; EWRAM_DATA u16 gChosenMove = 0; -EWRAM_DATA u16 gRandomMove = 0; +EWRAM_DATA u16 gCalledMove = 0; EWRAM_DATA s32 gBattleMoveDamage = 0; EWRAM_DATA s32 gHpDealt = 0; EWRAM_DATA s32 gTakenDmg[MAX_BATTLERS_COUNT] = {0}; |