Merge remote-tracking branch 'upstream/master' into battle_anim_data

2 files changed, 3 insertions, 3 deletions

diff --git a/src/field/item.c b/src/field/item.c
index 66d7d65df..6ff7a7cbe 100644
--- a/src/field/item.c
+++ b/src/field/item.c
@@ -571,7 +571,7 @@ void SwapRegisteredBike(void)
 
 static u16 SanitizeItemId(u16 itemId)
 {
-    if (itemId > 0x15C)
+    if (itemId >= ARRAY_COUNT(gItems))
         return 0;
     else
         return itemId;
diff --git a/src/field/start_menu.c b/src/field/start_menu.c
index d6881cb01..2f6f1e7dd 100644
--- a/src/field/start_menu.c
+++ b/src/field/start_menu.c
@@ -395,7 +395,7 @@ static u8 StartMenu_PlayerCallback(void)
     if (!gPaletteFade.active)
     {
         PlayRainSoundEffect();
-        sub_8093110(sub_805469C);
+        TrainerCard_ShowPlayerCard(sub_805469C);
         return 1;
     }
     return 0;
@@ -443,7 +443,7 @@ static u8 StartMenu_PlayerLinkCallback(void)
     if (!gPaletteFade.active)
     {
         PlayRainSoundEffect();
-        sub_8093130(gUnknown_03004860, sub_805469C);
+        TrainerCard_ShowLinkCard(gUnknown_03004860, sub_805469C);
         return 1;
     }
     return 0;