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

sync with pret/pokeemerald#847

Browse Source
This commit is contained in:
jiangzhengwenjz
2019-10-21 05:02:05 +08:00
parent cfe2a27b9c
commit 8fa4c84dbd
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/battle_anim_effects_2.s
+4 -4
View File
@@ -3902,7 +3902,7 @@ _080A8C60:
subs r0, r4 subs r0, r4
strh r0, [r1] strh r0, [r1]
_080A8C6A: _080A8C6A:
ldr r1, _080A8C80 @ =AnimSparklingParticle ldr r1, _080A8C80 @ =AnimSpriteOnMonPos
str r1, [r6, 0x1C] str r1, [r6, 0x1C]
adds r0, r6, 0 adds r0, r6, 0
bl _call_via_r1 bl _call_via_r1
@@ -3912,7 +3912,7 @@ _080A8C6A:
bx r0 bx r0
.align 2, 0 .align 2, 0
_080A8C7C: .4byte gBattleAnimArgs _080A8C7C: .4byte gBattleAnimArgs
_080A8C80: .4byte AnimSparklingParticle _080A8C80: .4byte AnimSpriteOnMonPos
thumb_func_end sub_80A8BC4 thumb_func_end sub_80A8BC4
thumb_func_start sub_80A8C84 thumb_func_start sub_80A8C84
@@ -4233,7 +4233,7 @@ _080A8F0E:
adds r0, r4, 0 adds r0, r4, 0
movs r1, 0x1 movs r1, 0x1
bl StartSpriteAffineAnim bl StartSpriteAffineAnim
ldr r1, _080A8F34 @ =AnimSparklingParticle ldr r1, _080A8F34 @ =AnimSpriteOnMonPos
str r1, [r4, 0x1C] str r1, [r4, 0x1C]
adds r0, r4, 0 adds r0, r4, 0
bl _call_via_r1 bl _call_via_r1
@@ -4244,7 +4244,7 @@ _080A8F0E:
_080A8F28: .4byte 0x000027db _080A8F28: .4byte 0x000027db
_080A8F2C: .4byte 0x01010000 _080A8F2C: .4byte 0x01010000
_080A8F30: .4byte gBattleAnimArgs _080A8F30: .4byte gBattleAnimArgs
_080A8F34: .4byte AnimSparklingParticle _080A8F34: .4byte AnimSpriteOnMonPos
thumb_func_end sub_80A8EE8 thumb_func_end sub_80A8EE8
thumb_func_start sub_80A8F38 thumb_func_start sub_80A8F38
include/battle_anim.h
+2 -2
View File
@@ -240,9 +240,9 @@ void SetGreyscaleOrOriginalPalette(u16 paletteNum, bool8 restoreOriginalColor);
u32 sub_8075BE8(u8 battleBackground, u8 attacker, u8 target, u8 attackerPartner, u8 targetPartner, u8 a6, u8 a7); u32 sub_8075BE8(u8 battleBackground, u8 attacker, u8 target, u8 attackerPartner, u8 targetPartner, u8 a6, u8 a7);
u32 sub_8075CB8(u8 a1, u8 a2, u8 a3, u8 a4); u32 sub_8075CB8(u8 a1, u8 a2, u8 a3, u8 a4);
u8 sub_8075D80(u8 a1); u8 sub_8075D80(u8 a1);
void AnimSparklingParticle(struct Sprite *sprite); void AnimSpriteOnMonPos(struct Sprite *sprite);
void TranslateAnimSpriteToTargetMonLocation(struct Sprite *sprite); void TranslateAnimSpriteToTargetMonLocation(struct Sprite *sprite);
void sub_8075E80(struct Sprite *sprite); void AnimThrowProjectile(struct Sprite *sprite);
void sub_8075F0C(struct Sprite *sprite); void sub_8075F0C(struct Sprite *sprite);
s16 CloneBattlerSpriteWithBlend(u8 animBattler); s16 CloneBattlerSpriteWithBlend(u8 animBattler);
void obj_delete_but_dont_free_vram(struct Sprite *sprite); void obj_delete_but_dont_free_vram(struct Sprite *sprite);
src/battle_anim_mons.c
+5 -5
View File
@@ -28,7 +28,7 @@ static u8 GetBattlerSpriteFinal_Y(u8 battlerId, u16 species, bool8 a3);
static void sub_8075658(struct Sprite *sprite); static void sub_8075658(struct Sprite *sprite);
static void sub_80757E8(struct Sprite *sprite); static void sub_80757E8(struct Sprite *sprite);
static bool8 sub_80758DC(void); static bool8 sub_80758DC(void);
static void sub_8075EF0(struct Sprite *sprite); static void AnimThrowProjectile_Step(struct Sprite *sprite);
static void sub_80760D0(u8 taskId); static void sub_80760D0(u8 taskId);
static void AnimTask_BlendMonInAndOutSetup(struct Task *task); static void AnimTask_BlendMonInAndOutSetup(struct Task *task);
static void AnimTask_BlendMonInAndOutStep(u8 taskId); static void AnimTask_BlendMonInAndOutStep(u8 taskId);
@@ -1336,7 +1336,7 @@ static u8 GetBattlerAtPosition_(u8 position)
return GetBattlerAtPosition(position); return GetBattlerAtPosition(position);
} }
void AnimSparklingParticle(struct Sprite *sprite) void AnimSpriteOnMonPos(struct Sprite *sprite)
{ {
bool8 var; bool8 var;
@@ -1390,7 +1390,7 @@ void TranslateAnimSpriteToTargetMonLocation(struct Sprite *sprite)
StoreSpriteCallbackInData6(sprite, DestroyAnimSprite); StoreSpriteCallbackInData6(sprite, DestroyAnimSprite);
} }
void sub_8075E80(struct Sprite *sprite) void AnimThrowProjectile(struct Sprite *sprite)
{ {
InitSpritePosToAnimAttacker(sprite, 1); InitSpritePosToAnimAttacker(sprite, 1);
if (GetBattlerSide(gBattleAnimAttacker)) if (GetBattlerSide(gBattleAnimAttacker))
@@ -1400,10 +1400,10 @@ void sub_8075E80(struct Sprite *sprite)
sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y_PIC_OFFSET) + gBattleAnimArgs[3]; sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y_PIC_OFFSET) + gBattleAnimArgs[3];
sprite->data[5] = gBattleAnimArgs[5]; sprite->data[5] = gBattleAnimArgs[5];
InitAnimArcTranslation(sprite); InitAnimArcTranslation(sprite);
sprite->callback = sub_8075EF0; sprite->callback = AnimThrowProjectile_Step;
} }
static void sub_8075EF0(struct Sprite *sprite) static void AnimThrowProjectile_Step(struct Sprite *sprite)
{ {
if (TranslateAnimHorizontalArc(sprite)) if (TranslateAnimHorizontalArc(sprite))
DestroyAnimSprite(sprite); DestroyAnimSprite(sprite);
src/psychic.c
+2 -2
View File
@@ -47,7 +47,7 @@ const struct SpriteTemplate gUnknown_83E6DF8 =
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gUnknown_83E6DF4, .affineAnims = gUnknown_83E6DF4,
.callback = AnimSparklingParticle, .callback = AnimSpriteOnMonPos,
}; };
const struct SpriteTemplate gUnknown_83E6E10 = const struct SpriteTemplate gUnknown_83E6E10 =
@@ -376,7 +376,7 @@ const struct SpriteTemplate gUnknown_83E7148 =
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gUnknown_83E7144, .affineAnims = gUnknown_83E7144,
.callback = AnimSparklingParticle, .callback = AnimSpriteOnMonPos,
}; };
static const union AffineAnimCmd gUnknown_83E7160[] = static const union AffineAnimCmd gUnknown_83E7160[] =