Enumerate the move effect command macros.

battle/effect_commands.asm

@@ -90,8 +90,8 @@ DoMove: ; 3402c
 	ld [BattleScriptBufferLoc + 1], a
 	pop af
 
-; $fe is used to terminate branches without ending the read cycle.
+; endturn_command (-2) is used to terminate branches without ending the read cycle.
-	cp $fe
+	cp endturn_command
 	ret nc
 
 ; The rest of the commands (01-af) are read from BattleCommandPointers.
@@ -3918,7 +3918,7 @@ BattleCommanda1: ; 35461
 
 
 Function355b0: ; 355b0
-	ld b, $12 ; buildopponentrage
+	ld b, buildopponentrage_command
 	jp SkipToBattleCommand
 ; 355b5
 
@@ -6977,7 +6977,7 @@ BattleCommand21: ; 36671
 	ld a, BIDE
 	ld [hl], a
 
-	ld b, $22 ; unleashenergy
+	ld b, unleashenergy_command
 	jp SkipToBattleCommand
 
 .asm_366dc
@@ -7051,7 +7051,7 @@ BattleCommand3e: ; 3671a
 	inc de
 	ld [de], a
 .asm_3674c
-	ld b, $3d ; rampage
+	ld b, rampage_command
 	jp SkipToBattleCommand
 ; 36751
 
@@ -7707,7 +7707,7 @@ BattleCommand3a: ; 36b3a
 	res SUBSTATUS_CHARGED, [hl]
 	res SUBSTATUS_UNDERGROUND, [hl]
 	res SUBSTATUS_FLYING, [hl]
-	ld b, $39 ; charge
+	ld b, charge_command
 	jp SkipToBattleCommand
 ; 36b4d
 
@@ -7787,7 +7787,7 @@ BattleCommand39: ; 36b4d
 	ld a, BATTLE_VARS_MOVE_EFFECT
 	call GetBattleVar
 	cp EFFECT_SKULL_BASH
-	ld b, $fe ; endturn
+	ld b, endturn_command
 	jp z, SkipToBattleCommand
 	jp EndMoveEffect
 
@@ -10294,7 +10294,7 @@ BattleCommand9e: ; 37d02
 	ld a, [Weather]
 	cp WEATHER_SUN
 	ret nz
-	ld b, $39 ; charge
+	ld b, charge_command
 	jp SkipToBattleCommand
 ; 37d0d
 
@@ -10323,7 +10323,7 @@ BattleCommand9b: ; 37d0d
 	ld [CurDamage], a
 	ld a, [de]
 	ld [CurDamage + 1], a
-	ld b, $9c ; futuresight
+	ld b, futuresight_command
 	jp SkipToBattleCommand
 ; 37d34
 

macros/move_effect.asm

