From 4907ce6f7f5e8d73c32f6d8746ba64465502df03 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Sun, 3 Mar 2019 02:50:40 -0500 Subject: Fully document move_tutor (formerly learn_move) --- src/item_menu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/item_menu.c') diff --git a/src/item_menu.c b/src/item_menu.c index 7b48a2d5d..a3a0d8080 100755 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -1108,7 +1108,7 @@ void Task_BagMenu(u8 taskId) { case LIST_NOTHING_CHOSEN: break; - case LIST_B_PRESSED: + case LIST_CANCEL: if (gUnknown_0203CE58.location == 5) { PlaySE(SE_HAZURE); @@ -1324,7 +1324,7 @@ void sub_81AC3C0(u8 taskId) { case LIST_NOTHING_CHOSEN: break; - case LIST_B_PRESSED: + case LIST_CANCEL: PlaySE(SE_SELECT); if (gMain.newKeys & A_BUTTON) sub_81AC498(taskId); -- cgit v1.2.3 From 7d54c2b9600060c2b0cc37bac7fbdcdad6ee3178 Mon Sep 17 00:00:00 2001 From: Fontbane Date: Thu, 21 Mar 2019 22:10:56 -0400 Subject: EventScript and Text Documentation In event_script.s. Also renamed a couple events for consistency/detail. --- src/item_menu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/item_menu.c') diff --git a/src/item_menu.c b/src/item_menu.c index 81bc120a8..8edf6f279 100755 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -447,7 +447,7 @@ static EWRAM_DATA struct TempWallyStruct *gUnknown_0203CE80 = 0; extern u8 *const gPocketNamesStringsTable[]; extern u8* gReturnToXStringsTable[]; -extern const u8 EventScript_2736B3[]; +extern const u8 EventScript_SelectWithoutRegisteredItem[]; extern const u16 gUnknown_0860F074[]; void ResetBagScrollPositions(void) @@ -1900,7 +1900,7 @@ bool8 UseRegisteredKeyItemOnField(void) else gSaveBlock1Ptr->registeredItem = ITEM_NONE; } - ScriptContext1_SetupScript(EventScript_2736B3); + ScriptContext1_SetupScript(EventScript_SelectWithoutRegisteredItem); return TRUE; } -- cgit v1.2.3 From b0223f691fcc83c18b6ba8df5140d907939b04cf Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Thu, 4 Apr 2019 23:53:06 +0200 Subject: Clean up data headers --- src/item_menu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/item_menu.c') diff --git a/src/item_menu.c b/src/item_menu.c index 8edf6f279..c000b9563 100755 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -8,7 +8,7 @@ #include "bg.h" #include "constants/items.h" #include "constants/songs.h" -#include "data2.h" +#include "data.h" #include "decompress.h" #include "event_data.h" #include "event_object_movement.h" -- cgit v1.2.3