Merge pull request #124 from DizzyEggg/dump_battlescripts

Dump Battle Scripts
2017-11-27 14:00:29 -06:00
parent 64e6480988 77a6c30bd4
commit 6e317c6463
29 changed files with 8562 additions and 1778 deletions
--- a/src/battle_2.c
+++ b/src/battle_2.c
@@ -6,6 +6,7 @@
 #include "gpu_regs.h"
 #include "unknown_task.h"
 #include "battle_setup.h"
+#include "battle_scripts.h"
 #include "pokemon.h"
 #include "palette.h"
 #include "task.h"
@@ -119,14 +120,14 @@ extern u32 gBattleExecBuffer;
 extern u8 gMultiHitCounter;
 extern u8 gBattleMoveFlags;
 extern s32 gBattleMoveDamage;
-extern const u8* gUnknown_02024230[BATTLE_BANKS_COUNT];
-extern u16 gUnknownMovesUsedByBanks[BATTLE_BANKS_COUNT];
-extern u16 gLastUsedMovesByBanks[BATTLE_BANKS_COUNT];
-extern u16 gUnknown_02024250[BATTLE_BANKS_COUNT];
-extern u16 gUnknown_02024258[BATTLE_BANKS_COUNT];
-extern u16 gUnknown_02024260[BATTLE_BANKS_COUNT];
+extern const u8* gPalaceSelectionBattleScripts[BATTLE_BANKS_COUNT];
+extern u16 gLastPrintedMoves[BATTLE_BANKS_COUNT];
+extern u16 gLastMoves[BATTLE_BANKS_COUNT];
+extern u16 gLastLandedMoves[BATTLE_BANKS_COUNT];
+extern u16 gLastHitByType[BATTLE_BANKS_COUNT];
+extern u16 gLastResultingMoves[BATTLE_BANKS_COUNT];
 extern u16 gLockedMoves[BATTLE_BANKS_COUNT];
-extern u8 gUnknown_02024270[BATTLE_BANKS_COUNT];
+extern u8 gLastHitBy[BATTLE_BANKS_COUNT];
 extern u8 gUnknown_02024284[BATTLE_BANKS_COUNT];
 extern u32 gStatuses3[BATTLE_BANKS_COUNT];
 extern u16 gSideAffecting[2];
@@ -140,7 +141,7 @@ extern u16 gChosenMovesByBanks[BATTLE_BANKS_COUNT];
 extern u8 gCurrentActionFuncId;
 extern u8 gLastUsedAbility;
 extern u8 gUnknown_0203CF00[];
-extern const u8* gBattlescriptPtrsForSelection[BATTLE_BANKS_COUNT];
+extern const u8* gSelectionBattleScripts[BATTLE_BANKS_COUNT];
 extern const u8* gBattlescriptCurrInstr;
 extern u8 gActionsByTurnOrder[BATTLE_BANKS_COUNT];
 extern u8 gCurrentTurnActionNumber;
@@ -148,7 +149,7 @@ extern u16 gDynamicBasePower;
 extern u8 gCritMultiplier;
 extern u8 gCurrMovePos;
 extern u8 gUnknown_020241E9;
-extern u16 gLastUsedMove;
+extern u16 gChosenMove;

 extern const struct BattleMove gBattleMoves[];
 extern const u16 gUnknown_08C004E0[]; // battle textbox palette
@@ -178,31 +179,6 @@ extern const u8 gText_Ice[];
 extern const u8 gText_Confusion[];
 extern const u8 gText_Love[];

-// battlescripts
-extern const u8 gUnknown_082DB8BE[];
-extern const u8 gUnknown_082DB881[];
-extern const u8 BattleScript_ActionSelectionItemsCantBeUsed[];
-extern const u8 gUnknown_082DAB11[];
-extern const u8 gUnknown_082DB9BA[];
-extern const u8 gUnknown_082DAAFE[];
-extern const u8 gUnknown_082DAB0B[];
-extern const u8 BattleScript_FocusPunchSetUp[];
-extern const u8 BattleScript_LinkBattleWonOrLost[];
-extern const u8 BattleScript_FrontierTrainerBattleWon[];
-extern const u8 BattleScript_LocalTrainerBattleWon[];
-extern const u8 BattleScript_PayDayMoneyAndPickUpItems[];
-extern const u8 BattleScript_LocalBattleLost[];
-extern const u8 gUnknown_082DB9C8[];
-extern const u8 gUnknown_082DAA0B[];
-extern const u8 gUnknown_082DB9C1[];
-extern const u8 BattleScript_RanAwayUsingMonAbility[];
-extern const u8 BattleScript_SmokeBallEscape[];
-extern const u8 BattleScript_GotAwaySafely[];
-extern const u8 BattleScript_WildMonFled[];
-extern const u8 BattleScript_MoveUsedLoafingAround[];
-extern const u8 BattleScript_ActionSwitch[];
-extern const u8 BattleScript_PrintFailedToRunString[];
-
 // functions
 extern void dp12_8087EA4(void);
 extern void sub_80356D0(void);
@@ -485,7 +461,7 @@ static void sub_8036A5C(void)
    u32 status = 0;
    s32 i;

-    for (i = 0; i < 6; i++)
+    for (i = 0; i < PARTY_SIZE; i++)
    {
        species = GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2);
        hp = GetMonData(&gPlayerParty[i], MON_DATA_HP);
@@ -1902,7 +1878,7 @@ static void sub_8038B94(u8 taskId)
    }

    r7 = 0;
-    for (i = 0; i < 6; i++)
+    for (i = 0; i < PARTY_SIZE; i++)
    {
        u16 species = GetMonData(&sp4[i], MON_DATA_SPECIES2);
        u16 hp = GetMonData(&sp4[i], MON_DATA_HP);
@@ -1926,7 +1902,7 @@ static void sub_8038B94(u8 taskId)
    gTasks[taskId].data[3] = r7;

    r7 = 0;
-    for (i = 0; i < 6; i++)
+    for (i = 0; i < PARTY_SIZE; i++)
    {
        u16 species = GetMonData(&sp8[i], MON_DATA_SPECIES2);
        u16 hp = GetMonData(&sp8[i], MON_DATA_HP);
@@ -2765,17 +2741,17 @@ static void BattleStartClearSetData(void)
        for (j = 0; j < sizeof(struct DisableStruct); j++)
            dataPtr[j] = 0;

-        gDisableStructs[i].isFirstTurn= 2;
+        gDisableStructs[i].isFirstTurn = 2;
        gUnknown_02024284[i] = 0;
-        gLastUsedMovesByBanks[i] = 0;
-        gUnknown_02024250[i] = 0;
-        gUnknown_02024258[i] = 0;
-        gUnknown_02024260[i] = 0;
-        gUnknown_02024270[i] = 0xFF;
+        gLastMoves[i] = 0;
+        gLastLandedMoves[i] = 0;
+        gLastHitByType[i] = 0;
+        gLastResultingMoves[i] = 0;
+        gLastHitBy[i] = 0xFF;
        gLockedMoves[i] = 0;
-        gUnknownMovesUsedByBanks[i] = 0;
+        gLastPrintedMoves[i] = 0;
        gBattleResources->flags->flags[i] = 0;
-        gUnknown_02024230[i] = 0;
+        gPalaceSelectionBattleScripts[i] = 0;
    }

    for (i = 0; i < 2; i++)
@@ -2932,14 +2908,14 @@ void SwitchInClearSetData(void)
    }

    gBattleMoveFlags = 0;
-    gDisableStructs[gActiveBank].isFirstTurn= 2;
+    gDisableStructs[gActiveBank].isFirstTurn = 2;
    gDisableStructs[gActiveBank].truantUnknownBit = disableStructCopy.truantUnknownBit;
-    gLastUsedMovesByBanks[gActiveBank] = 0;
-    gUnknown_02024250[gActiveBank] = 0;
-    gUnknown_02024258[gActiveBank] = 0;
-    gUnknown_02024260[gActiveBank] = 0;
-    gUnknownMovesUsedByBanks[gActiveBank] = 0;
-    gUnknown_02024270[gActiveBank] = 0xFF;
+    gLastMoves[gActiveBank] = 0;
+    gLastLandedMoves[gActiveBank] = 0;
+    gLastHitByType[gActiveBank] = 0;
+    gLastResultingMoves[gActiveBank] = 0;
+    gLastPrintedMoves[gActiveBank] = 0;
+    gLastHitBy[gActiveBank] = 0xFF;

    *(gBattleStruct->mirrorMoves + gActiveBank * 2 + 0) = 0;
    *(gBattleStruct->mirrorMoves + gActiveBank * 2 + 1) = 0;
@@ -3026,12 +3002,12 @@ void FaintClearSetData(void)

    gDisableStructs[gActiveBank].isFirstTurn = 2;

-    gLastUsedMovesByBanks[gActiveBank] = 0;
-    gUnknown_02024250[gActiveBank] = 0;
-    gUnknown_02024258[gActiveBank] = 0;
-    gUnknown_02024260[gActiveBank] = 0;
-    gUnknownMovesUsedByBanks[gActiveBank] = 0;
-    gUnknown_02024270[gActiveBank] = 0xFF;
+    gLastMoves[gActiveBank] = 0;
+    gLastLandedMoves[gActiveBank] = 0;
+    gLastHitByType[gActiveBank] = 0;
+    gLastResultingMoves[gActiveBank] = 0;
+    gLastPrintedMoves[gActiveBank] = 0;
+    gLastHitBy[gActiveBank] = 0xFF;

    *(u8*)((u8*)(&gBattleStruct->choicedMove[gActiveBank]) + 0) = 0;
    *(u8*)((u8*)(&gBattleStruct->choicedMove[gActiveBank]) + 1) = 0;
@@ -3213,7 +3189,7 @@ static void BattleIntroDrawPartySummaryScreens(void)

    if (gBattleTypeFlags & BATTLE_TYPE_TRAINER)
    {
-        for (i = 0; i < 6; i++)
+        for (i = 0; i < PARTY_SIZE; i++)
        {
            if (GetMonData(&gEnemyParty[i], MON_DATA_SPECIES2) == SPECIES_NONE
             || GetMonData(&gEnemyParty[i], MON_DATA_SPECIES2) == SPECIES_EGG)
@@ -3231,7 +3207,7 @@ static void BattleIntroDrawPartySummaryScreens(void)
        EmitDrawPartyStatusSummary(0, hpStatus, 0x80);
        MarkBufferBankForExecution(gActiveBank);

-        for (i = 0; i < 6; i++)
+        for (i = 0; i < PARTY_SIZE; i++)
        {
            if (GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2) == SPECIES_NONE
             || GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2) == SPECIES_EGG)
@@ -3704,7 +3680,7 @@ static void TryDoEventsBeforeFirstTurn(void)
    if (gBattleTypeFlags & BATTLE_TYPE_ARENA)
    {
        StopCryAndClearCrySongs();
-        BattleScriptExecute(gUnknown_082DB8BE);
+        BattleScriptExecute(BattleScript_82DB8BE);
    }
 }

@@ -3792,9 +3768,9 @@ void BattleTurnPassed(void)
    gRandomTurnNumber = Random();

    if (gBattleTypeFlags & BATTLE_TYPE_PALACE)
-        BattleScriptExecute(gUnknown_082DB881);
+        BattleScriptExecute(BattleScript_82DB881);
    else if (gBattleTypeFlags & BATTLE_TYPE_ARENA && gBattleStruct->field_DA == 0)
-        BattleScriptExecute(gUnknown_082DB8BE);
+        BattleScriptExecute(BattleScript_82DB8BE);
 }

 u8 IsRunningFromBattleImpossible(void)
@@ -4007,7 +3983,7 @@ static void HandleTurnActionSelectionState(void)
                                            | BATTLE_TYPE_x2000000))
                    {
                        RecordedBattle_ClearBankAction(gActiveBank, 1);
-                        gBattlescriptPtrsForSelection[gActiveBank] = BattleScript_ActionSelectionItemsCantBeUsed;
+                        gSelectionBattleScripts[gActiveBank] = BattleScript_ActionSelectionItemsCantBeUsed;
                        gBattleCommunication[gActiveBank] = STATE_SELECTION_SCRIPT;
                        *(gBattleStruct->selectionScriptFinished + gActiveBank) = FALSE;
                        *(gBattleStruct->stateIdAfterSelScript + gActiveBank) = STATE_BEFORE_ACTION_CHOSEN;
@@ -4052,7 +4028,7 @@ static void HandleTurnActionSelectionState(void)
                case ACTION_SAFARI_ZONE_BALL:
                    if (IsPlayerPartyAndPokemonStorageFull())
                    {
-                        gBattlescriptPtrsForSelection[gActiveBank] = gUnknown_082DAB11;
+                        gSelectionBattleScripts[gActiveBank] = BattleScript_PrintFullBox;
                        gBattleCommunication[gActiveBank] = STATE_SELECTION_SCRIPT;
                        *(gBattleStruct->selectionScriptFinished + gActiveBank) = FALSE;
                        *(gBattleStruct->stateIdAfterSelScript + gActiveBank) = STATE_BEFORE_ACTION_CHOSEN;
@@ -4107,7 +4083,7 @@ static void HandleTurnActionSelectionState(void)
                    && gBattleTypeFlags & (BATTLE_TYPE_FRONTIER | BATTLE_TYPE_x4000000)
                    && gBattleBufferB[gActiveBank][1] == ACTION_RUN)
                {
-                    gBattlescriptPtrsForSelection[gActiveBank] = gUnknown_082DB9BA;
+                    gSelectionBattleScripts[gActiveBank] = BattleScript_AskIfWantsToForfeitMatch;
                    gBattleCommunication[gActiveBank] = 8;
                    *(gBattleStruct->selectionScriptFinished + gActiveBank) = FALSE;
                    *(gBattleStruct->stateIdAfterSelScript + gActiveBank) = STATE_BEFORE_ACTION_CHOSEN;
@@ -4117,13 +4093,13 @@ static void HandleTurnActionSelectionState(void)
                         && !(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000))
                         && gBattleBufferB[gActiveBank][1] == ACTION_RUN)
                {
-                    BattleScriptExecute(gUnknown_082DAAFE);
+                    BattleScriptExecute(BattleScript_PrintCantRunFromTrainer);
                    gBattleCommunication[gActiveBank] = 1;
                }
-                else if (IsRunningFromBattleImpossible() != 0
+                else if (IsRunningFromBattleImpossible()
                         && gBattleBufferB[gActiveBank][1] == ACTION_RUN)
                {
-                    gBattlescriptPtrsForSelection[gActiveBank] = gUnknown_082DAB0B;
+                    gSelectionBattleScripts[gActiveBank] = BattleScript_PrintCantEscapeFromBattle;
                    gBattleCommunication[gActiveBank] = STATE_SELECTION_SCRIPT;
                    *(gBattleStruct->selectionScriptFinished + gActiveBank) = FALSE;
                    *(gBattleStruct->stateIdAfterSelScript + gActiveBank) = STATE_BEFORE_ACTION_CHOSEN;
@@ -4276,12 +4252,12 @@ static void HandleTurnActionSelectionState(void)
            else
            {
                gBankAttacker = gActiveBank;
-                gBattlescriptCurrInstr = gBattlescriptPtrsForSelection[gActiveBank];
+                gBattlescriptCurrInstr = gSelectionBattleScripts[gActiveBank];
                if (!(gBattleExecBuffer & ((gBitTable[gActiveBank]) | (0xF0000000) | (gBitTable[gActiveBank] << 4) | (gBitTable[gActiveBank] << 8) | (gBitTable[gActiveBank] << 0xC))))
                {
                    gBattleScriptingCommandsTable[gBattlescriptCurrInstr[0]]();
                }
-                gBattlescriptPtrsForSelection[gActiveBank] = gBattlescriptCurrInstr;
+                gSelectionBattleScripts[gActiveBank] = gBattlescriptCurrInstr;
            }
            break;
        case STATE_WAIT_SET_BEFORE_ACTION:
@@ -4308,12 +4284,12 @@ static void HandleTurnActionSelectionState(void)
            else
            {
                gBankAttacker = gActiveBank;
-                gBattlescriptCurrInstr = gBattlescriptPtrsForSelection[gActiveBank];
+                gBattlescriptCurrInstr = gSelectionBattleScripts[gActiveBank];
                if (!(gBattleExecBuffer & ((gBitTable[gActiveBank]) | (0xF0000000) | (gBitTable[gActiveBank] << 4) | (gBitTable[gActiveBank] << 8) | (gBitTable[gActiveBank] << 0xC))))
                {
                    gBattleScriptingCommandsTable[gBattlescriptCurrInstr[0]]();
                }
-                gBattlescriptPtrsForSelection[gActiveBank] = gBattlescriptCurrInstr;
+                gSelectionBattleScripts[gActiveBank] = gBattlescriptCurrInstr;
            }
            break;
        }
@@ -4811,13 +4787,13 @@ static void HandleEndTurn_BattleLost(void)
        {
            if (gBattleOutcome & BATTLE_OUTCOME_BIT_x80)
            {
-                gBattlescriptCurrInstr = gUnknown_082DB9C8;
+                gBattlescriptCurrInstr = BattleScript_82DB9C8;
                gBattleOutcome &= ~(BATTLE_OUTCOME_BIT_x80);
                gSaveBlock2Ptr->field_CA9_b = 1;
            }
            else
            {
-                gBattlescriptCurrInstr = gUnknown_082DAA0B;
+                gBattlescriptCurrInstr = BattleScript_82DAA0B;
                gBattleOutcome &= ~(BATTLE_OUTCOME_BIT_x80);
            }
        }
@@ -4843,13 +4819,13 @@ static void HandleEndTurn_RanFromBattle(void)

    if (gBattleTypeFlags & BATTLE_TYPE_FRONTIER && gBattleTypeFlags & BATTLE_TYPE_TRAINER)
    {
-        gBattlescriptCurrInstr = gUnknown_082DB9C1;
+        gBattlescriptCurrInstr = BattleScript_82DB9C1;
        gBattleOutcome = BATTLE_FORFEITED;
        gSaveBlock2Ptr->field_CA9_b = 1;
    }
    else if (gBattleTypeFlags & BATTLE_TYPE_x4000000)
    {
-        gBattlescriptCurrInstr = gUnknown_082DB9C1;
+        gBattlescriptCurrInstr = BattleScript_82DB9C1;
        gBattleOutcome = BATTLE_FORFEITED;
    }
    else
@@ -5072,19 +5048,19 @@ static void HandleAction_UseMove(void)
    if (gProtectStructs[gBankAttacker].onlyStruggle)
    {
        gProtectStructs[gBankAttacker].onlyStruggle = 0;
-        gCurrentMove = gLastUsedMove = MOVE_STRUGGLE;
+        gCurrentMove = gChosenMove = MOVE_STRUGGLE;
        gHitMarker |= HITMARKER_NO_PPDEDUCT;
        *(gBattleStruct->moveTarget + gBankAttacker) = GetMoveTarget(MOVE_STRUGGLE, 0);
    }
    else if (gBattleMons[gBankAttacker].status2 & STATUS2_MULTIPLETURNS || gBattleMons[gBankAttacker].status2 & STATUS2_RECHARGE)
    {
-        gCurrentMove = gLastUsedMove = gLockedMoves[gBankAttacker];
+        gCurrentMove = gChosenMove = gLockedMoves[gBankAttacker];
    }
    // encore forces you to use the same move
    else if (gDisableStructs[gBankAttacker].encoredMove != MOVE_NONE
             && gDisableStructs[gBankAttacker].encoredMove == gBattleMons[gBankAttacker].moves[gDisableStructs[gBankAttacker].encoredMovePos])
    {
-        gCurrentMove = gLastUsedMove = gDisableStructs[gBankAttacker].encoredMove;
+        gCurrentMove = gChosenMove = gDisableStructs[gBankAttacker].encoredMove;
        gCurrMovePos = gUnknown_020241E9 = gDisableStructs[gBankAttacker].encoredMovePos;
        *(gBattleStruct->moveTarget + gBankAttacker) = GetMoveTarget(gCurrentMove, 0);
    }
@@ -5093,7 +5069,7 @@ static void HandleAction_UseMove(void)
             && gDisableStructs[gBankAttacker].encoredMove != gBattleMons[gBankAttacker].moves[gDisableStructs[gBankAttacker].encoredMovePos])
    {
        gCurrMovePos = gUnknown_020241E9 = gDisableStructs[gBankAttacker].encoredMovePos;
-        gCurrentMove = gLastUsedMove = gBattleMons[gBankAttacker].moves[gCurrMovePos];
+        gCurrentMove = gChosenMove = gBattleMons[gBankAttacker].moves[gCurrMovePos];
        gDisableStructs[gBankAttacker].encoredMove = MOVE_NONE;
        gDisableStructs[gBankAttacker].encoredMovePos = 0;
        gDisableStructs[gBankAttacker].encoreTimer1 = 0;
@@ -5101,12 +5077,12 @@ static void HandleAction_UseMove(void)
    }
    else if (gBattleMons[gBankAttacker].moves[gCurrMovePos] != gChosenMovesByBanks[gBankAttacker])
    {
-        gCurrentMove = gLastUsedMove = gBattleMons[gBankAttacker].moves[gCurrMovePos];
+        gCurrentMove = gChosenMove = gBattleMons[gBankAttacker].moves[gCurrMovePos];
        *(gBattleStruct->moveTarget + gBankAttacker) = GetMoveTarget(gCurrentMove, 0);
    }
    else
    {
-        gCurrentMove = gLastUsedMove = gBattleMons[gBankAttacker].moves[gCurrMovePos];
+        gCurrentMove = gChosenMove = gBattleMons[gBankAttacker].moves[gCurrMovePos];
    }

    if (gBattleMons[gBankAttacker].hp != 0)