@@ -1,708 +1,186 @@
-checkturn: macro
+command: macro
-	db $01
+	enum \1_command
-	endm
+\1 equs "db \1_command"
-
+endm
-checkobedience: macro
+
-	db $02
+	enum_start 1
-	endm
+
-
+	command checkturn
-usedmovetext: macro
+	command checkobedience
-	db $03
+	command usedmovetext
-	endm
+	command doturn
-
+	command critical
-doturn: macro
+	command damagestats
-	db $04
+	command stab
-	endm
+	command damagevariation
-
+	command checkhit
-critical: macro
+	command effect0x0a
-	db $05
+	command effect0x0b
-	endm
+	command effect0x0c
-
+	command resulttext
-damagestats: macro
+	command checkfaint
-	db $06
+	command criticaltext
-	endm
+	command supereffectivetext
-
+	command checkdestinybond
-stab: macro
+	command buildopponentrage
-	db $07
+	command poisontarget
-	endm
+	command sleeptarget
-
+	command draintarget
-damagevariation: macro
+	command eatdream
-	db $08
+	command burntarget
-	endm
+	command freezetarget
-
+	command paralyzetarget
-checkhit: macro
+	command selfdestruct
-	db $09
+	command mirrormove
-	endm
+	command statup
-
+	command statdown
-effect0x0a: macro
+	command payday
-	db $0a
+	command conversion
-	endm
+	command resetstats
-
+	command storeenergy
-effect0x0b: macro
+	command unleashenergy
-	db $0b
+	command forceswitch
-	endm
+	command endloop
-
+	command flinchtarget
-effect0x0c: macro
+	command ohko
-	db $0c
+	command recoil
-	endm
+	command mist
-
+	command focusenergy
-resulttext: macro
+	command confuse
-	db $0d
+	command confusetarget
-	endm
+	command heal
-
+	command transform
-checkfaint: macro
+	command screen
-	db $0e
+	command poison
-	endm
+	command paralyze
-
+	command substitute
-criticaltext: macro
+	command rechargenextturn
-	db $0f
+	command mimic
-	endm
+	command metronome
-
+	command leechseed
-supereffectivetext: macro
+	command splash
-	db $10
+	command disable
-	endm
+	command cleartext
-
+	command charge
-checkdestinybond: macro
+	command checkcharge
-	db $11
+	command traptarget
-	endm
+	command effect0x3c
-
+	command rampage
-buildopponentrage: macro
+	command checkrampage
-	db $12
+	command constantdamage
-	endm
+	command counter
-
+	command encore
-poisontarget: macro
+	command painsplit
-	db $13
+	command snore
-	endm
+	command conversion2
-
+	command lockon
-sleeptarget: macro
+	command sketch
-	db $14
+	command defrostopponent
-	endm
+	command sleeptalk
-
+	command destinybond
-draintarget: macro
+	command spite
-	db $15
+	command falseswipe
-	endm
+	command healbell
-
+	command kingsrock
-eatdream: macro
+	command triplekick
-	db $16
+	command kickcounter
-	endm
+	command thief
-
+	command arenatrap
-burntarget: macro
+	command nightmare
-	db $17
+	command defrost
-	endm
+	command curse
-
+	command protect
-freezetarget: macro
+	command spikes
-	db $18
+	command foresight
-	endm
+	command perishsong
-
+	command startsandstorm
-paralyzetarget: macro
+	command endure
-	db $19
+	command checkcurl
-	endm
+	command rolloutpower
-
+	command effect0x5d
-selfdestruct: macro
+	command furycutter
-	db $1a
+	command attract
-	endm
+	command happinesspower
-
+	command present
-mirrormove: macro
+	command damagecalc
-	db $1b
+	command frustrationpower
-	endm
+	command safeguard
-
+	command checksafeguard
-statup: macro
+	command getmagnitude
-	db $1c
+	command batonpass
-	endm
+	command pursuit
-
+	command clearhazards
-statdown: macro
+	command healmorn
-	db $1d
+	command healday
-	endm
+	command healnite
-
+	command hiddenpower
-payday: macro
+	command startrain
-	db $1e
+	command startsun
-	endm
+	command attackup
-
+	command defenseup
-conversion: macro
+	command speedup
-	db $1f
+	command specialattackup
-	endm
+	command specialdefenseup
-
+	command accuracyup
-resetstats: macro
+	command evasionup
-	db $20
+	command attackup2
-	endm
+	command defenseup2
-
+	command speedup2
-storeenergy: macro
+	command specialattackup2
-	db $21
+	command specialdefenseup2
-	endm
+	command accuracyup2
-
+	command evasionup2
-unleashenergy: macro
+	command attackdown
-	db $22
+	command defensedown
-	endm
+	command speeddown
-
+	command specialattackdown
-forceswitch: macro
+	command specialdefensedown
-	db $23
+	command accuracydown
-	endm
+	command evasiondown
-
+	command attackdown2
-endloop: macro
+	command defensedown2
-	db $24
+	command speeddown2
-	endm
+	command specialattackdown2
-
+	command specialdefensedown2
-flinchtarget: macro
+	command accuracydown2
-	db $25
+	command evasiondown2
-	endm
+	command statmessageuser
-
+	command statmessagetarget
-ohko: macro
+	command statupfailtext
-	db $26
+	command statdownfailtext
-	endm
+	command effectchance
-
+	command effect0x91
-recoil: macro
+	command effect0x92
-	db $27
+	command switchturn
-	endm
+	command fakeout
-
+	command bellydrum
-mist: macro
+	command psychup
-	db $28
+	command rage
-	endm
+	command doubleflyingdamage
-
+	command doubleundergrounddamage
-focusenergy: macro
+	command mirrorcoat
-	db $29
+	command checkfuturesight
-	endm
+	command futuresight
-
+	command doubleminimizedamage
-confuse: macro
+	command skipsuncharge
-	db $2a
+	command thunderaccuracy
-	endm
+	command teleport
-
+	command beatup
-confusetarget: macro
+	command ragedamage
-	db $2b
+	command effect0xa3
-	endm
+	command allstatsup
-
+	command effect0xa5
-heal: macro
+	command effect0xa6
-	db $2c
+	command effect0xa7
-	endm
+	command effect0xa8
-
+	command clearmissdamage
-transform: macro
+	command movedelay
-	db $2d
+	command hittarget
-	endm
+	command tristatuschance
-
+	command supereffectivelooptext
-screen: macro
+	command startloop
-	db $2e
+	command curl
-	endm
+
-
+	enum_start -1, -1
-poison: macro
+	command endmove
-	db $2f
+	command endturn
-	endm
-
-paralyze: macro
-	db $30
-	endm
-
-substitute: macro
-	db $31
-	endm
-
-rechargenextturn: macro
-	db $32
-	endm
-
-mimic: macro
-	db $33
-	endm
-
-metronome: macro
-	db $34
-	endm
-
-leechseed: macro
-	db $35
-	endm
-
-splash: macro
-	db $36
-	endm
-
-disable: macro
-	db $37
-	endm
-
-cleartext: macro
-	db $38
-	endm
-
-charge: macro
-	db $39
-	endm
-
-checkcharge: macro
-	db $3a
-	endm
-
-traptarget: macro
-	db $3b
-	endm
-
-effect0x3c: macro
-	db $3c
-	endm
-
-rampage: macro
-	db $3d
-	endm
-
-checkrampage: macro
-	db $3e
-	endm
-
-constantdamage: macro
-	db $3f
-	endm
-
-counter: macro
-	db $40
-	endm
-
-encore: macro
-	db $41
-	endm
-
-painsplit: macro
-	db $42
-	endm
-
-snore: macro
-	db $43
-	endm
-
-conversion2: macro
-	db $44
-	endm
-
-lockon: macro
-	db $45
-	endm
-
-sketch: macro
-	db $46
-	endm
-
-defrostopponent: macro
-	db $47
-	endm
-
-sleeptalk: macro
-	db $48
-	endm
-
-destinybond: macro
-	db $49
-	endm
-
-spite: macro
-	db $4a
-	endm
-
-falseswipe: macro
-	db $4b
-	endm
-
-healbell: macro
-	db $4c
-	endm
-
-kingsrock: macro
-	db $4d
-	endm
-
-triplekick: macro
-	db $4e
-	endm
-
-kickcounter: macro
-	db $4f
-	endm
-
-thief: macro
-	db $50
-	endm
-
-arenatrap: macro
-	db $51
-	endm
-
-nightmare: macro
-	db $52
-	endm
-
-defrost: macro
-	db $53
-	endm
-
-curse: macro
-	db $54
-	endm
-
-protect: macro
-	db $55
-	endm
-
-spikes: macro
-	db $56
-	endm
-
-foresight: macro
-	db $57
-	endm
-
-perishsong: macro
-	db $58
-	endm
-
-startsandstorm: macro
-	db $59
-	endm
-
-endure: macro
-	db $5a
-	endm
-
-checkcurl: macro
-	db $5b
-	endm
-
-rolloutpower: macro
-	db $5c
-	endm
-
-effect0x5d: macro
-	db $5d
-	endm
-
-furycutter: macro
-	db $5e
-	endm
-
-attract: macro
-	db $5f
-	endm
-
-happinesspower: macro
-	db $60
-	endm
-
-present: macro
-	db $61
-	endm
-
-damagecalc: macro
-	db $62
-	endm
-
-frustrationpower: macro
-	db $63
-	endm
-
-safeguard: macro
-	db $64
-	endm
-
-checksafeguard: macro
-	db $65
-	endm
-
-getmagnitude: macro
-	db $66
-	endm
-
-batonpass: macro
-	db $67
-	endm
-
-pursuit: macro
-	db $68
-	endm
-
-clearhazards: macro
-	db $69
-	endm
-
-healmorn: macro
-	db $6a
-	endm
-
-healday: macro
-	db $6b
-	endm
-
-healnite: macro
-	db $6c
-	endm
-
-hiddenpower: macro
-	db $6d
-	endm
-
-startrain: macro
-	db $6e
-	endm
-
-startsun: macro
-	db $6f
-	endm
-
-attackup: macro
-	db $70
-	endm
-
-defenseup: macro
-	db $71
-	endm
-
-speedup: macro
-	db $72
-	endm
-
-specialattackup: macro
-	db $73
-	endm
-
-specialdefenseup: macro
-	db $74
-	endm
-
-accuracyup: macro
-	db $75
-	endm
-
-evasionup: macro
-	db $76
-	endm
-
-attackup2: macro
-	db $77
-	endm
-
-defenseup2: macro
-	db $78
-	endm
-
-speedup2: macro
-	db $79
-	endm
-
-specialattackup2: macro
-	db $7a
-	endm
-
-specialdefenseup2: macro
-	db $7b
-	endm
-
-accuracyup2: macro
-	db $7c
-	endm
-
-evasionup2: macro
-	db $7d
-	endm
-
-attackdown: macro
-	db $7e
-	endm
-
-defensedown: macro
-	db $7f
-	endm
-
-speeddown: macro
-	db $80
-	endm
-
-specialattackdown: macro
-	db $81
-	endm
-
-specialdefensedown: macro
-	db $82
-	endm
-
-accuracydown: macro
-	db $83
-	endm
-
-evasiondown: macro
-	db $84
-	endm
-
-attackdown2: macro
-	db $85
-	endm
-
-defensedown2: macro
-	db $86
-	endm
-
-speeddown2: macro
-	db $87
-	endm
-
-specialattackdown2: macro
-	db $88
-	endm
-
-specialdefensedown2: macro
-	db $89
-	endm
-
-accuracydown2: macro
-	db $8a
-	endm
-
-evasiondown2: macro
-	db $8b
-	endm
-
-statmessageuser: macro
-	db $8c
-	endm
-
-statmessagetarget: macro
-	db $8d
-	endm
-
-statupfailtext: macro
-	db $8e
-	endm
-
-statdownfailtext: macro
-	db $8f
-	endm
-
-effectchance: macro
-	db $90
-	endm
-
-effect0x91: macro
-	db $91
-	endm
-
-effect0x92: macro
-	db $92
-	endm
-
-switchturn: macro
-	db $93
-	endm
-
-fakeout: macro
-	db $94
-	endm
-
-bellydrum: macro
-	db $95
-	endm
-
-psychup: macro
-	db $96
-	endm
-
-rage: macro
-	db $97
-	endm
-
-doubleflyingdamage: macro
-	db $98
-	endm
-
-doubleundergrounddamage: macro
-	db $99
-	endm
-
-mirrorcoat: macro
-	db $9a
-	endm
-
-checkfuturesight: macro
-	db $9b
-	endm
-
-futuresight: macro
-	db $9c
-	endm
-
-doubleminimizedamage: macro
-	db $9d
-	endm
-
-skipsuncharge: macro
-	db $9e
-	endm
-
-thunderaccuracy: macro
-	db $9f
-	endm
-
-teleport: macro
-	db $a0
-	endm
-
-beatup: macro
-	db $a1
-	endm
-
-ragedamage: macro
-	db $a2
-	endm
-
-effect0xa3: macro
-	db $a3
-	endm
-
-allstatsup: macro
-	db $a4
-	endm
-
-effect0xa5: macro
-	db $a5
-	endm
-
-effect0xa6: macro
-	db $a6
-	endm
-
-effect0xa7: macro
-	db $a7
-	endm
-
-effect0xa8: macro
-	db $a8
-	endm
-
-clearmissdamage: macro
-	db $a9
-	endm
-
-movedelay: macro
-	db $aa
-	endm
-
-hittarget: macro
-	db $ab
-	endm
-
-tristatuschance: macro
-	db $ac
-	endm
-
-supereffectivelooptext: macro
-	db $ad
-	endm
-
-startloop: macro
-	db $ae
-	endm
-
-curl: macro
-	db $af
-	endm
-
-endturn: macro
-	db $fe
-	endm
-
-endmove: macro
-	db $ff
-	endm
-