ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-09-28 16:54:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove all trailing whitespace (master) (#3472)

Browse Source
This commit is contained in:
kittenchilly 2023-10-27 11:52:44 -05:00 committed by GitHub
parent 591ef71e3b
commit bd71946372
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
20 changed files with 41 additions and 41 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 :)

6
INSTALL.md
View File

@ -150,9 +150,9 @@ Note that in msys2, Copy is Ctrl+Insert and Paste is Shift+Insert.
<details>
<summary><i>Notes...</i></summary>
> Note 1: While not shown, msys uses forward slashes `/` instead of backwards slashes `\` as the directory separator.
> Note 2: If the path has spaces, then the path must be wrapped with quotations, e.g. `cd "Downloads/My Downloads"`.
> Note 3: Windows path names are case-insensitive so adhering to capitalization isn’t needed.
> Note 1: While not shown, msys uses forward slashes `/` instead of backwards slashes `\` as the directory separator.
> Note 2: If the path has spaces, then the path must be wrapped with quotations, e.g. `cd "Downloads/My Downloads"`.
> Note 3: Windows path names are case-insensitive so adhering to capitalization isn’t needed.
> Note 4: If libpng was saved elsewhere, you will need to specify the full path to where libpng was downloaded, e.g. `cd c:/devkitpro/msys2` if it was saved there.
</details>

2
data/battle_scripts_2.s
View File

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

4
src/battle_dome.c
View File

@ -1665,13 +1665,13 @@ static const u8 sTourneyTreePokeballCoords[DOME_TOURNAMENT_TRAINERS_COUNT + DOME
{.tile = LINE_V_L, .y = 9, .x = 17}, \
{.tile = LINE_V_L, .y = 10, .x = 17}, \
{.tile = LINE_V_L_HALF_LOGO, .y = 11, .x = 17},
#define LINESECTION_SEMIFINAL_BOTTOM_RIGHT \
{.tile = LINE_V_L_LOGO4, .y = 14, .x = 17}, \
{.tile = LINE_V_L_LOGO3, .y = 13, .x = 17}, \
{.tile = LINE_V_L_LOGO2, .y = 12, .x = 17}, \
{.tile = LINE_V_L_LOGO1, .y = 11, .x = 17},
#define LINESECTION_FINAL_LEFT \
{.tile = LINE_H_LOGO1, .y = 11, .x = 13}, \
{.tile = LINE_H_LOGO2, .y = 11, .x = 14},

4
src/battle_interface.c
View File

@ -3672,13 +3672,13 @@ static void Task_BounceBall(u8 taskId)
sprite->callback = SpriteCB_LastUsedBallBounce; //Show and bounce down
task->sState++;
}
break;
break;
case 4: // Destroy Task
if(!sprite->sMoving)
{
sprite->callback = SpriteCB_LastUsedBall;
DestroyTask(taskId);
}
}
}
if (!gLastUsedBallMenuPresent)
{

2
src/data/items.h
View File

@ -15,7 +15,7 @@
#endif
#if I_TYPE_BOOST_POWER >= GEN_4 // For non Pokémon-specific type-boosting held items.
#define TYPE_BOOST_PARAM 20
#define TYPE_BOOST_PARAM 20
#else
#define TYPE_BOOST_PARAM 10
#endif

2
src/fieldmap.c
View File

@ -681,7 +681,7 @@ bool8 CameraMove(int x, int y)
{
DebugPrintfLevel(MGBA_LOG_WARN, "GetIncomingConnection returned an invalid connection inside CameraMove!");
}
}
return gCamera.active;
}

16
src/pokemon_animation.c
View File

@ -604,7 +604,7 @@ static const u8 sSpeciesToBackAnimSet[NUM_SPECIES] =
[SPECIES_JIRACHI] = BACK_ANIM_CONVEX_DOUBLE_ARC,
[SPECIES_DEOXYS] = BACK_ANIM_SHRINK_GROW_VIBRATE,
[SPECIES_CHIMECHO] = BACK_ANIM_CONVEX_DOUBLE_ARC,
// Gen 4
[SPECIES_TURTWIG] = BACK_ANIM_H_SLIDE,
[SPECIES_GROTLE] = BACK_ANIM_H_SLIDE,
@ -713,7 +713,7 @@ static const u8 sSpeciesToBackAnimSet[NUM_SPECIES] =
[SPECIES_DARKRAI] = BACK_ANIM_SHRINK_GROW_VIBRATE,
[SPECIES_SHAYMIN] = BACK_ANIM_CONCAVE_ARC_SMALL,
[SPECIES_ARCEUS] = BACK_ANIM_GROW,
//Gen 4 Forms
[SPECIES_DEOXYS_ATTACK] = BACK_ANIM_GROW_STUTTER,
[SPECIES_DEOXYS_DEFENSE] = BACK_ANIM_DIP_RIGHT_SIDE,
@ -749,7 +749,7 @@ static const u8 sSpeciesToBackAnimSet[NUM_SPECIES] =
[SPECIES_ARCEUS_DRAGON] = BACK_ANIM_GROW_STUTTER,
[SPECIES_ARCEUS_DARK] = BACK_ANIM_GROW_STUTTER,
[SPECIES_ARCEUS_FAIRY] = BACK_ANIM_GROW_STUTTER,
// Gen 5
[SPECIES_VICTINI] = BACK_ANIM_H_SHAKE,
[SPECIES_SNIVY] = BACK_ANIM_H_SLIDE,
@ -812,7 +812,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] = BACK_ANIM_V_SHAKE_H_SLIDE,
[SPECIES_DARMANITAN] = 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,
@ -928,7 +928,7 @@ static const u8 sSpeciesToBackAnimSet[NUM_SPECIES] =
[SPECIES_GENESECT_SHOCK_DRIVE] = BACK_ANIM_CIRCLE_COUNTERCLOCKWISE,
[SPECIES_GENESECT_BURN_DRIVE] = BACK_ANIM_CIRCLE_COUNTERCLOCKWISE,
[SPECIES_GENESECT_CHILL_DRIVE] = BACK_ANIM_CIRCLE_COUNTERCLOCKWISE,
//Gen 6
[SPECIES_CHESPIN] = BACK_ANIM_H_SLIDE,
[SPECIES_QUILLADIN] = BACK_ANIM_GROW,
@ -1002,7 +1002,7 @@ static const u8 sSpeciesToBackAnimSet[NUM_SPECIES] =
[SPECIES_DIANCIE] = BACK_ANIM_CIRCLE_COUNTERCLOCKWISE,
[SPECIES_HOOPA] = BACK_ANIM_CONVEX_DOUBLE_ARC,
[SPECIES_VOLCANION] = BACK_ANIM_SHAKE_GLOW_RED,
//Gen 6 Forms
[SPECIES_GRENINJA_ASH] = BACK_ANIM_SHAKE_GLOW_BLUE,
[SPECIES_GRENINJA_BATTLE_BOND] = BACK_ANIM_V_STRETCH,
@ -1061,7 +1061,7 @@ static const u8 sSpeciesToBackAnimSet[NUM_SPECIES] =
[SPECIES_ZYGARDE_50_POWER_CONSTRUCT] = BACK_ANIM_SHAKE_GLOW_GREEN,
[SPECIES_ZYGARDE_COMPLETE] = BACK_ANIM_SHAKE_GLOW_GREEN,
[SPECIES_HOOPA_UNBOUND] = BACK_ANIM_V_SHAKE_LOW,
//Gen 6 Megas (Thanks Furret/CyanSMP64!)
[SPECIES_VENUSAUR_MEGA] = BACK_ANIM_SHAKE_GLOW_GREEN,
[SPECIES_CHARIZARD_MEGA_X] = BACK_ANIM_SHAKE_GLOW_BLUE,
@ -1111,7 +1111,7 @@ static const u8 sSpeciesToBackAnimSet[NUM_SPECIES] =
[SPECIES_RAYQUAZA_MEGA] = BACK_ANIM_SHAKE_GLOW_GREEN,
[SPECIES_KYOGRE_PRIMAL] = BACK_ANIM_SHAKE_GLOW_BLUE,
[SPECIES_GROUDON_PRIMAL] = BACK_ANIM_SHAKE_GLOW_RED,
};
// Equivalent to struct YellowFlashData, but doesn't match as a struct

2
src/pokemon_debug.c
View File

@ -1262,7 +1262,7 @@ static void ApplyOffsetSpriteValues(struct PokemonDebugMenu *data)
gSprites[data->backspriteId].y = DEBUG_MON_BACK_Y + gMonBackPicCoords[species].y_offset + data->offsetsSpriteValues.offset_back_picCoords;
//Front
gSprites[data->frontspriteId].y = GetBattlerSpriteFinal_YCustom(species, data->offsetsSpriteValues.offset_front_picCoords, data->offsetsSpriteValues.offset_front_elevation);
if (data->currentSubmenu == 2)
UpdateShadowSpriteInvisible(data);
}

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!");

10
test/battle/move_effect/roost.c
View File

@ -62,7 +62,7 @@ SINGLE_BATTLE_TEST("Roost fails if the user is under the effects of Heal Block")
}
SINGLE_BATTLE_TEST("Roost recovers 50% of the user's Max HP")
{
{
s16 hp;
KNOWN_FAILING; // All healing is currently rounded down
@ -222,7 +222,7 @@ SINGLE_BATTLE_TEST("Roost, if used by a Mystery/Flying type, treats the user as
MESSAGE("It's not very effective…");
MESSAGE("It doesn't affect Moltres…");
}
}
}
}
// Tested in ORAS
@ -234,9 +234,9 @@ DOUBLE_BATTLE_TEST("Roost suppresses the user's not-yet-aquired Flying-type this
PLAYER(SPECIES_KECLEON) { Speed(40); HP(150); Ability(ABILITY_COLOR_CHANGE); }
PLAYER(SPECIES_WOBBUFFET) { Speed(10); }
OPPONENT(SPECIES_PIDGEY) { Speed(30); }
OPPONENT(SPECIES_SANDSHREW) { Speed(20); }
OPPONENT(SPECIES_SANDSHREW) { Speed(20); }
} WHEN {
TURN { MOVE(playerLeft, MOVE_ROOST);
TURN { MOVE(playerLeft, MOVE_ROOST);
MOVE(opponentLeft, MOVE_GUST, target: playerLeft);
MOVE(opponentRight, MOVE_EARTHQUAKE, target: playerLeft); }
} SCENE {
@ -441,6 +441,6 @@ SINGLE_BATTLE_TEST("Roost does not suppress the ungrounded effect of Telekinesis
}
// Tested in ORAS
// Transform does not copy the Roost "status" either.
// Transform does not copy the Roost "status" either.
// Probably better as a Transform test.
TO_DO_BATTLE_TEST("Roost's suppression does not prevent others who are Transforming into the user from copying its Flying-type");

6
test/battle/move_effect/teatime.c
View File

@ -143,7 +143,7 @@ SINGLE_BATTLE_TEST("Teatime does not affect Pokémon in the semi-invulnerable tu
PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_NONE); }
OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_LIECHI_BERRY); }
} WHEN {
TURN {
TURN {
MOVE(opponent, MOVE_FLY);
MOVE(player, MOVE_TEATIME);
}
@ -172,7 +172,7 @@ SINGLE_BATTLE_TEST("Teatime triggers Volt Absorb if it has been affected by Elec
PLAYER(SPECIES_JOLTEON) { Ability(ABILITY_VOLT_ABSORB); Item(item); HP(55); MaxHP(100); }
OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_LIECHI_BERRY); }
} WHEN {
TURN {
TURN {
MOVE(player, move);
MOVE(opponent, MOVE_TEATIME);
}
@ -248,7 +248,7 @@ SINGLE_BATTLE_TEST("Teatime triggers Motor Drive if it has been affected by Elec
PLAYER(SPECIES_ELECTIVIRE) { Ability(ABILITY_MOTOR_DRIVE); Item(item); }
OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_LIECHI_BERRY); }
} WHEN {
TURN {
TURN {
MOVE(player, move);
MOVE(opponent, MOVE_TEATIME);
}

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;