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

add silk trap anim

Browse Source
This commit is contained in:
ghoulslash 2023-01-28 09:03:18 -05:00
parent f1d97bfad7
commit 3f616215ea
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
data/battle_anim_scripts.s
View File

@ -14371,6 +14371,21 @@ Move_SCORCHING_SANDS::
Move_JUNGLE_HEALING:: Move_JUNGLE_HEALING::
goto Move_AROMATHERAPY goto Move_AROMATHERAPY
Move_SILK_TRAP::
loadspritegfx ANIM_TAG_PROTECT
loadspritegfx ANIM_TAG_SPIDER_WEB
splitbgprio ANIM_ATTACKER
playsewithpan SE_M_STRING_SHOT2, SOUND_PAN_TARGET
createsprite gSpiderWebSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, FALSE
waitforvisualfinish
createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_PROTECT, 0, 10, 10, RGB_LIME_GREEN
monbg ANIM_ATK_PARTNER
waitplaysewithpan SE_M_REFLECT, SOUND_PAN_ATTACKER, 0x10
createsprite gProtectSpriteTemplate, ANIM_ATTACKER, 2, 24, 0, 90
waitforvisualfinish
clearmonbg ANIM_ATK_PARTNER
end
Move_WICKED_BLOW:: Move_WICKED_BLOW::
Move_SURGING_STRIKES:: Move_SURGING_STRIKES::
Move_THUNDER_CAGE:: Move_THUNDER_CAGE::
@ -14406,7 +14421,6 @@ Move_SANDSEAR_STORM::
Move_LUNAR_BLESSING:: Move_LUNAR_BLESSING::
Move_TAKE_HEART:: Move_TAKE_HEART::
Move_TERA_BLAST:: Move_TERA_BLAST::
Move_SILK_TRAP::
Move_AXE_KICK:: Move_AXE_KICK::
Move_LAST_RESPECTS:: Move_LAST_RESPECTS::
Move_LUMINA_CRASH:: Move_LUMINA_CRASH::

3
include/constants/rgb.h
View File

@ -8,6 +8,7 @@
#define RGB(r, g, b) ((r) | ((g) << 5) | ((b) << 10)) #define RGB(r, g, b) ((r) | ((g) << 5) | ((b) << 10))
#define RGB2(r, g, b) (((b) << 10) | ((g) << 5) | (r)) #define RGB2(r, g, b) (((b) << 10) | ((g) << 5) | (r))
#define _RGB(r, g, b) ((((b) & 0x1F) << 10) + (((g) & 0x1F) << 5) + ((r) & 0x1F)) #define _RGB(r, g, b) ((((b) & 0x1F) << 10) + (((g) & 0x1F) << 5) + ((r) & 0x1F))
#define RGB2GBA(r, g, b) (((r >> 3) & 31) | (((g >> 3) & 31) << 5) | (((b >> 3) & 31) << 10))
#define RGB_ALPHA (1 << 15) #define RGB_ALPHA (1 << 15)
#define IS_ALPHA(color) ((color) & RGB_ALPHA) #define IS_ALPHA(color) ((color) & RGB_ALPHA)
@ -23,4 +24,6 @@
#define RGB_CYAN RGB(0, 31, 31) #define RGB_CYAN RGB(0, 31, 31)
#define RGB_WHITEALPHA (RGB_WHITE | RGB_ALPHA) #define RGB_WHITEALPHA (RGB_WHITE | RGB_ALPHA)
#define RGB_LIME_GREEN RGB2GBA(222, 230, 49)
#endif // GUARD_RGB_H #endif // GUARD_RGB_H