diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-04-06 17:00:55 -0700 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-04-06 17:00:55 -0700 |
| commit | 9e4bf55716fb5a27bc2f6eee4a489e48327eac3f (patch) | |
| tree | 8b31e761c5b2b03e2b5200baec6755f6a3273fe5 /data/contest_effect.s | |
| parent | f150a5cd9f15c368a3e520168b56acd3628d6852 (diff) | |
| parent | ed5847cb41c48357d83b92823e08393a1ca54bdd (diff) | |
Merge remote-tracking branch 'upstream/master' into nakamura
Diffstat (limited to 'data/contest_effect.s')
| -rw-r--r-- | data/contest_effect.s | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/data/contest_effect.s b/data/contest_effect.s deleted file mode 100644 index cd960fb52..000000000 --- a/data/contest_effect.s +++ /dev/null @@ -1,21 +0,0 @@ - .include "include/macros.inc" - .include "constants/constants.inc" - - .section .rodata - -@ 83CF594 - .include "data/contest_moves.inc" - -@ 83D00AC - .include "data/contest_effects.inc" - -@ A lookup table with TRUE for each combo starter ID and FALSE for ID 0, -@ which means "not a combo starter move". -gComboStarterLookupTable:: @ 83D016C - .byte FALSE - .rept 62 - .byte TRUE - .endr - -@ 83D01AC - .include "data/contest_effect_funcs.inc" |