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

Fix defines in MAP_NUM and MAP_GROUP #2023

Merged
merged 3 commits into from
Sep 19, 2024

Conversation

Bassoonian
Copy link
Contributor

Due to the inclusion of MAP_ in MAP_NUM and MAP_GROUP, references to maps with these macros were not searchable in-repo which leads to frustration for hackers who want to rename maps. This PR updates the macro.

IMPORTANT: I think this breaks PoryMap support (I haven't had the time to check yet), so we should be very careful and coordinate this change with a new PoryMap release.

Discord contact info

bassoonian

@GriffinRichards
Copy link
Member

I think this breaks PoryMap support

For reading/writing heal location data, yes. Otherwise Porymap doesn't care about MAP_NUM/MAP_GROUP

@GriffinRichards GriffinRichards changed the base branch from master to porymap-6 August 26, 2024 04:05
Copy link
Member

@GriffinRichards GriffinRichards left a comment

Choose a reason for hiding this comment

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

You left some files in from another branch that need to be removed (src/data/map_group_count.h and tools/trainerproc/trainerproc)

Comment on lines 73 to 74
.mapGroup = {% if wild_encounter_group.for_maps %}MAP_GROUP({{ removePrefix(encounter.map, "MAP_") }}){% else %}0{% endif %},
.mapNum = {% if wild_encounter_group.for_maps %}MAP_NUM({{ removePrefix(encounter.map, "MAP_") }}){% else %}{{ loop.index1 }}{% endif %},
.mapGroup = {% if wild_encounter_group.for_maps %}MAP_GROUP(MAP_{{ removePrefix(encounter.map, "MAP_") }}){% else %}0{% endif %},
.mapNum = {% if wild_encounter_group.for_maps %}MAP_NUM(MAP_{{ removePrefix(encounter.map, "MAP_") }}){% else %}{{ loop.index1 }}{% endif %},
Copy link
Member

Choose a reason for hiding this comment

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

Fix this to replace removePrefix

@GriffinRichards GriffinRichards merged commit e4e90ea into pret:porymap-6 Sep 19, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants