Allowed rematches to occur if I_VS_SEEKER_CHARGING isn't enabled

rh-hideout / pokeemerald-expansion

Feature branches for the pokeemerald decompilation. See the wiki for more info.

305 stars 815 forks source link

Allowed rematches to occur if I_VS_SEEKER_CHARGING isn't enabled #4866

Closed fdeblasio closed 3 days ago

fdeblasio commented 1 week ago

Description

The way the code is currently written, the step counter for rematches will never increment if I_VS_SEEKER_CHARGING is disabled

Discord contact info

Frankfurter

pkmnsnfrn commented 1 week ago

In plain English, does this mean that:

On master right now, if the Match Call is enabled and the player does not have the Vs. Seeker, they will never get rematches because the counter does not increment?

fdeblasio commented 1 week ago

In plain English, does this mean that:

On master right now, if the Match Call is enabled and the player does not have the Vs. Seeker, they will never get rematches because the counter does not increment?

Correct

pkmnsnfrn commented 1 week ago

In plain English, does this mean that: On master right now, if the Match Call is enabled and the player does not have the Vs. Seeker, they will never get rematches because the counter does not increment?

Correct

I swear I tested this but maybe I made a change later on and fucked it up...

pkmnsnfrn commented 1 week ago

I have tested the following scenarios:

When the player has more than four badges, and
- I_VS_SEEKER_CHARGING is not set, IncrementRematchStepCounter runs and UpdateVsSeekerStepCounter does not.
- I_VS_SEEKER_CHARGING is not set, and the player has ITEM_VS_SEEKER, IncrementRematchStepCounter runs and UpdateVsSeekerStepCounter does not.
- I_VS_SEEKER_CHARGING is set, and the player has ITEM_VS_SEEKER, IncrementRematchStepCounter does not run and UpdateVsSeekerStepCounter runs.
When the player has less than five badges, neither function runs.

I believe this can be merged. It is a bug fix, so I think it should target master...?

AlexOn1ine commented 1 week ago

@fdeblasio could you please retarget this to master? It is an improtant bugfix that I think 1.8.5 should get.

fdeblasio commented 1 week ago

@fdeblasio could you please retarget this to master? It is an improtant bugfix that I think 1.8.5 should get.

Done! I think it needs re-approval though

AlexOn1ine commented 1 week ago

@fdeblasio could you please retarget this to master? It is an improtant bugfix that I think 1.8.5 should get.

Done! I think it needs re-approval though

thx

AlexOn1ine commented 4 days ago

@fdeblasio weird ask but could you squash the pr and force push so CI runs again?

fdeblasio commented 3 days ago

@fdeblasio weird ask but could you squash the pr and force push so CI runs again?

Done!

AlexOn1ine commented 3 days ago

@fdeblasio weird ask but could you squash the pr and force push so CI runs again?

Done!

Thx