From f24eae3e9094f80596173aaff27f4d2cb2b5f69a Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Mon, 15 Jul 2019 13:24:47 +0800 Subject: resolved several TODOs --- include/constants/battle.h | 2 +- include/pokemon.h | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/constants/battle.h b/include/constants/battle.h index 3b765eede..f886f560b 100644 --- a/include/constants/battle.h +++ b/include/constants/battle.h @@ -60,7 +60,7 @@ #define BATTLE_TYPE_LEGENDARY 0x2000 #define BATTLE_TYPE_REGI 0x4000 #define BATTLE_TYPE_GHOST 0x8000 -#define BATTLE_TYPE_DOME 0x10000 +#define BATTLE_TYPE_POKEDUDE 0x10000 #define BATTLE_TYPE_PALACE 0x20000 #define BATTLE_TYPE_ARENA 0x40000 #define BATTLE_TYPE_FACTORY 0x80000 diff --git a/include/pokemon.h b/include/pokemon.h index 157e65e16..971e0b5aa 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -110,6 +110,16 @@ #define MON_FEMALE 0xFE #define MON_GENDERLESS 0xFF +#define FRIENDSHIP_EVENT_GROW_LEVEL 0x0 +#define FRIENDSHIP_EVENT_VITAMIN 0x1 +#define FRIENDSHIP_EVENT_BATTLE_ITEM 0x2 +#define FRIENDSHIP_EVENT_LEAGUE_BATTLE 0x3 +#define FRIENDSHIP_EVENT_LEARN_TMHM 0x4 +#define FRIENDSHIP_EVENT_WALKING 0x5 +#define FRIENDSHIP_EVENT_FAINT_SMALL 0x6 +#define FRIENDSHIP_EVENT_FAINT_OUTSIDE_BATTLE 0x7 +#define FRIENDSHIP_EVENT_FAINT_LARGE 0x8 + #define TYPE_NORMAL 0x00 #define TYPE_FIGHTING 0x01 #define TYPE_FLYING 0x02 -- cgit v1.2.3