diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2019-01-27 00:11:44 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2019-01-27 00:11:44 -0600 |
| commit | 6b2dda422b533bf0edadcd727f4b491e4e6f4fb7 (patch) | |
| tree | 2b175aba4460597f688bb6b5f8deeef01fc9bee1 /src/trainer_hill.c | |
| parent | 7a60f36954e9baeab2df64e24ce7fea5a8d2ada1 (diff) | |
| parent | f4af987c01c95d98a9d2ee943cc11315f80951d1 (diff) | |
Merge branch 'master' of github.com:pret/pokeemerald
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. |