Adds Commander and Order Up #5246

AlexOn1ine · 2024-08-23T22:34:31Z

Closes #2764
Closes #2490

I'll do clean up once the review is done.
Also this will need proper in-game testing

hedara90 · 2024-08-24T16:14:54Z

Problems with the implementation.

AI will attack the Tatsugiri despite not being "on the field"
If Tatsugiri would act after a Pokemon that knocks out Dondozo, it will attack the opponent in front of them (or diagonal if none is in front) with the move in the first slot.
If Tatsugiri is in the right slot, it will take damage from AoE moves after exiting Dondozo if Dondozo faints to the move.

slowTatsu.mp4

hedara90 · 2024-08-24T22:03:00Z

Things that needs testing for how they should work:

Does Ditto Transformed into Tatsugiri trigger Commander?
Currently it does.
If Dondozo is in the semi-invulnerable turn of Dive when Tatsugiri switches in, what happens?
Currently Commander triggers normally.
If Tatsugiri is in the semi-invulnerable turn of Dive when Dondozo switches in, what happens? (Not actually possible in SV)
Currently Commander triggers normally.
What happens if Tatsugiri has a Substitute up before being swallowed?
Currently Substitute reappears when exiting Dondozo.

AlexOn1ine · 2024-08-25T11:17:36Z

* Does Ditto Transformed into Tatsugiri trigger Commander?
  Currently it does.

it has to be a non transformed user

* If Dondozo is in the semi-invulnerable turn of Dive when Tatsugiri switches in, what happens?
  Currently Commander triggers normally.

yes, commander is still triggered

* If Tatsugiri is in the semi-invulnerable turn of Dive when Dondozo switches in, what happens? (Not actually possible in SV)
  Currently Commander triggers normally.

didn't test but I assume it is the same as above

* What happens if Tatsugiri has a Substitute up before being swallowed?
  Currently Substitute reappears when exiting Dondozo.

tatsugiri keeps the sub

All according to showdown but I assume that this is correct since it is a very viable VGC mechanic.

hedara90 · 2024-08-25T11:50:06Z

* What happens if Tatsugiri has a Substitute up before being swallowed?
  Currently Substitute reappears when exiting Dondozo.
tatsugiri keeps the sub

All according to showdown but I assume that this is correct since it is a very viable VGC mechanic.

I don't know if this is how it's supposed to be. I haven't found any example of this, and Substitute is not represented in the move% for Tatsugiri usage at any point in time.
The other things are correct.

AlexOn1ine · 2024-08-30T13:55:39Z

this has a bug I can't solve. putting on draft for now

hedara90 · 2024-08-31T07:46:27Z

this has a bug I can't solve. putting on draft for now

What's the bug?

AlexOn1ine · 2024-08-31T07:47:54Z

this has a bug I can't solve. putting on draft for now

What's the bug?

when tatsugiri switches in while an opposing mon attacks with a spread move the attacker and target are switched so it becomes and attack from dozo.

hedara90 · 2024-08-31T07:48:58Z

Ah, yea, that bug...

hedara90 · 2024-09-01T16:16:59Z

Could the actions for the turn be redone/reassigned (whatever the term if) after Dozo switches in?

PhallenTree

when tatsugiri switches in while an opposing mon attacks with a spread move the attacker and target are switched so it becomes and attack from dozo.

Here are tests for this bug:

DOUBLE_BATTLE_TEST("(Commander) Attacker is kept (Dondozo Left Slot)")
{
    GIVEN {
        ASSUME(gMovesInfo[MOVE_SURF].target == MOVE_TARGET_FOES_AND_ALLY);
        PLAYER(SPECIES_WOBBUFFET);
        PLAYER(SPECIES_TATSUGIRI) { Ability(ABILITY_COMMANDER); }
        PLAYER(SPECIES_DONDOZO);
        OPPONENT(SPECIES_WOBBUFFET);
        OPPONENT(SPECIES_WOBBUFFET);
    } WHEN {
        TURN { MOVE(opponentRight, MOVE_TACKLE, target: opponentLeft); }
        TURN { SWITCH(playerLeft, 2); MOVE(opponentLeft, MOVE_SURF); }
    } SCENE {
        ANIMATION(ANIM_TYPE_MOVE, MOVE_TACKLE, opponentRight);
        ABILITY_POPUP(playerRight, ABILITY_COMMANDER);
        MESSAGE("Tatsugiri was swallowed by Dondozo and became Dondozo's commander!");
        ANIMATION(ANIM_TYPE_MOVE, MOVE_SURF, opponentLeft);
        HP_BAR(playerLeft);
        MESSAGE("Foe Wobbuffet's attack missed!");
        HP_BAR(opponentRight);
    }
}

