diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2021-05-08 11:35:23 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2021-05-08 11:35:23 -0400 |
| commit | 8cb3819cc2a9ed3509240f614bae341da197fc31 (patch) | |
| tree | 1ccd857a1c4489c5d9dcb5fa8aed1ce1ce2a242c /include/cereader_tool.h | |
| parent | a64b074e7dd28a88719515ebe3ea152d42dbf1ff (diff) | |
| parent | 4767019e4f541a19577a9bfd09851a94b2e3c745 (diff) | |
Merge remote-tracking branch 'origin/master' into doc_field_effect_templates
Diffstat (limited to 'include/cereader_tool.h')
| -rw-r--r-- | include/cereader_tool.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/cereader_tool.h b/include/cereader_tool.h index dd1866fb3..5dd0a7589 100644 --- a/include/cereader_tool.h +++ b/include/cereader_tool.h @@ -8,7 +8,7 @@ struct TrainerTowerTrainer { /* 0x000 */ u8 name[11]; /* 0x00B */ u8 facilityClass; - /* 0x00C */ u8 gender; + /* 0x00C */ u8 textColor; /* 0x00E */ u16 speechBefore[6]; /* 0x01A */ u16 speechWin[6]; /* 0x026 */ u16 speechLose[6]; @@ -18,7 +18,7 @@ struct TrainerTowerTrainer struct TrainerTowerFloor { - /* 0x000 */ u8 unk_000; + /* 0x000 */ u8 id; /* 0x001 */ u8 floorIdx; /* 0x002 */ u8 challengeType; /* 0x003 */ u8 prize; |