diff --git a/constants/battle_constants.asm b/constants/battle_constants.asm index 0ef6bb325..0811f6a89 100644 --- a/constants/battle_constants.asm +++ b/constants/battle_constants.asm @@ -5,32 +5,35 @@ NUM_MOVES EQU 4 REST_TURNS EQU 2 -ATTACK EQU 0 -DEFENSE EQU 1 -SPEED EQU 2 -SP_ATTACK EQU 3 -SP_DEFENSE EQU 4 -ACCURACY EQU 5 -EVASION EQU 6 + const_def + const ATTACK + const DEFENSE + const SPEED + const SP_ATTACK + const SP_DEFENSE + const ACCURACY + const EVASION ; move struct -MOVE_LENGTH EQU 7 -MOVE_ANIM EQU 0 -MOVE_EFFECT EQU 1 -MOVE_POWER EQU 2 -MOVE_TYPE EQU 3 -MOVE_ACC EQU 4 -MOVE_PP EQU 5 -MOVE_CHANCE EQU 6 + const_def + const MOVE_ANIM + const MOVE_EFFECT + const MOVE_POWER + const MOVE_TYPE + const MOVE_ACC + const MOVE_PP + const MOVE_CHANCE + const MOVE_LENGTH ; stat constants -NUM_STATS EQU 6 -STAT_HP EQU 1 -STAT_ATK EQU 2 -STAT_DEF EQU 3 -STAT_SPD EQU 4 -STAT_SATK EQU 5 -STAT_SDEF EQU 6 +const_value SET 1 + const STAT_HP + const STAT_ATK + const STAT_DEF + const STAT_SPD + const STAT_SATK + const STAT_SDEF +NUM_STATS EQU const_value STAT_MIN_NORMAL EQU 5 STAT_MIN_HP EQU 10 @@ -39,263 +42,276 @@ ATKDEFDV_SHINY EQU $EA SPDSPCDV_SHINY EQU $AA ; battle classes -WILD_BATTLE EQU 1 -TRAINER_BATTLE EQU 2 +const_value SET 1 + const WILD_BATTLE + const TRAINER_BATTLE ; battle types -BATTLETYPE_NORMAL EQU $00 -BATTLETYPE_CANLOSE EQU $01 -BATTLETYPE_TUTORIAL EQU $03 -BATTLETYPE_FISH EQU $04 -BATTLETYPE_ROAMING EQU $05 -BATTLETYPE_CONTEST EQU $06 -BATTLETYPE_SHINY EQU $07 -BATTLETYPE_TREE EQU $08 -BATTLETYPE_TRAP EQU $09 -BATTLETYPE_FORCEITEM EQU $0a -BATTLETYPE_CELEBI EQU $0b -BATTLETYPE_SUICUNE EQU $0c + const_def + const BATTLETYPE_NORMAL + const BATTLETYPE_CANLOSE + const BATTLETYPE_DEBUG + const BATTLETYPE_TUTORIAL + const BATTLETYPE_FISH + const BATTLETYPE_ROAMING + const BATTLETYPE_CONTEST + const BATTLETYPE_SHINY + const BATTLETYPE_TREE + const BATTLETYPE_TRAP + const BATTLETYPE_FORCEITEM + const BATTLETYPE_CELEBI + const BATTLETYPE_SUICUNE ; battle variables -BATTLE_VARS_SUBSTATUS1 EQU 0 -BATTLE_VARS_SUBSTATUS2 EQU 1 -BATTLE_VARS_SUBSTATUS3 EQU 2 -BATTLE_VARS_SUBSTATUS4 EQU 3 -BATTLE_VARS_SUBSTATUS5 EQU 4 -BATTLE_VARS_SUBSTATUS1_OPP EQU 5 -BATTLE_VARS_SUBSTATUS2_OPP EQU 6 -BATTLE_VARS_SUBSTATUS3_OPP EQU 7 -BATTLE_VARS_SUBSTATUS4_OPP EQU 8 -BATTLE_VARS_SUBSTATUS5_OPP EQU 9 -BATTLE_VARS_STATUS EQU 10 -BATTLE_VARS_STATUS_OPP EQU 11 -BATTLE_VARS_MOVE_ANIM EQU 12 -BATTLE_VARS_MOVE_EFFECT EQU 13 -BATTLE_VARS_MOVE_POWER EQU 14 -BATTLE_VARS_MOVE_TYPE EQU 15 -BATTLE_VARS_MOVE EQU 16 -BATTLE_VARS_LAST_COUNTER_MOVE EQU 17 -BATTLE_VARS_LAST_COUNTER_MOVE_OPP EQU 18 -BATTLE_VARS_LAST_MOVE EQU 19 -BATTLE_VARS_LAST_MOVE_OPP EQU 20 + const_def + const BATTLE_VARS_SUBSTATUS1 + const BATTLE_VARS_SUBSTATUS2 + const BATTLE_VARS_SUBSTATUS3 + const BATTLE_VARS_SUBSTATUS4 + const BATTLE_VARS_SUBSTATUS5 + const BATTLE_VARS_SUBSTATUS1_OPP + const BATTLE_VARS_SUBSTATUS2_OPP + const BATTLE_VARS_SUBSTATUS3_OPP + const BATTLE_VARS_SUBSTATUS4_OPP + const BATTLE_VARS_SUBSTATUS5_OPP + const BATTLE_VARS_STATUS + const BATTLE_VARS_STATUS_OPP + const BATTLE_VARS_MOVE_ANIM + const BATTLE_VARS_MOVE_EFFECT + const BATTLE_VARS_MOVE_POWER + const BATTLE_VARS_MOVE_TYPE + const BATTLE_VARS_MOVE + const BATTLE_VARS_LAST_COUNTER_MOVE + const BATTLE_VARS_LAST_COUNTER_MOVE_OPP + const BATTLE_VARS_LAST_MOVE + const BATTLE_VARS_LAST_MOVE_OPP ; status -SLP EQU 7 ; 7 turns -PSN EQU 3 -BRN EQU 4 -FRZ EQU 5 -PAR EQU 6 +const_value SET 3 + const PSN + const BRN + const FRZ + const PAR + const SLP ; 7 turns ; substatus -SUBSTATUS_IN_LOVE EQU 7 -SUBSTATUS_ROLLOUT EQU 6 -SUBSTATUS_ENDURE EQU 5 -SUBSTATUS_PERISH EQU 4 -SUBSTATUS_IDENTIFIED EQU 3 -SUBSTATUS_PROTECT EQU 2 -SUBSTATUS_CURSE EQU 1 -SUBSTATUS_NIGHTMARE EQU 0 + enum_start 7, -1 + enum SUBSTATUS_IN_LOVE + enum SUBSTATUS_ROLLOUT + enum SUBSTATUS_ENDURE + enum SUBSTATUS_PERISH + enum SUBSTATUS_IDENTIFIED + enum SUBSTATUS_PROTECT + enum SUBSTATUS_CURSE + enum SUBSTATUS_NIGHTMARE SUBSTATUS_CURLED EQU 0 -SUBSTATUS_CONFUSED EQU 7 -SUBSTATUS_FLYING EQU 6 -SUBSTATUS_UNDERGROUND EQU 5 -SUBSTATUS_CHARGED EQU 4 -SUBSTATUS_FLINCHED EQU 3 -SUBSTATUS_IN_LOOP EQU 2 -SUBSTATUS_RAMPAGE EQU 1 -SUBSTATUS_BIDE EQU 0 + enum_start 7, -1 + enum SUBSTATUS_CONFUSED + enum SUBSTATUS_FLYING + enum SUBSTATUS_UNDERGROUND + enum SUBSTATUS_CHARGED + enum SUBSTATUS_FLINCHED + enum SUBSTATUS_IN_LOOP + enum SUBSTATUS_RAMPAGE + enum SUBSTATUS_BIDE -SUBSTATUS_LEECH_SEED EQU 7 -SUBSTATUS_RAGE EQU 6 -SUBSTATUS_RECHARGE EQU 5 -SUBSTATUS_SUBSTITUTE EQU 4 -; EQU 3 -SUBSTATUS_FOCUS_ENERGY EQU 2 -SUBSTATUS_MIST EQU 1 -SUBSTATUS_X_ACCURACY EQU 0 + enum_start 7, -1 + enum SUBSTATUS_LEECH_SEED + enum SUBSTATUS_RAGE + enum SUBSTATUS_RECHARGE + enum SUBSTATUS_SUBSTITUTE + enum SUBSTATUS_UNKNOWN_1 + enum SUBSTATUS_FOCUS_ENERGY + enum SUBSTATUS_MIST + enum SUBSTATUS_X_ACCURACY -SUBSTATUS_CANT_RUN EQU 7 -SUBSTATUS_DESTINY_BOND EQU 6 -SUBSTATUS_LOCK_ON EQU 5 -SUBSTATUS_ENCORED EQU 4 -SUBSTATUS_TRANSFORMED EQU 3 -; EQU 2 -; EQU 1 -SUBSTATUS_TOXIC EQU 0 + enum_start 7, -1 + enum SUBSTATUS_CANT_RUN + enum SUBSTATUS_DESTINY_BOND + enum SUBSTATUS_LOCK_ON + enum SUBSTATUS_ENCORED + enum SUBSTATUS_TRANSFORMED + enum SUBSTATUS_UNKNOWN_2 + enum SUBSTATUS_UNKNOWN_3 + enum SUBSTATUS_TOXIC ; environmental -SCREENS_REFLECT EQU 4 -SCREENS_LIGHT_SCREEN EQU 3 -SCREENS_SAFEGUARD EQU 2 -SCREENS_SPIKES EQU 0 + enum_start 4, -1 + enum SCREENS_REFLECT + enum SCREENS_LIGHT_SCREEN + enum SCREENS_SAFEGUARD + enum SCREENS_UNUSED + enum SCREENS_SPIKES ; weather -WEATHER_NONE EQU 0 -WEATHER_RAIN EQU 1 -WEATHER_SUN EQU 2 -WEATHER_SANDSTORM EQU 3 -WEATHER_RAIN_END EQU 4 -WEATHER_SUN_END EQU 5 -WEATHER_SANDSTORM_END EQU 6 + const_def + const WEATHER_NONE + const WEATHER_RAIN + const WEATHER_SUN + const WEATHER_SANDSTORM + const WEATHER_RAIN_END + const WEATHER_SUN_END + const WEATHER_SANDSTORM_END ; move effects -EFFECT_NORMAL_HIT EQU $00 -EFFECT_SLEEP EQU $01 -EFFECT_POISON_HIT EQU $02 -EFFECT_LEECH_HIT EQU $03 -EFFECT_BURN_HIT EQU $04 -EFFECT_FREEZE_HIT EQU $05 -EFFECT_PARALYZE_HIT EQU $06 -EFFECT_EXPLOSION EQU $07 -EFFECT_DREAM_EATER EQU $08 -EFFECT_MIRROR_MOVE EQU $09 -EFFECT_ATTACK_UP EQU $0a -EFFECT_DEFENSE_UP EQU $0b -EFFECT_SPEED_UP EQU $0c -EFFECT_SP_ATK_UP EQU $0d -EFFECT_SP_DEF_UP EQU $0e -EFFECT_ACCURACY_UP EQU $0f -EFFECT_EVASION_UP EQU $10 -EFFECT_ALWAYS_HIT EQU $11 -EFFECT_ATTACK_DOWN EQU $12 -EFFECT_DEFENSE_DOWN EQU $13 -EFFECT_SPEED_DOWN EQU $14 -EFFECT_SP_ATK_DOWN EQU $15 -EFFECT_SP_DEF_DOWN EQU $16 -EFFECT_ACCURACY_DOWN EQU $17 -EFFECT_EVASION_DOWN EQU $18 -EFFECT_HAZE EQU $19 -EFFECT_BIDE EQU $1a -EFFECT_RAMPAGE EQU $1b -EFFECT_WHIRLWIND EQU $1c -EFFECT_MULTI_HIT EQU $1d -EFFECT_CONVERSION EQU $1e -EFFECT_FLINCH_HIT EQU $1f -EFFECT_HEAL EQU $20 -EFFECT_TOXIC EQU $21 -EFFECT_PAY_DAY EQU $22 -EFFECT_LIGHT_SCREEN EQU $23 -EFFECT_TRI_ATTACK EQU $24 -EFFECT_UNUSED_25 EQU $25 ; unused -EFFECT_OHKO EQU $26 -EFFECT_RAZOR_WIND EQU $27 -EFFECT_SUPER_FANG EQU $28 -EFFECT_STATIC_DAMAGE EQU $29 -EFFECT_BIND EQU $2a -EFFECT_UNUSED_2B EQU $2b ; unused -EFFECT_DOUBLE_HIT EQU $2c -EFFECT_JUMP_KICK EQU $2d -EFFECT_MIST EQU $2e -EFFECT_FOCUS_ENERGY EQU $2f -EFFECT_RECOIL_HIT EQU $30 -EFFECT_CONFUSE EQU $31 -EFFECT_ATTACK_UP_2 EQU $32 -EFFECT_DEFENSE_UP_2 EQU $33 -EFFECT_SPEED_UP_2 EQU $34 -EFFECT_SP_ATK_UP_2 EQU $35 -EFFECT_SP_DEF_UP_2 EQU $36 -EFFECT_ACCURACY_UP_2 EQU $37 -EFFECT_EVASION_UP_2 EQU $38 -EFFECT_TRANSFORM EQU $39 -EFFECT_ATTACK_DOWN_2 EQU $3a -EFFECT_DEFENSE_DOWN_2 EQU $3b -EFFECT_SPEED_DOWN_2 EQU $3c -EFFECT_SP_ATK_DOWN_2 EQU $3d -EFFECT_SP_DEF_DOWN_2 EQU $3e -EFFECT_ACCURACY_DOWN_2 EQU $3f -EFFECT_EVASION_DOWN_2 EQU $40 -EFFECT_REFLECT EQU $41 -EFFECT_POISON EQU $42 -EFFECT_PARALYZE EQU $43 -EFFECT_ATTACK_DOWN_HIT EQU $44 -EFFECT_DEFENSE_DOWN_HIT EQU $45 -EFFECT_SPEED_DOWN_HIT EQU $46 -EFFECT_SP_ATK_DOWN_HIT EQU $47 -EFFECT_SP_DEF_DOWN_HIT EQU $48 -EFFECT_ACCURACY_DOWN_HIT EQU $49 -EFFECT_EVASION_DOWN_HIT EQU $4a -EFFECT_SKY_ATTACK EQU $4b -EFFECT_CONFUSE_HIT EQU $4c -EFFECT_TWINEEDLE EQU $4d -EFFECT_UNUSED_4E EQU $4e ; unused -EFFECT_SUBSTITUTE EQU $4f -EFFECT_HYPER_BEAM EQU $50 -EFFECT_RAGE EQU $51 -EFFECT_MIMIC EQU $52 -EFFECT_METRONOME EQU $53 -EFFECT_LEECH_SEED EQU $54 -EFFECT_SPLASH EQU $55 -EFFECT_DISABLE EQU $56 -EFFECT_LEVEL_DAMAGE EQU $57 -EFFECT_PSYWAVE EQU $58 -EFFECT_COUNTER EQU $59 -EFFECT_ENCORE EQU $5a -EFFECT_PAIN_SPLIT EQU $5b -EFFECT_SNORE EQU $5c -EFFECT_CONVERSION2 EQU $5d -EFFECT_LOCK_ON EQU $5e -EFFECT_SKETCH EQU $5f -EFFECT_DEFROST_OPPONENT EQU $60 -EFFECT_SLEEP_TALK EQU $61 -EFFECT_DESTINY_BOND EQU $62 -EFFECT_REVERSAL EQU $63 -EFFECT_SPITE EQU $64 -EFFECT_FALSE_SWIPE EQU $65 -EFFECT_HEAL_BELL EQU $66 -EFFECT_PRIORITY_HIT EQU $67 -EFFECT_TRIPLE_KICK EQU $68 -EFFECT_THIEF EQU $69 -EFFECT_MEAN_LOOK EQU $6a -EFFECT_NIGHTMARE EQU $6b -EFFECT_FLAME_WHEEL EQU $6c -EFFECT_CURSE EQU $6d -EFFECT_UNUSED_6E EQU $6e ; unused -EFFECT_PROTECT EQU $6f -EFFECT_SPIKES EQU $70 -EFFECT_FORESIGHT EQU $71 -EFFECT_PERISH_SONG EQU $72 -EFFECT_SANDSTORM EQU $73 -EFFECT_ENDURE EQU $74 -EFFECT_ROLLOUT EQU $75 -EFFECT_SWAGGER EQU $76 -EFFECT_FURY_CUTTER EQU $77 -EFFECT_ATTRACT EQU $78 -EFFECT_RETURN EQU $79 -EFFECT_PRESENT EQU $7a -EFFECT_FRUSTRATION EQU $7b -EFFECT_SAFEGUARD EQU $7c -EFFECT_SACRED_FIRE EQU $7d -EFFECT_MAGNITUDE EQU $7e -EFFECT_BATON_PASS EQU $7f -EFFECT_PURSUIT EQU $80 -EFFECT_RAPID_SPIN EQU $81 -EFFECT_UNUSED_82 EQU $82 ; unused -EFFECT_UNUSED_83 EQU $83 ; unused -EFFECT_MORNING_SUN EQU $84 -EFFECT_SYNTHESIS EQU $85 -EFFECT_MOONLIGHT EQU $86 -EFFECT_HIDDEN_POWER EQU $87 -EFFECT_RAIN_DANCE EQU $88 -EFFECT_SUNNY_DAY EQU $89 -EFFECT_STEEL_WING EQU $8a -EFFECT_METAL_CLAW EQU $8b -EFFECT_ANCIENTPOWER EQU $8c -EFFECT_FAKE_OUT EQU $8d -EFFECT_BELLY_DRUM EQU $8e -EFFECT_PSYCH_UP EQU $8f -EFFECT_MIRROR_COAT EQU $90 -EFFECT_SKULL_BASH EQU $91 -EFFECT_TWISTER EQU $92 -EFFECT_EARTHQUAKE EQU $93 -EFFECT_FUTURE_SIGHT EQU $94 -EFFECT_GUST EQU $95 -EFFECT_STOMP EQU $96 -EFFECT_SOLARBEAM EQU $97 -EFFECT_THUNDER EQU $98 -EFFECT_TELEPORT EQU $99 -EFFECT_BEAT_UP EQU $9a -EFFECT_FLY EQU $9b -EFFECT_DEFENSE_CURL EQU $9c + 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 diff --git a/constants/gfx_constants.asm b/constants/gfx_constants.asm index 6a530d164..c5f8517ac 100644 --- a/constants/gfx_constants.asm +++ b/constants/gfx_constants.asm @@ -1,4 +1,4 @@ -const_value = 1 +const_value SET 1 const ANIM_GFX_HIT const ANIM_GFX_CUT const ANIM_GFX_FIRE diff --git a/constants/item_constants.asm b/constants/item_constants.asm index 64c387b2f..b891a2c3e 100644 --- a/constants/item_constants.asm +++ b/constants/item_constants.asm @@ -291,7 +291,7 @@ CANT_TOSS EQU 1 << 7 const HELD_7 const HELD_CLEANSE_TAG -const_value = 10 +const_value SET 10 const HELD_HEAL_POISON const HELD_HEAL_FREEZE const HELD_HEAL_BURN @@ -300,7 +300,7 @@ const_value = 10 const HELD_HEAL_STATUS const HELD_HEAL_CONFUSION -const_value = 20 +const_value SET 20 const HELD_PREVENT_POISON const HELD_PREVENT_BURN const HELD_PREVENT_FREEZE @@ -308,7 +308,7 @@ const_value = 20 const HELD_PREVENT_PARALYZE const HELD_PREVENT_CONFUSE -const_value = 30 +const_value SET 30 const HELD_30 const HELD_ATTACK_UP const HELD_DEFENSE_UP @@ -318,12 +318,12 @@ const_value = 30 const HELD_ACCURACY_UP const HELD_EVASION_UP -const_value = 40 +const_value SET 40 const HELD_40 const HELD_41 const HELD_METAL_POWDER -const_value = 50 +const_value SET 50 const HELD_NORMAL_BOOST const HELD_FIGHTING_BOOST const HELD_FLYING_BOOST @@ -342,7 +342,7 @@ const_value = 50 const HELD_DARK_BOOST const HELD_STEEL_BOOST -const_value = 70 +const_value SET 70 const HELD_CATCH_CHANCE const HELD_71 const HELD_ESCAPE diff --git a/constants/map_constants.asm b/constants/map_constants.asm index ecbcf2102..0be01cade 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -576,7 +576,7 @@ MAP_N_A EQU -1 const SPRITE_ENTEI const SPRITE_RAIKOU const SPRITE_STANDING_YOUNGSTER -const_value = $80 +const_value SET $80 SPRITE_POKEMON EQU const_value const SPRITE_UNOWN const SPRITE_GEODUDE @@ -614,11 +614,11 @@ SPRITE_POKEMON EQU const_value const SPRITE_LUGIA const SPRITE_HO_OH -const_value = $e0 +const_value SET $e0 const SPRITE_DAYCARE_MON_1 const SPRITE_DAYCARE_MON_2 -const_value = $f0 +const_value SET $f0 SPRITE_VARS EQU const_value const SPRITE_CONSOLE const SPRITE_DOLL_1 @@ -635,7 +635,7 @@ SPRITE_VARS EQU const_value const SPRITE_JANINE_IMPERSONATOR ; sprite types -const_value = 1 +const_value SET 1 const WALKING_SPRITE const STANDING_SPRITE const STILL_SPRITE @@ -652,7 +652,7 @@ const_value = 1 const PAL_OW_ROCK ; permissions -const_value = 1 +const_value SET 1 const TOWN const ROUTE const INDOOR diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm index ba106611a..c4fde4e75 100644 --- a/constants/pokemon_constants.asm +++ b/constants/pokemon_constants.asm @@ -1,4 +1,3 @@ -NUM_POKEMON EQU 251 const_value set 1 const BULBASAUR @@ -253,4 +252,8 @@ const_value set 1 const HO_OH const CELEBI +const_value SET const_value + -1 + +NUM_POKEMON EQU const_value + EGG EQU 253 diff --git a/constants/pokemon_data_constants.asm b/constants/pokemon_data_constants.asm index 449447b5b..fd84c727c 100644 --- a/constants/pokemon_data_constants.asm +++ b/constants/pokemon_data_constants.asm @@ -1,75 +1,80 @@ ; growth rate -MEDIUM_FAST EQU 0 -MEDIUM_SLOW EQU 3 -SLOW EQU 4 -FAST EQU 5 + const_def + const MEDIUM_FAST + const SLIGHTLY_FAST + const SLIGHTLY_SLOW + const MEDIUM_SLOW + const SLOW + const FAST ; egg group constants - -MONSTER EQU $01 -AMPHIBIAN EQU $02 -INSECT EQU $03 -AVIAN EQU $04 -FIELD EQU $05 -FAIRY EQU $06 -PLANT EQU $07 -HUMANSHAPE EQU $08 -INVERTEBRATE EQU $09 -INANIMATE EQU $0A -AMORPHOUS EQU $0B -FISH EQU $0C -LADIES_MAN EQU $0D -REPTILE EQU $0E -NO_EGGS EQU $0F +const_value SET 1 + const MONSTER + const AMPHIBIAN + const INSECT + const AVIAN + const FIELD + const FAIRY + const PLANT + const HUMANSHAPE + const INVERTEBRATE + const INANIMATE + const AMORPHOUS + const FISH + const LADIES_MAN + const REPTILE + const NO_EGGS ; menu sprites -ICON_POLIWAG EQU $01 -ICON_JIGGLYPUFF EQU $02 -ICON_DIGLETT EQU $03 -ICON_PIKACHU EQU $04 -ICON_STARYU EQU $05 -ICON_FISH EQU $06 -ICON_BIRD EQU $07 -ICON_MONSTER EQU $08 -ICON_CLEFAIRY EQU $09 -ICON_ODDISH EQU $0a -ICON_BUG EQU $0b -ICON_GHOST EQU $0c -ICON_LAPRAS EQU $0d -ICON_HUMANSHAPE EQU $0e -ICON_FOX EQU $0f -ICON_EQUINE EQU $10 -ICON_SHELL EQU $11 -ICON_BLOB EQU $12 -ICON_SERPENT EQU $13 -ICON_VOLTORB EQU $14 -ICON_SQUIRTLE EQU $15 -ICON_BULBASAUR EQU $16 -ICON_CHARMANDER EQU $17 -ICON_CATERPILLAR EQU $18 -ICON_UNOWN EQU $19 -ICON_GEODUDE EQU $1a -ICON_FIGHTER EQU $1b -ICON_EGG EQU $1c -ICON_JELLYFISH EQU $1d -ICON_MOTH EQU $1e -ICON_BAT EQU $1f -ICON_SNORLAX EQU $20 -ICON_HO_OH EQU $21 -ICON_LUGIA EQU $22 -ICON_GYARADOS EQU $23 -ICON_SLOWPOKE EQU $24 -ICON_SUDOWOODO EQU $25 -ICON_BIGMON EQU $26 +const_value SET 1 + const ICON_POLIWAG + const ICON_JIGGLYPUFF + const ICON_DIGLETT + const ICON_PIKACHU + const ICON_STARYU + const ICON_FISH + const ICON_BIRD + const ICON_MONSTER + const ICON_CLEFAIRY + const ICON_ODDISH + const ICON_BUG + const ICON_GHOST + const ICON_LAPRAS + const ICON_HUMANSHAPE + const ICON_FOX + const ICON_EQUINE + const ICON_SHELL + const ICON_BLOB + const ICON_SERPENT + const ICON_VOLTORB + const ICON_SQUIRTLE + const ICON_BULBASAUR + const ICON_CHARMANDER + const ICON_CATERPILLAR + const ICON_UNOWN + const ICON_GEODUDE + const ICON_FIGHTER + const ICON_EGG + const ICON_JELLYFISH + const ICON_MOTH + const ICON_BAT + const ICON_SNORLAX + const ICON_HO_OH + const ICON_LUGIA + const ICON_GYARADOS + const ICON_SLOWPOKE + const ICON_SUDOWOODO + const ICON_BIGMON ; evolution types -EVOLVE_LEVEL EQU 1 -EVOLVE_ITEM EQU 2 -EVOLVE_TRADE EQU 3 -EVOLVE_HAPPINESS EQU 4 -EVOLVE_STAT EQU 5 +const_value SET 1 + const EVOLVE_LEVEL + const EVOLVE_ITEM + const EVOLVE_TRADE + const EVOLVE_HAPPINESS + const EVOLVE_STAT BASE_HAPPINESS EQU 70 @@ -77,12 +82,14 @@ FRIEND_BALL_HAPPINESS EQU 200 ; happiness evolution triggers HAPPINESS_TO_EVOLVE EQU 220 -TR_ANYTIME EQU 1 -TR_MORNDAY EQU 2 -TR_NITE EQU 3 +const_value SET 1 + const TR_ANYTIME + const TR_MORNDAY + const TR_NITE ; stat evolution triggers -ATK_GT_DEF EQU 1 -ATK_LT_DEF EQU 2 -ATK_EQ_DEF EQU 3 +const_value SET 1 + const ATK_GT_DEF + const ATK_LT_DEF + const ATK_EQ_DEF diff --git a/constants/sfx_constants.asm b/constants/sfx_constants.asm index 8107d56c5..d68f39cb0 100644 --- a/constants/sfx_constants.asm +++ b/constants/sfx_constants.asm @@ -1,208 +1,210 @@ -SFX_DEX_FANFARE_50_79 EQU $00 -SFX_ITEM EQU $01 -SFX_CAUGHT_MON EQU $02 -SFX_POKEBALLS_PLACED_ON_TABLE EQU $03 -SFX_POTION EQU $04 -SFX_FULL_HEAL EQU $05 -SFX_MENU EQU $06 -SFX_READ_TEXT EQU $07 -SFX_READ_TEXT_2 EQU $08 -SFX_DEX_FANFARE_20_49 EQU $09 -SFX_DEX_FANFARE_80_109 EQU $0a -SFX_POISON EQU $0b -SFX_GOT_SAFARI_BALLS EQU $0c -SFX_BOOT_PC EQU $0d -SFX_SHUT_DOWN_PC EQU $0e -SFX_CHOOSE_PC_OPTION EQU $0f -SFX_ESCAPE_ROPE EQU $10 -SFX_PUSH_BUTTON EQU $11 -SFX_SECOND_PART_OF_ITEMFINDER EQU $12 -SFX_WARP_TO EQU $13 -SFX_WARP_FROM EQU $14 -SFX_CHANGE_DEX_MODE EQU $15 -SFX_JUMP_OVER_LEDGE EQU $16 -SFX_GRASS_RUSTLE EQU $17 -SFX_FLY EQU $18 -SFX_WRONG EQU $19 -SFX_SQUEAK EQU $1a -SFX_STRENGTH EQU $1b -SFX_BOAT EQU $1c -SFX_WALL_OPEN EQU $1d -SFX_PLACE_PUZZLE_PIECE_DOWN EQU $1e -SFX_ENTER_DOOR EQU $1f -SFX_SWITCH_POKEMON EQU $20 -SFX_TALLY EQU $21 -SFX_TRANSACTION EQU $22 -SFX_EXIT_BUILDING EQU $23 -SFX_BUMP EQU $24 -SFX_SAVE EQU $25 -SFX_POKEFLUTE EQU $26 -SFX_ELEVATOR_END EQU $27 -SFX_THROW_BALL EQU $28 -SFX_BALL_POOF EQU $29 -SFX_UNKNOWN_2A EQU $2a -SFX_RUN EQU $2b -SFX_SLOT_MACHINE_START EQU $2c -SFX_FANFARE EQU $2d -SFX_PECK EQU $2e -SFX_KINESIS EQU $2f -SFX_LICK EQU $30 -SFX_POUND EQU $31 -SFX_MOVE_PUZZLE_PIECE EQU $32 -SFX_COMET_PUNCH EQU $33 -SFX_MEGA_PUNCH EQU $34 -SFX_SCRATCH EQU $35 -SFX_VICEGRIP EQU $36 -SFX_RAZOR_WIND EQU $37 -SFX_CUT EQU $38 -SFX_WING_ATTACK EQU $39 -SFX_WHIRLWIND EQU $3a -SFX_BIND EQU $3b -SFX_VINE_WHIP EQU $3c -SFX_DOUBLE_KICK EQU $3d -SFX_MEGA_KICK EQU $3e -SFX_HEADBUTT EQU $3f -SFX_HORN_ATTACK EQU $40 -SFX_TACKLE EQU $41 -SFX_POISON_STING EQU $42 -SFX_POWDER EQU $43 -SFX_DOUBLESLAP EQU $44 -SFX_BITE EQU $45 -SFX_JUMP_KICK EQU $46 -SFX_STOMP EQU $47 -SFX_TAIL_WHIP EQU $48 -SFX_KARATE_CHOP EQU $49 -SFX_SUBMISSION EQU $4a -SFX_WATER_GUN EQU $4b -SFX_SWORDS_DANCE EQU $4c -SFX_THUNDER EQU $4d -SFX_SUPERSONIC EQU $4e -SFX_LEER EQU $4f -SFX_EMBER EQU $50 -SFX_BUBBLEBEAM EQU $51 -SFX_HYDRO_PUMP EQU $52 -SFX_SURF EQU $53 -SFX_PSYBEAM EQU $54 -SFX_CHARGE EQU $55 -SFX_THUNDERSHOCK EQU $56 -SFX_PSYCHIC EQU $57 -SFX_SCREECH EQU $58 -SFX_BONE_CLUB EQU $59 -SFX_SHARPEN EQU $5a -SFX_EGG_BOMB EQU $5b -SFX_SING EQU $5c -SFX_HYPER_BEAM EQU $5d -SFX_SHINE EQU $5e -SFX_UNKNOWN_5F EQU $5f -SFX_UNKNOWN_60 EQU $60 -SFX_UNKNOWN_61 EQU $61 -SFX_UNKNOWN_62 EQU $62 -SFX_UNKNOWN_63 EQU $63 -SFX_BURN EQU $64 -SFX_TITLE_SCREEN_ENTRANCE EQU $65 -SFX_UNKNOWN_66 EQU $66 -SFX_GET_COIN_FROM_SLOTS EQU $67 -SFX_PAY_DAY EQU $68 -SFX_METRONOME EQU $69 -SFX_CALL EQU $6a -SFX_HANG_UP EQU $6b -SFX_NO_SIGNAL EQU $6c -SFX_SANDSTORM EQU $6d -SFX_ELEVATOR EQU $6e -SFX_PROTECT EQU $6f -SFX_SKETCH EQU $70 -SFX_RAIN_DANCE EQU $71 -SFX_AEROBLAST EQU $72 -SFX_SPARK EQU $73 -SFX_CURSE EQU $74 -SFX_RAGE EQU $75 -SFX_THIEF EQU $76 -SFX_THIEF_2 EQU $77 -SFX_SPIDER_WEB EQU $78 -SFX_MIND_READER EQU $79 -SFX_NIGHTMARE EQU $7a -SFX_SNORE EQU $7b -SFX_SWEET_KISS EQU $7c -SFX_SWEET_KISS_2 EQU $7d -SFX_BELLY_DRUM EQU $7e -SFX_UNKNOWN_7F EQU $7f -SFX_SLUDGE_BOMB EQU $80 -SFX_FORESIGHT EQU $81 -SFX_SPITE EQU $82 -SFX_OUTRAGE EQU $83 -SFX_PERISH_SONG EQU $84 -SFX_GIGA_DRAIN EQU $85 -SFX_ATTRACT EQU $86 -SFX_KINESIS_2 EQU $87 -SFX_ZAP_CANNON EQU $88 -SFX_MEAN_LOOK EQU $89 -SFX_HEAL_BELL EQU $8a -SFX_RETURN EQU $8b -SFX_EXP_BAR EQU $8c -SFX_MILK_DRINK EQU $8d -SFX_PRESENT EQU $8e -SFX_MORNING_SUN EQU $8f -SFX_LEVEL_UP EQU $90 -SFX_KEY_ITEM EQU $91 -SFX_FANFARE_2 EQU $92 -SFX_REGISTER_PHONE_NUMBER EQU $93 -SFX_3RD_PLACE EQU $94 -SFX_GET_EGG_FROM_DAYCARE_MAN EQU $95 -SFX_GET_EGG_FROM_DAYCARE_LADY EQU $96 -SFX_MOVE_DELETED EQU $97 -SFX_2ND_PLACE EQU $98 -SFX_1ST_PLACE EQU $99 -SFX_CHOOSE_A_CARD EQU $9a -SFX_GET_TM EQU $9b -SFX_GET_BADGE EQU $9c -SFX_QUIT_SLOTS EQU $9d -SFX_EGG_CRACK EQU $9e -SFX_DEX_FANFARE_LESS_THAN_20 EQU $9f -SFX_DEX_FANFARE_140_169 EQU $a0 -SFX_DEX_FANFARE_170_199 EQU $a1 -SFX_DEX_FANFARE_200_229 EQU $a2 -SFX_DEX_FANFARE_230_PLUS EQU $a3 -SFX_EVOLVED EQU $a4 -SFX_MASTER_BALL EQU $a5 -SFX_EGG_HATCH EQU $a6 -SFX_GS_INTRO_CHARIZARD_FIREBALL EQU $a7 -SFX_GS_INTRO_POKEMON_APPEARS EQU $a8 -SFX_FLASH EQU $a9 -SFX_GAME_FREAK_LOGO_GS EQU $aa -SFX_NOT_VERY_EFFECTIVE EQU $ab -SFX_DAMAGE EQU $ac -SFX_SUPER_EFFECTIVE EQU $ad -SFX_BALL_BOUNCE EQU $ae -SFX_MOONLIGHT EQU $af -SFX_ENCORE EQU $b0 -SFX_BEAT_UP EQU $b1 -SFX_BATON_PASS EQU $b2 -SFX_BALL_WIGGLE EQU $b3 -SFX_SWEET_SCENT EQU $b4 -SFX_SWEET_SCENT_2 EQU $b5 -SFX_HIT_END_OF_EXP_BAR EQU $b6 -SFX_GIVE_TRADEMON EQU $b7 -SFX_GET_TRADEMON EQU $b8 -SFX_TRAIN_ARRIVED EQU $b9 -SFX_STOP_SLOT EQU $ba -SFX_2_BOOPS EQU $bb -SFX_GLASS_TING EQU $bc -SFX_GLASS_TING_2 EQU $bd + const_def -SFX_INTRO_UNOWN_1 EQU $be -SFX_INTRO_UNOWN_2 EQU $bf -SFX_INTRO_UNOWN_3 EQU $c0 -SFX_DITTO_POP_UP EQU $c1 -SFX_DITTO_TRANSFORM EQU $c2 -SFX_INTRO_SUICUNE_1 EQU $c3 -SFX_INTRO_PICHU EQU $c4 -SFX_INTRO_SUICUNE_2 EQU $c5 -SFX_INTRO_SUICUNE_3 EQU $c6 -SFX_DITTO_BOUNCE EQU $c7 -SFX_INTRO_SUICUNE_4 EQU $c8 -SFX_GAME_FREAK_PRESENTS EQU $c9 -SFX_TINGLE EQU $ca -SFX_UNKNOWN_CB EQU $cb -SFX_TWO_PC_BEEPS EQU $cc -SFX_4_NOTE_DITTY EQU $cd -SFX_TWINKLE EQU $ce + const SFX_DEX_FANFARE_50_79 + const SFX_ITEM + const SFX_CAUGHT_MON + const SFX_POKEBALLS_PLACED_ON_TABLE + const SFX_POTION + const SFX_FULL_HEAL + const SFX_MENU + const SFX_READ_TEXT + const SFX_READ_TEXT_2 + const SFX_DEX_FANFARE_20_49 + const SFX_DEX_FANFARE_80_109 + const SFX_POISON + const SFX_GOT_SAFARI_BALLS + const SFX_BOOT_PC + const SFX_SHUT_DOWN_PC + const SFX_CHOOSE_PC_OPTION + const SFX_ESCAPE_ROPE + const SFX_PUSH_BUTTON + const SFX_SECOND_PART_OF_ITEMFINDER + const SFX_WARP_TO + const SFX_WARP_FROM + const SFX_CHANGE_DEX_MODE + const SFX_JUMP_OVER_LEDGE + const SFX_GRASS_RUSTLE + const SFX_FLY + const SFX_WRONG + const SFX_SQUEAK + const SFX_STRENGTH + const SFX_BOAT + const SFX_WALL_OPEN + const SFX_PLACE_PUZZLE_PIECE_DOWN + const SFX_ENTER_DOOR + const SFX_SWITCH_POKEMON + const SFX_TALLY + const SFX_TRANSACTION + const SFX_EXIT_BUILDING + const SFX_BUMP + const SFX_SAVE + const SFX_POKEFLUTE + const SFX_ELEVATOR_END + const SFX_THROW_BALL + const SFX_BALL_POOF + const SFX_UNKNOWN_2A + const SFX_RUN + const SFX_SLOT_MACHINE_START + const SFX_FANFARE + const SFX_PECK + const SFX_KINESIS + const SFX_LICK + const SFX_POUND + const SFX_MOVE_PUZZLE_PIECE + const SFX_COMET_PUNCH + const SFX_MEGA_PUNCH + const SFX_SCRATCH + const SFX_VICEGRIP + const SFX_RAZOR_WIND + const SFX_CUT + const SFX_WING_ATTACK + const SFX_WHIRLWIND + const SFX_BIND + const SFX_VINE_WHIP + const SFX_DOUBLE_KICK + const SFX_MEGA_KICK + const SFX_HEADBUTT + const SFX_HORN_ATTACK + const SFX_TACKLE + const SFX_POISON_STING + const SFX_POWDER + const SFX_DOUBLESLAP + const SFX_BITE + const SFX_JUMP_KICK + const SFX_STOMP + const SFX_TAIL_WHIP + const SFX_KARATE_CHOP + const SFX_SUBMISSION + const SFX_WATER_GUN + const SFX_SWORDS_DANCE + const SFX_THUNDER + const SFX_SUPERSONIC + const SFX_LEER + const SFX_EMBER + const SFX_BUBBLEBEAM + const SFX_HYDRO_PUMP + const SFX_SURF + const SFX_PSYBEAM + const SFX_CHARGE + const SFX_THUNDERSHOCK + const SFX_PSYCHIC + const SFX_SCREECH + const SFX_BONE_CLUB + const SFX_SHARPEN + const SFX_EGG_BOMB + const SFX_SING + const SFX_HYPER_BEAM + const SFX_SHINE + const SFX_UNKNOWN_5F + const SFX_UNKNOWN_60 + const SFX_UNKNOWN_61 + const SFX_UNKNOWN_62 + const SFX_UNKNOWN_63 + const SFX_BURN + const SFX_TITLE_SCREEN_ENTRANCE + const SFX_UNKNOWN_66 + const SFX_GET_COIN_FROM_SLOTS + const SFX_PAY_DAY + const SFX_METRONOME + const SFX_CALL + const SFX_HANG_UP + const SFX_NO_SIGNAL + const SFX_SANDSTORM + const SFX_ELEVATOR + const SFX_PROTECT + const SFX_SKETCH + const SFX_RAIN_DANCE + const SFX_AEROBLAST + const SFX_SPARK + const SFX_CURSE + const SFX_RAGE + const SFX_THIEF + const SFX_THIEF_2 + const SFX_SPIDER_WEB + const SFX_MIND_READER + const SFX_NIGHTMARE + const SFX_SNORE + const SFX_SWEET_KISS + const SFX_SWEET_KISS_2 + const SFX_BELLY_DRUM + const SFX_UNKNOWN_7F + const SFX_SLUDGE_BOMB + const SFX_FORESIGHT + const SFX_SPITE + const SFX_OUTRAGE + const SFX_PERISH_SONG + const SFX_GIGA_DRAIN + const SFX_ATTRACT + const SFX_KINESIS_2 + const SFX_ZAP_CANNON + const SFX_MEAN_LOOK + const SFX_HEAL_BELL + const SFX_RETURN + const SFX_EXP_BAR + const SFX_MILK_DRINK + const SFX_PRESENT + const SFX_MORNING_SUN + const SFX_LEVEL_UP + const SFX_KEY_ITEM + const SFX_FANFARE_2 + const SFX_REGISTER_PHONE_NUMBER + const SFX_3RD_PLACE + const SFX_GET_EGG_FROM_DAYCARE_MAN + const SFX_GET_EGG_FROM_DAYCARE_LADY + const SFX_MOVE_DELETED + const SFX_2ND_PLACE + const SFX_1ST_PLACE + const SFX_CHOOSE_A_CARD + const SFX_GET_TM + const SFX_GET_BADGE + const SFX_QUIT_SLOTS + const SFX_EGG_CRACK + const SFX_DEX_FANFARE_LESS_THAN_20 + const SFX_DEX_FANFARE_140_169 + const SFX_DEX_FANFARE_170_199 + const SFX_DEX_FANFARE_200_229 + const SFX_DEX_FANFARE_230_PLUS + const SFX_EVOLVED + const SFX_MASTER_BALL + const SFX_EGG_HATCH + const SFX_GS_INTRO_CHARIZARD_FIREBALL + const SFX_GS_INTRO_POKEMON_APPEARS + const SFX_FLASH + const SFX_GAME_FREAK_LOGO_GS + const SFX_NOT_VERY_EFFECTIVE + const SFX_DAMAGE + const SFX_SUPER_EFFECTIVE + const SFX_BALL_BOUNCE + const SFX_MOONLIGHT + const SFX_ENCORE + const SFX_BEAT_UP + const SFX_BATON_PASS + const SFX_BALL_WIGGLE + const SFX_SWEET_SCENT + const SFX_SWEET_SCENT_2 + const SFX_HIT_END_OF_EXP_BAR + const SFX_GIVE_TRADEMON + const SFX_GET_TRADEMON + const SFX_TRAIN_ARRIVED + const SFX_STOP_SLOT + const SFX_2_BOOPS + const SFX_GLASS_TING + const SFX_GLASS_TING_2 + + const SFX_INTRO_UNOWN_1 + const SFX_INTRO_UNOWN_2 + const SFX_INTRO_UNOWN_3 + const SFX_DITTO_POP_UP + const SFX_DITTO_TRANSFORM + const SFX_INTRO_SUICUNE_1 + const SFX_INTRO_PICHU + const SFX_INTRO_SUICUNE_2 + const SFX_INTRO_SUICUNE_3 + const SFX_DITTO_BOUNCE + const SFX_INTRO_SUICUNE_4 + const SFX_GAME_FREAK_PRESENTS + const SFX_TINGLE + const SFX_UNKNOWN_CB + const SFX_TWO_PC_BEEPS + const SFX_4_NOTE_DITTY + const SFX_TWINKLE diff --git a/main.asm b/main.asm index d8679216d..2f3b9db0d 100644 --- a/main.asm +++ b/main.asm @@ -50503,8 +50503,8 @@ growth_rate: MACRO ENDM growth_rate 1, 1, 0, 0, 0 ; Medium Fast - growth_rate 3, 4, 10, 0, 30 - growth_rate 3, 4, 20, 0, 70 + growth_rate 3, 4, 10, 0, 30 ; Slightly Fast + growth_rate 3, 4, 20, 0, 70 ; Slightly Slow growth_rate 6, 5, -15, 100, 140 ; Medium Slow growth_rate 4, 5, 0, 0, 0 ; Fast growth_rate 5, 4, 0, 0, 0 ; Slow