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

Modify "FillPartnerParty" to work with "Everything Customized" #2889

Merged

Conversation

AlexOn1ine
Copy link
Collaborator

@AlexOn1ine AlexOn1ine commented Apr 6, 2023

Description

Fixing my mistake when I added the case F_TRAINER_PARTY_EVERYTHING_CUSTOMIZED in FillPartnerParty.
The Prolbem was that the partner pokemon where created in the first 3 slots instead of the last 3 which removed the players team.

The changes were tested with this script:

MultiBattle_EventScript_ChoosePartyForMultiBattle::
	special SavePlayerParty
	fadescreen FADE_TO_BLACK
	special ChooseHalfPartyForBattle
	waitstate
	goto_if_ne VAR_RESULT, 0, MultiBattle_EventScript_2VS2
	special LoadPlayerParty
	goto MultiBattle_EventScript_Won_Lost

MultiBattle_EventScript_2VS2::
	multi_2_vs_2 TRAINER_ROBERT_1, MultiBattle_Generic_Text, TRAINER_COLIN, MultiBattle_Generic_Text, TRAINER_BRENDAN_ROUTE_103_TORCHIC, TRAINER_BACK_PIC_BRENDAN
	specialvar VAR_RESULT, GetBattleOutcome
	goto_if_eq MultiBattle_EventScript_Won_Lost
	goto MultiBattle_EventScript_Won_Lost

MultiBattle_EventScript_Won_Lost::
	msgbox MultiBattle_Generic_Text, MSGBOX_AUTOCLOSE
	end

MultiBattle_Generic_Text:
	.string "Generic Text$"

TrainerMon:

static const struct TrainerMonCustomized sParty_BrendanRoute103Torchic[] = {
    {
    .species = SPECIES_MUDKIP,
    .lvl = 5,
    .isShiny = TRUE,
    .gender = TRAINER_MON_FEMALE,
    .ball = ITEM_MASTER_BALL,
    .ability = ABILITY_TORRENT,
    .friendship = 42,
    .heldItem = ITEM_MYSTIC_WATER,
    .iv = TRAINER_PARTY_IVS(25,26,27,28,29,30),
    .ev = TRAINER_PARTY_EVS(252, 0, 0, 252, 4, 0),
    .nature = TRAINER_PARTY_NATURE(NATURE_ADAMANT),
    .moves = {MOVE_EARTHQUAKE, MOVE_WATERFALL, MOVE_ROCK_SLIDE, MOVE_TACKLE},
    .nickname = COMPOUND_STRING("Bubbles"),
    },
    {
    .species = SPECIES_MUDKIP,
    .ability = ABILITY_DAMP,
    .moves = {MOVE_EARTHQUAKE},
    .lvl = 15,
    }
};

Clip that shows a tag battle with the changes:
https://user-images.githubusercontent.com/93446519/230474584-22facc51-5744-4a00-9d71-b670de28606d.mp4

Discord contact info

AlexOnline#2331

test multi battle

final

remove empty line
@AsparagusEduardo AsparagusEduardo merged commit 1094861 into rh-hideout:upcoming Apr 8, 2023
@AlexOn1ine AlexOn1ine deleted the multi_battle_customized branch April 20, 2023 12:18
@AsparagusEduardo AsparagusEduardo mentioned this pull request May 31, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants