Merge branch 'master' into main-menu-state-machine

18 files changed, 68 insertions, 19 deletions

diff --git a/include/braille_puzzles.h b/include/braille_puzzles.h
index d4c5a24d8..1614c92e1 100644
--- a/include/braille_puzzles.h
+++ b/include/braille_puzzles.h
@@ -1,11 +1,11 @@
 #ifndef GUARD_BRAILLE_PUZZLES_H
 #define GUARD_BRAILLE_PUZZLES_H
 
-bool8 ShouldDoBrailleFlyEffect(void);
-bool8 ShouldDoBrailleStrengthEffect(void);
+bool8 ShouldDoBrailleRegisteelEffect(void);
+bool8 ShouldDoBrailleRegirockEffect(void);
 bool8 ShouldDoBrailleDigEffect(void);
 void DoBrailleDigEffect(void);
-void sub_8179918(void);
-void sub_8179834(void);
+void SetUpPuzzleEffectRegisteel(void);
+void SetUpPuzzleEffectRegirock(void);
 
 #endif // GUARD_BRAILLE_PUZZLES_H
diff --git a/include/constants/field_effects.h b/include/constants/field_effects.h
index add195df8..282f9ce75 100644
--- a/include/constants/field_effects.h
+++ b/include/constants/field_effects.h
@@ -61,7 +61,7 @@
 #define FLDEFF_SECRET_POWER_SHRUB        57
 #define FLDEFF_CUT_GRASS                 58
 #define FLDEFF_FIELD_MOVE_SHOW_MON_INIT  59
-#define FLDEFF_USE_FLY_ANCIENT_TOMB      60
+#define FLDEFF_USE_TOMB_PUZZLE_EFFECT      60
 #define FLDEFF_PCTURN_ON                 61
 #define FLDEFF_HALL_OF_FAME_RECORD       62
 #define FLDEFF_USE_TELEPORT              63
diff --git a/include/constants/flags.h b/include/constants/flags.h
index 5082014e7..b440ba78b 100644
--- a/include/constants/flags.h
+++ b/include/constants/flags.h
@@ -1352,9 +1352,9 @@
 #define FLAG_SYS_ENC_UP_ITEM                        (SYSTEM_FLAGS + 0x4D)
 #define FLAG_SYS_ENC_DOWN_ITEM                      (SYSTEM_FLAGS + 0x4E)
 #define FLAG_SYS_BRAILLE_DIG                        (SYSTEM_FLAGS + 0x4F)
-#define FLAG_SYS_BRAILLE_STRENGTH                   (SYSTEM_FLAGS + 0x50)
-#define FLAG_SYS_BRAILLE_WAIT                       (SYSTEM_FLAGS + 0x51)
-#define FLAG_SYS_BRAILLE_FLY                        (SYSTEM_FLAGS + 0x52)
+#define FLAG_SYS_REGIROCK_PUZZLE_COMPLETED          (SYSTEM_FLAGS + 0x50)
+#define FLAG_SYS_BRAILLE_REGICE_COMPLETED           (SYSTEM_FLAGS + 0x51)
+#define FLAG_SYS_REGISTEEL_PUZZLE_COMPLETED         (SYSTEM_FLAGS + 0x52)
 #define FLAG_SYS_HAS_EON_TICKET                     (SYSTEM_FLAGS + 0x53)
 
 #define FLAG_LANDMARK_POKEMON_LEAGUE                (SYSTEM_FLAGS + 0x54)
diff --git a/include/constants/vars.h b/include/constants/vars.h
index c055c5baf..fedc85657 100644
--- a/include/constants/vars.h
+++ b/include/constants/vars.h
@@ -75,9 +75,9 @@
 #define VAR_0x4038                 0x4038
 #define VAR_0x4039                 0x4039
 #define VAR_0x403A                 0x403A
-#define VAR_0x403B                 0x403B
-#define VAR_0x403C                 0x403C
-#define VAR_0x403D                 0x403D
+#define VAR_REGICE_STEPS_1         0x403B
+#define VAR_REGICE_STEPS_2         0x403C
+#define VAR_REGICE_STEPS_3         0x403D
 #define VAR_ALTERING_CAVE_WILD_SET 0x403E
 #define VAR_0x403F                 0x403F
 #define VAR_DAYS                   0x4040
diff --git a/include/contest_link_80FC4F4.h b/include/contest_link_80FC4F4.h
index 6f3bab97d..a3f118798 100644
--- a/include/contest_link_80FC4F4.h
+++ b/include/contest_link_80FC4F4.h
@@ -4,5 +4,10 @@
 void sub_80FCC88(u8);
 void sub_80FCC88(u8);
 void sub_80FCACC(u8);
+void sub_80FC580(u8);
+void sub_80FC6BC(u8);
+void sub_80FC804(u8);
+void sub_80FCE48(u8);
+void sub_80FC894(u8);
 
 #endif //GUARD_CONTEST_LINK_80FC4F4_H
