diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-14 10:53:36 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-14 10:53:36 -0500 |
| commit | 1ff1e8ce9547d646b17b135b3013a516d17f35db (patch) | |
| tree | c23fbb425b230e81529932482ddb0fe7fc6a1376 /src/field | |
| parent | daa0a98ee0129be1797274de318a35df30d39020 (diff) | |
| parent | b9388f078ed95e80ac73b35eeb206e52ce376b0c (diff) | |
Merge branch 'master' into pokemon_storage_system
Diffstat (limited to 'src/field')
| -rw-r--r-- | src/field/item.c | 2 | ||||
| -rw-r--r-- | src/field/start_menu.c | 4 |
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; |