DOUBLE_BATTLE_TEST("(Commander) Attacker is kept (Dondozo Right Slot)")
{
    GIVEN {
        ASSUME(gMovesInfo[MOVE_SURF].target == MOVE_TARGET_FOES_AND_ALLY);
        PLAYER(SPECIES_TATSUGIRI) { Ability(ABILITY_COMMANDER); }
        PLAYER(SPECIES_WOBBUFFET);
        PLAYER(SPECIES_DONDOZO);
        OPPONENT(SPECIES_WOBBUFFET);
        OPPONENT(SPECIES_WOBBUFFET);
    } WHEN {
        TURN { MOVE(opponentRight, MOVE_TACKLE, target: opponentLeft); }
        TURN { SWITCH(playerRight, 2); MOVE(opponentLeft, MOVE_SURF); }
    } SCENE {
        ANIMATION(ANIM_TYPE_MOVE, MOVE_TACKLE, opponentRight);
        ABILITY_POPUP(playerLeft, ABILITY_COMMANDER);
        MESSAGE("Tatsugiri was swallowed by Dondozo and became Dondozo's commander!");
        MESSAGE("Foe Wobbuffet's attack missed!");
        ANIMATION(ANIM_TYPE_MOVE, MOVE_SURF, opponentLeft);
        HP_BAR(playerRight);
        HP_BAR(opponentRight);
    }
}

Test 1 fails because "Dondozo's attack missed!" instead of "Foe Wobbuffet's attack missed!".
Test 2 fails because the animation for Surf is played on the player's side of the field.

