dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Dions QOL Changes

Browse Source
This commit is contained in:
dionmoustos
2026-06-02 17:37:02 +09:30
parent b8560820f3
commit f3b4ff189c
2 changed files with 46 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/CeladonCity_DepartmentStore_2F/scripts.inc
+44
View File
@@ -52,12 +52,56 @@ CeladonCity_DepartmentStore_2F_EventScript_ClerkTMs::
.align 2 .align 2
CeladonCity_DepartmentStore_2F_TMs:: CeladonCity_DepartmentStore_2F_TMs::
.2byte ITEM_TM01
.2byte ITEM_TM02
.2byte ITEM_TM03
.2byte ITEM_TM04
.2byte ITEM_TM05 .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_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_TM28
.2byte ITEM_TM29
.2byte ITEM_TM30
.2byte ITEM_TM31 .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_TM43
.2byte ITEM_TM44
.2byte ITEM_TM45 .2byte ITEM_TM45
.2byte ITEM_TM46
.2byte ITEM_TM47
.2byte ITEM_TM48
.2byte ITEM_TM49
.2byte ITEM_TM50
.2byte ITEM_NONE .2byte ITEM_NONE
release release
end end
src/item_use.c
+2 -16
View File
@@ -711,22 +711,8 @@ static void Task_UseFameCheckerFromField(u8 taskId)
void FieldUseFunc_VsSeeker(u8 taskId) void FieldUseFunc_VsSeeker(u8 taskId)
{ {
if ((gMapHeader.mapType != MAP_TYPE_ROUTE sItemUseOnFieldCB = Task_VsSeeker_0;
&& gMapHeader.mapType != MAP_TYPE_TOWN SetUpItemUseOnFieldCallback(taskId);
&& 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);
}
} }
void Task_ItemUse_CloseMessageBoxAndReturnToField_VsSeeker(u8 taskId) void Task_ItemUse_CloseMessageBoxAndReturnToField_VsSeeker(u8 taskId)