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

port 80d51ac

Browse Source
This commit is contained in:
DizzyEggg 2018-10-07 17:45:37 +02:00
parent 61343d5069
commit 413e26e83d
8 changed files with 1029 additions and 2462 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2446
asm/battle_anim_80D51AC.s
View File

File diff suppressed because it is too large Load Diff

8
data/battle_anim_scripts.s
View File

@ -6166,7 +6166,7 @@ Move_WING_ATTACK:
monbgprio_28 ANIM_TARGET monbgprio_28 ANIM_TARGET
setalpha 12, 8 setalpha 12, 8
loopsewithpan SE_W017, -64, 20, 2 loopsewithpan SE_W017, -64, 20, 2
createvisualtask sub_80D5738, 2, 0, 12, 4, 1, 4 createvisualtask AnimTask_TranslateMonElliptical, 2, 0, 12, 4, 1, 4
createvisualtask sub_810DED8, 5, 1, 70 createvisualtask sub_810DED8, 5, 1, 70
createsprite gBattleAnimSpriteTemplate_85962A4, 2, -25, 0, 0, 0, 20 createsprite gBattleAnimSpriteTemplate_85962A4, 2, -25, 0, 0, 0, 20
createsprite gBattleAnimSpriteTemplate_85962A4, 2, 25, 0, 0, 0, 20 createsprite gBattleAnimSpriteTemplate_85962A4, 2, 25, 0, 0, 0, 20
@ -6694,8 +6694,8 @@ Move_SUBMISSION:
waitplaysewithpan SE_W004, +63, 70 waitplaysewithpan SE_W004, +63, 70
waitplaysewithpan SE_W104, -64, 80 waitplaysewithpan SE_W104, -64, 80
waitplaysewithpan SE_W004, +63, 0x5A waitplaysewithpan SE_W004, +63, 0x5A
createvisualtask sub_80D5738, 2, 0, -18, 6, 6, 4 createvisualtask AnimTask_TranslateMonElliptical, 2, 0, -18, 6, 6, 4
createvisualtask sub_80D5738, 2, 1, 18, 6, 6, 4 createvisualtask AnimTask_TranslateMonElliptical, 2, 1, 18, 6, 6, 4
call Submission1 call Submission1
call Submission1 call Submission1
call Submission1 call Submission1
@ -7219,7 +7219,7 @@ Move_STEEL_WING:
monbgprio_28 ANIM_TARGET monbgprio_28 ANIM_TARGET
setalpha 12, 8 setalpha 12, 8
loopsewithpan SE_W017, -64, 20, 2 loopsewithpan SE_W017, -64, 20, 2
createvisualtask sub_80D5738, 2, 0, 12, 4, 1, 4 createvisualtask AnimTask_TranslateMonElliptical, 2, 0, 12, 4, 1, 4
createvisualtask sub_810DED8, 5, 1, 70 createvisualtask sub_810DED8, 5, 1, 70
createsprite gBattleAnimSpriteTemplate_85962A4, 2, -25, 0, 0, 0, 20 createsprite gBattleAnimSpriteTemplate_85962A4, 2, -25, 0, 0, 0, 20
createsprite gBattleAnimSpriteTemplate_85962A4, 2, 25, 0, 0, 0, 20 createsprite gBattleAnimSpriteTemplate_85962A4, 2, 25, 0, 0, 0, 20

9
include/battle_anim.h
View File

