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.

Sign up for GitHub

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

Add OW_HIDE_REPEAT_MAP_POPUP config #4370

Merged
merged 3 commits into from
Apr 10, 2024
Merged

Add OW_HIDE_REPEAT_MAP_POPUP config #4370

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2f80fe9
Added first working version
pkmnsnfrn Apr 8, 2024
2818ab2
Fixed spacing and set config to false
pkmnsnfrn Apr 8, 2024
be75032
Update src/overworld.c
pkmnsnfrn Apr 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions include/config/overworld.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#define OW_POISON_DAMAGE GEN_LATEST // In Gen4, Pokémon no longer faint from Poison in the overworld. In Gen5+, they no longer take damage at all.
#define OW_TIMES_OF_DAY GEN_LATEST // Different generations have the times of day change at different times.
#define OW_DOUBLE_APPROACH_WITH_ONE_MON FALSE // If enabled, you can be spotted by two trainers at the same time even if you only have one eligible Pokémon in your party.
#define OW_HIDE_REPEAT_MAP_POPUP FALSE // If enabled, map popups will not appear if entering a map with the same Map Section Id as the last.

// PC settings
#define OW_PC_PRESS_B GEN_LATEST // In Gen4, pressing B when holding a Pokémon is equivalent to placing it. In Gen3, it gives the "You're holding a Pokémon!" error.
Expand Down
14 changes: 11 additions & 3 deletions src/overworld.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -851,9 +851,17 @@ if (I_VS_SEEKER_CHARGING != 0)
ResetFieldTasksArgs();
RunOnResumeMapScript();

if (gMapHeader.regionMapSectionId != MAPSEC_BATTLE_FRONTIER
|| gMapHeader.regionMapSectionId != sLastMapSectionId)
ShowMapNamePopup();
if (OW_HIDE_REPEAT_MAP_POPUP)
{
if (gMapHeader.regionMapSectionId != sLastMapSectionId)
ShowMapNamePopup();
}
else
{
if (gMapHeader.regionMapSectionId != MAPSEC_BATTLE_FRONTIER
|| gMapHeader.regionMapSectionId != sLastMapSectionId)
ShowMapNamePopup();
}
}

static void LoadMapFromWarp(bool32 a1)
Expand Down
Loading