@@ -5146,7 +5122,7 @@ static void HandleAction_UseMove(void)
        }
        if (var == 4)
        {
-            if (gBattleMoves[gLastUsedMove].target & MOVE_TARGET_RANDOM)
+            if (gBattleMoves[gChosenMove].target & MOVE_TARGET_RANDOM)
            {
                if (GetBankSide(gBankAttacker) == SIDE_PLAYER)
                {
@@ -5191,7 +5167,7 @@ static void HandleAction_UseMove(void)
        }
    }
    else if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE
-             && gBattleMoves[gLastUsedMove].target & MOVE_TARGET_RANDOM)
+             && gBattleMoves[gChosenMove].target & MOVE_TARGET_RANDOM)
    {
        if (GetBankSide(gBankAttacker) == SIDE_PLAYER)
        {
@@ -5241,11 +5217,11 @@ static void HandleAction_UseMove(void)
            gCurrentActionFuncId = 12;
            return;
        }
-        else if (gUnknown_02024230[gBankAttacker] != NULL)
+        else if (gPalaceSelectionBattleScripts[gBankAttacker] != NULL)
        {
            gBattleCommunication[MULTISTRING_CHOOSER] = 4;
-            gBattlescriptCurrInstr = gUnknown_02024230[gBankAttacker];
-            gUnknown_02024230[gBankAttacker] = NULL;
+            gBattlescriptCurrInstr = gPalaceSelectionBattleScripts[gBankAttacker];
+            gPalaceSelectionBattleScripts[gBankAttacker] = NULL;
        }
        else
        {
@@ -5624,8 +5600,8 @@ static void HandleAction_ActionFinished(void)
    gBattleMoveFlags = 0;
    gBattleScripting.animTurn = 0;
    gBattleScripting.animTargetsHit = 0;
-    gUnknown_02024250[gBankAttacker] = 0;
-    gUnknown_02024258[gBankAttacker] = 0;
+    gLastLandedMoves[gBankAttacker] = 0;
+    gLastHitByType[gBankAttacker] = 0;
    gBattleStruct->dynamicMoveType = 0;
    gDynamicBasePower = 0;
    gBattleScripting.atk49_state = 0;
--- a/src/battle_ai_script_commands.c
+++ b/src/battle_ai_script_commands.c
@@ -58,7 +58,7 @@ extern struct BattlePokemon gBattleMons[BATTLE_BANKS_COUNT];
 extern u16 gCurrentMove;
 extern u8 gBankTarget;
 extern u8 gAbsentBankFlags;
-extern u16 gLastUsedMovesByBanks[BATTLE_BANKS_COUNT];
+extern u16 gLastMoves[BATTLE_BANKS_COUNT];
 extern u16 gTrainerBattleOpponent_A;
 extern u16 gTrainerBattleOpponent_B;
 extern u32 gStatuses3[BATTLE_BANKS_COUNT];
@@ -633,12 +633,12 @@ static void RecordLastUsedMoveByTarget(void)

    for (i = 0; i < 4; i++)
    {
-        if (gBattleResources->battleHistory->usedMoves[gBankTarget].moves[i] == gLastUsedMovesByBanks[gBankTarget])
+        if (gBattleResources->battleHistory->usedMoves[gBankTarget].moves[i] == gLastMoves[gBankTarget])
            break;
-        if (gBattleResources->battleHistory->usedMoves[gBankTarget].moves[i] != gLastUsedMovesByBanks[gBankTarget]  // HACK: This redundant condition is a hack to make the asm match.
+        if (gBattleResources->battleHistory->usedMoves[gBankTarget].moves[i] != gLastMoves[gBankTarget]  // HACK: This redundant condition is a hack to make the asm match.
         && gBattleResources->battleHistory->usedMoves[gBankTarget].moves[i] == 0)
        {
-            gBattleResources->battleHistory->usedMoves[gBankTarget].moves[i] = gLastUsedMovesByBanks[gBankTarget];
+            gBattleResources->battleHistory->usedMoves[gBankTarget].moves[i] = gLastMoves[gBankTarget];
            break;
        }
    }
@@ -1252,9 +1252,9 @@ static void BattleAICmd_is_most_powerful_move(void)
 static void BattleAICmd_get_last_used_bank_move(void)
 {
    if (gAIScriptPtr[1] == AI_USER)
-        AI_THINKING_STRUCT->funcResult = gLastUsedMovesByBanks[sBank_AI];
+        AI_THINKING_STRUCT->funcResult = gLastMoves[sBank_AI];
    else
-        AI_THINKING_STRUCT->funcResult = gLastUsedMovesByBanks[gBankTarget];
+        AI_THINKING_STRUCT->funcResult = gLastMoves[gBankTarget];

    gAIScriptPtr += 2;
 }
--- a/src/battle_ai_switch_items.c
+++ b/src/battle_ai_switch_items.c
@@ -16,8 +16,8 @@ extern u32 gBattleTypeFlags;
 extern u32 gStatuses3[BATTLE_BANKS_COUNT];
 extern struct BattlePokemon gBattleMons[BATTLE_BANKS_COUNT];
 extern u16 gBattlePartyID[BATTLE_BANKS_COUNT];
-extern u16 gUnknown_02024250[BATTLE_BANKS_COUNT];
-extern u8 gUnknown_02024270[BATTLE_BANKS_COUNT];
+extern u16 gLastLandedMoves[BATTLE_BANKS_COUNT];
+extern u8 gLastHitBy[BATTLE_BANKS_COUNT];
 extern u16 gDynamicBasePower;
 extern u8 gBattleMoveFlags;
 extern u8 gCritMultiplier;
@@ -141,11 +141,11 @@ static bool8 FindMonThatAbsorbsOpponentsMove(void)

    if (HasSuperEffectiveMoveAgainstOpponents(TRUE) && Random() % 3 != 0)
        return FALSE;
-    if (gUnknown_02024250[gActiveBank] == 0)
+    if (gLastLandedMoves[gActiveBank] == 0)
        return FALSE;
-    if (gUnknown_02024250[gActiveBank] == 0xFFFF)
+    if (gLastLandedMoves[gActiveBank] == 0xFFFF)
        return FALSE;
-    if (gBattleMoves[gUnknown_02024250[gActiveBank]].power == 0)
+    if (gBattleMoves[gLastLandedMoves[gActiveBank]].power == 0)
        return FALSE;

    if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
@@ -162,11 +162,11 @@ static bool8 FindMonThatAbsorbsOpponentsMove(void)
        bankIn2 = gActiveBank;
    }

-    if (gBattleMoves[gUnknown_02024250[gActiveBank]].type == TYPE_FIRE)
+    if (gBattleMoves[gLastLandedMoves[gActiveBank]].type == TYPE_FIRE)
        absorbingTypeAbility = ABILITY_FLASH_FIRE;
-    else if (gBattleMoves[gUnknown_02024250[gActiveBank]].type == TYPE_WATER)
+    else if (gBattleMoves[gLastLandedMoves[gActiveBank]].type == TYPE_WATER)
        absorbingTypeAbility = ABILITY_WATER_ABSORB;
-    else if (gBattleMoves[gUnknown_02024250[gActiveBank]].type == TYPE_ELECTRIC)
+    else if (gBattleMoves[gLastLandedMoves[gActiveBank]].type == TYPE_ELECTRIC)
        absorbingTypeAbility = ABILITY_VOLT_ABSORB;
    else
        return FALSE;
@@ -238,13 +238,13 @@ static bool8 ShouldSwitchIfNaturalCure(void)
    if (gBattleMons[gActiveBank].hp < gBattleMons[gActiveBank].maxHP / 2)
        return FALSE;

-    if ((gUnknown_02024250[gActiveBank] == 0 || gUnknown_02024250[gActiveBank] == 0xFFFF) && Random() & 1)
+    if ((gLastLandedMoves[gActiveBank] == 0 || gLastLandedMoves[gActiveBank] == 0xFFFF) && Random() & 1)
    {
        *(gBattleStruct->AI_monToSwitchIntoId + gActiveBank) = 6;
        EmitTwoReturnValues(1, ACTION_SWITCH, 0);
        return TRUE;
    }
-    else if (gBattleMoves[gUnknown_02024250[gActiveBank]].power == 0 && Random() & 1)
+    else if (gBattleMoves[gLastLandedMoves[gActiveBank]].power == 0 && Random() & 1)
    {
        *(gBattleStruct->AI_monToSwitchIntoId + gActiveBank) = 6;
        EmitTwoReturnValues(1, ACTION_SWITCH, 0);
@@ -345,13 +345,13 @@ static bool8 FindMonWithFlagsAndSuperEffective(u8 flags, u8 moduloPercent)
    u16 move;
    u8 moveFlags;

-    if (gUnknown_02024250[gActiveBank] == 0)
+    if (gLastLandedMoves[gActiveBank] == 0)
        return FALSE;
-    if (gUnknown_02024250[gActiveBank] == 0xFFFF)
+    if (gLastLandedMoves[gActiveBank] == 0xFFFF)
        return FALSE;
-    if (gUnknown_02024270[gActiveBank] == 0xFF)
+    if (gLastHitBy[gActiveBank] == 0xFF)
        return FALSE;
-    if (gBattleMoves[gUnknown_02024250[gActiveBank]].power == 0)
+    if (gBattleMoves[gLastLandedMoves[gActiveBank]].power == 0)
        return FALSE;

    if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
@@ -411,10 +411,10 @@ static bool8 FindMonWithFlagsAndSuperEffective(u8 flags, u8 moduloPercent)
        else
            monAbility = gBaseStats[species].ability1;

-        moveFlags = AI_TypeCalc(gUnknown_02024250[gActiveBank], species, monAbility);
+        moveFlags = AI_TypeCalc(gLastLandedMoves[gActiveBank], species, monAbility);
        if (moveFlags & flags)
        {
-            bankIn1 = gUnknown_02024270[gActiveBank];
+            bankIn1 = gLastHitBy[gActiveBank];

            for (j = 0; j < 4; j++)
            {
--- a/src/battle_controller_link_opponent.c
+++ b/src/battle_controller_link_opponent.c
@@ -82,7 +82,7 @@ static void LinkOpponentHandleBallThrowAnim(void);
 static void LinkOpponentHandlePause(void);
 static void LinkOpponentHandleMoveAnimation(void);
 static void LinkOpponentHandlePrintString(void);
-static void LinkOpponentHandlePrintStringPlayerOnly(void);
+static void LinkOpponentHandlePrintSelectionString(void);
 static void LinkOpponentHandleChooseAction(void);
 static void LinkOpponentHandleUnknownYesNoBox(void);
 static void LinkOpponentHandleChooseMove(void);
@@ -108,7 +108,7 @@ static void LinkOpponentHandleCmd39(void);
 static void LinkOpponentHandleCmd40(void);
 static void LinkOpponentHandleHitAnimation(void);
 static void LinkOpponentHandleCmd42(void);
-static void LinkOpponentHandleEffectivenessSound(void);
+static void LinkOpponentHandlePlaySE(void);
 static void LinkOpponentHandlePlayFanfareOrBGM(void);
 static void LinkOpponentHandleFaintingCry(void);
 static void LinkOpponentHandleIntroSlide(void);
@@ -154,7 +154,7 @@ static void (*const sLinkOpponentBufferCommands[CONTROLLER_CMDS_COUNT])(void) =
    LinkOpponentHandlePause,
    LinkOpponentHandleMoveAnimation,
    LinkOpponentHandlePrintString,
-    LinkOpponentHandlePrintStringPlayerOnly,
+    LinkOpponentHandlePrintSelectionString,
    LinkOpponentHandleChooseAction,
    LinkOpponentHandleUnknownYesNoBox,
    LinkOpponentHandleChooseMove,
@@ -180,7 +180,7 @@ static void (*const sLinkOpponentBufferCommands[CONTROLLER_CMDS_COUNT])(void) =
    LinkOpponentHandleCmd40,
    LinkOpponentHandleHitAnimation,
    LinkOpponentHandleCmd42,
-    LinkOpponentHandleEffectivenessSound,
+    LinkOpponentHandlePlaySE,
    LinkOpponentHandlePlayFanfareOrBGM,
    LinkOpponentHandleFaintingCry,
    LinkOpponentHandleIntroSlide,
@@ -1505,7 +1505,7 @@ static void LinkOpponentHandlePrintString(void)
    sub_817C95C(*stringId);
 }

-static void LinkOpponentHandlePrintStringPlayerOnly(void)
+static void LinkOpponentHandlePrintSelectionString(void)
 {
    LinkOpponentBufferExecCompleted();
 }
@@ -1681,7 +1681,7 @@ static void LinkOpponentHandleCmd42(void)
    LinkOpponentBufferExecCompleted();
 }

-static void LinkOpponentHandleEffectivenessSound(void)
+static void LinkOpponentHandlePlaySE(void)
 {
    s8 pan;

--- a/src/battle_controller_link_partner.c
+++ b/src/battle_controller_link_partner.c
@@ -78,7 +78,7 @@ static void LinkPartnerHandleBallThrowAnim(void);
 static void LinkPartnerHandlePause(void);
 static void LinkPartnerHandleMoveAnimation(void);
 static void LinkPartnerHandlePrintString(void);
-static void LinkPartnerHandlePrintStringPlayerOnly(void);
+static void LinkPartnerHandlePrintSelectionString(void);
 static void LinkPartnerHandleChooseAction(void);
 static void LinkPartnerHandleUnknownYesNoBox(void);
 static void LinkPartnerHandleChooseMove(void);
@@ -104,7 +104,7 @@ static void LinkPartnerHandleCmd39(void);
 static void LinkPartnerHandleCmd40(void);
 static void LinkPartnerHandleHitAnimation(void);
 static void LinkPartnerHandleCmd42(void);
-static void LinkPartnerHandleEffectivenessSound(void);
+static void LinkPartnerHandlePlaySE(void);
 static void LinkPartnerHandlePlayFanfareOrBGM(void);
 static void LinkPartnerHandleFaintingCry(void);
 static void LinkPartnerHandleIntroSlide(void);
@@ -149,7 +149,7 @@ static void (*const sLinkPartnerBufferCommands[CONTROLLER_CMDS_COUNT])(void) =
    LinkPartnerHandlePause,
    LinkPartnerHandleMoveAnimation,
    LinkPartnerHandlePrintString,
-    LinkPartnerHandlePrintStringPlayerOnly,
+    LinkPartnerHandlePrintSelectionString,
    LinkPartnerHandleChooseAction,
    LinkPartnerHandleUnknownYesNoBox,
    LinkPartnerHandleChooseMove,
@@ -175,7 +175,7 @@ static void (*const sLinkPartnerBufferCommands[CONTROLLER_CMDS_COUNT])(void) =
    LinkPartnerHandleCmd40,
    LinkPartnerHandleHitAnimation,
    LinkPartnerHandleCmd42,
-    LinkPartnerHandleEffectivenessSound,
+    LinkPartnerHandlePlaySE,
    LinkPartnerHandlePlayFanfareOrBGM,
    LinkPartnerHandleFaintingCry,
    LinkPartnerHandleIntroSlide,
@@ -1327,7 +1327,7 @@ static void LinkPartnerHandlePrintString(void)
    sub_817C95C(*stringId);
 }

-static void LinkPartnerHandlePrintStringPlayerOnly(void)
+static void LinkPartnerHandlePrintSelectionString(void)
 {
    LinkPartnerBufferExecCompleted();
 }
@@ -1503,7 +1503,7 @@ static void LinkPartnerHandleCmd42(void)
    LinkPartnerBufferExecCompleted();
 }

-static void LinkPartnerHandleEffectivenessSound(void)
+static void LinkPartnerHandlePlaySE(void)
 {
    s8 pan;

--- a/src/battle_controller_opponent.c
+++ b/src/battle_controller_opponent.c
@@ -83,7 +83,7 @@ static void OpponentHandleBallThrow(void);
 static void OpponentHandlePause(void);
 static void OpponentHandleMoveAnimation(void);
 static void OpponentHandlePrintString(void);
-static void OpponentHandlePrintStringPlayerOnly(void);
+static void OpponentHandlePrintSelectionString(void);
 static void OpponentHandleChooseAction(void);
 static void OpponentHandleUnknownYesNoBox(void);
 static void OpponentHandleChooseMove(void);
@@ -109,7 +109,7 @@ static void OpponentHandleCmd39(void);
 static void OpponentHandleCmd40(void);
 static void OpponentHandleHitAnimation(void);
 static void OpponentHandleCmd42(void);
-static void OpponentHandleEffectivenessSound(void);
+static void OpponentHandlePlaySE(void);
 static void OpponentHandlePlayFanfareOrBGM(void);
 static void OpponentHandleFaintingCry(void);
 static void OpponentHandleIntroSlide(void);
@@ -155,7 +155,7 @@ static void (*const sOpponentBufferCommands[CONTROLLER_CMDS_COUNT])(void) =
    OpponentHandlePause,
    OpponentHandleMoveAnimation,
    OpponentHandlePrintString,
-    OpponentHandlePrintStringPlayerOnly,
+    OpponentHandlePrintSelectionString,
    OpponentHandleChooseAction,
    OpponentHandleUnknownYesNoBox,
    OpponentHandleChooseMove,
@@ -181,7 +181,7 @@ static void (*const sOpponentBufferCommands[CONTROLLER_CMDS_COUNT])(void) =
    OpponentHandleCmd40,
    OpponentHandleHitAnimation,
    OpponentHandleCmd42,
-    OpponentHandleEffectivenessSound,
+    OpponentHandlePlaySE,
    OpponentHandlePlayFanfareOrBGM,
    OpponentHandleFaintingCry,
    OpponentHandleIntroSlide,
@@ -1537,7 +1537,7 @@ static void OpponentHandlePrintString(void)
    sub_81A57E4(gActiveBank, *stringId);
 }

-static void OpponentHandlePrintStringPlayerOnly(void)
+static void OpponentHandlePrintSelectionString(void)
 {
    OpponentBufferExecCompleted();
 }
@@ -1826,7 +1826,7 @@ static void OpponentHandleCmd42(void)
    OpponentBufferExecCompleted();
 }

-static void OpponentHandleEffectivenessSound(void)
+static void OpponentHandlePlaySE(void)
 {
    s8 pan;

--- a/src/battle_controller_player.c
+++ b/src/battle_controller_player.c
@@ -102,7 +102,7 @@ static void PlayerHandleBallThrowAnim(void);
 static void PlayerHandlePause(void);
 static void PlayerHandleMoveAnimation(void);
 static void PlayerHandlePrintString(void);
-static void PlayerHandlePrintStringPlayerOnly(void);
+static void PlayerHandlePrintSelectionString(void);
 static void PlayerHandleChooseAction(void);
 static void PlayerHandleUnknownYesNoBox(void);
 static void PlayerHandleChooseMove(void);
@@ -128,7 +128,7 @@ static void PlayerHandleCmd39(void);
 static void PlayerHandleCmd40(void);
 static void PlayerHandleHitAnimation(void);
 static void PlayerHandleCmd42(void);
-static void PlayerHandleEffectivenessSound(void);
+static void PlayerHandlePlaySE(void);
 static void PlayerHandlePlayFanfareOrBGM(void);
 static void PlayerHandleFaintingCry(void);
 static void PlayerHandleIntroSlide(void);
@@ -189,7 +189,7 @@ static void (*const sPlayerBufferCommands[CONTROLLER_CMDS_COUNT])(void) =
    PlayerHandlePause,
    PlayerHandleMoveAnimation,
    PlayerHandlePrintString,
-    PlayerHandlePrintStringPlayerOnly,
+    PlayerHandlePrintSelectionString,
    PlayerHandleChooseAction,
    PlayerHandleUnknownYesNoBox,
    PlayerHandleChooseMove,
@@ -215,7 +215,7 @@ static void (*const sPlayerBufferCommands[CONTROLLER_CMDS_COUNT])(void) =
    PlayerHandleCmd40,
    PlayerHandleHitAnimation,
    PlayerHandleCmd42,
-    PlayerHandleEffectivenessSound,
+    PlayerHandlePlaySE,
    PlayerHandlePlayFanfareOrBGM,
    PlayerHandleFaintingCry,
    PlayerHandleIntroSlide,
@@ -2576,7 +2576,7 @@ static void PlayerHandlePrintString(void)
    sub_81A57E4(gActiveBank, *stringId);
 }

-static void PlayerHandlePrintStringPlayerOnly(void)
+static void PlayerHandlePrintSelectionString(void)
 {
    if (GetBankSide(gActiveBank) == SIDE_PLAYER)
        PlayerHandlePrintString();
@@ -2913,7 +2913,7 @@ static void PlayerHandleCmd42(void)
    PlayerBufferExecCompleted();
 }

-static void PlayerHandleEffectivenessSound(void)
+static void PlayerHandlePlaySE(void)
 {
    s8 pan;

--- a/src/battle_controller_player_partner.c
+++ b/src/battle_controller_player_partner.c
@@ -78,7 +78,7 @@ static void PlayerPartnerHandleBallThrowAnim(void);
 static void PlayerPartnerHandlePause(void);
 static void PlayerPartnerHandleMoveAnimation(void);
 static void PlayerPartnerHandlePrintString(void);
-static void PlayerPartnerHandlePrintStringPlayerOnly(void);
+static void PlayerPartnerHandlePrintSelectionString(void);
 static void PlayerPartnerHandleChooseAction(void);
 static void PlayerPartnerHandleUnknownYesNoBox(void);
 static void PlayerPartnerHandleChooseMove(void);
@@ -104,7 +104,7 @@ static void PlayerPartnerHandleCmd39(void);
 static void PlayerPartnerHandleCmd40(void);
 static void PlayerPartnerHandleHitAnimation(void);
 static void PlayerPartnerHandleCmd42(void);
-static void PlayerPartnerHandleEffectivenessSound(void);
+static void PlayerPartnerHandlePlaySE(void);
 static void PlayerPartnerHandlePlayFanfareOrBGM(void);
 static void PlayerPartnerHandleFaintingCry(void);
 static void PlayerPartnerHandleIntroSlide(void);
@@ -155,7 +155,7 @@ static void (*const sPlayerPartnerBufferCommands[CONTROLLER_CMDS_COUNT])(void) =
    PlayerPartnerHandlePause,
    PlayerPartnerHandleMoveAnimation,
    PlayerPartnerHandlePrintString,
-    PlayerPartnerHandlePrintStringPlayerOnly,
+    PlayerPartnerHandlePrintSelectionString,
    PlayerPartnerHandleChooseAction,
    PlayerPartnerHandleUnknownYesNoBox,
    PlayerPartnerHandleChooseMove,
@@ -181,7 +181,7 @@ static void (*const sPlayerPartnerBufferCommands[CONTROLLER_CMDS_COUNT])(void) =
    PlayerPartnerHandleCmd40,
    PlayerPartnerHandleHitAnimation,
    PlayerPartnerHandleCmd42,
-    PlayerPartnerHandleEffectivenessSound,
+    PlayerPartnerHandlePlaySE,
    PlayerPartnerHandlePlayFanfareOrBGM,
    PlayerPartnerHandleFaintingCry,
    PlayerPartnerHandleIntroSlide,
@@ -1519,7 +1519,7 @@ static void PlayerPartnerHandlePrintString(void)
    gBattleBankFunc[gActiveBank] = CompleteOnInactiveTextPrinter2;
 }

-static void PlayerPartnerHandlePrintStringPlayerOnly(void)
+static void PlayerPartnerHandlePrintSelectionString(void)
 {
    PlayerPartnerBufferExecCompleted();
 }
@@ -1756,7 +1756,7 @@ static void PlayerPartnerHandleCmd42(void)
    PlayerPartnerBufferExecCompleted();
 }

