ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 11:44:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1326 from ultima-soul/add_fairy_type_icon_ie

Browse Source 
Add Fairy-type Icon to Fix Contest Move Viewing Crash
This commit is contained in:
ghoulslash 2021-01-21 12:19:10 -07:00 committed by GitHub
commit c5491664bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
graphics/types/fairy.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 245 B

2
graphics_file_rules.mk
View File

@ -18,7 +18,7 @@ PSSGFXDIR := graphics/pokemon_storage
OBJEVENTGFXDIR := graphics/object_events OBJEVENTGFXDIR := graphics/object_events
MISCGFXDIR := graphics/misc MISCGFXDIR := graphics/misc
types := normal fight flying poison ground rock bug ghost steel mystery fire water grass electric psychic ice dragon dark types := normal fight flying poison ground rock bug ghost steel mystery fire water grass electric psychic ice dragon dark fairy
contest_types := cool beauty cute smart tough contest_types := cool beauty cute smart tough

6
src/pokemon_summary_screen.c
View File

@ -805,6 +805,10 @@ static const union AnimCmd sSpriteAnim_TypeDark[] = {
ANIMCMD_FRAME(TYPE_DARK * 8, 0, FALSE, FALSE), ANIMCMD_FRAME(TYPE_DARK * 8, 0, FALSE, FALSE),
ANIMCMD_END ANIMCMD_END
}; };
static const union AnimCmd sSpriteAnim_TypeFairy[] = {
ANIMCMD_FRAME(TYPE_FAIRY * 8, 0, FALSE, FALSE),
ANIMCMD_END
};
static const union AnimCmd sSpriteAnim_CategoryCool[] = { static const union AnimCmd sSpriteAnim_CategoryCool[] = {
ANIMCMD_FRAME((CONTEST_CATEGORY_COOL + NUMBER_OF_MON_TYPES) * 8, 0, FALSE, FALSE), ANIMCMD_FRAME((CONTEST_CATEGORY_COOL + NUMBER_OF_MON_TYPES) * 8, 0, FALSE, FALSE),
ANIMCMD_END ANIMCMD_END
@ -844,6 +848,7 @@ static const union AnimCmd *const sSpriteAnimTable_MoveTypes[NUMBER_OF_MON_TYPES
sSpriteAnim_TypeIce, sSpriteAnim_TypeIce,
sSpriteAnim_TypeDragon, sSpriteAnim_TypeDragon,
sSpriteAnim_TypeDark, sSpriteAnim_TypeDark,
sSpriteAnim_TypeFairy,
sSpriteAnim_CategoryCool, sSpriteAnim_CategoryCool,
sSpriteAnim_CategoryBeauty, sSpriteAnim_CategoryBeauty,
sSpriteAnim_CategoryCute, sSpriteAnim_CategoryCute,
@ -887,6 +892,7 @@ static const u8 sMoveTypeToOamPaletteNum[NUMBER_OF_MON_TYPES + CONTEST_CATEGORIE
[TYPE_ICE] = 14, [TYPE_ICE] = 14,
[TYPE_DRAGON] = 15, [TYPE_DRAGON] = 15,
[TYPE_DARK] = 13, [TYPE_DARK] = 13,
[TYPE_FAIRY] = 14,
[NUMBER_OF_MON_TYPES + CONTEST_CATEGORY_COOL] = 13, [NUMBER_OF_MON_TYPES + CONTEST_CATEGORY_COOL] = 13,
[NUMBER_OF_MON_TYPES + CONTEST_CATEGORY_BEAUTY] = 14, [NUMBER_OF_MON_TYPES + CONTEST_CATEGORY_BEAUTY] = 14,
[NUMBER_OF_MON_TYPES + CONTEST_CATEGORY_CUTE] = 14, [NUMBER_OF_MON_TYPES + CONTEST_CATEGORY_CUTE] = 14,