FATEFUL ENCOUNTER

kithr1 · Mar 26, 2024 · cef5674 · cef5674
1 parent 2f4c29f
commit cef5674
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/battle_setup.c b/src/battle_setup.c
@@ -992,10 +992,13 @@ void ChooseStarter(void)
 static void CB2_GiveStarter(void)
 {
     u16 starterMon;
-
+    u16 starterMet = METLOC_FATEFUL_ENCOUNTER;
+    bool32 isModernFatefulEncounter = TRUE;
     *GetVarPointer(VAR_STARTER_MON) = gSpecialVar_Result;
-    starterMon = GetStarterPokemon(gSpecialVar_Result);
+    starterMon = GetStarterPokemon(gSpecialVar_Result); 
     ScriptGiveMon(starterMon, 5, ITEM_NONE, 0, 0, 0);
+    SetMonData(&gPlayerParty[0], MON_DATA_MET_LOCATION, &starterMet);
+    SetMonData(&gPlayerParty[0], MON_DATA_MODERN_FATEFUL_ENCOUNTER, &isModernFatefulEncounter);
     ResetTasks();
     PlayBattleBGM();
     SetMainCallback2(CB2_StartFirstBattle);

diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c
@@ -3222,6 +3222,8 @@ static void BufferMonTrainerMemo(void)
         {
             if (sum->metLevel == 0)
                 text = (sum->metLocation >= MAPSEC_NONE) ? gText_XNatureHatchedSomewhereAt : gText_XNatureHatchedAtYZ;
+            else if (sum->metLocation == METLOC_FATEFUL_ENCOUNTER)
+                text = gText_XNatureFatefulEncounter;
             else
                 text = (sum->metLocation >= MAPSEC_NONE) ? gText_XNatureMetSomewhereAt : gText_XNatureMetAtYZ;
         }