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

gBattleCommunication ids

Browse source
This commit is contained in:
Eduardo Quezada 2023-10-10 19:53:56 -03:00
parent c61d187cc3
commit 3cb29f87a6
3 changed files with 24 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
include/constants/battle_string_ids.h
View file

@ -992,4 +992,16 @@
#define B_MSG_SPIKESSCATTERED 4
#define B_MSG_SHARPSTEELFLOATS 5
// gDamageNonTypesStartStringIds
#define B_MSG_TRAPPED_WITH_VINES 0
#define B_MSG_CAUGHT_IN_VORTEX 1
#define B_MSG_SURROUNDED_BY_FIRE 2
#define B_MSG_SURROUNDED_BY_ROCKS 3
// gDamageNonTypesDmgStringIds
#define B_MSG_HURT_BY_VINES 0
#define B_MSG_HURT_BY_VORTEX 1
#define B_MSG_BURNING_UP 2
#define B_MSG_HURT_BY_ROCKS_THROWN 3
#endif // GUARD_CONSTANTS_BATTLE_STRING_IDS_H

8
src/battle_dynamax.c
View file

@ -505,16 +505,16 @@ void ChooseDamageNonTypesString(u8 type)
switch (type)
{
case TYPE_GRASS:
gBattleCommunication[MULTISTRING_CHOOSER] = 0;
gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_TRAPPED_WITH_VINES;
break;
case TYPE_WATER:
gBattleCommunication[MULTISTRING_CHOOSER] = 1;
gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_CAUGHT_IN_VORTEX;
break;
case TYPE_FIRE:
gBattleCommunication[MULTISTRING_CHOOSER] = 2;
gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_SURROUNDED_BY_FIRE;
break;
case TYPE_ROCK:
gBattleCommunication[MULTISTRING_CHOOSER] = 3;
gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_SURROUNDED_BY_ROCKS;
break;
}
}

10
src/battle_message.c
View file

@ -1992,12 +1992,18 @@ const u16 gStatus2StringIds[] =
const u16 gDamageNonTypesStartStringIds[] =
{
STRINGID_TEAMTRAPPEDWITHVINES, STRINGID_TEAMCAUGHTINVORTEX, STRINGID_TEAMSURROUNDEDBYFIRE, STRINGID_TEAMSURROUNDEDBYROCKS
[B_MSG_TRAPPED_WITH_VINES] = STRINGID_TEAMTRAPPEDWITHVINES,
[B_MSG_CAUGHT_IN_VORTEX] = STRINGID_TEAMCAUGHTINVORTEX,
[B_MSG_SURROUNDED_BY_FIRE] = STRINGID_TEAMSURROUNDEDBYFIRE,
[B_MSG_SURROUNDED_BY_ROCKS] = STRINGID_TEAMSURROUNDEDBYROCKS,
};
const u16 gDamageNonTypesDmgStringIds[] =
{
STRINGID_PKMNHURTBYVINES, STRINGID_PKMNHURTBYVORTEX, STRINGID_PKMNBURNINGUP, STRINGID_PKMNHURTBYROCKSTHROWN
[B_MSG_HURT_BY_VINES] = STRINGID_PKMNHURTBYVINES,
[B_MSG_HURT_BY_VORTEX] = STRINGID_PKMNHURTBYVORTEX,
[B_MSG_BURNING_UP] = STRINGID_PKMNBURNINGUP,
[B_MSG_HURT_BY_ROCKS_THROWN] = STRINGID_PKMNHURTBYROCKSTHROWN,
};
const u8 gText_PkmnIsEvolving[] = _("What?\n{STR_VAR_1} is evolving!");