diff --git a/include/dewford_trend.h b/include/dewford_trend.h
index dac5ea6c9..608a925f5 100644
--- a/include/dewford_trend.h
+++ b/include/dewford_trend.h
@@ -4,5 +4,6 @@
 void InitDewfordTrend(void);
 void UpdateDewfordTrendPerDay(u16);
 void UpdateDewfordTrendPerDay(u16 days);
+bool8 sub_81226D8(u16 *a);
 
 #endif // GUARD_DEWFORDTREND_H
diff --git a/include/field_specials.h b/include/field_specials.h
index 981d65c0a..bff04a739 100644
--- a/include/field_specials.h
+++ b/include/field_specials.h
@@ -25,5 +25,7 @@ void UpdateFrontierManiac(u16 a0);
 void UpdateFrontierGambler(u16 a0);
 void ResetCyclingRoadChallengeData(void);
 bool8 warp0_in_pokecenter(void);
+void ResetFanClub(void);
+
 
 #endif // GUARD_FIELD_SPECIALS_H
diff --git a/include/global.h b/include/global.h
index 14a6387cd..cc308c3c9 100644
--- a/include/global.h
+++ b/include/global.h
@@ -376,7 +376,7 @@ struct BattleFrontier
     /*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];
@@ -891,7 +891,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;
diff --git a/include/graphics.h b/include/graphics.h
index 58a9666a6..48c00943b 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -4007,9 +4007,17 @@ extern const u32 gBerryPalette_Enigma[];
 //credits
 extern const u32 gCreditsCopyrightEnd_Gfx[];
 
-//pokenav condition marker
+//pokenav
 extern const u8 gPokenavConditionMarker_Gfx[];
 extern const u16 gPokenavConditionMarker_Pal[];
+extern const u16 gPokenavHeader_Pal[];
+extern const u32 gPokenavHeader_Gfx[];
+extern const u32 gPokenavHeader_Tilemap[];
+extern const u32 gPokenavLeftHeaderHoennMap_Gfx[];
+extern const u32 gPokenavLeftHeaderMainMenu_Gfx[];
+extern const u32 gPokenavLeftHeaderCondition_Gfx[];
+extern const u32 gPokenavLeftHeaderRibbons_Gfx[];
+extern const u32 gPokenavLeftHeaderMatchCall_Gfx[];
 
 extern const u32 gUnknown_08D9862C[];
 extern const u32 gUnknown_08D98CC8[];
diff --git a/include/item_menu.h b/include/item_menu.h
index d972cdf83..2ca1af200 100644
--- a/include/item_menu.h
+++ b/include/item_menu.h
@@ -79,5 +79,7 @@ bool8 UseRegisteredKeyItemOnField(void);
 void CB2_GoToSellMenu(void);
 void GoToBagMenu(u8 bagMenuType, u8 pocketId, void ( *postExitMenuMainCallback2)());
 void DoWallyTutorialBagMenu(void);
+void ResetBagScrollPositions(void);
+
 
 #endif //GUARD_item_menu_H
diff --git a/include/link.h b/include/link.h
index 52a631570..11eff5c28 100644
--- a/include/link.h
+++ b/include/link.h
@@ -305,7 +305,7 @@ void sub_8009FAC(void);
 bool8 sub_800A4D8(u8 a0);
 u8 sub_800A9D8(void);
 u8 sub_800A0C8(s32, s32);
-u16 *sub_801B058(void);
+u16 *GetSaveBlock1Field3564(void);
 u8 sub_800A9A8(void);
 void sub_800AD10(void);
 void sub_800AB18(void);
diff --git a/include/link_rfu.h b/include/link_rfu.h
index d468d6c49..c91f9f1d3 100644
--- a/include/link_rfu.h
+++ b/include/link_rfu.h
@@ -213,6 +213,7 @@ extern struct UnkRfuStruct_2 gUnknown_03005000;
 extern u8 gWirelessStatusIndicatorSpriteId;
 
 // Exported ROM declarations
+void WipeTrainerNameRecords(void);
 u32 sub_800BEC0(void);
 void sub_800E700(void);
 void sub_800EDD4(void);
@@ -263,7 +264,7 @@ void sub_800E084(void);
 void sub_801103C(void);
 void sub_8011C5C(void);
 void sub_80106D4(void);
-void sub_800E3A8(void);
+void RecordMixTrainerNames(void);
 void sub_800ED10(void);
 void sub_800ED28(void);
 void sub_8011090(u8 a0, u32 a1, u32 a2);
diff --git a/include/main.h b/include/main.h
index 2ed30307b..728064288 100644
--- a/include/main.h
+++ b/include/main.h
@@ -68,5 +68,7 @@ void ClearPokemonCrySongs(void);
 void RestoreSerialTimer3IntrHandlers(void);
 void StartTimer1(void);
 void SeedRngAndSetTrainerId(void);
+extern u16 GetGeneratedTrainerIdLower(void);
+
 
 #endif // GUARD_MAIN_H
diff --git a/include/player_pc.h b/include/player_pc.h
index 5a0b83683..53bb25c6b 100644
--- a/include/player_pc.h
+++ b/include/player_pc.h
@@ -85,5 +85,7 @@ extern const struct MenuAction gMailboxMailOptions[];
 void ReshowPlayerPC(u8 taskId);
 void sub_816B31C(void);
 void Mailbox_ReturnToMailListAfterDeposit(void);
+void NewGameInitPCItems(void);
+
 
 #endif //GUARD_PLAYER_PC_H
diff --git a/include/pokedex.h b/include/pokedex.h
index 91e9e37d4..6136f7786 100644
--- a/include/pokedex.h
+++ b/include/pokedex.h
@@ -1,7 +1,7 @@
 #ifndef GUARD_POKEDEX_H
 #define GUARD_POKEDEX_H
 
-extern u8 gUnknown_030060B0;
+extern u8 gUnusedPokedexU8;
 extern void (*gUnknown_030060B4)(void);
 
 #define HOENN_DEX_COUNT 202
@@ -42,5 +42,6 @@ u8 CreateDexDisplayMonDataTask(u16 dexNum, u32 trainerId, u32 personality);
 s8 GetSetPokedexFlag(u16 nationalNum, u8 caseId);
 u16 CreateMonSpriteFromNationalDexNumber(u16, s16, s16, u16);
 bool16 HasAllHoennMons(void);
+void ResetPokedexScrollPositions(void);
 
 #endif // GUARD_POKEDEX_H
diff --git a/include/secret_base.h b/include/secret_base.h
index 57ad81fee..699158d0e 100644
--- a/include/secret_base.h
+++ b/include/secret_base.h
@@ -24,6 +24,7 @@ void sub_80EBB28(void);
 void WarpIntoSecretBase(const struct MapPosition *position, const struct MapEvents *events);
 bool8 sub_80E909C(void);
 void sub_80EB218(void);
+void ResetSecretBases(void);
 
 // SetCurrentSecretBaseFromPosition
 void sub_80E9608(const struct MapPosition *position, const struct MapEvents *events);
@@ -33,4 +34,5 @@ void sub_80E8BC8(void);
 void sub_80E8D4C(void);
 void EnableBothScriptContexts(void);
 
+
 #endif //GUARD_SECRET_BASE_H
diff --git a/include/strings.h b/include/strings.h
index 9557dcca2..af1625140 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -986,6 +986,19 @@ extern const u8 gText_SomeonesPC[];
 extern const u8 gText_PlayersPC[];
 extern const u8 gText_WhichPCShouldBeAccessed[];
 
+extern const u8 gText_Navgear_ClearButtonList[];
+extern const u8 gText_NavgearMap_ZoomedOutButtons[];
+extern const u8 gText_NavgearMap_ZoomedInButtons[];
+extern const u8 gText_NavgearCondition_MonListButtons[];
+extern const u8 gText_NavgearCondition_MonStatusButtons[];
+extern const u8 gText_NavgearCondition_MarkingButtons[];
+extern const u8 gText_NavgearMatchCall_TrainerListButtons[];
+extern const u8 gText_NavgearMatchCall_CallMenuButtons[];
+extern const u8 gText_NavgearMatchCall_CheckTrainerButtons[];
+extern const u8 gText_NavgearRibbons_MonListButtons[];
+extern const u8 gText_NavgearRibbons_RibbonListButtons[];
+extern const u8 gText_NavgearRibbons_RibbonCheckButtons[];
+
 extern const u8 gUnknown_085EAD37[];
 extern const u8 gUnknown_085EAD41[];
 extern const u8 gUnknown_085EAD67[];
@@ -2400,5 +2413,14 @@ extern const u8 gUnknown_085EDC45[];
 extern const u8 gUnknown_085EDB00[];
 extern const u8 gUnknown_085EDC84[];
 
+// Easy Chat Entry
+extern const u8 gText_StopGivingPkmnMail[];
+extern const u8 gText_LikeToQuitQuiz[];
+extern const u8 gText_ChallengeQuestionMark[];
+extern const u8 gText_QuitEditing[];
+extern const u8 gText_AllTextBeingEditedWill[];
+extern const u8 gText_BeDeletedThatOkay[];
+extern const u8 gText_Lady[];
+extern const u8 gText_F700sQuiz[];
 
 #endif // GUARD_STRINGS_H
diff --git a/include/tv.h b/include/tv.h
index 760d87522..a7ef3daa8 100644
--- a/include/tv.h
+++ b/include/tv.h
@@ -61,5 +61,6 @@ void ContestLiveUpdates_BeforeInterview_2(u8 a0);
 void ContestLiveUpdates_BeforeInterview_3(u8 a0);
 void ContestLiveUpdates_BeforeInterview_4(u16 a0);
 void ContestLiveUpdates_BeforeInterview_5(u8 a0, u8 a1);
+void ResetGabbyAndTy(void);
 
 #endif //GUARD_TV_H