-static void PlayerPartnerHandleEffectivenessSound(void)
+static void PlayerPartnerHandlePlaySE(void)
 {
    s8 pan;

--- a/src/battle_controller_recorded_opponent.c
+++ b/src/battle_controller_recorded_opponent.c
@@ -81,7 +81,7 @@ static void RecordedOpponentHandleBallThrowAnim(void);
 static void RecordedOpponentHandlePause(void);
 static void RecordedOpponentHandleMoveAnimation(void);
 static void RecordedOpponentHandlePrintString(void);
-static void RecordedOpponentHandlePrintStringPlayerOnly(void);
+static void RecordedOpponentHandlePrintSelectionString(void);
 static void RecordedOpponentHandleChooseAction(void);
 static void RecordedOpponentHandleUnknownYesNoBox(void);
 static void RecordedOpponentHandleChooseMove(void);
@@ -107,7 +107,7 @@ static void RecordedOpponentHandleCmd39(void);
 static void RecordedOpponentHandleCmd40(void);
 static void RecordedOpponentHandleHitAnimation(void);
 static void RecordedOpponentHandleCmd42(void);
-static void RecordedOpponentHandleEffectivenessSound(void);
+static void RecordedOpponentHandlePlaySE(void);
 static void RecordedOpponentHandlePlayFanfareOrBGM(void);
 static void RecordedOpponentHandleFaintingCry(void);
 static void RecordedOpponentHandleIntroSlide(void);
@@ -153,7 +153,7 @@ static void (*const sRecordedOpponentBufferCommands[CONTROLLER_CMDS_COUNT])(void
    RecordedOpponentHandlePause,
    RecordedOpponentHandleMoveAnimation,
    RecordedOpponentHandlePrintString,
-    RecordedOpponentHandlePrintStringPlayerOnly,
+    RecordedOpponentHandlePrintSelectionString,
    RecordedOpponentHandleChooseAction,
    RecordedOpponentHandleUnknownYesNoBox,
    RecordedOpponentHandleChooseMove,
@@ -179,7 +179,7 @@ static void (*const sRecordedOpponentBufferCommands[CONTROLLER_CMDS_COUNT])(void
    RecordedOpponentHandleCmd40,
    RecordedOpponentHandleHitAnimation,
    RecordedOpponentHandleCmd42,
-    RecordedOpponentHandleEffectivenessSound,
+    RecordedOpponentHandlePlaySE,
    RecordedOpponentHandlePlayFanfareOrBGM,
    RecordedOpponentHandleFaintingCry,
    RecordedOpponentHandleIntroSlide,
@@ -1435,7 +1435,7 @@ static void RecordedOpponentHandlePrintString(void)
    gBattleBankFunc[gActiveBank] = CompleteOnInactiveTextPrinter;
 }

-static void RecordedOpponentHandlePrintStringPlayerOnly(void)
+static void RecordedOpponentHandlePrintSelectionString(void)
 {
    RecordedOpponentBufferExecCompleted();
 }
@@ -1625,7 +1625,7 @@ static void RecordedOpponentHandleCmd42(void)
    RecordedOpponentBufferExecCompleted();
 }

-static void RecordedOpponentHandleEffectivenessSound(void)
+static void RecordedOpponentHandlePlaySE(void)
 {
    s8 pan;

--- a/src/battle_controller_recorded_player.c
+++ b/src/battle_controller_recorded_player.c
@@ -81,7 +81,7 @@ static void RecordedPlayerHandleBallThrowAnim(void);
 static void RecordedPlayerHandlePause(void);
 static void RecordedPlayerHandleMoveAnimation(void);
 static void RecordedPlayerHandlePrintString(void);
-static void RecordedPlayerHandlePrintStringPlayerOnly(void);
+static void RecordedPlayerHandlePrintSelectionString(void);
 static void RecordedPlayerHandleChooseAction(void);
 static void RecordedPlayerHandleUnknownYesNoBox(void);
 static void RecordedPlayerHandleChooseMove(void);
@@ -107,7 +107,7 @@ static void RecordedPlayerHandleCmd39(void);
 static void RecordedPlayerHandleCmd40(void);
 static void RecordedPlayerHandleHitAnimation(void);
 static void RecordedPlayerHandleCmd42(void);
-static void RecordedPlayerHandleEffectivenessSound(void);
+static void RecordedPlayerHandlePlaySE(void);
 static void RecordedPlayerHandlePlayFanfareOrBGM(void);
 static void RecordedPlayerHandleFaintingCry(void);
 static void RecordedPlayerHandleIntroSlide(void);
@@ -152,7 +152,7 @@ static void (*const sRecordedPlayerBufferCommands[CONTROLLER_CMDS_COUNT])(void)
    RecordedPlayerHandlePause,
    RecordedPlayerHandleMoveAnimation,
    RecordedPlayerHandlePrintString,
-    RecordedPlayerHandlePrintStringPlayerOnly,
+    RecordedPlayerHandlePrintSelectionString,
    RecordedPlayerHandleChooseAction,
    RecordedPlayerHandleUnknownYesNoBox,
    RecordedPlayerHandleChooseMove,
@@ -178,7 +178,7 @@ static void (*const sRecordedPlayerBufferCommands[CONTROLLER_CMDS_COUNT])(void)
    RecordedPlayerHandleCmd40,
    RecordedPlayerHandleHitAnimation,
    RecordedPlayerHandleCmd42,
-    RecordedPlayerHandleEffectivenessSound,
+    RecordedPlayerHandlePlaySE,
    RecordedPlayerHandlePlayFanfareOrBGM,
    RecordedPlayerHandleFaintingCry,
    RecordedPlayerHandleIntroSlide,
@@ -1437,7 +1437,7 @@ static void RecordedPlayerHandlePrintString(void)
    gBattleBankFunc[gActiveBank] = CompleteOnInactiveTextPrinter;
 }

-static void RecordedPlayerHandlePrintStringPlayerOnly(void)
+static void RecordedPlayerHandlePrintSelectionString(void)
 {
    RecordedPlayerBufferExecCompleted();
 }
@@ -1644,7 +1644,7 @@ static void RecordedPlayerHandleCmd42(void)
    RecordedPlayerBufferExecCompleted();
 }

