dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #117 from jiangzhengwenjz/battle

Browse Source 
#107 review commit
This commit is contained in:
PikalaxALT
2019-10-12 21:19:22 -04:00
committed by GitHub
parent 807e03c25d 7c08a10359
commit 094b29edb5
5 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/battle_2.s
+1 -1
View File
@@ -4151,7 +4151,7 @@ _08011F46:
.align 2, 0 .align 2, 0
_08011F4C: .4byte gMonFrontPicCoords _08011F4C: .4byte gMonFrontPicCoords
_08011F50: _08011F50:
ldr r0, _08011F68 @ =0x00000181 ldr r0, _08011F68 @ =0x00000181 @ SPECIES_CASTFORM
cmp r4, r0 cmp r4, r0
bne _08011F74 bne _08011F74
ldr r0, _08011F6C @ =gCastformFrontSpriteCoords ldr r0, _08011F6C @ =gCastformFrontSpriteCoords
src/battle_anim_mons.c
+5 -4
View File
@@ -1369,18 +1369,18 @@ void sub_8075D9C(struct Sprite *sprite)
// arg 5: lower 8 bits = location on attacking mon, upper 8 bits = location on target mon pick to target // arg 5: lower 8 bits = location on attacking mon, upper 8 bits = location on target mon pick to target
void TranslateAnimSpriteToTargetMonLocation(struct Sprite *sprite) void TranslateAnimSpriteToTargetMonLocation(struct Sprite *sprite)
{ {
bool8 v1; bool8 respectMonPicOffsets;
u8 coordType; u8 coordType;
if (!(gBattleAnimArgs[5] & 0xFF00)) if (!(gBattleAnimArgs[5] & 0xFF00))
v1 = TRUE; respectMonPicOffsets = TRUE;
else else
v1 = FALSE; respectMonPicOffsets = FALSE;
if (!(gBattleAnimArgs[5] & 0xFF)) if (!(gBattleAnimArgs[5] & 0xFF))
coordType = BATTLER_COORD_Y_PIC_OFFSET; coordType = BATTLER_COORD_Y_PIC_OFFSET;
else else
coordType = BATTLER_COORD_Y; coordType = BATTLER_COORD_Y;
InitSpritePosToAnimAttacker(sprite, v1); InitSpritePosToAnimAttacker(sprite, respectMonPicOffsets);
if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
gBattleAnimArgs[2] = -gBattleAnimArgs[2]; gBattleAnimArgs[2] = -gBattleAnimArgs[2];
sprite->data[0] = gBattleAnimArgs[4]; sprite->data[0] = gBattleAnimArgs[4];
@@ -2183,6 +2183,7 @@ static void sub_8077118(u8 taskId)
static void sub_80771E4(struct Task *task, u8 taskId) static void sub_80771E4(struct Task *task, u8 taskId)
{ {
s16 spriteId = CloneBattlerSpriteWithBlend(0); s16 spriteId = CloneBattlerSpriteWithBlend(0);
if (spriteId >= 0) if (spriteId >= 0)
{ {
gSprites[spriteId].oam.priority = task->data[6]; gSprites[spriteId].oam.priority = task->data[6];
src/battle_anim_sound_tasks.c
+1 -1
View File
@@ -110,7 +110,7 @@ static void sub_80DCFE8(u8 taskId)
gTasks[taskId].data[10] = 0; gTasks[taskId].data[10] = 0;
dPan = gTasks[taskId].data[3]; dPan = gTasks[taskId].data[3];
oldPan = gTasks[taskId].data[11] ; oldPan = gTasks[taskId].data[11];
gTasks[taskId].data[11] = dPan + oldPan; gTasks[taskId].data[11] = dPan + oldPan;
gTasks[taskId].data[11] = KeepPanInRange(gTasks[taskId].data[11], oldPan); gTasks[taskId].data[11] = KeepPanInRange(gTasks[taskId].data[11], oldPan);
} }
src/dark.c
+2 -2
View File
@@ -727,7 +727,7 @@ static void sub_80B856C(u8 priority)
void sub_80B85B8(u8 taskId) void sub_80B85B8(u8 taskId)
{ {
u8 toBG2 = GetBattlerSpriteBGPriorityRank(gBattleAnimAttacker) ^ 1 ? 1 : 0; bool8 toBG2 = GetBattlerSpriteBGPriorityRank(gBattleAnimAttacker) ^ 1 ? TRUE : FALSE;
MoveBattlerSpriteToBG(gBattleAnimAttacker, toBG2); MoveBattlerSpriteToBG(gBattleAnimAttacker, toBG2);
gSprites[gBattlerSpriteIds[gBattleAnimAttacker]].invisible = FALSE; gSprites[gBattlerSpriteIds[gBattleAnimAttacker]].invisible = FALSE;
@@ -741,7 +741,7 @@ void sub_80B85B8(u8 taskId)
void sub_80B8664(u8 taskId) void sub_80B8664(u8 taskId)
{ {
u8 toBG2 = GetBattlerSpriteBGPriorityRank(gBattleAnimAttacker) ^ 1 ? 1 : 0; bool8 toBG2 = GetBattlerSpriteBGPriorityRank(gBattleAnimAttacker) ^ 1 ? TRUE : FALSE;
sub_8073128(toBG2); sub_8073128(toBG2);
if (IsBattlerSpriteVisible(BATTLE_PARTNER(gBattleAnimAttacker))) if (IsBattlerSpriteVisible(BATTLE_PARTNER(gBattleAnimAttacker)))
src/psychic.c
+6 -6
View File
@@ -430,13 +430,13 @@ static void sub_80B2ECC(struct Sprite *sprite)
u8 battler = battlerCopy = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT); u8 battler = battlerCopy = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT);
u8 rank = GetBattlerSpriteBGPriorityRank(battler); u8 rank = GetBattlerSpriteBGPriorityRank(battler);
s32 var0 = 1; s32 var0 = 1;
u8 toBG_2 = (rank ^ var0) != 0; bool8 toBG2 = (rank ^ var0) != 0;
if (IsBattlerSpriteVisible(battler)) if (IsBattlerSpriteVisible(battler))
MoveBattlerSpriteToBG(battler, toBG_2); MoveBattlerSpriteToBG(battler, toBG2);
battler = BATTLE_PARTNER(battlerCopy); battler = BATTLE_PARTNER(battlerCopy);
if (IsBattlerSpriteVisible(battler)) if (IsBattlerSpriteVisible(battler))
MoveBattlerSpriteToBG(battler, toBG_2 ^ var0); MoveBattlerSpriteToBG(battler, toBG2 ^ var0);
} }
if (!IsContest() && IsDoubleBattle()) if (!IsContest() && IsDoubleBattle())
{ {
@@ -522,13 +522,13 @@ static void sub_80B3168(struct Sprite *sprite)
u8 battler = battlerCopy = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT); u8 battler = battlerCopy = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT);
u8 rank = GetBattlerSpriteBGPriorityRank(battler); u8 rank = GetBattlerSpriteBGPriorityRank(battler);
s32 var0 = 1; s32 var0 = 1;
u8 toBG_2 = (rank ^ var0) != 0; bool8 toBG2 = (rank ^ var0) != 0;
if (IsBattlerSpriteVisible(battler)) if (IsBattlerSpriteVisible(battler))
sub_8073128(toBG_2); sub_8073128(toBG2);
battler = battlerCopy ^ 2; battler = battlerCopy ^ 2;
if (IsBattlerSpriteVisible(battler)) if (IsBattlerSpriteVisible(battler))
sub_8073128(toBG_2 ^ var0); sub_8073128(toBG2 ^ var0);
} }
sprite->callback = DestroyAnimSprite; sprite->callback = DestroyAnimSprite;
} }