summaryrefslogtreecommitdiff
path: root/constants
diff options
context:
space:
mode:
Diffstat (limited to 'constants')
-rw-r--r--constants/battle_constants.asm160
-rw-r--r--constants/item_constants.asm6
-rw-r--r--constants/move_effect_constants.asm159
3 files changed, 161 insertions, 164 deletions
diff --git a/constants/battle_constants.asm b/constants/battle_constants.asm
index 804f223c..99d86e56 100644
--- a/constants/battle_constants.asm
+++ b/constants/battle_constants.asm
@@ -162,166 +162,6 @@ SUBSTATUS_CURLED EQU 0
const WEATHER_SANDSTORM_END
-; move effects
- const_def
- const EFFECT_NORMAL_HIT
- const EFFECT_SLEEP
- const EFFECT_POISON_HIT
- const EFFECT_LEECH_HIT
- const EFFECT_BURN_HIT
- const EFFECT_FREEZE_HIT
- const EFFECT_PARALYZE_HIT
- const EFFECT_EXPLOSION
- const EFFECT_DREAM_EATER
- const EFFECT_MIRROR_MOVE
- const EFFECT_ATTACK_UP
- const EFFECT_DEFENSE_UP
- const EFFECT_SPEED_UP
- const EFFECT_SP_ATK_UP
- const EFFECT_SP_DEF_UP
- const EFFECT_ACCURACY_UP
- const EFFECT_EVASION_UP
- const EFFECT_ALWAYS_HIT
- const EFFECT_ATTACK_DOWN
- const EFFECT_DEFENSE_DOWN
- const EFFECT_SPEED_DOWN
- const EFFECT_SP_ATK_DOWN
- const EFFECT_SP_DEF_DOWN
- const EFFECT_ACCURACY_DOWN
- const EFFECT_EVASION_DOWN
- const EFFECT_HAZE
- const EFFECT_BIDE
- const EFFECT_RAMPAGE
- const EFFECT_WHIRLWIND
- const EFFECT_MULTI_HIT
- const EFFECT_CONVERSION
- const EFFECT_FLINCH_HIT
- const EFFECT_HEAL
- const EFFECT_TOXIC
- const EFFECT_PAY_DAY
- const EFFECT_LIGHT_SCREEN
- const EFFECT_TRI_ATTACK
- const EFFECT_UNUSED_25
- const EFFECT_OHKO
- const EFFECT_RAZOR_WIND
- const EFFECT_SUPER_FANG
- const EFFECT_STATIC_DAMAGE
- const EFFECT_BIND
- const EFFECT_UNUSED_2B
- const EFFECT_DOUBLE_HIT
- const EFFECT_JUMP_KICK
- const EFFECT_MIST
- const EFFECT_FOCUS_ENERGY
- const EFFECT_RECOIL_HIT
- const EFFECT_CONFUSE
- const EFFECT_ATTACK_UP_2
- const EFFECT_DEFENSE_UP_2
- const EFFECT_SPEED_UP_2
- const EFFECT_SP_ATK_UP_2
- const EFFECT_SP_DEF_UP_2
- const EFFECT_ACCURACY_UP_2
- const EFFECT_EVASION_UP_2
- const EFFECT_TRANSFORM
- const EFFECT_ATTACK_DOWN_2
- const EFFECT_DEFENSE_DOWN_2
- const EFFECT_SPEED_DOWN_2
- const EFFECT_SP_ATK_DOWN_2
- const EFFECT_SP_DEF_DOWN_2
- const EFFECT_ACCURACY_DOWN_2
- const EFFECT_EVASION_DOWN_2
- const EFFECT_REFLECT
- const EFFECT_POISON
- const EFFECT_PARALYZE
- const EFFECT_ATTACK_DOWN_HIT
- const EFFECT_DEFENSE_DOWN_HIT
- const EFFECT_SPEED_DOWN_HIT
- const EFFECT_SP_ATK_DOWN_HIT
- const EFFECT_SP_DEF_DOWN_HIT
- const EFFECT_ACCURACY_DOWN_HIT
- const EFFECT_EVASION_DOWN_HIT
- const EFFECT_SKY_ATTACK
- const EFFECT_CONFUSE_HIT
- const EFFECT_TWINEEDLE
- const EFFECT_UNUSED_4E
- const EFFECT_SUBSTITUTE
- const EFFECT_HYPER_BEAM
- const EFFECT_RAGE
- const EFFECT_MIMIC
- const EFFECT_METRONOME
- const EFFECT_LEECH_SEED
- const EFFECT_SPLASH
- const EFFECT_DISABLE
- const EFFECT_LEVEL_DAMAGE
- const EFFECT_PSYWAVE
- const EFFECT_COUNTER
- const EFFECT_ENCORE
- const EFFECT_PAIN_SPLIT
- const EFFECT_SNORE
- const EFFECT_CONVERSION2
- const EFFECT_LOCK_ON
- const EFFECT_SKETCH
- const EFFECT_DEFROST_OPPONENT
- const EFFECT_SLEEP_TALK
- const EFFECT_DESTINY_BOND
- const EFFECT_REVERSAL
- const EFFECT_SPITE
- const EFFECT_FALSE_SWIPE
- const EFFECT_HEAL_BELL
- const EFFECT_PRIORITY_HIT
- const EFFECT_TRIPLE_KICK
- const EFFECT_THIEF
- const EFFECT_MEAN_LOOK
- const EFFECT_NIGHTMARE
- const EFFECT_FLAME_WHEEL
- const EFFECT_CURSE
- const EFFECT_UNUSED_6E
- const EFFECT_PROTECT
- const EFFECT_SPIKES
- const EFFECT_FORESIGHT
- const EFFECT_PERISH_SONG
- const EFFECT_SANDSTORM
- const EFFECT_ENDURE
- const EFFECT_ROLLOUT
- const EFFECT_SWAGGER
- const EFFECT_FURY_CUTTER
- const EFFECT_ATTRACT
- const EFFECT_RETURN
- const EFFECT_PRESENT
- const EFFECT_FRUSTRATION
- const EFFECT_SAFEGUARD
- const EFFECT_SACRED_FIRE
- const EFFECT_MAGNITUDE
- const EFFECT_BATON_PASS
- const EFFECT_PURSUIT
- const EFFECT_RAPID_SPIN
- const EFFECT_UNUSED_82
- const EFFECT_UNUSED_83
- const EFFECT_MORNING_SUN
- const EFFECT_SYNTHESIS
- const EFFECT_MOONLIGHT
- const EFFECT_HIDDEN_POWER
- const EFFECT_RAIN_DANCE
- const EFFECT_SUNNY_DAY
- const EFFECT_STEEL_WING
- const EFFECT_METAL_CLAW
- const EFFECT_ANCIENTPOWER
- const EFFECT_FAKE_OUT
- const EFFECT_BELLY_DRUM
- const EFFECT_PSYCH_UP
- const EFFECT_MIRROR_COAT
- const EFFECT_SKULL_BASH
- const EFFECT_TWISTER
- const EFFECT_EARTHQUAKE
- const EFFECT_FUTURE_SIGHT
- const EFFECT_GUST
- const EFFECT_STOMP
- const EFFECT_SOLARBEAM
- const EFFECT_THUNDER
- const EFFECT_TELEPORT
- const EFFECT_BEAT_UP
- const EFFECT_FLY
- const EFFECT_DEFENSE_CURL
-
; Battle vars used in home/battle.asm
const_def
const PLAYER_SUBSTATUS_1
diff --git a/constants/item_constants.asm b/constants/item_constants.asm
index 299b59a4..5bdbc959 100644
--- a/constants/item_constants.asm
+++ b/constants/item_constants.asm
@@ -202,8 +202,7 @@ if !DEF(TM01)
TM01 EQU const_value
enum_start 1
endc
- define _\@_1, "TM_\1"
- const _\@_1
+ const TM_\1
enum \1_TMNUM
ENDM
@@ -266,8 +265,7 @@ add_hm: MACRO
if !DEF(HM01)
HM01 EQU const_value
endc
- define _\@_1, "HM_\1"
- const _\@_1
+ const HM_\1
enum \1_TMNUM
ENDM
diff --git a/constants/move_effect_constants.asm b/constants/move_effect_constants.asm
new file mode 100644
index 00000000..0ca97f38
--- /dev/null
+++ b/constants/move_effect_constants.asm
@@ -0,0 +1,159 @@
+; MoveEffectsPointers indexes (see data/moves/effects_pointers.asm)
+ const_def
+ const EFFECT_NORMAL_HIT
+ const EFFECT_SLEEP
+ const EFFECT_POISON_HIT
+ const EFFECT_LEECH_HIT
+ const EFFECT_BURN_HIT
+ const EFFECT_FREEZE_HIT
+ const EFFECT_PARALYZE_HIT
+ const EFFECT_SELFDESTRUCT
+ const EFFECT_DREAM_EATER
+ const EFFECT_MIRROR_MOVE
+ const EFFECT_ATTACK_UP
+ const EFFECT_DEFENSE_UP
+ const EFFECT_SPEED_UP
+ const EFFECT_SP_ATK_UP
+ const EFFECT_SP_DEF_UP
+ const EFFECT_ACCURACY_UP
+ const EFFECT_EVASION_UP
+ const EFFECT_ALWAYS_HIT
+ const EFFECT_ATTACK_DOWN
+ const EFFECT_DEFENSE_DOWN
+ const EFFECT_SPEED_DOWN
+ const EFFECT_SP_ATK_DOWN
+ const EFFECT_SP_DEF_DOWN
+ const EFFECT_ACCURACY_DOWN
+ const EFFECT_EVASION_DOWN
+ const EFFECT_RESET_STATS
+ const EFFECT_BIDE
+ const EFFECT_RAMPAGE
+ const EFFECT_FORCE_SWITCH
+ const EFFECT_MULTI_HIT
+ const EFFECT_CONVERSION
+ const EFFECT_FLINCH_HIT
+ const EFFECT_HEAL
+ const EFFECT_TOXIC
+ const EFFECT_PAY_DAY
+ const EFFECT_LIGHT_SCREEN
+ const EFFECT_TRI_ATTACK
+ const EFFECT_UNUSED_25
+ const EFFECT_OHKO
+ const EFFECT_RAZOR_WIND
+ const EFFECT_SUPER_FANG
+ const EFFECT_STATIC_DAMAGE
+ const EFFECT_TRAP_TARGET
+ const EFFECT_UNUSED_2B
+ const EFFECT_DOUBLE_HIT
+ const EFFECT_JUMP_KICK
+ const EFFECT_MIST
+ const EFFECT_FOCUS_ENERGY
+ const EFFECT_RECOIL_HIT
+ const EFFECT_CONFUSE
+ const EFFECT_ATTACK_UP_2
+ const EFFECT_DEFENSE_UP_2
+ const EFFECT_SPEED_UP_2
+ const EFFECT_SP_ATK_UP_2
+ const EFFECT_SP_DEF_UP_2
+ const EFFECT_ACCURACY_UP_2
+ const EFFECT_EVASION_UP_2
+ const EFFECT_TRANSFORM
+ const EFFECT_ATTACK_DOWN_2
+ const EFFECT_DEFENSE_DOWN_2
+ const EFFECT_SPEED_DOWN_2
+ const EFFECT_SP_ATK_DOWN_2
+ const EFFECT_SP_DEF_DOWN_2
+ const EFFECT_ACCURACY_DOWN_2
+ const EFFECT_EVASION_DOWN_2
+ const EFFECT_REFLECT
+ const EFFECT_POISON
+ const EFFECT_PARALYZE
+ const EFFECT_ATTACK_DOWN_HIT
+ const EFFECT_DEFENSE_DOWN_HIT
+ const EFFECT_SPEED_DOWN_HIT
+ const EFFECT_SP_ATK_DOWN_HIT
+ const EFFECT_SP_DEF_DOWN_HIT
+ const EFFECT_ACCURACY_DOWN_HIT
+ const EFFECT_EVASION_DOWN_HIT
+ const EFFECT_SKY_ATTACK
+ const EFFECT_CONFUSE_HIT
+ const EFFECT_POISON_MULTI_HIT
+ const EFFECT_UNUSED_4E
+ const EFFECT_SUBSTITUTE
+ const EFFECT_HYPER_BEAM
+ const EFFECT_RAGE
+ const EFFECT_MIMIC
+ const EFFECT_METRONOME
+ const EFFECT_LEECH_SEED
+ const EFFECT_SPLASH
+ const EFFECT_DISABLE
+ const EFFECT_LEVEL_DAMAGE
+ const EFFECT_PSYWAVE
+ const EFFECT_COUNTER
+ const EFFECT_ENCORE
+ const EFFECT_PAIN_SPLIT
+ const EFFECT_SNORE
+ const EFFECT_CONVERSION2
+ const EFFECT_LOCK_ON
+ const EFFECT_SKETCH
+ const EFFECT_DEFROST_OPPONENT
+ const EFFECT_SLEEP_TALK
+ const EFFECT_DESTINY_BOND
+ const EFFECT_REVERSAL
+ const EFFECT_SPITE
+ const EFFECT_FALSE_SWIPE
+ const EFFECT_HEAL_BELL
+ const EFFECT_PRIORITY_HIT
+ const EFFECT_TRIPLE_KICK
+ const EFFECT_THIEF
+ const EFFECT_MEAN_LOOK
+ const EFFECT_NIGHTMARE
+ const EFFECT_FLAME_WHEEL
+ const EFFECT_CURSE
+ const EFFECT_UNUSED_6E
+ const EFFECT_PROTECT
+ const EFFECT_SPIKES
+ const EFFECT_FORESIGHT
+ const EFFECT_PERISH_SONG
+ const EFFECT_SANDSTORM
+ const EFFECT_ENDURE
+ const EFFECT_ROLLOUT
+ const EFFECT_SWAGGER
+ const EFFECT_FURY_CUTTER
+ const EFFECT_ATTRACT
+ const EFFECT_RETURN
+ const EFFECT_PRESENT
+ const EFFECT_FRUSTRATION
+ const EFFECT_SAFEGUARD
+ const EFFECT_SACRED_FIRE
+ const EFFECT_MAGNITUDE
+ const EFFECT_BATON_PASS
+ const EFFECT_PURSUIT
+ const EFFECT_RAPID_SPIN
+ const EFFECT_UNUSED_82
+ const EFFECT_UNUSED_83
+ const EFFECT_MORNING_SUN
+ const EFFECT_SYNTHESIS
+ const EFFECT_MOONLIGHT
+ const EFFECT_HIDDEN_POWER
+ const EFFECT_RAIN_DANCE
+ const EFFECT_SUNNY_DAY
+ const EFFECT_DEFENSE_UP_HIT
+ const EFFECT_ATTACK_UP_HIT
+ const EFFECT_ALL_UP_HIT
+ const EFFECT_FAKE_OUT
+ const EFFECT_BELLY_DRUM
+ const EFFECT_PSYCH_UP
+ const EFFECT_MIRROR_COAT
+ const EFFECT_SKULL_BASH
+ const EFFECT_TWISTER
+ const EFFECT_EARTHQUAKE
+ const EFFECT_FUTURE_SIGHT
+ const EFFECT_GUST
+ const EFFECT_STOMP
+ const EFFECT_SOLARBEAM
+ const EFFECT_THUNDER
+ const EFFECT_TELEPORT
+ const EFFECT_BEAT_UP
+ const EFFECT_FLY
+ const EFFECT_DEFENSE_CURL