From f3b4ff189c52a591189bd1a9de8b8f4ce48d800e Mon Sep 17 00:00:00 2001 From: dionmoustos Date: Tue, 2 Jun 2026 17:37:02 +0930 Subject: [PATCH] Dions QOL Changes --- .../scripts.inc | 44 +++++++++++++++++++ src/item_use.c | 18 +------- 2 files changed, 46 insertions(+), 16 deletions(-) diff --git a/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc index c15e291c1..ae2525df0 100644 --- a/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc @@ -52,12 +52,56 @@ CeladonCity_DepartmentStore_2F_EventScript_ClerkTMs:: .align 2 CeladonCity_DepartmentStore_2F_TMs:: + .2byte ITEM_TM01 + .2byte ITEM_TM02 + .2byte ITEM_TM03 + .2byte ITEM_TM04 .2byte ITEM_TM05 + .2byte ITEM_TM06 + .2byte ITEM_TM07 + .2byte ITEM_TM08 + .2byte ITEM_TM09 + .2byte ITEM_TM10 + .2byte ITEM_TM11 + .2byte ITEM_TM12 + .2byte ITEM_TM13 + .2byte ITEM_TM14 .2byte ITEM_TM15 + .2byte ITEM_TM16 + .2byte ITEM_TM17 + .2byte ITEM_TM18 + .2byte ITEM_TM19 + .2byte ITEM_TM20 + .2byte ITEM_TM21 + .2byte ITEM_TM22 + .2byte ITEM_TM23 + .2byte ITEM_TM24 + .2byte ITEM_TM25 + .2byte ITEM_TM26 + .2byte ITEM_TM27 .2byte ITEM_TM28 + .2byte ITEM_TM29 + .2byte ITEM_TM30 .2byte ITEM_TM31 + .2byte ITEM_TM32 + .2byte ITEM_TM33 + .2byte ITEM_TM34 + .2byte ITEM_TM35 + .2byte ITEM_TM36 + .2byte ITEM_TM37 + .2byte ITEM_TM38 + .2byte ITEM_TM39 + .2byte ITEM_TM40 + .2byte ITEM_TM41 + .2byte ITEM_TM42 .2byte ITEM_TM43 + .2byte ITEM_TM44 .2byte ITEM_TM45 + .2byte ITEM_TM46 + .2byte ITEM_TM47 + .2byte ITEM_TM48 + .2byte ITEM_TM49 + .2byte ITEM_TM50 .2byte ITEM_NONE release end diff --git a/src/item_use.c b/src/item_use.c index 954f4821d..5148a9974 100644 --- a/src/item_use.c +++ b/src/item_use.c @@ -711,22 +711,8 @@ static void Task_UseFameCheckerFromField(u8 taskId) void FieldUseFunc_VsSeeker(u8 taskId) { - if ((gMapHeader.mapType != MAP_TYPE_ROUTE - && gMapHeader.mapType != MAP_TYPE_TOWN - && gMapHeader.mapType != MAP_TYPE_CITY) - || (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(MAP_VIRIDIAN_FOREST) - && (gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_VIRIDIAN_FOREST) - || gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_MT_EMBER_EXTERIOR) - || gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_THREE_ISLAND_BERRY_FOREST) - || gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAP_SIX_ISLAND_PATTERN_BUSH)))) - { - PrintNotTheTimeToUseThat(taskId, gTasks[taskId].data[3]); - } - else - { - sItemUseOnFieldCB = Task_VsSeeker_0; - SetUpItemUseOnFieldCallback(taskId); - } + sItemUseOnFieldCB = Task_VsSeeker_0; + SetUpItemUseOnFieldCallback(taskId); } void Task_ItemUse_CloseMessageBoxAndReturnToField_VsSeeker(u8 taskId)