Skip to content
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

Fly from Pokenav #5679

Merged
merged 19 commits into from
Jan 4, 2025
Merged

Fly from Pokenav #5679

merged 19 commits into from
Jan 4, 2025

Conversation

khbsd
Copy link

@khbsd khbsd commented Nov 18, 2024

Lets the player press 'R' over locations they have visited to fly to them from the PokeNav Region Map.

Description

  • refactored some logic from CB_ExitFlyMap() to allow setting the fly destination correctly from other files
  • added OW_FLAG_POKE_RIDER to allow this feature to be disabled
  • added gSkipShowMonAnim as an EWRAM variable to control whether the ShowMon animation plays or not
  • added new Looped Task in pokenav_region_map.c to handle flying
  • added new function UpdateRegionMapHelpBarText() so the HelpBarText can be easily synced with cursor movement and loading the map from the menu
  • added new inputs to both ProcessRegionMapInput_* functions
  • added new zoomed in and out text strings with the R button and the text 'FLY' for when the cursor is over a flyable location in the region map
  • adjusted some #includes and changed some static functions to non-static so they could be declared in the header files
  • uhhhhh probs more but i forgor

remade 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 Fly

Discord contact info

@khbsd

@AlexOn1ine AlexOn1ine added the new-feature Adds a feature label Nov 18, 2024
@AlexOn1ine AlexOn1ine added this to the 1.11 milestone Nov 18, 2024
@AlexOn1ine AlexOn1ine self-assigned this Nov 18, 2024
@AlexOn1ine AlexOn1ine removed their assignment Dec 3, 2024
@AlexOn1ine
Copy link
Collaborator

Could you also make it work with the Town Map item?

@hedara90
Copy link
Collaborator

Currently, you can use the PokeNav to fly while indoors (and I'm assuming other areas where flying is usually not possible).

include/config/overworld.h Outdated Show resolved Hide resolved
src/pokenav_region_map.c Outdated Show resolved Hide resolved
src/pokenav_region_map.c Outdated Show resolved Hide resolved
@khbsd
Copy link
Author

khbsd commented Dec 19, 2024

addressed @hedara90's comments, looking into the town map item functionality now!

@khbsd
Copy link
Author

khbsd commented Dec 20, 2024

added the prompt for flying from the town map. it replaces HOENN in the region title at the top right; this was the most space-efficient solution i could think of that didnt mean covering up more of the map.

src/field_region_map.c Outdated Show resolved Hide resolved
src/field_region_map.c Outdated Show resolved Hide resolved
Copy link
Collaborator

@AlexOn1ine AlexOn1ine left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Few more things. I'll test ingame after that and should be ready for a merge

src/field_region_map.c Outdated Show resolved Hide resolved
src/field_region_map.c Outdated Show resolved Hide resolved
src/region_map.c Outdated Show resolved Hide resolved
src/field_region_map.c Outdated Show resolved Hide resolved
src/pokenav_region_map.c Outdated Show resolved Hide resolved
@AlexOn1ine AlexOn1ine merged commit 76964dd into rh-hideout:upcoming Jan 4, 2025
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
new-feature Adds a feature
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants