diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/battle_records.h | 6 | ||||
-rw-r--r-- | include/event_scripts.h | 3 | ||||
-rw-r--r-- | include/global.h | 14 | ||||
-rw-r--r-- | include/new_game.h | 2 |
4 files changed, 14 insertions, 11 deletions
diff --git a/include/battle_records.h b/include/battle_records.h index 88ff6adc9..97f28a3b0 100644 --- a/include/battle_records.h +++ b/include/battle_records.h @@ -1,12 +1,6 @@ #ifndef GUARD_BATTLE_RECORDS_H #define GUARD_BATTLE_RECORDS_H -extern u8 gRecordsWindowId; - void ClearPlayerLinkBattleRecords(void); -void UpdatePlayerLinkBattleRecords(s32 battlerId); -void ShowLinkBattleRecords(void); -void RemoveRecordsWindow(void); -void ShowTrainerHillRecords(void); #endif // GUARD_BATTLE_RECORDS_H diff --git a/include/event_scripts.h b/include/event_scripts.h index 310335196..41a7a7bf2 100644 --- a/include/event_scripts.h +++ b/include/event_scripts.h @@ -1155,4 +1155,7 @@ extern const u8 EventScript_SafariOutOfBalls[]; extern const u8 EventScript_ItemfinderDigUpUnderfootItem[]; +// new_game +extern const u8 EventScript_ResetAllMapFlags[]; + #endif //GUARD_EVENT_SCRIPTS_H diff --git a/include/global.h b/include/global.h index c206cf5f1..98dd8ab2c 100644 --- a/include/global.h +++ b/include/global.h @@ -205,6 +205,14 @@ struct UnkSaveBlock2Substruct_55C /* 0x016:0x572 */ u8 unk_16; }; // size: 0x018 +struct UnkSaveBlock2Substruct_B0 +{ + /* 0x000:0x0B0 */ u8 field_0[0x3F0]; + /* 0x3F0:0x4A0 */ u32 field_3F0[0x2F]; + /* 0x4AC:0x55C */ struct UnkSaveBlock2Substruct_55C field_4AC; + /* 0x4C4:0x574 */ u8 field_4C4[0x324]; +}; // size: 0x7E8 + struct SaveBlock2 { /*0x000*/ u8 playerName[PLAYER_NAME_LENGTH]; @@ -230,11 +238,7 @@ struct SaveBlock2 /*0x0AC*/ u8 field_AC; /*0x0AD*/ u8 field_AD; /*0x0AE*/ u8 filler_AE[0x2]; - /*0x0B0*/ u8 field_B0; - /*0x0B1*/ u8 filler_B1[0x3EF]; - /*0x4A0*/ u32 unk_4A0[0x2F]; - /*0x55c*/ struct UnkSaveBlock2Substruct_55C unk_55C; - /*0x574*/ u8 filler_574[0x324]; + /*0x0B0*/ struct UnkSaveBlock2Substruct_B0 unk_B0; /*0x898*/ u16 mapView[0x100]; /*0xA98*/ struct LinkBattleRecords linkBattleRecords; /*0xAF0*/ struct BerryCrush berryCrush; diff --git a/include/new_game.h b/include/new_game.h index eedaea724..ed40546ba 100644 --- a/include/new_game.h +++ b/include/new_game.h @@ -1,6 +1,8 @@ #ifndef GUARD_NEW_GAME_H #define GUARD_NEW_GAME_H +#include "global.h" + void SetTrainerId(u32 trainerId, u8 *dst); void CopyTrainerId(u8 *dst, u8 *src); void NewGameInitData(void); |