Leahnaya/pokeemerald-expansion
1
0
Fork 0
mirror of https://github.com/rh-hideout/pokeemerald-expansion.git synced 2026-03-21 18:04:50 -05:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge 2e59cd088f into 264d99215b

Browse Source
This commit is contained in:
Meister-anon 2026-03-21 17:58:35 +00:00 committed by GitHub
commit c6a2b3e6f3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
data/battle_scripts_1.s
View File

@ -6141,7 +6141,7 @@ BattleScript_HealerActivates::
BattleScript_ShedSkinActivates::
call BattleScript_AbilityPopUp
printstring STRINGID_PKMNSXCUREDYPROBLEM
printstring STRINGID_PKMNSXCUREDITSYPROBLEM
waitmessage B_WAIT_TIME_LONG
updatestatusicon BS_ATTACKER
end2
@ -6544,13 +6544,6 @@ BattleScript_ItemNoStatLoss::
waitmessage B_WAIT_TIME_LONG
return
BattleScript_ObliviousPreventsAttraction::
pause B_WAIT_TIME_SHORT
call BattleScript_AbilityPopUp
printstring STRINGID_PKMNPREVENTSROMANCEWITH
waitmessage B_WAIT_TIME_LONG
goto BattleScript_MoveEnd
BattleScript_FlinchPrevention::
pause B_WAIT_TIME_SHORT
call BattleScript_AbilityPopUp

1
include/battle_scripts.h
View File

@ -179,7 +179,6 @@ extern const u8 BattleScript_MonMadeMoveUseless[];
extern const u8 BattleScript_FlashFireBoost[];
extern const u8 BattleScript_AbilityNoStatLoss[];
extern const u8 BattleScript_ItemNoStatLoss[];
extern const u8 BattleScript_ObliviousPreventsAttraction[];
extern const u8 BattleScript_FlinchPrevention[];
extern const u8 BattleScript_OwnTempoPrevents[];
extern const u8 BattleScript_SoundproofProtected[];

1
include/constants/battle_string_ids.h
View File

@ -292,7 +292,6 @@ enum StringID
STRINGID_PKMNSXPREVENTSYLOSS,
STRINGID_PKMNSXINFATUATEDY,
STRINGID_PKMNSXMADEYINEFFECTIVE,
STRINGID_PKMNSXCUREDYPROBLEM,
STRINGID_ITSUCKEDLIQUIDOOZE,
STRINGID_PKMNTRANSFORMED,
STRINGID_ELECTRICITYWEAKENED,

1
src/battle_message.c
View File

@ -469,7 +469,6 @@ const u8 *const gBattleStringsTable[STRINGID_COUNT] =
[STRINGID_PKMNSXPREVENTSYLOSS] = COMPOUND_STRING("{B_SCR_NAME_WITH_PREFIX}'s {B_SCR_ABILITY} prevents {B_BUFF1} loss!"), //not in gen 5+, ability popup
[STRINGID_PKMNSXINFATUATEDY] = COMPOUND_STRING("{B_DEF_NAME_WITH_PREFIX}'s {B_DEF_ABILITY} infatuated {B_ATK_NAME_WITH_PREFIX2}!"), //not in gen 5+, ability popup
[STRINGID_PKMNSXMADEYINEFFECTIVE] = COMPOUND_STRING("{B_SCR_NAME_WITH_PREFIX}'s {B_SCR_ABILITY} made {B_CURRENT_MOVE} ineffective!"), //not in gen 5+, ability popup
[STRINGID_PKMNSXCUREDYPROBLEM] = COMPOUND_STRING("{B_SCR_NAME_WITH_PREFIX}'s {B_SCR_ABILITY} cured its {B_BUFF1} problem!"), //not in gen 5+, ability popup
[STRINGID_ITSUCKEDLIQUIDOOZE] = COMPOUND_STRING("{B_ATK_NAME_WITH_PREFIX} sucked up the liquid ooze!"),
[STRINGID_PKMNTRANSFORMED] = COMPOUND_STRING("{B_SCR_NAME_WITH_PREFIX} transformed!"),
[STRINGID_ELECTRICITYWEAKENED] = COMPOUND_STRING("Electricity's power was weakened!"),

1
test/text.c
View File

@ -791,7 +791,6 @@ TEST("Battle strings fit on the battle message window")
break;
// Buffer Status name to B_BUFF2
case STRINGID_PKMNSITEMCUREDPROBLEM:
case STRINGID_PKMNSXCUREDYPROBLEM:
case STRINGID_PKMNSXCUREDITSYPROBLEM:
StringCopy(gBattleTextBuff1, gText_Confusion);
break;