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 label typos, add some constants instead of raw numbers #492

Merged
merged 2 commits into from
Jan 30, 2025

Conversation

Narishma-gb
Copy link
Contributor

  • In the macro trainer, arguments 4 and 5 descriptions are swapped.

  • In SilphCo7FSilphWorkerM1Text, wSimulatedJoypadStatesEnd is more likely a reference to wAddedToParty, which is written to by _GivePokemon to address text delay issues when returning.

  • The 3 entries in RocketHideout4TrainerHeaders are for the Rocket trainers on that floor. The battle with Giovanni is triggered within RocketHideoutB4FGiovanniText text entry.

Copy link
Member

@Rangi42 Rangi42 left a comment

Choose a reason for hiding this comment

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

Thanks for this cleanup! <3

data/maps/objects/Route3.asm Show resolved Hide resolved
data/maps/objects/TradeCenter.asm Show resolved Hide resolved
scripts/ChampionsRoom.asm Show resolved Hide resolved
@Rangi42 Rangi42 merged commit 43f21cc into pret:master Jan 30, 2025
1 check passed
@dannye
Copy link
Member

dannye commented Jan 31, 2025

Nice finds, thanks!

@Narishma-gb Narishma-gb deleted the pokered branch January 31, 2025 07:36
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.

3 participants