dionmoustos/Pokemon-Firered
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into doc-ttower

Browse Source
This commit is contained in:
GriffinR authored and GitHub committed 2020-02-15 20:44:57 -05:00
2 parents 34deceb136 fee980decd
commit a4cd331634
327 files changed
+14966 -18895
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

include/constants/battle.h
+3
View File
@@ -81,6 +81,9 @@
#define IS_BATTLE_TYPE_GHOST_WITHOUT_SCOPE(flags) ((flags) & BATTLE_TYPE_GHOST && !((flags) & BATTLE_TYPE_GHOST_UNVEILED))
#define IS_BATTLE_TYPE_GHOST_WITH_SCOPE(flags) ((flags) & BATTLE_TYPE_GHOST && (flags) & BATTLE_TYPE_GHOST_UNVEILED)
#define RIVAL_BATTLE_HEAL_AFTER 1
#define RIVAL_BATTLE_TUTORIAL 3
// Battle Outcome defines
#define B_OUTCOME_WON 0x1
#define B_OUTCOME_LOST 0x2