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

Reload weather icon sprite on MoveDescription close #977

Merged
merged 2 commits into from
Aug 13, 2024

Conversation

walshyb
Copy link

@walshyb walshyb commented Aug 8, 2024

Issue

Per #905:

  • pulling up a move description doesn't redraw the weather icon until you go back to the main battle menu
  • if there's a weather condition and you're out of moves, the "has no moves left" message appears under the weather icon

Move Description Issue Before Example

2024-08-07.22-57-56.mov

Move Description Fixed Example

2024-08-07.23-00-56.mov

No Moves Left Issue Fixed Example

2024-08-12.02-13-33.mov

I'm not sure how testing / validation works for this. Please let me know if I'm missing anything, thank you!

@walshyb walshyb changed the title Load Weather Icon sprite if present on MoveDescription close Load weather icon sprite if present on MoveDescription close Aug 8, 2024
@walshyb walshyb changed the title Load weather icon sprite if present on MoveDescription close Reload weather icon sprite on MoveDescription close Aug 8, 2024
@vulcandth
Copy link
Collaborator

vulcandth commented Aug 8, 2024

Thanks! This looks good; probably leave this open until I can do some quick testing myself and I can possibly add the fix for if there's a weather condition and you're out of moves, the "has no moves left" message appears under the weather icon into this PR as well. I should have time to do that either tonight, or this weekend.

@walshyb
Copy link
Author

walshyb commented Aug 9, 2024

Totally, thank you so much! If I have some time I'll see if I can figure out that other issue. But it's also fine if you get to it first!

@walshyb
Copy link
Author

walshyb commented Aug 12, 2024

@vulcandth I think I got it working! Seems so at least when I tested.

Notes / questions:

  • Had to change the jr .start_over to jp .start_over because having the LoadWeatherIconSprite call in .pressed_start and the ClearSprites call in .struggle gave me: jr target must be between -128 and 127 bytes away, not -129; use jp instead
  • Haven't when an enemy pokemon uses struggle; proabably worth testing to ensure no regression
  • Do you think that's a good place to call ClearSprites?
  • Not shown in the vid, but I confirmed that the first fix still works. Also confirmed that weather icon is redrawn appropriately at start of next turn

Here's the vid:

2024-08-12.02-13-33.mov

engine/battle/core.asm Outdated Show resolved Hide resolved
engine/battle/core.asm Show resolved Hide resolved
@vulcandth vulcandth merged commit 1cf14de into Rangi42:9bit Aug 13, 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.

2 participants