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 Emerald: Use self.player_name #3384

Merged
merged 3 commits into from
Jun 1, 2024

Conversation

Zunawe
Copy link
Collaborator

@Zunawe Zunawe commented May 23, 2024

What is this fixing or adding?

Replaces use of MultiWorld.player_name with World.player_name

How was this tested?

Generated a couple times, set some options to show a warning and saw it use the correct name in the warning message.

@Zunawe Zunawe added the is: refactor/cleanup Improvements to code/output readability or organizization. label May 23, 2024
@github-actions github-actions bot added the waiting-on: peer-review Issue/PR has not been reviewed by enough people yet. label May 23, 2024
@Exempt-Medic
Copy link
Member

Exempt-Medic commented May 23, 2024

There's one more on line 191 of __init.py__
Also maybe some in rom.py

@Zunawe
Copy link
Collaborator Author

Zunawe commented May 23, 2024

Fixed. Also changed getting other player names to use MultiWorld.get_player_name. Tested the hashes of the patched ROMs, which would have patched player names in. Looked fine.

Copy link
Member

@Exempt-Medic Exempt-Medic left a comment

Choose a reason for hiding this comment

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

Changes LGTM, merged into main and had yamls hit the various code paths, it generated and displayed the proper names.

Copy link
Collaborator

@ScipioWright ScipioWright left a comment

Choose a reason for hiding this comment

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

Code looks fine, simple change. Did not do test gens.

@ScipioWright ScipioWright added waiting-on: core-review Issue/PR has been peer-reviewed and is ready to be merged or needs input from a core maintainer. and removed waiting-on: peer-review Issue/PR has not been reviewed by enough people yet. labels May 29, 2024
@ThePhar ThePhar merged commit 67cd32b into ArchipelagoMW:main Jun 1, 2024
16 checks passed
@Zunawe Zunawe deleted the emerald-player-name branch June 1, 2024 22:04
wu4 pushed a commit to wu4/Archipelago that referenced this pull request Jun 6, 2024
jnschurig pushed a commit to Tranquilite0/Archipelago-SoulBlazer that referenced this pull request Jun 13, 2024
sflavelle pushed a commit to sflavelle/Archipelago-tgc that referenced this pull request Jun 20, 2024
qwint pushed a commit to qwint/Archipelago that referenced this pull request Jun 24, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
is: refactor/cleanup Improvements to code/output readability or organizization. waiting-on: core-review Issue/PR has been peer-reviewed and is ready to be merged or needs input from a core maintainer.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants