Repeated level reset when a level has fluctuating water, causes water to rise

[aussieadam]

As title says, it feels like when there's fluctuating water the water will keep rising on level reset to the point where mario can start submerged. Unsure if it just picks the highest point, or picks the point where you level reset on. Act Select will set water to correct height.

I tested this with:
ROM Hack - Super Mario New Comet
Course - Green Hill Zone (C5)
Star - Star 6

[aglab2]

It seems like water changer writes directly inside the collision of the course so it does not get reloaded. Perhaps some shim for the first load needs to be done?