From dc81d0cfcfa92ecfab99984ee674d0fe3e6c19cf Mon Sep 17 00:00:00 2001
From: yenatch <yenatch@gmail.com>
Date: Fri, 29 Mar 2013 18:54:13 -0400
Subject: [PATCH] dump move effects

---
 battle/moves/move_effects.asm | 2181 +++++++++++++++++++++++++++++++++
 extras/crystal.py             |  217 +++-
 main.asm                      |    4 +-
 preprocessor.py               |    2 +
 4 files changed, 2402 insertions(+), 2 deletions(-)
 create mode 100644 battle/moves/move_effects.asm

diff --git a/battle/moves/move_effects.asm b/battle/moves/move_effects.asm
new file mode 100644
index 000000000..a068f3e5a
--- /dev/null
+++ b/battle/moves/move_effects.asm
@@ -0,0 +1,2181 @@
+Pound:
+KarateChop:
+MegaPunch:
+Scratch:
+Vicegrip:
+Cut:
+WingAttack:
+Slam:
+VineWhip:
+MegaKick:
+HornAttack:
+Tackle:
+WaterGun:
+HydroPump:
+Surf:
+Peck:
+DrillPeck:
+Strength:
+RazorLeaf:
+RockThrow:
+EggBomb:
+Waterfall:
+Crabhammer:
+Slash:
+Aeroblast:
+Megahorn:
+CrossChop:
+Swift:
+FaintAttack:
+VitalThrow:
+JumpKick:
+HiJumpKick:
+QuickAttack:
+MachPunch:
+Extremespeed:
+	checkobedience
+	usedmovetext
+	doturn
+	critical
+	damagecalc
+	itemmultiplier
+	stab
+	damagevariation
+	checkhit
+	hittarget
+	resulttext
+	checkfaint
+	criticaltext
+	supereffectivetext
+	checkdestinybond
+	buildopponentrage
+	kingsrock
+	endmove
+
+Sing:
+SleepPowder:
+Hypnosis:
+LovelyKiss:
+Spore:
+	checkobedience
+	usedmovetext
+	doturn
+	checkhit
+	checksafeguard
+	sleeptarget
+	endmove
+
+PoisonSting:
+Smog:
+Sludge:
+SludgeBomb:
+	checkobedience
+	usedmovetext
+	doturn
+	critical
+	damagecalc
+	itemmultiplier
+	stab
+	damagevariation
+	checkhit
+	effectchance
+	hittarget
+	resulttext
+	checkfaint
+	criticaltext
+	supereffectivetext
+	checkdestinybond
+	buildopponentrage
+	poisontarget
+	endmove
+
+Absorb:
+MegaDrain:
+LeechLife:
+GigaDrain:
+	checkobedience
+	usedmovetext
+	doturn
+	critical
+	damagecalc
+	itemmultiplier
+	stab
+	damagevariation
+	checkhit
+	hittarget
+	resulttext
+	checkfaint
+	criticaltext
+	supereffectivetext
+	draintarget
+	checkdestinybond
+	buildopponentrage
+	kingsrock
+	endmove
+
+FirePunch:
+Ember:
+Flamethrower:
+FireBlast:
+	checkobedience
+	usedmovetext
+	doturn
+	critical
+	damagecalc
+	itemmultiplier
+	stab
+	damagevariation
+	checkhit
+	effectchance
+	hittarget
+	resulttext
+	checkfaint
+	criticaltext
+	supereffectivetext
+	checkdestinybond
+	buildopponentrage
+	burntarget
+	endmove
+
+IcePunch:
+IceBeam:
+Blizzard:
+PowderSnow:
+	checkobedience
+	usedmovetext
+	doturn
+	critical
+	damagecalc
+	itemmultiplier
+	stab
+	damagevariation
+	checkhit
+	effectchance
+	hittarget
+	resulttext
+	checkfaint
+	criticaltext
+	supereffectivetext
+	checkdestinybond
+	buildopponentrage
+	freezetarget
+	endmove
+
+Thunderpunch:
+BodySlam:
+Thundershock:
+Thunderbolt:
+Lick:
+ZapCannon:
+Spark:
+Dragonbreath:
+	checkobedience
+	usedmovetext
+	doturn
+	critical
+	damagecalc
+	itemmultiplier
+	stab
+	damagevariation
+	checkhit
+	effectchance
+	hittarget
+	resulttext
+	checkfaint
+	criticaltext
+	supereffectivetext
+	checkdestinybond
+	buildopponentrage
+	paralyzetarget
+	endmove
+
+Selfdestruct:
+Explosion:
+	checkobedience
+	usedmovetext
+	doturn
+	critical
+	damagecalc
+	itemmultiplier
+	stab
+	damagevariation
+	checkhit
+	selfdestruct
+	effect0x0b
+	resulttext
+	checkfaint
+	criticaltext
+	supereffectivetext
+	checkdestinybond
+	buildopponentrage
+	kingsrock
+	endmove
+
+DreamEater:
+	checkobedience
+	usedmovetext
+	doturn
+	critical
+	damagecalc
+	itemmultiplier
+	stab
+	damagevariation
+	checkhit
+	hittarget
+	resulttext
+	checkfaint
+	criticaltext
+	supereffectivetext
+	eatdream
+	checkdestinybond
+	buildopponentrage
+	endmove
+
+MirrorMove:
+	checkobedience
+	usedmovetext
+	doturn
+	mirrormove
+	endmove
+
+Meditate:
+Sharpen:
+	checkobedience
+	usedmovetext
+	doturn
+	attackup
+	effect0x0a
+	effect0x92
+	effect0x0c
+	statmessageuser
+	statupfailtext
+	endmove
+
+Harden:
+Withdraw:
+	checkobedience
+	usedmovetext
+	doturn
+	defenseup
+	effect0x0a
+	effect0x92
+	effect0x0c
+	statmessageuser
+	statupfailtext
+	endmove
+
+	checkobedience
+	usedmovetext
+	doturn
+	speedup
+	effect0x0a
+	effect0x92
+	effect0x0c
+	statmessageuser
+	statupfailtext
+	endmove
+
+Growth:
+	checkobedience
+	usedmovetext
+	doturn
+	specialattackup
+	effect0x0a
+	effect0x92
+	effect0x0c
+	statmessageuser
+	statupfailtext
+	endmove
+
+	checkobedience
+	usedmovetext
+	doturn
+	specialdefenseup
+	effect0x0a
+	effect0x92
+	effect0x0c
+	statmessageuser
+	statupfailtext
+	endmove
+
+	checkobedience
+	usedmovetext
+	doturn
+	accuracyup
+	effect0x0a
+	effect0x92
+	effect0x0c
+	statmessageuser
+	statupfailtext
+	endmove
+
+DoubleTeam:
+Minimize:
+	checkobedience
+	usedmovetext
+	doturn
+	effect0x0a
+	evasionup
+	effect0x92
+	effect0xa7
+	effect0x0c
+	statmessageuser
+	statupfailtext
+	endmove
+
+SwordsDance:
+	checkobedience
+	usedmovetext
+	doturn
+	attackup2
+	effect0x0a
+	effect0x92
+	effect0x0c
+	statmessageuser
+	statupfailtext
+	endmove
+
+Barrier:
+AcidArmor:
+	checkobedience
+	usedmovetext
+	doturn
+	defenseup2
+	effect0x0a
+	effect0x92
+	effect0x0c
+	statmessageuser
+	statupfailtext
+	endmove
+
+Agility:
+	checkobedience
+	usedmovetext
+	doturn
+	speedup2
+	effect0x0a
+	effect0x92
+	effect0x0c
+	statmessageuser
+	statupfailtext
+	endmove
+
+	checkobedience
+	usedmovetext
+	doturn
+	specialattackup2
+	effect0x0a
+	effect0x92
+	effect0x0c
+	statmessageuser
+	statupfailtext
+	endmove
+
+Amnesia:
+	checkobedience
+	usedmovetext
+	doturn
+	specialdefenseup2
+	effect0x0a
+	effect0x92
+	effect0x0c
+	statmessageuser
+	statupfailtext
+	endmove
+
+	checkobedience
+	usedmovetext
+	doturn
+	accuracyup2
+	effect0x0a
+	effect0x92
+	effect0x0c
+	statmessageuser
+	statupfailtext
+	endmove
+
+	checkobedience
+	usedmovetext
+	doturn
+	evasionup2
+	effect0x0a
+	effect0x92
+	effect0x0c
+	statmessageuser
+	statupfailtext
+	endmove
+
+Growl:
+	checkobedience
+	usedmovetext
+	doturn
+	checkhit
+	attackdown
+	effect0x0a
+	effect0x91
+	effect0x0c
+	statmessagetarget
+	statdownfailtext
+	endmove
+
+TailWhip:
+Leer:
+	checkobedience
+	usedmovetext
+	doturn
+	checkhit
+	defensedown
+	effect0x0a
+	effect0x91
+	effect0x0c
+	statmessagetarget
+	statdownfailtext
+	endmove
+
+StringShot:
+	checkobedience
+	usedmovetext
+	doturn
+	checkhit
+	speeddown
+	effect0x0a
+	effect0x91
+	effect0x0c
+	statmessagetarget
+	statdownfailtext
+	endmove
+
+	checkobedience
+	usedmovetext
+	doturn
+	checkhit
+	specialattackdown
+	effect0x0a
+	effect0x91
+	effect0x0c
+	statmessagetarget
+	statdownfailtext
+	endmove
+
+	checkobedience
+	usedmovetext
+	doturn
+	checkhit
+	specialdefensedown
+	effect0x0a
+	effect0x91
+	effect0x0c
+	statmessagetarget
+	statdownfailtext
+	endmove
+
+SandAttack:
+Smokescreen:
+Kinesis:
+Flash:
+	checkobedience
+	usedmovetext
+	doturn
+	checkhit
+	accuracydown
+	effect0x0a
+	effect0x91
+	effect0x0c
+	statmessagetarget
+	statdownfailtext
+	endmove
+
+SweetScent:
+	checkobedience
+	usedmovetext
+	doturn
+	checkhit
+	evasiondown
+	effect0x0a
+	effect0x91
+	effect0x0c
+	statmessagetarget
+	statdownfailtext
+	endmove
+
+Charm:
+	checkobedience
+	usedmovetext
+	doturn
+	checkhit
+	attackdown2
+	effect0x0a
+	effect0x91
+	effect0x0c
+	statmessagetarget
+	statdownfailtext
+	endmove
+
+Screech:
+	checkobedience
+	usedmovetext
+	doturn
+	checkhit
+	defensedown2
+	effect0x0a
+	effect0x91
+	effect0x0c
+	statmessagetarget
+	statdownfailtext
+	endmove
+
+CottonSpore:
+ScaryFace:
+	checkobedience
+	usedmovetext
+	doturn
+	checkhit
+	speeddown2
+	effect0x0a
+	effect0x91
+	effect0x0c
+	statmessagetarget
+	statdownfailtext
+	endmove
+
+	checkobedience
+	usedmovetext
+	doturn
+	checkhit
+	specialattackdown2
+	effect0x0a
+	effect0x91
+	effect0x0c
+	statmessagetarget
+	statdownfailtext
+	endmove
+
+	checkobedience
+	usedmovetext
+	doturn
+	checkhit
+	specialdefensedown2
+	effect0x0a
+	effect0x91
+	effect0x0c
+	statmessagetarget
+	statdownfailtext
+	endmove
+
+	checkobedience
+	usedmovetext
+	doturn
+	checkhit
+	accuracydown2
+	effect0x0a
+	effect0x91
+	effect0x0c
+	statmessagetarget
+	statdownfailtext
+	endmove
+
+	checkobedience
+	usedmovetext
+	doturn
+	checkhit
+	evasiondown2
+	effect0x0a
+	effect0x91
+	effect0x0c
+	statmessagetarget
+	statdownfailtext
+	endmove
+
+AuroraBeam:
+	checkobedience
+	usedmovetext
+	doturn
+	critical
+	damagecalc
+	itemmultiplier
+	stab
+	damagevariation
+	checkhit
+	effectchance
+	hittarget
+	resulttext
+	checkfaint
+	criticaltext
+	supereffectivetext
+	checkdestinybond
+	buildopponentrage
+	attackdown
+	statmessagetarget
+	endmove
+
+Acid:
+IronTail:
+RockSmash:
+	checkobedience
+	usedmovetext
+	doturn
+	critical
+	damagecalc
+	itemmultiplier
+	stab
+	damagevariation
+	checkhit
+	effectchance
+	hittarget
+	resulttext
+	checkfaint
+	criticaltext
+	supereffectivetext
+	checkdestinybond
+	buildopponentrage
+	effectchance
+	defensedown
+	statmessagetarget
+	endmove
+
+Bubblebeam:
+Constrict:
+Bubble:
+IcyWind:
+	checkobedience
+	usedmovetext
+	doturn
+	critical
+	damagecalc
+	itemmultiplier
+	stab
+	damagevariation
+	checkhit
+	effectchance
+	hittarget
+	resulttext
+	checkfaint
+	criticaltext
+	supereffectivetext
+	checkdestinybond
+	buildopponentrage
+	speeddown
+	statmessagetarget
+	endmove
+
+	checkobedience
+	usedmovetext
+	doturn
+	critical
+	damagecalc
+	itemmultiplier
+	stab
+	damagevariation
+	checkhit
+	effectchance
+	hittarget
+	resulttext
+	checkfaint
+	criticaltext
+	supereffectivetext
+	checkdestinybond
+	buildopponentrage
+	specialattackdown
+	statmessagetarget
+	endmove
+
+PsychicM:
+Crunch:
+ShadowBall:
+	checkobedience
+	usedmovetext
+	doturn
+	critical
+	damagecalc
+	itemmultiplier
+	stab
+	damagevariation
+	checkhit
+	effectchance
+	hittarget
+	resulttext
+	checkfaint
+	criticaltext
+	supereffectivetext
+	checkdestinybond
+	buildopponentrage
+	specialdefensedown
+	statmessagetarget
+	endmove
+
+MudSlap:
+Octazooka:
+	checkobedience
+	usedmovetext
+	doturn
+	critical
+	damagecalc
+	itemmultiplier
+	stab
+	damagevariation
+	checkhit
+	effectchance
+	hittarget
+	resulttext
+	checkfaint
+	criticaltext
+	supereffectivetext
+	checkdestinybond
+	buildopponentrage
+	accuracydown
+	statmessagetarget
+	endmove
+
+	checkobedience
+	usedmovetext
+	doturn
+	critical
+	damagecalc
+	itemmultiplier
+	stab
+	damagevariation
+	checkhit
+	effectchance
+	hittarget
+	resulttext
+	checkfaint
+	criticaltext
+	supereffectivetext
+	checkdestinybond
+	buildopponentrage
+	evasiondown
+	statmessagetarget
+	endmove
+
+SteelWing:
+	checkobedience
+	usedmovetext
+	doturn
+	critical
+	damagecalc
+	itemmultiplier
+	stab
+	damagevariation
+	checkhit
+	effectchance
+	hittarget
+	resulttext
+	checkfaint
+	criticaltext
+	supereffectivetext
+	checkdestinybond
+	buildopponentrage
+	defenseup
+	statmessageuser
+	endmove
+
+MetalClaw:
+	checkobedience
+	usedmovetext
+	doturn
+	critical
+	damagecalc
+	itemmultiplier
+	stab
+	damagevariation
+	checkhit
+	effectchance
+	hittarget
+	resulttext
+	checkfaint
+	criticaltext
+	supereffectivetext
+	checkdestinybond
+	buildopponentrage
+	attackup
+	statmessageuser
+	endmove
+
+Ancientpower:
+	checkobedience
+	usedmovetext
+	doturn
+	critical
+	damagecalc
+	itemmultiplier
+	stab
+	damagevariation
+	checkhit
+	effectchance
+	hittarget
+	resulttext
+	checkfaint
+	criticaltext
+	supereffectivetext
+	checkdestinybond
+	buildopponentrage
+	allstatsup
+	endmove
+
+PayDay:
+	checkobedience
+	usedmovetext
+	doturn
+	critical
+	damagecalc
+	itemmultiplier
+	stab
+	damagevariation
+	checkhit
+	hittarget
+	resulttext
+	checkfaint
+	criticaltext
+	supereffectivetext
+	payday
+	checkdestinybond
+	buildopponentrage
+	kingsrock
+	endmove
+
+Conversion:
+	checkobedience
+	usedmovetext
+	doturn
+	conversion
+	endmove
+
+Haze:
+	checkobedience
+	usedmovetext
+	doturn
+	resetstats
+	endmove
+
+Bide:
+	storeenergy
+	checkobedience
+	doturn
+	usedmovetext
+	unleashenergy
+	effect0xa3
+	checkhit
+	hittarget
+	effect0xa5
+	checkfaint
+	checkdestinybond
+	buildopponentrage
+	kingsrock
+	endmove
+
+Thrash:
+PetalDance:
+Outrage:
+	checkrampage
+	checkobedience
+	doturn
+	rampage
+	usedmovetext
+	checkhit
+	critical
+	damagecalc
+	itemmultiplier
+	stab
+	damagevariation
+	clearmissdamage
+	hittarget
+	resulttext
+	checkfaint
+	criticaltext
+	supereffectivetext
+	checkdestinybond
+	buildopponentrage
+	kingsrock
+	endmove
+
+Whirlwind:
+Roar:
+	checkobedience
+	usedmovetext
+	doturn
+	checkhit
+	forceswitch
+	endmove
+
+Doubleslap:
+CometPunch:
+FuryAttack:
+PinMissile:
+SpikeCannon:
+Barrage:
+FurySwipes:
+BoneRush:
+DoubleKick:
+Bonemerang:
+	checkobedience
+	usedmovetext
+	doturn
+	startloop
+	effect0x0a
+	checkhit
+	critical
+	damagecalc
+	itemmultiplier
+	stab
+	damagevariation
+	clearmissdamage
+	effect0x0b
+	resulttext
+	checkfaint
+	criticaltext
+	cleartext
+	supereffectivelooptext
+	checkdestinybond
+	buildopponentrage
+	endloop
+	effect0x0c
+	kingsrock
+	endmove
+
+Twineedle:
+	checkobedience
+	usedmovetext
+	doturn
+	startloop
+	effect0x0a
+	checkhit
+	effectchance
+	critical
+	damagecalc
+	itemmultiplier
+	stab
+	damagevariation
+	clearmissdamage
+	effect0x0b
+	resulttext
+	checkfaint
+	criticaltext
+	cleartext
+	supereffectivelooptext
+	checkdestinybond
+	buildopponentrage
+	endloop
+	effect0x0c
+	kingsrock
+	poisontarget
+	endmove
+
+RollingKick:
+Headbutt:
+Bite:
+LowKick:
+BoneClub:
+RockSlide:
+HyperFang:
+	checkobedience
+	usedmovetext
+	doturn
+	critical
+	damagecalc
+	itemmultiplier
+	stab
+	damagevariation
+	checkhit
+	effectchance
+	hittarget
+	resulttext
+	checkfaint
+	criticaltext
+	supereffectivetext
+	checkdestinybond
+	buildopponentrage
+	flinchtarget
+	endmove
+
+Guillotine:
+HornDrill:
+Fissure:
+	checkobedience
+	usedmovetext
+	doturn
+	stab
+	ohko
+	hittarget
+	resulttext
+	checkfaint
+	criticaltext
+	supereffectivetext
+	checkdestinybond
+	buildopponentrage
+	endmove
+
+TakeDown:
+DoubleEdge:
+Submission:
+Struggle:
+	checkobedience
+	usedmovetext
+	doturn
+	critical
+	damagecalc
+	itemmultiplier
+	stab
+	damagevariation
+	checkhit
+	hittarget
+	resulttext
+	checkfaint
+	criticaltext
+	supereffectivetext
+	recoil
+	checkdestinybond
+	buildopponentrage
+	kingsrock
+	endmove
+
+Mist:
+	checkobedience
+	usedmovetext
+	doturn
+	mist
+	endmove
+
+FocusEnergy:
+	checkobedience
+	usedmovetext
+	doturn
+	focusenergy
+	endmove
+
+Supersonic:
+ConfuseRay:
+SweetKiss:
+	checkobedience
+	usedmovetext
+	doturn
+	checkhit
+	checksafeguard
+	confuse
+	endmove
+
+Psybeam:
+Confusion:
+DizzyPunch:
+Dynamicpunch:
+	checkobedience
+	usedmovetext
+	doturn
+	critical
+	damagecalc
+	itemmultiplier
+	stab
+	damagevariation
+	checkhit
+	effectchance
+	hittarget
+	resulttext
+	checkfaint
+	criticaltext
+	supereffectivetext
+	checkdestinybond
+	buildopponentrage
+	confusetarget
+	endmove
+
+Recover:
+Softboiled:
+Rest:
+MilkDrink:
+	checkobedience
+	usedmovetext
+	doturn
+	heal
+	endmove
+
+Transform:
+	checkobedience
+	usedmovetext
+	doturn
+	transform
+	endmove
+
+LightScreen:
+Reflect:
+	checkobedience
+	usedmovetext
+	doturn
+	screen
+	endmove
+
+TriAttack:
+	checkobedience
+	usedmovetext
+	doturn
+	critical
+	damagecalc
+	itemmultiplier
+	stab
+	damagevariation
+	checkhit
+	hittarget
+	resulttext
+	checkfaint
+	criticaltext
+	supereffectivetext
+	checkdestinybond
+	buildopponentrage
+	tristatuschance
+	endmove
+
+Toxic:
+Poisonpowder:
+PoisonGas:
+	checkobedience
+	usedmovetext
+	doturn
+	checkhit
+	stab
+	checksafeguard
+	poison
+	endmove
+
+StunSpore:
+ThunderWave:
+Glare:
+	checkobedience
+	usedmovetext
+	doturn
+	stab
+	checkhit
+	checksafeguard
+	paralyze
+	endmove
+
+SkyAttack:
+	checkcharge
+	checkobedience
+	doturn
+	charge
+	usedmovetext
+	critical
+	damagecalc
+	itemmultiplier
+	stab
+	damagevariation
+	checkhit
+	effectchance
+	hittarget
+	resulttext
+	checkfaint
+	criticaltext
+	supereffectivetext
+	checkdestinybond
+	buildopponentrage
+	flinchtarget
+	kingsrock
+	endmove
+
+Substitute:
+	checkobedience
+	usedmovetext
+	doturn
+	substitute
+	endmove
+
+HyperBeam:
+	checkobedience
+	usedmovetext
+	doturn
+	critical
+	damagecalc
+	itemmultiplier
+	stab
+	damagevariation
+	checkhit
+	hittarget
+	resulttext
+	checkfaint
+	criticaltext
+	supereffectivetext
+	rechargenextturn
+	checkdestinybond
+	buildopponentrage
+	endmove
+
+Rage:
+	checkobedience
+	usedmovetext
+	doturn
+	critical
+	damagecalc
+	itemmultiplier
+	stab
+	checkhit
+	ragedamage
+	damagevariation
+	hittarget
+	resulttext
+	rage
+	checkfaint
+	criticaltext
+	supereffectivetext
+	checkdestinybond
+	buildopponentrage
+	kingsrock
+	endmove
+
+Mimic:
+	checkobedience
+	usedmovetext
+	doturn
+	checkhit
+	mimic
+	endmove
+
+Metronome:
+	checkobedience
+	usedmovetext
+	doturn
+	metronome
+	endmove
+
+LeechSeed:
+	checkobedience
+	usedmovetext
+	doturn
+	checkhit
+	leechseed
+	endmove
+
+Splash:
+	checkobedience
+	usedmovetext
+	doturn
+	splash
+	endmove
+
+Disable:
+	checkobedience
+	usedmovetext
+	doturn
+	checkhit
+	disable
+	endmove
+
+RazorWind:
+	checkcharge
+	checkobedience
+	doturn
+	charge
+	usedmovetext
+	critical
+	damagecalc
+	itemmultiplier
+	stab
+	damagevariation
+	checkhit
+	hittarget
+	resulttext
+	checkfaint
+	criticaltext
+	supereffectivetext
+	checkdestinybond
+	buildopponentrage
+	kingsrock
+	endmove
+
+Fly:
+Dig:
+	checkcharge
+	checkobedience
+	doturn
+	charge
+	usedmovetext
+	critical
+	damagecalc
+	itemmultiplier
+	stab
+	damagevariation
+	checkhit
+	effect0x0b
+	effect0x0c
+	resulttext
+	checkfaint
+	criticaltext
+	supereffectivetext
+	checkdestinybond
+	buildopponentrage
+	kingsrock
+	endmove
+
+Bind:
+Wrap:
+FireSpin:
+Clamp:
+Whirlpool:
+	checkobedience
+	usedmovetext
+	doturn
+	checkhit
+	critical
+	damagecalc
+	itemmultiplier
+	stab
+	damagevariation
+	clearmissdamage
+	hittarget
+	resulttext
+	checkfaint
+	criticaltext
+	supereffectivetext
+	checkdestinybond
+	buildopponentrage
+	traptarget
+	endmove
+
+SuperFang:
+Sonicboom:
+DragonRage:
+SeismicToss:
+NightShade:
+Psywave:
+	checkobedience
+	usedmovetext
+	doturn
+	constantdamage
+	checkhit
+	effect0xa3
+	hittarget
+	resulttext
+	checkfaint
+	checkdestinybond
+	buildopponentrage
+	kingsrock
+	endmove
+
+Flail:
+Reversal:
+	checkobedience
+	usedmovetext
+	doturn
+	constantdamage
+	stab
+	checkhit
+	hittarget
+	resulttext
+	checkfaint
+	supereffectivetext
+	checkdestinybond
+	buildopponentrage
+	kingsrock
+	endmove
+
+Counter:
+	checkobedience
+	usedmovetext
+	doturn
+	counter
+	hittarget
+	resulttext
+	checkfaint
+	checkdestinybond
+	buildopponentrage
+	kingsrock
+	endmove
+
+Encore:
+	checkobedience
+	usedmovetext
+	doturn
+	checkhit
+	encore
+	endmove
+
+PainSplit:
+	checkobedience
+	usedmovetext
+	doturn
+	checkhit
+	painsplit
+	endmove
+
+Snore:
+	checkobedience
+	usedmovetext
+	doturn
+	critical
+	damagecalc
+	itemmultiplier
+	stab
+	damagevariation
+	checkhit
+	effectchance
+	snore
+	hittarget
+	resulttext
+	checkfaint
+	criticaltext
+	supereffectivetext
+	checkdestinybond
+	buildopponentrage
+	flinchtarget
+	kingsrock
+	endmove
+
+Conversion2:
+	checkobedience
+	usedmovetext
+	doturn
+	checkhit
+	conversion2
+	endmove
+
+MindReader:
+LockOn:
+	checkobedience
+	usedmovetext
+	doturn
+	checkhit
+	lockon
+	endmove
+
+Sketch:
+	checkobedience
+	usedmovetext
+	doturn
+	sketch
+	endmove
+
+	checkobedience
+	usedmovetext
+	doturn
+	defrostopponent
+	endmove
+
+SleepTalk:
+	checkobedience
+	usedmovetext
+	doturn
+	sleeptalk
+	endmove
+
+DestinyBond:
+	checkobedience
+	usedmovetext
+	doturn
+	destinybond
+	endmove
+
+Spite:
+	checkobedience
+	usedmovetext
+	doturn
+	checkhit
+	spite
+	endmove
+
+FalseSwipe:
+	checkobedience
+	usedmovetext
+	doturn
+	critical
+	damagecalc
+	itemmultiplier
+	stab
+	damagevariation
+	falseswipe
+	checkhit
+	hittarget
+	resulttext
+	checkfaint
+	criticaltext
+	supereffectivetext
+	checkdestinybond
+	buildopponentrage
+	kingsrock
+	endmove
+
+HealBell:
+	checkobedience
+	usedmovetext
+	doturn
+	healbell
+	endmove
+
+TripleKick:
+	checkobedience
+	usedmovetext
+	doturn
+	startloop
+	effect0x0a
+	checkhit
+	critical
+	damagecalc
+	itemmultiplier
+	triplekick
+	stab
+	damagevariation
+	clearmissdamage
+	effect0x0b
+	resulttext
+	checkfaint
+	criticaltext
+	cleartext
+	supereffectivelooptext
+	checkdestinybond
+	buildopponentrage
+	kickcounter
+	endloop
+	effect0x0c
+	kingsrock
+	endmove
+
+Thief:
+	checkobedience
+	usedmovetext
+	doturn
+	critical
+	damagecalc
+	itemmultiplier
+	stab
+	damagevariation
+	checkhit
+	effectchance
+	hittarget
+	resulttext
+	checkfaint
+	criticaltext
+	supereffectivetext
+	thief
+	checkdestinybond
+	buildopponentrage
+	kingsrock
+	endmove
+
+SpiderWeb:
+MeanLook:
+	checkobedience
+	usedmovetext
+	doturn
+	arenatrap
+	endmove
+
+Nightmare:
+	checkobedience
+	usedmovetext
+	doturn
+	nightmare
+	endmove
+
+FlameWheel:
+	checkobedience
+	usedmovetext
+	doturn
+	critical
+	damagecalc
+	itemmultiplier
+	stab
+	damagevariation
+	checkhit
+	effectchance
+	hittarget
+	resulttext
+	checkfaint
+	criticaltext
+	supereffectivetext
+	defrost
+	checkdestinybond
+	buildopponentrage
+	burntarget
+	endmove
+
+Curse:
+	checkobedience
+	usedmovetext
+	doturn
+	curse
+	endmove
+
+Protect:
+Detect:
+	checkobedience
+	usedmovetext
+	doturn
+	protect
+	endmove
+
+Spikes:
+	checkobedience
+	usedmovetext
+	doturn
+	spikes
+	endmove
+
+Foresight:
+	checkobedience
+	usedmovetext
+	doturn
+	checkhit
+	foresight
+	endmove
+
+PerishSong:
+	checkobedience
+	usedmovetext
+	doturn
+	perishsong
+	endmove
+
+Sandstorm:
+	checkobedience
+	usedmovetext
+	doturn
+	startsandstorm
+	endmove
+
+Endure:
+	checkobedience
+	usedmovetext
+	doturn
+	endure
+	endmove
+
+Rollout:
+	checkcurl
+	checkobedience
+	doturn
+	usedmovetext
+	critical
+	damagecalc
+	itemmultiplier
+	stab
+	checkhit
+	rolloutpower
+	damagevariation
+	hittarget
+	resulttext
+	checkfaint
+	criticaltext
+	supereffectivetext
+	checkdestinybond
+	buildopponentrage
+	kingsrock
+	endmove
+
+Swagger:
+	checkobedience
+	usedmovetext
+	doturn
+	checkhit
+	switchturn
+	attackup2
+	switchturn
+	effect0x0a
+	effect0x92
+	effect0x0c
+	resulttext
+	switchturn
+	statmessageuser
+	switchturn
+	confusetarget
+	endmove
+
+FuryCutter:
+	checkobedience
+	usedmovetext
+	doturn
+	critical
+	damagecalc
+	itemmultiplier
+	stab
+	checkhit
+	furycutter
+	damagevariation
+	hittarget
+	resulttext
+	checkfaint
+	criticaltext
+	supereffectivetext
+	checkdestinybond
+	buildopponentrage
+	kingsrock
+	endmove
+
+Attract:
+	checkobedience
+	usedmovetext
+	doturn
+	checkhit
+	attract
+	endmove
+
+Return:
+	checkobedience
+	usedmovetext
+	doturn
+	critical
+	damagecalc
+	happinesspower
+	itemmultiplier
+	stab
+	damagevariation
+	checkhit
+	hittarget
+	resulttext
+	checkfaint
+	criticaltext
+	supereffectivetext
+	checkdestinybond
+	buildopponentrage
+	kingsrock
+	endmove
+
+Present:
+	checkobedience
+	usedmovetext
+	doturn
+	checkhit
+	critical
+	damagecalc
+	present
+	itemmultiplier
+	stab
+	damagevariation
+	clearmissdamage
+	resulttext
+	checkfaint
+	criticaltext
+	supereffectivetext
+	checkdestinybond
+	buildopponentrage
+	kingsrock
+	endmove
+
+Frustration:
+	checkobedience
+	usedmovetext
+	doturn
+	critical
+	damagecalc
+	frustrationpower
+	itemmultiplier
+	stab
+	damagevariation
+	checkhit
+	hittarget
+	resulttext
+	checkfaint
+	criticaltext
+	supereffectivetext
+	checkdestinybond
+	buildopponentrage
+	kingsrock
+	endmove
+
+Safeguard:
+	checkobedience
+	usedmovetext
+	doturn
+	safeguard
+	endmove
+
+SacredFire:
+	checkobedience
+	usedmovetext
+	doturn
+	critical
+	damagecalc
+	itemmultiplier
+	stab
+	damagevariation
+	checkhit
+	effectchance
+	hittarget
+	resulttext
+	checkfaint
+	criticaltext
+	supereffectivetext
+	defrost
+	checkdestinybond
+	buildopponentrage
+	burntarget
+	endmove
+
+Magnitude:
+	checkobedience
+	usedmovetext
+	doturn
+	critical
+	damagecalc
+	getmagnitude
+	itemmultiplier
+	stab
+	damagevariation
+	checkhit
+	doubleundergrounddamage
+	hittarget
+	resulttext
+	checkfaint
+	criticaltext
+	supereffectivetext
+	checkdestinybond
+	buildopponentrage
+	kingsrock
+	endmove
+
+BatonPass:
+	checkobedience
+	usedmovetext
+	doturn
+	batonpass
+	endmove
+
+Pursuit:
+	checkobedience
+	usedmovetext
+	doturn
+	critical
+	damagecalc
+	itemmultiplier
+	stab
+	damagevariation
+	pursuit
+	checkhit
+	hittarget
+	resulttext
+	checkfaint
+	criticaltext
+	supereffectivetext
+	checkdestinybond
+	buildopponentrage
+	kingsrock
+	endmove
+
+RapidSpin:
+	checkobedience
+	usedmovetext
+	doturn
+	critical
+	damagecalc
+	itemmultiplier
+	stab
+	damagevariation
+	checkhit
+	hittarget
+	resulttext
+	checkfaint
+	criticaltext
+	supereffectivetext
+	clearhazards
+	checkdestinybond
+	buildopponentrage
+	kingsrock
+	endmove
+
+MorningSun:
+	checkobedience
+	usedmovetext
+	doturn
+	healmorn
+	endmove
+
+Synthesis:
+	checkobedience
+	usedmovetext
+	doturn
+	healday
+	endmove
+
+Moonlight:
+	checkobedience
+	usedmovetext
+	doturn
+	healnite
+	endmove
+
+HiddenPower:
+	checkobedience
+	usedmovetext
+	doturn
+	critical
+	hiddenpower
+	itemmultiplier
+	stab
+	damagevariation
+	checkhit
+	hittarget
+	resulttext
+	checkfaint
+	criticaltext
+	supereffectivetext
+	checkdestinybond
+	buildopponentrage
+	kingsrock
+	endmove
+
+RainDance:
+	checkobedience
+	usedmovetext
+	doturn
+	startrain
+	endmove
+
+SunnyDay:
+	checkobedience
+	usedmovetext
+	doturn
+	startsun
+	endmove
+
+	checkobedience
+	usedmovetext
+	doturn
+	checkhit
+	fakeout
+	hittarget
+	resulttext
+	endmove
+
+BellyDrum:
+	checkobedience
+	usedmovetext
+	doturn
+	bellydrum
+	endmove
+
+PsychUp:
+	checkobedience
+	usedmovetext
+	doturn
+	psychup
+	endmove
+
+MirrorCoat:
+	checkobedience
+	usedmovetext
+	doturn
+	mirrorcoat
+	hittarget
+	resulttext
+	checkfaint
+	checkdestinybond
+	buildopponentrage
+	kingsrock
+	endmove
+
+SkullBash:
+	checkcharge
+	checkobedience
+	doturn
+	charge
+	usedmovetext
+	critical
+	damagecalc
+	itemmultiplier
+	stab
+	damagevariation
+	checkhit
+	hittarget
+	resulttext
+	checkfaint
+	criticaltext
+	supereffectivetext
+	checkdestinybond
+	buildopponentrage
+	kingsrock
+	endturn
+	defenseup
+	statmessageuser
+	endmove
+
+Twister:
+	checkobedience
+	usedmovetext
+	doturn
+	critical
+	damagecalc
+	itemmultiplier
+	stab
+	damagevariation
+	doubleflyingdamage
+	checkhit
+	effectchance
+	hittarget
+	resulttext
+	checkfaint
+	criticaltext
+	supereffectivetext
+	checkdestinybond
+	buildopponentrage
+	flinchtarget
+	endmove
+
+Earthquake:
+	checkobedience
+	usedmovetext
+	doturn
+	critical
+	damagecalc
+	itemmultiplier
+	stab
+	damagevariation
+	doubleundergrounddamage
+	checkhit
+	effectchance
+	hittarget
+	resulttext
+	checkfaint
+	criticaltext
+	supereffectivetext
+	checkdestinybond
+	buildopponentrage
+	endmove
+
+FutureSight:
+	checkfuturesight
+	checkobedience
+	usedmovetext
+	doturn
+	damagecalc
+	itemmultiplier
+	futuresight
+	damagevariation
+	checkhit
+	effect0x0b
+	resulttext
+	checkfaint
+	checkdestinybond
+	buildopponentrage
+	endmove
+
+Gust:
+	checkobedience
+	usedmovetext
+	doturn
+	critical
+	damagecalc
+	itemmultiplier
+	stab
+	damagevariation
+	doubleflyingdamage
+	checkhit
+	hittarget
+	resulttext
+	checkfaint
+	criticaltext
+	supereffectivetext
+	checkdestinybond
+	buildopponentrage
+	endmove
+
+Stomp:
+	checkobedience
+	usedmovetext
+	doturn
+	critical
+	damagecalc
+	itemmultiplier
+	stab
+	damagevariation
+	doubleminimizedamage
+	checkhit
+	effectchance
+	hittarget
+	resulttext
+	checkfaint
+	criticaltext
+	supereffectivetext
+	checkdestinybond
+	buildopponentrage
+	flinchtarget
+	endmove
+
+Solarbeam:
+	checkcharge
+	checkobedience
+	doturn
+	skipsuncharge
+	charge
+	usedmovetext
+	critical
+	damagecalc
+	itemmultiplier
+	stab
+	damagevariation
+	checkhit
+	hittarget
+	resulttext
+	checkfaint
+	criticaltext
+	supereffectivetext
+	checkdestinybond
+	buildopponentrage
+	kingsrock
+	endmove
+
+Thunder:
+	checkobedience
+	usedmovetext
+	doturn
+	critical
+	damagecalc
+	itemmultiplier
+	thunderaccuracy
+	checkhit
+	effectchance
+	stab
+	damagevariation
+	hittarget
+	resulttext
+	checkfaint
+	criticaltext
+	supereffectivetext
+	checkdestinybond
+	buildopponentrage
+	paralyzetarget
+	endmove
+
+Teleport:
+	checkobedience
+	usedmovetext
+	doturn
+	teleport
+	endmove
+
+BeatUp:
+	checkobedience
+	usedmovetext
+	wait
+	doturn
+	startloop
+	effect0x0a
+	checkhit
+	critical
+	beatup
+	itemmultiplier
+	damagevariation
+	clearmissdamage
+	effect0x0b
+	resulttext
+	checkfaint
+	criticaltext
+	cleartext
+	supereffectivetext
+	checkdestinybond
+	buildopponentrage
+	endloop
+	effect0xa8
+	effect0x0c
+	kingsrock
+	endmove
+
+DefenseCurl:
+	checkobedience
+	usedmovetext
+	doturn
+	defenseup
+	curl
+	effect0x0a
+	effect0x92
+	effect0x0c
+	statmessageuser
+	statupfailtext
+	endmove
+
+
+
diff --git a/extras/crystal.py b/extras/crystal.py
index 0fe1aa30c..3f9e164b7 100644
--- a/extras/crystal.py
+++ b/extras/crystal.py
@@ -2912,7 +2912,7 @@ music_command_enders = [0xEA, 0xEB, 0xEE, 0xFC, 0xFF,]
 # special case for 0xFD (if loopchannel.count = 0, break)
 
 def create_music_command_classes(debug=False):
