diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2019-01-24 17:21:04 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-24 17:21:04 -0600 |
| commit | 29b9483f39ad247dd29ea8a2c2c68af1bb64fb43 (patch) | |
| tree | db8b145f190bb27bb64b918d1d5a4eae8c070c70 /src/trainer_hill.c | |
| parent | 0827945698fda77548abff87144e344cfbb4aa3b (diff) | |
| parent | 74de0f59bdf0e121d582024064ba351acc01abe3 (diff) | |
Merge pull request #521 from DizzyEggg/dump
Dump trainer hill trainers
Diffstat (limited to 'src/trainer_hill.c')
| -rw-r--r-- | src/trainer_hill.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/trainer_hill.c b/src/trainer_hill.c index 7ec6865fd..e0a236286 100644 --- a/src/trainer_hill.c +++ b/src/trainer_hill.c @@ -24,8 +24,11 @@ #include "constants/event_object_movement_constants.h" #include "constants/event_objects.h" #include "constants/items.h" +#include "constants/moves.h" #include "constants/maps.h" +#include "constants/species.h" #include "constants/trainers.h" +#include "constants/easy_chat.h" extern bool32 sub_81D3B34(void); @@ -118,11 +121,7 @@ static void sub_81D642C(struct Pokemon *mon, u8 level); static u16 sub_81D6640(void); // const data -// I will decompile these soon, no worries :) -extern const struct TrHillTag gUnknown_08626814; -extern const struct TrHillTag gUnknown_086276FC; -extern const struct TrHillTag gUnknown_086285E4; -extern const struct TrHillTag gUnknown_086294CC; +#include "data/battle_frontier/trainer_hill.h" struct { @@ -246,10 +245,10 @@ static const u8 sRecordWinColors[] = {0, 2, 3}; static const struct TrHillTag *const sDataPerTag[] = { - &gUnknown_08626814, - &gUnknown_086276FC, - &gUnknown_086285E4, - &gUnknown_086294CC, + &sDataTagNormal, + &sDataTagVariety, + &sDataTagUnique, + &sDataTagExpert, }; // Unused. |