Confirmed after the following changes both pass and none of the other tests fail (that didn't fail before).

Note that the Tatsugiri (the mon with Commander) is also gBattleScripting.battler therefore there is no need for both gBattlerAttacker and gBattlerTarget to be used. Since the swap of target and attacker is gone, the bug should be fixed.

src/battle_util.c

data/battle_scripts_1.s

AlexOn1ine · 2024-09-02T11:59:46Z

Note that the Tatsugiri (the mon with Commander) is also gBattleScripting.battler therefore there is no need for both gBattlerAttacker and gBattlerTarget to be used. Since the swap of target and attacker is gone, the bug should be fixed.

Right, I'm stupid. Thanks for the help! I'll update the branch later.

AlexOn1ine · 2024-09-08T12:51:54Z

Ready for review again.

hedara90

Adding this here as to not forget it

src/data/trainers.party

src/data/trainers.h

asm/macros/battle_script.inc

data/battle_scripts_1.s

src/battle_script_commands.c

test/battle/ability/commander.c

src/battle_main.c

AlexOn1ine · 2024-09-22T11:44:11Z

I can't check how it's supposed to be in S/V, ...
..., Tatsugiri does not use the chosen move. Reading Bulbapedia it's supposed to cancel the move.

Test for this

DOUBLE_BATTLE_TEST("(Commander) Tatsugiri does not attack if Dondozo faints the same turn it's switched in")
{
    GIVEN {
        PLAYER(SPECIES_WOBBUFFET);
        PLAYER(SPECIES_TATSUGIRI) { Ability(ABILITY_COMMANDER); }
        PLAYER(SPECIES_DONDOZO) { HP(1); }
        OPPONENT(SPECIES_WOBBUFFET);
        OPPONENT(SPECIES_WOBBUFFET);
    } WHEN {
        TURN { SWITCH(playerLeft, 2); MOVE(opponentLeft, MOVE_TACKLE, target: playerLeft); MOVE(opponentRight, MOVE_CELEBRATE, target: playerRight); MOVE(playerRight, MOVE_CELEBRATE); SEND_OUT(playerLeft, 0); }
    } SCENE {
        MESSAGE("Dondozo fainted!");
        NOT MESSAGE("Tatsugiri used Celebrate!");
    }
}

fixed

Ready for re-review!

test/battle/move_effect_secondary/order_up.c

test/battle/hold_effect/eject_pack.c

hedara90 · 2024-09-23T09:42:45Z

Maybe also add some Dragon Darts + Commander tests.

Dragon Darts is broken currently.

dartsCommands.mp4

hedara90 · 2024-09-27T17:46:02Z

Maybe also add some Dragon Darts + Commander tests.

DOUBLE_BATTLE_TEST("(Commander) Tatsugiri does not get hit by Dragon Darts when commanding Dondozo")
{
    GIVEN {
        ASSUME(gMovesInfo[MOVE_DRAGON_DARTS].effect == EFFECT_DRAGON_DARTS);
        PLAYER(SPECIES_TATSUGIRI) { Ability(ABILITY_COMMANDER); }
        PLAYER(SPECIES_DONDOZO);
        OPPONENT(SPECIES_WOBBUFFET);
        OPPONENT(SPECIES_WYNAUT);
    } WHEN {
        TURN { MOVE(opponentRight, MOVE_DRAGON_DARTS, target: playerRight); }
    } SCENE {
        MESSAGE("Tatsugiri was swallowed by Dondozo and became Dondozo's commander!");
        ANIMATION(ANIM_TYPE_MOVE, MOVE_DRAGON_DARTS, opponentRight);
        NOT HP_BAR(playerLeft);
    }
}

AlexOn1ine · 2024-09-27T19:44:52Z

Added Dragon Darts test made by hedara. One of them doesn't pass because because of incomplete turn but works fine in game. I'm not sure what is up there.

AlexOn1ine · 2024-09-27T20:07:34Z

hedara fixed the test!

Ready for review

AsparagusEduardo

.

include/battle_script_commands.h

src/battle_main.c

src/battle_script_commands.c

test/battle/ability/commander.c

src/battle_script_commands.c

test/battle/hold_effect/eject_pack.c

AlexOn1ine · 2024-09-28T18:14:18Z

Ready for re-review

AsparagusEduardo

lgtm. just needs hedara's ok.

AlexOn1ine · 2024-09-29T05:51:11Z

lgtm. just needs hedara's ok.

please wait for Phallen to give the okay as well

PhallenTree · 2024-09-29T07:38:21Z

Looks good to me!

hedara90 · 2024-09-29T09:23:21Z

Hopefully the last edge case.
Order Up should always be boosted by Sheer Force, but the Stat increase when Commander is active should also always apply when Sheer Force is boosting Order up.
I'm writing tests for this and will PR them to you.

hedara90

Looks good now, all tests passed locally.

AlexOn1ine added 2 commits August 24, 2024 00:13

Adds Commander

f8354b0

merge rhh/upcoming

bf638ae

AlexOn1ine added the category: ability Pertains to abilities label Aug 23, 2024

AlexOn1ine added 3 commits August 24, 2024 22:37

review points

e6ec4b4

new line

28afd90

correction

02c0482

AlexOn1ine added 2 commits August 25, 2024 10:55

regression / double targeting still broken

d6736d0

fix wrong target order

d292492

transform fixes

6c97796

AlexOn1ine closed this Aug 25, 2024

AlexOn1ine reopened this Aug 25, 2024

haze test

1fee63a

AlexOn1ine marked this pull request as draft August 30, 2024 13:55

PhallenTree reviewed Sep 2, 2024

View reviewed changes

src/battle_util.c Outdated Show resolved Hide resolved

data/battle_scripts_1.s Outdated Show resolved Hide resolved

data/battle_scripts_1.s Outdated Show resolved Hide resolved

AlexOn1ine added 2 commits September 8, 2024 14:30

fixes, tests

afe306d

rhh merge/upcoming

a02e4c1

AlexOn1ine marked this pull request as ready for review September 8, 2024 12:51

hedara90 requested changes Sep 8, 2024

View reviewed changes

src/data/trainers.party Outdated Show resolved Hide resolved

src/data/trainers.h Outdated Show resolved Hide resolved

PhallenTree reviewed Sep 16, 2024

View reviewed changes

hedara90 reviewed Sep 23, 2024

View reviewed changes

test/battle/move_effect_secondary/order_up.c Show resolved Hide resolved

PhallenTree reviewed Sep 23, 2024

View reviewed changes

test/battle/hold_effect/eject_pack.c Outdated Show resolved Hide resolved

Dragon Darts tests

4acfdde

fix test

b3ec57c

AsparagusEduardo requested changes Sep 28, 2024

View reviewed changes

PhallenTree suggested changes Sep 28, 2024

View reviewed changes

test/battle/ability/commander.c Show resolved Hide resolved

test/battle/ability/commander.c Show resolved Hide resolved

src/battle_script_commands.c Show resolved Hide resolved

test/battle/hold_effect/eject_pack.c Outdated Show resolved Hide resolved

AlexOn1ine added 2 commits September 28, 2024 19:47

review comments

e9842ab

Merge remote-tracking branch 'rhh/upcoming' into commander

053ef19

assumtion in wrong file

5be10ed

AlexOn1ine force-pushed the commander branch from c47ad00 to 5be10ed Compare September 28, 2024 18:29

AsparagusEduardo previously approved these changes Sep 28, 2024

View reviewed changes

Order Up test fixes

30eecf2

AlexOn1ine dismissed AsparagusEduardo’s stale review via 30eecf2 September 29, 2024 20:03

AlexOn1ine force-pushed the commander branch from 5da0a87 to 30eecf2 Compare September 29, 2024 20:03

Merge branch 'upcoming' into commander

1a53422

hedara90 approved these changes Sep 29, 2024

View reviewed changes

AlexOn1ine merged commit 42c43a3 into rh-hideout:upcoming Sep 29, 2024
1 check passed

This was referenced Sep 29, 2024

MOVE_ORDER_UP Effect #2490

Closed

ABILITY_COMMANDER #2764

Closed

Eject Button followed by an item activation triggers mon to attack before turn ends. #4912

Closed

PhallenTree mentioned this pull request Oct 10, 2024

Updated ability popups for Skill Swap, Mummy/Lingering Aroma, Worry Seed, Simple Beam, fix Doodle/Role Play bugs #5493

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Adds Commander and Order Up #5246

Adds Commander and Order Up #5246

AlexOn1ine commented Aug 23, 2024

hedara90 commented Aug 24, 2024 •

edited

Loading

hedara90 commented Aug 24, 2024

AlexOn1ine commented Aug 25, 2024

hedara90 commented Aug 25, 2024

AlexOn1ine commented Aug 30, 2024

hedara90 commented Aug 31, 2024

AlexOn1ine commented Aug 31, 2024

hedara90 commented Aug 31, 2024

hedara90 commented Sep 1, 2024

PhallenTree left a comment •

edited

Loading

AlexOn1ine commented Sep 2, 2024

AlexOn1ine commented Sep 8, 2024

hedara90 left a comment

AlexOn1ine commented Sep 22, 2024

hedara90 commented Sep 23, 2024

hedara90 commented Sep 27, 2024

AlexOn1ine commented Sep 27, 2024

AlexOn1ine commented Sep 27, 2024

AsparagusEduardo left a comment •

edited

Loading

AlexOn1ine commented Sep 28, 2024

AsparagusEduardo left a comment

AlexOn1ine commented Sep 29, 2024

PhallenTree commented Sep 29, 2024

hedara90 commented Sep 29, 2024

hedara90 left a comment

Adds Commander and Order Up #5246

Adds Commander and Order Up #5246

Conversation

AlexOn1ine commented Aug 23, 2024

hedara90 commented Aug 24, 2024 • edited Loading

hedara90 commented Aug 24, 2024

AlexOn1ine commented Aug 25, 2024

hedara90 commented Aug 25, 2024

AlexOn1ine commented Aug 30, 2024

hedara90 commented Aug 31, 2024

AlexOn1ine commented Aug 31, 2024

hedara90 commented Aug 31, 2024

hedara90 commented Sep 1, 2024

PhallenTree left a comment • edited Loading

Choose a reason for hiding this comment

AlexOn1ine commented Sep 2, 2024

AlexOn1ine commented Sep 8, 2024

hedara90 left a comment

Choose a reason for hiding this comment

AlexOn1ine commented Sep 22, 2024

hedara90 commented Sep 23, 2024

hedara90 commented Sep 27, 2024

AlexOn1ine commented Sep 27, 2024

AlexOn1ine commented Sep 27, 2024

AsparagusEduardo left a comment • edited Loading

Choose a reason for hiding this comment

AlexOn1ine commented Sep 28, 2024

AsparagusEduardo left a comment

Choose a reason for hiding this comment

AlexOn1ine commented Sep 29, 2024

PhallenTree commented Sep 29, 2024

hedara90 commented Sep 29, 2024

hedara90 left a comment

Choose a reason for hiding this comment

hedara90 commented Aug 24, 2024 •

edited

Loading

PhallenTree left a comment •

edited

Loading

AsparagusEduardo left a comment •

edited

Loading