From 68a869da9974a0cd869b6339607ea5394fa5abc7 Mon Sep 17 00:00:00 2001 From: aronson Date: Sun, 30 Mar 2025 03:57:58 -0500 Subject: [PATCH] Hide in-battle types from Union Room trade request (#6489) --- src/data/union_room.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/data/union_room.h b/src/data/union_room.h index f39ab83de0..42c02c5a58 100644 --- a/src/data/union_room.h +++ b/src/data/union_room.h @@ -867,7 +867,8 @@ static const struct WindowTemplate sWindowTemplate_TradingBoardRequestType = { .baseBlock = 0x0001 }; -static const struct ListMenuItem sTradingBoardTypes[NUMBER_OF_MON_TYPES] = { +// Subtract two from the total type count to handle in-battle types not for display +static const struct ListMenuItem sTradingBoardTypes[NUMBER_OF_MON_TYPES - 2] = { { gTypesInfo[TYPE_NORMAL].name, TYPE_NORMAL }, { gTypesInfo[TYPE_FIRE].name, TYPE_FIRE }, { gTypesInfo[TYPE_WATER].name, TYPE_WATER },