-    klasses = [GivePoke]
+    klasses = []
     for (byte, cmd) in music_commands_new.items():
         cmd_name = cmd[0].replace(" ", "_")
         params = {"id": byte, "size": 1, "end": byte in music_command_enders, "macro_name": cmd_name}
@@ -2938,6 +2938,221 @@ def create_music_command_classes(debug=False):
     return klasses
 music_classes = create_music_command_classes()
 
+
+
+effect_commands = {
+	0x1: ['checkturn'],
+	0x2: ['checkobedience'],
+	0x3: ['usedmovetext'],
+	0x4: ['doturn'],
+	0x5: ['critical'],
+	0x6: ['damagecalc'],
+	0x7: ['stab'],
+	0x8: ['damagevariation'],
+	0x9: ['checkhit'],
+	0xa: ['effect0x0a'],
+	0xb: ['effect0x0b'],
+	0xc: ['effect0x0c'],
+	0xd: ['resulttext'],
+	0xe: ['checkfaint'],
+	0xf: ['criticaltext'],
+	0x10: ['supereffectivetext'],
+	0x11: ['checkdestinybond'],
+	0x12: ['buildopponentrage'],
+	0x13: ['poisontarget'],
+	0x14: ['sleeptarget'],
+	0x15: ['draintarget'],
+	0x16: ['eatdream'],
+	0x17: ['burntarget'],
+	0x18: ['freezetarget'],
+	0x19: ['paralyzetarget'],
+	0x1a: ['selfdestruct'],
+	0x1b: ['mirrormove'],
+	0x1c: ['statup'],
+	0x1d: ['statdown'],
+	0x1e: ['payday'],
+	0x1f: ['conversion'],
+	0x20: ['resetstats'],
+	0x21: ['storeenergy'],
+	0x22: ['unleashenergy'],
+	0x23: ['forceswitch'],
+	0x24: ['endloop'],
+	0x25: ['flinchtarget'],
+	0x26: ['ohko'],
+	0x27: ['recoil'],
+	0x28: ['mist'],
+	0x29: ['focusenergy'],
+	0x2a: ['confuse'],
+	0x2b: ['confusetarget'],
+	0x2c: ['heal'],
+	0x2d: ['transform'],
+	0x2e: ['screen'],
+	0x2f: ['poison'],
+	0x30: ['paralyze'],
+	0x31: ['substitute'],
+	0x32: ['rechargenextturn'],
+	0x33: ['mimic'],
+	0x34: ['metronome'],
+	0x35: ['leechseed'],
+	0x36: ['splash'],
+	0x37: ['disable'],
+	0x38: ['cleartext'],
+	0x39: ['charge'],
+	0x3a: ['checkcharge'],
+	0x3b: ['traptarget'],
+	0x3c: ['effect0x3c'],
+	0x3d: ['rampage'],
+	0x3e: ['checkrampage'],
+	0x3f: ['constantdamage'],
+	0x40: ['counter'],
+	0x41: ['encore'],
+	0x42: ['painsplit'],
+	0x43: ['snore'],
+	0x44: ['conversion2'],
+	0x45: ['lockon'],
+	0x46: ['sketch'],
+	0x47: ['defrostopponent'],
+	0x48: ['sleeptalk'],
+	0x49: ['destinybond'],
+	0x4a: ['spite'],
+	0x4b: ['falseswipe'],
+	0x4c: ['healbell'],
+	0x4d: ['kingsrock'],
+	0x4e: ['triplekick'],
+	0x4f: ['kickcounter'],
+	0x50: ['thief'],
+	0x51: ['arenatrap'],
+	0x52: ['nightmare'],
+	0x53: ['defrost'],
+	0x54: ['curse'],
+	0x55: ['protect'],
+	0x56: ['spikes'],
+	0x57: ['foresight'],
+	0x58: ['perishsong'],
+	0x59: ['startsandstorm'],
+	0x5a: ['endure'],
+	0x5b: ['checkcurl'],
+	0x5c: ['rolloutpower'],
+	0x5d: ['effect0x5d'],
+	0x5e: ['furycutter'],
+	0x5f: ['attract'],
+	0x60: ['happinesspower'],
+	0x61: ['present'],
+	0x62: ['itemmultiplier'],
+	0x63: ['frustrationpower'],
+	0x64: ['safeguard'],
+	0x65: ['checksafeguard'],
+	0x66: ['getmagnitude'],
+	0x67: ['batonpass'],
+	0x68: ['pursuit'],
+	0x69: ['clearhazards'],
+	0x6a: ['healmorn'],
+	0x6b: ['healday'],
+	0x6c: ['healnite'],
+	0x6d: ['hiddenpower'],
+	0x6e: ['startrain'],
+	0x6f: ['startsun'],
+	0x70: ['attackup'],
+	0x71: ['defenseup'],
+	0x72: ['speedup'],
+	0x73: ['specialattackup'],
+	0x74: ['specialdefenseup'],
+	0x75: ['accuracyup'],
+	0x76: ['evasionup'],
+	0x77: ['attackup2'],
+	0x78: ['defenseup2'],
+	0x79: ['speedup2'],
+	0x7a: ['specialattackup2'],
+	0x7b: ['specialdefenseup2'],
+	0x7c: ['accuracyup2'],
+	0x7d: ['evasionup2'],
+	0x7e: ['attackdown'],
+	0x7f: ['defensedown'],
+	0x80: ['speeddown'],
+	0x81: ['specialattackdown'],
+	0x82: ['specialdefensedown'],
+	0x83: ['accuracydown'],
+	0x84: ['evasiondown'],
+	0x85: ['attackdown2'],
+	0x86: ['defensedown2'],
+	0x87: ['speeddown2'],
+	0x88: ['specialattackdown2'],
+	0x89: ['specialdefensedown2'],
+	0x8a: ['accuracydown2'],
+	0x8b: ['evasiondown2'],
+	0x8c: ['statmessageuser'],
+	0x8d: ['statmessagetarget'],
+	0x8e: ['statupfailtext'],
+	0x8f: ['statdownfailtext'],
+	0x90: ['effectchance'],
+	0x91: ['effect0x91'],
+	0x92: ['effect0x92'],
+	0x93: ['switchturn'],
+	0x94: ['fakeout'],
+	0x95: ['bellydrum'],
+	0x96: ['psychup'],
+	0x97: ['rage'],
+	0x98: ['doubleflyingdamage'],
+	0x99: ['doubleundergrounddamage'],
+	0x9a: ['mirrorcoat'],
+	0x9b: ['checkfuturesight'],
+	0x9c: ['futuresight'],
+	0x9d: ['doubleminimizedamage'],
+	0x9e: ['skipsuncharge'],
+	0x9f: ['thunderaccuracy'],
+	0xa0: ['teleport'],
+	0xa1: ['beatup'],
+	0xa2: ['ragedamage'],
+	0xa3: ['effect0xa3'],
+	0xa4: ['allstatsup'],
+	0xa5: ['effect0xa5'],
+	0xa6: ['effect0xa6'],
+	0xa7: ['effect0xa7'],
+	0xa8: ['effect0xa8'],
+	0xa9: ['clearmissdamage'],
+	0xaa: ['wait'],
+	0xab: ['hittarget'],
+	0xac: ['tristatuschance'],
+	0xad: ['supereffectivelooptext'],
+	0xae: ['startloop'],
+	0xaf: ['curl'],
+	0xfe: ['endturn'],
+	0xff: ['endmove'],
+}
+
+effect_command_enders = [0xFF,]
+
+def create_effect_command_classes(debug=False):
+    klasses = []
+    for (byte, cmd) in effect_commands.items():
+        cmd_name = cmd[0].replace(" ", "_")
+        params = {
+            "id": byte,
+            "size": 1,
+            "end": byte in effect_command_enders,
+            "macro_name": cmd_name
+	}
+        params["param_types"] = {}
+        if len(cmd) > 1:
+            param_types = cmd[1:]
+            for (i, each) in enumerate(param_types):
+                thing = {"name": each[0], "class": each[1]}
+                params["param_types"][i] = thing
+                if debug:
+                    print "each is: " + str(each)
+                    print "thing[class] is: " + str(thing["class"])
+                params["size"] += thing["class"].size
+        klass_name = cmd_name+"Command"
+        klass = classobj(klass_name, (Command,), params)
+        globals()[klass_name] = klass
+        klasses.append(klass)
+    # later an individual klass will be instantiated to handle something
+    return klasses
+
+effect_classes = create_effect_command_classes()
+
+
+
 def generate_macros(filename="../script_macros.asm"):
     """generates all macros based on commands
     this is dumped into script_macros.asm"""
diff --git a/main.asm b/main.asm
index 470eb7508..7bdbd2bb9 100644
--- a/main.asm
+++ b/main.asm
@@ -5703,7 +5703,9 @@ INCBIN "baserom.gbc", $271f4, $2732e - $271f4
 
 MoveEffects: ; 2732e
 
-INCBIN "baserom.gbc", $2732e, $27a2d - $2732e
+INCLUDE "battle/moves/move_effects.asm"
+
+INCBIN "baserom.gbc", $27a28, $27a2d - $27a28
 
 
 SECTION "bankA",DATA,BANK[$A]
diff --git a/preprocessor.py b/preprocessor.py
index cb09fb898..c53612517 100644
--- a/preprocessor.py
+++ b/preprocessor.py
@@ -18,6 +18,7 @@ from extras.crystal import (
     text_command_classes,
     movement_command_classes,
     music_classes,
+    effect_classes,
 )
 
 even_more_macros = [
@@ -34,6 +35,7 @@ macros += even_more_macros
 macros += [each[1] for each in text_command_classes]
 macros += movement_command_classes
 macros += music_classes
+macros += effect_classes
 
 # show lines before preprocessing in stdout
 show_original_lines = False