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

Fix Salt Cure script (#8005)

Browse Source
This commit is contained in:
Alex 2025-10-24 18:53:53 +02:00 committed by GitHub
parent 8ea947d5a1
commit eb1be34d47
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
data/battle_scripts_1.s
View File

@ -408,6 +408,7 @@ BattleScript_SaltCureExtraDamage::
printstring STRINGID_TARGETISHURTBYSALTCURE
waitmessage B_WAIT_TIME_LONG
tryfaintmon BS_ATTACKER
tryrestorehpberry
end2
BattleScript_HurtTarget_NoString:

4
src/battle_end_turn.c
View File

@ -808,9 +808,9 @@ static bool32 HandleEndTurnSaltCure(u32 battler)
&& !IsAbilityAndRecord(battler, GetBattlerAbility(battler), ABILITY_MAGIC_GUARD))
{
if (IS_BATTLER_ANY_TYPE(battler, TYPE_STEEL, TYPE_WATER))
gBattleStruct->moveDamage[battler] = gBattleMons[battler].maxHP / 4;
gBattleStruct->moveDamage[battler] = GetNonDynamaxMaxHP(battler) / 4;
else
gBattleStruct->moveDamage[battler] = gBattleMons[battler].maxHP / 8;
gBattleStruct->moveDamage[battler] = GetNonDynamaxMaxHP(battler) / 8;
if (gBattleStruct->moveDamage[battler] == 0)
gBattleStruct->moveDamage[battler] = 1;
PREPARE_MOVE_BUFFER(gBattleTextBuff1, MOVE_SALT_CURE);