atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove all trailing whitespace (upcoming) (#3473)

Browse source
This commit is contained in:
kittenchilly 2023-10-27 11:54:55 -05:00 committed by GitHub
parent db00839d64
commit 9d2be9f3a6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 26 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/ISSUE_TEMPLATE/01_battle_engine_bugs.yaml vendored
View file

@ -11,7 +11,7 @@ body:
attributes:
label: Description
description: |
Describe the issue you are experiencing.
Describe the issue you are experiencing.
Attach images/videos if possible.
placeholder: |
Please enter a description of the issue. Here you can also attach log screenshots, gifs or a video

2
.github/ISSUE_TEMPLATE/02_battle_ai_issues.yaml vendored
View file

@ -11,7 +11,7 @@ body:
attributes:
label: Description
description: |
Describe the issue you are experiencing.
Describe the issue you are experiencing.
Attach images/videos if possible.
placeholder: |
Please enter a description of the issue. Here you can also attach log screenshots, gifs or a video

2
.github/ISSUE_TEMPLATE/03_feature_requests.yaml vendored
View file

@ -11,7 +11,7 @@ body:
attributes:
label: Description
description: |
Describe the issue you are experiencing.
Describe the issue you are experiencing.
Attach images/videos if possible.
placeholder: |
Please enter a description of the issue. Here you can also attach log screenshots, gifs or a video

2
.github/ISSUE_TEMPLATE/04_other_errors.yaml vendored
View file

@ -11,7 +11,7 @@ body:
attributes:
label: Description
description: |
Describe the issue you are experiencing.
Describe the issue you are experiencing.
Attach images/videos if possible.
placeholder: |
Please enter a description of the issue. Here you can also attach log screenshots, gifs or a video

2
.github/ISSUE_TEMPLATE/config.yml vendored
View file

@ -1,5 +1,5 @@
blank_issues_enabled: false
contact_links:
contact_links:
- name: Rom-Hacking Hideout's Discord server!
url: https://discord.gg/6CzjAG6GZk
about: You can follow the development of pokeemerald-expansion and be notified of new releases :)

2
data/battle_scripts_2.s
View file

@ -245,7 +245,7 @@ BattleScript_TrainerASlideMsgRet::
BattleScript_TrainerASlideMsgEnd2::
call BattleScript_TrainerASlideMsgRet
end2
BattleScript_TrainerBSlideMsgRet::
handletrainerslidemsg BS_SCRIPTING, 0
trainerslidein B_POSITION_OPPONENT_RIGHT

4
src/battle_controller_opponent.c
View file

@ -561,13 +561,13 @@ static void OpponentHandleChooseMove(u32 battler)
if (ShouldUseZMove(battler, gBattlerTarget, chosenMove))
QueueZMove(battler, chosenMove);
// If opponent can Mega Evolve, do it.
if (CanMegaEvolve(battler))
if (CanMegaEvolve(battler))
BtlController_EmitTwoReturnValues(battler, BUFFER_B, 10, (chosenMoveId) | (RET_MEGA_EVOLUTION) | (gBattlerTarget << 8));
// If opponent can Ultra Burst, do it.
else if (CanUltraBurst(battler))
BtlController_EmitTwoReturnValues(battler, BUFFER_B, 10, (chosenMoveId) | (RET_ULTRA_BURST) | (gBattlerTarget << 8));
// If opponent can Dynamax and is on final Pokemon, do it.
else if (CanDynamax(battler) && CountAIAliveNonEggMonsExcept(gBattlerPartyIndexes[battler]) == 0)
else if (CanDynamax(battler) && CountAIAliveNonEggMonsExcept(gBattlerPartyIndexes[battler]) == 0)
BtlController_EmitTwoReturnValues(battler, BUFFER_B, 10, (chosenMoveId) | (RET_DYNAMAX) | (gBattlerTarget << 8));
else
BtlController_EmitTwoReturnValues(battler, BUFFER_B, 10, (chosenMoveId) | (gBattlerTarget << 8));

1
src/data/text/move_names.h
View file

@ -1968,4 +1968,3 @@ const u8 *const gMaxMoveNames[] =
[MOVE_G_MAX_ONE_BLOW - FIRST_MAX_MOVE] = sText_G_Max_One_Blow,
[MOVE_G_MAX_RAPID_FLOW - FIRST_MAX_MOVE] = sText_G_Max_Rapid_Flow,
};

4
src/pokemon_animation.c
View file

