atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change Frostbite abbreviation from FSB to FRB (#4355)

Browse source 
* Change Frostbite abbreviation from FSB to FRB

* Melted the ice is actually the one used

* Update moves_info.h

* Update moves_info.h

* Update items.h
This commit is contained in:
kittenchilly 2024-04-10 02:16:32 -05:00 committed by GitHub
parent 3c85089428
commit 3fb52b6b0e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
14 changed files with 42 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
data/battle_scripts_1.s
View file

@ -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

BIN
graphics/battle_interface/status.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 559 B

After

Width:  |  Height:  |  Size: 553 B

BIN
graphics/battle_interface/status2.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 559 B

After

Width:  |  Height:  |  Size: 553 B

BIN
graphics/battle_interface/status3.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 559 B

After

Width:  |  Height:  |  Size: 553 B

BIN
graphics/battle_interface/status4.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 559 B

After

Width:  |  Height:  |  Size: 553 B

BIN
graphics/interface/status_icons.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 458 B

After

Width:  |  Height:  |  Size: 451 B

4
include/battle_scripts.h
View file

@ -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[];

2
include/constants/party_menu.h
View file

@ -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

20
src/battle_interface.c
View file

@ -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)

2
src/battle_message.c
View file

@ -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!");

6
src/battle_util.c
View file

@ -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;

8
src/data/items.h
View file

@ -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,

12
src/data/moves_info.h
View file

@ -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,

2
src/party_menu.c
View file

@ -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;
}