diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-12-11 01:09:06 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-11 01:09:06 -0500 |
| commit | 6556b556dd624964f53d76ff546589e6688412eb (patch) | |
| tree | b2e0049af7ebf824a8d264818ce3884ff6074396 /include/constants | |
| parent | 8da7a94423b11f52a1e9ea74df3ec0e6f16e96d0 (diff) | |
| parent | 49f1a90534180445d293761e2bdac165b49319a2 (diff) | |
Merge branch 'master' into fix-eventobj
Diffstat (limited to 'include/constants')
| -rw-r--r-- | include/constants/battle_pike.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/constants/battle_pike.h b/include/constants/battle_pike.h index c25f76aaa..9187ae28c 100644 --- a/include/constants/battle_pike.h +++ b/include/constants/battle_pike.h @@ -23,8 +23,8 @@ #define PIKE_HINT_BRAIN 4 // For the room with a status effect. -#define PIKE_STATUS_KIRLIA 0 -#define PIKE_STATUS_DUSCLOPS 1 +#define PIKE_STATUSMON_KIRLIA 0 +#define PIKE_STATUSMON_DUSCLOPS 1 #define PIKE_STATUS_FREEZE 0 #define PIKE_STATUS_BURN 1 @@ -48,7 +48,7 @@ #define BATTLE_PIKE_FUNC_GET_ROOM_STATUS_MON 12 #define BATTLE_PIKE_FUNC_HEAL_ONE_TWO_MONS 13 #define BATTLE_PIKE_FUNC_BUFFER_NPC_MSG 14 -#define BATTLE_PIKE_FUNC_STATUS_SCREEN_FADE 15 +#define BATTLE_PIKE_FUNC_STATUS_SCREEN_FLASH 15 #define BATTLE_PIKE_FUNC_IS_IN 16 #define BATTLE_PIKE_FUNC_SET_HINT_ROOM 17 #define BATTLE_PIKE_FUNC_GET_HINT_ROOM_ID 18 |