diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle_message.h | 1 | ||||
| -rw-r--r-- | include/global.h | 10 |
2 files changed, 7 insertions, 4 deletions
diff --git a/include/battle_message.h b/include/battle_message.h index 147bfa501..c68607246 100644 --- a/include/battle_message.h +++ b/include/battle_message.h @@ -224,6 +224,7 @@ extern const u8* const gStatNamesTable[]; extern const u8* const gPokeblockWasTooXStringTable[]; extern const u8* const gRefereeStringsTable[]; extern const u8* const gStatNamesTable2[]; +extern const u8 *const gRoundsStringTable[]; extern const u8 gText_PkmnIsEvolving[]; extern const u8 gText_CongratsPkmnEvolved[]; diff --git a/include/global.h b/include/global.h index 0d2167c47..5b78fc4c0 100644 --- a/include/global.h +++ b/include/global.h @@ -337,14 +337,16 @@ struct FrontierMonData u8 nature; }; -struct FrontierUnkStruct1 +struct BattleDomeTrainer { - u16 unk0:10; + u16 trainerId:10; u16 unk1:1; u16 unk2:2; u16 unk3:3; }; +#define DOME_TOURNAMENT_TRAINERS_COUNT 16 + struct BattleFrontier { /*0x64C*/ struct EmeraldBattleTowerRecord battleTower; @@ -404,8 +406,8 @@ struct BattleFrontier /*0xD21*/ u8 field_D21; /*0xD22*/ u8 field_D22; /*0xD23*/ u8 field_D23; - /*0xD24*/ struct FrontierUnkStruct1 field_D24[16]; - /*0xD64*/ u16 field_D64[16][3]; + /*0xD24*/ struct BattleDomeTrainer domeTrainers[DOME_TOURNAMENT_TRAINERS_COUNT]; + /*0xD64*/ u16 domeMonId[DOME_TOURNAMENT_TRAINERS_COUNT][3]; /*0xDC8*/ u16 field_DC8[2]; /*0xDCC*/ u8 filler_DCC[4]; /*0xDD0*/ u16 field_DD0[2]; |