diff options
| author | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-10-26 06:02:05 +0800 |
|---|---|---|
| committer | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-10-26 06:03:42 +0800 |
| commit | 1481f9e81977b1881ea29758a1051db913219257 (patch) | |
| tree | 3dd9b0fb24c223cbb381e0149cabe298ddb1cd4e /include | |
| parent | 1230a5c48a465d42ae7035ca9c1a6e2152c54d1a (diff) | |
resolve review comments
Diffstat (limited to 'include')
| -rw-r--r-- | include/constants/battle_anim.h | 1 | ||||
| -rw-r--r-- | include/constants/map_types.h | 15 |
2 files changed, 1 insertions, 15 deletions
diff --git a/include/constants/battle_anim.h b/include/constants/battle_anim.h index 1b86cbee9..22793032f 100644 --- a/include/constants/battle_anim.h +++ b/include/constants/battle_anim.h @@ -377,7 +377,6 @@ #define B_ANIM_SWITCH_OUT_PLAYER_MON 0x1 #define B_ANIM_SWITCH_OUT_OPPONENT_MON 0x2 #define B_ANIM_BALL_THROW 0x3 -#define B_ANIM_SP_4 0x4 // this one is used in battle_controller_oak_old_man #define B_ANIM_SAFARI_BALL_THROW 0x4 #define B_ANIM_SUBSTITUTE_TO_MON 0x5 #define B_ANIM_MON_TO_SUBSTITUTE 0x6 diff --git a/include/constants/map_types.h b/include/constants/map_types.h index 94fb99a57..96ea73702 100644 --- a/include/constants/map_types.h +++ b/include/constants/map_types.h @@ -12,17 +12,4 @@ #define MAP_TYPE_INDOOR 8 #define MAP_TYPE_SECRET_BASE 9 -enum -{ - MAP_BATTLE_SCENE_NORMAL, // 0 - MAP_BATTLE_SCENE_GYM, // 1 - MAP_BATTLE_SCENE_MAGMA, // 2 - MAP_BATTLE_SCENE_AQUA, // 3 - MAP_BATTLE_SCENE_SIDNEY, // 4 - MAP_BATTLE_SCENE_PHOEBE, // 5 - MAP_BATTLE_SCENE_GLACIA, // 6 - MAP_BATTLE_SCENE_DRAKE, // 7 - MAP_BATTLE_SCENE_BATTLE_TOWER, // 8 -}; - -#endif // GUARD_CONSTANTS_MAP_TYPES_H
\ No newline at end of file +#endif // GUARD_CONSTANTS_MAP_TYPES_H |