Merge pull request #1937 from kittenchilly/removewhitespace
Remove all trailing whitespace
This commit is contained in:
@@ -741,7 +741,7 @@ u8 GetFactoryMonFixedIV(u8 challengeNum, bool8 isLastBattle)
|
||||
u8 ivSet;
|
||||
bool8 useHigherIV = isLastBattle ? TRUE : FALSE;
|
||||
|
||||
// The Factory has an out-of-bounds access when generating the rental draft for round 9 (challengeNum==8),
|
||||
// The Factory has an out-of-bounds access when generating the rental draft for round 9 (challengeNum==8),
|
||||
// or the "elevated" rentals from round 8 (challengeNum+1==8)
|
||||
// This happens to land on a number higher than 31, which is interpreted as "random IVs"
|
||||
#ifdef BUGFIX
|
||||
|
||||
@@ -230,7 +230,7 @@ enum {
|
||||
PALTAG_TRIANGLE_CURSOR,
|
||||
PALTAG_RECTANGLE_CURSOR,
|
||||
PALTAG_MISC_UI,
|
||||
PALTAG_RS_INTERVIEW_FRAME,
|
||||
PALTAG_RS_INTERVIEW_FRAME,
|
||||
};
|
||||
|
||||
enum {
|
||||
@@ -240,7 +240,7 @@ enum {
|
||||
GFXTAG_START_SELECT_BUTTONS,
|
||||
GFXTAG_MODE_WINDOW,
|
||||
GFXTAG_RS_INTERVIEW_FRAME,
|
||||
GFXTAG_BUTTON_WINDOW,
|
||||
GFXTAG_BUTTON_WINDOW,
|
||||
};
|
||||
|
||||
|
||||
|
||||
@@ -498,7 +498,7 @@ static const struct SpritePalette sObjectEventSpritePalettes[] = {
|
||||
{gObjectEventPal_RubySapphireBrendan, OBJ_EVENT_PAL_TAG_RS_BRENDAN},
|
||||
{gObjectEventPal_RubySapphireMay, OBJ_EVENT_PAL_TAG_RS_MAY},
|
||||
#ifdef BUGFIX
|
||||
{NULL, OBJ_EVENT_PAL_TAG_NONE},
|
||||
{NULL, OBJ_EVENT_PAL_TAG_NONE},
|
||||
#else
|
||||
{}, // BUG: FindObjectEventPaletteIndexByTag looks for OBJ_EVENT_PAL_TAG_NONE and not 0x0.
|
||||
// If it's looking for a tag that isn't in this table, the game locks in an infinite loop.
|
||||
|
||||
@@ -41,7 +41,7 @@
|
||||
|
||||
#ifndef NDEBUG
|
||||
|
||||
struct mini_buff
|
||||
struct mini_buff
|
||||
{
|
||||
char *buffer, *pbuffer;
|
||||
u32 buffer_len;
|
||||
@@ -95,7 +95,7 @@ static s32 _putsAscii(char *s, s32 len, void *buf)
|
||||
s32 i;
|
||||
struct mini_buff *b;
|
||||
|
||||
if (!buf)
|
||||
if (!buf)
|
||||
return len;
|
||||
|
||||
b = buf;
|
||||
@@ -118,7 +118,7 @@ static s32 _putsEncoded(char *s, s32 len, void *buf)
|
||||
s32 i;
|
||||
struct mini_buff *b;
|
||||
|
||||
if (!buf)
|
||||
if (!buf)
|
||||
return len;
|
||||
|
||||
b = buf;
|
||||
@@ -159,7 +159,7 @@ static s32 mini_itoa(s32 value, u32 radix, s32 uppercase, bool32 unsig, char *bu
|
||||
}
|
||||
|
||||
/* This builds the string back to front ... */
|
||||
do
|
||||
do
|
||||
{
|
||||
s32 digit = value % radix;
|
||||
*(pbuffer++) = (digit < 10 ? '0' + digit : (uppercase ? 'A' : 'a') + digit - 10);
|
||||
@@ -243,7 +243,7 @@ s32 mini_vpprintf(void* buf, const char *fmt, va_list va)
|
||||
{
|
||||
len = 1;
|
||||
len = _putsAscii(&ch, len, buf);
|
||||
} else
|
||||
} else
|
||||
{
|
||||
char pad_char = ' ';
|
||||
s32 pad_to = 0;
|
||||
@@ -270,7 +270,7 @@ s32 mini_vpprintf(void* buf, const char *fmt, va_list va)
|
||||
ch=*(fmt++);
|
||||
}
|
||||
|
||||
switch (ch)
|
||||
switch (ch)
|
||||
{
|
||||
case 0:
|
||||
goto end;
|
||||
|
||||
@@ -9,8 +9,8 @@
|
||||
// The purpose of this struct is for outside applications to be
|
||||
// able to access parts of the ROM or its save file, like a public API.
|
||||
// In vanilla, it was used by Colosseum and XD to access pokemon graphics.
|
||||
//
|
||||
// If this struct is rearranged in any way, it defeats the purpose of
|
||||
//
|
||||
// If this struct is rearranged in any way, it defeats the purpose of
|
||||
// having it at all. Applications like PKHex or streaming HUDs may find
|
||||
// these values useful, so there's some potential benefit to keeping it.
|
||||
// If there's a compilation problem below, just comment out the assignment
|
||||
|
||||
@@ -1285,7 +1285,7 @@ static void Leader_HandleCommunication(void)
|
||||
if (sTradeMenu->playerSelectStatus == STATUS_READY
|
||||
&& sTradeMenu->partnerSelectStatus == STATUS_READY)
|
||||
{
|
||||
// Both players have selected a pokemon to trade
|
||||
// Both players have selected a pokemon to trade
|
||||
sTradeMenu->callbackId = CB_SET_SELECTED_MONS;
|
||||
sTradeMenu->linkData[0] = LINKCMD_SET_MONS_TO_TRADE;
|
||||
sTradeMenu->linkData[1] = sTradeMenu->cursorPosition;
|
||||
|
||||
Reference in New Issue
Block a user