ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-16 19:47:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Resolved review suggestions for upstream Pokemon Expansion sync.

Browse Source
This commit is contained in:
ultima-soul 2021-12-09 09:51:28 -08:00
parent a68a39e35f
commit d99ac2e44a
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/link_rfu.h
View File

@ -102,7 +102,7 @@ struct RfuGameCompatibilityData
struct __attribute__((packed, aligned(2))) RfuGameData
{
struct RfuGameCompatibilityData compatibility;
u8 partnerInfo[RFU_CHILD_MAX];
u8 partnerInfo[RFU_CHILD_MAX];
u16 tradeSpecies;
u8 activity:7;
u8 startedActivity:1;

2
src/battle_anim_effects_3.c
View File

@ -3247,7 +3247,7 @@ void AnimTask_RolePlaySilhouette(u8 taskId)
}
coord1 = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X);
coord2 = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X);
coord2 = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y);
spriteId = CreateAdditionalMonSpriteForMoveAnim(species, isBackPic, 0, coord1 + xOffset, coord2, 5, personality, otId, gBattleAnimTarget);
gSprites[spriteId].oam.priority = priority;