diff options
author | Cameron Hall <cameronghall@cox.net> | 2018-02-17 17:54:53 -0600 |
---|---|---|
committer | Cameron Hall <cameronghall@cox.net> | 2018-02-17 17:54:53 -0600 |
commit | 99befda409870bedc2120f3af0b84f3d6d55806b (patch) | |
tree | c113e556b2af84b803cbc6fb96347591de3856b1 /include/global.h | |
parent | 17a5968adbc1dfb6586641729b39eeb3873481df (diff) |
remove unnecessary struct in battle tower data
Diffstat (limited to 'include/global.h')
-rw-r--r-- | include/global.h | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/include/global.h b/include/global.h index dcd20981e..ec82d5d1d 100644 --- a/include/global.h +++ b/include/global.h @@ -737,24 +737,20 @@ struct BattleTowerTrainer /*0x00*/ u8 trainerClass; /*0x01*/ u8 name[8]; /*0x09*/ u8 teamFlags; - /*0x0C*/ - struct { - u16 easyChat[6]; - } greeting[6]; + u8 filler0A[2]; + /*0x0C*/ u16 greeting[6]; }; struct BattleTowerRecord // record mixing { - /*0x00*/u8 battleTowerLevelType; // 0 = level 50, 1 = level 100 - /*0x01*/u8 trainerClass; - /*0x02*/u16 winStreak; - /*0x04*/u8 name[8]; - /*0x0C*/u8 trainerId[4]; - /*0x10*/struct { - u16 easyChat[6]; - } greeting; - /*0x1C*/struct UnknownPokemonStruct party[3]; - /*0xA0*/u32 checksum; + /*0x00*/ u8 battleTowerLevelType; // 0 = level 50, 1 = level 100 + /*0x01*/ u8 trainerClass; + /*0x02*/ u16 winStreak; + /*0x04*/ u8 name[8]; + /*0x0C*/ u8 trainerId[4]; + /*0x10*/ u16 greeting[6]; + /*0x1C*/ struct UnknownPokemonStruct party[3]; + /*0xA0*/ u32 checksum; }; struct BattleTowerEReaderTrainer |