Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/pret/pokeemerald into pre…
Browse files Browse the repository at this point in the history
…tmerge5aug
  • Loading branch information
Bassoonian committed Aug 5, 2024
2 parents 1f93c25 + 9a3c6d0 commit 55159be
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions src/landmark.c
Original file line number Diff line number Diff line change
Expand Up @@ -369,8 +369,13 @@ static const struct LandmarkList sLandmarkLists[] =
{MAPSEC_ROUTE_120, 2, Landmarks_Route120_2},
{MAPSEC_ROUTE_121, 2, Landmarks_Route121_2},
{MAPSEC_ROUTE_122, 0, Landmarks_Route122_0},
#ifdef BUGFIX
{MAPSEC_ROUTE_122, 1, Landmarks_Route122_0},
{MAPSEC_ROUTE_123, 0, Landmarks_Route123_0},
#else
{MAPSEC_ROUTE_123, 0, Landmarks_Route123_0},
{MAPSEC_ROUTE_122, 1, Landmarks_Route122_0},
#endif
{MAPSEC_ROUTE_124, 7, Landmarks_Route124_7},
{MAPSEC_ROUTE_125, 2, Landmarks_Route125_2},
{MAPSEC_ROUTE_128, 1, Landmarks_Route128_1},
Expand Down

0 comments on commit 55159be

Please sign in to comment.