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

Rename MON_ID to MON_OT_ID #1114

Merged
merged 4 commits into from
Apr 27, 2024
Merged

Rename MON_ID to MON_OT_ID #1114

merged 4 commits into from
Apr 27, 2024

Conversation

SnorlaxMonster
Copy link
Contributor

The constant name MON_ID implies it relates to the ID number of the Pokémon itself; however, it actually refers to the Trainer ID number of the Pokémon's Original Trainer. Renaming it to MON_TRAINER_ID makes it substantially more clear what its meaning is.

The original definition of MON_ID is preserved in macros/legacy.asm

The constant name MON_ID implies it relates to the ID number of the
Pokémon itself. However, it actually refers to the Trainer ID number of
the Pokémon's Original Trainer. Renaming it to MON_TRAINER_ID makes it
substantially more clear what its purpose is.

The original definition of MON_ID is preserved in macros/legacy.asm
macros/legacy.asm Outdated Show resolved Hide resolved
SnorlaxMonster and others added 2 commits February 26, 2024 02:42
Co-authored-by: Sylvie <35663410+Rangi42@users.noreply.github.com>
@vulcandth
Copy link
Collaborator

vulcandth commented Apr 2, 2024

Calling it MON_OT_ID would probably be slightly more consistent with the rest of the codebase, but that's just a nitpick.

@Rangi42
Copy link
Member

Rangi42 commented Apr 14, 2024

I agree MON_OT_ID would be slightly better, but it's fine as-is if you want to just merge.

Copy link
Collaborator

@vulcandth vulcandth left a comment

Choose a reason for hiding this comment

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

I'll probably make the change to MON_OT_ID myself and i'll merge this at the same time as Idain's PR real soon. Thanks for the contribution!

@mid-kid
Copy link
Member

mid-kid commented Apr 25, 2024

I agree on MON_OT_ID, since we use the OT term everywhere.

@vulcandth vulcandth changed the title Rename MON_ID to MON_TRAINER_ID Rename MON_ID to MON_OT_ID Apr 27, 2024
@vulcandth vulcandth changed the title Rename MON_ID to MON_OT_ID Rename MON_ID to MON_OT_ID Apr 27, 2024
@vulcandth vulcandth merged commit b9dce73 into pret:master Apr 27, 2024
1 check passed
vulcandth added a commit to pret/pokegold that referenced this pull request Apr 27, 2024
* Rename MON_ID to MON_TRAINER_ID

The constant name MON_ID implies it relates to the ID number of the
Pokémon itself. However, it actually refers to the Trainer ID number of
the Pokémon's Original Trainer. Renaming it to MON_TRAINER_ID makes it
substantially more clear what its purpose is.

The original definition of MON_ID is preserved in macros/legacy.asm

* Remove MON_ID from macros/legacy.asm

Co-authored-by: Sylvie <35663410+Rangi42@users.noreply.github.com>

* Apply rename to missed file

* Rename to `MON_OT_ID`

---------

Co-authored-by: SnorlaxMonster <snorlaxmonster@users.noreply.github.com>
Co-authored-by: Sylvie <35663410+Rangi42@users.noreply.github.com>
Co-authored-by: vulcandth <vulcandth@gmail.com>
dreams897 added a commit to dreams897/pokemon-red-remastered that referenced this pull request May 3, 2024
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.

4 participants