dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve review comments

Browse Source
This commit is contained in:
jiangzhengwenjz
2019-10-26 06:02:05 +08:00
parent 1230a5c48a
commit 1481f9e819
82 changed files with 862 additions and 871 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/constants/battle_anim.h
-1
View File
@@ -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
include/constants/map_types.h
+1 -14
View File
@@ -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
#endif // GUARD_CONSTANTS_MAP_TYPES_H