diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-26 18:07:00 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-26 18:07:00 +0100 |
| commit | d48392e677f3b77b34d4b125b90a74be86b19a2d (patch) | |
| tree | ad7b1da6b6855516a8d9cbefa236d86210d43fe4 /src/battle_controllers.c | |
| parent | 59f64c622bf2ed7a0fcc6d45975813bc55c84141 (diff) | |
change battle variables names
Diffstat (limited to 'src/battle_controllers.c')
| -rw-r--r-- | src/battle_controllers.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/battle_controllers.c b/src/battle_controllers.c index b3fb91b42..2d373e876 100644 --- a/src/battle_controllers.c +++ b/src/battle_controllers.c @@ -38,7 +38,7 @@ extern u8 gEffectBank; extern u16 gBattleWeather; extern struct BattlePokemon gBattleMons[BATTLE_BANKS_COUNT]; extern u16 gCurrentMove; -extern u16 gOriginallyUsedMove; +extern u16 gChosenMove; extern u16 gLastUsedItem; extern u8 gBattleOutcome; extern u8 gLastUsedAbility; @@ -1120,7 +1120,7 @@ void EmitPrintString(u8 bufferId, u16 stringID) stringInfo = (struct StringInfoBattle*)(&gBattleBuffersTransferData[4]); stringInfo->currentMove = gCurrentMove; - stringInfo->originallyUsedMove = gOriginallyUsedMove; + stringInfo->originallyUsedMove = gChosenMove; stringInfo->lastItem = gLastUsedItem; stringInfo->lastAbility = gLastUsedAbility; stringInfo->scrActive = gBattleScripting.bank; @@ -1152,7 +1152,7 @@ void EmitPrintSelectionString(u8 bufferId, u16 stringID) stringInfo = (struct StringInfoBattle*)(&gBattleBuffersTransferData[4]); stringInfo->currentMove = gCurrentMove; - stringInfo->originallyUsedMove = gOriginallyUsedMove; + stringInfo->originallyUsedMove = gChosenMove; stringInfo->lastItem = gLastUsedItem; stringInfo->lastAbility = gLastUsedAbility; stringInfo->scrActive = gBattleScripting.bank; |