@ -777,7 +777,7 @@ static const u8 sSpeciesToBackAnimSet[NUM_SPECIES] =
[SPECIES_KROKOROK] = BACK_ANIM_V_STRETCH,
[SPECIES_KROOKODILE] = BACK_ANIM_V_SHAKE_LOW,
[SPECIES_DARUMAKA] = BACK_ANIM_CONCAVE_ARC_LARGE,
[SPECIES_DARMANITAN_STANDARD_MODE] = BACK_ANIM_V_SHAKE_H_SLIDE,
[SPECIES_DARMANITAN_STANDARD_MODE] = BACK_ANIM_V_SHAKE_H_SLIDE,
[SPECIES_MARACTUS] = BACK_ANIM_CONCAVE_ARC_LARGE,
[SPECIES_DWEBBLE] = BACK_ANIM_H_SLIDE,
[SPECIES_CRUSTLE] = BACK_ANIM_V_SHAKE_LOW,
@ -872,7 +872,7 @@ static const u8 sSpeciesToBackAnimSet[NUM_SPECIES] =
[SPECIES_KELDEO_ORDINARY] = BACK_ANIM_JOLT_RIGHT,
[SPECIES_MELOETTA_ARIA] = BACK_ANIM_CONVEX_DOUBLE_ARC,
[SPECIES_GENESECT] = BACK_ANIM_CIRCLE_COUNTERCLOCKWISE,
// Gen 6
[SPECIES_CHESPIN] = BACK_ANIM_H_SLIDE,
[SPECIES_QUILLADIN] = BACK_ANIM_GROW,

2
test/battle/hold_effect/eject_button.c
View file

