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

Fix White Herb Known Failing tests (#4258)

Browse Source 
* Fix White Herb Known Failing tests

* get out agbcc

* remove unneeded white herb test
This commit is contained in:
DizzyEggg
2024-03-29 17:43:05 +01:00
committed by GitHub
parent 8c7ba8a849
commit 46e6324fe2
7 changed files with 229 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/battle_util.h
View File

@@ -54,6 +54,7 @@
#define ITEMEFFECT_ORBS 6
#define ITEMEFFECT_LIFEORB_SHELLBELL 7
#define ITEMEFFECT_USE_LAST_ITEM 8 // move end effects for just the battler, not whole field
#define ITEMEFFECT_STATS_CHANGED 9 // For White Herb and Eject Pack
#define WEATHER_HAS_EFFECT ((!IsAbilityOnField(ABILITY_CLOUD_NINE) && !IsAbilityOnField(ABILITY_AIR_LOCK)))

6
include/constants/battle_script_commands.h
View File

@@ -304,9 +304,9 @@
#define MOVEEND_DEFROST 23
#define MOVEEND_RECOIL 24
#define MOVEEND_MAGICIAN 25 // Occurs after final multi-hit strike, and after other items/abilities would activate
#define MOVEEND_EJECT_BUTTON 26
#define MOVEEND_RED_CARD 27
#define MOVEEND_EJECT_PACK 28
#define MOVEEND_EJECT_ITEMS 26
#define MOVEEND_WHITE_HERB 27
#define MOVEEND_RED_CARD 28
#define MOVEEND_LIFEORB_SHELLBELL 29 // Includes shell bell, throat spray, etc
#define MOVEEND_CHANGED_ITEMS 30
#define MOVEEND_PICKPOCKET 31