ref: 340230e997b32fd44f1d99aecbab083ffb89a921
parent: b96ef8d2d495b8c39f703742e8c1965c774fc54f
author: dannye <corrnondacqb@yahoo.com>
date: Sat Jul 18 20:43:43 EDT 2015
Enumerate more constants
--- a/constants/credits_constants.asm
+++ b/constants/credits_constants.asm
@@ -1,65 +1,67 @@
-CRED_VERSION EQU $00
-CRED_TAJIRI EQU $01
-CRED_TA_OOTA EQU $02
-CRED_MORIMOTO EQU $03
-CRED_WATANABE EQU $04
-CRED_MASUDE EQU $05
-CRED_NISINO EQU $06
-CRED_SUGIMORI EQU $07
-CRED_NISHIDA EQU $08
-CRED_MIYAMOTO EQU $09
-CRED_KAWAGUCHI EQU $0A
-CRED_ISHIHARA EQU $0B
-CRED_YAMAUCHI EQU $0C
-CRED_ZINNAI EQU $0D
-CRED_HISHIDA EQU $0E
-CRED_SAKAI EQU $0F
-CRED_YAMAGUCHI EQU $10
-CRED_YAMAMOTO EQU $11
-CRED_TANIGUCHI EQU $12
-CRED_NONOMURA EQU $13
-CRED_FUZIWARA EQU $14
-CRED_MATSUSIMA EQU $15
-CRED_TOMISAWA EQU $16
-CRED_KAWAMOTO EQU $17
-CRED_KAKEI EQU $18
-CRED_TSUCHIYA EQU $19
-CRED_TA_NAKAMURA EQU $1A
-CRED_YUDA EQU $1B
-CRED_MON EQU $1C ; Pokemon
-CRED_DIRECTOR EQU $1D
-CRED_PROGRAMMERS EQU $1E
-CRED_CHAR_DESIGN EQU $1F
-CRED_MUSIC EQU $20
-CRED_SOUND_EFFECTS EQU $21
-CRED_GAME_DESIGN EQU $22
-CRED_MONSTER_DESIGN EQU $23
-CRED_GAME_SCENE EQU $24
-CRED_PARAM EQU $25
-CRED_MAP EQU $26
-CRED_TEST EQU $27
-CRED_SPECIAL EQU $28
-CRED_PRODUCERS EQU $29
-CRED_PRODUCER EQU $2A
-CRED_EXECUTIVE EQU $2B
-CRED_TAMADA EQU $2C
-CRED_SA_OOTA EQU $2D
-CRED_YOSHIKAWA EQU $2E
-CRED_TO_OOTA EQU $2F
-CRED_US_STAFF EQU $30
-CRED_US_COORD EQU $31
-CRED_TILDEN EQU $32
-CRED_KAWAKAMI EQU $33
-CRED_HI_NAKAMURA EQU $34
-CRED_GIESE EQU $35
-CRED_OSBORNE EQU $36
-CRED_TRANS EQU $37
-CRED_OGASAWARA EQU $38
-CRED_IWATA EQU $39
-CRED_IZUSHI EQU $3A
-CRED_HARADA EQU $3B
-CRED_MURAKAWA EQU $3C
-CRED_FUKUI EQU $3D
-CRED_CLUB EQU $3E
-CRED_PAAD EQU $3F
+const_value = 0
+
+ const CRED_VERSION ; $00
+ const CRED_TAJIRI ; $01
+ const CRED_TA_OOTA ; $02
+ const CRED_MORIMOTO ; $03
+ const CRED_WATANABE ; $04
+ const CRED_MASUDE ; $05
+ const CRED_NISINO ; $06
+ const CRED_SUGIMORI ; $07
+ const CRED_NISHIDA ; $08
+ const CRED_MIYAMOTO ; $09
+ const CRED_KAWAGUCHI ; $0A
+ const CRED_ISHIHARA ; $0B
+ const CRED_YAMAUCHI ; $0C
+ const CRED_ZINNAI ; $0D
+ const CRED_HISHIDA ; $0E
+ const CRED_SAKAI ; $0F
+ const CRED_YAMAGUCHI ; $10
+ const CRED_YAMAMOTO ; $11
+ const CRED_TANIGUCHI ; $12
+ const CRED_NONOMURA ; $13
+ const CRED_FUZIWARA ; $14
+ const CRED_MATSUSIMA ; $15
+ const CRED_TOMISAWA ; $16
+ const CRED_KAWAMOTO ; $17
+ const CRED_KAKEI ; $18
+ const CRED_TSUCHIYA ; $19
+ const CRED_TA_NAKAMURA ; $1A
+ const CRED_YUDA ; $1B
+ const CRED_MON ; $1C
+ const CRED_DIRECTOR ; $1D
+ const CRED_PROGRAMMERS ; $1E
+ const CRED_CHAR_DESIGN ; $1F
+ const CRED_MUSIC ; $20
+ const CRED_SOUND_EFFECTS ; $21
+ const CRED_GAME_DESIGN ; $22
+ const CRED_MONSTER_DESIGN ; $23
+ const CRED_GAME_SCENE ; $24
+ const CRED_PARAM ; $25
+ const CRED_MAP ; $26
+ const CRED_TEST ; $27
+ const CRED_SPECIAL ; $28
+ const CRED_PRODUCERS ; $29
+ const CRED_PRODUCER ; $2A
+ const CRED_EXECUTIVE ; $2B
+ const CRED_TAMADA ; $2C
+ const CRED_SA_OOTA ; $2D
+ const CRED_YOSHIKAWA ; $2E
+ const CRED_TO_OOTA ; $2F
+ const CRED_US_STAFF ; $30
+ const CRED_US_COORD ; $31
+ const CRED_TILDEN ; $32
+ const CRED_KAWAKAMI ; $33
+ const CRED_HI_NAKAMURA ; $34
+ const CRED_GIESE ; $35
+ const CRED_OSBORNE ; $36
+ const CRED_TRANS ; $37
+ const CRED_OGASAWARA ; $38
+ const CRED_IWATA ; $39
+ const CRED_IZUSHI ; $3A
+ const CRED_HARADA ; $3B
+ const CRED_MURAKAWA ; $3C
+ const CRED_FUKUI ; $3D
+ const CRED_CLUB ; $3E
+ const CRED_PAAD ; $3F
--- a/constants/item_constants.asm
+++ b/constants/item_constants.asm
@@ -1,140 +1,145 @@
-MASTER_BALL EQU $01
-ULTRA_BALL EQU $02
-GREAT_BALL EQU $03
-POKE_BALL EQU $04
-TOWN_MAP EQU $05
-BICYCLE EQU $06
-SURFBOARD EQU $07 ; buggy?
-SAFARI_BALL EQU $08
-POKEDEX EQU $09
-MOON_STONE EQU $0A
-ANTIDOTE EQU $0B
-BURN_HEAL EQU $0C
-ICE_HEAL EQU $0D
-AWAKENING EQU $0E
-PARLYZ_HEAL EQU $0F
-FULL_RESTORE EQU $10
-MAX_POTION EQU $11
-HYPER_POTION EQU $12
-SUPER_POTION EQU $13
-POTION EQU $14
-BOULDERBADGE EQU $15
-CASCADEBADGE EQU $16
-SAFARI_BAIT EQU $15 ; overload
-SAFARI_ROCK EQU $16 ; overload
-THUNDERBADGE EQU $17
-RAINBOWBADGE EQU $18
-SOULBADGE EQU $19
-MARSHBADGE EQU $1A
-VOLCANOBADGE EQU $1B
-EARTHBADGE EQU $1C
-ESCAPE_ROPE EQU $1D
-REPEL EQU $1E
-OLD_AMBER EQU $1F
-FIRE_STONE EQU $20
-THUNDER_STONE EQU $21
-WATER_STONE EQU $22
-HP_UP EQU $23
-PROTEIN EQU $24
-IRON EQU $25
-CARBOS EQU $26
-CALCIUM EQU $27
-RARE_CANDY EQU $28
-DOME_FOSSIL EQU $29
-HELIX_FOSSIL EQU $2A
-SECRET_KEY EQU $2B
-; XXX ????? EQU $2C
-BIKE_VOUCHER EQU $2D
-X_ACCURACY EQU $2E
-LEAF_STONE EQU $2F
-CARD_KEY EQU $30
-NUGGET EQU $31
-;PP_UP EQU $32
-POKE_DOLL EQU $33
-FULL_HEAL EQU $34
-REVIVE EQU $35
-MAX_REVIVE EQU $36
-GUARD_SPEC_ EQU $37
-SUPER_REPEL EQU $38
-MAX_REPEL EQU $39
-DIRE_HIT EQU $3A
-COIN EQU $3B
-FRESH_WATER EQU $3C
-SODA_POP EQU $3D
-LEMONADE EQU $3E
-S_S__TICKET EQU $3F
-GOLD_TEETH EQU $40
-X_ATTACK EQU $41
-X_DEFEND EQU $42
-X_SPEED EQU $43
-X_SPECIAL EQU $44
-COIN_CASE EQU $45
-OAKS_PARCEL EQU $46
-ITEMFINDER EQU $47
-SILPH_SCOPE EQU $48
-POKE_FLUTE EQU $49
-LIFT_KEY EQU $4A
-EXP__ALL EQU $4B
-OLD_ROD EQU $4C
-GOOD_ROD EQU $4D
-SUPER_ROD EQU $4E
-PP_UP EQU $4F
-ETHER EQU $50
-MAX_ETHER EQU $51
-ELIXER EQU $52
-MAX_ELIXER EQU $53
-HM_01 EQU $C4
-HM_02 EQU $C5
-HM_03 EQU $C6
-HM_04 EQU $C7
-HM_05 EQU $C8
-TM_01 EQU $C9
-TM_02 EQU $CA
-TM_03 EQU $CB
-TM_04 EQU $CC
-TM_05 EQU $CD
-TM_06 EQU $CE
-TM_07 EQU $CF
-TM_08 EQU $D0
-TM_09 EQU $D1
-TM_10 EQU $D2
-TM_11 EQU $D3
-TM_12 EQU $D4
-TM_13 EQU $D5
-TM_14 EQU $D6
-TM_15 EQU $D7
-TM_16 EQU $D8
-TM_17 EQU $D9
-TM_18 EQU $DA
-TM_19 EQU $DB
-TM_20 EQU $DC
-TM_21 EQU $DD
-TM_22 EQU $DE
-TM_23 EQU $DF
-TM_24 EQU $E0
-TM_25 EQU $E1
-TM_26 EQU $E2
-TM_27 EQU $E3
-TM_28 EQU $E4
-TM_29 EQU $E5
-TM_30 EQU $E6
-TM_31 EQU $E7
-TM_32 EQU $E8
-TM_33 EQU $E9
-TM_34 EQU $EA
-TM_35 EQU $EB
-TM_36 EQU $EC
-TM_37 EQU $ED
-TM_38 EQU $EE
-TM_39 EQU $EF
-TM_40 EQU $F0
-TM_41 EQU $F1
-TM_42 EQU $F2
-TM_43 EQU $F3
-TM_44 EQU $F4
-TM_45 EQU $F5
-TM_46 EQU $F6
-TM_47 EQU $F7
-TM_48 EQU $F8
-TM_49 EQU $F9
-TM_50 EQU $FA
+const_value = 1
+
+ const MASTER_BALL ; $01
+ const ULTRA_BALL ; $02
+ const GREAT_BALL ; $03
+ const POKE_BALL ; $04
+ const TOWN_MAP ; $05
+ const BICYCLE ; $06
+ const SURFBOARD ; $07 buggy?
+ const SAFARI_BALL ; $08
+ const POKEDEX ; $09
+ const MOON_STONE ; $0A
+ const ANTIDOTE ; $0B
+ const BURN_HEAL ; $0C
+ const ICE_HEAL ; $0D
+ const AWAKENING ; $0E
+ const PARLYZ_HEAL ; $0F
+ const FULL_RESTORE ; $10
+ const MAX_POTION ; $11
+ const HYPER_POTION ; $12
+ const SUPER_POTION ; $13
+ const POTION ; $14
+ const BOULDERBADGE ; $15
+ const CASCADEBADGE ; $16
+SAFARI_BAIT EQU $15 ; overload
+SAFARI_ROCK EQU $16 ; overload
+ const THUNDERBADGE ; $17
+ const RAINBOWBADGE ; $18
+ const SOULBADGE ; $19
+ const MARSHBADGE ; $1A
+ const VOLCANOBADGE ; $1B
+ const EARTHBADGE ; $1C
+ const ESCAPE_ROPE ; $1D
+ const REPEL ; $1E
+ const OLD_AMBER ; $1F
+ const FIRE_STONE ; $20
+ const THUNDER_STONE ; $21
+ const WATER_STONE ; $22
+ const HP_UP ; $23
+ const PROTEIN ; $24
+ const IRON ; $25
+ const CARBOS ; $26
+ const CALCIUM ; $27
+ const RARE_CANDY ; $28
+ const DOME_FOSSIL ; $29
+ const HELIX_FOSSIL ; $2A
+ const SECRET_KEY ; $2B
+ const UNUSED_ITEM ; $2C "?????"
+ const BIKE_VOUCHER ; $2D
+ const X_ACCURACY ; $2E
+ const LEAF_STONE ; $2F
+ const CARD_KEY ; $30
+ const NUGGET ; $31
+ const PP_UP_2 ; $32
+ const POKE_DOLL ; $33
+ const FULL_HEAL ; $34
+ const REVIVE ; $35
+ const MAX_REVIVE ; $36
+ const GUARD_SPEC_ ; $37
+ const SUPER_REPEL ; $38
+ const MAX_REPEL ; $39
+ const DIRE_HIT ; $3A
+ const COIN ; $3B
+ const FRESH_WATER ; $3C
+ const SODA_POP ; $3D
+ const LEMONADE ; $3E
+ const S_S__TICKET ; $3F
+ const GOLD_TEETH ; $40
+ const X_ATTACK ; $41
+ const X_DEFEND ; $42
+ const X_SPEED ; $43
+ const X_SPECIAL ; $44
+ const COIN_CASE ; $45
+ const OAKS_PARCEL ; $46
+ const ITEMFINDER ; $47
+ const SILPH_SCOPE ; $48
+ const POKE_FLUTE ; $49
+ const LIFT_KEY ; $4A
+ const EXP__ALL ; $4B
+ const OLD_ROD ; $4C
+ const GOOD_ROD ; $4D
+ const SUPER_ROD ; $4E
+ const PP_UP ; $4F
+ const ETHER ; $50
+ const MAX_ETHER ; $51
+ const ELIXER ; $52
+ const MAX_ELIXER ; $53
+
+const_value = $C4
+
+ const HM_01 ; $C4
+ const HM_02 ; $C5
+ const HM_03 ; $C6
+ const HM_04 ; $C7
+ const HM_05 ; $C8
+ const TM_01 ; $C9
+ const TM_02 ; $CA
+ const TM_03 ; $CB
+ const TM_04 ; $CC
+ const TM_05 ; $CD
+ const TM_06 ; $CE
+ const TM_07 ; $CF
+ const TM_08 ; $D0
+ const TM_09 ; $D1
+ const TM_10 ; $D2
+ const TM_11 ; $D3
+ const TM_12 ; $D4
+ const TM_13 ; $D5
+ const TM_14 ; $D6
+ const TM_15 ; $D7
+ const TM_16 ; $D8
+ const TM_17 ; $D9
+ const TM_18 ; $DA
+ const TM_19 ; $DB
+ const TM_20 ; $DC
+ const TM_21 ; $DD
+ const TM_22 ; $DE
+ const TM_23 ; $DF
+ const TM_24 ; $E0
+ const TM_25 ; $E1
+ const TM_26 ; $E2
+ const TM_27 ; $E3
+ const TM_28 ; $E4
+ const TM_29 ; $E5
+ const TM_30 ; $E6
+ const TM_31 ; $E7
+ const TM_32 ; $E8
+ const TM_33 ; $E9
+ const TM_34 ; $EA
+ const TM_35 ; $EB
+ const TM_36 ; $EC
+ const TM_37 ; $ED
+ const TM_38 ; $EE
+ const TM_39 ; $EF
+ const TM_40 ; $F0
+ const TM_41 ; $F1
+ const TM_42 ; $F2
+ const TM_43 ; $F3
+ const TM_44 ; $F4
+ const TM_45 ; $F5
+ const TM_46 ; $F6
+ const TM_47 ; $F7
+ const TM_48 ; $F8
+ const TM_49 ; $F9
+ const TM_50 ; $FA
--- a/constants/move_animation_constants.asm
+++ b/constants/move_animation_constants.asm
@@ -1,43 +1,44 @@
; subanimations
+const_value = $D8
; special effects, prefaced with "SE" for "Special Effect"
-SE_WAVY_SCREEN EQU $D8 ; used in Psywave/Night Shade/Psychic etc.
-SE_SUBSTITUTE_MON EQU $D9 ; used in Substitute (turns the pokemon into a mini sprite)
-SE_SHAKE_BACK_AND_FORTH EQU $DA ; used in Double Team
-SE_SLIDE_ENEMY_MON_OUT EQU $DB ; used in Whirlwind
-SE_SHOW_ENEMY_MON_PIC EQU $DC ; used in Seismic Toss
-SE_SHOW_MON_PIC EQU $DD ; used in Low Kick/Quick Attack/Seismic Toss etc.
-SE_BLINK_ENEMY_MON EQU $DE ; used in Seismic Toss
-SE_HIDE_ENEMY_MON_PIC EQU $DF ; used in Seismic Toss
-SE_FLASH_ENEMY_MON_PIC EQU $E0 ; unused
-SE_DELAY_ANIMATION_10 EQU $E1 ; used in lots of animations
-SE_SPIRAL_BALLS_INWARD EQU $E2 ; used in Growth/Focus Energy/Hyper Beam etc.
-SE_SHAKE_ENEMY_HUD_2 EQU $E3 ; unused
-SE_SHAKE_ENEMY_HUD EQU $E4 ;
-SE_SLIDE_MON_HALF_LEFT EQU $E5 ; used in Softboiled
-SE_PETALS_FALLING EQU $E6 ; used in Petal Dance
-SE_LEAVES_FALLING EQU $E7 ; used in Razor Leaf
-SE_TRANSFORM_MON EQU $E8 ; used in Transform
-SE_SLIDE_MON_DOWN_AND_HIDE EQU $E9 ; used in Acid Armor
-SE_MINIMIZE_MON EQU $EA ; used in Minimize
-SE_BOUNCE_UP_AND_DOWN EQU $EB ; used in Splash
-SE_SHOOT_MANY_BALLS_UPWARD EQU $EC ; used in an unused animation
-SE_SHOOT_BALLS_UPWARD EQU $ED ; used in Teleport/Sky Attack
-SE_SQUISH_MON_PIC EQU $EE ; used in Teleport/Sky Attack
-SE_HIDE_MON_PIC EQU $EF
-SE_LIGHT_SCREEN_PALETTE EQU $F0 ; used in Mist/Double Edge/Absorb/etc.
-SE_RESET_MON_POSITION EQU $F1 ; used in Tackle/Body Slam/etc.
-SE_MOVE_MON_HORIZONTALLY EQU $F2 ; used in Tackle/Body Slam/etc.
-SE_BLINK_MON EQU $F3 ; used in Recover
-SE_SLIDE_MON_OUT EQU $F4 ; used in Seismic Toss/Low Kick/etc.
-SE_FLASH_MON_PIC EQU $F5
-SE_SLIDE_MON_DOWN EQU $F6 ; used in Withdraw/Waterfall/fainting
-SE_SLIDE_MON_UP EQU $F7 ; used in Dig/Waterfall/etc.
-SE_FLASH_SCREEN_LONG EQU $F8 ; used in Confusion/Psychic/etc.
-SE_DARKEN_MON_PALETTE EQU $F9 ; used in Smokescreen/Smog/etc.
-SE_WATER_DROPLETS_EVERYWHERE EQU $FA ; used in Mist/Surf/Toxic/etc.
-SE_SHAKE_SCREEN EQU $FB ; used in Earthquake/Fissure/etc.
-SE_RESET_SCREEN_PALETTE EQU $FC ; used in Leer/Thunderpunch/etc.
-SE_DARK_SCREEN_PALETTE EQU $FD ; used in Hyper Beam/Thunderpunch/etc.
-SE_DARK_SCREEN_FLASH EQU $FE ; used in Cut/Take Down/etc.
+ const SE_WAVY_SCREEN ; $D8 used in Psywave/Night Shade/Psychic etc.
+ const SE_SUBSTITUTE_MON ; $D9 used in Substitute (turns the pokemon into a mini sprite)
+ const SE_SHAKE_BACK_AND_FORTH ; $DA used in Double Team
+ const SE_SLIDE_ENEMY_MON_OUT ; $DB used in Whirlwind
+ const SE_SHOW_ENEMY_MON_PIC ; $DC used in Seismic Toss
+ const SE_SHOW_MON_PIC ; $DD used in Low Kick/Quick Attack/Seismic Toss etc.
+ const SE_BLINK_ENEMY_MON ; $DE used in Seismic Toss
+ const SE_HIDE_ENEMY_MON_PIC ; $DF used in Seismic Toss
+ const SE_FLASH_ENEMY_MON_PIC ; $E0 unused
+ const SE_DELAY_ANIMATION_10 ; $E1 used in lots of animations
+ const SE_SPIRAL_BALLS_INWARD ; $E2 used in Growth/Focus Energy/Hyper Beam etc.
+ const SE_SHAKE_ENEMY_HUD_2 ; $E3 unused
+ const SE_SHAKE_ENEMY_HUD ; $E4
+ const SE_SLIDE_MON_HALF_LEFT ; $E5 used in Softboiled
+ const SE_PETALS_FALLING ; $E6 used in Petal Dance
+ const SE_LEAVES_FALLING ; $E7 used in Razor Leaf
+ const SE_TRANSFORM_MON ; $E8 used in Transform
+ const SE_SLIDE_MON_DOWN_AND_HIDE ; $E9 used in Acid Armor
+ const SE_MINIMIZE_MON ; $EA used in Minimize
+ const SE_BOUNCE_UP_AND_DOWN ; $EB used in Splash
+ const SE_SHOOT_MANY_BALLS_UPWARD ; $EC used in an unused animation
+ const SE_SHOOT_BALLS_UPWARD ; $ED used in Teleport/Sky Attack
+ const SE_SQUISH_MON_PIC ; $EE used in Teleport/Sky Attack
+ const SE_HIDE_MON_PIC ; $EF
+ const SE_LIGHT_SCREEN_PALETTE ; $F0 used in Mist/Double Edge/Absorb/etc.
+ const SE_RESET_MON_POSITION ; $F1 used in Tackle/Body Slam/etc.
+ const SE_MOVE_MON_HORIZONTALLY ; $F2 used in Tackle/Body Slam/etc.
+ const SE_BLINK_MON ; $F3 used in Recover
+ const SE_SLIDE_MON_OUT ; $F4 used in Seismic Toss/Low Kick/etc.
+ const SE_FLASH_MON_PIC ; $F5
+ const SE_SLIDE_MON_DOWN ; $F6 used in Withdraw/Waterfall/fainting
+ const SE_SLIDE_MON_UP ; $F7 used in Dig/Waterfall/etc.
+ const SE_FLASH_SCREEN_LONG ; $F8 used in Confusion/Psychic/etc.
+ const SE_DARKEN_MON_PALETTE ; $F9 used in Smokescreen/Smog/etc.
+ const SE_WATER_DROPLETS_EVERYWHERE ; $FA used in Mist/Surf/Toxic/etc.
+ const SE_SHAKE_SCREEN ; $FB used in Earthquake/Fissure/etc.
+ const SE_RESET_SCREEN_PALETTE ; $FC used in Leer/Thunderpunch/etc.
+ const SE_DARK_SCREEN_PALETTE ; $FD used in Hyper Beam/Thunderpunch/etc.
+ const SE_DARK_SCREEN_FLASH ; $FE used in Cut/Take Down/etc.
--- a/constants/move_effect_constants.asm
+++ b/constants/move_effect_constants.asm
@@ -2,92 +2,95 @@
; {stat}_(UP|DOWN)(1|2) means that the move raises the user's (or lowers the target's) corresponding stat modifier by 1 (or 2) stages
; {status condition}_side_effect means that the move has a side chance of causing that condition
; {status condition}_effect means that the move causes the status condition every time it hits the target
-NO_ADDITIONAL_EFFECT EQU $00
-POISON_SIDE_EFFECT1 EQU $02
-DRAIN_HP_EFFECT EQU $03
-BURN_SIDE_EFFECT1 EQU $04
-FREEZE_SIDE_EFFECT EQU $05
-PARALYZE_SIDE_EFFECT1 EQU $06
-EXPLODE_EFFECT EQU $07 ; Explosion, Self Destruct
-DREAM_EATER_EFFECT EQU $08
-MIRROR_MOVE_EFFECT EQU $09
-ATTACK_UP1_EFFECT EQU $0A
-DEFENSE_UP1_EFFECT EQU $0B
-SPEED_UP1_EFFECT EQU $0C
-SPECIAL_UP1_EFFECT EQU $0D
-ACCURACY_UP1_EFFECT EQU $0E
-EVASION_UP1_EFFECT EQU $0F
-PAY_DAY_EFFECT EQU $10
-SWIFT_EFFECT EQU $11
-ATTACK_DOWN1_EFFECT EQU $12
-DEFENSE_DOWN1_EFFECT EQU $13
-SPEED_DOWN1_EFFECT EQU $14
-SPECIAL_DOWN1_EFFECT EQU $15
-ACCURACY_DOWN1_EFFECT EQU $16
-EVASION_DOWN1_EFFECT EQU $17
-CONVERSION_EFFECT EQU $18
-HAZE_EFFECT EQU $19
-BIDE_EFFECT EQU $1A
-THRASH_PETAL_DANCE_EFFECT EQU $1B
-SWITCH_AND_TELEPORT_EFFECT EQU $1C
-TWO_TO_FIVE_ATTACKS_EFFECT EQU $1D
-; unused effect EQU $1E
-FLINCH_SIDE_EFFECT1 EQU $1F
-SLEEP_EFFECT EQU $20
-POISON_SIDE_EFFECT2 EQU $21
-BURN_SIDE_EFFECT2 EQU $22
-; unused effect EQU $23
-PARALYZE_SIDE_EFFECT2 EQU $24
-FLINCH_SIDE_EFFECT2 EQU $25
-OHKO_EFFECT EQU $26 ; moves like Horn Drill
-CHARGE_EFFECT EQU $27 ; moves like Solar Beam
-SUPER_FANG_EFFECT EQU $28
-SPECIAL_DAMAGE_EFFECT EQU $29 ; Seismic Toss, Night Shade, Sonic Boom, Dragon Rage, Psywave
-TRAPPING_EFFECT EQU $2A ; moves like Wrap
-FLY_EFFECT EQU $2B
-ATTACK_TWICE_EFFECT EQU $2C
-JUMP_KICK_EFFECT EQU $2D ; Jump Kick and Hi Jump Kick effect
-MIST_EFFECT EQU $2E
-FOCUS_ENERGY_EFFECT EQU $2F
-RECOIL_EFFECT EQU $30 ; moves like Double Edge
-CONFUSION_EFFECT EQU $31 ; Confuse Ray, Supersonic (not the move Confusion)
-ATTACK_UP2_EFFECT EQU $32
-DEFENSE_UP2_EFFECT EQU $33
-SPEED_UP2_EFFECT EQU $34
-SPECIAL_UP2_EFFECT EQU $35
-ACCURACY_UP2_EFFECT EQU $36
-EVASION_UP2_EFFECT EQU $37
-HEAL_EFFECT EQU $38 ; Recover, Softboiled, Rest
-TRANSFORM_EFFECT EQU $39
-ATTACK_DOWN2_EFFECT EQU $3A
-DEFENSE_DOWN2_EFFECT EQU $3B
-SPEED_DOWN2_EFFECT EQU $3C
-SPECIAL_DOWN2_EFFECT EQU $3D
-ACCURACY_DOWN2_EFFECT EQU $3E
-EVASION_DOWN2_EFFECT EQU $3F
-LIGHT_SCREEN_EFFECT EQU $40
-REFLECT_EFFECT EQU $41
-POISON_EFFECT EQU $42
-PARALYZE_EFFECT EQU $43
-ATTACK_DOWN_SIDE_EFFECT EQU $44
-DEFENSE_DOWN_SIDE_EFFECT EQU $45
-SPEED_DOWN_SIDE_EFFECT EQU $46
-SPECIAL_DOWN_SIDE_EFFECT EQU $47
-; unused effect EQU $48
-; unused effect EQU $49
-; unused effect EQU $4A
-; unused effect EQU $4B
-CONFUSION_SIDE_EFFECT EQU $4C
-TWINEEDLE_EFFECT EQU $4D
-; unused effect EQU $4E
-SUBSTITUTE_EFFECT EQU $4F
-HYPER_BEAM_EFFECT EQU $50
-RAGE_EFFECT EQU $51
-MIMIC_EFFECT EQU $52
-METRONOME_EFFECT EQU $53
-LEECH_SEED_EFFECT EQU $54
-SPLASH_EFFECT EQU $55
-DISABLE_EFFECT EQU $56
+const_value = 0
+
+ const NO_ADDITIONAL_EFFECT ; $00
+ const UNUSED_EFFECT_01 ; $01
+ const POISON_SIDE_EFFECT1 ; $02
+ const DRAIN_HP_EFFECT ; $03
+ const BURN_SIDE_EFFECT1 ; $04
+ const FREEZE_SIDE_EFFECT ; $05
+ const PARALYZE_SIDE_EFFECT1 ; $06
+ const EXPLODE_EFFECT ; $07 Explosion, Self Destruct
+ const DREAM_EATER_EFFECT ; $08
+ const MIRROR_MOVE_EFFECT ; $09
+ const ATTACK_UP1_EFFECT ; $0A
+ const DEFENSE_UP1_EFFECT ; $0B
+ const SPEED_UP1_EFFECT ; $0C
+ const SPECIAL_UP1_EFFECT ; $0D
+ const ACCURACY_UP1_EFFECT ; $0E
+ const EVASION_UP1_EFFECT ; $0F
+ const PAY_DAY_EFFECT ; $10
+ const SWIFT_EFFECT ; $11
+ const ATTACK_DOWN1_EFFECT ; $12
+ const DEFENSE_DOWN1_EFFECT ; $13
+ const SPEED_DOWN1_EFFECT ; $14
+ const SPECIAL_DOWN1_EFFECT ; $15
+ const ACCURACY_DOWN1_EFFECT ; $16
+ const EVASION_DOWN1_EFFECT ; $17
+ const CONVERSION_EFFECT ; $18
+ const HAZE_EFFECT ; $19
+ const BIDE_EFFECT ; $1A
+ const THRASH_PETAL_DANCE_EFFECT ; $1B
+ const SWITCH_AND_TELEPORT_EFFECT ; $1C
+ const TWO_TO_FIVE_ATTACKS_EFFECT ; $1D
+ const UNUSED_EFFECT_1E ; $1E
+ const FLINCH_SIDE_EFFECT1 ; $1F
+ const SLEEP_EFFECT ; $20
+ const POISON_SIDE_EFFECT2 ; $21
+ const BURN_SIDE_EFFECT2 ; $22
+ const UNUSED_EFFECT_23 ; $23
+ const PARALYZE_SIDE_EFFECT2 ; $24
+ const FLINCH_SIDE_EFFECT2 ; $25
+ const OHKO_EFFECT ; $26 moves like Horn Drill
+ const CHARGE_EFFECT ; $27 moves like Solar Beam
+ const SUPER_FANG_EFFECT ; $28
+ const SPECIAL_DAMAGE_EFFECT ; $29 Seismic Toss, Night Shade, Sonic Boom, Dragon Rage, Psywave
+ const TRAPPING_EFFECT ; $2A moves like Wrap
+ const FLY_EFFECT ; $2B
+ const ATTACK_TWICE_EFFECT ; $2C
+ const JUMP_KICK_EFFECT ; $2D Jump Kick and Hi Jump Kick effect
+ const MIST_EFFECT ; $2E
+ const FOCUS_ENERGY_EFFECT ; $2F
+ const RECOIL_EFFECT ; $30 moves like Double Edge
+ const CONFUSION_EFFECT ; $31 Confuse Ray, Supersonic (not the move Confusion)
+ const ATTACK_UP2_EFFECT ; $32
+ const DEFENSE_UP2_EFFECT ; $33
+ const SPEED_UP2_EFFECT ; $34
+ const SPECIAL_UP2_EFFECT ; $35
+ const ACCURACY_UP2_EFFECT ; $36
+ const EVASION_UP2_EFFECT ; $37
+ const HEAL_EFFECT ; $38 Recover, Softboiled, Rest
+ const TRANSFORM_EFFECT ; $39
+ const ATTACK_DOWN2_EFFECT ; $3A
+ const DEFENSE_DOWN2_EFFECT ; $3B
+ const SPEED_DOWN2_EFFECT ; $3C
+ const SPECIAL_DOWN2_EFFECT ; $3D
+ const ACCURACY_DOWN2_EFFECT ; $3E
+ const EVASION_DOWN2_EFFECT ; $3F
+ const LIGHT_SCREEN_EFFECT ; $40
+ const REFLECT_EFFECT ; $41
+ const POISON_EFFECT ; $42
+ const PARALYZE_EFFECT ; $43
+ const ATTACK_DOWN_SIDE_EFFECT ; $44
+ const DEFENSE_DOWN_SIDE_EFFECT ; $45
+ const SPEED_DOWN_SIDE_EFFECT ; $46
+ const SPECIAL_DOWN_SIDE_EFFECT ; $47
+ const UNUSED_EFFECT_48 ; $48
+ const UNUSED_EFFECT_49 ; $49
+ const UNUSED_EFFECT_4A ; $4A
+ const UNUSED_EFFECT_4B ; $4B
+ const CONFUSION_SIDE_EFFECT ; $4C
+ const TWINEEDLE_EFFECT ; $4D
+ const UNUSED_EFFECT_4E ; $4E
+ const SUBSTITUTE_EFFECT ; $4F
+ const HYPER_BEAM_EFFECT ; $50
+ const RAGE_EFFECT ; $51
+ const MIMIC_EFFECT ; $52
+ const METRONOME_EFFECT ; $53
+ const LEECH_SEED_EFFECT ; $54
+ const SPLASH_EFFECT ; $55
+ const DISABLE_EFFECT ; $56
; fixed damage constants
SONICBOOM_DAMAGE EQU 20
--- a/constants/palette_constants.asm
+++ b/constants/palette_constants.asm
@@ -1,38 +1,40 @@
; super game boy palettes
-PAL_ROUTE EQU $00
-PAL_PALLET EQU $01
-PAL_VIRIDIAN EQU $02
-PAL_PEWTER EQU $03
-PAL_CERULEAN EQU $04
-PAL_LAVENDER EQU $05
-PAL_VERMILION EQU $06
-PAL_CELADON EQU $07
-PAL_FUCHSIA EQU $08
-PAL_CINNABAR EQU $09
-PAL_INDIGO EQU $0A
-PAL_SAFFRON EQU $0B
-PAL_TOWNMAP EQU $0C
-PAL_LOGO1 EQU $0D
-PAL_LOGO2 EQU $0E
-;PAL_0F EQU $0F
-PAL_MEWMON EQU $10
-PAL_BLUEMON EQU $11
-PAL_REDMON EQU $12
-PAL_CYANMON EQU $13
-PAL_PURPLEMON EQU $14
-PAL_BROWNMON EQU $15
-PAL_GREENMON EQU $16
-PAL_PINKMON EQU $17
-PAL_YELLOWMON EQU $18
-PAL_GREYMON EQU $19
-PAL_SLOTS1 EQU $1A
-PAL_SLOTS2 EQU $1B
-PAL_SLOTS3 EQU $1C
-PAL_SLOTS4 EQU $1D
-PAL_BLACK EQU $1E
-PAL_GREENBAR EQU $1F
-PAL_YELLOWBAR EQU $20
-PAL_REDBAR EQU $21
-PAL_BADGE EQU $22
-PAL_CAVE EQU $23
-PAL_GAMEFREAK EQU $24
+const_value = 0
+
+ const PAL_ROUTE ; $00
+ const PAL_PALLET ; $01
+ const PAL_VIRIDIAN ; $02
+ const PAL_PEWTER ; $03
+ const PAL_CERULEAN ; $04
+ const PAL_LAVENDER ; $05
+ const PAL_VERMILION ; $06
+ const PAL_CELADON ; $07
+ const PAL_FUCHSIA ; $08
+ const PAL_CINNABAR ; $09
+ const PAL_INDIGO ; $0A
+ const PAL_SAFFRON ; $0B
+ const PAL_TOWNMAP ; $0C
+ const PAL_LOGO1 ; $0D
+ const PAL_LOGO2 ; $0E
+ const PAL_0F ; $0F
+ const PAL_MEWMON ; $10
+ const PAL_BLUEMON ; $11
+ const PAL_REDMON ; $12
+ const PAL_CYANMON ; $13
+ const PAL_PURPLEMON ; $14
+ const PAL_BROWNMON ; $15
+ const PAL_GREENMON ; $16
+ const PAL_PINKMON ; $17
+ const PAL_YELLOWMON ; $18
+ const PAL_GREYMON ; $19
+ const PAL_SLOTS1 ; $1A
+ const PAL_SLOTS2 ; $1B
+ const PAL_SLOTS3 ; $1C
+ const PAL_SLOTS4 ; $1D
+ const PAL_BLACK ; $1E
+ const PAL_GREENBAR ; $1F
+ const PAL_YELLOWBAR ; $20
+ const PAL_REDBAR ; $21
+ const PAL_BADGE ; $22
+ const PAL_CAVE ; $23
+ const PAL_GAMEFREAK ; $24
--- a/constants/pokedex_constants.asm
+++ b/constants/pokedex_constants.asm
@@ -1,153 +1,155 @@
-DEX_BULBASAUR EQU 1
-DEX_IVYSAUR EQU 2
-DEX_VENUSAUR EQU 3
-DEX_CHARMANDER EQU 4
-DEX_CHARMELEON EQU 5
-DEX_CHARIZARD EQU 6
-DEX_SQUIRTLE EQU 7
-DEX_WARTORTLE EQU 8
-DEX_BLASTOISE EQU 9
-DEX_CATERPIE EQU 10
-DEX_METAPOD EQU 11
-DEX_BUTTERFREE EQU 12
-DEX_WEEDLE EQU 13
-DEX_KAKUNA EQU 14
-DEX_BEEDRILL EQU 15
-DEX_PIDGEY EQU 16
-DEX_PIDGEOTTO EQU 17
-DEX_PIDGEOT EQU 18
-DEX_RATTATA EQU 19
-DEX_RATICATE EQU 20
-DEX_SPEAROW EQU 21
-DEX_FEAROW EQU 22
-DEX_EKANS EQU 23
-DEX_ARBOK EQU 24
-DEX_PIKACHU EQU 25
-DEX_RAICHU EQU 26
-DEX_SANDSHREW EQU 27
-DEX_SANDSLASH EQU 28
-DEX_NIDORAN_F EQU 29
-DEX_NIDORINA EQU 30
-DEX_NIDOQUEEN EQU 31
-DEX_NIDORAN_M EQU 32
-DEX_NIDORINO EQU 33
-DEX_NIDOKING EQU 34
-DEX_CLEFAIRY EQU 35
-DEX_CLEFABLE EQU 36
-DEX_VULPIX EQU 37
-DEX_NINETALES EQU 38
-DEX_JIGGLYPUFF EQU 39
-DEX_WIGGLYTUFF EQU 40
-DEX_ZUBAT EQU 41
-DEX_GOLBAT EQU 42
-DEX_ODDISH EQU 43
-DEX_GLOOM EQU 44
-DEX_VILEPLUME EQU 45
-DEX_PARAS EQU 46
-DEX_PARASECT EQU 47
-DEX_VENONAT EQU 48
-DEX_VENOMOTH EQU 49
-DEX_DIGLETT EQU 50
-DEX_DUGTRIO EQU 51
-DEX_MEOWTH EQU 52
-DEX_PERSIAN EQU 53
-DEX_PSYDUCK EQU 54
-DEX_GOLDUCK EQU 55
-DEX_MANKEY EQU 56
-DEX_PRIMEAPE EQU 57
-DEX_GROWLITHE EQU 58
-DEX_ARCANINE EQU 59
-DEX_POLIWAG EQU 60
-DEX_POLIWHIRL EQU 61
-DEX_POLIWRATH EQU 62
-DEX_ABRA EQU 63
-DEX_KADABRA EQU 64
-DEX_ALAKAZAM EQU 65
-DEX_MACHOP EQU 66
-DEX_MACHOKE EQU 67
-DEX_MACHAMP EQU 68
-DEX_BELLSPROUT EQU 69
-DEX_WEEPINBELL EQU 70
-DEX_VICTREEBEL EQU 71
-DEX_TENTACOOL EQU 72
-DEX_TENTACRUEL EQU 73
-DEX_GEODUDE EQU 74
-DEX_GRAVELER EQU 75
-DEX_GOLEM EQU 76
-DEX_PONYTA EQU 77
-DEX_RAPIDASH EQU 78
-DEX_SLOWPOKE EQU 79
-DEX_SLOWBRO EQU 80
-DEX_MAGNEMITE EQU 81
-DEX_MAGNETON EQU 82
-DEX_FARFETCH_D EQU 83
-DEX_DODUO EQU 84
-DEX_DODRIO EQU 85
-DEX_SEEL EQU 86
-DEX_DEWGONG EQU 87
-DEX_GRIMER EQU 88
-DEX_MUK EQU 89
-DEX_SHELLDER EQU 90
-DEX_CLOYSTER EQU 91
-DEX_GASTLY EQU 92
-DEX_HAUNTER EQU 93
-DEX_GENGAR EQU 94
-DEX_ONIX EQU 95
-DEX_DROWZEE EQU 96
-DEX_HYPNO EQU 97
-DEX_KRABBY EQU 98
-DEX_KINGLER EQU 99
-DEX_VOLTORB EQU 100
-DEX_ELECTRODE EQU 101
-DEX_EXEGGCUTE EQU 102
-DEX_EXEGGUTOR EQU 103
-DEX_CUBONE EQU 104
-DEX_MAROWAK EQU 105
-DEX_HITMONLEE EQU 106
-DEX_HITMONCHAN EQU 107
-DEX_LICKITUNG EQU 108
-DEX_KOFFING EQU 109
-DEX_WEEZING EQU 110
-DEX_RHYHORN EQU 111
-DEX_RHYDON EQU 112
-DEX_CHANSEY EQU 113
-DEX_TANGELA EQU 114
-DEX_KANGASKHAN EQU 115
-DEX_HORSEA EQU 116
-DEX_SEADRA EQU 117
-DEX_GOLDEEN EQU 118
-DEX_SEAKING EQU 119
-DEX_STARYU EQU 120
-DEX_STARMIE EQU 121
-DEX_MR_MIME EQU 122
-DEX_SCYTHER EQU 123
-DEX_JYNX EQU 124
-DEX_ELECTABUZZ EQU 125
-DEX_MAGMAR EQU 126
-DEX_PINSIR EQU 127
-DEX_TAUROS EQU 128
-DEX_MAGIKARP EQU 129
-DEX_GYARADOS EQU 130
-DEX_LAPRAS EQU 131
-DEX_DITTO EQU 132
-DEX_EEVEE EQU 133
-DEX_VAPOREON EQU 134
-DEX_JOLTEON EQU 135
-DEX_FLAREON EQU 136
-DEX_PORYGON EQU 137
-DEX_OMANYTE EQU 138
-DEX_OMASTAR EQU 139
-DEX_KABUTO EQU 140
-DEX_KABUTOPS EQU 141
-DEX_AERODACTYL EQU 142
-DEX_SNORLAX EQU 143
-DEX_ARTICUNO EQU 144
-DEX_ZAPDOS EQU 145
-DEX_MOLTRES EQU 146
-DEX_DRATINI EQU 147
-DEX_DRAGONAIR EQU 148
-DEX_DRAGONITE EQU 149
-DEX_MEWTWO EQU 150
-DEX_MEW EQU 151
+const_value = 1
+
+ const DEX_BULBASAUR ; 1
+ const DEX_IVYSAUR ; 2
+ const DEX_VENUSAUR ; 3
+ const DEX_CHARMANDER ; 4
+ const DEX_CHARMELEON ; 5
+ const DEX_CHARIZARD ; 6
+ const DEX_SQUIRTLE ; 7
+ const DEX_WARTORTLE ; 8
+ const DEX_BLASTOISE ; 9
+ const DEX_CATERPIE ; 10
+ const DEX_METAPOD ; 11
+ const DEX_BUTTERFREE ; 12
+ const DEX_WEEDLE ; 13
+ const DEX_KAKUNA ; 14
+ const DEX_BEEDRILL ; 15
+ const DEX_PIDGEY ; 16
+ const DEX_PIDGEOTTO ; 17
+ const DEX_PIDGEOT ; 18
+ const DEX_RATTATA ; 19
+ const DEX_RATICATE ; 20
+ const DEX_SPEAROW ; 21
+ const DEX_FEAROW ; 22
+ const DEX_EKANS ; 23
+ const DEX_ARBOK ; 24
+ const DEX_PIKACHU ; 25
+ const DEX_RAICHU ; 26
+ const DEX_SANDSHREW ; 27
+ const DEX_SANDSLASH ; 28
+ const DEX_NIDORAN_F ; 29
+ const DEX_NIDORINA ; 30
+ const DEX_NIDOQUEEN ; 31
+ const DEX_NIDORAN_M ; 32
+ const DEX_NIDORINO ; 33
+ const DEX_NIDOKING ; 34
+ const DEX_CLEFAIRY ; 35
+ const DEX_CLEFABLE ; 36
+ const DEX_VULPIX ; 37
+ const DEX_NINETALES ; 38
+ const DEX_JIGGLYPUFF ; 39
+ const DEX_WIGGLYTUFF ; 40
+ const DEX_ZUBAT ; 41
+ const DEX_GOLBAT ; 42
+ const DEX_ODDISH ; 43
+ const DEX_GLOOM ; 44
+ const DEX_VILEPLUME ; 45
+ const DEX_PARAS ; 46
+ const DEX_PARASECT ; 47
+ const DEX_VENONAT ; 48
+ const DEX_VENOMOTH ; 49
+ const DEX_DIGLETT ; 50
+ const DEX_DUGTRIO ; 51
+ const DEX_MEOWTH ; 52
+ const DEX_PERSIAN ; 53
+ const DEX_PSYDUCK ; 54
+ const DEX_GOLDUCK ; 55
+ const DEX_MANKEY ; 56
+ const DEX_PRIMEAPE ; 57
+ const DEX_GROWLITHE ; 58
+ const DEX_ARCANINE ; 59
+ const DEX_POLIWAG ; 60
+ const DEX_POLIWHIRL ; 61
+ const DEX_POLIWRATH ; 62
+ const DEX_ABRA ; 63
+ const DEX_KADABRA ; 64
+ const DEX_ALAKAZAM ; 65
+ const DEX_MACHOP ; 66
+ const DEX_MACHOKE ; 67
+ const DEX_MACHAMP ; 68
+ const DEX_BELLSPROUT ; 69
+ const DEX_WEEPINBELL ; 70
+ const DEX_VICTREEBEL ; 71
+ const DEX_TENTACOOL ; 72
+ const DEX_TENTACRUEL ; 73
+ const DEX_GEODUDE ; 74
+ const DEX_GRAVELER ; 75
+ const DEX_GOLEM ; 76
+ const DEX_PONYTA ; 77
+ const DEX_RAPIDASH ; 78
+ const DEX_SLOWPOKE ; 79
+ const DEX_SLOWBRO ; 80
+ const DEX_MAGNEMITE ; 81
+ const DEX_MAGNETON ; 82
+ const DEX_FARFETCH_D ; 83
+ const DEX_DODUO ; 84
+ const DEX_DODRIO ; 85
+ const DEX_SEEL ; 86
+ const DEX_DEWGONG ; 87
+ const DEX_GRIMER ; 88
+ const DEX_MUK ; 89
+ const DEX_SHELLDER ; 90
+ const DEX_CLOYSTER ; 91
+ const DEX_GASTLY ; 92
+ const DEX_HAUNTER ; 93
+ const DEX_GENGAR ; 94
+ const DEX_ONIX ; 95
+ const DEX_DROWZEE ; 96
+ const DEX_HYPNO ; 97
+ const DEX_KRABBY ; 98
+ const DEX_KINGLER ; 99
+ const DEX_VOLTORB ; 100
+ const DEX_ELECTRODE ; 101
+ const DEX_EXEGGCUTE ; 102
+ const DEX_EXEGGUTOR ; 103
+ const DEX_CUBONE ; 104
+ const DEX_MAROWAK ; 105
+ const DEX_HITMONLEE ; 106
+ const DEX_HITMONCHAN ; 107
+ const DEX_LICKITUNG ; 108
+ const DEX_KOFFING ; 109
+ const DEX_WEEZING ; 110
+ const DEX_RHYHORN ; 111
+ const DEX_RHYDON ; 112
+ const DEX_CHANSEY ; 113
+ const DEX_TANGELA ; 114
+ const DEX_KANGASKHAN ; 115
+ const DEX_HORSEA ; 116
+ const DEX_SEADRA ; 117
+ const DEX_GOLDEEN ; 118
+ const DEX_SEAKING ; 119
+ const DEX_STARYU ; 120
+ const DEX_STARMIE ; 121
+ const DEX_MR_MIME ; 122
+ const DEX_SCYTHER ; 123
+ const DEX_JYNX ; 124
+ const DEX_ELECTABUZZ ; 125
+ const DEX_MAGMAR ; 126
+ const DEX_PINSIR ; 127
+ const DEX_TAUROS ; 128
+ const DEX_MAGIKARP ; 129
+ const DEX_GYARADOS ; 130
+ const DEX_LAPRAS ; 131
+ const DEX_DITTO ; 132
+ const DEX_EEVEE ; 133
+ const DEX_VAPOREON ; 134
+ const DEX_JOLTEON ; 135
+ const DEX_FLAREON ; 136
+ const DEX_PORYGON ; 137
+ const DEX_OMANYTE ; 138
+ const DEX_OMASTAR ; 139
+ const DEX_KABUTO ; 140
+ const DEX_KABUTOPS ; 141
+ const DEX_AERODACTYL ; 142
+ const DEX_SNORLAX ; 143
+ const DEX_ARTICUNO ; 144
+ const DEX_ZAPDOS ; 145
+ const DEX_MOLTRES ; 146
+ const DEX_DRATINI ; 147
+ const DEX_DRAGONAIR ; 148
+ const DEX_DRAGONITE ; 149
+ const DEX_MEWTWO ; 150
+ const DEX_MEW ; 151
NUM_POKEMON EQU 151
--- a/constants/pokemon_constants.asm
+++ b/constants/pokemon_constants.asm
@@ -1,190 +1,192 @@
-RHYDON EQU $01
-KANGASKHAN EQU $02
-NIDORAN_M EQU $03
-CLEFAIRY EQU $04
-SPEAROW EQU $05
-VOLTORB EQU $06
-NIDOKING EQU $07
-SLOWBRO EQU $08
-IVYSAUR EQU $09
-EXEGGUTOR EQU $0A
-LICKITUNG EQU $0B
-EXEGGCUTE EQU $0C
-GRIMER EQU $0D
-GENGAR EQU $0E
-NIDORAN_F EQU $0F
-NIDOQUEEN EQU $10
-CUBONE EQU $11
-RHYHORN EQU $12
-LAPRAS EQU $13
-ARCANINE EQU $14
-MEW EQU $15
-GYARADOS EQU $16
-SHELLDER EQU $17
-TENTACOOL EQU $18
-GASTLY EQU $19
-SCYTHER EQU $1A
-STARYU EQU $1B
-BLASTOISE EQU $1C
-PINSIR EQU $1D
-TANGELA EQU $1E
+const_value = 1
-
-GROWLITHE EQU $21
-ONIX EQU $22
-FEAROW EQU $23
-PIDGEY EQU $24
-SLOWPOKE EQU $25
-KADABRA EQU $26
-GRAVELER EQU $27
-CHANSEY EQU $28
-MACHOKE EQU $29
-MR_MIME EQU $2A
-HITMONLEE EQU $2B
-HITMONCHAN EQU $2C
-ARBOK EQU $2D
-PARASECT EQU $2E
-PSYDUCK EQU $2F
-DROWZEE EQU $30
-GOLEM EQU $31
-
-MAGMAR EQU $33
-
-ELECTABUZZ EQU $35
-MAGNETON EQU $36
-KOFFING EQU $37
-
-MANKEY EQU $39
-SEEL EQU $3A
-DIGLETT EQU $3B
-TAUROS EQU $3C
-
-
-
-FARFETCH_D EQU $40
-VENONAT EQU $41
-DRAGONITE EQU $42
-
-
-
-DODUO EQU $46
-POLIWAG EQU $47
-JYNX EQU $48
-MOLTRES EQU $49
-ARTICUNO EQU $4A
-ZAPDOS EQU $4B
-DITTO EQU $4C
-MEOWTH EQU $4D
-KRABBY EQU $4E
-
-
-
-VULPIX EQU $52
-NINETALES EQU $53
-PIKACHU EQU $54
-RAICHU EQU $55
-
-
-DRATINI EQU $58
-DRAGONAIR EQU $59
-KABUTO EQU $5A
-KABUTOPS EQU $5B
-HORSEA EQU $5C
-SEADRA EQU $5D
-
-
-SANDSHREW EQU $60
-SANDSLASH EQU $61
-OMANYTE EQU $62
-OMASTAR EQU $63
-JIGGLYPUFF EQU $64
-WIGGLYTUFF EQU $65
-EEVEE EQU $66
-FLAREON EQU $67
-JOLTEON EQU $68
-VAPOREON EQU $69
-MACHOP EQU $6A
-ZUBAT EQU $6B
-EKANS EQU $6C
-PARAS EQU $6D
-POLIWHIRL EQU $6E
-POLIWRATH EQU $6F
-WEEDLE EQU $70
-KAKUNA EQU $71
-BEEDRILL EQU $72
-
-DODRIO EQU $74
-PRIMEAPE EQU $75
-DUGTRIO EQU $76
-VENOMOTH EQU $77
-DEWGONG EQU $78
-
-
-CATERPIE EQU $7B
-METAPOD EQU $7C
-BUTTERFREE EQU $7D
-MACHAMP EQU $7E
-
-GOLDUCK EQU $80
-HYPNO EQU $81
-GOLBAT EQU $82
-MEWTWO EQU $83
-SNORLAX EQU $84
-MAGIKARP EQU $85
-
-
-MUK EQU $88
-
-KINGLER EQU $8A
-CLOYSTER EQU $8B
-
-ELECTRODE EQU $8D
-CLEFABLE EQU $8E
-WEEZING EQU $8F
-PERSIAN EQU $90
-MAROWAK EQU $91
-
-HAUNTER EQU $93
-ABRA EQU $94
-ALAKAZAM EQU $95
-PIDGEOTTO EQU $96
-PIDGEOT EQU $97
-STARMIE EQU $98
-BULBASAUR EQU $99
-VENUSAUR EQU $9A
-TENTACRUEL EQU $9B
-
-GOLDEEN EQU $9D
-SEAKING EQU $9E
-
-
-
-
-PONYTA EQU $A3
-RAPIDASH EQU $A4
-RATTATA EQU $A5
-RATICATE EQU $A6
-NIDORINO EQU $A7
-NIDORINA EQU $A8
-GEODUDE EQU $A9
-PORYGON EQU $AA
-AERODACTYL EQU $AB
-
-MAGNEMITE EQU $AD
-
-
-CHARMANDER EQU $B0
-SQUIRTLE EQU $B1
-CHARMELEON EQU $B2
-WARTORTLE EQU $B3
-CHARIZARD EQU $B4
-
-FOSSIL_KABUTOPS EQU $B6
-FOSSIL_AERODACTYL EQU $B7
-MON_GHOST EQU $B8
-ODDISH EQU $B9
-GLOOM EQU $BA
-VILEPLUME EQU $BB
-BELLSPROUT EQU $BC
-WEEPINBELL EQU $BD
-VICTREEBEL EQU $BE
+ const RHYDON ; $01
+ const KANGASKHAN ; $02
+ const NIDORAN_M ; $03
+ const CLEFAIRY ; $04
+ const SPEAROW ; $05
+ const VOLTORB ; $06
+ const NIDOKING ; $07
+ const SLOWBRO ; $08
+ const IVYSAUR ; $09
+ const EXEGGUTOR ; $0A
+ const LICKITUNG ; $0B
+ const EXEGGCUTE ; $0C
+ const GRIMER ; $0D
+ const GENGAR ; $0E
+ const NIDORAN_F ; $0F
+ const NIDOQUEEN ; $10
+ const CUBONE ; $11
+ const RHYHORN ; $12
+ const LAPRAS ; $13
+ const ARCANINE ; $14
+ const MEW ; $15
+ const GYARADOS ; $16
+ const SHELLDER ; $17
+ const TENTACOOL ; $18
+ const GASTLY ; $19
+ const SCYTHER ; $1A
+ const STARYU ; $1B
+ const BLASTOISE ; $1C
+ const PINSIR ; $1D
+ const TANGELA ; $1E
+ const MISSINGNO_1F ; $1F
+ const MISSINGNO_20 ; $20
+ const GROWLITHE ; $21
+ const ONIX ; $22
+ const FEAROW ; $23
+ const PIDGEY ; $24
+ const SLOWPOKE ; $25
+ const KADABRA ; $26
+ const GRAVELER ; $27
+ const CHANSEY ; $28
+ const MACHOKE ; $29
+ const MR_MIME ; $2A
+ const HITMONLEE ; $2B
+ const HITMONCHAN ; $2C
+ const ARBOK ; $2D
+ const PARASECT ; $2E
+ const PSYDUCK ; $2F
+ const DROWZEE ; $30
+ const GOLEM ; $31
+ const MISSINGNO_32 ; $32
+ const MAGMAR ; $33
+ const MISSINGNO_34 ; $34
+ const ELECTABUZZ ; $35
+ const MAGNETON ; $36
+ const KOFFING ; $37
+ const MISSINGNO_38 ; $38
+ const MANKEY ; $39
+ const SEEL ; $3A
+ const DIGLETT ; $3B
+ const TAUROS ; $3C
+ const MISSINGNO_3D ; $3D
+ const MISSINGNO_3E ; $3E
+ const MISSINGNO_3F ; $3F
+ const FARFETCH_D ; $40
+ const VENONAT ; $41
+ const DRAGONITE ; $42
+ const MISSINGNO_43 ; $43
+ const MISSINGNO_44 ; $44
+ const MISSINGNO_45 ; $45
+ const DODUO ; $46
+ const POLIWAG ; $47
+ const JYNX ; $48
+ const MOLTRES ; $49
+ const ARTICUNO ; $4A
+ const ZAPDOS ; $4B
+ const DITTO ; $4C
+ const MEOWTH ; $4D
+ const KRABBY ; $4E
+ const MISSINGNO_4F ; $4F
+ const MISSINGNO_50 ; $50
+ const MISSINGNO_51 ; $51
+ const VULPIX ; $52
+ const NINETALES ; $53
+ const PIKACHU ; $54
+ const RAICHU ; $55
+ const MISSINGNO_56 ; $56
+ const MISSINGNO_57 ; $57
+ const DRATINI ; $58
+ const DRAGONAIR ; $59
+ const KABUTO ; $5A
+ const KABUTOPS ; $5B
+ const HORSEA ; $5C
+ const SEADRA ; $5D
+ const MISSINGNO_5E ; $5E
+ const MISSINGNO_5F ; $5F
+ const SANDSHREW ; $60
+ const SANDSLASH ; $61
+ const OMANYTE ; $62
+ const OMASTAR ; $63
+ const JIGGLYPUFF ; $64
+ const WIGGLYTUFF ; $65
+ const EEVEE ; $66
+ const FLAREON ; $67
+ const JOLTEON ; $68
+ const VAPOREON ; $69
+ const MACHOP ; $6A
+ const ZUBAT ; $6B
+ const EKANS ; $6C
+ const PARAS ; $6D
+ const POLIWHIRL ; $6E
+ const POLIWRATH ; $6F
+ const WEEDLE ; $70
+ const KAKUNA ; $71
+ const BEEDRILL ; $72
+ const MISSINGNO_73 ; $73
+ const DODRIO ; $74
+ const PRIMEAPE ; $75
+ const DUGTRIO ; $76
+ const VENOMOTH ; $77
+ const DEWGONG ; $78
+ const MISSINGNO_79 ; $79
+ const MISSINGNO_7A ; $7A
+ const CATERPIE ; $7B
+ const METAPOD ; $7C
+ const BUTTERFREE ; $7D
+ const MACHAMP ; $7E
+ const MISSINGNO_7F ; $7F
+ const GOLDUCK ; $80
+ const HYPNO ; $81
+ const GOLBAT ; $82
+ const MEWTWO ; $83
+ const SNORLAX ; $84
+ const MAGIKARP ; $85
+ const MISSINGNO_86 ; $86
+ const MISSINGNO_87 ; $87
+ const MUK ; $88
+ const MISSINGNO_8A ; $8A
+ const KINGLER ; $8A
+ const CLOYSTER ; $8B
+ const MISSINGNO_8C ; $8C
+ const ELECTRODE ; $8D
+ const CLEFABLE ; $8E
+ const WEEZING ; $8F
+ const PERSIAN ; $90
+ const MAROWAK ; $91
+ const MISSINGNO_92 ; $92
+ const HAUNTER ; $93
+ const ABRA ; $94
+ const ALAKAZAM ; $95
+ const PIDGEOTTO ; $96
+ const PIDGEOT ; $97
+ const STARMIE ; $98
+ const BULBASAUR ; $99
+ const VENUSAUR ; $9A
+ const TENTACRUEL ; $9B
+ const MISSINGNO_9C ; $9C
+ const GOLDEEN ; $9D
+ const SEAKING ; $9E
+ const MISSINGNO_9F ; $9F
+ const MISSINGNO_A0 ; $A0
+ const MISSINGNO_A1 ; $A1
+ const MISSINGNO_A2 ; $A2
+ const PONYTA ; $A3
+ const RAPIDASH ; $A4
+ const RATTATA ; $A5
+ const RATICATE ; $A6
+ const NIDORINO ; $A7
+ const NIDORINA ; $A8
+ const GEODUDE ; $A9
+ const PORYGON ; $AA
+ const AERODACTYL ; $AB
+ const MISSINGNO_AC ; $AC
+ const MAGNEMITE ; $AD
+ const MISSINGNO_AE ; $AE
+ const MISSINGNO_AF ; $AF
+ const CHARMANDER ; $B0
+ const SQUIRTLE ; $B1
+ const CHARMELEON ; $B2
+ const WARTORTLE ; $B3
+ const CHARIZARD ; $B4
+ const MISSINGNO_B5 ; $B5
+ const FOSSIL_KABUTOPS ; $B6
+ const FOSSIL_AERODACTYL ; $B7
+ const MON_GHOST ; $B8
+ const ODDISH ; $B9
+ const GLOOM ; $BA
+ const VILEPLUME ; $BB
+ const BELLSPROUT ; $BC
+ const WEEPINBELL ; $BD
+ const VICTREEBEL ; $BE
--- a/constants/sprite_constants.asm
+++ b/constants/sprite_constants.asm
@@ -1,88 +1,92 @@
; pokemon's overworld sprites
-SPRITE_MON EQU $0
-SPRITE_BALL_M EQU $1
-SPRITE_HELIX EQU $2
-SPRITE_FAIRY EQU $3
-SPRITE_BIRD_M EQU $4
-SPRITE_WATER EQU $5
-SPRITE_BUG EQU $6
-SPRITE_GRASS EQU $7
-SPRITE_SNAKE EQU $8
-SPRITE_QUADRUPED EQU $9
+const_value = 0
+ const SPRITE_MON ; $0
+ const SPRITE_BALL_M ; $1
+ const SPRITE_HELIX ; $2
+ const SPRITE_FAIRY ; $3
+ const SPRITE_BIRD_M ; $4
+ const SPRITE_WATER ; $5
+ const SPRITE_BUG ; $6
+ const SPRITE_GRASS ; $7
+ const SPRITE_SNAKE ; $8
+ const SPRITE_QUADRUPED ; $9
+
; overworld sprites
-SPRITE_RED EQU $01
-SPRITE_BLUE EQU $02
-SPRITE_OAK EQU $03
-SPRITE_BUG_CATCHER EQU $04
-SPRITE_SLOWBRO EQU $05
-SPRITE_LASS EQU $06
-SPRITE_BLACK_HAIR_BOY_1 EQU $07
-SPRITE_LITTLE_GIRL EQU $08
-SPRITE_BIRD EQU $09
-SPRITE_FAT_BALD_GUY EQU $0a
-SPRITE_GAMBLER EQU $0b
-SPRITE_BLACK_HAIR_BOY_2 EQU $0c
-SPRITE_GIRL EQU $0d
-SPRITE_HIKER EQU $0e
-SPRITE_FOULARD_WOMAN EQU $0f
-SPRITE_GENTLEMAN EQU $10
-SPRITE_DAISY EQU $11
-SPRITE_BIKER EQU $12
-SPRITE_SAILOR EQU $13
-SPRITE_COOK EQU $14
-SPRITE_BIKE_SHOP_GUY EQU $15
-SPRITE_MR_FUJI EQU $16
-SPRITE_GIOVANNI EQU $17
-SPRITE_ROCKET EQU $18
-SPRITE_MEDIUM EQU $19
-SPRITE_WAITER EQU $1a
-SPRITE_ERIKA EQU $1b
-SPRITE_MOM_GEISHA EQU $1c
-SPRITE_BRUNETTE_GIRL EQU $1d
-SPRITE_LANCE EQU $1e
-SPRITE_OAK_SCIENTIST_AIDE EQU $1f
-SPRITE_OAK_AIDE EQU $20
-SPRITE_ROCKER EQU $21
-SPRITE_SWIMMER EQU $22
-SPRITE_WHITE_PLAYER EQU $23
-SPRITE_GYM_HELPER EQU $24
-SPRITE_OLD_PERSON EQU $25
-SPRITE_MART_GUY EQU $26
-SPRITE_FISHER EQU $27
-SPRITE_OLD_MEDIUM_WOMAN EQU $28
-SPRITE_NURSE EQU $29
-SPRITE_CABLE_CLUB_WOMAN EQU $2a
-SPRITE_MR_MASTERBALL EQU $2b
-SPRITE_LAPRAS_GIVER EQU $2c
-SPRITE_WARDEN EQU $2d
-SPRITE_SS_CAPTAIN EQU $2e
-SPRITE_FISHER2 EQU $2f
-SPRITE_BLACKBELT EQU $30
-SPRITE_GUARD EQU $31
-;SPRITE_COP_GUARD EQU $32
-SPRITE_MOM EQU $33
-SPRITE_BALDING_GUY EQU $34
-SPRITE_YOUNG_BOY EQU $35
-SPRITE_GAMEBOY_KID EQU $36
-SPRITE_GAMEBOY_KID_COPY EQU $37
-SPRITE_CLEFAIRY EQU $38
-SPRITE_AGATHA EQU $39
-SPRITE_BRUNO EQU $3a
-SPRITE_LORELEI EQU $3b
-SPRITE_SEEL EQU $3c
-SPRITE_BALL EQU $3d
-SPRITE_OMANYTE EQU $3e
-SPRITE_BOULDER EQU $3f
-SPRITE_PAPER_SHEET EQU $40
-SPRITE_BOOK_MAP_DEX EQU $41
-SPRITE_CLIPBOARD EQU $42
-SPRITE_SNORLAX EQU $43
-SPRITE_OLD_AMBER_COPY EQU $44
-SPRITE_OLD_AMBER EQU $45
-SPRITE_LYING_OLD_MAN_UNUSED_1 EQU $46
-SPRITE_LYING_OLD_MAN_UNUSED_2 EQU $47
-SPRITE_LYING_OLD_MAN EQU $48
+const_value = 1
+
+ const SPRITE_RED ; $01
+ const SPRITE_BLUE ; $02
+ const SPRITE_OAK ; $03
+ const SPRITE_BUG_CATCHER ; $04
+ const SPRITE_SLOWBRO ; $05
+ const SPRITE_LASS ; $06
+ const SPRITE_BLACK_HAIR_BOY_1 ; $07
+ const SPRITE_LITTLE_GIRL ; $08
+ const SPRITE_BIRD ; $09
+ const SPRITE_FAT_BALD_GUY ; $0a
+ const SPRITE_GAMBLER ; $0b
+ const SPRITE_BLACK_HAIR_BOY_2 ; $0c
+ const SPRITE_GIRL ; $0d
+ const SPRITE_HIKER ; $0e
+ const SPRITE_FOULARD_WOMAN ; $0f
+ const SPRITE_GENTLEMAN ; $10
+ const SPRITE_DAISY ; $11
+ const SPRITE_BIKER ; $12
+ const SPRITE_SAILOR ; $13
+ const SPRITE_COOK ; $14
+ const SPRITE_BIKE_SHOP_GUY ; $15
+ const SPRITE_MR_FUJI ; $16
+ const SPRITE_GIOVANNI ; $17
+ const SPRITE_ROCKET ; $18
+ const SPRITE_MEDIUM ; $19
+ const SPRITE_WAITER ; $1a
+ const SPRITE_ERIKA ; $1b
+ const SPRITE_MOM_GEISHA ; $1c
+ const SPRITE_BRUNETTE_GIRL ; $1d
+ const SPRITE_LANCE ; $1e
+ const SPRITE_OAK_SCIENTIST_AIDE ; $1f
+ const SPRITE_OAK_AIDE ; $20
+ const SPRITE_ROCKER ; $21
+ const SPRITE_SWIMMER ; $22
+ const SPRITE_WHITE_PLAYER ; $23
+ const SPRITE_GYM_HELPER ; $24
+ const SPRITE_OLD_PERSON ; $25
+ const SPRITE_MART_GUY ; $26
+ const SPRITE_FISHER ; $27
+ const SPRITE_OLD_MEDIUM_WOMAN ; $28
+ const SPRITE_NURSE ; $29
+ const SPRITE_CABLE_CLUB_WOMAN ; $2a
+ const SPRITE_MR_MASTERBALL ; $2b
+ const SPRITE_LAPRAS_GIVER ; $2c
+ const SPRITE_WARDEN ; $2d
+ const SPRITE_SS_CAPTAIN ; $2e
+ const SPRITE_FISHER2 ; $2f
+ const SPRITE_BLACKBELT ; $30
+ const SPRITE_GUARD ; $31
+ const SPRITE_COP_GUARD ; $32
+ const SPRITE_MOM ; $33
+ const SPRITE_BALDING_GUY ; $34
+ const SPRITE_YOUNG_BOY ; $35
+ const SPRITE_GAMEBOY_KID ; $36
+ const SPRITE_GAMEBOY_KID_COPY ; $37
+ const SPRITE_CLEFAIRY ; $38
+ const SPRITE_AGATHA ; $39
+ const SPRITE_BRUNO ; $3a
+ const SPRITE_LORELEI ; $3b
+ const SPRITE_SEEL ; $3c
+ const SPRITE_BALL ; $3d
+ const SPRITE_OMANYTE ; $3e
+ const SPRITE_BOULDER ; $3f
+ const SPRITE_PAPER_SHEET ; $40
+ const SPRITE_BOOK_MAP_DEX ; $41
+ const SPRITE_CLIPBOARD ; $42
+ const SPRITE_SNORLAX ; $43
+ const SPRITE_OLD_AMBER_COPY ; $44
+ const SPRITE_OLD_AMBER ; $45
+ const SPRITE_LYING_OLD_MAN_UNUSED_1 ; $46
+ const SPRITE_LYING_OLD_MAN_UNUSED_2 ; $47
+ const SPRITE_LYING_OLD_MAN ; $48
; different kinds of people events
ITEM EQU $80
--- a/constants/tilesets.asm
+++ b/constants/tilesets.asm
@@ -1,27 +1,29 @@
-OVERWORLD EQU 0
-REDS_HOUSE_1 EQU 1
-MART EQU 2
-FOREST EQU 3
-REDS_HOUSE_2 EQU 4
-DOJO EQU 5
-POKECENTER EQU 6
-GYM EQU 7
-HOUSE EQU 8
-FOREST_GATE EQU 9
-MUSEUM EQU 10
-UNDERGROUND EQU 11
-GATE EQU 12
-SHIP EQU 13
-SHIP_PORT EQU 14
-CEMETERY EQU 15
-INTERIOR EQU 16
-CAVERN EQU 17
-LOBBY EQU 18
-MANSION EQU 19
-LAB EQU 20
-CLUB EQU 21
-FACILITY EQU 22
-PLATEAU EQU 23
+const_value = 0
+
+ const OVERWORLD ; 0
+ const REDS_HOUSE_1 ; 1
+ const MART ; 2
+ const FOREST ; 3
+ const REDS_HOUSE_2 ; 4
+ const DOJO ; 5
+ const POKECENTER ; 6
+ const GYM ; 7
+ const HOUSE ; 8
+ const FOREST_GATE ; 9
+ const MUSEUM ; 10
+ const UNDERGROUND ; 11
+ const GATE ; 12
+ const SHIP ; 13
+ const SHIP_PORT ; 14
+ const CEMETERY ; 15
+ const INTERIOR ; 16
+ const CAVERN ; 17
+ const LOBBY ; 18
+ const MANSION ; 19
+ const LAB ; 20
+ const CLUB ; 21
+ const FACILITY ; 22
+ const PLATEAU ; 23
IF DEF(_OPTION_BEACH_HOUSE)
-BEACH_HOUSE_TILESET EQU 24
+ const BEACH_HOUSE_TILESET ; 24
ENDC
--- a/constants/trainer_constants.asm
+++ b/constants/trainer_constants.asm
@@ -1,48 +1,50 @@
; sometimes it's necessary to add $C8 to these values
-YOUNGSTER EQU $01
-BUG_CATCHER EQU $02
-LASS EQU $03
-SAILOR EQU $04
-JR__TRAINER_M EQU $05
-JR__TRAINER_F EQU $06
-POKEMANIAC EQU $07
-SUPER_NERD EQU $08
-HIKER EQU $09
-BIKER EQU $0A
-BURGLAR EQU $0B
-ENGINEER EQU $0C
-JUGGLER_X EQU $0D
-FISHER EQU $0E
-SWIMMER EQU $0F
-CUE_BALL EQU $10
-GAMBLER EQU $11
-BEAUTY EQU $12
-PSYCHIC_TR EQU $13
-ROCKER EQU $14
-JUGGLER EQU $15
-TAMER EQU $16
-BIRD_KEEPER EQU $17
-BLACKBELT EQU $18
-SONY1 EQU $19
-PROF_OAK EQU $1A
-CHIEF EQU $1B
-SCIENTIST EQU $1C
-GIOVANNI EQU $1D
-ROCKET EQU $1E
-COOLTRAINER_M EQU $1F
-COOLTRAINER_F EQU $20
-BRUNO EQU $21
-BROCK EQU $22
-MISTY EQU $23
-LT__SURGE EQU $24
-ERIKA EQU $25
-KOGA EQU $26
-BLAINE EQU $27
-SABRINA EQU $28
-GENTLEMAN EQU $29
-SONY2 EQU $2A
-SONY3 EQU $2B
-LORELEI EQU $2C
-CHANNELER EQU $2D
-AGATHA EQU $2E
-LANCE EQU $2F
+const_value = 1
+
+ const YOUNGSTER ; $01
+ const BUG_CATCHER ; $02
+ const LASS ; $03
+ const SAILOR ; $04
+ const JR__TRAINER_M ; $05
+ const JR__TRAINER_F ; $06
+ const POKEMANIAC ; $07
+ const SUPER_NERD ; $08
+ const HIKER ; $09
+ const BIKER ; $0A
+ const BURGLAR ; $0B
+ const ENGINEER ; $0C
+ const JUGGLER_X ; $0D
+ const FISHER ; $0E
+ const SWIMMER ; $0F
+ const CUE_BALL ; $10
+ const GAMBLER ; $11
+ const BEAUTY ; $12
+ const PSYCHIC_TR ; $13
+ const ROCKER ; $14
+ const JUGGLER ; $15
+ const TAMER ; $16
+ const BIRD_KEEPER ; $17
+ const BLACKBELT ; $18
+ const SONY1 ; $19
+ const PROF_OAK ; $1A
+ const CHIEF ; $1B
+ const SCIENTIST ; $1C
+ const GIOVANNI ; $1D
+ const ROCKET ; $1E
+ const COOLTRAINER_M ; $1F
+ const COOLTRAINER_F ; $20
+ const BRUNO ; $21
+ const BROCK ; $22
+ const MISTY ; $23
+ const LT__SURGE ; $24
+ const ERIKA ; $25
+ const KOGA ; $26
+ const BLAINE ; $27
+ const SABRINA ; $28
+ const GENTLEMAN ; $29
+ const SONY2 ; $2A
+ const SONY3 ; $2B
+ const LORELEI ; $2C
+ const CHANNELER ; $2D
+ const AGATHA ; $2E
+ const LANCE ; $2F