Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Oinkologne Male define

Browse Source
This commit is contained in:
Eduardo Quezada 2023-10-23 10:12:55 -03:00
parent a92a3256df
commit e6c5077d7c
22 changed files with 32 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/constants/species.h
View File

@ -1449,7 +1449,8 @@
#define SPECIES_QUAXWELL GEN9_START + 8
#define SPECIES_QUAQUAVAL GEN9_START + 9
#define SPECIES_LECHONK GEN9_START + 10
#define SPECIES_OINKOLOGNE GEN9_START + 11
#define SPECIES_OINKOLOGNE SPECIES_OINKOLOGNE_MALE
#define SPECIES_OINKOLOGNE_MALE GEN9_START + 11
#define SPECIES_TAROUNTULA GEN9_START + 12
#define SPECIES_SPIDOPS GEN9_START + 13
#define SPECIES_NYMBLE GEN9_START + 14

10
include/graphics.h
View File

@ -7497,11 +7497,11 @@ extern const u32 gMonBackPic_Lechonk[];
extern const u32 gMonShinyPalette_Lechonk[];
extern const u8 gMonIcon_Lechonk[];
extern const u8 gMonFootprint_Lechonk[];
extern const u32 gMonFrontPic_Oinkologne[];
extern const u32 gMonPalette_Oinkologne[];
extern const u32 gMonBackPic_Oinkologne[];
extern const u32 gMonShinyPalette_Oinkologne[];
extern const u8 gMonIcon_Oinkologne[];
extern const u32 gMonFrontPic_OinkologneMale[];
extern const u32 gMonPalette_OinkologneMale[];
extern const u32 gMonBackPic_OinkologneMale[];
extern const u32 gMonShinyPalette_OinkologneMale[];
extern const u8 gMonIcon_OinkologneMale[];
extern const u8 gMonFootprint_Oinkologne[];
extern const u32 gMonFrontPic_OinkologneFemale[];
extern const u32 gMonPalette_OinkologneFemale[];

10
src/data/graphics/pokemon.h
View File

@ -7440,11 +7440,11 @@ const u32 gMonShinyPalette_Lechonk[] = INCBIN_U32("graphics/pokemon/lechonk/shin
const u8 gMonIcon_Lechonk[] = INCBIN_U8("graphics/pokemon/lechonk/icon.4bpp");
// const u8 gMonFootprint_Lechonk[] = INCBIN_U8("graphics/pokemon/lechonk/footprint.1bpp");
const u32 gMonFrontPic_Oinkologne[] = INCBIN_U32("graphics/pokemon/oinkologne/front.4bpp.lz");
const u32 gMonPalette_Oinkologne[] = INCBIN_U32("graphics/pokemon/oinkologne/normal.gbapal.lz");
const u32 gMonBackPic_Oinkologne[] = INCBIN_U32("graphics/pokemon/oinkologne/back.4bpp.lz");
const u32 gMonShinyPalette_Oinkologne[] = INCBIN_U32("graphics/pokemon/oinkologne/shiny.gbapal.lz");
const u8 gMonIcon_Oinkologne[] = INCBIN_U8("graphics/pokemon/oinkologne/icon.4bpp");
const u32 gMonFrontPic_OinkologneMale[] = INCBIN_U32("graphics/pokemon/oinkologne/front.4bpp.lz");
const u32 gMonPalette_OinkologneMale[] = INCBIN_U32("graphics/pokemon/oinkologne/normal.gbapal.lz");
const u32 gMonBackPic_OinkologneMale[] = INCBIN_U32("graphics/pokemon/oinkologne/back.4bpp.lz");
const u32 gMonShinyPalette_OinkologneMale[] = INCBIN_U32("graphics/pokemon/oinkologne/shiny.gbapal.lz");
const u8 gMonIcon_OinkologneMale[] = INCBIN_U8("graphics/pokemon/oinkologne/icon.4bpp");
// const u8 gMonFootprint_Oinkologne[] = INCBIN_U8("graphics/pokemon/oinkologne/footprint.1bpp");
const u32 gMonFrontPic_OinkologneFemale[] = INCBIN_U32("graphics/pokemon/oinkologne/female/front.4bpp.lz");

2
src/data/pokemon/evolution.h
View File

@ -547,7 +547,7 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] =
[SPECIES_CROCALOR] = {{EVO_LEVEL, 36, SPECIES_SKELEDIRGE}},
[SPECIES_QUAXLY] = {{EVO_LEVEL, 16, SPECIES_QUAXWELL}},
[SPECIES_QUAXWELL] = {{EVO_LEVEL, 36, SPECIES_QUAQUAVAL}},
[SPECIES_LECHONK] = {{EVO_LEVEL_MALE, 18, SPECIES_OINKOLOGNE},
[SPECIES_LECHONK] = {{EVO_LEVEL_MALE, 18, SPECIES_OINKOLOGNE_MALE},
{EVO_LEVEL_FEMALE, 18, SPECIES_OINKOLOGNE_FEMALE}},
[SPECIES_TAROUNTULA] = {{EVO_LEVEL, 15, SPECIES_SPIDOPS}},
[SPECIES_NYMBLE] = {{EVO_LEVEL, 24, SPECIES_LOKIX}},

2
src/data/pokemon/form_species_table_pointers.h
View File

@ -176,7 +176,7 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] =
[SPECIES_BASCULEGION_MALE] = sBasculegionFormSpeciesIdTable,
#endif
#if P_GEN_9_POKEMON == TRUE
[SPECIES_OINKOLOGNE] = sOinkologneFormSpeciesIdTable,
[SPECIES_OINKOLOGNE_MALE] = sOinkologneFormSpeciesIdTable,
[SPECIES_MAUSHOLD] = sMausholdFormSpeciesIdTable,
[SPECIES_SQUAWKABILLY] = sSquawkabillyFormSpeciesIdTable,
[SPECIES_PALAFIN] = sPalafinFormSpeciesIdTable,

