Merge branch 'master' into link

include/battle_records.h

@@ -0,0 +1,6 @@
+#ifndef GUARD_BATTLE_RECORDS_H
+#define GUARD_BATTLE_RECORDS_H
+
+void ClearPlayerLinkBattleRecords(void);
+
+#endif // GUARD_BATTLE_RECORDS_H

include/berry.h

@@ -62,6 +62,7 @@ void FieldObjectInteractionPickBerryTree(void);
 void FieldObjectInteractionRemoveBerryTree(void);
 u8 PlayerHasBerries(void);
 void ResetBerryTreeSparkleFlags(void);
+void sub_809C794(void);
 const struct Berry * sub_809C8A0(u8 berryIdx);
 
 extern const struct Berry gBerries[];

include/berry_pouch.h

@@ -19,5 +19,6 @@ void BerryPouch_SetExitCallback(void (*exitCallback)(void));
 void InitBerryPouch(u8 type, void (*savedCallback)(void), u8 allowSelect);
 void DisplayItemMessageInBerryPouch(u8 taskId, u8 fontId, const u8 * str, TaskFunc followUpFunc);
 void Task_BerryPouch_DestroyDialogueWindowAndRefreshListMenu(u8 taskId);
+void BerryPouch_CursorResetToTop(void);
 
 #endif //GUARD_BERRY_POUCH_H

include/berry_powder.h

@@ -2,5 +2,6 @@
 #define GUARD_BERRY_POWDER_H
 
 u32 GetBerryPowder(void);
+void SetBerryPowder(u32 *powder, u32 amount);
 
 #endif //GUARD_BERRY_POWDER_H

include/easy_chat.h

@@ -38,6 +38,7 @@ void InitializeEasyChatWordArray(u16 *words, u16 length);
 void ConvertEasyChatWordsToString(u8 *dest, const u16 *src, u16 length1, u16 length2);
 bool8 ECWord_CheckIfOutsideOfValidRange(u16 word);
 void sub_80BDE28(void);
+void InitEasyChatPhrases(void);
 void EnableRareWord(u8);
 
 #endif // GUARD_EASYCHAT_H

include/event_data.h

@@ -37,7 +37,7 @@ void sub_806E6FC(void);
 void sub_806E2D0(void);
 void sub_806E370(void);
 bool32 IsNationalPokedexEnabled(void);
-
+void sub_806E190(void);
 extern u16 gSpecialVar_0x8000;
 extern u16 gSpecialVar_0x8001;
 extern u16 gSpecialVar_0x8002;

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

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];
@@ -227,14 +235,16 @@ struct SaveBlock2
     /*0x098*/ struct Time localTimeOffset;
     /*0x0A0*/ struct Time lastBerryTreeUpdate;
     /*0x0A8*/ u32 field_A8;
-    /*0x0AC*/ u8 filler_AC[0x3F4];
-    /*0x4A0*/ u32 unk_4A0[0x2F];
-    /*0x55c*/ struct UnkSaveBlock2Substruct_55C unk_55C;
-    /*0x574*/ u8 filler_574[0x324];
+    /*0x0AC*/ u8 field_AC;
+    /*0x0AD*/ u8 field_AD;
+    /*0x0AE*/ u8 filler_AE[0x2];
+    /*0x0B0*/ struct UnkSaveBlock2Substruct_B0 unk_B0;
     /*0x898*/ u16 mapView[0x100];
     /*0xA98*/ struct LinkBattleRecords linkBattleRecords;
     /*0xAF0*/ struct BerryCrush berryCrush;
-    /*0xB00*/ u8 filler_B00[0x420];
+    /*0xB00*/ struct PokemonJumpResults pokeJump;
+    /*0xB10*/ struct BerryPickingResults berryPick;
+    /*0xB20*/ u8 filler_B20[0x400];
     /*0xF20*/ u32 encryptionKey;
 };
 

include/item.h

@@ -62,7 +62,7 @@ u8 ItemId_GetBattleUsage(u16 itemId);
 ItemUseFunc ItemId_GetBattleFunc(u16 itemId);
 u8 ItemId_GetSecondaryId(u16 itemId);
 u16 itemid_get_market_price(u16 itemId);
-void ClearItemSlotsInAllBagPockets(void);
+void ClearBag(void);
 void ClearPCItemSlots(void);
 void sub_809A824(u16 itemId);
 bool8 AddBagItem(u16 itemId, u16 amount);

include/item_menu.h

@@ -26,6 +26,7 @@ extern u16 gSpecialVar_ItemId;
 void sub_81AAC50(void);
 void sub_81AAC70(void);
 void sub_8108CF0(void);
+void sub_81089BC(void);
 void sub_810B108(u8);
 void ReturnToBagFromKeyItem(void);
 void ItemMenu_MoveItemSlotToNewPositionInArray(struct ItemSlot * slots, int pos1, int pos2);

include/main.h

@@ -67,6 +67,7 @@ void SetVBlankCounter1Ptr(u32 *ptr);
 void DisableVBlankCounter1(void);
 void StartTimer1(void);
 void SeedRngAndSetTrainerId(void);
+u16 GetGeneratedTrainerIdLower(void);
 
 extern const char RomHeaderGameCode[4];
 extern const char RomHeaderSoftwareVersion;

