diff options
| author | yenatch <yenatch@gmail.com> | 2018-06-04 00:47:16 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-04 00:47:16 -0400 |
| commit | d596a0c83bfbb97bff5cdb5b3bba925d3f798fa1 (patch) | |
| tree | 5bc4cbdd09186fbdf2f7e2294fdde443ff8900bd /data/types | |
| parent | 53bcd8f46ca4f78381af70f55d03f3180be277de (diff) | |
| parent | c7bb2d15cfb32a5e965933b90e0acb497c7bf7b2 (diff) | |
Merge pull request #514 from Rangi42/master
[Ready to merge] Named constants for sprite movement data bit flags + other minor fixes
Diffstat (limited to 'data/types')
| -rw-r--r-- | data/types/type_matchups.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/types/type_matchups.asm b/data/types/type_matchups.asm index 90e38ae2c..3cd0f609b 100644 --- a/data/types/type_matchups.asm +++ b/data/types/type_matchups.asm @@ -109,11 +109,11 @@ TypeMatchups: ; 34bb1 db STEEL, ROCK, SUPER_EFFECTIVE db STEEL, STEEL, NOT_VERY_EFFECTIVE - db -2 ; end + db -2 ; end (with Foresight) ; Foresight removes Ghost's immunities. db NORMAL, GHOST, NO_EFFECT db FIGHTING, GHOST, NO_EFFECT - db -1 ; end (with Foresight) + db -1 ; end ; 34cfd |
