diff options
| author | nullableVoidPtr <30564701+nullableVoidPtr@users.noreply.github.com> | 2018-12-08 12:13:15 +0800 |
|---|---|---|
| committer | nullableVoidPtr <30564701+nullableVoidPtr@users.noreply.github.com> | 2018-12-08 12:13:15 +0800 |
| commit | 8a8baaeaaaffd7528c13f064b664c31e747c8fdc (patch) | |
| tree | bbd238d169df88dc2dbbed17956daae2ad630227 /asm | |
| parent | 907ed3f5f5537d14ed6136daeb81e38c383239c2 (diff) | |
| parent | 6068495619364c8e0ccae15ad036a1b5a9eef171 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/macros/event.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/asm/macros/event.inc b/asm/macros/event.inc index d66992c35..c815f3753 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -668,7 +668,7 @@ .4byte \pointer2 @ text .4byte \pointer3 @ text .4byte \pointer4 @ event script - .elseif \type == TRAINER_BATTLE_9 + .elseif \type == TRAINER_BATTLE_PYRAMID .4byte \pointer1 @ text .4byte \pointer2 @ text .elseif \type == TRAINER_BATTLE_SET_TRAINER_A |