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 /include/constants/battle_setup.h | |
parent | 2265d49ac2e8868e0b3362f8e7a4d22355eed202 (diff) | |
parent | 170b6ef44992f4b7decb31451a3756b6bd4e2d46 (diff) |
Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_party_menu
Diffstat (limited to 'include/constants/battle_setup.h')
-rw-r--r-- | include/constants/battle_setup.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/constants/battle_setup.h b/include/constants/battle_setup.h index 329bfa650..d98e1762f 100644 --- a/include/constants/battle_setup.h +++ b/include/constants/battle_setup.h @@ -10,7 +10,7 @@ #define TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE 6 #define TRAINER_BATTLE_REMATCH_DOUBLE 7 #define TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE_NO_MUSIC 8 -#define TRAINER_BATTLE_9 9 +#define TRAINER_BATTLE_PYRAMID 9 #define TRAINER_BATTLE_SET_TRAINER_A 10 #define TRAINER_BATTLE_SET_TRAINER_B 11 #define TRAINER_BATTLE_12 12 |