-static void RecordedPlayerHandleEffectivenessSound(void)
+static void RecordedPlayerHandlePlaySE(void)
 {
    s8 pan;

--- a/src/battle_controller_safari.c
+++ b/src/battle_controller_safari.c
@@ -66,7 +66,7 @@ static void SafariHandleBallThrowAnim(void);
 static void SafariHandlePause(void);
 static void SafariHandleMoveAnimation(void);
 static void SafariHandlePrintString(void);
-static void SafariHandlePrintStringPlayerOnly(void);
+static void SafariHandlePrintSelectionString(void);
 static void SafariHandleChooseAction(void);
 static void SafariHandleUnknownYesNoBox(void);
 static void SafariHandleChooseMove(void);
@@ -92,7 +92,7 @@ static void SafariHandleCmd39(void);
 static void SafariHandleCmd40(void);
 static void SafariHandleHitAnimation(void);
 static void SafariHandleCmd42(void);
-static void SafariHandleEffectivenessSound(void);
+static void SafariHandlePlaySE(void);
 static void SafariHandlePlayFanfareOrBGM(void);
 static void SafariHandleFaintingCry(void);
 static void SafariHandleIntroSlide(void);
@@ -130,7 +130,7 @@ static void (*const sSafariBufferCommands[CONTROLLER_CMDS_COUNT])(void) =
    SafariHandlePause,
    SafariHandleMoveAnimation,
    SafariHandlePrintString,
-    SafariHandlePrintStringPlayerOnly,
+    SafariHandlePrintSelectionString,
    SafariHandleChooseAction,
    SafariHandleUnknownYesNoBox,
    SafariHandleChooseMove,
@@ -156,7 +156,7 @@ static void (*const sSafariBufferCommands[CONTROLLER_CMDS_COUNT])(void) =
    SafariHandleCmd40,
    SafariHandleHitAnimation,
    SafariHandleCmd42,
-    SafariHandleEffectivenessSound,
+    SafariHandlePlaySE,
    SafariHandlePlayFanfareOrBGM,
    SafariHandleFaintingCry,
    SafariHandleIntroSlide,
@@ -449,7 +449,7 @@ static void SafariHandlePrintString(void)
    gBattleBankFunc[gActiveBank] = CompleteOnInactiveTextPrinter;
 }