2
src/data/pokemon/form_species_tables.h
View File

@ -1317,7 +1317,7 @@ static const u16 sBasculegionFormSpeciesIdTable[] = {
#if P_GEN_9_POKEMON == TRUE
static const u16 sOinkologneFormSpeciesIdTable[] = {
SPECIES_OINKOLOGNE,
SPECIES_OINKOLOGNE_MALE,
SPECIES_OINKOLOGNE_FEMALE,
FORM_SPECIES_END,
};

2
src/data/pokemon/level_up_learnset_pointers.h
View File

@ -927,7 +927,7 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] =
[SPECIES_QUAXWELL] = sQuaxwellLevelUpLearnset,
[SPECIES_QUAQUAVAL] = sQuaquavalLevelUpLearnset,
[SPECIES_LECHONK] = sLechonkLevelUpLearnset,
[SPECIES_OINKOLOGNE] = sOinkologneLevelUpLearnset,
[SPECIES_OINKOLOGNE_MALE] = sOinkologneMaleLevelUpLearnset,
[SPECIES_TAROUNTULA] = sTarountulaLevelUpLearnset,
[SPECIES_SPIDOPS] = sSpidopsLevelUpLearnset,
[SPECIES_NYMBLE] = sNymbleLevelUpLearnset,

2
src/data/pokemon/level_up_learnsets.h
View File

