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

Document battle animation scripts.

Browse Source
This commit is contained in:
DizzyEggg 2018-09-10 21:19:19 +02:00
parent 9438613291
commit 10b479a3ca
11 changed files with 1209 additions and 1215 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
asm/battle_anim_80A5C6C.s
View File

@ -4802,8 +4802,8 @@ _080A8136:
.pool
thumb_func_end sub_80A80C8
thumb_func_start sub_80A8140
sub_80A8140: @ 80A8140
thumb_func_start AnimTask_GetHappinessPowerLevel
AnimTask_GetHappinessPowerLevel: @ 80A8140
push {lr}
lsls r0, 24
lsrs r2, r0, 24
@ -4827,7 +4827,7 @@ _080A815E:
pop {r0}
bx r0
.pool
thumb_func_end sub_80A8140
thumb_func_end AnimTask_GetHappinessPowerLevel
thumb_func_start sub_80A8174
sub_80A8174: @ 80A8174

48
asm/battle_anim_80FE840.s
View File

@ -17049,8 +17049,8 @@ _08107118:
.pool
thumb_func_end sub_81070AC
thumb_func_start sub_8107144
sub_8107144: @ 8107144
thumb_func_start AnimTask_IsFuryCutterHitRight
AnimTask_IsFuryCutterHitRight: @ 8107144
push {lr}
lsls r0, 24
lsrs r0, 24
@ -17065,10 +17065,10 @@ sub_8107144: @ 8107144
pop {r0}
bx r0
.pool
thumb_func_end sub_8107144
thumb_func_end AnimTask_IsFuryCutterHitRight
thumb_func_start sub_8107168
sub_8107168: @ 8107168
thumb_func_start AnimTask_GetFuryCutterHitCount
AnimTask_GetFuryCutterHitCount: @ 8107168
push {lr}
lsls r0, 24
lsrs r0, 24
@ -17081,7 +17081,7 @@ sub_8107168: @ 8107168
pop {r0}
bx r0
.pool
thumb_func_end sub_8107168
thumb_func_end AnimTask_GetFuryCutterHitCount
thumb_func_start sub_8107188
sub_8107188: @ 8107188
@ -28522,8 +28522,8 @@ _0810CDF6:
bx r0
thumb_func_end sub_810CDB0
thumb_func_start sub_810CDFC
sub_810CDFC: @ 810CDFC
thumb_func_start AnimTask_GetRolloutCounter
AnimTask_GetRolloutCounter: @ 810CDFC
push {lr}
lsls r0, 24
lsrs r0, 24
@ -28544,7 +28544,7 @@ sub_810CDFC: @ 810CDFC
pop {r0}
bx r0
.pool
thumb_func_end sub_810CDFC
thumb_func_end AnimTask_GetRolloutCounter
thumb_func_start unc_080B08A0
unc_080B08A0: @ 810CE2C
@ -45184,8 +45184,8 @@ _081155F4:
.pool
thumb_func_end sub_8115588
thumb_func_start sub_8115600
sub_8115600: @ 8115600
thumb_func_start AnimTask_IsPowerOver99
AnimTask_IsPowerOver99: @ 8115600
push {lr}
lsls r0, 24
lsrs r1, r0, 24
@ -45203,7 +45203,7 @@ _08115614:
pop {r0}
bx r0
.pool
thumb_func_end sub_8115600
thumb_func_end AnimTask_IsPowerOver99
thumb_func_start sub_8115628
sub_8115628: @ 8115628
@ -49190,8 +49190,8 @@ _0811773E:
.pool
thumb_func_end sub_81176D8
thumb_func_start sub_8117754
sub_8117754: @ 8117754
thumb_func_start AnimTask_IsAttackerOpponentSide
AnimTask_IsAttackerOpponentSide: @ 8117754
push {r4,lr}
adds r4, r0, 0
lsls r4, 24
@ -49209,10 +49209,10 @@ sub_8117754: @ 8117754
pop {r0}
bx r0
.pool
thumb_func_end sub_8117754
thumb_func_end AnimTask_IsAttackerOpponentSide
thumb_func_start sub_8117780
sub_8117780: @ 8117780
thumb_func_start AnimTask_IsTargetOpponentSide
AnimTask_IsTargetOpponentSide: @ 8117780
push {r4,lr}
adds r4, r0, 0
lsls r4, 24
@ -49230,10 +49230,10 @@ sub_8117780: @ 8117780
pop {r0}
bx r0
.pool
thumb_func_end sub_8117780
thumb_func_end AnimTask_IsTargetOpponentSide
thumb_func_start sub_81177AC
sub_81177AC: @ 81177AC
thumb_func_start AnimTask_IsTargetPartner
AnimTask_IsTargetPartner: @ 81177AC
push {r4,r5,lr}
lsls r0, 24
lsrs r3, r0, 24
@ -49256,7 +49256,7 @@ _081177C8:
pop {r0}
bx r0
.pool
thumb_func_end sub_81177AC
thumb_func_end AnimTask_IsTargetPartner
thumb_func_start sub_81177E4
sub_81177E4: @ 81177E4
@ -50032,8 +50032,8 @@ _08117E34:
.pool
thumb_func_end sub_8117DD8
thumb_func_start sub_8117E60
sub_8117E60: @ 8117E60
thumb_func_start AnimTask_IsContest
AnimTask_IsContest: @ 8117E60
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
@ -50057,7 +50057,7 @@ _08117E84:
pop {r0}
bx r0
.pool
thumb_func_end sub_8117E60
thumb_func_end AnimTask_IsContest
thumb_func_start sub_8117E94
sub_8117E94: @ 8117E94

