Partial refactor of TryWriteTrainerHill_r

This commit is contained in:
PikalaxALT
2019-09-03 14:35:01 -04:00
committed by huderlem
parent cb0fa2fdc3
commit a9918c3b89
5 changed files with 62 additions and 93 deletions
-36
View File
@@ -40,42 +40,6 @@
#define HILL_MAX_TIME 215999 // 60 * 60 * 60 - 1
struct TrHillRoomTrainers
{
u8 name[2][HILL_TRAINER_NAME_LENGTH];
u8 facilityClass[2];
};
struct TrHillFloor
{
u8 unk0;
u8 unk1;
struct TrainerHillTrainer trainers[2];
u8 data[0x100];
u16 unk3A0[16];
u8 coords[2]; // x first 4 bits, y last 4 bits
u8 direction; // array of 4 bits for each trainer
u8 range; // array of 4 bits for each trainer
};
struct TrHillTag
{
u8 unkField_0;
u8 unused1;
u8 unkField_2;
u8 unused3;
u8 unused4;
u8 unused5;
u8 unused6;
struct TrHillFloor floors[4];
};
struct TrHillStruct2
{
u8 floorId;
struct TrHillTag tag;
};
// EWRAM
static EWRAM_DATA struct TrHillStruct2 *sHillData = NULL;
static EWRAM_DATA struct TrHillRoomTrainers *sRoomTrainers = NULL;