-static void SafariHandlePrintStringPlayerOnly(void)
+static void SafariHandlePrintSelectionString(void)
 {
    if (GetBankSide(gActiveBank) == SIDE_PLAYER)
        SafariHandlePrintString();
@@ -607,7 +607,7 @@ static void SafariHandleCmd42(void)
    SafariBufferExecCompleted();
 }

-static void SafariHandleEffectivenessSound(void)
+static void SafariHandlePlaySE(void)
 {
    s8 pan;

--- a/src/battle_controller_wally.c
+++ b/src/battle_controller_wally.c
@@ -86,7 +86,7 @@ static void WallyHandleBallThrowAnim(void);
 static void WallyHandlePause(void);
 static void WallyHandleMoveAnimation(void);
 static void WallyHandlePrintString(void);
-static void WallyHandlePrintStringPlayerOnly(void);
+static void WallyHandlePrintSelectionString(void);
 static void WallyHandleChooseAction(void);
 static void WallyHandleUnknownYesNoBox(void);
 static void WallyHandleChooseMove(void);
@@ -112,7 +112,7 @@ static void WallyHandleCmd39(void);
 static void WallyHandleCmd40(void);
 static void WallyHandleHitAnimation(void);
 static void WallyHandleCmd42(void);
-static void WallyHandleEffectivenessSound(void);
+static void WallyHandlePlaySE(void);
 static void WallyHandlePlayFanfareOrBGM(void);
 static void WallyHandleFaintingCry(void);
 static void WallyHandleIntroSlide(void);
@@ -155,7 +155,7 @@ static void (*const sWallyBufferCommands[CONTROLLER_CMDS_COUNT])(void) =
    WallyHandlePause,
    WallyHandleMoveAnimation,
    WallyHandlePrintString,
-    WallyHandlePrintStringPlayerOnly,
+    WallyHandlePrintSelectionString,
    WallyHandleChooseAction,
    WallyHandleUnknownYesNoBox,
    WallyHandleChooseMove,
@@ -181,7 +181,7 @@ static void (*const sWallyBufferCommands[CONTROLLER_CMDS_COUNT])(void) =
    WallyHandleCmd40,
    WallyHandleHitAnimation,
    WallyHandleCmd42,
-    WallyHandleEffectivenessSound,
+    WallyHandlePlaySE,
    WallyHandlePlayFanfareOrBGM,
    WallyHandleFaintingCry,
    WallyHandleIntroSlide,
@@ -1211,7 +1211,7 @@ static void WallyHandlePrintString(void)
    gBattleBankFunc[gActiveBank] = CompleteOnInactiveTextPrinter;
 }

-static void WallyHandlePrintStringPlayerOnly(void)
+static void WallyHandlePrintSelectionString(void)
 {
    if (GetBankSide(gActiveBank) == SIDE_PLAYER)
        WallyHandlePrintString();
@@ -1419,7 +1419,7 @@ static void WallyHandleCmd42(void)
    WallyBufferExecCompleted();
 }

-static void WallyHandleEffectivenessSound(void)
+static void WallyHandlePlaySE(void)
 {
    PlaySE(gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8));
    WallyBufferExecCompleted();
--- 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 gLastUsedMove;
+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->lastMove = gLastUsedMove;
+    stringInfo->originallyUsedMove = gChosenMove;
    stringInfo->lastItem = gLastUsedItem;
    stringInfo->lastAbility = gLastUsedAbility;
    stringInfo->scrActive = gBattleScripting.bank;
@@ -1140,10 +1140,10 @@ void EmitPrintString(u8 bufferId, u16 stringID)
    PrepareBufferDataTransfer(bufferId, gBattleBuffersTransferData, sizeof(struct StringInfoBattle) + 4);
 }

-void EmitPrintStringPlayerOnly(u8 bufferId, u16 stringID)
+void EmitPrintSelectionString(u8 bufferId, u16 stringID)
 {
    s32 i;
-    struct StringInfoBattle* stringInfo;
+    struct StringInfoBattle *stringInfo;

    gBattleBuffersTransferData[0] = CONTROLLER_PRINTSTRINGPLAYERONLY;
    gBattleBuffersTransferData[1] = CONTROLLER_PRINTSTRINGPLAYERONLY;
@@ -1152,7 +1152,7 @@ void EmitPrintStringPlayerOnly(u8 bufferId, u16 stringID)

    stringInfo = (struct StringInfoBattle*)(&gBattleBuffersTransferData[4]);
    stringInfo->currentMove = gCurrentMove;
-    stringInfo->lastMove = gLastUsedMove;
+    stringInfo->originallyUsedMove = gChosenMove;
    stringInfo->lastItem = gLastUsedItem;
    stringInfo->lastAbility = gLastUsedAbility;
    stringInfo->scrActive = gBattleScripting.bank;
@@ -1427,7 +1427,7 @@ void EmitCmd42(u8 bufferId)
    PrepareBufferDataTransfer(bufferId, gBattleBuffersTransferData, 4);
 }

-void EmitEffectivenessSound(u8 bufferId, u16 songId)
+void EmitPlaySE(u8 bufferId, u16 songId)
 {
    gBattleBuffersTransferData[0] = CONTROLLER_EFFECTIVENESSSOUND;
    gBattleBuffersTransferData[1] = songId;
--- a/src/battle_message.c
+++ b/src/battle_message.c
@@ -932,58 +932,237 @@ const u16 gSandStormHailDmgStringIds[] =
    STRINGID_PKMNBUFFETEDBYSANDSTORM, STRINGID_PKMNPELTEDBYHAIL
 };

