diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index bd920dbc29..aab7bff6b3 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -5428,23 +5428,23 @@ BattleScript_LocalBattleLost:: jumpifnowhiteout BattleScript_LocalBattleLostEnd_ BattleScript_LocalBattleLostPrintWhiteOut:: getmoneyreward -.if B_WHITEOUT_MONEY >= GEN_4 - jumpifbattletype BATTLE_TYPE_TRAINER, BattleScript_LocalBattleLostEnd printstring STRINGID_PLAYERWHITEOUT waitmessage B_WAIT_TIME_LONG - printstring STRINGID_PLAYERWHITEOUT2 +.if B_WHITEOUT_MONEY >= GEN_4 + jumpifbattletype BATTLE_TYPE_TRAINER, BattleScript_LocalBattleLostEnd + printstring STRINGID_PLAYERWHITEOUT2_WILD + waitmessage B_WAIT_TIME_LONG + printstring STRINGID_PLAYERWHITEOUT3 waitmessage B_WAIT_TIME_LONG end2 BattleScript_LocalBattleLostEnd:: - printstring STRINGID_PLAYERLOSTTOENEMYTRAINER + printstring STRINGID_PLAYERWHITEOUT2_TRAINER waitmessage B_WAIT_TIME_LONG - printstring STRINGID_PLAYERPAIDPRIZEMONEY + printstring STRINGID_PLAYERWHITEOUT3 waitmessage B_WAIT_TIME_LONG end2 .else - printstring STRINGID_PLAYERWHITEOUT - waitmessage B_WAIT_TIME_LONG - printstring STRINGID_PLAYERWHITEOUT2 + printstring STRINGID_PLAYERWHITEOUT3 waitmessage B_WAIT_TIME_LONG BattleScript_LocalBattleLostEnd:: end2 @@ -10063,9 +10063,9 @@ BattleScript_QuestionForfeitBattle:: BattleScript_ForfeitBattleGaveMoney:: getmoneyreward .if B_WHITEOUT_MONEY >= GEN_4 - printstring STRINGID_FORFEITBATTLEGAVEMONEY + printstring STRINGID_PLAYERWHITEOUT2_TRAINER .else - printstring STRINGID_PLAYERWHITEOUT2 + printstring STRINGID_PLAYERWHITEOUT3 .endif waitmessage B_WAIT_TIME_LONG end2 diff --git a/include/constants/battle_string_ids.h b/include/constants/battle_string_ids.h index 8e8503458d..680ea413d8 100644 --- a/include/constants/battle_string_ids.h +++ b/include/constants/battle_string_ids.h @@ -32,7 +32,9 @@ enum StringID STRINGID_TARGETFAINTED, STRINGID_PLAYERGOTMONEY, STRINGID_PLAYERWHITEOUT, - STRINGID_PLAYERWHITEOUT2, + STRINGID_PLAYERWHITEOUT2_WILD, + STRINGID_PLAYERWHITEOUT2_TRAINER, + STRINGID_PLAYERWHITEOUT3, STRINGID_PREVENTSESCAPE, STRINGID_HITXTIMES, STRINGID_PKMNFELLASLEEP, @@ -611,8 +613,6 @@ enum StringID STRINGID_METEORBEAMCHARGING, STRINGID_HEATUPBEAK, STRINGID_COURTCHANGE, - STRINGID_PLAYERLOSTTOENEMYTRAINER, - STRINGID_PLAYERPAIDPRIZEMONEY, STRINGID_ZPOWERSURROUNDS, STRINGID_ZMOVEUNLEASHED, STRINGID_ZMOVERESETSSTATS, @@ -734,7 +734,6 @@ enum StringID STRINGID_TIMETODYNAMAX, STRINGID_TIMETOGIGANTAMAX, STRINGID_QUESTIONFORFEITBATTLE, - STRINGID_FORFEITBATTLEGAVEMONEY, STRINGID_TOXICSPIKESBADLYPOISONED, STRINGID_POWERCONSTRUCTPRESENCEOFMANY, STRINGID_POWERCONSTRUCTTRANSFORM, diff --git a/src/battle_message.c b/src/battle_message.c index d46ead7669..98a44a1ef7 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -191,11 +191,9 @@ const u8 *const gBattleStringsTable[STRINGID_COUNT] = [STRINGID_TARGETFAINTED] = COMPOUND_STRING("{B_DEF_NAME_WITH_PREFIX} fainted!\p"), [STRINGID_PLAYERGOTMONEY] = COMPOUND_STRING("You got ¥{B_BUFF1} for winning!\p"), [STRINGID_PLAYERWHITEOUT] = COMPOUND_STRING("You have no more Pokémon that can fight!\p"), -#if B_WHITEOUT_MONEY >= GEN_4 - [STRINGID_PLAYERWHITEOUT2] = COMPOUND_STRING("You panicked and dropped ¥{B_BUFF1}…\pYou were overwhelmed by your defeat!{PAUSE_UNTIL_PRESS}"), -#else - [STRINGID_PLAYERWHITEOUT2] = COMPOUND_STRING("You were overwhelmed by your defeat!{PAUSE_UNTIL_PRESS}"), -#endif + [STRINGID_PLAYERWHITEOUT2_WILD] = COMPOUND_STRING("You panicked and dropped ¥{B_BUFF1}…"), + [STRINGID_PLAYERWHITEOUT2_TRAINER] = COMPOUND_STRING("You gave ¥{B_BUFF1} to the winner…"), + [STRINGID_PLAYERWHITEOUT3] = COMPOUND_STRING("You were overwhelmed by your defeat!"), [STRINGID_PREVENTSESCAPE] = COMPOUND_STRING("{B_SCR_NAME_WITH_PREFIX} prevents escape with {B_SCR_ACTIVE_ABILITY}!\p"), [STRINGID_HITXTIMES] = COMPOUND_STRING("The Pokémon was hit {B_BUFF1} time(s)!"), //SV has dynamic plural here [STRINGID_PKMNFELLASLEEP] = COMPOUND_STRING("{B_EFF_NAME_WITH_PREFIX} fell asleep!"), @@ -775,8 +773,6 @@ const u8 *const gBattleStringsTable[STRINGID_COUNT] = [STRINGID_METEORBEAMCHARGING] = COMPOUND_STRING("{B_ATK_NAME_WITH_PREFIX} is overflowing with space power!"), [STRINGID_HEATUPBEAK] = COMPOUND_STRING("{B_ATK_NAME_WITH_PREFIX} started heating up its beak!"), [STRINGID_COURTCHANGE] = COMPOUND_STRING("{B_ATK_NAME_WITH_PREFIX} swapped the battle effects affecting each side of the field!"), - [STRINGID_PLAYERLOSTTOENEMYTRAINER] = COMPOUND_STRING("You have no more Pokémon that can fight!\pYou lost to {B_TRAINER1_NAME_WITH_CLASS}!{PAUSE_UNTIL_PRESS}"), - [STRINGID_PLAYERPAIDPRIZEMONEY] = COMPOUND_STRING("You gave ¥{B_BUFF1} to the winner…\pYou were overwhelmed by your defeat!{PAUSE_UNTIL_PRESS}"), [STRINGID_ZPOWERSURROUNDS] = COMPOUND_STRING("{B_ATK_NAME_WITH_PREFIX} surrounded itself with its Z-Power!"), [STRINGID_ZMOVEUNLEASHED] = COMPOUND_STRING("{B_ATK_NAME_WITH_PREFIX} unleashes its full-force Z-Move!"), [STRINGID_ZMOVERESETSSTATS] = COMPOUND_STRING("{B_SCR_NAME_WITH_PREFIX} returned its decreased stats to normal using its Z-Power!"), @@ -898,7 +894,6 @@ const u8 *const gBattleStringsTable[STRINGID_COUNT] = [STRINGID_TIMETODYNAMAX] = COMPOUND_STRING("Time to Dynamax!"), [STRINGID_TIMETOGIGANTAMAX] = COMPOUND_STRING("Time to Gigantamax!"), [STRINGID_QUESTIONFORFEITBATTLE] = COMPOUND_STRING("Would you like to give up on this battle and quit now? Quitting the battle is the same as losing the battle."), - [STRINGID_FORFEITBATTLEGAVEMONEY] = COMPOUND_STRING("You gave ¥{B_BUFF1} to the winner…{PAUSE_UNTIL_PRESS}"), [STRINGID_POWERCONSTRUCTPRESENCEOFMANY] = COMPOUND_STRING("You sense the presence of many!"), [STRINGID_POWERCONSTRUCTTRANSFORM] = COMPOUND_STRING("{B_ATK_NAME_WITH_PREFIX} transformed into its Complete Forme!"), }; diff --git a/test/text.c b/test/text.c index e2eed3af93..0a5a4dd2a2 100644 --- a/test/text.c +++ b/test/text.c @@ -682,9 +682,9 @@ TEST("Battle strings fit on the battle message window") break; // Buffer "999999" to B_BUFF1 case STRINGID_PLAYERGOTMONEY: - case STRINGID_PLAYERWHITEOUT2: + case STRINGID_PLAYERWHITEOUT2_TRAINER: case STRINGID_PLAYERPICKEDUPMONEY: - case STRINGID_PLAYERPAIDPRIZEMONEY: + case STRINGID_PLAYERWHITEOUT2_WILD: PREPARE_WORD_NUMBER_BUFFER(gBattleTextBuff1, 6, sixDigitNines); break; // Buffer "99" to B_BUFF1