@ -19849,7 +19849,7 @@ static const struct LevelUpMove sLechonkLevelUpLearnset[] = {
LEVEL_UP_END
};
static const struct LevelUpMove sOinkologneLevelUpLearnset[] = {
static const struct LevelUpMove sOinkologneMaleLevelUpLearnset[] = {
LEVEL_UP_MOVE( 1, MOVE_TACKLE),
LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP),
LEVEL_UP_MOVE( 5, MOVE_DISARMING_VOICE),

2
src/data/pokemon/species_info.h
View File

@ -25282,7 +25282,7 @@ const struct SpeciesInfo gSpeciesInfo[] =
.bodyColor = BODY_COLOR_GRAY, \
.noFlip = FALSE
[SPECIES_OINKOLOGNE] =
[SPECIES_OINKOLOGNE_MALE] =
{
.baseHP = 110,
.baseAttack = 100,

2
src/data/pokemon/teachable_learnset_pointers.h
View File

@ -927,7 +927,7 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] =
[SPECIES_QUAXWELL] = sQuaxwellTeachableLearnset,
[SPECIES_QUAQUAVAL] = sQuaquavalTeachableLearnset,
[SPECIES_LECHONK] = sLechonkTeachableLearnset,
[SPECIES_OINKOLOGNE] = sOinkologneTeachableLearnset,
[SPECIES_OINKOLOGNE_MALE] = sOinkologneMaleTeachableLearnset,
[SPECIES_TAROUNTULA] = sTarountulaTeachableLearnset,
[SPECIES_SPIDOPS] = sSpidopsTeachableLearnset,
[SPECIES_NYMBLE] = sNymbleTeachableLearnset,

2
src/data/pokemon/teachable_learnsets.h
View File

@ -34142,7 +34142,7 @@ static const u16 sLechonkTeachableLearnset[] = {
MOVE_UNAVAILABLE,
};
static const u16 sOinkologneTeachableLearnset[] = {
static const u16 sOinkologneMaleTeachableLearnset[] = {
MOVE_BODY_PRESS,
MOVE_BODY_SLAM,
MOVE_BULLDOZE,

2
src/data/pokemon_graphics/back_pic_coordinates.h
View File

@ -954,7 +954,7 @@ const struct MonCoords gMonBackPicCoords[NUM_SPECIES + 1] =
[SPECIES_QUAXWELL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 2 },
[SPECIES_QUAQUAVAL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 1 },
[SPECIES_LECHONK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 11 },
[SPECIES_OINKOLOGNE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 8 },
[SPECIES_OINKOLOGNE_MALE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 8 },
[SPECIES_OINKOLOGNE_FEMALE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 7 },
[SPECIES_TAROUNTULA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 11 },
[SPECIES_SPIDOPS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },

2
src/data/pokemon_graphics/back_pic_table.h
View File

@ -1387,7 +1387,7 @@ const struct CompressedSpriteSheet gMonBackPicTable[NUM_SPECIES + 1] =
SPECIES_SPRITE(QUAXWELL, gMonBackPic_Quaxwell),
SPECIES_SPRITE(QUAQUAVAL, gMonBackPic_Quaquaval),
SPECIES_SPRITE(LECHONK, gMonBackPic_Lechonk),
SPECIES_SPRITE(OINKOLOGNE, gMonBackPic_Oinkologne),
SPECIES_SPRITE(OINKOLOGNE_MALE, gMonBackPic_OinkologneMale),
SPECIES_SPRITE(OINKOLOGNE_FEMALE, gMonBackPic_OinkologneFemale),
SPECIES_SPRITE(TAROUNTULA, gMonBackPic_Tarountula),
SPECIES_SPRITE(SPIDOPS, gMonBackPic_Spidops),

2
src/data/pokemon_graphics/footprint_table.h
View File

@ -920,7 +920,7 @@ const u8 *const gMonFootprintTable[NUM_SPECIES + 1] =
//[SPECIES_QUAXWELL] = gMonFootprint_Quaxwell,
//[SPECIES_QUAQUAVAL] = gMonFootprint_Quaquaval,
//[SPECIES_LECHONK] = gMonFootprint_Lechonk,
//[SPECIES_OINKOLOGNE] = gMonFootprint_Oinkologne,
//[SPECIES_OINKOLOGNE_MALE] = gMonFootprint_Oinkologne,
//[SPECIES_TAROUNTULA] = gMonFootprint_Tarountula,
//[SPECIES_SPIDOPS] = gMonFootprint_Spidops,
//[SPECIES_NYMBLE] = gMonFootprint_Nymble,

2
src/data/pokemon_graphics/front_pic_anims.h
View File

@ -13036,7 +13036,7 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[NUM_SPECIES + 1] =
[SPECIES_QUAXWELL] = sAnims_Quaxwell,
[SPECIES_QUAQUAVAL] = sAnims_Quaquaval,
[SPECIES_LECHONK] = sAnims_Lechonk,
[SPECIES_OINKOLOGNE] = sAnims_Oinkologne,
[SPECIES_OINKOLOGNE_MALE] = sAnims_Oinkologne,
[SPECIES_TAROUNTULA] = sAnims_Tarountula,
[SPECIES_SPIDOPS] = sAnims_Spidops,
[SPECIES_NYMBLE] = sAnims_Nymble,

2
src/data/pokemon_graphics/front_pic_coordinates.h
View File

@ -932,7 +932,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES + 1] =
[SPECIES_QUAXWELL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_QUAQUAVAL] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_LECHONK] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 10 },
[SPECIES_OINKOLOGNE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 6 },
[SPECIES_OINKOLOGNE_MALE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 6 },
[SPECIES_TAROUNTULA] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 11 },
[SPECIES_SPIDOPS] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },
[SPECIES_NYMBLE] = { .size = MON_COORDS_SIZE(64, 64), .y_offset = 0 },

2
src/data/pokemon_graphics/front_pic_table.h
View File

@ -1385,7 +1385,7 @@ const struct CompressedSpriteSheet gMonFrontPicTable[NUM_SPECIES + 1] =
SPECIES_SPRITE(QUAXWELL, gMonFrontPic_Quaxwell),
SPECIES_SPRITE(QUAQUAVAL, gMonFrontPic_Quaquaval),
SPECIES_SPRITE(LECHONK, gMonFrontPic_Lechonk),
SPECIES_SPRITE(OINKOLOGNE, gMonFrontPic_Oinkologne),
SPECIES_SPRITE(OINKOLOGNE_MALE, gMonFrontPic_OinkologneMale),
SPECIES_SPRITE(OINKOLOGNE_FEMALE, gMonFrontPic_OinkologneFemale),
SPECIES_SPRITE(TAROUNTULA, gMonFrontPic_Tarountula),
SPECIES_SPRITE(SPIDOPS, gMonFrontPic_Spidops),

2
src/data/pokemon_graphics/palette_table.h
View File

