-
Notifications
You must be signed in to change notification settings - Fork 1.3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Adds Dexnav #4818
Adds Dexnav #4818
Conversation
This makes so the msgbox doesn't move in the Y coordinate if the map popup was previously playing.
Msgbox fixes
…tatic asserts that flags, vars are setup and dexnav cannot be used/accessed otherwise
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
pretty sure I got all the other comments taken care of. ready for another review
@@ -200,6 +204,7 @@ static const struct MenuAction sStartMenuItems[] = | |||
[MENU_ACTION_RETIRE_FRONTIER] = {gText_MenuRetire, {.u8_void = StartMenuBattlePyramidRetireCallback}}, | |||
[MENU_ACTION_PYRAMID_BAG] = {gText_MenuBag, {.u8_void = StartMenuBattlePyramidBagCallback}}, | |||
[MENU_ACTION_DEBUG] = {sText_MenuDebug, {.u8_void = StartMenuDebugCallback}}, | |||
[MENU_ACTION_DEXNAV] = {gText_MenuDexNav, {.u8_void = StartMenuDexNavCallback}}, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
FLAG_SYS_DEXNAV_GET needs to be set for it to show up so it does not overflow by default. I will add a comment about that here. The code needs to exist as a reference for the entry point of the GUI, also
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There's still a bunch of comments in dexnav.c
that need to be looked at
Should have all reviews handled now |
include/config/dexnav.h
Outdated
#define FLAG_SYS_DEXNAV_SEARCH 0 // Searching for mon | ||
#define FLAG_SYS_DEXNAV_GET 0 // Dexnav shows in start menu | ||
#define FLAG_SYS_DETECTOR_MODE 0 // Allow player to find hidden mons | ||
#define VAR_DEXNAV_SPECIES 0 // Registered dexnav species | ||
#define VAR_DEXNAV_STEP_COUNTER 0 // Steps for finding hidden pokemon |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Final request before we merge this in: these five are all needed if DexNav is enabled, which means we should probably add a static assert to make sure these are set before people complain about UB related to exactly this. Thoughts?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Already done. Those exist at the top of dexnav.c except FLAG_SYS_DEXNAV_GET since adding it to the start menu is not required for the implementation
ready for review
Merges in my dexnav branch with some rhh specific tweaks.
Everything is more or less kept the same