diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle.h | 2 | ||||
| -rw-r--r-- | include/battle_transition.h | 15 |
2 files changed, 2 insertions, 15 deletions
diff --git a/include/battle.h b/include/battle.h index 297711bd8..155c38afd 100644 --- a/include/battle.h +++ b/include/battle.h @@ -62,7 +62,7 @@ #define BATTLE_TYPE_x4000000 0x4000000 #define BATTLE_TYPE_SECRET_BASE 0x8000000 #define BATTLE_TYPE_GROUDON 0x10000000 -#define BATTLE_TYPE_KYORGE 0x20000000 +#define BATTLE_TYPE_KYOGRE 0x20000000 #define BATTLE_TYPE_RAYQUAZA 0x40000000 #define BATTLE_TYPE_x80000000 0x80000000 diff --git a/include/battle_transition.h b/include/battle_transition.h index b160f3e02..84b5e37ec 100644 --- a/include/battle_transition.h +++ b/include/battle_transition.h @@ -6,19 +6,6 @@ void BattleTransition_StartOnField(u8 transitionID); void BattleTransition_Start(u8 transitionID); bool8 IsBattleTransitionDone(void); -#define TRANSITIONS_NO 25 - -enum // TRANSITION_MUGSHOT -{ - MUGSHOT_SYDNEY, - MUGSHOT_PHOEBE, - MUGSHOT_GLACIA, - MUGSHOT_DRAKE, - MUGSHOT_CHAMPION, -}; - -#define MUGSHOTS_NO 5 - // credits for the names go to Dyskinesia and Tetrable // names are naturally subject to change @@ -45,7 +32,7 @@ enum // TRANSITION_MUGSHOT #define B_TRANSITION_REGICE 19 #define B_TRANSITION_REGISTEEL 20 #define B_TRANSITION_REGIROCK 21 -#define B_TRANSITION_KYORGE 22 +#define B_TRANSITION_KYOGRE 22 #define B_TRANSITION_GROUDON 23 #define B_TRANSITION_RAYQUAZA 24 #define B_TRANSITION_25 25 |