-// todo once battlescripts are dumped
-const u16 gTooLazyToSplitThemStringIds[] =
+const u16 gSandStormHailEndStringIds[] =
 {
-    STRINGID_SANDSTORMSUBSIDED, STRINGID_HAILSTOPPED, STRINGID_RAINCONTINUES, STRINGID_DOWNPOURCONTINUES,
-    STRINGID_RAINSTOPPED, STRINGID_PKMNPROTECTEDITSELF2, STRINGID_PKMNBRACEDITSELF,
-    STRINGID_BUTITFAILED, STRINGID_BUTITFAILED, STRINGID_PKMNRAISEDDEF,
-    STRINGID_PKMNRAISEDDEFALITTLE, STRINGID_PKMNRAISEDSPDEF, STRINGID_PKMNRAISEDSPDEFALITTLE,
-    STRINGID_PKMNCOVEREDBYVEIL, STRINGID_PKMNSEEDED, STRINGID_PKMNEVADEDATTACK,
+    STRINGID_SANDSTORMSUBSIDED, STRINGID_HAILSTOPPED
+};
+
+const u16 gRainContinuesStringIds[] =
+{
+    STRINGID_RAINCONTINUES, STRINGID_DOWNPOURCONTINUES, STRINGID_RAINSTOPPED
+};
+
+const u16 gProtectLikeUsedStringIds[] =
+{
+    STRINGID_PKMNPROTECTEDITSELF2, STRINGID_PKMNBRACEDITSELF, STRINGID_BUTITFAILED
+};
+
+const u16 gReflectLightScreenSafeguardStringIds[] =
+{
+    STRINGID_BUTITFAILED, STRINGID_PKMNRAISEDDEF, STRINGID_PKMNRAISEDDEFALITTLE,
+    STRINGID_PKMNRAISEDSPDEF, STRINGID_PKMNRAISEDSPDEFALITTLE, STRINGID_PKMNCOVEREDBYVEIL
+};
+
+const u16 gLeechSeedStringIds[] =
+{
+    STRINGID_PKMNSEEDED, STRINGID_PKMNEVADEDATTACK,
    STRINGID_ITDOESNTAFFECT, STRINGID_PKMNSAPPEDBYLEECHSEED, STRINGID_ITSUCKEDLIQUIDOOZE,
-    STRINGID_PKMNWENTTOSLEEP, STRINGID_PKMNSLEPTHEALTHY, STRINGID_PKMNMAKINGUPROAR,
-    STRINGID_PKMNCALMEDDOWN, STRINGID_PKMNSTOCKPILED, STRINGID_PKMNCANTSTOCKPILE,
-    STRINGID_PKMNWOKEUP, STRINGID_PKMNWOKEUPINUPROAR, STRINGID_FAILEDTOSWALLOW,
-    STRINGID_PKMNHPFULL, STRINGID_PKMNCANTSLEEPINUPROAR2, STRINGID_UPROARKEPTPKMNAWAKE,
-    STRINGID_PKMNSTAYEDAWAKEUSING, STRINGID_PKMNSSTATCHANGED, STRINGID_PKMNSSTATCHANGED2,
-    STRINGID_STATSWONTINCREASE, STRINGID_EMPTYSTRING3, STRINGID_USINGXTHEYOFZN,
-    STRINGID_PKMNUSEDXTOGETPUMPED, STRINGID_PKMNSSTATCHANGED3, STRINGID_PKMNSSTATCHANGED4,
-    STRINGID_STATSWONTDECREASE, STRINGID_EMPTYSTRING3, STRINGID_PKMNWHIPPEDWHIRLWIND,
-    STRINGID_PKMNTOOKSUNLIGHT, STRINGID_PKMNLOWEREDHEAD, STRINGID_PKMNISGLOWING,
-    STRINGID_PKMNFLEWHIGH, STRINGID_PKMNDUGHOLE, STRINGID_PKMNHIDUNDERWATER,
-    STRINGID_PKMNSPRANGUP, STRINGID_PKMNSQUEEZEDBYBIND, STRINGID_PKMNWRAPPEDBY,
-    STRINGID_PKMNTRAPPEDINVORTEX, STRINGID_PKMNCLAMPED, STRINGID_PKMNTRAPPEDINVORTEX,
-    STRINGID_PKMNTRAPPEDBYSANDTOMB, STRINGID_PKMNSHROUDEDINMIST, STRINGID_BUTITFAILED,
-    STRINGID_PKMNGETTINGPUMPED, STRINGID_BUTITFAILED, STRINGID_PKMNTRANSFORMEDINTO,
-    STRINGID_BUTITFAILED, STRINGID_PKMNMADESUBSTITUTE, STRINGID_TOOWEAKFORSUBSTITUTE,
-    STRINGID_PKMNWASPOISONED, STRINGID_PKMNPOISONEDBY, STRINGID_PKMNWASPARALYZED,
-    STRINGID_PKMNWASPARALYZEDBY, STRINGID_PKMNFELLASLEEP, STRINGID_PKMNMADESLEEP,
-    STRINGID_PKMNWASBURNED, STRINGID_PKMNBURNEDBY, STRINGID_PKMNWASFROZEN,
-    STRINGID_PKMNFROZENBY, STRINGID_PKMNWASDEFROSTED2, STRINGID_PKMNWASDEFROSTEDBY,
-    STRINGID_ATTACKMISSED, STRINGID_PKMNUNAFFECTED, STRINGID_PKMNFELLINLOVE,
-    STRINGID_PKMNSXINFATUATEDY, STRINGID_PKMNENERGYDRAINED, STRINGID_ITSUCKEDLIQUIDOOZE,
-    STRINGID_ELECTRICITYWEAKENED, STRINGID_FIREWEAKENED, STRINGID_BELLCHIMED,
-    STRINGID_BELLCHIMED, STRINGID_BELLCHIMED, STRINGID_BELLCHIMED,
-    STRINGID_SOOTHINGAROMA, STRINGID_PKMNFORESAWATTACK, STRINGID_PKMNCHOSEXASDESTINY,
-    STRINGID_PKMNBROKEFREE, STRINGID_ITAPPEAREDCAUGHT, STRINGID_AARGHALMOSTHADIT,
-    STRINGID_SHOOTSOCLOSE, STRINGID_ITISRAINING, STRINGID_ITISRAINING,
+};
+
+const u16 gRestUsedStringIds[] =
+{
+    STRINGID_PKMNWENTTOSLEEP, STRINGID_PKMNSLEPTHEALTHY
+};
+
+const u16 gUproarOverTurnStringIds[] =
+{
+    STRINGID_PKMNMAKINGUPROAR, STRINGID_PKMNCALMEDDOWN
+};
+
+const u16 gStockpileUsedStringIds[] =
+{
+    STRINGID_PKMNSTOCKPILED, STRINGID_PKMNCANTSTOCKPILE,
+};
+
+const u16 gWokeUpStringIds[] =
+{
+    STRINGID_PKMNWOKEUP, STRINGID_PKMNWOKEUPINUPROAR
+};
+
+const u16 gSwallowFailStringIds[] =
+{
+    STRINGID_FAILEDTOSWALLOW, STRINGID_PKMNHPFULL
+};
+
+const u16 gUproarAwakeStringIds[] =
+{
+    STRINGID_PKMNCANTSLEEPINUPROAR2, STRINGID_UPROARKEPTPKMNAWAKE, STRINGID_PKMNSTAYEDAWAKEUSING
+};
+
+const u16 gStatUpStringIds[] =
+{
+    STRINGID_PKMNSSTATCHANGED, STRINGID_PKMNSSTATCHANGED2, STRINGID_STATSWONTINCREASE,
+    STRINGID_EMPTYSTRING3, STRINGID_USINGXTHEYOFZN, STRINGID_PKMNUSEDXTOGETPUMPED
+};
+
+const u16 gStatDownStringIds[] =
+{
+    STRINGID_PKMNSSTATCHANGED3, STRINGID_PKMNSSTATCHANGED4, STRINGID_STATSWONTDECREASE, STRINGID_EMPTYSTRING3
+};
+
+const u16 gFirstTurnOfTwoStringIds[] =
+{
+    STRINGID_PKMNWHIPPEDWHIRLWIND, STRINGID_PKMNTOOKSUNLIGHT, STRINGID_PKMNLOWEREDHEAD, STRINGID_PKMNISGLOWING,
+    STRINGID_PKMNFLEWHIGH, STRINGID_PKMNDUGHOLE, STRINGID_PKMNHIDUNDERWATER, STRINGID_PKMNSPRANGUP
+};
+
+const u16 gWrappedStringIds[] =
+{
+    STRINGID_PKMNSQUEEZEDBYBIND, STRINGID_PKMNWRAPPEDBY, STRINGID_PKMNTRAPPEDINVORTEX,
+    STRINGID_PKMNCLAMPED, STRINGID_PKMNTRAPPEDINVORTEX, STRINGID_PKMNTRAPPEDBYSANDTOMB
+};
+
+const u16 gMistUsedStringIds[] =
+{
+    STRINGID_PKMNSHROUDEDINMIST, STRINGID_BUTITFAILED
+};
+
+const u16 gFocusEnergyUsedStringIds[] =
+{
+    STRINGID_PKMNGETTINGPUMPED, STRINGID_BUTITFAILED
+};
+
+const u16 gTransformUsedStringIds[] =
+{
+    STRINGID_PKMNTRANSFORMEDINTO, STRINGID_BUTITFAILED
+};
+
+const u16 gSubsituteUsedStringIds[] =
+{
+    STRINGID_PKMNMADESUBSTITUTE, STRINGID_TOOWEAKFORSUBSTITUTE
+};
+
+const u16 gGotPoisonedStringIds[] =
+{
+    STRINGID_PKMNWASPOISONED, STRINGID_PKMNPOISONEDBY
+};
+
+const u16 gGotParalyzedStringIds[] =
+{
+    STRINGID_PKMNWASPARALYZED, STRINGID_PKMNWASPARALYZEDBY
+};
+
+const u16 gFellAsleepStringIds[] =
+{
+    STRINGID_PKMNFELLASLEEP, STRINGID_PKMNMADESLEEP,
+};
+
+const u16 gGotBurnedStringIds[] =
+{
+    STRINGID_PKMNWASBURNED, STRINGID_PKMNBURNEDBY
+};
+
+const u16 gGotFrozenStringIds[] =
+{
+    STRINGID_PKMNWASFROZEN, STRINGID_PKMNFROZENBY
+};
+
+const u16 gGotDefrostedStringIds[] =
+{
+    STRINGID_PKMNWASDEFROSTED2, STRINGID_PKMNWASDEFROSTEDBY
+};
+
+const u16 gKOFailedStringIds[] =
+{
+    STRINGID_ATTACKMISSED, STRINGID_PKMNUNAFFECTED
+};
+
+const u16 gAttractUsedStringIds[] =
+{
+    STRINGID_PKMNFELLINLOVE, STRINGID_PKMNSXINFATUATEDY
+};
+
+const u16 gLeechSeedDrainStringIds[] =
+{
+    STRINGID_PKMNENERGYDRAINED, STRINGID_ITSUCKEDLIQUIDOOZE
+};
+
+const u16 gSportsUsedStringIds[] =
+{
+    STRINGID_ELECTRICITYWEAKENED, STRINGID_FIREWEAKENED
+};
+
+const u16 gPartyStatusHealStringIds[] =
+{
+    STRINGID_BELLCHIMED, STRINGID_BELLCHIMED, STRINGID_BELLCHIMED, STRINGID_BELLCHIMED,
+    // interesting how there are four instances of the same string
+    STRINGID_SOOTHINGAROMA
+};
+
+const u16 gFutureMoveUsedStringIds[] =
+{
+    STRINGID_PKMNFORESAWATTACK, STRINGID_PKMNCHOSEXASDESTINY
+};
+
+const u16 gBallEscapeStringIds[] =
+{
+    STRINGID_PKMNBROKEFREE, STRINGID_ITAPPEAREDCAUGHT, STRINGID_AARGHALMOSTHADIT, STRINGID_SHOOTSOCLOSE
+};
+
+const u16 gWeatherContinuesStringIds[] =
+{
    STRINGID_ITISRAINING, STRINGID_ITISRAINING, STRINGID_ITISRAINING,
    STRINGID_ITISRAINING, STRINGID_ITISRAINING, STRINGID_ITISRAINING,
-    STRINGID_SANDSTORMISRAGING, STRINGID_ITISRAINING, STRINGID_ITISRAINING,
-    STRINGID_ITISRAINING, STRINGID_SUNLIGHTSTRONG, STRINGID_ITISRAINING,
-    STRINGID_ITISRAINING, STRINGID_ITISRAINING, STRINGID_PKMNLOAFING,
-    STRINGID_PKMNWONTOBEY, STRINGID_PKMNTURNEDAWAY, STRINGID_PKMNPRETENDNOTNOTICE,
-    STRINGID_PKMNINCAPABLEOFPOWER, STRINGID_CREPTCLOSER, STRINGID_CANTGETCLOSER,
-    STRINGID_PKMNCURIOUSABOUTX, STRINGID_PKMNENTHRALLEDBYX, STRINGID_PKMNIGNOREDX,
+    STRINGID_ITISRAINING, STRINGID_ITISRAINING, STRINGID_SANDSTORMISRAGING,
+    STRINGID_ITISRAINING, STRINGID_ITISRAINING, STRINGID_ITISRAINING,
+    STRINGID_SUNLIGHTSTRONG, STRINGID_ITISRAINING, STRINGID_ITISRAINING, STRINGID_ITISRAINING
+};
+
+const u16 gInobedientStringIds[] =
+{
+    STRINGID_PKMNLOAFING, STRINGID_PKMNWONTOBEY, STRINGID_PKMNTURNEDAWAY,
+    STRINGID_PKMNPRETENDNOTNOTICE, STRINGID_PKMNINCAPABLEOFPOWER
+};
+
+const u16 gSafariGetNearStringIds[] =
+{
+    STRINGID_CREPTCLOSER, STRINGID_CANTGETCLOSER
+};
+
+const u16 gSafariPokeblockResultStringIds[] =
+{
+    STRINGID_PKMNCURIOUSABOUTX, STRINGID_PKMNENTHRALLEDBYX, STRINGID_PKMNIGNOREDX
+};
+
+const u16 gTrainerItemCuredStatusStringIds[] =
+{
    STRINGID_PKMNSITEMSNAPPEDOUT, STRINGID_PKMNSITEMCUREDPARALYSIS, STRINGID_PKMNSITEMDEFROSTEDIT,
-    STRINGID_PKMNSITEMHEALEDBURN, STRINGID_PKMNSITEMCUREDPOISON, STRINGID_PKMNSITEMWOKEIT,
-    STRINGID_PKMNSITEMCUREDPROBLEM, STRINGID_PKMNSITEMNORMALIZEDSTATUS, STRINGID_PKMNSXPREVENTSBURNS,
-    STRINGID_PKMNSXPREVENTSYSZ, STRINGID_PKMNSXHADNOEFFECTONY, STRINGID_PKMNPREVENTSPARALYSISWITH,
-    STRINGID_PKMNSXPREVENTSYSZ, STRINGID_PKMNSXHADNOEFFECTONY, STRINGID_PKMNPREVENTSPOISONINGWITH,
-    STRINGID_PKMNSXPREVENTSYSZ, STRINGID_PKMNSXHADNOEFFECTONY, STRINGID_PKMNOBTAINEDX,
-    STRINGID_PKMNOBTAINEDX2, STRINGID_PKMNOBTAINEDXYOBTAINEDZ, STRINGID_PKMNRAISEDFIREPOWERWITH,
-    STRINGID_PKMNSXMADEYINEFFECTIVE, STRINGID_PKMNTRANSFERREDSOMEONESPC, STRINGID_PKMNTRANSFERREDLANETTESPC,
-    STRINGID_PKMNBOXSOMEONESPCFULL, STRINGID_PKMNBOXLANETTESPCFULL,
+    STRINGID_PKMNSITEMHEALEDBURN, STRINGID_PKMNSITEMCUREDPOISON, STRINGID_PKMNSITEMWOKEIT
+};
+
+const u16 gBerryEffectStringIds[] =
+{
+    STRINGID_PKMNSITEMCUREDPROBLEM, STRINGID_PKMNSITEMNORMALIZEDSTATUS
+};
+
+const u16 gBRNPreventionStringIds[] =
+{
+    STRINGID_PKMNSXPREVENTSBURNS, STRINGID_PKMNSXPREVENTSYSZ, STRINGID_PKMNSXHADNOEFFECTONY
+};
+
+const u16 gPRLZPreventionStringIds[] =
+{
+    STRINGID_PKMNPREVENTSPARALYSISWITH, STRINGID_PKMNSXPREVENTSYSZ, STRINGID_PKMNSXHADNOEFFECTONY
+};
+
+const u16 gPSNPreventionStringIds[] =
+{
+    STRINGID_PKMNPREVENTSPOISONINGWITH, STRINGID_PKMNSXPREVENTSYSZ, STRINGID_PKMNSXHADNOEFFECTONY
+};
+
+const u16 gItemSwapStringIds[] =
+{
+    STRINGID_PKMNOBTAINEDX, STRINGID_PKMNOBTAINEDX2, STRINGID_PKMNOBTAINEDXYOBTAINEDZ
+};
+
+const u16 gFlashFireStringIds[] =
+{
+    STRINGID_PKMNRAISEDFIREPOWERWITH, STRINGID_PKMNSXMADEYINEFFECTIVE
+};
+
+const u16 gCaughtMonStringIds[] =
+{
+    STRINGID_PKMNTRANSFERREDSOMEONESPC, STRINGID_PKMNTRANSFERREDLANETTESPC, STRINGID_PKMNBOXSOMEONESPCFULL, STRINGID_PKMNBOXLANETTESPCFULL,
 };

 const u16 gTrappingMoves[] =
