Reload weather icon sprite on MoveDescription close

Rangi42 / polishedcrystal

An upgrade to Pokémon Crystal. Brings features and content up to date, and adds some original content.

https://hax.iimarckus.org/topic/6874/

1.03k stars 197 forks source link

Reload weather icon sprite on MoveDescription close #977

Closed walshyb closed 1 month ago

walshyb commented 1 month ago

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

https://github.com/user-attachments/assets/aef3c615-5e3e-47a5-8271-2c38eb31c59e

Move Description Fixed Example

https://github.com/user-attachments/assets/65d1c59c-c3e9-4981-a609-8f5bdbc0c02a

No Moves Left Issue Fixed Example

https://github.com/user-attachments/assets/608d6dd1-cb2f-42ae-8e40-68cda09e2673

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

vulcandth commented 1 month ago

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 commented 1 month ago

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 commented 1 month ago

@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:

https://github.com/user-attachments/assets/608d6dd1-cb2f-42ae-8e40-68cda09e2673