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

Add caught mon to full party by sending a different mon to the Box #6058

Open
wants to merge 20 commits into
base: upcoming
Choose a base branch
from

Conversation

fakuzatsu
Copy link

@fakuzatsu fakuzatsu commented Jan 20, 2025

addtoparty

Allows you to switch a caught Pokemon into your party even when it is full. Similar to how modern games work.

(Doesn't come with all the other stuff shown in the gif, that's just on my personal romhack)

@AlexOn1ine AlexOn1ine added the new-feature Adds a feature label Jan 20, 2025
@fakuzatsu
Copy link
Author

I've clearly fucked something up in regards to the compound string stuff. That's all newer than the version I'd originally developed the feature on. Will sort out soon.

@fakuzatsu
Copy link
Author

fixed, ready for review

@AlexOn1ine
Copy link
Collaborator

AlexOn1ine commented Jan 20, 2025

not a review but could you use enums for the cases for documentation?

@Bassoonian
Copy link
Collaborator

There doesn't appear to be a config here, which is pretty vital for something like this. The current (original Emerald) behaviour should be easily toggleable.

@AlexOn1ine
Copy link
Collaborator

To remember to close it once this is merged, closes #3912

src/battle_script_commands.c Outdated Show resolved Hide resolved
src/battle_script_commands.c Outdated Show resolved Hide resolved
src/battle_script_commands.c Outdated Show resolved Hide resolved
@fakuzatsu fakuzatsu requested a review from AlexOn1ine January 25, 2025 18:31
include/config/battle.h Outdated Show resolved Hide resolved
@fakuzatsu fakuzatsu requested a review from AlexOn1ine January 26, 2025 17:30
@AlexOn1ine
Copy link
Collaborator

@fakuzatsu Sorry, but one more request. Could you add a config that prevents for choosing mons that know an HM? 😅

@fakuzatsu
Copy link
Author

I'll give it a stab, I imagine it'll be easy to prevent picking a mon with a HM, but not so much to display an error due to trying.

@AlexOn1ine
Copy link
Collaborator

I'll give it a stab, I imagine it'll be easy to prevent picking a mon with a HM, but not so much to display an error due to trying.

Thx. I think it would be fine if it is just blocked.

@fakuzatsu
Copy link
Author

Ok, sorted. I managed to get a message displayed to the effect of "Cannot send that mon because it knows a HM", and it's behind a config that's set to TRUE by default.

One thing to note is that I've replicated some static data from the pokemon.c file so that I could customise the function rather than adding a new arg or anything like that. I think really the most optimal solution to this would have been to create a global DoesMonKnowAHM function, but I won't be handling that in this PR.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
new-feature Adds a feature
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants