diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 944ef87466..6415dee69c 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -521,7 +521,7 @@ BattleScript_AffectionBasedStatus_HealFreezeString: printstring STRINGID_ATTACKERMELTEDTHEICE goto BattleScript_AffectionBasedStatusHeal_Continue BattleScript_AffectionBasedStatus_HealFrostbiteString: - printstring STRINGID_ATTACKERHEALEDITSFROSTBITE + printstring STRINGID_ATTACKERMELTEDTHEICE BattleScript_AffectionBasedStatusHeal_Continue: waitmessage B_WAIT_TIME_LONG clearstatus BS_ATTACKER @@ -8720,11 +8720,11 @@ BattleScript_BerryCureFrzRet:: removeitem BS_SCRIPTING return -BattleScript_BerryCureFsbEnd2:: +BattleScript_BerryCureFrbEnd2:: call BattleScript_BerryCureFrzRet end2 -BattleScript_BerryCureFsbRet:: +BattleScript_BerryCureFrbRet:: playanimation BS_SCRIPTING, B_ANIM_HELD_ITEM_EFFECT printstring STRINGID_PKMNSITEMHEALEDFROSTBITE waitmessage B_WAIT_TIME_LONG diff --git a/graphics/battle_interface/status.png b/graphics/battle_interface/status.png index 0b212907e5..ceb39fb777 100644 Binary files a/graphics/battle_interface/status.png and b/graphics/battle_interface/status.png differ diff --git a/graphics/battle_interface/status2.png b/graphics/battle_interface/status2.png index 5d7f6459be..ecb72c52de 100644 Binary files a/graphics/battle_interface/status2.png and b/graphics/battle_interface/status2.png differ diff --git a/graphics/battle_interface/status3.png b/graphics/battle_interface/status3.png index 7cc8cd56dc..369564815f 100644 Binary files a/graphics/battle_interface/status3.png and b/graphics/battle_interface/status3.png differ diff --git a/graphics/battle_interface/status4.png b/graphics/battle_interface/status4.png index c5ab2c5e11..119d4f4aa7 100644 Binary files a/graphics/battle_interface/status4.png and b/graphics/battle_interface/status4.png differ diff --git a/graphics/interface/status_icons.png b/graphics/interface/status_icons.png index f93406cfd1..cef7119a40 100644 Binary files a/graphics/interface/status_icons.png and b/graphics/interface/status_icons.png differ diff --git a/include/battle_scripts.h b/include/battle_scripts.h index 3f99a90893..0cf14c0fc0 100644 --- a/include/battle_scripts.h +++ b/include/battle_scripts.h @@ -205,8 +205,8 @@ extern const u8 BattleScript_BerryCureBrnEnd2[]; extern const u8 BattleScript_BerryCureBrnRet[]; extern const u8 BattleScript_BerryCureFrzEnd2[]; extern const u8 BattleScript_BerryCureFrzRet[]; -extern const u8 BattleScript_BerryCureFsbEnd2[]; -extern const u8 BattleScript_BerryCureFsbRet[]; +extern const u8 BattleScript_BerryCureFrbEnd2[]; +extern const u8 BattleScript_BerryCureFrbRet[]; extern const u8 BattleScript_BerryCureSlpEnd2[]; extern const u8 BattleScript_BerryCureSlpRet[]; extern const u8 BattleScript_BerryCureConfusionEnd2[]; diff --git a/include/constants/party_menu.h b/include/constants/party_menu.h index c860b425d4..1f37f3416c 100644 --- a/include/constants/party_menu.h +++ b/include/constants/party_menu.h @@ -11,7 +11,7 @@ #define AILMENT_BRN 5 #define AILMENT_PKRS 6 #define AILMENT_FNT 7 -#define AILMENT_FSB 8 +#define AILMENT_FRB 8 #define PARTY_LAYOUT_SINGLE 0 #define PARTY_LAYOUT_DOUBLE 1 diff --git a/src/battle_interface.c b/src/battle_interface.c index 99ba59f489..d46c95dd3c 100644 --- a/src/battle_interface.c +++ b/src/battle_interface.c @@ -74,7 +74,7 @@ enum HEALTHBOX_GFX_STATUS_BRN_BATTLER0, //status brn HEALTHBOX_GFX_34, HEALTHBOX_GFX_35, - HEALTHBOX_GFX_STATUS_FSB_BATTLER0, //status fsb + HEALTHBOX_GFX_STATUS_FRB_BATTLER0, //status frb HEALTHBOX_GFX_116, HEALTHBOX_GFX_117, HEALTHBOX_GFX_36, //misc [Black section] @@ -127,7 +127,7 @@ enum HEALTHBOX_GFX_STATUS_BRN_BATTLER1, //status2 "BRN" HEALTHBOX_GFX_84, HEALTHBOX_GFX_85, - HEALTHBOX_GFX_STATUS_FSB_BATTLER1, //status2 "FSB" + HEALTHBOX_GFX_STATUS_FRB_BATTLER1, //status2 "FRB" HEALTHBOX_GFX_118, HEALTHBOX_GFX_119, HEALTHBOX_GFX_STATUS_PSN_BATTLER2, //status3 "PSN" @@ -145,7 +145,7 @@ enum HEALTHBOX_GFX_STATUS_BRN_BATTLER2, //status3 "BRN" HEALTHBOX_GFX_99, HEALTHBOX_GFX_100, - HEALTHBOX_GFX_STATUS_FSB_BATTLER2, //status3 "FSB" + HEALTHBOX_GFX_STATUS_FRB_BATTLER2, //status3 "FRB" HEALTHBOX_GFX_120, HEALTHBOX_GFX_121, HEALTHBOX_GFX_STATUS_PSN_BATTLER3, //status4 "PSN" @@ -163,7 +163,7 @@ enum HEALTHBOX_GFX_STATUS_BRN_BATTLER3, //status4 "BRN" HEALTHBOX_GFX_114, HEALTHBOX_GFX_115, - HEALTHBOX_GFX_STATUS_FSB_BATTLER3, //status4 "FSB" + HEALTHBOX_GFX_STATUS_FRB_BATTLER3, //status4 "FRB" HEALTHBOX_GFX_122, HEALTHBOX_GFX_123, HEALTHBOX_GFX_FRAME_END, @@ -2389,7 +2389,7 @@ static void UpdateStatusIconInHealthbox(u8 healthboxSpriteId) } else if (status & STATUS1_FROSTBITE) { - statusGfxPtr = GetHealthboxElementGfxPtr(GetStatusIconForBattlerId(HEALTHBOX_GFX_STATUS_FSB_BATTLER0, battlerId)); + statusGfxPtr = GetHealthboxElementGfxPtr(GetStatusIconForBattlerId(HEALTHBOX_GFX_STATUS_FRB_BATTLER0, battlerId)); statusPalId = PAL_STATUS_FRZ; } else if (status & STATUS1_PARALYSIS) @@ -2474,15 +2474,15 @@ static u8 GetStatusIconForBattlerId(u8 statusElementId, u8 battlerId) else ret = HEALTHBOX_GFX_STATUS_FRZ_BATTLER3; break; - case HEALTHBOX_GFX_STATUS_FSB_BATTLER0: + case HEALTHBOX_GFX_STATUS_FRB_BATTLER0: if (battlerId == 0) - ret = HEALTHBOX_GFX_STATUS_FSB_BATTLER0; + ret = HEALTHBOX_GFX_STATUS_FRB_BATTLER0; else if (battlerId == 1) - ret = HEALTHBOX_GFX_STATUS_FSB_BATTLER1; + ret = HEALTHBOX_GFX_STATUS_FRB_BATTLER1; else if (battlerId == 2) - ret = HEALTHBOX_GFX_STATUS_FSB_BATTLER2; + ret = HEALTHBOX_GFX_STATUS_FRB_BATTLER2; else - ret = HEALTHBOX_GFX_STATUS_FSB_BATTLER3; + ret = HEALTHBOX_GFX_STATUS_FRB_BATTLER3; break; case HEALTHBOX_GFX_STATUS_BRN_BATTLER0: if (battlerId == 0) diff --git a/src/battle_message.c b/src/battle_message.c index 55493e6834..cbd7bf55ea 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -783,7 +783,7 @@ static const u8 sText_AttackerExpelledThePoison[] = _("{B_ATK_NAME_WITH_PREFIX} static const u8 sText_AttackerShookItselfAwake[] = _("{B_ATK_NAME_WITH_PREFIX} shook itself awake!"); static const u8 sText_AttackerBrokeThroughParalysis[] = _("{B_ATK_NAME_WITH_PREFIX} gathered all its energy\nto overcome its paralysis!"); static const u8 sText_AttackerHealedItsBurn[] = _("{B_ATK_NAME_WITH_PREFIX} healed its burn with\nits sheer determination!"); -static const u8 sText_AttackerHealedItsFrostbite[] = _("{B_ATK_NAME_WITH_PREFIX} healed its frostbite with\nits sheer determination!"); +static const u8 sText_AttackerHealedItsFrostbite[] = _("{B_ATK_NAME_WITH_PREFIX} healed its frostbite with\nits sheer determination!"); //not used, "melted the ice" is used instead in PLA static const u8 sText_AttackerMeltedTheIce[] = _("{B_ATK_NAME_WITH_PREFIX} melted the ice with\nits fiery determination!"); static const u8 sText_TargetToughedItOut[] = _("{B_DEF_NAME_WITH_PREFIX} toughed it out\nto show you its best side!"); static const u8 sText_AttackerLostElectricType[] = _("{B_ATK_NAME_WITH_PREFIX} used up all\nof its electricity!"); @@ -1571,7 +1571,7 @@ const u16 gMentalHerbCureStringIds[] = [B_MSG_MENTALHERBCURE_DISABLE] = STRINGID_PKMNMOVEDISABLEDNOMORE, }; -const u16 gStartingStatusStringIds[B_MSG_STARTING_STATUS_COUNT] = +const u16 gStartingStatusStringIds[B_MSG_STARTING_STATUS_COUNT] = { [B_MSG_TERRAIN_SET_MISTY] = STRINGID_TERRAINBECOMESMISTY, [B_MSG_TERRAIN_SET_ELECTRIC] = STRINGID_TERRAINBECOMESELECTRIC, diff --git a/src/battle_util.c b/src/battle_util.c index 3f106b553f..d6797e2c1b 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -6912,7 +6912,7 @@ static u8 ItemEffectMoveEnd(u32 battler, u16 holdEffect) { gBattleMons[battler].status1 &= ~STATUS1_FROSTBITE; BattleScriptPushCursor(); - gBattlescriptCurrInstr = BattleScript_BerryCureFsbRet; + gBattlescriptCurrInstr = BattleScript_BerryCureFrbRet; effect = ITEM_STATUS_CHANGE; } break; @@ -7152,7 +7152,7 @@ u8 ItemBattleEffects(u8 caseID, u32 battler, bool32 moveTurn) && !UnnerveOn(battler, gLastUsedItem)) { gBattleMons[battler].status1 &= ~STATUS1_FROSTBITE; - BattleScriptExecute(BattleScript_BerryCureFsbEnd2); + BattleScriptExecute(BattleScript_BerryCureFrbEnd2); effect = ITEM_STATUS_CHANGE; } break; @@ -7444,7 +7444,7 @@ u8 ItemBattleEffects(u8 caseID, u32 battler, bool32 moveTurn) if (gBattleMons[battler].status1 & STATUS1_FROSTBITE && !UnnerveOn(battler, gLastUsedItem)) { gBattleMons[battler].status1 &= ~STATUS1_FROSTBITE; - BattleScriptExecute(BattleScript_BerryCureFsbEnd2); + BattleScriptExecute(BattleScript_BerryCureFrbEnd2); effect = ITEM_STATUS_CHANGE; } break; diff --git a/src/data/items.h b/src/data/items.h index 1185f65178..3a65f8758c 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -9412,7 +9412,11 @@ const struct Item gItemsInfo[] = .description = COMPOUND_STRING( "Fires an icy cold\n" "beam that may\n" + #if B_USE_FROSTBITE == TRUE + "give the foe frostbite."), + #else "freeze the foe."), + #endif .importance = I_REUSABLE_TMS, .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, @@ -9427,7 +9431,11 @@ const struct Item gItemsInfo[] = .description = COMPOUND_STRING( "A brutal snow-and-\n" "wind attack that\n" + #if B_USE_FROSTBITE == TRUE + "may give the foe frostbite."), + #else "may freeze the foe."), + #endif .importance = I_REUSABLE_TMS, .pocket = POCKET_TM_HM, .type = ITEM_USE_PARTY_MENU, diff --git a/src/data/moves_info.h b/src/data/moves_info.h index f23f664ea5..5ae99761ff 100644 --- a/src/data/moves_info.h +++ b/src/data/moves_info.h @@ -4435,7 +4435,11 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .name = COMPOUND_STRING("Powder Snow"), .description = COMPOUND_STRING( "Blasts the foe with a snowy\n" + #if B_USE_FROSTBITE == TRUE + "gust. May cause frostbite."), + #else "gust. May cause freezing."), + #endif .effect = EFFECT_HIT, .power = 40, .type = TYPE_ICE, @@ -10166,7 +10170,11 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .name = COMPOUND_STRING("Ice Fang"), .description = COMPOUND_STRING( "May cause flinching or\n" + #if B_USE_FROSTBITE == TRUE "leave the foe frozen."), + #else + "leave the foe with frostbite."), + #endif .effect = EFFECT_HIT, .power = 65, .type = TYPE_ICE, @@ -13679,7 +13687,11 @@ const struct MoveInfo gMovesInfo[MOVES_COUNT_DYNAMAX] = .name = COMPOUND_STRING("Freeze-Dry"), .description = COMPOUND_STRING( "Super effective on Water-\n" + #if B_USE_FROSTBITE == TRUE + "types. May cause frostbite."), + #else "types. May cause freezing."), + #endif .effect = EFFECT_FREEZE_DRY, .power = 70, .type = TYPE_ICE, diff --git a/src/party_menu.c b/src/party_menu.c index 19f50b7c88..3d535be62d 100644 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -2093,7 +2093,7 @@ u8 GetAilmentFromStatus(u32 status) if (status & STATUS1_BURN) return AILMENT_BRN; if (status & STATUS1_FROSTBITE) - return AILMENT_FSB; + return AILMENT_FRB; return AILMENT_NONE; }