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

Pokemon struct cleanup #122

Merged
merged 6 commits into from
May 20, 2023
Merged

Conversation

AsparagusEduardo
Copy link
Contributor

  • Renamed POKEMON to Pokemon.
  • Fixed placeholder MON_DATA names.
  • Standarized pointer star positions for Pokemon pointers.
  • Standarized most variable names using Pokemon.

AsparagusEduardo#6051

…oThis

# Conflicts:
#	src/battle_arcade_game_board.c
#	src/battle_command.c
#	src/overlay_94.c
#	src/scrcmd_move_relearner.c
#	src/scrcmd_party.c
#	src/scrcmd_pokemon_misc.c
#	src/use_item_on_mon.c
Copy link
Member

@red031000 red031000 left a comment

Choose a reason for hiding this comment

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

generally speaking, I prefer pokemon instead of mon for the variable names, since it's more explicit.

there is a discussion to be had about typedef struct vs explicit struct, I think atm we're leaning towards the latter

The renaming is good though, all caps struct names just seem weird

…sDoThis

# Conflicts:
#	include/field_blackthorn_tutors.h
#	include/get_egg.h
#	src/get_egg.c
#	src/hall_of_fame.c
#	src/scrcmd_move_relearner.c
@AsparagusEduardo
Copy link
Contributor Author

Solved conflicts.

Copy link
Member

@red031000 red031000 left a comment

Choose a reason for hiding this comment

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

only thing left is mon -> pokemon, then I'm happy to merge

@red031000 red031000 merged commit e097a8b into pret:master May 20, 2023
@AsparagusEduardo AsparagusEduardo deleted the pret/doc/letsDoThis branch May 21, 2023 03:40
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