diff options
Diffstat (limited to 'asm')
-rw-r--r-- | asm/battle_anim_80A9C70.s | 2 | ||||
-rw-r--r-- | asm/battle_anim_80FE840.s | 6 | ||||
-rwxr-xr-x | asm/battle_anim_815A0D4.s | 12 | ||||
-rw-r--r-- | asm/battle_anim_sound_tasks.s | 6 | ||||
-rw-r--r-- | asm/macros/battle_anim_script.inc | 268 |
5 files changed, 281 insertions, 13 deletions
diff --git a/asm/battle_anim_80A9C70.s b/asm/battle_anim_80A9C70.s index bdb1a51ec..c471cc729 100644 --- a/asm/battle_anim_80A9C70.s +++ b/asm/battle_anim_80A9C70.s @@ -867,7 +867,7 @@ LaunchStatusAnimation: @ 80AA364 strb r4, [r0] ldr r0, =gAnimBankTarget strb r4, [r0] - ldr r0, =gUnknown_082C92FC + ldr r0, =gBattleAnims_Statuses movs r2, 0 bl LaunchBattleAnimation ldr r0, =task0A_80788BC diff --git a/asm/battle_anim_80FE840.s b/asm/battle_anim_80FE840.s index 1055c8944..a60163139 100644 --- a/asm/battle_anim_80FE840.s +++ b/asm/battle_anim_80FE840.s @@ -17067,8 +17067,8 @@ sub_8107144: @ 8107144 .pool thumb_func_end sub_8107144 - thumb_func_start update_fury_cutter_counter_copy -update_fury_cutter_counter_copy: @ 8107168 + thumb_func_start sub_8107168 +sub_8107168: @ 8107168 push {lr} lsls r0, 24 lsrs r0, 24 @@ -17081,7 +17081,7 @@ update_fury_cutter_counter_copy: @ 8107168 pop {r0} bx r0 .pool - thumb_func_end update_fury_cutter_counter_copy + thumb_func_end sub_8107168 thumb_func_start sub_8107188 sub_8107188: @ 8107188 diff --git a/asm/battle_anim_815A0D4.s b/asm/battle_anim_815A0D4.s index 611e4b067..d583f1e85 100755 --- a/asm/battle_anim_815A0D4.s +++ b/asm/battle_anim_815A0D4.s @@ -639,8 +639,8 @@ _0815A5AC: .pool thumb_func_end sub_815A52C - thumb_func_start c3_80DE6F0 -c3_80DE6F0: @ 815A5C8 + thumb_func_start sub_815A5C8 +sub_815A5C8: @ 815A5C8 lsls r0, 24 lsrs r0, 24 ldr r2, =gTasks @@ -656,7 +656,7 @@ c3_80DE6F0: @ 815A5C8 strb r0, [r1] bx lr .pool - thumb_func_end c3_80DE6F0 + thumb_func_end sub_815A5C8 thumb_func_start sub_815A5F0 sub_815A5F0: @ 815A5F0 @@ -3271,8 +3271,8 @@ _0815BAFC: .pool thumb_func_end sub_815B7D0 - thumb_func_start c3_80DFBE4 -c3_80DFBE4: @ 815BB18 + thumb_func_start sub_815BB18 +sub_815BB18: @ 815BB18 push {r4,lr} lsls r0, 24 lsrs r0, 24 @@ -3297,7 +3297,7 @@ c3_80DFBE4: @ 815BB18 pop {r0} bx r0 .pool - thumb_func_end c3_80DFBE4 + thumb_func_end sub_815BB18 thumb_func_start sub_815BB58 sub_815BB58: @ 815BB58 diff --git a/asm/battle_anim_sound_tasks.s b/asm/battle_anim_sound_tasks.s index 4bfd7ae68..949934e1d 100644 --- a/asm/battle_anim_sound_tasks.s +++ b/asm/battle_anim_sound_tasks.s @@ -150,8 +150,8 @@ _08158C4C: .pool thumb_func_end sub_8158C04 - thumb_func_start mas_80DCF38 -mas_80DCF38: @ 8158C58 + thumb_func_start sub_8158C58 +sub_8158C58: @ 8158C58 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -230,7 +230,7 @@ mas_80DCF38: @ 8158C58 pop {r0} bx r0 .pool - thumb_func_end mas_80DCF38 + thumb_func_end sub_8158C58 thumb_func_start sub_8158D08 sub_8158D08: @ 8158D08 diff --git a/asm/macros/battle_anim_script.inc b/asm/macros/battle_anim_script.inc new file mode 100644 index 000000000..b26d1218d --- /dev/null +++ b/asm/macros/battle_anim_script.inc @@ -0,0 +1,268 @@ +@ commands + + .macro loadspritegfx param0 + .byte 0x0 + .2byte \param0 + .endm + + .macro unloadspritegfx param0 + .byte 0x1 + .2byte \param0 + .endm + + .macro createsprite template, priority, argv:vararg + .byte 0x02 + .4byte \template + .byte \priority + .byte (.Lsprite_\@_2 - .Lsprite_\@_1) / 2 +.Lsprite_\@_1: + .2byte \argv +.Lsprite_\@_2: + .endm + + .macro createvisualtask addr, priority, argv:vararg + .byte 0x03 + .4byte \addr + .byte \priority + .byte (.Lcreatetask_\@_2 - .Lcreatetask_\@_1) / 2 +.Lcreatetask_\@_1: + .2byte \argv +.Lcreatetask_\@_2: + .endm + + .macro delay param0 + .byte 0x4 + .byte \param0 + .endm + + .macro waitforvisualfinish + .byte 0x5 + .endm + + .macro hang1 + .byte 0x6 + .endm + + .macro hang2 + .byte 0x7 + .endm + + .macro end + .byte 0x8 + .endm + + .macro playse param0 + .byte 0x9 + .2byte \param0 + .endm + + .macro monbg bank + .byte 0xa + .byte \bank + .endm + + .macro clearmonbg bank + .byte 0xb + .byte \bank + .endm + + .macro setalpha param0 + .byte 0xc + .2byte \param0 + .endm + + .macro blendoff + .byte 0xd + .endm + + .macro call param0 + .byte 0xe + .4byte \param0 + .endm + + .macro return + .byte 0xf + .endm + + .macro setarg param0, param1 + .byte 0x10 + .byte \param0 + .2byte \param1 + .endm + + .macro choosetwoturnanim param0, param1 + .byte 0x11 + .4byte \param0 + .4byte \param1 + .endm + + .macro jumpifmoveturn param0, param1 + .byte 0x12 + .byte \param0 + .4byte \param1 + .endm + + .macro goto param0 + .byte 0x13 + .4byte \param0 + .endm + + .macro fadetobg param0 + .byte 0x14 + .byte \param0 + .endm + + .macro restorebg + .byte 0x15 + .endm + + .macro waitbgfadeout + .byte 0x16 + .endm + + .macro waitbgfadein + .byte 0x17 + .endm + + .macro changebg param0 + .byte 0x18 + .byte \param0 + .endm + + .macro playsewithpan param0, param1 + .byte 0x19 + .2byte \param0 + .byte \param1 + .endm + + .macro setpan param0 + .byte 0x1a + .byte \param0 + .endm + + .macro panse_1B param0, param1, param2, param3, param4 + .byte 0x1b + .2byte \param0 + .byte \param1 + .byte \param2 + .byte \param3 + .byte \param4 + .endm + + .macro loopsewithpan param0, param1, param2, param3 + .byte 0x1c + .2byte \param0 + .byte \param1 + .byte \param2 + .byte \param3 + .endm + + .macro waitplaysewithpan param0, param1, param2 + .byte 0x1d + .2byte \param0 + .byte \param1 + .byte \param2 + .endm + + .macro setbldcnt param0 + .byte 0x1e + .2byte \param0 + .endm + + .macro createsoundtask addr, argv:vararg + .byte 0x1F + .4byte \addr + .byte (.Lcreatetask_1F_\@_2 - .Lcreatetask_1F_\@_1) / 2 +.Lcreatetask_1F_\@_1: + .2byte \argv +.Lcreatetask_1F_\@_2: + .endm + + .macro waitsound + .byte 0x20 + .endm + + .macro jumpargeq param0, param1, param2 + .byte 0x21 + .byte \param0 + .2byte \param1 + .4byte \param2 + .endm + + .macro monbg_22 bank + .byte 0x22 + .byte \bank + .endm + + .macro clearmonbg_23 bank + .byte 0x23 + .byte \bank + .endm + + .macro jumpifcontest param0 + .byte 0x24 + .4byte \param0 + .endm + + .macro fadetobgfromset param0, param1, param2 + .byte 0x25 + .byte \param0 + .byte \param1 + .byte \param2 + .endm + + .macro panse_26 param0, param1, param2, param3, param4 + .byte 0x26 + .2byte \param0 + .byte \param1 + .byte \param2 + .byte \param3 + .byte \param4 + .endm + + .macro panse_27 param0, param1, param2, param3, param4 + .byte 0x27 + .2byte \param0 + .byte \param1 + .byte \param2 + .byte \param3 + .byte \param4 + .endm + + .macro monbgprio_28 bank + .byte 0x28 + .byte \bank + .endm + + .macro monbgprio_29 + .byte 0x29 + .endm + + .macro monbgprio_2A bank + .byte 0x2a + .byte \bank + .endm + + .macro invisible bank + .byte 0x2b + .byte \bank + .endm + + .macro visible bank + .byte 0x2c + .byte \bank + .endm + + .macro doublebattle_2D bank + .byte 0x2d + .byte \bank + .endm + + .macro doublebattle_2E bank + .byte 0x2e + .byte \bank + .endm + + .macro stopsound + .byte 0x2f + .endm |