diff options
Diffstat (limited to 'src/pokenav.c')
| -rw-r--r-- | src/pokenav.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/pokenav.c b/src/pokenav.c index a7b7c95a3..03b29ab0b 100644 --- a/src/pokenav.c +++ b/src/pokenav.c @@ -21,7 +21,7 @@ struct PokenavResources u32 (*currentMenuCb1)(void); u32 currentMenuIndex; u16 mode; - u16 fieldA; + u16 conditionSearchId; bool32 hasAnyRibbons; void *field10[SUBSTRUCT_COUNT]; }; @@ -57,7 +57,7 @@ const struct UnknownPokenavCallbackStruct PokenavMenuCallbacks[15] = .unk0 = PokenavCallback_Init_0, .unk4 = sub_81C941C, .unk8 = sub_81C9924, - .unkC = sub_81C9990, + .unkC = CreateMenuHandlerLoopedTask, .unk10 = sub_81C99C0, .unk14 = sub_81C9430, .unk18 = sub_81C99D4, @@ -66,7 +66,7 @@ const struct UnknownPokenavCallbackStruct PokenavMenuCallbacks[15] = .unk0 = PokenavCallback_Init_0, .unk4 = sub_81C941C, .unk8 = sub_81C9940, - .unkC = sub_81C9990, + .unkC = CreateMenuHandlerLoopedTask, .unk10 = sub_81C99C0, .unk14 = sub_81C9430, .unk18 = sub_81C99D4, @@ -75,7 +75,7 @@ const struct UnknownPokenavCallbackStruct PokenavMenuCallbacks[15] = .unk0 = PokenavCallback_Init_2, .unk4 = sub_81C941C, .unk8 = sub_81C9940, - .unkC = sub_81C9990, + .unkC = CreateMenuHandlerLoopedTask, .unk10 = sub_81C99C0, .unk14 = sub_81C9430, .unk18 = sub_81C99D4, @@ -84,7 +84,7 @@ const struct UnknownPokenavCallbackStruct PokenavMenuCallbacks[15] = .unk0 = PokenavCallback_Init_3, .unk4 = sub_81C941C, .unk8 = sub_81C9940, - .unkC = sub_81C9990, + .unkC = CreateMenuHandlerLoopedTask, .unk10 = sub_81C99C0, .unk14 = sub_81C9430, .unk18 = sub_81C99D4, @@ -93,7 +93,7 @@ const struct UnknownPokenavCallbackStruct PokenavMenuCallbacks[15] = .unk0 = PokenavCallback_Init_4, .unk4 = sub_81C941C, .unk8 = sub_81C9940, - .unkC = sub_81C9990, + .unkC = CreateMenuHandlerLoopedTask, .unk10 = sub_81C99C0, .unk14 = sub_81C9430, .unk18 = sub_81C99D4, @@ -102,7 +102,7 @@ const struct UnknownPokenavCallbackStruct PokenavMenuCallbacks[15] = .unk0 = PokenavCallback_Init_5, .unk4 = sub_81C941C, .unk8 = sub_81C9940, - .unkC = sub_81C9990, + .unkC = CreateMenuHandlerLoopedTask, .unk10 = sub_81C99C0, .unk14 = sub_81C9430, .unk18 = sub_81C99D4, @@ -156,7 +156,7 @@ const struct UnknownPokenavCallbackStruct PokenavMenuCallbacks[15] = .unk0 = PokenavCallback_Init_11, .unk4 = sub_81CAB24, .unk8 = sub_81CB260, - .unkC = sub_81CB29C, + .unkC = CreateMatchCallLoopedTask, .unk10 = sub_81CB2CC, .unk14 = sub_81CAB38, .unk18 = sub_81CB2E0, @@ -554,18 +554,18 @@ void SetPokenavMode(u16 mode) gPokenavResources->mode = mode; } -void sub_81C7694(u32 a0) +void SetSelectedConditionSearch(u32 cursorPos) { - u32 value = a0; + u32 searchId = cursorPos; - if (value > 4) - value = 0; - gPokenavResources->fieldA = value; + if (searchId > POKENAV_MENUITEM_CONDITION_SEARCH_TOUGH - POKENAV_MENUITEM_CONDITION_SEARCH_COOL) + searchId = 0; + gPokenavResources->conditionSearchId = searchId; } -u32 sub_81C76AC(void) +u32 GetSelectedConditionSearch(void) { - return gPokenavResources->fieldA; + return gPokenavResources->conditionSearchId; } bool32 CanViewRibbonsMenu(void) |