include/mevent.h

@@ -66,5 +66,6 @@ void MENews_RemoveScrollIndicatorArrowPair(void);
 bool32 WonderNews_Test_Unk_02(void);
 bool32 WonderCard_Test_Unk_08_6(void);
 u32 MENews_GetInput(u16 input);
+void sub_8143D24(void);
 
 #endif //GUARD_MEVENT_H

include/new_game.h

@@ -3,17 +3,10 @@
 
 #include "global.h"
 
-void WriteUnalignedWord(u32 var, u8 *dataPtr);
-u32 ReadUnalignedWord(u8* dataPtr);
-void CopyUnalignedWord(u8 *copyTo, u8 *copyFrom);
-void InitPlayerTrainerId(void);
-void SetDefaultOptions(void);
-void ClearPokedexFlags(void);
-void WarpToTruck(void);
+void SetTrainerId(u32 trainerId, u8 *dst);
+void CopyTrainerId(u8 *dst, u8 *src);
 void NewGameInitData(void);
-void ResetMiniGamesResults(void);
-void sub_808447C(void);
-void Sav2_ClearSetDefault(void);
 void ResetMenuAndMonGlobals(void);
+void Sav2_ClearSetDefault(void);
 
 #endif // GUARD_NEW_GAME_H

include/overworld.h

@@ -49,7 +49,7 @@ void IncrementGameStat(u8 index);
 void Overworld_SetMapObjTemplateCoords(u8, s16, s16);
 void Overworld_SetMapObjTemplateMovementType(u8, u8);
 
-void Overworld_SetWarpDestination(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y);
+void SetWarpDestination(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y);
 
 void saved_warp2_set(int unused, s8 mapGroup, s8 mapNum, s8 warpId);
 void SetDynamicWarpWithCoords(int unused, s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y);
@@ -137,6 +137,7 @@ u8 get_map_light_from_warp0(void);
 const struct MapHeader *warp1_get_mapheader(void);
 void sub_8055F88(void);
 void sub_8056788(void);
+void ResetGameStats(void);
 
 void Overworld_CreditsMainCB(void);
 bool32 Overworld_DoScrollSceneForCredits(u8 *, const struct CreditsOverworldCmd *, u8);

include/player_pc.h

@@ -21,5 +21,6 @@ struct PlayerPC_Unk_203AAC4
 // Exported ROM declarations
 
 void sub_816B060(u8 taskId);
+void NewGameInitPCItems(void);
 
 #endif //GUARD_PLAYER_PC_H

include/pokemon_jump.h

@@ -0,0 +1,8 @@
+#ifndef GUARD_POKEMON_JUMP_H
+#define GUARD_POKEMON_JUMP_H
+
+#include "main.h"
+
+void ResetPokeJumpResults(void);
+
+#endif // GUARD_POKEMON_JUMP_H

include/pokemon_size_record.h

@@ -11,6 +11,9 @@ void InitLotadSizeRecord(void);
 void GetLotadSizeRecordInfo(void);
 void CompareLotadSize(void);
 
+void sub_80A0904(void);
+void sub_80A0958(void);
+
 void GiveGiftRibbonToParty(u8 index, u8 ribbonId);
 
 #endif // GUARD_POKEMON_SIZE_RECORD_H

include/pokemon_storage_system.h

@@ -14,6 +14,7 @@ u32 GetBoxMonDataFromAnyBox(u8 boxId, u8 monPosition, u32 request);
 void sub_808BCB4(u8 boxId, u8 monPosition);
 u8 * GetBoxNamePtr(u8 boxId);
 void sub_808CE60(void);
+void ResetPokemonStorageSystem(void);
 u8 StorageGetCurrentBox(void);
 
 #endif // GUARD_POKEMON_STORAGE_SYSTEM_H

include/quest_log.h

@@ -33,6 +33,8 @@ u8 sub_8112EB4(void);
 void sub_8113018(const u8 * text, u8 mode);
 void MapNamePopupWindowIdSetDummy(void);
 void sub_8111CF0(void);
+void sub_811089C(void);
+void sub_8113044(void);
 
 extern u8 gUnknown_203ADFA;
 

include/trainer_tower.h

@@ -5,5 +5,7 @@ void PrintTrainerTowerRecords(void);
 void InitTrainerTowerBattleStruct(void);
 void FreeTrainerTowerBattleStruct(void);
 u8 GetTrainerTowerTrainerFrontSpriteId(void);
+void sub_815D838(void);
+void ResetTrainerTowerResults(void);
 
 #endif //GUARD_TRAINER_TOWER_H

include/union_room_chat.h

@@ -0,0 +1,7 @@
+#ifndef GUARD_UNION_ROOM_CHAT_H
+#define GUARD_UNION_ROOM_CHAT_H
+
+void sub_801DD98(void);
+void copy_strings_to_sav1(void);
+
+#endif // GUARD_UNION_ROOM_CHAT_H

include/wild_encounter.h

@@ -45,5 +45,6 @@ bool8 UpdateRepelCounter(void);
 void sub_8082740(u8);
 u8 GetUnownLetterByPersonalityLoByte(u32 personality);
 bool8 SweetScentWildEncounter(void);
+void sub_8083214(u16 randVal);
 
 #endif // GUARD_WILD_ENCOUNTER_H