party_menu third quarter

src/option_menu.c

@@ -206,7 +206,7 @@ void CB2_OptionsMenuFromStartMenu(void)
     u8 i;
     
     if (gMain.savedCallback == NULL)
-        gMain.savedCallback = CB2_ReturnToStartMenu;
+        gMain.savedCallback = CB2_ReturnToFieldWithOpenMenu;
     sOptionMenuPtr = AllocZeroed(sizeof(struct OptionMenu));
     sOptionMenuPtr->state3 = 0;
     sOptionMenuPtr->state2 = 0;

src/start_menu.c

@@ -504,7 +504,7 @@ static bool8 StartMenuPlayerCallback(void)
         PlayRainStoppingSoundEffect();
         DestroySafariZoneStatsWindow();
         CleanupOverworldWindowsAndTilemaps();
-        InitTrainerCard(CB2_ReturnToStartMenu);
+        InitTrainerCard(CB2_ReturnToFieldWithOpenMenu);
         return TRUE;
     }
     return FALSE;
@@ -524,7 +524,7 @@ static bool8 StartMenuOptionCallback(void)
         DestroySafariZoneStatsWindow();
         CleanupOverworldWindowsAndTilemaps();
         SetMainCallback2(CB2_OptionsMenuFromStartMenu);
-        gMain.savedCallback = CB2_ReturnToStartMenu;
+        gMain.savedCallback = CB2_ReturnToFieldWithOpenMenu;
         return TRUE;
     }
     return FALSE;
@@ -554,7 +554,7 @@ static bool8 StartMenuLinkPlayerCallback(void)
     {
         PlayRainStoppingSoundEffect();
         CleanupOverworldWindowsAndTilemaps();
-        InitLinkPartnerTrainerCard(gUnknown_300502C, CB2_ReturnToStartMenu);
+        InitLinkPartnerTrainerCard(gUnknown_300502C, CB2_ReturnToFieldWithOpenMenu);
         return TRUE;
     }
     return FALSE;

src/trade.c

@@ -4474,7 +4474,7 @@ int GetUnionRoomTradeMessageId(struct UnkLinkRfuStruct_02022B14Substruct a0, str
     return 0;
 }
 
-int Trade_CanTradeSelectedMon(struct UnkLinkRfuStruct_02022B14Substruct a0, u16 species, u16 a2, u8 a3)
+int CanRegisterMonForTradingBoard(struct UnkLinkRfuStruct_02022B14Substruct a0, u16 species, u16 a2, u8 a3)
 {
     u8 canTradeEggAndNational = a0.unk_01_0;