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

Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into battle_engine

Browse Source
This commit is contained in:
Evan 2020-11-08 14:07:50 -07:00
commit cdad1e7101
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/battle_anim_scripts.s
View File

@ -6617,8 +6617,8 @@ Move_HURRICANE:
call UnsetPsychicBg
end
HurricaneGust:
launchtemplate gPoisonBubbleSpriteTemplate 0x82, 2 0 0xfff0
launchtask AnimTask_AnimateGustTornadoPalette 5 2 1 0x46
createsprite gEllipticalGustSpriteTemplate, ANIM_ATTACKER, 2, 0, -16
createvisualtask AnimTask_AnimateGustTornadoPalette, 5, 1, 70
return

4
src/data/text/move_descriptions.h
View File

@ -2170,7 +2170,7 @@ static const u8 sFUSION_BOLTDescription[] = _(
"Works well with a fireball.");
static const u8 sFLYING_PRESSDescription[] = _(
"This attack does FightingDash\n"
"This attack does Fighting\n"
"and Flying-type damage.");
static const u8 sMAT_BLOCKDescription[] = _(
@ -2218,7 +2218,7 @@ static const u8 sPETAL_BLIZZARDDescription[] = _(
"of petals to attack.");
static const u8 sFREEZE_DRYDescription[] = _(
"Super effective on WaterDash\n"
"Super effective on Water-\n"
"types. May cause freezing.");
static const u8 sDISARMING_VOICEDescription[] = _(