diff options
Diffstat (limited to 'include/global.h')
| -rw-r--r-- | include/global.h | 61 |
1 files changed, 30 insertions, 31 deletions
diff --git a/include/global.h b/include/global.h index f45d36f68..1f9ac5185 100644 --- a/include/global.h +++ b/include/global.h @@ -277,7 +277,7 @@ struct FrontierMonData u8 nature; }; -struct Struct_field_E70 +struct RentalMon { u16 monId; u32 personality; @@ -316,7 +316,7 @@ struct BattleFrontier /*0xCAA*/ u16 selectedPartyMons[3]; /*0xCB0*/ u16 field_CB0; /*0xCB2*/ u16 curChallengeBattleNum; // In case of battle pyramid, the floor. - /*0xCB4*/ u16 field_CB4[20]; + /*0xCB4*/ u16 trainerIds[20]; /*0xCDC*/ u32 field_CDC; /*0xCE0*/ u16 towerWinStreaks[4][2]; /*0xCF0*/ u16 towerRecordWinStreaks[4][2]; @@ -345,7 +345,7 @@ struct BattleFrontier /*0xDC6*/ u16 field_DC6; /*0xDC8*/ u16 palaceWinStreaks[2][2]; /*0xDD0*/ u16 palaceRecordWinStreaks[2][2]; - /*0xDD8*/ u16 field_DD8; + /*0xDD8*/ u16 arenaRewardItem; /*0xDDA*/ u16 arenaWinStreaks[2]; /*0xDDE*/ u16 arenaRecordStreaks[2]; /*0xDE2*/ u16 factoryWinStreaks[2][2]; @@ -356,27 +356,27 @@ struct BattleFrontier /*0xE04*/ u16 pikeWinStreaks[2]; /*0xE08*/ u16 pikeRecordStreaks[2]; /*0xE0C*/ u16 pikeTotalStreaks[2]; - /*0xE10*/ u8 field_E10_1:3; - /*0xE10*/ u8 field_E10_2:4; - /*0xE10*/ u8 field_E10_3:1; - /*0xE12*/ u16 field_E12[3]; - /*0xE18*/ u16 field_E18; + /*0xE10*/ u8 pikeHintedRoomIndex:3; + /*0xE10*/ u8 pikeHintedRoomType:4; + /*0xE10*/ u8 pikeHealingRoomsDisabled:1; + /*0xE12*/ u16 pikeHeldItemsBackup[3]; + /*0xE18*/ u16 pyramidRewardItem; /*0xE1A*/ u16 pyramidWinStreaks[2]; /*0xE1E*/ u16 pyramidRecordStreaks[2]; - /*0xE22*/ u16 field_E22[4]; - /*0xE2A*/ u8 field_E2A; + /*0xE22*/ u16 pyramidRandoms[4]; + /*0xE2A*/ u8 pyramidTrainerFlags; /*0xE2C*/ struct PyramidBag pyramidBag; - /*0xE68*/ u8 field_E68; + /*0xE68*/ u8 pyramidLightRadius; /*0xE6A*/ u16 field_E6A; /*0xE6C*/ u16 field_E6C; /*0xE6E*/ u16 field_E6E; - /*0xE70*/ struct Struct_field_E70 field_E70[6]; + /*0xE70*/ struct RentalMon rentalMons[6]; /*0xEB8*/ u16 battlePoints; /*0xEBA*/ u16 field_EBA; /*0xEBC*/ u32 battlesCount; /*0xEC0*/ u16 field_EC0[16]; /*0xEE0*/ u8 field_EE0; - /*0xEE1*/ u8 field_EE1[2][PLAYER_NAME_LENGTH + 1]; + /*0xEE1*/ u8 opponentName[2][PLAYER_NAME_LENGTH + 1]; /*0xEF1*/ u8 field_EF1[2][4]; /*0xEF9*/ u8 field_EF9_0:7; /*0xEF9*/ u8 field_EF9_1:1; @@ -446,7 +446,7 @@ struct SaveBlock2 /*0x90*/ u8 filler_90[0x8]; /*0x98*/ struct Time localTimeOffset; /*0xA0*/ struct Time lastBerryTreeUpdate; - /*0xA8*/ u32 field_A8; + /*0xA8*/ u32 field_A8; // Written to, but never read. /*0xAC*/ u32 encryptionKey; /*0xB0*/ struct PlayersApprentice playerApprentice; /*0xDC*/ struct Apprentice apprentices[4]; // From record mixing. @@ -787,7 +787,7 @@ struct WaldaPhrase bool8 patternUnlocked; }; -struct UnkSaveSubstruct_3b98 +struct TrainerNameRecord { u32 trainerId; u8 trainerName[PLAYER_NAME_LENGTH + 1]; @@ -795,15 +795,15 @@ struct UnkSaveSubstruct_3b98 struct SaveTrainerHill { - /*0x3D64*/ u32 field_3D64; - /*0x3D68*/ u32 field_3D68; + /*0x3D64*/ u32 timer; + /*0x3D68*/ u32 bestTime; /*0x3D6C*/ u8 field_3D6C; /*0x3D6D*/ u8 unused; /*0x3D6E*/ u16 field_3D6E_0a:1; // 1 /*0x3D6E*/ u16 field_3D6E_0b:1; // 2 /*0x3D6E*/ u16 field_3D6E_0c:1; // 4 - /*0x3D6E*/ u16 field_3D6E_0d:1; // 8 - /*0x3D6E*/ u16 field_3D6E_0e:1; // x10 + /*0x3D6E*/ u16 hasLost:1; // 8 + /*0x3D6E*/ u16 maybeECardScanDuringChallenge:1; // x10 /*0x3D6E*/ u16 field_3D6E_0f:1; // x20 /*0x3D6E*/ u16 tag:2; // x40, x80 = xC0 }; @@ -870,13 +870,12 @@ struct SaveBlock1 /*0x2BA1*/ u8 outbreakPokemonProbability; /*0x2BA2*/ u16 outbreakDaysLeft; /*0x2BA4*/ struct GabbyAndTyData gabbyAndTyData; - /*0x2BB0*/ u16 unk2BB0[6]; - /*0x2BBC*/ u16 unk2BBC[6]; - /*0x2BC8*/ u16 unk2BC8[6]; - /*0x2BD4*/ u16 unk2BD4[6]; + /*0x2BB0*/ u16 easyChatProfile[6]; + /*0x2BBC*/ u16 easyChatBattleStart[6]; + /*0x2BC8*/ u16 easyChatBattleWon[6]; + /*0x2BD4*/ u16 easyChatBattleLost[6]; /*0x2BE0*/ struct MailStruct mail[MAIL_COUNT]; - /*0x2E20*/ u8 additionalPhrases[5]; // bitfield for 33 additional phrases in easy chat system - /*0x2E25*/ u8 unk2E25[3]; // possibly padding? + /*0x2E20*/ u8 additionalPhrases[8]; // bitfield for 33 additional phrases in easy chat system /*0x2E28*/ OldMan oldMan; /*0x2e64*/ struct EasyChatPair easyChatPairs[5]; //Dewford trend [0] and some other stuff /*0x2e90*/ struct ContestWinner contestWinners[13]; // 0 - 5 used in contest hall, 6 - 7 unused?, 8 - 12 museum @@ -891,7 +890,7 @@ struct SaveBlock1 /*0x3B14*/ struct RecordMixingGift recordMixingGift; /*0x3B24*/ u8 seen2[DEX_FLAGS_NO]; /*0x3B58*/ LilycoveLady lilycoveLady; - /*0x3B98*/ struct UnkSaveSubstruct_3b98 unk_3B98[20]; + /*0x3B98*/ struct TrainerNameRecord trainerNameRecords[20]; /*0x3C88*/ u8 filler_3C88[0xDC]; /*0x3D64*/ struct SaveTrainerHill trainerHill; /*0x3D70*/ struct WaldaPhrase waldaPhrase; @@ -907,13 +906,13 @@ struct MapPosition s8 height; }; -struct UnkStruct_8054FF8 +struct TradeRoomPlayer { - u8 a; - u8 b; + u8 playerId; + u8 isLocalPlayer; u8 c; - u8 d; - struct MapPosition sub; + u8 facing; + struct MapPosition pos; u16 field_C; }; |