diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle_tower.h | 4 | ||||
| -rw-r--r-- | include/constants/trainers.h | 15 |
2 files changed, 9 insertions, 10 deletions
diff --git a/include/battle_tower.h b/include/battle_tower.h index 137ce8a54..5fe8d1190 100644 --- a/include/battle_tower.h +++ b/include/battle_tower.h @@ -1,10 +1,6 @@ #ifndef GUARD_BATTLE_TOWER_H #define GUARD_BATTLE_TOWER_H -#define BATTLE_TOWER_RECORD_MIXING_TRAINER_BASE_ID 300 -#define BATTLE_TOWER_RECORD_APPRENTICE_BASE_ID 400 -#define BATTLE_TOWER_EREADER_TRAINER_ID 500 - struct RSBattleTowerRecord { /*0x00*/ u8 lvlMode; // 0 = level 50, 1 = level 100 diff --git a/include/constants/trainers.h b/include/constants/trainers.h index f79216d94..2ea9f7c62 100644 --- a/include/constants/trainers.h +++ b/include/constants/trainers.h @@ -4,12 +4,15 @@ #include "constants/opponents.h" // Special Trainer Ids. -#define TRAINER_FRONTIER_BRAIN 1022 -#define TRAINER_PLAYER 1023 -#define TRAINER_SECRET_BASE 1024 -#define TRAINER_LINK_OPPONENT 2048 -#define TRAINER_OPPONENT_C00 3072 -#define TRAINER_STEVEN_PARTNER 3075 +#define TRAINER_RECORD_MIXING_FRIEND 300 +#define TRAINER_RECORD_MIXING_APPRENTICE 400 +#define TRAINER_EREADER 500 +#define TRAINER_FRONTIER_BRAIN 1022 +#define TRAINER_PLAYER 1023 +#define TRAINER_SECRET_BASE 1024 +#define TRAINER_LINK_OPPONENT 2048 +#define TRAINER_OPPONENT_C00 3072 +#define TRAINER_STEVEN_PARTNER 3075 #define TRAINER_PIC_HIKER 0 #define TRAINER_PIC_AQUA_GRUNT_M 1 |