diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-12-13 00:31:06 -0500 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-12-13 00:31:06 -0500 |
| commit | 6748ef72fb31e1b0af250472a34e50cb3966c5f8 (patch) | |
| tree | f6dafca53a0e45e5a2a6cdb262a2766f2bde8753 /asm/macros | |
| parent | 2265d49ac2e8868e0b3362f8e7a4d22355eed202 (diff) | |
| parent | 170b6ef44992f4b7decb31451a3756b6bd4e2d46 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_party_menu
Diffstat (limited to 'asm/macros')
| -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 |