diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle_records.h | 2 | ||||
| -rw-r--r-- | include/global.h | 8 | ||||
| -rw-r--r-- | include/new_game.h | 3 | ||||
| -rw-r--r-- | include/union_room_chat.h | 2 |
4 files changed, 6 insertions, 9 deletions
diff --git a/include/battle_records.h b/include/battle_records.h index 55e969b50..5ddb11472 100644 --- a/include/battle_records.h +++ b/include/battle_records.h @@ -10,4 +10,4 @@ void ShowLinkBattleRecords(void); void RemoveRecordsWindow(void); void ShowTrainerHillRecords(void); -#endif // GUARD_BATTLE_RECORDS_H
\ No newline at end of file +#endif // GUARD_BATTLE_RECORDS_H diff --git a/include/global.h b/include/global.h index 2af9bbc94..c206cf5f1 100644 --- a/include/global.h +++ b/include/global.h @@ -230,8 +230,8 @@ struct SaveBlock2 /*0x0AC*/ u8 field_AC; /*0x0AD*/ u8 field_AD; /*0x0AE*/ u8 filler_AE[0x2]; - /*0x0B0*/ u8 field_B0; - /*0x0B1*/ u8 filler_B1[0x3EF]; + /*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]; @@ -239,8 +239,8 @@ struct SaveBlock2 /*0xA98*/ struct LinkBattleRecords linkBattleRecords; /*0xAF0*/ struct BerryCrush berryCrush; /*0xB00*/ struct PokemonJumpResults pokeJump; - /*0xB10*/ struct BerryPickingResults berryPick; - /*0xB20*/ u8 filler_B20[0x400]; + /*0xB10*/ struct BerryPickingResults berryPick; + /*0xB20*/ u8 filler_B20[0x400]; /*0xF20*/ u32 encryptionKey; }; diff --git a/include/new_game.h b/include/new_game.h index 346e7aff3..eedaea724 100644 --- a/include/new_game.h +++ b/include/new_game.h @@ -2,12 +2,9 @@ #define GUARD_NEW_GAME_H void SetTrainerId(u32 trainerId, u8 *dst); -u32 ReadUnalignedWord(u8* dataPtr); void CopyTrainerId(u8 *dst, u8 *src); void NewGameInitData(void); void ResetMenuAndMonGlobals(void); void Sav2_ClearSetDefault(void); -void ResetMiniGamesResults(void); -void sub_808447C(void); #endif // GUARD_NEW_GAME_H diff --git a/include/union_room_chat.h b/include/union_room_chat.h index 027a2e20c..17e482525 100644 --- a/include/union_room_chat.h +++ b/include/union_room_chat.h @@ -4,4 +4,4 @@ void sub_801DD98(void); void copy_strings_to_sav1(void); -#endif // GUARD_UNION_ROOM_CHAT_H
\ No newline at end of file +#endif // GUARD_UNION_ROOM_CHAT_H |