@ -1385,7 +1385,7 @@ const struct CompressedSpritePalette gMonPaletteTable[NUM_SPECIES + 1] =
SPECIES_PAL(QUAXWELL, gMonPalette_Quaxwell),
SPECIES_PAL(QUAQUAVAL, gMonPalette_Quaquaval),
SPECIES_PAL(LECHONK, gMonPalette_Lechonk),
SPECIES_PAL(OINKOLOGNE, gMonPalette_Oinkologne),
SPECIES_PAL(OINKOLOGNE_MALE, gMonPalette_OinkologneMale),
SPECIES_PAL(OINKOLOGNE_FEMALE, gMonPalette_OinkologneFemale),
SPECIES_PAL(TAROUNTULA, gMonPalette_Tarountula),
SPECIES_PAL(SPIDOPS, gMonPalette_Spidops),

2
src/data/pokemon_graphics/shiny_palette_table.h
View File

@ -1384,7 +1384,7 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[NUM_SPECIES + 1] =
SPECIES_SHINY_PAL(QUAXWELL, gMonShinyPalette_Quaxwell),
SPECIES_SHINY_PAL(QUAQUAVAL, gMonShinyPalette_Quaquaval),
SPECIES_SHINY_PAL(LECHONK, gMonShinyPalette_Lechonk),
SPECIES_SHINY_PAL(OINKOLOGNE, gMonShinyPalette_Oinkologne),
SPECIES_SHINY_PAL(OINKOLOGNE_MALE, gMonShinyPalette_OinkologneMale),
SPECIES_SHINY_PAL(OINKOLOGNE_FEMALE, gMonShinyPalette_OinkologneFemale),
SPECIES_SHINY_PAL(TAROUNTULA, gMonShinyPalette_Tarountula),
SPECIES_SHINY_PAL(SPIDOPS, gMonShinyPalette_Spidops),

2
src/data/text/species_names.h
View File

@ -926,7 +926,7 @@ const u8 gSpeciesNames[NUM_SPECIES][POKEMON_NAME_LENGTH + 1] = {
[SPECIES_QUAXWELL] = _("Quaxwell"),
[SPECIES_QUAQUAVAL] = _("Quaquaval"),
[SPECIES_LECHONK] = _("Lechonk"),
[SPECIES_OINKOLOGNE] = _("Oinkologne"),
[SPECIES_OINKOLOGNE_MALE] = _("Oinkologne"),
[SPECIES_TAROUNTULA] = _("Tarountula"),
[SPECIES_SPIDOPS] = _("Spidops"),
[SPECIES_NYMBLE] = _("Nymble"),

2
src/pokemon.c
View File

@ -3076,7 +3076,7 @@ const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] =
[SPECIES_QUAXWELL - 1] = ANIM_V_SQUISH_AND_BOUNCE,
[SPECIES_QUAQUAVAL - 1] = ANIM_V_SQUISH_AND_BOUNCE,
[SPECIES_LECHONK - 1] = ANIM_V_SQUISH_AND_BOUNCE,
[SPECIES_OINKOLOGNE - 1] = ANIM_V_SQUISH_AND_BOUNCE,
[SPECIES_OINKOLOGNE_MALE - 1] = ANIM_V_SQUISH_AND_BOUNCE,
[SPECIES_TAROUNTULA - 1] = ANIM_V_SQUISH_AND_BOUNCE,
[SPECIES_SPIDOPS - 1] = ANIM_V_SQUISH_AND_BOUNCE,
[SPECIES_NYMBLE - 1] = ANIM_V_SQUISH_AND_BOUNCE,

4
src/pokemon_icon.c
View File

@ -1344,7 +1344,7 @@ const u8 *const gMonIconTable[NUM_SPECIES + 1] =
[SPECIES_QUAXWELL] = gMonIcon_Quaxwell,
[SPECIES_QUAQUAVAL] = gMonIcon_Quaquaval,
[SPECIES_LECHONK] = gMonIcon_Lechonk,
[SPECIES_OINKOLOGNE] = gMonIcon_Oinkologne,
[SPECIES_OINKOLOGNE_MALE] = gMonIcon_OinkologneMale,
[SPECIES_OINKOLOGNE_FEMALE] = gMonIcon_OinkologneFemale,
[SPECIES_TAROUNTULA] = gMonIcon_Tarountula,
[SPECIES_SPIDOPS] = gMonIcon_Spidops,
@ -2728,7 +2728,7 @@ const u8 gMonIconPaletteIndices[] =
[SPECIES_QUAXWELL] = 0,
[SPECIES_QUAQUAVAL] = 0,
[SPECIES_LECHONK] = 1,
[SPECIES_OINKOLOGNE] = 1,
[SPECIES_OINKOLOGNE_MALE] = 1,
[SPECIES_OINKOLOGNE_FEMALE] = 2,
[SPECIES_TAROUNTULA] = 1,
[SPECIES_SPIDOPS] = 1,