ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 11:44:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes weirdly set value for eject buttons etc (#2846)

Browse Source 
* Fixes weirdly set value for eject buttons etc

* Remove known fialing from fixed test

---------

Co-authored-by: tennis <May8th1995@users.noreply.github.com>
This commit is contained in:
May8th1995 2023-03-21 19:12:46 +00:00 committed by GitHub
parent 170ff2f422
commit 9ec31c61bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
data/battle_scripts_1.s
View File

@ -8654,6 +8654,7 @@ BattleScript_IntimidateLoopIncrement:
addbyte gBattlerTarget, 1
jumpifbytenotequal gBattlerTarget, gBattlersCount, BattleScript_IntimidateLoop
BattleScript_IntimidateEnd:
copybyte sBATTLER, gBattlerAttacker
destroyabilitypopup
pause B_WAIT_TIME_MED
end3

1
test/ability_intimidate.c
View File

@ -98,7 +98,6 @@ DOUBLE_BATTLE_TEST("Intimidate doesn't activate on an empty field in a double ba
SINGLE_BATTLE_TEST("Intimidate and Eject Button force the opponent to Attack")
{
KNOWN_FAILING; // Issue #2837
GIVEN {
ASSUME(gItems[ITEM_EJECT_BUTTON].holdEffect == HOLD_EFFECT_EJECT_BUTTON);
PLAYER(SPECIES_WOBBUFFET);