Leahnaya/pokeemerald
1
0
Fork 0
mirror of https://github.com/pret/pokeemerald.git synced 2026-05-09 04:13:03 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

FINAL review changes

Browse Source
This commit is contained in:
Nephrite 2024-01-12 07:25:51 +09:00
parent f6efc75c1a
commit 095decbd27
2 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/battle_script_commands.c
View File

@ -2753,17 +2753,6 @@ void StealTargetItem(u8 battlerStealer, u8 battlerItem)
return; \
}
// For a future update...
// #define INCREMENT_RETURN_ON_PARENTAL_BOND_1ST_HIT \
// { \
// if (gSpecialStatuses[gBattlerAttacker].parentalBondState == PARENTAL_BOND_1ST_HIT \
// && gBattleMons[gEffectBattler].hp != 0) \
// { \
// gBattlescriptCurrInstr++; \
// return; \
// } \
// }
void SetMoveEffect(bool32 primary, bool32 certain)
{
s32 i, affectsUser = 0;
@ -3666,7 +3655,7 @@ void SetMoveEffect(bool32 primary, bool32 certain)
case TYPE_FIRE: // Burn Up
gBattlescriptCurrInstr = BattleScript_RemoveFireType;
break;
case TYPE_ELECTRIC: // Electro Shot
case TYPE_ELECTRIC: // Double Shot
gBattlescriptCurrInstr = BattleScript_RemoveElectricType;
break;
default:

2
test/battle/move_effect/fling.c
View File

@ -257,7 +257,7 @@ SINGLE_BATTLE_TEST("Fling applies special effects when throwing specific Items")
}
}
SINGLE_BATTLE_TEST("Fling's effects are blocked by Shield Dust")
SINGLE_BATTLE_TEST("Fling's secondary effects are blocked by Shield Dust")
{
u16 item;