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

Shyly begin move animations

Browse Source
This commit is contained in:
DizzyEggg 2018-09-10 17:11:16 +02:00
parent ae24f7de41
commit d20189234e
4 changed files with 1212 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/battle_anim_80FE840.s
View File

@ -3880,4 +3880,4 @@ gUnknown_08597424:: @ 8597424
.4byte task_battle_intro_80BC47C .4byte task_battle_intro_80BC47C
.4byte task_battle_intro_80BC47C .4byte task_battle_intro_80BC47C
.4byte task_battle_intro_anim .4byte task_battle_intro_anim
.4byte task_battle_intro_anim .4byte task_battle_intro_anim

1208
data/battle_anim_scripts.s
View File

File diff suppressed because it is too large Load Diff

2
src/battle_gfx_sfx_util.c
View File

@ -502,7 +502,7 @@ static void Task_ClearBitWhenSpecialAnimDone(u8 taskId)
// Great function to include newly added moves that don't have animation yet. // Great function to include newly added moves that don't have animation yet.
bool8 IsMoveWithoutAnimation(u16 moveId, u8 animationTurn) bool8 IsMoveWithoutAnimation(u16 moveId, u8 animationTurn)
{ {
if (moveId >= (MOVES_COUNT_GEN3 - 1)) if (moveId >= (MOVES_COUNT_GEN6 - 1))
return TRUE; return TRUE;
else else
return FALSE; return FALSE;

4
src/pokemon_summary_screen.c
View File

@ -855,7 +855,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_TypeFairy,
sSpriteAnim_CategoryCool, sSpriteAnim_CategoryCool,
sSpriteAnim_CategoryBeauty, sSpriteAnim_CategoryBeauty,
sSpriteAnim_CategoryCute, sSpriteAnim_CategoryCute,
@ -899,7 +899,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, [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,