diff options
| author | Aroymart <andrewrmartinek@gmail.com> | 2020-12-06 21:06:54 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-06 21:06:54 -0500 |
| commit | d7f996687fa01473b08cb572d7b1f59275eaa851 (patch) | |
| tree | c46cfba092c5797e9787fe190e8f21cfcb7fd120 /src/data | |
| parent | 6c44ebb86d6d45150e69fbab82d4e1a251c7366b (diff) | |
| parent | db90dae74cc91f53e9ec815531572bdd295efacc (diff) | |
Merge branch 'master' into rgbds
Diffstat (limited to 'src/data')
| -rw-r--r-- | src/data/effect_commands.asm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/data/effect_commands.asm b/src/data/effect_commands.asm index 171c241..7360aff 100644 --- a/src/data/effect_commands.asm +++ b/src/data/effect_commands.asm @@ -1491,7 +1491,7 @@ FullHealEffectCommands: db $00 ImposterProfessorOakEffectCommands: - dbw EFFECTCMDTYPE_BEFORE_DAMAGE, $74e1 + dbw EFFECTCMDTYPE_BEFORE_DAMAGE, ImposterProfessorOakEffect db $00 ComputerSearchEffectCommands: |