summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/battle/battle_3.c84
-rw-r--r--src/battle/battle_4.c224
-rwxr-xr-xsrc/data/battle_strings_de.h92
-rwxr-xr-xsrc/data/battle_strings_en.h92
-rw-r--r--src/rom3.c6
5 files changed, 249 insertions, 249 deletions
diff --git a/src/battle/battle_3.c b/src/battle/battle_3.c
index b21ec1572..e5a730598 100644
--- a/src/battle/battle_3.c
+++ b/src/battle/battle_3.c
@@ -110,22 +110,22 @@ extern u8 BattleScript_WrapEnds[];
extern u8 BattleScript_DisabledNoMore[];
extern u8 BattleScript_EncoredNoMore[];
-extern u8 gUnknown_081D9030[];
-extern u8 gUnknown_081D8F62[];
-extern u8 gUnknown_081D8FFF[];
-extern u8 gUnknown_081D8F7D[];
-extern u8 gUnknown_081D9016[];
-extern u8 gUnknown_081D9008[];
-extern u8 gUnknown_081D9041[];
-extern u8 gUnknown_081D950F[]; //uproar wakeup BS
-extern u8 gUnknown_081D957E[]; //uproar BS
+extern u8 BattleScript_SideStatusWoreOff[];
+extern u8 BattleScript_RainContinuesOrEnds[];
+extern u8 BattleScript_SandStormHailEnds[];
+extern u8 BattleScript_DamagingWeatherContinues[];
+extern u8 BattleScript_SunlightFaded[];
+extern u8 BattleScript_SunlightContinues[];
+extern u8 BattleScript_SafeguardEnds[];
+extern u8 BattleScript_MonWokeUpInUproar[]; //uproar wakeup BS
+extern u8 BattleScript_PrintUproarOverTurns[]; //uproar BS
extern u8 BattleScript_ThrashConfuses[];
extern u8 BattleScript_YawnMakesAsleep[];
-extern u8 BattleScript_FutureSightHits[];
+extern u8 BattleScript_MonTookFutureAttack[];
extern u8 BattleScript_PerishSongHits[];
extern u8 BattleScript_PerishSongTimerGoesDown[];
-extern u8 gUnknown_081D8C72[];
-extern u8 gUnknown_081D8C7B[];
+extern u8 BattleScript_GiveExp[];
+extern u8 BattleScript_HandleFaintedMon[];
extern u8 BattleScript_MoveUsedIsAsleep[];
extern u8 BattleScript_MoveUsedWokeUp[];
@@ -146,7 +146,7 @@ extern u8 BattleScript_BideStoringEnergy[];
extern u8 BattleScript_BideAttack[];
extern u8 BattleScript_BideNoEnergyToAttack[];
-extern u8 gUnknown_081D901D[]; //load weather from overworld
+extern u8 BattleScript_OverworldWeatherStarts[]; //load weather from overworld
extern u8 BattleScript_DrizzleActivates[];
extern u8 BattleScript_SandstreamActivates[];
extern u8 BattleScript_DroughtActivates[];
@@ -165,7 +165,7 @@ extern u8 BattleScript_ColorChangeActivates[];
extern u8 BattleScript_RoughSkinActivates[];
extern u8 BattleScript_ApplySecondaryEffect[];
extern u8 BattleScript_CuteCharmActivates[];
-extern u8 gUnknown_081D9956[]; //ability status clear
+extern u8 BattleScript_AbilityCuredStatus[]; //ability status clear
extern u8 BattleScript_SynchronizeActivates[];
extern u8 gUnknown_081D978C[]; //intimidate1
extern u8 gUnknown_081D9795[]; //intimidate2
@@ -185,20 +185,20 @@ extern u8 BattleScript_BerryCureBrnEnd2[];
extern u8 BattleScript_BerryCureFrzEnd2[];
extern u8 BattleScript_BerryCureSlpEnd2[];
extern u8 BattleScript_BerryCureConfusionEnd2[];
-extern u8 gUnknown_081D9A44[]; //berry cure any status end2
+extern u8 BattleScript_BerryCureChosenStatusEnd2[]; //berry cure any status end2
extern u8 BattleScript_BerryCureParRet[];
extern u8 BattleScript_BerryCurePsnRet[];
extern u8 BattleScript_BerryCureBrnRet[];
extern u8 BattleScript_BerryCureFrzRet[];
extern u8 BattleScript_BerryCureSlpRet[];
extern u8 BattleScript_BerryCureConfusionRet[];
-extern u8 gUnknown_081D9A4A[]; //berry cure any status return
+extern u8 BattleScript_BerryCureChosenStatusRet[]; //berry cure any status return
extern u8 BattleScript_ItemHealHP_Ret[];
extern u8 gUnknown_081D995F[]; //disobedient while asleep
-extern u8 gUnknown_081D996F[]; //disobedient, uses a random move
-extern u8 gUnknown_081D9989[]; //disobedient, went to sleep
+extern u8 BattleScript_IgnoresAndUsesRandomMove[]; //disobedient, uses a random move
+extern u8 BattleScript_IgnoresAndFallsAsleep[]; //disobedient, went to sleep
extern u8 gUnknown_081D99A0[]; //disobedient, hits itself
//array entries for battle communication
@@ -396,7 +396,7 @@ u8 UpdateTurnCounters(void)
{
gSideAffecting[sideBank] &= ~SIDE_STATUS_REFLECT;
- b_call_bc_move_exec(gUnknown_081D9030);
+ b_call_bc_move_exec(BattleScript_SideStatusWoreOff);
gBattleTextBuff1[0] = 0xFD;
gBattleTextBuff1[1] = 2;
gBattleTextBuff1[2] = MOVE_REFLECT;
@@ -424,7 +424,7 @@ u8 UpdateTurnCounters(void)
if (--gSideTimer[sideBank].lightscreenTimer == 0)
{
gSideAffecting[sideBank] &= ~SIDE_STATUS_LIGHTSCREEN;
- b_call_bc_move_exec(gUnknown_081D9030);
+ b_call_bc_move_exec(BattleScript_SideStatusWoreOff);
gBattleCommunication[MULTISTRING_CHOOSER] = sideBank;
gBattleTextBuff1[0] = 0xFD;
gBattleTextBuff1[1] = 2;
@@ -451,7 +451,7 @@ u8 UpdateTurnCounters(void)
if (gSideTimer[sideBank].mistTimer && --gSideTimer[sideBank].mistTimer == 0)
{
gSideAffecting[sideBank] &= ~SIDE_STATUS_MIST;
- b_call_bc_move_exec(gUnknown_081D9030);
+ b_call_bc_move_exec(BattleScript_SideStatusWoreOff);
gBattleCommunication[MULTISTRING_CHOOSER] = sideBank;
gBattleTextBuff1[0] = 0xFD;
gBattleTextBuff1[1] = 2;
@@ -479,7 +479,7 @@ u8 UpdateTurnCounters(void)
if (--gSideTimer[sideBank].safeguardTimer == 0)
{
gSideAffecting[sideBank] &= ~SIDE_STATUS_SAFEGUARD;
- b_call_bc_move_exec(gUnknown_081D9041);
+ b_call_bc_move_exec(BattleScript_SafeguardEnds);
effect++;
}
}
@@ -532,7 +532,7 @@ u8 UpdateTurnCounters(void)
gBattleCommunication[MULTISTRING_CHOOSER] = 1;
else
gBattleCommunication[MULTISTRING_CHOOSER] = 0;
- b_call_bc_move_exec(gUnknown_081D8F62);
+ b_call_bc_move_exec(BattleScript_RainContinuesOrEnds);
effect++;
}
BATTLE_STRUCT->turncountersTracker++;
@@ -543,10 +543,10 @@ u8 UpdateTurnCounters(void)
if (!(gBattleWeather & WEATHER_SANDSTORM_PERMANENT) && --gWishFutureKnock.weatherDuration == 0)
{
gBattleWeather &= ~WEATHER_SANDSTORM_TEMPORARY;
- gBattlescriptCurrInstr = gUnknown_081D8FFF;
+ gBattlescriptCurrInstr = BattleScript_SandStormHailEnds;
}
else
- gBattlescriptCurrInstr = gUnknown_081D8F7D;
+ gBattlescriptCurrInstr = BattleScript_DamagingWeatherContinues;
BATTLE_STRUCT->animArg1 = B_ANIM_SANDSTORM_CONTINUES;
gBattleCommunication[MULTISTRING_CHOOSER] = 0;
@@ -561,10 +561,10 @@ u8 UpdateTurnCounters(void)
if (!(gBattleWeather & WEATHER_SUN_PERMANENT) && --gWishFutureKnock.weatherDuration == 0)
{
gBattleWeather &= ~WEATHER_SUN_TEMPORARY;
- gBattlescriptCurrInstr = gUnknown_081D9016;
+ gBattlescriptCurrInstr = BattleScript_SunlightFaded;
}
else
- gBattlescriptCurrInstr = gUnknown_081D9008;
+ gBattlescriptCurrInstr = BattleScript_SunlightContinues;
b_call_bc_move_exec(gBattlescriptCurrInstr);
effect++;
@@ -577,10 +577,10 @@ u8 UpdateTurnCounters(void)
if (--gWishFutureKnock.weatherDuration == 0)
{
gBattleWeather &= ~WEATHER_HAIL;
- gBattlescriptCurrInstr = gUnknown_081D8FFF;
+ gBattlescriptCurrInstr = BattleScript_SandStormHailEnds;
}
else
- gBattlescriptCurrInstr = gUnknown_081D8F7D;
+ gBattlescriptCurrInstr = BattleScript_DamagingWeatherContinues;
BATTLE_STRUCT->animArg1 = B_ANIM_HAIL_CONTINUES;
gBattleCommunication[MULTISTRING_CHOOSER] = 1;
@@ -760,7 +760,7 @@ u8 TurnBasedEffects(void)
gBattleMons[gBankAttacker].status1 &= ~(STATUS_SLEEP);
gBattleMons[gBankAttacker].status2 &= ~(STATUS2_NIGHTMARE);
gBattleCommunication[MULTISTRING_CHOOSER] = 1;
- b_call_bc_move_exec(gUnknown_081D950F);
+ b_call_bc_move_exec(BattleScript_MonWokeUpInUproar);
gActiveBank = gBankAttacker;
EmitSetAttributes(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBank].status1);
MarkBufferBankForExecution(gActiveBank);
@@ -791,7 +791,7 @@ u8 TurnBasedEffects(void)
gBattleCommunication[MULTISTRING_CHOOSER] = 1;
CancelMultiTurnMoves(gActiveBank);
}
- b_call_bc_move_exec(gUnknown_081D957E);
+ b_call_bc_move_exec(BattleScript_PrintUproarOverTurns);
effect = 1;
}
}
@@ -938,7 +938,7 @@ bool8 sub_80170DC(void) // handle future sight and perish song
gBankAttacker = gWishFutureKnock.futureSightAttacker[gActiveBank];
gBattleMoveDamage = gWishFutureKnock.futureSightDmg[gActiveBank];
gSpecialStatuses[gBankTarget].moveturnLostHP = 0xFFFF;
- b_call_bc_move_exec(BattleScript_FutureSightHits);
+ b_call_bc_move_exec(BattleScript_MonTookFutureAttack);
return 1;
}
}
@@ -1009,7 +1009,7 @@ bool8 sub_80173A4(void)
gBank1 = gBankTarget = BATTLE_STRUCT->unk1605A;
if (gBattleMons[BATTLE_STRUCT->unk1605A].hp == 0 && !(BATTLE_STRUCT->unk16113 & gBitTable[gBattlePartyID[BATTLE_STRUCT->unk1605A]]) && !(gAbsentBankFlags & gBitTable[BATTLE_STRUCT->unk1605A]))
{
- b_call_bc_move_exec(gUnknown_081D8C72);
+ b_call_bc_move_exec(BattleScript_GiveExp);
BATTLE_STRUCT->sub80173A4_Tracker = 2;
return 1;
}
@@ -1032,7 +1032,7 @@ bool8 sub_80173A4(void)
gBank1 = gBankTarget = BATTLE_STRUCT->unk1605A; //or should banks be switched?
if (gBattleMons[BATTLE_STRUCT->unk1605A].hp == 0 && !(gAbsentBankFlags & gBitTable[BATTLE_STRUCT->unk1605A]))
{
- b_call_bc_move_exec(gUnknown_081D8C7B);
+ b_call_bc_move_exec(BattleScript_HandleFaintedMon);
BATTLE_STRUCT->sub80173A4_Tracker = 5;
return 1;
}
@@ -1534,7 +1534,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
if (effect)
{
gBattleCommunication[MULTISTRING_CHOOSER] = weather_get_current();
- b_push_move_exec(gUnknown_081D901D);
+ b_push_move_exec(BattleScript_OverworldWeatherStarts);
}
break;
case ABILITY_DRIZZLE:
@@ -1969,7 +1969,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg)
break;
}
b_movescr_stack_push_cursor();
- gBattlescriptCurrInstr = gUnknown_081D9956;
+ gBattlescriptCurrInstr = BattleScript_AbilityCuredStatus;
BATTLE_STRUCT->scriptingActive = bank;
gActiveBank = bank;
EmitSetAttributes(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBank].status1);
@@ -2768,7 +2768,7 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
gBattleCommunication[MULTISTRING_CHOOSER] = 1;
gBattleMons[bank].status1 = 0;
gBattleMons[bank].status2 &= ~(STATUS2_CONFUSION);
- b_call_bc_move_exec(gUnknown_081D9A44);
+ b_call_bc_move_exec(BattleScript_BerryCureChosenStatusEnd2);
effect = ITEM_STATUS_CHANGE;
}
break;
@@ -2777,7 +2777,7 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
{
gBattleMons[bank].status2 &= ~(STATUS2_INFATUATION);
StringCopy(gBattleTextBuff1, gStatusConditionString_LoveJpn);
- b_call_bc_move_exec(gUnknown_081D9A44);
+ b_call_bc_move_exec(BattleScript_BerryCureChosenStatusEnd2);
gBattleCommunication[MULTISTRING_CHOOSER] = 0;
effect = ITEM_EFFECT_OTHER;
}
@@ -2882,7 +2882,7 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
StringCopy(gBattleTextBuff1, gStatusConditionString_LoveJpn);
b_movescr_stack_push_cursor();
gBattleCommunication[MULTISTRING_CHOOSER] = 0;
- gBattlescriptCurrInstr = gUnknown_081D9A4A;
+ gBattlescriptCurrInstr = BattleScript_BerryCureChosenStatusRet;
effect = ITEM_EFFECT_OTHER;
}
break;
@@ -2918,7 +2918,7 @@ u8 ItemBattleEffects(u8 caseID, u8 bank, bool8 moveTurn)
gBattleMons[bank].status2 &= ~(STATUS2_CONFUSION);
b_movescr_stack_push_cursor();
gBattleCommunication[MULTISTRING_CHOOSER] = 0;
- gBattlescriptCurrInstr = gUnknown_081D9A4A;
+ gBattlescriptCurrInstr = BattleScript_BerryCureChosenStatusRet;
effect = ITEM_STATUS_CHANGE;
}
break;
@@ -3186,7 +3186,7 @@ u8 IsPokeDisobedient(void)
gBattleCommunication[3] = 0;
gDynamicBasePower = 0;
BATTLE_STRUCT->dynamicMoveType = 0;
- gBattlescriptCurrInstr = gUnknown_081D996F;
+ gBattlescriptCurrInstr = BattleScript_IgnoresAndUsesRandomMove;
gBankTarget = GetMoveTarget(gRandomMove, 0);
gHitMarker |= HITMARKER_x200000;
return 2;
@@ -3208,7 +3208,7 @@ u8 IsPokeDisobedient(void)
}
if (i == gNoOfAllBanks)
{
- gBattlescriptCurrInstr = gUnknown_081D9989;
+ gBattlescriptCurrInstr = BattleScript_IgnoresAndFallsAsleep;
return 1;
}
}
diff --git a/src/battle/battle_4.c b/src/battle/battle_4.c
index f37ba8682..7f67abe81 100644
--- a/src/battle/battle_4.c
+++ b/src/battle/battle_4.c
@@ -87,8 +87,8 @@ extern u8 gPlayerPartyCount;
extern u16 gMoveToLearn; //move to learn
extern const u8 gTrainerMoney[];
extern u16 gRandomMove;
-extern u8* gBattleScriptsEffectsTable[];
-extern u16 gUnknown_02024BE8; //last used move in battle
+extern u8* gBattleScriptsForMoveEffects[];
+extern u16 gChosenMove; //last used move in battle
extern u8 gBankInMenu;
extern u8 gActionForBanks[4];
extern u16 gUnknown_02024C2C[4]; //last used moves 2, used by sketch
@@ -167,7 +167,7 @@ bool8 IsLinkDoubleBattle(void);
void sub_8094B6C(u8 bank, u8 partyID, u8 r2);
//extern BattleScripts
-extern u8 BattleScript_EndTurn[];
+extern u8 BattleScript_MoveEnd[];
extern u8 BattleScript_NoPPForMove[];
extern u8 BattleScript_MagicCoatBounce[];
extern u8 BattleScript_TookAttack[];
@@ -205,21 +205,21 @@ extern u8 BattleScript_AllStatsUp[];
extern u8 BattleScript_AtkDefDown[];
extern u8 BattleScript_SAtkDown2[];
-extern u8 gUnknown_081D919F[]; //spikes1
-extern u8 gUnknown_081D9171[]; //spikes2
-extern u8 gUnknown_081D91CD[]; //spikes3
-extern u8 BattleScript_1D6F44[]; //present dmg
-extern u8 BattleScript_1D83B5[]; //present full hp
-extern u8 BattleScript_1D839B[]; //present hp heal
-extern u8 BattleScript_1D6F74[];
+extern u8 BattleScript_SpikesOnTarget[]; //spikes1
+extern u8 BattleScript_SpikesOnAttacker[]; //spikes2
+extern u8 BattleScript_SpikesOngBank1[]; //spikes3
+extern u8 BattleScript_HitFromCritCalc[]; //present dmg
+extern u8 BattleScript_AlreadyAtFullHp[]; //present full hp
+extern u8 BattleScript_PresentHealTarget[]; //present hp heal
+extern u8 BattleScript_MoveMissedPause[];
extern u8 BattleScript_CastformChange[];
-extern u8 gUnknown_081D9834[];
-extern u8 gUnknown_081D90FC[]; //bs random switchout
-extern u8 gUnknown_081D95DB[]; //bs payday money give
-extern u8 gUnknown_081D8C58[];
-extern u8 gUnknown_081D8C65[];
-extern u8 gUnknown_081D9156[];
-extern u8 gUnknown_081D9468[];
+extern u8 BattleScript_DampStopsExplosion[];
+extern u8 BattleScript_SuccessForceOut[]; //bs random switchout
+extern u8 BattleScript_PrintPayDayMoneyString[]; //bs payday money give
+extern u8 BattleScript_FaintAttacker[];
+extern u8 BattleScript_FaintTarget[];
+extern u8 BattleScript_DestinyBondTakesLife[];
+extern u8 BattleScript_SelectingImprisionedMoveInPalace[];
// read via orr
#define BSScriptRead32(ptr) ((ptr)[0] | (ptr)[1] << 8 | (ptr)[2] << 16 | (ptr)[3] << 24)
@@ -869,59 +869,59 @@ static const u32 gStatusFlagsForMoveEffects[] =
0x00000000
};
-extern u8 BattleScript_1D963E[];
-extern u8 BattleScript_1D965A[];
-extern u8 BattleScript_1D9669[];
-extern u8 BattleScript_1D9678[];
-extern u8 BattleScript_1D9687[];
-extern u8 BattleScript_1D969D[];
-extern u8 BattleScript_1D96BA[];
-extern u8 BattleScript_1D9696[];
-extern u8 BattleScript_1D96B1[];
-extern u8 BattleScript_1D96AA[];
-extern u8 BattleScript_1D96C8[];
+extern u8 BattleScript_MoveEffectSleep[];
+extern u8 BattleScript_MoveEffectPoison[];
+extern u8 BattleScript_MoveEffectBurn[];
+extern u8 BattleScript_MoveEffectFreeze[];
+extern u8 BattleScript_MoveEffectParalysis[];
+extern u8 BattleScript_MoveEffectToxic[];
+extern u8 BattleScript_MoveEffectConfusion[];
+extern u8 BattleScript_MoveEffectUproar[];
+extern u8 BattleScript_MoveEffectWrap[];
+extern u8 BattleScript_MoveEffectPayDay[];
+extern u8 BattleScript_MoveEffectRecoil33[];
u8* const gMoveEffectBS_Ptrs[] =
{
- BattleScript_1D963E,
- BattleScript_1D963E,
- BattleScript_1D965A,
- BattleScript_1D9669,
- BattleScript_1D9678,
- BattleScript_1D9687,
- BattleScript_1D969D,
- BattleScript_1D96BA,
- BattleScript_1D963E,
- BattleScript_1D963E,
- BattleScript_1D9696,
- BattleScript_1D96AA,
- BattleScript_1D963E,
- BattleScript_1D96B1,
- BattleScript_1D96C8,
- BattleScript_1D963E,
- BattleScript_1D963E,
- BattleScript_1D963E,
- BattleScript_1D963E,
- BattleScript_1D963E,
- BattleScript_1D963E,
- BattleScript_1D963E,
- BattleScript_1D963E,
- BattleScript_1D963E,
- BattleScript_1D963E,
- BattleScript_1D963E,
- BattleScript_1D963E,
- BattleScript_1D963E,
- BattleScript_1D963E,
- BattleScript_1D963E,
- BattleScript_1D963E,
- BattleScript_1D963E,
- BattleScript_1D963E,
- BattleScript_1D963E,
- BattleScript_1D963E,
- BattleScript_1D963E,
- BattleScript_1D963E,
- BattleScript_1D963E,
- BattleScript_1D96C8
+ BattleScript_MoveEffectSleep,
+ BattleScript_MoveEffectSleep,
+ BattleScript_MoveEffectPoison,
+ BattleScript_MoveEffectBurn,
+ BattleScript_MoveEffectFreeze,
+ BattleScript_MoveEffectParalysis,
+ BattleScript_MoveEffectToxic,
+ BattleScript_MoveEffectConfusion,
+ BattleScript_MoveEffectSleep,
+ BattleScript_MoveEffectSleep,
+ BattleScript_MoveEffectUproar,
+ BattleScript_MoveEffectPayDay,
+ BattleScript_MoveEffectSleep,
+ BattleScript_MoveEffectWrap,
+ BattleScript_MoveEffectRecoil33,
+ BattleScript_MoveEffectSleep,
+ BattleScript_MoveEffectSleep,
+ BattleScript_MoveEffectSleep,
+ BattleScript_MoveEffectSleep,
+ BattleScript_MoveEffectSleep,
+ BattleScript_MoveEffectSleep,
+ BattleScript_MoveEffectSleep,
+ BattleScript_MoveEffectSleep,
+ BattleScript_MoveEffectSleep,
+ BattleScript_MoveEffectSleep,
+ BattleScript_MoveEffectSleep,
+ BattleScript_MoveEffectSleep,
+ BattleScript_MoveEffectSleep,
+ BattleScript_MoveEffectSleep,
+ BattleScript_MoveEffectSleep,
+ BattleScript_MoveEffectSleep,
+ BattleScript_MoveEffectSleep,
+ BattleScript_MoveEffectSleep,
+ BattleScript_MoveEffectSleep,
+ BattleScript_MoveEffectSleep,
+ BattleScript_MoveEffectSleep,
+ BattleScript_MoveEffectSleep,
+ BattleScript_MoveEffectSleep,
+ BattleScript_MoveEffectRecoil33
};
const u8 sUnreferencedBitMask1[] = {0, 1, 3, 7, 0xF, 0x1F, 0x3F};
@@ -1034,7 +1034,7 @@ static void atk00_attackcanceler(void)
if (gBattleMons[gBankAttacker].hp == 0 && !(gHitMarker & HITMARKER_NO_ATTACKSTRING))
{
gHitMarker |= HITMARKER_UNABLE_TO_USE_MOVE;
- gBattlescriptCurrInstr = BattleScript_EndTurn;
+ gBattlescriptCurrInstr = BattleScript_MoveEnd;
return;
}
if (AtkCanceller_UnableToUseMove())
@@ -4995,13 +4995,13 @@ static void atk19_tryfaintmon(void)
{
gActiveBank = gBankAttacker;
bank = gBankTarget;
- r4 = gUnknown_081D8C58;
+ r4 = BattleScript_FaintAttacker;
}
else
{
gActiveBank = gBankTarget;
bank = gBankAttacker;
- r4 = gUnknown_081D8C65;
+ r4 = BattleScript_FaintTarget;
}
if (!(gAbsentBankFlags & gBitTable[gActiveBank])
&& gBattleMons[gActiveBank].hp == 0)
@@ -5039,7 +5039,7 @@ static void atk19_tryfaintmon(void)
{
b_movescr_stack_push(gBattlescriptCurrInstr);
gBattleMoveDamage = gBattleMons[bank].hp;
- gBattlescriptCurrInstr = gUnknown_081D9156;
+ gBattlescriptCurrInstr = BattleScript_DestinyBondTakesLife;
}
if ((gStatuses3[gBankTarget] & STATUS3_GRUDGE)
&& !(gHitMarker & HITMARKER_GRUDGE)
@@ -5051,7 +5051,7 @@ static void atk19_tryfaintmon(void)
gBattleMons[gBankAttacker].pp[moveIndex] = 0;
b_movescr_stack_push(gBattlescriptCurrInstr);
- gBattlescriptCurrInstr = gUnknown_081D9468;
+ gBattlescriptCurrInstr = BattleScript_SelectingImprisionedMoveInPalace;
gActiveBank = gBankAttacker;
EmitSetAttributes(0, moveIndex + 9, 0, 1, &gBattleMons[gActiveBank].pp[moveIndex]);
MarkBufferBankForExecution(gActiveBank);
@@ -7831,7 +7831,7 @@ static void atk49_moveend(void)
{
gBattleMons[gBankTarget].statStages[STAT_STAGE_ATK]++;
b_movescr_stack_push_cursor();
- gBattlescriptCurrInstr = gUnknown_081D9132;
+ gBattlescriptCurrInstr = BattleScript_RageIsBuilding;
effect = 1;
}
BATTLE_STRUCT->cmd49StateTracker++;
@@ -7847,7 +7847,7 @@ static void atk49_moveend(void)
EmitSetAttributes(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gBankTarget].status1);
MarkBufferBankForExecution(gActiveBank);
b_movescr_stack_push_cursor();
- gBattlescriptCurrInstr = gUnknown_081D955D;
+ gBattlescriptCurrInstr = BattleScript_DefrostedViaFireMove;
effect = 1;
}
BATTLE_STRUCT->cmd49StateTracker++;
@@ -8008,7 +8008,7 @@ _08021874:\n\
adds r0, r3\n\
strb r4, [r0]\n\
bl MoveValuesCleanUp\n\
- ldr r2, _080218B4 @ =gBattleScriptsEffectsTable\n\
+ ldr r2, _080218B4 @ =gBattleScriptsForMoveEffects\n\
mov r4, r8\n\
ldrh r1, [r4]\n\
lsls r0, r1, 1\n\
@@ -8026,7 +8026,7 @@ _08021874:\n\
.align 2, 0\n\
_080218AC: .4byte gSharedMem\n\
_080218B0: .4byte 0x0001600c\n\
-_080218B4: .4byte gBattleScriptsEffectsTable\n\
+_080218B4: .4byte gBattleScriptsForMoveEffects\n\
_080218B8: .4byte gBattlescriptCurrInstr\n\
_080218BC: .4byte gUnknown_081D9B2D\n\
_080218C0:\n\
@@ -8166,7 +8166,7 @@ _080219C8:\n\
strb r0, [r1, 0x19]\n\
bl b_movescr_stack_push_cursor\n\
ldr r1, _08021A24 @ =gBattlescriptCurrInstr\n\
- ldr r0, _08021A28 @ =gUnknown_081D9132\n\
+ ldr r0, _08021A28 @ =BattleScript_RageIsBuilding\n\
str r0, [r1]\n\
movs r5, 0x1\n\
mov r10, r5\n\
@@ -8184,7 +8184,7 @@ _08021A18: .4byte gProtectStructs\n\
_08021A1C: .4byte gBattleMoves\n\
_08021A20: .4byte gCurrentMove\n\
_08021A24: .4byte gBattlescriptCurrInstr\n\
-_08021A28: .4byte gUnknown_081D9132\n\
+_08021A28: .4byte BattleScript_RageIsBuilding\n\
_08021A2C: .4byte gSharedMem\n\
_08021A30: .4byte 0x0001600c\n\
_08021A34:\n\
@@ -8264,7 +8264,7 @@ _08021A92:\n\
bl MarkBufferBankForExecution\n\
bl b_movescr_stack_push_cursor\n\
ldr r1, _08021AE8 @ =gBattlescriptCurrInstr\n\
- ldr r0, _08021AEC @ =gUnknown_081D955D\n\
+ ldr r0, _08021AEC @ =BattleScript_DefrostedViaFireMove\n\
str r0, [r1]\n\
movs r2, 0x1\n\
mov r10, r2\n\
@@ -8277,7 +8277,7 @@ _08021ADC: .4byte gSpecialStatuses\n\
_08021AE0: .4byte gBattleMoveFlags\n\
_08021AE4: .4byte gActiveBank\n\
_08021AE8: .4byte gBattlescriptCurrInstr\n\
-_08021AEC: .4byte gUnknown_081D955D\n\
+_08021AEC: .4byte BattleScript_DefrostedViaFireMove\n\
_08021AF0:\n\
ldr r0, _08021B14 @ =gBankTarget\n\
ldrb r1, [r0]\n\
@@ -8376,7 +8376,7 @@ _08021B9C:\n\
ldr r4, [sp, 0x8]\n\
cmp r4, 0x1D\n\
bne _08021BE0\n\
- ldr r0, _08021C2C @ =gUnknown_02024BE8\n\
+ ldr r0, _08021C2C @ =gChosenMove\n\
ldrh r2, [r0]\n\
adds r7, r0, 0\n\
cmp r2, 0xA5\n\
@@ -8444,7 +8444,7 @@ _08021C22:\n\
b _08022244\n\
.align 2, 0\n\
_08021C28: .4byte gHitMarker\n\
-_08021C2C: .4byte gUnknown_02024BE8\n\
+_08021C2C: .4byte gChosenMove\n\
_08021C30: .4byte 0x0000ffff\n\
_08021C34: .4byte gBattleMoveFlags\n\
_08021C38: .4byte gBattleMons\n\
@@ -8733,7 +8733,7 @@ _08021E70:\n\
str r3, [r5]\n\
_08021E9A:\n\
ldr r1, _08021F40 @ =gBattleMoves\n\
- ldr r2, _08021F44 @ =gUnknown_02024BE8\n\
+ ldr r2, _08021F44 @ =gChosenMove\n\
ldrh r3, [r2]\n\
lsls r0, r3, 1\n\
adds r0, r3\n\
@@ -8816,7 +8816,7 @@ _08021F34: .4byte gActiveBank\n\
_08021F38: .4byte gBankTarget\n\
_08021F3C: .4byte 0xffffefff\n\
_08021F40: .4byte gBattleMoves\n\
-_08021F44: .4byte gUnknown_02024BE8\n\
+_08021F44: .4byte gChosenMove\n\
_08021F48: .4byte gBattleMoveFlags\n\
_08021F4C: .4byte gUnknown_02024C2C\n\
_08021F50: .4byte gAbsentBankFlags\n\
@@ -8967,7 +8967,7 @@ _08022082:\n\
b _08022244\n\
_08022090:\n\
ldr r1, _0802213C @ =gBattleMoves\n\
- ldr r4, _08022140 @ =gUnknown_02024BE8\n\
+ ldr r4, _08022140 @ =gChosenMove\n\
ldrh r3, [r4]\n\
lsls r0, r3, 1\n\
adds r0, r3\n\
@@ -9051,7 +9051,7 @@ _08022130: .4byte gBitTable\n\
_08022134: .4byte gBankAttacker\n\
_08022138: .4byte 0x000160a6\n\
_0802213C: .4byte gBattleMoves\n\
-_08022140: .4byte gUnknown_02024BE8\n\
+_08022140: .4byte gChosenMove\n\
_08022144: .4byte gHitMarker\n\
_08022148: .4byte gBankTarget\n\
_0802214C: .4byte gBattleMoveFlags\n\
@@ -10641,11 +10641,11 @@ static void atk52_switchineffects(void)
b_movescr_stack_push_cursor();
if (T2_READ_8(gBattlescriptCurrInstr + 1) == 0)
- gBattlescriptCurrInstr = gUnknown_081D919F;
+ gBattlescriptCurrInstr = BattleScript_SpikesOnTarget;
else if (T2_READ_8(gBattlescriptCurrInstr + 1) == 1)
- gBattlescriptCurrInstr = gUnknown_081D9171;
+ gBattlescriptCurrInstr = BattleScript_SpikesOnAttacker;
else
- gBattlescriptCurrInstr = gUnknown_081D91CD;
+ gBattlescriptCurrInstr = BattleScript_SpikesOngBank1;
}
else
{
@@ -11307,8 +11307,8 @@ static void atk63_jumptorandomattack(void)
if (T2_READ_8(gBattlescriptCurrInstr + 1))
gCurrentMove = gRandomMove;
else
- gUnknown_02024BE8 = gCurrentMove = gRandomMove;
- gBattlescriptCurrInstr = gBattleScriptsEffectsTable[gBattleMoves[gCurrentMove].effect];
+ gChosenMove = gCurrentMove = gRandomMove;
+ gBattlescriptCurrInstr = gBattleScriptsForMoveEffects[gBattleMoves[gCurrentMove].effect];
}
static void atk64_statusanimation(void)
@@ -12138,7 +12138,7 @@ static void atk78_faintifabilitynotdamp(void)
{
gLastUsedAbility = ABILITY_DAMP;
RecordAbilityBattle(gBankTarget, gBattleMons[gBankTarget].ability);
- gBattlescriptCurrInstr = gUnknown_081D9834;
+ gBattlescriptCurrInstr = BattleScript_DampStopsExplosion;
}
}
@@ -12207,7 +12207,7 @@ static void atk7C_trymirrormove(void)
gHitMarker &= ~(HITMARKER_ATTACKSTRING_PRINTED);
gCurrentMove = r7;
gBankTarget = GetMoveTarget(gCurrentMove, 0);
- gBattlescriptCurrInstr = gBattleScriptsEffectsTable[gBattleMoves[gCurrentMove].effect];
+ gBattlescriptCurrInstr = gBattleScriptsForMoveEffects[gBattleMoves[gCurrentMove].effect];
}
else if (r6 != 0 && r5 != 0 && r6 != 0xFFFF && r5 != 0xFFFF)
{
@@ -12217,21 +12217,21 @@ static void atk7C_trymirrormove(void)
else
gCurrentMove = r5;
gBankTarget = GetMoveTarget(gCurrentMove, 0);
- gBattlescriptCurrInstr = gBattleScriptsEffectsTable[gBattleMoves[gCurrentMove].effect];
+ gBattlescriptCurrInstr = gBattleScriptsForMoveEffects[gBattleMoves[gCurrentMove].effect];
}
else if (r6 != 0 && r6 != 0xFFFF)
{
gHitMarker &= ~(HITMARKER_ATTACKSTRING_PRINTED);
gCurrentMove = r6;
gBankTarget = GetMoveTarget(gCurrentMove, 0);
- gBattlescriptCurrInstr = gBattleScriptsEffectsTable[gBattleMoves[gCurrentMove].effect];
+ gBattlescriptCurrInstr = gBattleScriptsForMoveEffects[gBattleMoves[gCurrentMove].effect];
}
else if (r5 != 0 && r5 != 0xFFFF)
{
gHitMarker &= ~(HITMARKER_ATTACKSTRING_PRINTED);
gCurrentMove = r5;
gBankTarget = GetMoveTarget(gCurrentMove, 0);
- gBattlescriptCurrInstr = gBattleScriptsEffectsTable[gBattleMoves[gCurrentMove].effect];
+ gBattlescriptCurrInstr = gBattleScriptsForMoveEffects[gBattleMoves[gCurrentMove].effect];
}
else
{
@@ -13306,7 +13306,7 @@ static bool8 sub_80264C0(void)
}
ewram16064arr(gBankTarget) = gBattlePartyID[gBankTarget];
}
- gBattlescriptCurrInstr = gUnknown_081D90FC;
+ gBattlescriptCurrInstr = BattleScript_SuccessForceOut;
return 1;
}
@@ -13472,7 +13472,7 @@ static void atk91_givepaydaymoney(void)
gBattleTextBuff1[5] = uBYTE1_16(gPaydayMoney);
gBattleTextBuff1[6] = 0xFF;
b_movescr_stack_push(gBattlescriptCurrInstr + 1);
- gBattlescriptCurrInstr = gUnknown_081D95DB;
+ gBattlescriptCurrInstr = BattleScript_PrintPayDayMoneyString;
}
else
gBattlescriptCurrInstr++;
@@ -13647,7 +13647,7 @@ _08026C0C:\n\
ldr r0, _08026C60 @ =gLastUsedAbility\n\
strb r3, [r0]\n\
ldr r1, _08026C64 @ =gBattlescriptCurrInstr\n\
- ldr r0, _08026C68 @ =gUnknown_081D9826\n\
+ ldr r0, _08026C68 @ =BattleScript_SturdyPreventsOHKO\n\
str r0, [r1]\n\
ldr r1, _08026C50 @ =gBankTarget\n\
ldrb r0, [r1]\n\
@@ -13662,7 +13662,7 @@ _08026C58: .4byte gBattleMons\n\
_08026C5C: .4byte gBattleMoveFlags\n\
_08026C60: .4byte gLastUsedAbility\n\
_08026C64: .4byte gBattlescriptCurrInstr\n\
-_08026C68: .4byte gUnknown_081D9826\n\
+_08026C68: .4byte BattleScript_SturdyPreventsOHKO\n\
_08026C6C:\n\
ldr r1, _08026CE0 @ =gStatuses3\n\
lsls r0, r2, 2\n\
@@ -14078,7 +14078,7 @@ static void atk9A_setfocusenergy(void)
static void atk9B_transformdataexecution(void)
{
- gUnknown_02024BE8 = 0xFFFF;
+ gChosenMove = 0xFFFF;
gBattlescriptCurrInstr++;
if (gBattleMons[gBankTarget].status2 & STATUS2_TRANSFORMED || gStatuses3[gBankTarget] & STATUS3_SEMI_INVULNERABLE)
{
@@ -14155,7 +14155,7 @@ static bool8 IsMoveUncopyable(u16 move)
static void atk9D_mimicattackcopy(void)
{
- gUnknown_02024BE8 = 0xFFFF;
+ gChosenMove = 0xFFFF;
if (IsMoveUncopyable(gLastUsedMove[gBankTarget]) || gBattleMons[gBankAttacker].status2 & STATUS2_TRANSFORMED
|| gLastUsedMove[gBankTarget] == 0 || gLastUsedMove[gBankTarget] == 0xFFFF)
{
@@ -14203,7 +14203,7 @@ static void atk9E_metronome(void)
} while (sUnknown_081FACFE[i] != 0xFFFF);
gHitMarker &= ~(HITMARKER_ATTACKSTRING_PRINTED);
- gBattlescriptCurrInstr = gBattleScriptsEffectsTable[gBattleMoves[gCurrentMove].effect];
+ gBattlescriptCurrInstr = gBattleScriptsForMoveEffects[gBattleMoves[gCurrentMove].effect];
gBankTarget = GetMoveTarget(gCurrentMove, 0);
}
@@ -14255,7 +14255,7 @@ _080278F8:\n\
ldr r1, _08027950 @ =0xfffffbff\n\
ands r0, r1\n\
str r0, [r2]\n\
- ldr r3, _08027954 @ =gBattleScriptsEffectsTable\n\
+ ldr r3, _08027954 @ =gBattleScriptsForMoveEffects\n\
ldr r2, _08027958 @ =gBattleMoves\n\
ldrh r1, [r4]\n\
lsls r0, r1, 1\n\
@@ -14286,7 +14286,7 @@ _08027944: .4byte 0x000001ff\n\
_08027948: .4byte 0x0000ffff\n\
_0802794C: .4byte gHitMarker\n\
_08027950: .4byte 0xfffffbff\n\
-_08027954: .4byte gBattleScriptsEffectsTable\n\
+_08027954: .4byte gBattleScriptsForMoveEffects\n\
_08027958: .4byte gBattleMoves\n\
_0802795C: .4byte gBankTarget\n\
.syntax divided");
@@ -14742,7 +14742,7 @@ struct move_pp
static void atkA8_copymovepermanently(void)
{
- gUnknown_02024BE8 = 0xFFFF;
+ gChosenMove = 0xFFFF;
if (!(gBattleMons[gBankAttacker].status2 & STATUS2_TRANSFORMED) && gUnknown_02024C2C[gBankTarget] != MOVE_STRUGGLE && gUnknown_02024C2C[gBankTarget] != 0 && gUnknown_02024C2C[gBankTarget] != 0xFFFF && gUnknown_02024C2C[gBankTarget] != MOVE_SKETCH)
{
int i;
@@ -15065,7 +15065,7 @@ static void atkB3_rolloutdamagecalculation(void)
if (gBattleMoveFlags & MOVESTATUS_NOEFFECT)
{
CancelMultiTurnMoves(gBankAttacker);
- gBattlescriptCurrInstr = BattleScript_1D6F74;
+ gBattlescriptCurrInstr = BattleScript_MoveMissedPause;
}
else
{
@@ -15104,7 +15104,7 @@ static void atkB5_furycuttercalc(void)
if (gBattleMoveFlags & MOVESTATUS_NOEFFECT)
{
gDisableStructs[gBankAttacker].furyCutterCounter = 0;
- gBattlescriptCurrInstr = BattleScript_1D6F74;
+ gBattlescriptCurrInstr = BattleScript_MoveMissedPause;
}
else
{
@@ -15147,13 +15147,13 @@ static void atkB7_presentdamagecalculation(void)
gBattleMoveDamage *= -1;
}
if (rand < 204)
- gBattlescriptCurrInstr = BattleScript_1D6F44;
+ gBattlescriptCurrInstr = BattleScript_HitFromCritCalc;
else if (gBattleMons[gBankTarget].maxHP == gBattleMons[gBankTarget].hp)
- gBattlescriptCurrInstr = BattleScript_1D83B5;
+ gBattlescriptCurrInstr = BattleScript_AlreadyAtFullHp;
else
{
//gBattleMoveFlags &= ~(MOVESTATUS_NOTAFFECTED); only in Emerald
- gBattlescriptCurrInstr = BattleScript_1D839B;
+ gBattlescriptCurrInstr = BattleScript_PresentHealTarget;
}
}
@@ -15953,7 +15953,7 @@ static void atkCC_callterrainattack(void) //nature power
gHitMarker &= ~(HITMARKER_ATTACKSTRING_PRINTED);
gCurrentMove = sNaturePowerMoves[gBattleTerrain];
gBankTarget = GetMoveTarget(gCurrentMove, 0);
- b_movescr_stack_push(gBattleScriptsEffectsTable[gBattleMoves[gCurrentMove].effect]);
+ b_movescr_stack_push(gBattleScriptsForMoveEffects[gBattleMoves[gCurrentMove].effect]);
gBattlescriptCurrInstr++;
}
diff --git a/src/data/battle_strings_de.h b/src/data/battle_strings_de.h
index f78d0bf14..a3d51f2a5 100755
--- a/src/data/battle_strings_de.h
+++ b/src/data/battle_strings_de.h
@@ -1227,7 +1227,7 @@ const u16 gMissStrings[] =
BATTLE_TEXT_GroundMoveNegate,
};
-const u16 BattleTextList_401512[] =
+const u16 gNoEscapeStringIds[] =
{
BATTLE_TEXT_CantEscape2,
BATTLE_TEXT_BirchDontLeaveMe,
@@ -1236,7 +1236,7 @@ const u16 BattleTextList_401512[] =
BATTLE_TEXT_AttackingCantEscape,
};
-const u16 BattleTextList_40151C[] =
+const u16 gMoveWeatherChangeStringIds[] =
{
BATTLE_TEXT_RainStart,
BATTLE_TEXT_PourStart,
@@ -1246,39 +1246,39 @@ const u16 BattleTextList_40151C[] =
BATTLE_TEXT_HailStart,
};
-const u16 BattleTextList_401528[] =
+const u16 gSandStormHailContinuesStringIds[] =
{
BATTLE_TEXT_SandRages,
BATTLE_TEXT_HailCont,
};
-const u16 BattleTextList_40152C[] =
+const u16 gSandStormHailDmgStringIds[] =
{
BATTLE_TEXT_SandBuffeted,
BATTLE_TEXT_HailStricken,
};
-const u16 BattleTextList_401530[] =
+const u16 gSandStormHailEndStringIds[] =
{
BATTLE_TEXT_SandSubsided,
BATTLE_TEXT_HailStop,
};
-const u16 BattleTextList_401534[] =
+const u16 gRainContinuesStringIds[] =
{
BATTLE_TEXT_RainCont1,
BATTLE_TEXT_PourCont,
BATTLE_TEXT_RainStop,
};
-const u16 BattleTextList_40153A[] =
+const u16 gProtectLikeUsedStringIds[] =
{
BATTLE_TEXT_ProtectedItself2,
BATTLE_TEXT_BracedItself,
BATTLE_TEXT_Failed,
};
-const u16 BattleTextList_401540[] =
+const u16 gReflectLightScreenSafeguardStringIds[] =
{
BATTLE_TEXT_Failed,
BATTLE_TEXT_RaisedDefense,
@@ -1288,7 +1288,7 @@ const u16 BattleTextList_401540[] =
BATTLE_TEXT_CoveredVeil,
};
-const u16 BattleTextList_40154C[] =
+const u16 gLeechSeedStringIds[] =
{
BATTLE_TEXT_WasSeeded,
BATTLE_TEXT_EvadedAttack,
@@ -1297,44 +1297,44 @@ const u16 BattleTextList_40154C[] =
BATTLE_TEXT_OozeSuckup,
};
-const u16 BattleTextList_401556[] =
+const u16 gRestUsedStringIds[] =
{
BATTLE_TEXT_WentToSleep,
BATTLE_TEXT_SpeltHealthy,
};
-const u16 BattleTextList_40155A[] =
+const u16 gUproarOverTurnStringIds[] =
{
BATTLE_TEXT_UproarMaking,
BATTLE_TEXT_CalmedDown,
};
-const u16 BattleTextList_40155E[] =
+const u16 gStockpileUsedStringIds[] =
{
BATTLE_TEXT_Stockpiled,
BATTLE_TEXT_StockpiledCant,
};
-const u16 BattleTextList_401562[] =
+const u16 gWokeUpStringIds[] =
{
BATTLE_TEXT_WokeUp,
BATTLE_TEXT_UproarWoke,
};
-const u16 BattleTextList_401566[] =
+const u16 gSwallowFailStringIds[] =
{
BATTLE_TEXT_SwallowFail,
BATTLE_TEXT_HPFull,
};
-const u16 BattleTextList_40156A[] =
+const u16 gUproarAwakeStringIds[] =
{
BATTLE_TEXT_UproarCantSleep2,
BATTLE_TEXT_UproarKeptAwake,
BATTLE_TEXT_StayedAwake,
};
-const u16 BattleTextList_401570[] =
+const u16 gStatUpStringIds[] =
{
BATTLE_TEXT_UnknownString7,
BATTLE_TEXT_UnknownString3,
@@ -1344,7 +1344,7 @@ const u16 BattleTextList_401570[] =
BATTLE_TEXT_HustleUse,
};
-const u16 BattleTextList_40157C[] =
+const u16 gStatDownStringIds[] =
{
BATTLE_TEXT_UnknownString5,
BATTLE_TEXT_UnknownString6,
@@ -1352,7 +1352,7 @@ const u16 BattleTextList_40157C[] =
BATTLE_TEXT_Terminator2,
};
-const u16 BattleTextList_401584[] =
+const u16 gFirstTurnOfTwoStringIds[] =
{
BATTLE_TEXT_WhipWhirlwind,
BATTLE_TEXT_TookSunlight,
@@ -1364,7 +1364,7 @@ const u16 BattleTextList_401584[] =
BATTLE_TEXT_SprangUp,
};
-const u16 BattleTextList_401594[] =
+const u16 gWrappedStringIds[] =
{
BATTLE_TEXT_SqueezedBind,
BATTLE_TEXT_Wrapped,
@@ -1374,67 +1374,67 @@ const u16 BattleTextList_401594[] =
BATTLE_TEXT_SandTombTrapped,
};
-const u16 BattleTextList_4015A0[] =
+const u16 gMistUsedStringIds[] =
{
BATTLE_TEXT_MistShroud,
BATTLE_TEXT_Failed,
};
-const u16 BattleTextList_4015A4[] =
+const u16 gFocusEnergyUsedStringIds[] =
{
BATTLE_TEXT_GetPumped,
BATTLE_TEXT_Failed,
};
-const u16 BattleTextList_4015A8[] =
+const u16 gTransformUsedStringIds[] =
{
BATTLE_TEXT_Transformed,
BATTLE_TEXT_Failed,
};
-const u16 BattleTextList_4015AC[] =
+const u16 gSubsituteUsedStringIds[] =
{
BATTLE_TEXT_SubMade,
BATTLE_TEXT_SubWeak,
};
-const u16 BattleTextList_4015B0[] =
+const u16 gGotPoisonedStringIds[] =
{
BATTLE_TEXT_Poisoned,
BATTLE_TEXT_Poisoned2,
};
-const u16 BattleTextList_4015B4[] =
+const u16 gGotParalyzedStringIds[] =
{
BATTLE_TEXT_Paralyzed,
BATTLE_TEXT_Paralyzed2,
};
-const u16 BattleTextList_4015B8[] =
+const u16 gFellAsleepStringIds[] =
{
BATTLE_TEXT_FellAsleep,
BATTLE_TEXT_MadeAsleep,
};
-const u16 BattleTextList_4015BC[] =
+const u16 gGotBurnedStringIds[] =
{
BATTLE_TEXT_Burned,
BATTLE_TEXT_Burned2,
};
-const u16 BattleTextList_4015C0[] =
+const u16 gGotFrozenStringIds[] =
{
BATTLE_TEXT_Frozen,
BATTLE_TEXT_Frozen2,
};
-const u16 BattleTextList_4015C4[] =
+const u16 gGotDefrostedStringIds[] =
{
BATTLE_TEXT_AttackingDefrosted,
BATTLE_TEXT_Defrosted,
};
-const u16 BattleTextList_4015C8[] =
+const u16 gKOFailedStringIds[] =
{
BATTLE_TEXT_AttackMissed,
BATTLE_TEXT_Unaffected,
@@ -1442,19 +1442,19 @@ const u16 BattleTextList_4015C8[] =
BATTLE_TEXT_InfatuatedPoke,
};
-const u16 BattleTextList_4015D0[] =
+const u16 gLeechSeedDrainStringIds[] =
{
BATTLE_TEXT_EnergyDrained,
BATTLE_TEXT_OozeSuckup,
};
-const u16 BattleTextList_4015D4[] =
+const u16 gSportsUsedStringIds[] =
{
BATTLE_TEXT_ElecWeakened,
BATTLE_TEXT_FireWeakened,
};
-const u16 BattleTextList_4015D8[] =
+const u16 gPartyStatusHealStringIds[] =
{
BATTLE_TEXT_BellChime,
BATTLE_TEXT_BellChime,
@@ -1463,13 +1463,13 @@ const u16 BattleTextList_4015D8[] =
BATTLE_TEXT_SoothingAroma,
};
-const u16 BattleTextList_4015E2[] =
+const u16 gFutureMoveUsedStringIds[] =
{
BATTLE_TEXT_ForesawAttack,
BATTLE_TEXT_ChoseDestiny,
};
-const u16 BattleTextList_4015E6[] =
+const u16 gBallEscapeStringIds[] =
{
BATTLE_TEXT_BallBrokeOhNo,
BATTLE_TEXT_BallBrokeAppeared,
@@ -1477,7 +1477,7 @@ const u16 BattleTextList_4015E6[] =
BATTLE_TEXT_BallBrokeSoClose,
};
-const u16 BattleTextList_4015EE[] =
+const u16 gWeatherContinuesStringIds[] =
{
BATTLE_TEXT_Raining,
BATTLE_TEXT_Raining,
@@ -1497,7 +1497,7 @@ const u16 BattleTextList_4015EE[] =
BATTLE_TEXT_Raining,
};
-const u16 BattleTextList_40160E[] =
+const u16 gInobedientStringIds[] =
{
BATTLE_TEXT_LoafingAround,
BATTLE_TEXT_WontObey,
@@ -1505,20 +1505,20 @@ const u16 BattleTextList_40160E[] =
BATTLE_TEXT_NotNotice,
};
-const u16 BattleTextList_401616[] =
+const u16 gSafariGetNearStringIds[] =
{
BATTLE_TEXT_CreptCloser,
BATTLE_TEXT_CantGetCloser,
};
-const u16 BattleTextList_40161A[] =
+const u16 gSafariPokeblockResultStringIds[] =
{
BATTLE_TEXT_CuriousAbout,
BATTLE_TEXT_EnthralledBy,
BATTLE_TEXT_IgnoredThing,
};
-const u16 BattleTextList_401620[] =
+const u16 gTrainerItemCuredStatusStringIds[] =
{
BATTLE_TEXT_CuredConfusion,
BATTLE_TEXT_CuredParalysis,
@@ -1528,41 +1528,41 @@ const u16 BattleTextList_401620[] =
BATTLE_TEXT_CuredSleep,
};
-const u16 BattleTextList_40162C[] =
+const u16 gBerryEffectStringIds[] =
{
BATTLE_TEXT_CuredStatus,
BATTLE_TEXT_NormalizedStatus,
};
-const u16 BattleTextList_401630[] =
+const u16 gBRNPreventionStringIds[] =
{
BATTLE_TEXT_PreventedBurn,
BATTLE_TEXT_PreventedOther2,
BATTLE_TEXT_NoEffectOn,
};
-const u16 BattleTextList_401636[] =
+const u16 gPRLZPreventionStringIds[] =
{
BATTLE_TEXT_PreventedPara,
BATTLE_TEXT_PreventedOther2,
BATTLE_TEXT_NoEffectOn,
};
-const u16 BattleTextList_40163C[] =
+const u16 gPSNPreventionStringIds[] =
{
BATTLE_TEXT_PreventedPoison,
BATTLE_TEXT_PreventedOther2,
BATTLE_TEXT_NoEffectOn,
};
-const u16 BattleTextList_401642[] =
+const u16 gItemSwapStringIds[] =
{
BATTLE_TEXT_Obtained1,
BATTLE_TEXT_Obtained2,
BATTLE_TEXT_Obtained3,
};
-const u16 BattleTextList_401648[] =
+const u16 gFlashFireStringIds[] =
{
BATTLE_TEXT_RaisedFirePower,
BATTLE_TEXT_MadeIneffective,
diff --git a/src/data/battle_strings_en.h b/src/data/battle_strings_en.h
index 26523d2e0..f29e48410 100755
--- a/src/data/battle_strings_en.h
+++ b/src/data/battle_strings_en.h
@@ -1227,7 +1227,7 @@ const u16 gMissStrings[] =
BATTLE_TEXT_GroundMoveNegate,
};
-const u16 BattleTextList_401512[] =
+const u16 gNoEscapeStringIds[] =
{
BATTLE_TEXT_CantEscape2,
BATTLE_TEXT_BirchDontLeaveMe,
@@ -1236,7 +1236,7 @@ const u16 BattleTextList_401512[] =
BATTLE_TEXT_AttackingCantEscape,
};
-const u16 BattleTextList_40151C[] =
+const u16 gMoveWeatherChangeStringIds[] =
{
BATTLE_TEXT_RainStart,
BATTLE_TEXT_PourStart,
@@ -1246,39 +1246,39 @@ const u16 BattleTextList_40151C[] =
BATTLE_TEXT_HailStart,
};
-const u16 BattleTextList_401528[] =
+const u16 gSandStormHailContinuesStringIds[] =
{
BATTLE_TEXT_SandRages,
BATTLE_TEXT_HailCont,
};
-const u16 BattleTextList_40152C[] =
+const u16 gSandStormHailDmgStringIds[] =
{
BATTLE_TEXT_SandBuffeted,
BATTLE_TEXT_HailStricken,
};
-const u16 BattleTextList_401530[] =
+const u16 gSandStormHailEndStringIds[] =
{
BATTLE_TEXT_SandSubsided,
BATTLE_TEXT_HailStop,
};
-const u16 BattleTextList_401534[] =
+const u16 gRainContinuesStringIds[] =
{
BATTLE_TEXT_RainCont1,
BATTLE_TEXT_PourCont,
BATTLE_TEXT_RainStop,
};
-const u16 BattleTextList_40153A[] =
+const u16 gProtectLikeUsedStringIds[] =
{
BATTLE_TEXT_ProtectedItself2,
BATTLE_TEXT_BracedItself,
BATTLE_TEXT_Failed,
};
-const u16 BattleTextList_401540[] =
+const u16 gReflectLightScreenSafeguardStringIds[] =
{
BATTLE_TEXT_Failed,
BATTLE_TEXT_RaisedDefense,
@@ -1288,7 +1288,7 @@ const u16 BattleTextList_401540[] =
BATTLE_TEXT_CoveredVeil,
};
-const u16 BattleTextList_40154C[] =
+const u16 gLeechSeedStringIds[] =
{
BATTLE_TEXT_WasSeeded,
BATTLE_TEXT_EvadedAttack,
@@ -1297,44 +1297,44 @@ const u16 BattleTextList_40154C[] =
BATTLE_TEXT_OozeSuckup,
};
-const u16 BattleTextList_401556[] =
+const u16 gRestUsedStringIds[] =
{
BATTLE_TEXT_WentToSleep,
BATTLE_TEXT_SpeltHealthy,
};
-const u16 BattleTextList_40155A[] =
+const u16 gUproarOverTurnStringIds[] =
{
BATTLE_TEXT_UproarMaking,
BATTLE_TEXT_CalmedDown,
};
-const u16 BattleTextList_40155E[] =
+const u16 gStockpileUsedStringIds[] =
{
BATTLE_TEXT_Stockpiled,
BATTLE_TEXT_StockpiledCant,
};
-const u16 BattleTextList_401562[] =
+const u16 gWokeUpStringIds[] =
{
BATTLE_TEXT_WokeUp,
BATTLE_TEXT_UproarWoke,
};
-const u16 BattleTextList_401566[] =
+const u16 gSwallowFailStringIds[] =
{
BATTLE_TEXT_SwallowFail,
BATTLE_TEXT_HPFull,
};
-const u16 BattleTextList_40156A[] =
+const u16 gUproarAwakeStringIds[] =
{
BATTLE_TEXT_UproarCantSleep2,
BATTLE_TEXT_UproarKeptAwake,
BATTLE_TEXT_StayedAwake,
};
-const u16 BattleTextList_401570[] =
+const u16 gStatUpStringIds[] =
{
BATTLE_TEXT_UnknownString7,
BATTLE_TEXT_UnknownString3,
@@ -1344,7 +1344,7 @@ const u16 BattleTextList_401570[] =
BATTLE_TEXT_HustleUse,
};
-const u16 BattleTextList_40157C[] =
+const u16 gStatDownStringIds[] =
{
BATTLE_TEXT_UnknownString5,
BATTLE_TEXT_UnknownString6,
@@ -1352,7 +1352,7 @@ const u16 BattleTextList_40157C[] =
BATTLE_TEXT_Terminator2,
};
-const u16 BattleTextList_401584[] =
+const u16 gFirstTurnOfTwoStringIds[] =
{
BATTLE_TEXT_WhipWhirlwind,
BATTLE_TEXT_TookSunlight,
@@ -1364,7 +1364,7 @@ const u16 BattleTextList_401584[] =
BATTLE_TEXT_SprangUp,
};
-const u16 BattleTextList_401594[] =
+const u16 gWrappedStringIds[] =
{
BATTLE_TEXT_SqueezedBind,
BATTLE_TEXT_Wrapped,
@@ -1374,67 +1374,67 @@ const u16 BattleTextList_401594[] =
BATTLE_TEXT_SandTombTrapped,
};
-const u16 BattleTextList_4015A0[] =
+const u16 gMistUsedStringIds[] =
{
BATTLE_TEXT_MistShroud,
BATTLE_TEXT_Failed,
};
-const u16 BattleTextList_4015A4[] =
+const u16 gFocusEnergyUsedStringIds[] =
{
BATTLE_TEXT_GetPumped,
BATTLE_TEXT_Failed,
};
-const u16 BattleTextList_4015A8[] =
+const u16 gTransformUsedStringIds[] =
{
BATTLE_TEXT_Transformed,
BATTLE_TEXT_Failed,
};
-const u16 BattleTextList_4015AC[] =
+const u16 gSubsituteUsedStringIds[] =
{
BATTLE_TEXT_SubMade,
BATTLE_TEXT_SubWeak,
};
-const u16 BattleTextList_4015B0[] =
+const u16 gGotPoisonedStringIds[] =
{
BATTLE_TEXT_Poisoned,
BATTLE_TEXT_Poisoned2,
};
-const u16 BattleTextList_4015B4[] =
+const u16 gGotParalyzedStringIds[] =
{
BATTLE_TEXT_Paralyzed,
BATTLE_TEXT_Paralyzed2,
};
-const u16 BattleTextList_4015B8[] =
+const u16 gFellAsleepStringIds[] =
{
BATTLE_TEXT_FellAsleep,
BATTLE_TEXT_MadeAsleep,
};
-const u16 BattleTextList_4015BC[] =
+const u16 gGotBurnedStringIds[] =
{
BATTLE_TEXT_Burned,
BATTLE_TEXT_Burned2,
};
-const u16 BattleTextList_4015C0[] =
+const u16 gGotFrozenStringIds[] =
{
BATTLE_TEXT_Frozen,
BATTLE_TEXT_Frozen2,
};
-const u16 BattleTextList_4015C4[] =
+const u16 gGotDefrostedStringIds[] =
{
BATTLE_TEXT_AttackingDefrosted,
BATTLE_TEXT_Defrosted,
};
-const u16 BattleTextList_4015C8[] =
+const u16 gKOFailedStringIds[] =
{
BATTLE_TEXT_AttackMissed,
BATTLE_TEXT_Unaffected,
@@ -1442,19 +1442,19 @@ const u16 BattleTextList_4015C8[] =
BATTLE_TEXT_InfatuatedPoke,
};
-const u16 BattleTextList_4015D0[] =
+const u16 gLeechSeedDrainStringIds[] =
{
BATTLE_TEXT_EnergyDrained,
BATTLE_TEXT_OozeSuckup,
};
-const u16 BattleTextList_4015D4[] =
+const u16 gSportsUsedStringIds[] =
{
BATTLE_TEXT_ElecWeakened,
BATTLE_TEXT_FireWeakened,
};
-const u16 BattleTextList_4015D8[] =
+const u16 gPartyStatusHealStringIds[] =
{
BATTLE_TEXT_BellChime,
BATTLE_TEXT_BellChime,
@@ -1463,13 +1463,13 @@ const u16 BattleTextList_4015D8[] =
BATTLE_TEXT_SoothingAroma,
};
-const u16 BattleTextList_4015E2[] =
+const u16 gFutureMoveUsedStringIds[] =
{
BATTLE_TEXT_ForesawAttack,
BATTLE_TEXT_ChoseDestiny,
};
-const u16 BattleTextList_4015E6[] =
+const u16 gBallEscapeStringIds[] =
{
BATTLE_TEXT_BallBrokeOhNo,
BATTLE_TEXT_BallBrokeAppeared,
@@ -1477,7 +1477,7 @@ const u16 BattleTextList_4015E6[] =
BATTLE_TEXT_BallBrokeSoClose,
};
-const u16 BattleTextList_4015EE[] =
+const u16 gWeatherContinuesStringIds[] =
{
BATTLE_TEXT_Raining,
BATTLE_TEXT_Raining,
@@ -1497,7 +1497,7 @@ const u16 BattleTextList_4015EE[] =
BATTLE_TEXT_Raining,
};
-const u16 BattleTextList_40160E[] =
+const u16 gInobedientStringIds[] =
{
BATTLE_TEXT_LoafingAround,
BATTLE_TEXT_WontObey,
@@ -1505,20 +1505,20 @@ const u16 BattleTextList_40160E[] =
BATTLE_TEXT_NotNotice,
};
-const u16 BattleTextList_401616[] =
+const u16 gSafariGetNearStringIds[] =
{
BATTLE_TEXT_CreptCloser,
BATTLE_TEXT_CantGetCloser,
};
-const u16 BattleTextList_40161A[] =
+const u16 gSafariPokeblockResultStringIds[] =
{
BATTLE_TEXT_CuriousAbout,
BATTLE_TEXT_EnthralledBy,
BATTLE_TEXT_IgnoredThing,
};
-const u16 BattleTextList_401620[] =
+const u16 gTrainerItemCuredStatusStringIds[] =
{
BATTLE_TEXT_CuredConfusion,
BATTLE_TEXT_CuredParalysis,
@@ -1528,41 +1528,41 @@ const u16 BattleTextList_401620[] =
BATTLE_TEXT_CuredSleep,
};
-const u16 BattleTextList_40162C[] =
+const u16 gBerryEffectStringIds[] =
{
BATTLE_TEXT_CuredStatus,
BATTLE_TEXT_NormalizedStatus,
};
-const u16 BattleTextList_401630[] =
+const u16 gBRNPreventionStringIds[] =
{
BATTLE_TEXT_PreventedBurn,
BATTLE_TEXT_PreventedOther2,
BATTLE_TEXT_NoEffectOn,
};
-const u16 BattleTextList_401636[] =
+const u16 gPRLZPreventionStringIds[] =
{
BATTLE_TEXT_PreventedPara,
BATTLE_TEXT_PreventedOther2,
BATTLE_TEXT_NoEffectOn,
};
-const u16 BattleTextList_40163C[] =
+const u16 gPSNPreventionStringIds[] =
{
BATTLE_TEXT_PreventedPoison,
BATTLE_TEXT_PreventedOther2,
BATTLE_TEXT_NoEffectOn,
};
-const u16 BattleTextList_401642[] =
+const u16 gItemSwapStringIds[] =
{
BATTLE_TEXT_Obtained1,
BATTLE_TEXT_Obtained2,
BATTLE_TEXT_Obtained3,
};
-const u16 BattleTextList_401648[] =
+const u16 gFlashFireStringIds[] =
{
BATTLE_TEXT_RaisedFirePower,
BATTLE_TEXT_MadeIneffective,
diff --git a/src/rom3.c b/src/rom3.c
index b29bc7428..cdc66989c 100644
--- a/src/rom3.c
+++ b/src/rom3.c
@@ -35,7 +35,7 @@ extern u8 gNoOfAllBanks;
extern u16 gBattlePartyID[];
extern u8 gBanksBySide[];
extern u16 gCurrentMove;
-extern u16 gUnknown_02024BE8;
+extern u16 gChosenMove;
extern u16 gLastUsedItem;
extern u8 gLastUsedAbility;
extern u8 gBankAttacker;
@@ -745,7 +745,7 @@ void EmitPrintString(u8 a, u16 stringID)
stringInfo = (struct StringInfoBattle*)(&gBattleBuffersTransferData[4]);
stringInfo->currentMove = gCurrentMove;
- stringInfo->lastMove = gUnknown_02024BE8;
+ stringInfo->lastMove = gChosenMove;
stringInfo->lastItem = gLastUsedItem;
stringInfo->lastAbility = gLastUsedAbility;
stringInfo->scrActive = BATTLE_STRUCT->scriptingActive;
@@ -777,7 +777,7 @@ void EmitPrintStringPlayerOnly(u8 a, u16 stringID)
stringInfo = (struct StringInfoBattle*)(&gBattleBuffersTransferData[4]);
stringInfo->currentMove = gCurrentMove;
- stringInfo->lastMove = gUnknown_02024BE8;
+ stringInfo->lastMove = gChosenMove;
stringInfo->lastItem = gLastUsedItem;
stringInfo->lastAbility = gLastUsedAbility;
stringInfo->scrActive = BATTLE_STRUCT->scriptingActive;
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-11 03:54:03 +0000