summaryrefslogtreecommitdiff
path: root/src/use_pokeblock.c
diff options
context:
space:
mode:
authorLOuroboros <lunosouroboros@gmail.com>2021-08-24 19:59:32 -0300
committerLOuroboros <lunosouroboros@gmail.com>2021-08-24 19:59:32 -0300
commit554210c5e315e786ddc6eef888e9ff6065ad73f8 (patch)
tree66bb5065902fb10a4ad007e53cb61f90fd68e624 /src/use_pokeblock.c
parent63e6b914e4d9b9bdb0a8d621b2ed233990f2ef66 (diff)
Removed trailing spaces in the most relevant files
Command used for the job: egrep -rl ' $' --include *.c --include *.h --include *.s --include *.inc --include *.txt * | xargs sed -i 's/\s\+$//g' Credits to Grant Murphy from Stack Overflow.
Diffstat (limited to 'src/use_pokeblock.c')
-rw-r--r--src/use_pokeblock.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/use_pokeblock.c b/src/use_pokeblock.c
index cdcdfc5da..6ebc707e5 100644
--- a/src/use_pokeblock.c
+++ b/src/use_pokeblock.c
@@ -29,7 +29,7 @@
This file handles the screen where the player chooses
which pokemon to give a pokeblock to. The subsequent scene
of feeding the pokeblock to the pokemon is handled by
- pokeblock_feed.c, and the rest of the pokeblock menu (and
+ pokeblock_feed.c, and the rest of the pokeblock menu (and
other pokeblock-related functions) are in pokeblock.c
*/
@@ -243,7 +243,7 @@ static const struct BgTemplate sBgTemplates[4] =
}
};
-static const struct WindowTemplate sWindowTemplates[WIN_COUNT + 1] =
+static const struct WindowTemplate sWindowTemplates[WIN_COUNT + 1] =
{
[WIN_NAME] = {
.bg = 0,
@@ -275,7 +275,7 @@ static const struct WindowTemplate sWindowTemplates[WIN_COUNT + 1] =
DUMMY_WIN_TEMPLATE
};
-static const struct WindowTemplate sUsePokeblockYesNoWinTemplate =
+static const struct WindowTemplate sUsePokeblockYesNoWinTemplate =
{
.bg = 0,
.tilemapLeft = 24,
@@ -295,7 +295,7 @@ static const u8 *const sContestStatNames[] =
gText_Beauty3
};
-static const struct SpriteSheet sSpriteSheet_UpDown =
+static const struct SpriteSheet sSpriteSheet_UpDown =
{
gUsePokeblockUpDown_Gfx, 0x200, TAG_UP_DOWN
};
@@ -314,7 +314,7 @@ static const s16 sUpDownCoordsOnGraph[FLAVOR_COUNT][2] =
{197, 59}
};
-static const struct OamData sOam_UpDown =
+static const struct OamData sOam_UpDown =
{
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
@@ -357,7 +357,7 @@ static const struct SpriteTemplate sSpriteTemplate_UpDown =
.callback = SpriteCallbackDummy,
};
-static const struct OamData sOam_Condition =
+static const struct OamData sOam_Condition =
{
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
@@ -1594,7 +1594,7 @@ static void SpriteCB_SelectionIconCancel(struct Sprite *sprite)
}
// Calculate the max id for sparkles/stars that appear around the pokemon on the condition screen
-// All pokemon start with 1 sparkle (added by CreateConditionSparkleSprites), so the number here +1
+// All pokemon start with 1 sparkle (added by CreateConditionSparkleSprites), so the number here +1
// is the total number of sparkles that appear
static void CalculateNumAdditionalSparkles(u8 monIndex)
{