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

Move contest winner list to C

Browse Source
This commit is contained in:
Phlosioneer
2019-03-09 00:00:10 -05:00
parent 88c3781880
commit 5b4b0a245b
4 changed files with 234 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

149
src/contest.c
View File

@@ -218,8 +218,6 @@ EWRAM_DATA u8 gUnknown_02039F5D = 0;
// IWRAM common vars.
u32 gContestRngValue;
extern const struct BgTemplate gUnknown_08587F34[4];
extern const struct WindowTemplate gUnknown_08587F44[];
extern const u8 *const gUnknown_0827E8DA[];
extern const u8 gText_0827D55A[];
extern const u8 gText_0827E793[];
@@ -252,7 +250,6 @@ extern const struct SpriteTemplate gSpriteTemplate_8587AD0;
extern const struct SpriteTemplate gSpriteTemplate_8587B18[];
extern void (*const gContestEffectFuncs[])(void);
extern const s8 gContestExcitementTable[][5];
extern const struct ContestWinner gUnknown_08587FA4[];
extern const struct CompressedSpriteSheet gUnknown_08589904[];
extern const struct SpritePalette gUnknown_08589924[];
extern const struct SpriteTemplate gSpriteTemplate_858998C[];
@@ -581,6 +578,152 @@ const u16 gUnknown_08587C30[] = INCBIN_U16("graphics/unknown/unknown_587C30.gbap
#include "data/contest_text_tables.h"
const struct BgTemplate gUnknown_08587F34[] =
{
{
.bg = 0,
.charBaseIndex = 0,
.mapBaseIndex = 0x18,
.screenSize = 2,
.paletteMode = 0,
.priority = 0,
.baseTile = 0
},
{
.bg = 1,
.charBaseIndex = 2,
.mapBaseIndex = 0x1E,
.screenSize = 2,
.paletteMode = 0,
.priority = 1,
.baseTile = 0
},
{
.bg = 2,
.charBaseIndex = 0,
.mapBaseIndex = 0x1C,
.screenSize = 2,
.paletteMode = 0,
.priority = 0,
.baseTile = 0
},
{
.bg = 3,
.charBaseIndex = 0,
.mapBaseIndex = 0x1A,
.screenSize = 0,
.paletteMode = 0,
.priority = 3,
.baseTile = 0
}
};
const struct WindowTemplate gUnknown_08587F44[] =
{
{
.bg = 0,
.tilemapLeft = 18,
.tilemapTop = 0,
.width = 12,
.height = 2,
.paletteNum = 0xF,
.baseBlock = 0x200
},
{
.bg = 0,
.tilemapLeft = 18,
.tilemapTop = 5,
.width = 12,
.height = 2,
.paletteNum = 0xF,
.baseBlock = 0x218
},
{
.bg = 0,
.tilemapLeft = 18,
.tilemapTop = 10,
.width = 12,
.height = 2,
.paletteNum = 0xF,
.baseBlock = 0x230
},
{
.bg = 0,
.tilemapLeft = 18,
.tilemapTop = 15,
.width = 12,
.height = 2,
.paletteNum = 0xF,
.baseBlock = 0x248
},
{
.bg = 0,
.tilemapLeft = 1,
.tilemapTop = 15,
.width = 17,
.height = 4,
.paletteNum = 0xF,
.baseBlock = 0x260
},
{
.bg = 0,
.tilemapLeft = 1,
.tilemapTop = 0x1F,
.width = 9,
.height = 2,
.paletteNum = 0xF,
.baseBlock = 0x2A4
},
{
.bg = 0,
.tilemapLeft = 1,
.tilemapTop = 0x21,
.width = 9,
.height = 2,
.paletteNum = 0xF,
.baseBlock = 0x2B6
},
{
.bg = 0,
.tilemapLeft = 1,
.tilemapTop = 0x23,
.width = 9,
.height = 2,
.paletteNum = 0xF,
.baseBlock = 0x2C8
},
{
.bg = 0,
.tilemapLeft = 1,
.tilemapTop = 0x25,
.width = 9,
.height = 2,
.paletteNum = 0xF,
.baseBlock = 0x2DA
},
{
.bg = 0,
.tilemapLeft = 16,
.tilemapTop = 0x1F,
.width = 1,
.height = 2,
.paletteNum = 0xF,
.baseBlock = 0x2EC
},
{
.bg = 0,
.tilemapLeft = 11,
.tilemapTop = 0x23,
.width = 18,
.height = 4,
.paletteNum = 0xF,
.baseBlock = 0x2EE
},
DUMMY_WIN_TEMPLATE
};
#include "data/contest_opponents.h"
static void TaskDummy1(u8 taskId)
{
}

80
src/data/contest_opponents.h Normal file
View File

@@ -0,0 +1,80 @@
#include "global.h"
#include "contest.h"
#include "constants/species.h"
const struct ContestWinner gUnknown_08587FA4[] =
{
{
.personality = 0,
.trainerId = 0xFFFF,
.species = SPECIES_ELECTRIKE,
.contestCategory = CONTEST_CATEGORY_CUTE,
.monName = _("ELECTER"),
.trainerName = _("EZRA"),
.contestRank = CONTEST_RANK_NORMAL
},
{
.personality = 0,
.trainerId = 0xFFFF,
.species = SPECIES_TROPIUS,
.contestCategory = CONTEST_CATEGORY_COOL,
.monName = _("TROPO"),
.trainerName = _("ALLAN"),
.contestRank = CONTEST_RANK_HYPER
},
{
.personality = 0,
.trainerId = 0xFFFF,
.species = SPECIES_XATU,
.contestCategory = CONTEST_CATEGORY_BEAUTY,
.monName = _("TUXA"),
.trainerName = _("JULIET"),
.contestRank = CONTEST_RANK_NORMAL
},
{
.personality = 0,
.trainerId = 0xFFFF,
.species = SPECIES_PLUSLE,
.contestCategory = CONTEST_CATEGORY_TOUGH,
.monName = _("PULSE"),
.trainerName = _("BAILY"),
.contestRank = CONTEST_RANK_MASTER
},
{
.personality = 0,
.trainerId = 0xFFFF,
.species = SPECIES_SHUPPET,
.contestCategory = CONTEST_CATEGORY_SMART,
.monName = _("SHUPUP"),
.trainerName = _("MELANY"),
.contestRank = CONTEST_RANK_SUPER
},
{
.personality = 0,
.trainerId = 0xFFFF,
.species = SPECIES_ZANGOOSE,
.contestCategory = CONTEST_CATEGORY_COOL,
.monName = _("GOOZAN"),
.trainerName = _("HANA"),
.contestRank = CONTEST_RANK_HYPER
},
{
.personality = 0,
.trainerId = 0xFFFF,
.species = SPECIES_LOUDRED,
.contestCategory = CONTEST_CATEGORY_BEAUTY,
.monName = _("LOUDED"),
.trainerName = _("BRYANT"),
.contestRank = CONTEST_RANK_HYPER
},
{
.personality = 0,
.trainerId = 0xFFFF,
.species = SPECIES_DELCATTY,
.contestCategory = CONTEST_CATEGORY_CUTE,
.monName = _("KITSY"),
.trainerName = _("OMAR"),
.contestRank = CONTEST_RANK_MASTER
}
};