24
asm/battle_anim_815A0D4.s
View File

@ -1012,8 +1012,8 @@ _0815A8C2:
bx r0
thumb_func_end sub_815A8AC
thumb_func_start sub_815A8C8
sub_815A8C8: @ 815A8C8
thumb_func_start AnimTask_IsTargetPlayerSide
AnimTask_IsTargetPlayerSide: @ 815A8C8
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
@ -1039,10 +1039,10 @@ _0815A8F0:
pop {r0}
bx r0
.pool
thumb_func_end sub_815A8C8
thumb_func_end AnimTask_IsTargetPlayerSide
thumb_func_start sub_815A904
sub_815A904: @ 815A904
thumb_func_start AnimTask_IsHealingMove
AnimTask_IsHealingMove: @ 815A904
push {lr}
lsls r0, 24
lsrs r2, r0, 24
@ -1064,7 +1064,7 @@ _0815A924:
pop {r0}
bx r0
.pool
thumb_func_end sub_815A904
thumb_func_end AnimTask_IsHealingMove
thumb_func_start sub_815A934
sub_815A934: @ 815A934
@ -10861,8 +10861,8 @@ _0815F896:
.pool
thumb_func_end sub_815F7C4
thumb_func_start sub_815F8A0
sub_815F8A0: @ 815F8A0
thumb_func_start AnimTask_GetHappinessPowerLevel2
AnimTask_GetHappinessPowerLevel2: @ 815F8A0
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
@ -10904,7 +10904,7 @@ _0815F8E0:
pop {r0}
bx r0
.pool
thumb_func_end sub_815F8A0
thumb_func_end AnimTask_GetHappinessPowerLevel2
thumb_func_start sub_815F8F4
sub_815F8F4: @ 815F8F4
@ -12336,8 +12336,8 @@ _081604E8:
bx r0
thumb_func_end sub_81603F4
thumb_func_start sub_81604F0
sub_81604F0: @ 81604F0
thumb_func_start AnimTask_GetWeather
AnimTask_GetWeather: @ 81604F0
push {lr}
lsls r0, 24
lsrs r3, r0, 24
@ -12380,7 +12380,7 @@ _08160538:
bl DestroyAnimVisualTask
pop {r0}
bx r0
thumb_func_end sub_81604F0
thumb_func_end AnimTask_GetWeather
thumb_func_start sub_8160544
sub_8160544: @ 8160544

6
asm/battle_anim_8170478.s
View File

@ -1030,8 +1030,8 @@ sub_8170D24: @ 8170D24
.pool
thumb_func_end sub_8170D24
thumb_func_start sub_8170D4C
sub_8170D4C: @ 8170D4C
thumb_func_start AnimTask_IsBallBlockedByTrainer
AnimTask_IsBallBlockedByTrainer: @ 8170D4C
push {lr}
lsls r0, 24
lsrs r2, r0, 24
@ -1055,7 +1055,7 @@ _08170D74:
pop {r0}
bx r0
.pool
thumb_func_end sub_8170D4C
thumb_func_end AnimTask_IsBallBlockedByTrainer
thumb_func_start ItemIdToBallId
ItemIdToBallId: @ 8170D84

13
asm/macros/battle_anim_script.inc
View File

@ -266,3 +266,16 @@
.macro stopsound
.byte 0x2f
.endm
@ useful macros
.macro jumpreteq value, ptr
jumpargeq ARG_RET_ID, \value, \ptr
.endm
.macro jumprettrue ptr
jumpreteq TRUE, \ptr
.endm
.macro jumpretfalse ptr
jumpreteq FALSE, \ptr
.endm

