Fly from Pokenav #5679
Open
Fly from Pokenav #5679
+169
−42
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Could you also make it work with the Town Map item? |
|
Currently, you can use the PokeNav to fly while indoors (and I'm assuming other areas where flying is usually not possible). |
hedara90
reviewed
Dec 19, 2024
include/config/overworld.h
Outdated
Comment on lines
84
to
88
| #define OW_FLAG_PAUSE_TIME 0 // If this flag is set and OW_USE_FAKE_RTC is enabled, seconds on the in-game clock will not advance. | ||
| #define OW_FLAG_NO_ENCOUNTER 0 // If this flag is set, wild encounters will be disabled. | ||
| #define OW_FLAG_NO_TRAINER_SEE 0 // If this flag is set, trainers will not battle the player unless they're talked to. | ||
| #define OW_FLAG_NO_COLLISION 0 // If this flag is set, the player will be able to walk over tiles with collision. Mainly intended for debugging purposes. | ||
| #define OW_FLAG_POKE_RIDER 0 // If this flag is set, the player will be able to use fly from the Pokenav Region Map section by pressing 'R' on a city/location they have been to. |
There was a problem hiding this comment.
Suggested change
| #define OW_FLAG_PAUSE_TIME 0 // If this flag is set and OW_USE_FAKE_RTC is enabled, seconds on the in-game clock will not advance. | |
| #define OW_FLAG_NO_ENCOUNTER 0 // If this flag is set, wild encounters will be disabled. | |
| #define OW_FLAG_NO_TRAINER_SEE 0 // If this flag is set, trainers will not battle the player unless they're talked to. | |
| #define OW_FLAG_NO_COLLISION 0 // If this flag is set, the player will be able to walk over tiles with collision. Mainly intended for debugging purposes. | |
| #define OW_FLAG_POKE_RIDER 0 // If this flag is set, the player will be able to use fly from the Pokenav Region Map section by pressing 'R' on a city/location they have been to. | |
| #define OW_FLAG_PAUSE_TIME 0 // If this flag is set and OW_USE_FAKE_RTC is enabled, seconds on the in-game clock will not advance. | |
| #define OW_FLAG_NO_ENCOUNTER 0 // If this flag is set, wild encounters will be disabled. | |
| #define OW_FLAG_NO_TRAINER_SEE 0 // If this flag is set, trainers will not battle the player unless they're talked to. | |
| #define OW_FLAG_NO_COLLISION 0 // If this flag is set, the player will be able to walk over tiles with collision. Mainly intended for debugging purposes. | |
| #define OW_FLAG_POKE_RIDER 0 // If this flag is set, the player will be able to use fly from the Pokenav Region Map section by pressing 'R' on a city/location they have been to. |
Match previous alignment
src/pokenav_region_map.c
Outdated
| { | ||
| struct RegionMap* regionMap = GetSubstructPtr(POKENAV_SUBSTRUCT_REGION_MAP); | ||
|
|
||
| if (regionMap->mapSecType == MAPSECTYPE_CITY_CANFLY && OW_FLAG_POKE_RIDER) |
There was a problem hiding this comment.
Suggested change
| if (regionMap->mapSecType == MAPSECTYPE_CITY_CANFLY && OW_FLAG_POKE_RIDER) | |
| if (regionMap->mapSecType == MAPSECTYPE_CITY_CANFLY && OW_FLAG_POKE_RIDER && Overworld_MapTypeAllowsTeleportAndFly(gMapHeader.mapType)) |
Handling for prevention of flying indoors etc.
src/pokenav_region_map.c
Outdated
| @@ -215,6 +222,9 @@ static u32 HandleRegionMapInput(struct Pokenav_RegionMapMenu *state) | |||
| case MAP_INPUT_B_BUTTON: | |||
| state->callback = GetExitRegionMapMenuId; | |||
| return POKENAV_MAP_FUNC_EXIT; | |||
| case MAP_INPUT_R_BUTTON: | |||
| if (regionMap->mapSecType == MAPSECTYPE_CITY_CANFLY && OW_FLAG_POKE_RIDER) | |||
There was a problem hiding this comment.
Suggested change
| if (regionMap->mapSecType == MAPSECTYPE_CITY_CANFLY && OW_FLAG_POKE_RIDER) | |
| if (regionMap->mapSecType == MAPSECTYPE_CITY_CANFLY && OW_FLAG_POKE_RIDER && Overworld_MapTypeAllowsTeleportAndFly(gMapHeader.mapType) == TRUE) |
|
addressed @hedara90's comments, looking into the town map item functionality now! |
…kenav_region_map.c
|
added the prompt for flying from the town map. it replaces |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Lets the player press 'R' over locations they have visited to fly to them from the PokeNav Region Map.
Description
CB_ExitFlyMap()to allow setting the fly destination correctly from other filesOW_FLAG_POKE_RIDERto allow this feature to be disabledgSkipShowMonAnimas an EWRAM variable to control whether the ShowMon animation plays or notpokenav_region_map.cto handle flyingUpdateRegionMapHelpBarText()so the HelpBarText can be easily synced with cursor movement and loading the map from the menuProcessRegionMapInput_*functions#includesand changed some static functions to non-static so they could be declared in the header filesremade the branch and manually copy-pasted the correct changes. cleaned, compiled, tested.
Feature(s) this PR does NOT handle:
Adding other interactions in the overworld to handle other HM moves, this is specifically for
FlyDiscord contact info
@khbsd