dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'reverts' of https://github.com/aaaaaa123456789/pokeemerald into reverts

Browse Source
This commit is contained in:
Kurausukun
2020-11-02 18:43:40 -05:00
parent 8bf401c227 9794b077b5
commit 6545745e59
383 changed files with 22968 additions and 22552 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/contest.c
+23 -27
View File
@@ -42,7 +42,6 @@
#include "constants/moves.h"
#include "constants/rgb.h"
#include "constants/songs.h"
#include "constants/species.h"
#include "constants/tv.h"
// This file's functions.
@@ -951,39 +950,39 @@ const struct SpriteTemplate sSpriteTemplates_ContestantsTurnBlinkEffect[CONTESTA
static const s8 gContestExcitementTable[CONTEST_CATEGORIES_COUNT][CONTEST_CATEGORIES_COUNT] =
{
[CONTEST_CATEGORY_COOL] = {
[CONTEST_CATEGORY_COOL] = +1,
[CONTEST_CATEGORY_BEAUTY] = 0,
[CONTEST_CATEGORY_CUTE] = -1,
[CONTEST_CATEGORY_SMART] = -1,
[CONTEST_CATEGORY_COOL] = {
[CONTEST_CATEGORY_COOL] = +1,
[CONTEST_CATEGORY_BEAUTY] = 0,
[CONTEST_CATEGORY_CUTE] = -1,
[CONTEST_CATEGORY_SMART] = -1,
[CONTEST_CATEGORY_TOUGH] = 0
},
[CONTEST_CATEGORY_BEAUTY] = {
[CONTEST_CATEGORY_COOL] = 0,
[CONTEST_CATEGORY_BEAUTY] = +1,
[CONTEST_CATEGORY_CUTE] = 0,
[CONTEST_CATEGORY_SMART] = -1,
[CONTEST_CATEGORY_BEAUTY] = {
[CONTEST_CATEGORY_COOL] = 0,
[CONTEST_CATEGORY_BEAUTY] = +1,
[CONTEST_CATEGORY_CUTE] = 0,
[CONTEST_CATEGORY_SMART] = -1,
[CONTEST_CATEGORY_TOUGH] = -1
},
[CONTEST_CATEGORY_CUTE] = {
[CONTEST_CATEGORY_COOL] = -1,
[CONTEST_CATEGORY_BEAUTY] = 0,
[CONTEST_CATEGORY_CUTE] = +1,
[CONTEST_CATEGORY_SMART] = 0,
[CONTEST_CATEGORY_COOL] = -1,
[CONTEST_CATEGORY_BEAUTY] = 0,
[CONTEST_CATEGORY_CUTE] = +1,
[CONTEST_CATEGORY_SMART] = 0,
[CONTEST_CATEGORY_TOUGH] = -1
},
[CONTEST_CATEGORY_SMART] = {
[CONTEST_CATEGORY_COOL] = -1,
[CONTEST_CATEGORY_BEAUTY] = -1,
[CONTEST_CATEGORY_CUTE] = 0,
[CONTEST_CATEGORY_SMART] = +1,
[CONTEST_CATEGORY_COOL] = -1,
[CONTEST_CATEGORY_BEAUTY] = -1,
[CONTEST_CATEGORY_CUTE] = 0,
[CONTEST_CATEGORY_SMART] = +1,
[CONTEST_CATEGORY_TOUGH] = 0
},
[CONTEST_CATEGORY_TOUGH] = {
[CONTEST_CATEGORY_COOL] = 0,
[CONTEST_CATEGORY_BEAUTY] = -1,
[CONTEST_CATEGORY_CUTE] = -1,
[CONTEST_CATEGORY_SMART] = 0,
[CONTEST_CATEGORY_TOUGH] = {
[CONTEST_CATEGORY_COOL] = 0,
[CONTEST_CATEGORY_BEAUTY] = -1,
[CONTEST_CATEGORY_CUTE] = -1,
[CONTEST_CATEGORY_SMART] = 0,
[CONTEST_CATEGORY_TOUGH] = +1
}
};
@@ -999,8 +998,6 @@ void ResetLinkContestBoolean(void)
static void SetupContestGpuRegs(void)
{
u16 savedIme;
SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_1D_MAP);
SetGpuReg(REG_OFFSET_BLDCNT, 0);
SetGpuReg(REG_OFFSET_BLDALPHA, 0);
@@ -6101,4 +6098,3 @@ void StripPlayerAndMonNamesForLinkContest(struct ContestPokemon *mon, s32 langua
}
}