diff options
| author | Cameron Hall <cameronghall@cox.net> | 2018-02-17 15:32:57 -0600 |
|---|---|---|
| committer | Cameron Hall <cameronghall@cox.net> | 2018-02-17 15:32:57 -0600 |
| commit | b9f8d43825463363a67be0ce9fcd00b23d264e05 (patch) | |
| tree | b5368c25e1e3fd7a13ed08f628520449e447131c /include/global.h | |
| parent | 0687469f88a3eeac097cf440f3d12a4b3f2986f3 (diff) | |
decompile more debug code
Diffstat (limited to 'include/global.h')
| -rw-r--r-- | include/global.h | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/include/global.h b/include/global.h index 6dd772795..4b23fded7 100644 --- a/include/global.h +++ b/include/global.h @@ -734,9 +734,10 @@ struct Pokedex struct BattleTowerTrainer { - u8 trainerClass; - u8 name[8]; - u8 teamFlags; + /*0x00*/ u8 trainerClass; + /*0x01*/ u8 name[8]; + /*0x09*/ u8 teamFlags; + /*0x0C*/ struct { u16 easyChat[6]; } greeting; @@ -756,6 +757,7 @@ struct BattleTowerRecord // record mixing /*0xA0*/u32 checksum; }; +#if 0 struct BattleTowerEReaderTrainer { /*0x00*/u8 unk0; @@ -775,6 +777,21 @@ struct BattleTowerEReaderTrainer /*0x34*/struct UnknownPokemonStruct party[3]; /*0xB8*/u32 checksum; }; +#endif + +struct BattleTowerEReaderTrainer +{ + /*0x00*/ u8 unk0; + /*0x01*/ u8 trainerClass; + /*0x02*/ u16 winStreak; + /*0x04*/ u8 name[8]; + /*0x0C*/ u8 trainerId[4]; + /*0x10*/ u16 greeting[6]; + /*0x1C*/ u16 farewellPlayerLost[6]; + /*0x28*/ u16 farewellPlayerWon[6]; + /*0x34*/ struct UnknownPokemonStruct party[3]; + /*0xB8*/ u32 checksum; +}; struct BattleTowerData { @@ -831,7 +848,7 @@ struct MapPosition { s16 x; s16 y; - u8 height; + s8 height; }; struct UnkStruct_8054FF8 |