Note that the clunky naming on the new enums (e.g. OPTIONS_BUTTON_MODE_NORMAL instead of simply BUTTON_MODE_NORMAL) is to distinguish it from the enums not directly related to the options choices for those things. Following the same example, the BUTTON_MODE_NORMAL enum value in core_sys.h. You can see the (unfortunately necessary) distinction pretty clearly in Options_SetSystemButtonMode().
Note that the clunky naming on the new enums (e.g.
OPTIONS_BUTTON_MODE_NORMALinstead of simplyBUTTON_MODE_NORMAL) is to distinguish it from the enums not directly related to the options choices for those things. Following the same example, theBUTTON_MODE_NORMALenum value incore_sys.h. You can see the (unfortunately necessary) distinction pretty clearly inOptions_SetSystemButtonMode().