Expanded Pokémon Follower transformation functionality #5048

AsparagusEduardo · 2024-07-28T02:54:38Z

Description

Added FORM_CHANGE_OVERWORLD_WEATHER, which fully changes party Pokémon forms based on the overworld weather.
- Followers now use this form change data instead of hardcoding Castform (and can be disabled via new OW_FOLLOWERS_WEATHER_FORMS config.
Previously-exclusive transformations for Ditto/Mew into Wild Pokémon is now based on moves and/or ability (and can be disabled via new OW_FOLLOWERS_COPY_WILD_PKMN config. Either:
- They have Transform in their moveset.
- They have Illusion or Imposter in as their ability.
Cleaned up some potential UBs when handling form change tables.

Images

Feature(s) this PR does NOT handle:

Couldn't find Sunshine Cherrim overworld sprites, so I didn't add them here.

Discord contact info

AsparagusEduardo

…ollower transform

…hics

AlexOn1ine · 2024-07-28T08:08:36Z

Mentioned by Aero on discord but putting it here so it isn't lost.

Vanilla: Switch -> Stealth Rocks (normal effectiveness) -> Form change (Normal -> Fire type)
Your modification: Switch -> Stealth Rocks (super effective)

This will produce a non vanilla interaction. Possible solutions are either only transforming the first pokemon or I think a better solution would be to revert all affected mon form changes before the battle begins.

src/field_weather.c

Bassoonian · 2024-07-28T11:04:50Z

src/event_object_movement.c

+        && (MonKnowsMove(mon = GetFirstLiveMon(), MOVE_TRANSFORM)
+         || (ability = GetMonAbility(mon)) == ABILITY_IMPOSTER || ability == ABILITY_ILLUSION)


I don't think this sort of syntax exists outside of merrp's code, so I don't think we should use it even more

Pretty sure we have lots of those that look a bit scuffed.

~~This could look more readable with an early return since there is nothing but returns following this statement so something like:~~

Bassoonian · 2024-07-28T11:43:17Z

include/config/overworld.h

-#define OW_FOLLOWERS_POKEBALLS         TRUE       // Followers will emerge from the pokeball they are stored in, instead of a normal pokeball
+#define OW_FOLLOWERS_BOBBING           TRUE       // If TRUE, follower Pokémon will bob up and down during their idle & walking animations
+#define OW_FOLLOWERS_POKEBALLS         TRUE       // If TRUE, follower Pokémon will emerge from the Poké Ball they are stored in, instead of a normal Poké Ball
+#define OW_FOLLOWERS_WEATHER_FORMS     FALSE      // If TRUE, follower Pokémon that transform in battle via weather will also transform in the overworld.


Forms still change in the party, even with this config disabled

I think we may need a config to differentiate between them only changing appearance in the overworld (which is purely cosmetic, like OW_FOLLOWERS_COPY_WILD_PKMN) and one that actually changes the form (since this causes non-vanilla interactions when it enters a battle with starting entry hazards)

Doesn't even have to be starting hazards. Actually the first mon won't be affected by it but the transformed mons in the bag will which would be solved by:

This should only affect the Pokémon in the first slot of the party (the one currently following, rather). It's the fact they're out of the ball that makes them change forms. As a result, I think all other species should probably revert back to "normal" conditions if they're not currently outside of the ball.

AsparagusEduardo · 2024-08-07T21:36:18Z

Forgot to push changes on this, sorry.

AsparagusEduardo · 2024-08-07T21:39:21Z

This should only affect the Pokémon in the first slot of the party (the one currently following, rather). It's the fact they're out of the ball that makes them change forms. As a result, I think all other species should probably revert back to "normal" conditions if they're not currently outside of the ball.

Makes sense to me. Will update.

I believe forms also don't currently revert when they're deposited in the PC, which is also non-vanilla behaviour (and could deserve a config, again, but it is non-vanilla)

I can add the "Deposit" form change as well to fix this.

AlexOn1ine · 2024-12-01T20:49:21Z

Could you finish this please so we can finally merge it? Blocking for me would be mons not reverting back before a battle begins because this actually affects gameplay

AsparagusEduardo · 2024-12-16T18:31:52Z

Could you finish this please so we can finally merge it? Blocking for me would be mons not reverting back before a battle begins because this actually affects gameplay

(my last post somehow wasn't here 🤔)
I checked this a bit ago and it seemed that everything in the party was reverting back to normal before the battle.

AlexOn1ine · 2024-12-16T18:46:28Z

Could you finish this please so we can finally merge it? Blocking for me would be mons not reverting back before a battle begins because this actually affects gameplay

(my last post somehow wasn't here 🤔) I checked this a bit ago and it seemed that everything in the party was reverting back to normal before the battle.

I'll do some in-game testing

AlexOn1ine · 2025-01-05T16:51:46Z

what was left for this again?

/Edit: ah, reversion in the storage

AsparagusEduardo · 2025-01-12T15:33:06Z

what was left for this again?

/Edit: ah, reversion in the storage

Done :D
Ready for re-review :)

src/pokemon_storage_system.c

AsparagusEduardo added 5 commits July 27, 2024 16:03

Added Cherrim weather follower transform + Zorua and Zoroark random f…

cb6cf16

…ollower transform

Follower Overworld transformations can now be disabled

1c5ece1

Follower form change using form change table

acc7355

Weather form changes actually changes form and not just follower grap…

93e4a1f

…hics

OW_FOLLOWERS_COPY_WILD_PKMN now depends on follower's ability and moves

92b02ea

Bassoonian reviewed Jul 28, 2024

View reviewed changes

Converted OW_FOLLOWERS_WEATHER_FORMS into data toggle

f2d69eb

hedara90 added category: pokemon Pertains to Pokémon data and functionality category: overworld Pertains to out-of-battle mechanics new-feature Adds a feature and removed category: pokemon Pertains to Pokémon data and functionality labels Aug 17, 2024

pkmnsnfrn marked this pull request as draft August 28, 2024 02:54

AsparagusEduardo added 2 commits December 2, 2024 14:33

Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/followerFormChanges

dc8fc59

Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/followerFormChanges

eb19443

AsparagusEduardo marked this pull request as ready for review December 16, 2024 18:31

AsparagusEduardo added 8 commits January 12, 2025 09:18

Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/followerFormChanges

140c491

SetMonFormPSS has method parameter

79fdcbc

Split icon refresh from data logic

83697f2

FORM_CHANGE_DEPOSIT for PC

519acc8

FORM_CHANGE_DEPOSIT for Daycare

1bed0f5

FORM_CHANGE_WITHDRAW in PC

1412fa5

Added FORM_CHANGE_DEPOSIT to Castform and Cherrim

f4f24d1

Fix display mon gfx always updating

373ecd5

AlexOn1ine reviewed Jan 12, 2025

View reviewed changes

src/pokemon_storage_system.c Show resolved Hide resolved

AlexOn1ine approved these changes Jan 18, 2025

View reviewed changes

AlexOn1ine merged commit cd1482b into rh-hideout:upcoming Jan 18, 2025
1 check passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Expanded Pokémon Follower transformation functionality #5048

Expanded Pokémon Follower transformation functionality #5048

AsparagusEduardo commented Jul 28, 2024 •

edited

Loading

AlexOn1ine commented Jul 28, 2024

Bassoonian Jul 28, 2024

AlexOn1ine Dec 16, 2024 •

edited

Loading

Bassoonian Jul 28, 2024

Bassoonian Jul 28, 2024

AlexOn1ine Jul 28, 2024

AsparagusEduardo commented Aug 7, 2024

AsparagusEduardo commented Aug 7, 2024 •

edited

Loading

AlexOn1ine commented Dec 1, 2024

AsparagusEduardo commented Dec 16, 2024

AlexOn1ine commented Dec 16, 2024

AlexOn1ine commented Jan 5, 2025 •

edited

Loading

AsparagusEduardo commented Jan 12, 2025

		&& (MonKnowsMove(mon = GetFirstLiveMon(), MOVE_TRANSFORM)
		\|\| (ability = GetMonAbility(mon)) == ABILITY_IMPOSTER \|\| ability == ABILITY_ILLUSION)

Expanded Pokémon Follower transformation functionality #5048

Expanded Pokémon Follower transformation functionality #5048

Conversation

AsparagusEduardo commented Jul 28, 2024 • edited Loading

Description

Images

Feature(s) this PR does NOT handle:

Discord contact info

AlexOn1ine commented Jul 28, 2024

Bassoonian Jul 28, 2024

Choose a reason for hiding this comment

AlexOn1ine Dec 16, 2024 • edited Loading

Choose a reason for hiding this comment

Bassoonian Jul 28, 2024

Choose a reason for hiding this comment

Bassoonian Jul 28, 2024

Choose a reason for hiding this comment

AlexOn1ine Jul 28, 2024

Choose a reason for hiding this comment

AsparagusEduardo commented Aug 7, 2024

AsparagusEduardo commented Aug 7, 2024 • edited Loading

AlexOn1ine commented Dec 1, 2024

AsparagusEduardo commented Dec 16, 2024

AlexOn1ine commented Dec 16, 2024

AlexOn1ine commented Jan 5, 2025 • edited Loading

AsparagusEduardo commented Jan 12, 2025

AsparagusEduardo commented Jul 28, 2024 •

edited

Loading

AlexOn1ine Dec 16, 2024 •

edited

Loading

AsparagusEduardo commented Aug 7, 2024 •

edited

Loading

AlexOn1ine commented Jan 5, 2025 •

edited

Loading