diff options
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/macros/battle_anim.s | 266 | ||||
| -rw-r--r-- | asm/rom3.s | 4 | ||||
| -rw-r--r-- | asm/rom5.s | 2 | ||||
| -rw-r--r-- | asm/rom_8074BAC.s | 2 |
4 files changed, 270 insertions, 4 deletions
diff --git a/asm/macros/battle_anim.s b/asm/macros/battle_anim.s new file mode 100644 index 000000000..fc2777326 --- /dev/null +++ b/asm/macros/battle_anim.s @@ -0,0 +1,266 @@ + .macro loadsprite id + .byte 0x00 + .2byte \id + .endm + + .macro unloadsprite id + .byte 0x01 + .2byte \id + .endm + + .macro sprite template, priority, argc=0, argv:vararg + .byte 0x02 + .4byte \template + .byte \priority + .byte \argc + .if \argc > 0 + .2byte \argv + .endif + .endm + + .macro createtask addr, priority, argc=0, argv:vararg + .byte 0x03 + .4byte \addr + .byte \priority + .byte \argc + .if \argc > 0 + .2byte \argv + .endif + .endm + + .macro pause delay + .byte 0x04 + .byte \delay + .endm + + .macro wait + .byte 0x05 + .endm + + .macro hang1 + .byte 0x06 + .endm + + .macro hang2 + .byte 0x07 + .endm + + .macro end + .byte 0x08 + .endm + + .macro playse id + .byte 0x09 + .2byte \id + .endm + + .macro monbg which + .byte 0x0A + .byte \which + .endm + + .macro clearmonbg which + .byte 0x0B + .byte \which + .endm + + .macro setalpha eva, evb + .byte 0x0C + .2byte ((\evb) << 8) | (\eva) + .endm + + .macro blendoff + .byte 0x0D + .endm + + .macro call addr + .byte 0x0E + .4byte \addr + .endm + + .macro ret + .byte 0x0F + .endm + + .macro setvar var_num, value + .byte 0x10 + .byte \var_num + .2byte \value + .endm + + .macro ifelse addr1, addr2 + .byte 0x11 + .4byte \addr1 + .4byte \addr2 + .endm + + .macro jumpif cond, addr + .byte 0x12 + .byte \cond + .4byte \addr + .endm + + .macro jump addr + .byte 0x13 + .4byte \addr + .endm + + .macro fadetobg id + .byte 0x14 + .byte \id + .endm + + .macro restorebg + .byte 0x15 + .endm + + .macro waitbgfadeout + .byte 0x16 + .endm + + .macro waitbgfadein + .byte 0x17 + .endm + + .macro changebg id + .byte 0x18 + .byte \id + .endm + + .macro panse_19 id, pan + .byte 0x19 + .2byte \id + .byte \pan + .endm + + .macro setpan pan + .byte 0x1A + .byte \pan + .endm + + .macro panse_1B id, pan_start, pan_end, step, delay + .byte 0x1B + .2byte \id + .byte \pan_start + .byte \pan_end + .byte \step + .byte \delay + .endm + + .macro panse_1C id, pan, delay, count + .byte 0x1C + .2byte \id + .byte \pan + .byte \delay + .byte \count + .endm + + .macro panse_1D id, pan, count + .byte 0x1D + .2byte \id + .byte \pan + .byte \count + .endm + + .macro setbldcnt bldcnt + .byte 0x1E + .2byte \bldcnt + .endm + + .macro createtask_1F addr, argc=0, argv:vararg + .byte 0x1F + .4byte \addr + .byte \argc + .if \argc > 0 + .2byte \argv + .endif + .endm + + .macro waitsound + .byte 0x20 + .endm + + .macro jumpvareq var_num, value, addr + .byte 0x21 + .byte \var_num + .2byte \value + .4byte \addr + .endm + + .macro monbg_22 unk + .byte 0x22 + .byte \unk + .endm + + .macro clearmonbg_23 unk + .byte 0x23 + .byte \unk + .endm + + .macro jumpunkcond addr + .byte 0x24 + .4byte \addr + .endm + + .macro fadetobg_25 a, b, c + .byte 0x25 + .byte \a + .byte \b + .byte \c + .endm + + .macro panse_26 id, pan_start, pan_end, step, delay + .byte 0x26 + .2byte \id + .byte \pan_start + .byte \pan_end + .byte \step + .byte \delay + .endm + + .macro panse_27 id, pan_start, pan_end, step, delay + .byte 0x27 + .2byte \id + .byte \pan_start + .byte \pan_end + .byte \step + .byte \delay + .endm + + .macro monbgprio_28 unk + .byte 0x28 + .byte \unk + .endm + + .macro monbgprio_29 + .byte 0x29 + .endm + + .macro monbgprio_2A unk + .byte 0x2A + .byte \unk + .endm + + .macro invisible side + .byte 0x2B + .byte \side + .endm + + .macro visible side + .byte 0x2C + .byte \side + .endm + + .macro doublebattle_2D unk + .byte 0x2D + .byte \unk + .endm + + .macro doublebattle_2E unk + .byte 0x2E + .byte \unk + .endm + + .macro stopsound + .byte 0x2F + .endm diff --git a/asm/rom3.s b/asm/rom3.s index f2ed5b6ae..da13f5102 100644 --- a/asm/rom3.s +++ b/asm/rom3.s @@ -78993,7 +78993,7 @@ _080315C2: _080315D0: .4byte 0x0202f7c8 _080315D4: .4byte 0x0202f7c9 _080315D8: .4byte 0x02017840 -_080315DC: .4byte gUnknown_081C771C +_080315DC: .4byte gBattleAnims_Unknown1 _080315E0: .4byte sub_80315E8 _080315E4: .4byte 0x03004b20 thumb_func_end move_anim_start_t3 @@ -79109,7 +79109,7 @@ move_anim_start_t4: @ 8031660 .align 2, 0 _080316B4: .4byte 0x0202f7c8 _080316B8: .4byte 0x0202f7c9 -_080316BC: .4byte gUnknown_081C7778 +_080316BC: .4byte gBattleAnims_Unknown2 _080316C0: .4byte sub_80316CC _080316C4: .4byte 0x03004b20 _080316C8: .4byte 0x02017810 diff --git a/asm/rom5.s b/asm/rom5.s index eded47fc5..2b379e9bf 100644 --- a/asm/rom5.s +++ b/asm/rom5.s @@ -1996,7 +1996,7 @@ move_anim_start_t2: @ 807BD5C .align 2, 0 _0807BD98: .4byte 0x0202f7c8 _0807BD9C: .4byte 0x0202f7c9 -_0807BDA0: .4byte gUnknown_081C76F8 +_0807BDA0: .4byte gBattleAnims_StatusConditions _0807BDA4: .4byte sub_807BDAC _0807BDA8: .4byte 0x03004b20 thumb_func_end move_anim_start_t2 diff --git a/asm/rom_8074BAC.s b/asm/rom_8074BAC.s index cd8767816..40a302370 100644 --- a/asm/rom_8074BAC.s +++ b/asm/rom_8074BAC.s @@ -1522,7 +1522,7 @@ _08075724: .4byte 0x0202f7c8 _08075728: .4byte 0x02024c07 _0807572C: .4byte 0x0202f7c9 _08075730: .4byte 0x02024c08 -_08075734: .4byte gUnknown_081C7168 +_08075734: .4byte gBattleAnims_Moves thumb_func_end move_anim_start_t1 thumb_func_start move_something |