@ -39,7 +39,7 @@ extern bool8 gAnimScriptActive;
extern u8 gAnimVisualTaskCount; extern u8 gAnimVisualTaskCount;
extern u8 gAnimSoundTaskCount; extern u8 gAnimSoundTaskCount;
extern struct DisableStruct *gAnimDisableStructPtr; extern struct DisableStruct *gAnimDisableStructPtr;
extern u32 gAnimMoveDmg; extern s32 gAnimMoveDmg;
extern u16 gAnimMovePower; extern u16 gAnimMovePower;
extern u8 gAnimFriendship; extern u8 gAnimFriendship;
extern u16 gWeatherMoveAnim; extern u16 gWeatherMoveAnim;
@ -80,6 +80,13 @@ void sub_80A6B30(struct UnknownAnimStruct2*);
void sub_80A6B90(struct UnknownAnimStruct2*, u32 arg1); void sub_80A6B90(struct UnknownAnimStruct2*, u32 arg1);
u8 sub_80A82E4(u8 battlerId); u8 sub_80A82E4(u8 battlerId);
bool8 TranslateAnimArc(struct Sprite *sprite); bool8 TranslateAnimArc(struct Sprite *sprite);
void sub_80A6630(struct Sprite *sprite);
void sub_80A6680(struct Sprite *sprite);
void sub_80A7344(u8 spriteId);
void obj_id_set_rotscale(u8 spriteId, s16 xScale, s16 yScale, u16 rotation);
void sub_80A6E14(struct Sprite *sprite);
void sub_80A7270(u8 spriteId, u8 objMode);
void sub_80A73A0(u8 spriteId);
enum enum
{ {

2
ld_script.txt
View File

@ -134,7 +134,7 @@ SECTIONS {
src/mail_data.o(.text); src/mail_data.o(.text);
src/map_name_popup.o(.text); src/map_name_popup.o(.text);
src/item_menu_icons.o(.text); src/item_menu_icons.o(.text);
asm/battle_anim_80D51AC.o(.text); src/battle_anim_80D51AC.o(.text);
src/item.o(.text); src/item.o(.text);
src/contest.o(.text); src/contest.o(.text);
asm/contest.o(.text); asm/contest.o(.text);

2
src/battle_anim.c
View File

@ -107,7 +107,7 @@ EWRAM_DATA bool8 gAnimScriptActive = FALSE;
EWRAM_DATA u8 gAnimVisualTaskCount = 0; EWRAM_DATA u8 gAnimVisualTaskCount = 0;
EWRAM_DATA u8 gAnimSoundTaskCount = 0; EWRAM_DATA u8 gAnimSoundTaskCount = 0;
EWRAM_DATA struct DisableStruct *gAnimDisableStructPtr = NULL; EWRAM_DATA struct DisableStruct *gAnimDisableStructPtr = NULL;
EWRAM_DATA u32 gAnimMoveDmg = 0; EWRAM_DATA s32 gAnimMoveDmg = 0;
EWRAM_DATA u16 gAnimMovePower = 0; EWRAM_DATA u16 gAnimMovePower = 0;
EWRAM_DATA static u16 sAnimSpriteIndexArray[ANIM_SPRITE_INDEX_COUNT] = {0}; EWRAM_DATA static u16 sAnimSpriteIndexArray[ANIM_SPRITE_INDEX_COUNT] = {0};
EWRAM_DATA u8 gAnimFriendship = 0; EWRAM_DATA u8 gAnimFriendship = 0;

1
src/battle_anim_80A5C6C.c
View File

@ -38,7 +38,6 @@ extern const union AffineAnimCmd *gUnknown_082FF6C0[];
void sub_80A64EC(struct Sprite *sprite); void sub_80A64EC(struct Sprite *sprite);
void sub_80A653C(struct Sprite *sprite); void sub_80A653C(struct Sprite *sprite);
void InitAnimLinearTranslation(struct Sprite *sprite); void InitAnimLinearTranslation(struct Sprite *sprite);
void sub_80A6E14(struct Sprite *sprite);
void sub_80A6FB4(struct Sprite *sprite); void sub_80A6FB4(struct Sprite *sprite);
void sub_80A6F98(struct Sprite *sprite); void sub_80A6F98(struct Sprite *sprite);
void sub_80A7144(struct Sprite *sprite); void sub_80A7144(struct Sprite *sprite);

1007
src/battle_anim_80D51AC.c Normal file
View File

File diff suppressed because it is too large Load Diff

16
src/item_menu_icons.c
View File

@ -19,10 +19,10 @@ struct CompressedTilesPal
const u8 *pal; const u8 *pal;
}; };
extern void sub_80D5860(struct Sprite *sprite); extern void DoHorizontalLunge(struct Sprite *sprite);
extern void sub_80D58F8(struct Sprite *sprite); extern void DoVerticalDip(struct Sprite *sprite);
extern void sub_80D5968(struct Sprite *sprite); extern void SlideMonToOriginalPos(struct Sprite *sprite);
extern void sub_80D5A94(struct Sprite *sprite); extern void SlideMonToOffset(struct Sprite *sprite);
extern void sub_80D5B48(struct Sprite *sprite); extern void sub_80D5B48(struct Sprite *sprite);
// this file's functions // this file's functions
@ -422,7 +422,7 @@ const struct SpriteTemplate gHorizontalLungeSpriteTemplate =
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80D5860, .callback = DoHorizontalLunge,
}; };
const struct SpriteTemplate gVerticalDipSpriteTemplate = const struct SpriteTemplate gVerticalDipSpriteTemplate =
@ -433,7 +433,7 @@ const struct SpriteTemplate gVerticalDipSpriteTemplate =
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80D58F8, .callback = DoVerticalDip,
}; };
const struct SpriteTemplate gSlideMonToOriginalPosSpriteTemplate = const struct SpriteTemplate gSlideMonToOriginalPosSpriteTemplate =
@ -444,7 +444,7 @@ const struct SpriteTemplate gSlideMonToOriginalPosSpriteTemplate =
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80D5968, .callback = SlideMonToOriginalPos,
}; };
const struct SpriteTemplate gSlideMonToOffsetSpriteTemplate = const struct SpriteTemplate gSlideMonToOffsetSpriteTemplate =
@ -455,7 +455,7 @@ const struct SpriteTemplate gSlideMonToOffsetSpriteTemplate =
.anims = gDummySpriteAnimTable, .anims = gDummySpriteAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_80D5A94, .callback = SlideMonToOffset,
}; };
const struct SpriteTemplate gUnknown_0857FE88 = const struct SpriteTemplate gUnknown_0857FE88 =