2293
data/battle_anim_scripts.s
View File

File diff suppressed because it is too large Load Diff

2
data/battle_scripts_1.s
View File

@ -3741,7 +3741,7 @@ BattleScript_SAtkDown2End::
BattleScript_FocusPunchSetUp::
printstring STRINGID_EMPTYSTRING3
waitmessage 0x1
playanimation BS_ATTACKER, B_ANIM_x14, NULL
playanimation BS_ATTACKER, B_ANIM_FOCUS_PUNCH_SETUP, NULL
printstring STRINGID_PKMNTIGHTENINGFOCUS
waitmessage 0x40
end2

2
data/battle_scripts_2.s
View File

@ -190,7 +190,7 @@ BattleScript_ActionGetNear:
BattleScript_ActionThrowPokeblock:
printstring STRINGID_THREWPOKEBLOCKATPKMN
waitmessage 0x40
playanimation BS_ATTACKER, B_ANIM_x4, NULL
playanimation BS_ATTACKER, B_ANIM_POKEBLOCK_THROW, NULL
printfromtable gSafariPokeblockResultStringIds
waitmessage 0x40
end2

2
include/battle.h
View File

@ -609,7 +609,7 @@ struct BattleScripting
// rom_80A5C6C
u8 GetBattlerSide(u8 battler);
u8 GetBattlerPosition(u8 battler);
u8 GetBattlerAtPosition(u8 battler);
u8 GetBattlerAtPosition(u8 position);
struct BattleSpriteInfo
{

22
include/constants/battle_anim.h
View File

@ -41,7 +41,7 @@
#define B_ANIM_STATS_CHANGE 0x1
#define B_ANIM_SUBSTITUTE_FADE 0x2
#define B_ANIM_SUBSTITUTE_APPEAR 0x3
#define B_ANIM_x4 0x4
#define B_ANIM_POKEBLOCK_THROW 0x4
#define B_ANIM_ITEM_KNOCKOFF 0x5
#define B_ANIM_TURN_TRAP 0x6
#define B_ANIM_ITEM_EFFECT 0x7
@ -57,7 +57,7 @@
#define B_ANIM_SNATCH_MOVE 0x11
#define B_ANIM_FUTURE_SIGHT_HIT 0x12
#define B_ANIM_DOOM_DESIRE_HIT 0x13
#define B_ANIM_x14 0x14
#define B_ANIM_FOCUS_PUNCH_SETUP 0x14
#define B_ANIM_INGRAIN_HEAL 0x15
#define B_ANIM_WISH_HEAL 0x16
@ -82,4 +82,22 @@
#define B_ANIM_STATUS_NIGHTMARE 0x8
#define B_ANIM_STATUS_WRAPPED 0x9 // does not actually exist
// Most tasks return a value to gBattleAnimArgs[7].
#define ARG_RET_ID 0x7
// Trapping Wrap-like moves end turn animation.
#define TRAP_ANIM_BIND 0
#define TRAP_ANIM_WRAP 0
#define TRAP_ANIM_FIRE_SPIN 1
#define TRAP_ANIM_WHIRLPOOL 2
#define TRAP_ANIM_CLAMP 3
#define TRAP_ANIM_SAND_TOMB 4
// Weather defines for battle animation scripts.
#define ANIM_WEATHER_NONE 0
#define ANIM_WEATHER_SUN 1
#define ANIM_WEATHER_RAIN 2
#define ANIM_WEATHER_SANDSTORM 3
#define ANIM_WEATHER_HAIL 4
#endif // GUARD_CONSTANTS_BATTLE_ANIM_H

6
src/battle_anim.c
View File

@ -33,7 +33,7 @@ extern struct MusicPlayerInfo gMPlayInfo_BGM;
extern struct MusicPlayerInfo gMPlayInfo_SE1;
extern struct MusicPlayerInfo gMPlayInfo_SE2;
extern const u16 gUnknown_082C8D64[];
extern const u16 gMovesWithQuietBGM[];
extern const u8 * const gBattleAnims_Moves[];
extern const struct CompressedSpriteSheet gBattleAnimPicTable[];
extern const struct CompressedSpritePalette gBattleAnimPaletteTable[];
@ -260,9 +260,9 @@ void LaunchBattleAnimation(const u8 *const animsTable[], u16 tableId, bool8 isMo
if (isMoveAnim)
{
for (i = 0; gUnknown_082C8D64[i] != 0xFFFF; i++)
for (i = 0; gMovesWithQuietBGM[i] != 0xFFFF; i++)
{
if (tableId == gUnknown_082C8D64[i])
if (tableId == gMovesWithQuietBGM[i])
{
m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 128);
break;