@@ -1102,9 +1281,10 @@ const u8 gText_PkmnGettingIntoPosition[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX} is
 const u8 gText_PkmnBeganGrowlingDeeply[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX} began growling deeply!");
 const u8 gText_PkmnEagerForMore[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX} is eager for more!");

-const u16 gUnknown_085CCF0A[] =
+const u16 gStringIds_85CCF0A[] =
 {
-    0x016E, 0x016F, 0x0170, 0x0171
+    STRINGID_GLINTAPPEARSINEYE, STRINGID_PKMNGETTINGINTOPOSITION,
+    STRINGID_PKMNBEGANGROWLINGDEEPLY, STRINGID_PKMNEAGERFORMORE
 };

 const u8 gText_RefIfNothingIsDecided[] = _("REFEREE: If nothing is decided in\n3 turns, we will go to judging!");
@@ -1736,11 +1916,11 @@ u32 BattleStringExpandPlaceholders(const u8* src, u8* dst)
                else
                    toCpy = gMoveNames[gStringInfo->currentMove];
                break;
-            case B_TXT_LAST_MOVE: // last used move name
-                if (gStringInfo->lastMove > LAST_MOVE_INDEX)
+            case B_TXT_LAST_MOVE: // originally used move name
+                if (gStringInfo->originallyUsedMove > LAST_MOVE_INDEX)
                    toCpy = gText_UnknownMoveTypes[gBattleStruct->stringMoveType];
                else
-                    toCpy = gMoveNames[gStringInfo->lastMove];
+                    toCpy = gMoveNames[gStringInfo->originallyUsedMove];
                break;
            case B_TXT_LAST_ITEM: // last used item
                if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000))
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
--- a/src/battle_util.c
+++ b/src/battle_util.c