diff options
| author | huderlem <huderlem@gmail.com> | 2019-11-23 09:27:02 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-23 09:27:02 -0600 |
| commit | bef6150b59abb23380529099016f9deef8c558ca (patch) | |
| tree | 1f89af901a1f634c7547f6f3ce0bbb8faf5bbee5 /src/item_menu.c | |
| parent | e3f7f47321bbe399dfcfc422d53d9beb5caab788 (diff) | |
| parent | f039e897ca8229e6e9b104408bf48c2d4e0dcb4b (diff) | |
Merge pull request #909 from GriffinRichards/doc-apprentice
Document Apprentice
Diffstat (limited to 'src/item_menu.c')
| -rwxr-xr-x | src/item_menu.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/item_menu.c b/src/item_menu.c index 40a0f0439..3c5095551 100755 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -119,7 +119,7 @@ void sub_81AD9C0(u8); void sub_81ADB14(u8); void sub_81ADA7C(u8); void sub_81ADC0C(u8); -void bag_menu_leave_maybe(void); +void CB2_ApprenticeExitBagMenu(void); void CB2_FavorLadyExitBagMenu(void); void CB2_QuizLadyExitBagMenu(void); void sub_81ABA6C(void); @@ -492,23 +492,23 @@ void sub_81AAC14(void) GoToBagMenu(RETURN_LOCATION_PC, POCKETS_COUNT, sub_816B31C); } -void sub_81AAC28(void) +void ApprenticeOpenBagMenu(void) { - GoToBagMenu(RETURN_LOCATION_FIELD_6, POCKETS_COUNT, bag_menu_leave_maybe); - gSpecialVar_0x8005 = 0; - gSpecialVar_Result = 0; + GoToBagMenu(RETURN_LOCATION_FIELD_6, POCKETS_COUNT, CB2_ApprenticeExitBagMenu); + gSpecialVar_0x8005 = ITEM_NONE; + gSpecialVar_Result = FALSE; } void FavorLadyOpenBagMenu(void) { GoToBagMenu(RETURN_LOCATION_FIELD_4, POCKETS_COUNT, CB2_FavorLadyExitBagMenu); - gSpecialVar_Result = 0; + gSpecialVar_Result = FALSE; } void QuizLadyOpenBagMenu(void) { GoToBagMenu(RETURN_LOCATION_FIELD_5, POCKETS_COUNT, CB2_QuizLadyExitBagMenu); - gSpecialVar_Result = 0; + gSpecialVar_Result = FALSE; } void GoToBagMenu(u8 bagMenuType, u8 pocketId, void ( *postExitMenuMainCallback2)()) @@ -2203,7 +2203,7 @@ void unknown_ItemMenu_Show(u8 taskId) unknown_ItemMenu_Confirm(taskId); } -void bag_menu_leave_maybe(void) +void CB2_ApprenticeExitBagMenu(void) { gFieldCallback = Apprentice_EnableBothScriptContexts; SetMainCallback2(CB2_ReturnToField); |