@ -55,7 +55,7 @@ SINGLE_BATTLE_TEST("Eject Button will not activate under Substitute")
OPPONENT(SPECIES_RAICHU) { Item(ITEM_EJECT_BUTTON); }
OPPONENT(SPECIES_WOBBUFFET);
} WHEN {
TURN {
TURN {
MOVE(opponent, MOVE_SUBSTITUTE);
MOVE(player, MOVE_TACKLE);
}

6
test/battle/move_effect/hydro_steam.c
View file

@ -1,11 +1,11 @@
#include "global.h"
#include "test/battle.h"
ASSUMPTIONS
{
ASSUME(gBattleMoves[MOVE_HYDRO_STEAM].effect == EFFECT_HYDRO_STEAM);
}
SINGLE_BATTLE_TEST("Hydro Steam deals 1.5x damage under both Sunlight and Rain", s16 damage)
{
u16 setupMove;
@ -26,7 +26,7 @@ SINGLE_BATTLE_TEST("Hydro Steam deals 1.5x damage under both Sunlight and Rain",
EXPECT_MUL_EQ(results[0].damage, Q_4_12(1.5), results[1].damage);
}
}
SINGLE_BATTLE_TEST("Hydro Steam is affected by Utility Umbrella", s16 damage)
{
u32 itemPlayer;

2
test/battle/move_effect/revival_blessing.c
View file

@ -103,7 +103,7 @@ TO_DO_BATTLE_TEST("Revived battlers still lose their turn");
// OPPONENT(SPECIES_WYNAUT) { HP(1); }
// } WHEN {
// TURN { MOVE(playerLeft, MOVE_TACKLE, target: opponentRight);
// MOVE(opponentLeft, MOVE_REVIVAL_BLESSING);
// MOVE(opponentLeft, MOVE_REVIVAL_BLESSING);
// SEND_OUT(opponentLeft, 1); }
// } SCENE {
// MESSAGE("Wobbuffet used Tackle!");

4
test/battle/weather/rain.c
View file

@ -7,7 +7,7 @@ ASSUMPTIONS
ASSUME(gBattleMoves[MOVE_EMBER].type == TYPE_FIRE);
ASSUME(gBattleMoves[MOVE_WATER_GUN].type == TYPE_WATER);
}
SINGLE_BATTLE_TEST("Rain multiplies the power of Fire-type moves by 0.5x", s16 damage)
{
u32 setupMove;
@ -26,7 +26,7 @@ SINGLE_BATTLE_TEST("Rain multiplies the power of Fire-type moves by 0.5x", s16 d
EXPECT_MUL_EQ(results[0].damage, Q_4_12(0.5), results[1].damage);
}
}
SINGLE_BATTLE_TEST("Rain multiplies the power of Water-type moves by 1.5x", s16 damage)
{
u32 setupMove;

4
test/battle/weather/sunlight.c
View file

@ -7,7 +7,7 @@ ASSUMPTIONS
ASSUME(gBattleMoves[MOVE_EMBER].type == TYPE_FIRE);
ASSUME(gBattleMoves[MOVE_WATER_GUN].type == TYPE_WATER);
}
SINGLE_BATTLE_TEST("Sunlight multiplies the power of Fire-type moves by 1.5x", s16 damage)
{
u32 setupMove;
@ -26,7 +26,7 @@ SINGLE_BATTLE_TEST("Sunlight multiplies the power of Fire-type moves by 1.5x", s
EXPECT_MUL_EQ(results[0].damage, Q_4_12(1.5), results[1].damage);
}
}
SINGLE_BATTLE_TEST("Sunlight multiplies the power of Water-type moves by 0.5x", s16 damage)
{
u32 setupMove;

12
test/dynamax.c
View file

@ -19,7 +19,7 @@ SINGLE_BATTLE_TEST("(DYNAMAX) Dynamax increases HP and max HP by 1.5x", u16 hp)
}
MESSAGE("Foe Wobbuffet used Celebrate!");
} THEN {
results[i].hp = player->hp;
results[i].hp = player->hp;
} FINALLY {
EXPECT_MUL_EQ(results[0].hp, Q_4_12(1.5), results[1].hp);
}
@ -49,7 +49,7 @@ SINGLE_BATTLE_TEST("(DYNAMAX) Dynamax expires after three turns", u16 hp)
if (dynamax) // Expect to have visual reversion at the end.
ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_FORM_CHANGE, player);
} THEN {
results[i].hp = player->hp;
results[i].hp = player->hp;
} FINALLY {
EXPECT_EQ(results[0].hp, results[1].hp);
}
@ -250,7 +250,7 @@ SINGLE_BATTLE_TEST("(DYNAMAX) Dynamaxed Pokemon can be encored immediately after
TURN { MOVE(player, MOVE_ARM_THRUST, dynamax: TRUE); }
TURN { MOVE(player, MOVE_ARM_THRUST); }
TURN { MOVE(player, MOVE_ARM_THRUST); }
TURN { MOVE(opponent, MOVE_ENCORE); MOVE(player, MOVE_TACKLE); }
TURN { MOVE(opponent, MOVE_ENCORE); MOVE(player, MOVE_TACKLE); }
} SCENE {
MESSAGE("Wobbuffet used Max Knuckle!");
MESSAGE("Wobbuffet used Max Knuckle!");
@ -322,7 +322,7 @@ SINGLE_BATTLE_TEST("(DYNAMAX) Dynamaxed Pokemon are not immune to Knock Off")
MESSAGE("Wobbuffet used Max Strike!");
MESSAGE("Foe Wobbuffet used Knock Off!");
MESSAGE("Foe Wobbuffet knocked off Wobbuffet's Potion!");
} THEN {
} THEN {
EXPECT_EQ(player->item, ITEM_NONE);
}
}
@ -1216,7 +1216,7 @@ DOUBLE_BATTLE_TEST("(DYNAMAX) G-Max Wildfire sets a field effect that damages no
MESSAGE("Foe Wynaut is burning up within G-Max Wildfire's flames!");
HP_BAR(opponentRight);
// turn 5
NONE_OF {
NONE_OF {
HP_BAR(opponentRight);
MESSAGE("Foe Wynaut is burning up within G-Max Wildfire's flames!");
}
@ -1387,7 +1387,7 @@ DOUBLE_BATTLE_TEST("(DYNAMAX) G-Max Depletion takes away 2 PP from the target's
PLAYER(SPECIES_DURALUDON);
PLAYER(SPECIES_WYNAUT);
// Dynamax behaves weird with test turn order because stats are recalculated.
OPPONENT(SPECIES_SABLEYE) { Ability(ABILITY_PRANKSTER); }
OPPONENT(SPECIES_SABLEYE) { Ability(ABILITY_PRANKSTER); }
OPPONENT(SPECIES_WYNAUT);
} WHEN {
TURN { MOVE(playerLeft, MOVE_DRAGON_CLAW, target: opponentLeft, dynamax: TRUE); }

2
test/test_runner_battle.c
View file

@ -1980,7 +1980,7 @@ void MoveGetIdAndSlot(s32 battlerId, struct MoveContext *ctx, u32 *moveId, u32 *
if (ctx->explicitUltraBurst && ctx->ultraBurst)
*moveSlot |= RET_ULTRA_BURST;
if (ctx->explicitDynamax && ctx->dynamax)
*moveSlot |= RET_DYNAMAX;
}