diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-10-14 19:25:10 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-14 19:25:10 -0400 |
| commit | 928cdf2531e74df2432ec8d602c4c2d2fee14eb1 (patch) | |
| tree | 9a520de5b4790f14175a28eb70665a4f60ade486 /src/battle_pike.c | |
| parent | 30ef49416391d036286661a8e1225b4ba03e3109 (diff) | |
| parent | 26962b7725ffc5df719a0eea9442735b9dc04b5c (diff) | |
Merge branch 'master' into doc-inc2
Diffstat (limited to 'src/battle_pike.c')
| -rw-r--r-- | src/battle_pike.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/src/battle_pike.c b/src/battle_pike.c index bfb87f679..a81d88145 100644 --- a/src/battle_pike.c +++ b/src/battle_pike.c @@ -22,20 +22,7 @@ #include "constants/trainers.h" #include "constants/species.h" #include "constants/moves.h" - -#define PIKE_ROOM_SINGLE_BATTLE 0 -#define PIKE_ROOM_HEAL_FULL 1 -#define PIKE_ROOM_NPC 2 -#define PIKE_ROOM_STATUS 3 -#define PIKE_ROOM_HEAL_PART 4 -#define PIKE_ROOM_WILD_MONS 5 -#define PIKE_ROOM_HARD_BATTLE 6 -#define PIKE_ROOM_DOUBLE_BATTLE 7 -#define PIKE_ROOM_BRAIN 8 - -// For the room with a status effect. -#define PIKE_STATUS_KIRLIA 0 -#define PIKE_STATUS_DUSCLOPS 1 +#include "constants/battle_pike.h" struct PikeRoomNPC { |