ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-27 22:03:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix whitespace issues

Browse Source
This commit is contained in:
aaaaaa123456789 2020-10-26 15:52:44 -03:00
parent 4bbc14ecdd
commit bcbd05e151
1 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/contest.c
View File

@ -950,39 +950,39 @@ const struct SpriteTemplate sSpriteTemplates_ContestantsTurnBlinkEffect[CONTESTA
static const s8 gContestExcitementTable[CONTEST_CATEGORIES_COUNT][CONTEST_CATEGORIES_COUNT] = static const s8 gContestExcitementTable[CONTEST_CATEGORIES_COUNT][CONTEST_CATEGORIES_COUNT] =
{ {
[CONTEST_CATEGORY_COOL] = { [CONTEST_CATEGORY_COOL] = {
[CONTEST_CATEGORY_COOL] = +1, [CONTEST_CATEGORY_COOL] = +1,
[CONTEST_CATEGORY_BEAUTY] = 0, [CONTEST_CATEGORY_BEAUTY] = 0,
[CONTEST_CATEGORY_CUTE] = -1, [CONTEST_CATEGORY_CUTE] = -1,
[CONTEST_CATEGORY_SMART] = -1, [CONTEST_CATEGORY_SMART] = -1,
[CONTEST_CATEGORY_TOUGH] = 0 [CONTEST_CATEGORY_TOUGH] = 0
}, },
[CONTEST_CATEGORY_BEAUTY] = { [CONTEST_CATEGORY_BEAUTY] = {
[CONTEST_CATEGORY_COOL] = 0, [CONTEST_CATEGORY_COOL] = 0,
[CONTEST_CATEGORY_BEAUTY] = +1, [CONTEST_CATEGORY_BEAUTY] = +1,
[CONTEST_CATEGORY_CUTE] = 0, [CONTEST_CATEGORY_CUTE] = 0,
[CONTEST_CATEGORY_SMART] = -1, [CONTEST_CATEGORY_SMART] = -1,
[CONTEST_CATEGORY_TOUGH] = -1 [CONTEST_CATEGORY_TOUGH] = -1
}, },
[CONTEST_CATEGORY_CUTE] = { [CONTEST_CATEGORY_CUTE] = {
[CONTEST_CATEGORY_COOL] = -1, [CONTEST_CATEGORY_COOL] = -1,
[CONTEST_CATEGORY_BEAUTY] = 0, [CONTEST_CATEGORY_BEAUTY] = 0,
[CONTEST_CATEGORY_CUTE] = +1, [CONTEST_CATEGORY_CUTE] = +1,
[CONTEST_CATEGORY_SMART] = 0, [CONTEST_CATEGORY_SMART] = 0,
[CONTEST_CATEGORY_TOUGH] = -1 [CONTEST_CATEGORY_TOUGH] = -1
}, },
[CONTEST_CATEGORY_SMART] = { [CONTEST_CATEGORY_SMART] = {
[CONTEST_CATEGORY_COOL] = -1, [CONTEST_CATEGORY_COOL] = -1,
[CONTEST_CATEGORY_BEAUTY] = -1, [CONTEST_CATEGORY_BEAUTY] = -1,
[CONTEST_CATEGORY_CUTE] = 0, [CONTEST_CATEGORY_CUTE] = 0,
[CONTEST_CATEGORY_SMART] = +1, [CONTEST_CATEGORY_SMART] = +1,
[CONTEST_CATEGORY_TOUGH] = 0 [CONTEST_CATEGORY_TOUGH] = 0
}, },
[CONTEST_CATEGORY_TOUGH] = { [CONTEST_CATEGORY_TOUGH] = {
[CONTEST_CATEGORY_COOL] = 0, [CONTEST_CATEGORY_COOL] = 0,
[CONTEST_CATEGORY_BEAUTY] = -1, [CONTEST_CATEGORY_BEAUTY] = -1,
[CONTEST_CATEGORY_CUTE] = -1, [CONTEST_CATEGORY_CUTE] = -1,
[CONTEST_CATEGORY_SMART] = 0, [CONTEST_CATEGORY_SMART] = 0,
[CONTEST_CATEGORY_TOUGH] = +1 [CONTEST_CATEGORY_TOUGH] = +1
} }
}; };
@ -998,7 +998,6 @@ void ResetLinkContestBoolean(void)
static void SetupContestGpuRegs(void) static void SetupContestGpuRegs(void)
{ {
SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_1D_MAP); SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_1D_MAP);
SetGpuReg(REG_OFFSET_BLDCNT, 0); SetGpuReg(REG_OFFSET_BLDCNT, 0);
SetGpuReg(REG_OFFSET_BLDALPHA, 0); SetGpuReg(REG_OFFSET_BLDALPHA, 0);