Merge pull request #740 from Rangi42/master

Remove enum; add const_skip and const_next

audio/engine.asm

@@ -1364,7 +1364,7 @@ ParseMusicCommand:
 	jp hl
 
 MusicCommands:
-; entries correspond to macros/scripts/audio.asm enumeration
+; entries correspond to audio constants (see macros/scripts/audio.asm)
 	dw Music_Octave8 ; octave 8
 	dw Music_Octave7 ; octave 7
 	dw Music_Octave6 ; octave 6

constants/battle_anim_constants.asm

@@ -17,13 +17,7 @@
 	const BATTLEANIMSTRUCT_ANON_JT_INDEX
 	const BATTLEANIMSTRUCT_0F
 	const BATTLEANIMSTRUCT_10
-	const BATTLEANIMSTRUCT_11
+	const_skip 7
-	const BATTLEANIMSTRUCT_12
-	const BATTLEANIMSTRUCT_13
-	const BATTLEANIMSTRUCT_14
-	const BATTLEANIMSTRUCT_15
-	const BATTLEANIMSTRUCT_16
-	const BATTLEANIMSTRUCT_17
 BATTLEANIMSTRUCT_LENGTH EQU const_value
 NUM_ANIM_OBJECTS EQU 10 ; see wActiveAnimObjects
 

constants/battle_constants.asm

@@ -162,59 +162,60 @@ SLP EQU %111 ; 0-7 turns
 ALL_STATUS EQU (1 << PSN) | (1 << BRN) | (1 << FRZ) | (1 << PAR) | SLP
 
 ; wPlayerSubStatus1 or wEnemySubStatus1 bit flags
-	enum_start 7, -1
+	const_def
-	enum SUBSTATUS_IN_LOVE
+	const SUBSTATUS_NIGHTMARE
-	enum SUBSTATUS_ROLLOUT
+	const SUBSTATUS_CURSE
-	enum SUBSTATUS_ENDURE
+	const SUBSTATUS_PROTECT
-	enum SUBSTATUS_PERISH
+	const SUBSTATUS_IDENTIFIED
-	enum SUBSTATUS_IDENTIFIED
+	const SUBSTATUS_PERISH
-	enum SUBSTATUS_PROTECT
+	const SUBSTATUS_ENDURE
-	enum SUBSTATUS_CURSE
+	const SUBSTATUS_ROLLOUT
-	enum SUBSTATUS_NIGHTMARE
+	const SUBSTATUS_IN_LOVE
 
 ; wPlayerSubStatus2 or wEnemySubStatus2 bit flags
-SUBSTATUS_CURLED EQU 0
+	const_def
+	const SUBSTATUS_CURLED
 
 ; wPlayerSubStatus3 or wEnemySubStatus3 bit flags
-	enum_start 7, -1
+	const_def
-	enum SUBSTATUS_CONFUSED
+	const SUBSTATUS_BIDE
-	enum SUBSTATUS_FLYING
+	const SUBSTATUS_RAMPAGE
-	enum SUBSTATUS_UNDERGROUND
+	const SUBSTATUS_IN_LOOP
-	enum SUBSTATUS_CHARGED
+	const SUBSTATUS_FLINCHED
-	enum SUBSTATUS_FLINCHED
+	const SUBSTATUS_CHARGED
-	enum SUBSTATUS_IN_LOOP
+	const SUBSTATUS_UNDERGROUND
-	enum SUBSTATUS_RAMPAGE
+	const SUBSTATUS_FLYING
-	enum SUBSTATUS_BIDE
+	const SUBSTATUS_CONFUSED
 
 ; wPlayerSubStatus4 or wEnemySubStatus4 bit flags
-	enum_start 7, -1
+	const_def
-	enum SUBSTATUS_LEECH_SEED
+	const SUBSTATUS_X_ACCURACY
-	enum SUBSTATUS_RAGE
+	const SUBSTATUS_MIST
-	enum SUBSTATUS_RECHARGE
+	const SUBSTATUS_FOCUS_ENERGY
-	enum SUBSTATUS_SUBSTITUTE
+	const_skip
-	enum SUBSTATUS_UNKNOWN_1
+	const SUBSTATUS_SUBSTITUTE
-	enum SUBSTATUS_FOCUS_ENERGY
+	const SUBSTATUS_RECHARGE
-	enum SUBSTATUS_MIST
+	const SUBSTATUS_RAGE
-	enum SUBSTATUS_X_ACCURACY
+	const SUBSTATUS_LEECH_SEED
 
 ; wPlayerSubStatus5 or wEnemySubStatus5 bit flags
-	enum_start 7, -1
+	const_def
-	enum SUBSTATUS_CANT_RUN
+	const SUBSTATUS_TOXIC
-	enum SUBSTATUS_DESTINY_BOND
+	const_skip
-	enum SUBSTATUS_LOCK_ON
+	const_skip
-	enum SUBSTATUS_ENCORED
+	const SUBSTATUS_TRANSFORMED
-	enum SUBSTATUS_TRANSFORMED
+	const SUBSTATUS_ENCORED
-	enum SUBSTATUS_UNKNOWN_2
+	const SUBSTATUS_LOCK_ON
-	enum SUBSTATUS_UNKNOWN_3
+	const SUBSTATUS_DESTINY_BOND
-	enum SUBSTATUS_TOXIC
+	const SUBSTATUS_CANT_RUN
 
 ; wPlayerScreens or wEnemyScreens bit flags
-	enum_start 4, -1
+	const_def
-	enum SCREENS_REFLECT
+	const SCREENS_SPIKES
-	enum SCREENS_LIGHT_SCREEN
+	const_skip
-	enum SCREENS_SAFEGUARD
+	const SCREENS_SAFEGUARD
-	enum SCREENS_UNUSED
+	const SCREENS_LIGHT_SCREEN
-	enum SCREENS_SPIKES
+	const SCREENS_REFLECT
 
 ; values in wBattleWeather
 	const_def
@@ -238,9 +239,9 @@ SUBSTATUS_CURLED EQU 0
 	const BATTLEACTION_SWITCH4
 	const BATTLEACTION_SWITCH5
 	const BATTLEACTION_SWITCH6
-	const BATTLEACTION_A
+	const_skip
-	const BATTLEACTION_B
+	const_skip
-	const BATTLEACTION_C
+	const_skip
 	const BATTLEACTION_SKIPTURN
 	const BATTLEACTION_STRUGGLE
 	const BATTLEACTION_FORFEIT

constants/credits_constants.asm

@@ -105,11 +105,11 @@
 	const PAAD_TESTING
 
 ; CreditsScript indexes (see data/credits_script.asm)
-	const_def -7
+	const_def -1, -1
-	const CREDITS_THEEND
-	const CREDITS_WAIT2
-	const CREDITS_MUSIC
-	const CREDITS_CLEAR
-	const CREDITS_SCENE
-	const CREDITS_WAIT
 	const CREDITS_END
+	const CREDITS_WAIT
+	const CREDITS_SCENE
+	const CREDITS_CLEAR
+	const CREDITS_MUSIC
+	const CREDITS_WAIT2
+	const CREDITS_THEEND

constants/deco_constants.asm

@@ -1,5 +1,5 @@
 ; decoration types
-const_value = 1
+	const_def 1
 	const DECO_PLANT
 	const DECO_BED
 	const DECO_CARPET
@@ -8,7 +8,7 @@ const_value = 1
 	const DECO_BIGDOLL
 
 ; DecorationNames indexes (see data/decorations/names.asm)
-const_value = 1
+	const_def 1
 	const PUT_IT_AWAY
 	const MAGNAPLANT
 	const TROPICPLANT
@@ -36,7 +36,7 @@ const_value = 1
 	const GREEN_CARPET
 
 ; DoDecorationAction2.DecoActions indexes (see engine/overworld/decorations.asm)
-const_value = 1
+	const_def 1
 	const SET_UP_BED
 	const PUT_AWAY_BED
 	const SET_UP_CARPET
@@ -54,16 +54,18 @@ const_value = 1
 	const SET_UP_ORNAMENT
 	const PUT_AWAY_ORNAMENT
 
+__deco_value__ = 0
+
 deco: MACRO
 	const DECO_\1
-	enum DECOFLAG_\1
+DECOFLAG_\1 EQU __deco_value__
+__deco_value__ = __deco_value__ + 1
 ENDM
 
 ; decorations:
 ; - DecorationAttributes (see data/decorations/attributes.asm)
 ; - DecorationIDs (see data/decorations/decorations.asm)
 	const_def 1
-	enum_start
 ; FindOwnedBeds.beds values (see engine/overworld/decorations.asm)
 	const BEDS
 	deco  FEATHERY_BED
@@ -121,7 +123,7 @@ ENDM
 	deco  GEODUDE_DOLL
 	deco  MACHOP_DOLL
 	deco  TENTACOOL_DOLL
-NUM_NON_TROPHY_DECOS EQU __enum__
+NUM_NON_TROPHY_DECOS EQU __deco_value__
 	deco  GOLD_TROPHY_DOLL
 	deco  SILVER_TROPHY_DOLL
-NUM_DECOS EQU __enum__
+NUM_DECOS EQU __deco_value__

constants/item_constants.asm

@@ -197,6 +197,8 @@
 	const MIRAGE_MAIL  ; bd
 	const ITEM_BE      ; be
 
+__tmhm_value__ = 1
+
 add_tm: MACRO
 ; Defines three constants:
 ; - TM_\1: the item id, starting at $bf
@@ -205,17 +207,17 @@ add_tm: MACRO
 ; The first usage also defines TM01 as the first TM item id.
 if !DEF(TM01)
 TM01 EQU const_value
-	enum_start 1
 endc
-if __enum__ < 10
+if __tmhm_value__ < 10
-MOVE_FOR_TM EQUS "TM0{d:__enum__}_MOVE"
+MOVE_FOR_TM EQUS "TM0{d:__tmhm_value__}_MOVE"
 else
-MOVE_FOR_TM EQUS "TM{d:__enum__}_MOVE"
+MOVE_FOR_TM EQUS "TM{d:__tmhm_value__}_MOVE"
 endc
 MOVE_FOR_TM = \1
 PURGE MOVE_FOR_TM
 	const TM_\1
-	enum \1_TMNUM
+\1_TMNUM EQU __tmhm_value__
+__tmhm_value__ = __tmhm_value__ + 1
 ENDM
 
 ; see data/moves/tmhm_moves.asm for moves
@@ -271,7 +273,7 @@ ENDM
 	add_tm FIRE_PUNCH   ; f0
 	add_tm FURY_CUTTER  ; f1
 	add_tm NIGHTMARE    ; f2
-NUM_TMS EQU __enum__ - 1
+NUM_TMS EQU __tmhm_value__ - 1
 
 add_hm: MACRO
 ; Defines three constants:
@@ -282,7 +284,7 @@ add_hm: MACRO
 if !DEF(HM01)
 HM01 EQU const_value
 endc
-HM_VALUE EQU __enum__ - NUM_TMS
+HM_VALUE EQU __tmhm_value__ - NUM_TMS
 if HM_VALUE < 10
 MOVE_FOR_HM EQUS "HM0{d:HM_VALUE}_MOVE"
 else
@@ -292,7 +294,8 @@ MOVE_FOR_HM = \1
 PURGE MOVE_FOR_HM
 PURGE HM_VALUE
 	const HM_\1
-	enum \1_TMNUM
+\1_TMNUM EQU __tmhm_value__
+__tmhm_value__ = __tmhm_value__ + 1
 ENDM
 
 	add_hm CUT          ; f3
@@ -302,13 +305,13 @@ ENDM
 	add_hm FLASH        ; f7
 	add_hm WHIRLPOOL    ; f8
 	add_hm WATERFALL    ; f9
-NUM_HMS EQU __enum__ - NUM_TMS - 1
+NUM_HMS EQU __tmhm_value__ - NUM_TMS - 1
 
 add_mt: MACRO
 ; Defines two constants:
 ; - \1_TMNUM: the learnable TM/HM flag, starting at 58
 ; - MT##_MOVE: alias for the move id, equal to the value of \1
-MT_VALUE EQU __enum__ - NUM_TMS - NUM_HMS
+MT_VALUE EQU __tmhm_value__ - NUM_TMS - NUM_HMS
 if MT_VALUE < 10
 MOVE_FOR_MT EQUS "MT0{d:MT_VALUE}_MOVE"
 else
@@ -317,15 +320,16 @@ endc
 MOVE_FOR_MT = \1
 PURGE MOVE_FOR_MT
 PURGE MT_VALUE
-	enum \1_TMNUM
+\1_TMNUM EQU __tmhm_value__
+__tmhm_value__ = __tmhm_value__ + 1
 ENDM
 
 	add_mt FLAMETHROWER
 	add_mt THUNDERBOLT
 	add_mt ICE_BEAM
-NUM_TUTORS = __enum__ - NUM_TMS - NUM_HMS - 1
+NUM_TUTORS = __tmhm_value__ - NUM_TMS - NUM_HMS - 1
 
-NUM_TM_HM_TUTOR EQU __enum__ - 1
+NUM_TM_HM_TUTOR EQU __tmhm_value__ - 1
 
 	const ITEM_FA       ; fa
 

constants/item_data_constants.asm

@@ -1,6 +1,6 @@
 ; item_attributes struct members (see data/items/attributes.asm)
 	const_def
-	const ITEMATTR_PRICE
+	const ITEMATTR_PRICE_LO
 	const ITEMATTR_PRICE_HI
 	const ITEMATTR_EFFECT
 	const ITEMATTR_PARAM
@@ -19,10 +19,12 @@ ITEMATTR_STRUCT_LENGTH EQU const_value
 ; item menu types
 ; UseItem.dw indexes (see engine/items/pack.asm)
 ; UseRegisteredItem.SwitchTo indexes (see engine/overworld/select_menu.asm)
-ITEMMENU_NOUSE   EQU 0
+	const_def
-ITEMMENU_CURRENT EQU 4
+	const ITEMMENU_NOUSE   ; 0
-ITEMMENU_PARTY   EQU 5
+	const_skip 3
-ITEMMENU_CLOSE   EQU 6
+	const ITEMMENU_CURRENT ; 4
+	const ITEMMENU_PARTY   ; 5
+	const ITEMMENU_CLOSE   ; 6
 
 ; item actions
 CANT_SELECT_F EQU 6
@@ -57,13 +59,13 @@ MAIL_STRUCT_LENGTH EQU $2f ; mailmsg struct
 	const HELD_BERRY
 	const HELD_2
 	const HELD_LEFTOVERS
-	const HELD_4
+	const_skip
 	const HELD_5
 	const HELD_RESTORE_PP
-	const HELD_7
+	const_skip
 	const HELD_CLEANSE_TAG
 
-	const_def 10
+	const_next 10
 	const HELD_HEAL_POISON
 	const HELD_HEAL_FREEZE
 	const HELD_HEAL_BURN
@@ -72,7 +74,7 @@ MAIL_STRUCT_LENGTH EQU $2f ; mailmsg struct
 	const HELD_HEAL_STATUS
 	const HELD_HEAL_CONFUSION
 
-	const_def 20
+	const_next 20
 	const HELD_PREVENT_POISON
 	const HELD_PREVENT_BURN
 	const HELD_PREVENT_FREEZE
@@ -80,7 +82,7 @@ MAIL_STRUCT_LENGTH EQU $2f ; mailmsg struct
 	const HELD_PREVENT_PARALYZE
 	const HELD_PREVENT_CONFUSE
 
-	const_def 30
+	const_next 30
 	const HELD_30
 	const HELD_ATTACK_UP
 	const HELD_DEFENSE_UP
@@ -91,12 +93,12 @@ MAIL_STRUCT_LENGTH EQU $2f ; mailmsg struct
 	const HELD_EVASION_UP
 	const HELD_38
 
-	const_def 40
+	const_next 40
-	const HELD_40
+	const_skip
-	const HELD_41
+	const_skip
 	const HELD_METAL_POWDER
 
-	const_def 50
+	const_next 50
 	const HELD_NORMAL_BOOST
 	const HELD_FIGHTING_BOOST
 	const HELD_FLYING_BOOST
@@ -115,7 +117,7 @@ MAIL_STRUCT_LENGTH EQU $2f ; mailmsg struct
 	const HELD_DARK_BOOST
 	const HELD_STEEL_BOOST
 
-	const_def 70
+	const_next 70
 	const HELD_CATCH_CHANCE
 	const HELD_71
 	const HELD_ESCAPE
@@ -124,5 +126,5 @@ MAIL_STRUCT_LENGTH EQU $2f ; mailmsg struct
 	const HELD_FLINCH
 	const HELD_AMULET_COIN
 	const HELD_BRIGHTPOWDER
-	const HELD_78
+	const_skip
 	const HELD_FOCUS_BAND

constants/map_constants.asm

@@ -1,6 +1,6 @@
 newgroup: MACRO
 const_value = const_value + 1
-	enum_start 1
+__map_value__ = 1
 ENDM
 
 map_const: MACRO
@@ -8,7 +8,8 @@ map_const: MACRO
 ;\2: width: in blocks
 ;\3: height: in blocks
 GROUP_\1 EQU const_value
-	enum MAP_\1
+MAP_\1 EQU __map_value__
+__map_value__ = __map_value__ + 1
 \1_WIDTH EQU \2
 \1_HEIGHT EQU \3
 ENDM

constants/map_object_constants.asm

@@ -33,8 +33,8 @@
 	const OBJECT_1E                  ; 1e
 	const OBJECT_1F                  ; 1f
 	const OBJECT_RANGE               ; 20
-	; 21-27 are not used
+	const_skip 7
-OBJECT_LENGTH EQU 40
+OBJECT_LENGTH EQU const_value
 NUM_OBJECT_STRUCTS EQU 13 ; see wObjectStructs
 
 ; object_struct OBJECT_FACING values
@@ -99,21 +99,20 @@ ABSOLUTE_TILE_ID    EQU 1 << ABSOLUTE_TILE_ID_F
 ; map_object struct members (see macros/wram.asm)
 	const_def
 	const MAPOBJECT_OBJECT_STRUCT_ID ; 0
-	const MAPOBJECT_SPRITE ; 1
+	const MAPOBJECT_SPRITE           ; 1
-	const MAPOBJECT_Y_COORD ; 2
+	const MAPOBJECT_Y_COORD          ; 2
-	const MAPOBJECT_X_COORD ; 3
+	const MAPOBJECT_X_COORD          ; 3
-	const MAPOBJECT_MOVEMENT ; 4
+	const MAPOBJECT_MOVEMENT         ; 4
-	const MAPOBJECT_RADIUS ; 5
+	const MAPOBJECT_RADIUS           ; 5
-	const MAPOBJECT_HOUR ; 6
+	const MAPOBJECT_HOUR             ; 6
-	const MAPOBJECT_TIMEOFDAY ; 7
+	const MAPOBJECT_TIMEOFDAY        ; 7
-	const MAPOBJECT_COLOR ; 8
+	const MAPOBJECT_COLOR            ; 8
-	const MAPOBJECT_RANGE ; 9
+	const MAPOBJECT_RANGE            ; 9
-	const MAPOBJECT_SCRIPT_POINTER ; a
+	const MAPOBJECT_SCRIPT_POINTER   ; a
-	const MAPOBJECT_POINTER_HI ; b
+	const_skip ; high MAPOBJECT_SCRIPT_POINTER byte
-	const MAPOBJECT_EVENT_FLAG ; c
+	const MAPOBJECT_EVENT_FLAG       ; c
-	const MAPOBJECT_FLAG_HI ; d
+	const_skip ; high MAPOBJECT_EVENT_FLAG byte
-	const MAPOBJECT_E ; unused
+	const_skip 2 ; unused
-	const MAPOBJECT_F ; unused
 MAPOBJECT_LENGTH EQU const_value
 
 ; SpriteMovementData struct members (see data/sprites/map_objects.asm)

constants/menu_constants.asm

@@ -87,7 +87,7 @@ HMENURETURN_ASM    EQU %11111111
 	const PARTYMENUACTION_GIVE_ITEM
 	const PARTYMENUACTION_MOBILE ; mobile
 ; PrintPartyMenuActionText arguments (see engine/pokemon/party_menu.asm)
-	const_def $f0
+	const_next $f0
 	const PARTYMENUTEXT_HEAL_PSN
 	const PARTYMENUTEXT_HEAL_BRN
 	const PARTYMENUTEXT_HEAL_FRZ

constants/move_constants.asm

@@ -259,11 +259,8 @@
 	const BEAT_UP      ; fb
 NUM_ATTACKS EQU const_value - 1
 
-	const MOVE_OR_ANIM_FC ; fc
-	const MOVE_OR_ANIM_FD ; fd
-	const MOVE_OR_ANIM_FE ; fe
-
 ; Battle animations use the same constants as the moves up to this point
+	const_next $ff
 	const ANIM_SWEET_SCENT_2     ; ff
 	const ANIM_THROW_POKE_BALL   ; 100
 	const ANIM_SEND_OUT_MON      ; 101

constants/phone_constants.asm

@@ -8,9 +8,9 @@
 	const PHONE_SCHOOLBOY_JACK
 	const PHONE_POKEFAN_BEVERLY
 	const PHONE_SAILOR_HUEY
-	const PHONE_08
+	const_skip
-	const PHONE_09
+	const_skip
-	const PHONE_0A
+	const_skip
 	const PHONE_COOLTRAINERM_GAVEN
 	const PHONE_COOLTRAINERF_BETH
 	const PHONE_BIRDKEEPER_JOSE
@@ -25,7 +25,7 @@
 	const PHONE_JUGGLER_IRWIN
 	const PHONE_BUG_CATCHER_ARNIE
 	const PHONE_SCHOOLBOY_ALAN
-	const PHONE_19
+	const_skip
 	const PHONE_LASS_DANA
 	const PHONE_SCHOOLBOY_CHAD
 	const PHONE_POKEFANM_DEREK
@@ -59,12 +59,12 @@
 	const PHONE_CONTACT_MAP_NUMBER
 	const PHONE_CONTACT_SCRIPT1_TIME
 	const PHONE_CONTACT_SCRIPT1_BANK
-	const PHONE_CONTACT_SCRIPT1_ADDR_LO
+	const PHONE_CONTACT_SCRIPT1_ADDR
-	const PHONE_CONTACT_SCRIPT1_ADDR_HI
+	const_skip ; high PHONE_CONTACT_SCRIPT1_ADDR byte
 	const PHONE_CONTACT_SCRIPT2_TIME
 	const PHONE_CONTACT_SCRIPT2_BANK
-	const PHONE_CONTACT_SCRIPT2_ADDR_LO
+	const PHONE_CONTACT_SCRIPT2_ADDR
-	const PHONE_CONTACT_SCRIPT2_ADDR_HI
+	const_skip ; high PHONE_CONTACT_SCRIPT2_ADDR byte
 PHONE_CONTACT_SIZE EQU const_value
 
 ; maximum number of pokegear contacts

constants/pokemon_constants.asm

@@ -272,9 +272,8 @@ JOHTO_POKEMON EQU const_value
 	const HO_OH      ; fa
 	const CELEBI     ; fb
 NUM_POKEMON EQU const_value - 1
-	const MON_FC     ; fc
+	const_skip       ; fc
 	const EGG        ; fd
-	const MON_FE     ; fe
 
 ; Unown forms
 ; indexes for:

constants/sprite_constants.asm

@@ -106,7 +106,7 @@
 	const SPRITE_STANDING_YOUNGSTER ; 66
 
 ; SpriteMons indexes (see data/sprites/sprite_mons.asm)
-	const_def $80
+	const_next $80
 SPRITE_POKEMON EQU const_value
 	const SPRITE_UNOWN ; 80
 	const SPRITE_GEODUDE ; 81
@@ -145,12 +145,12 @@ SPRITE_POKEMON EQU const_value
 	const SPRITE_HO_OH ; a2
 
 ; special GetMonSprite values (see engine/overworld/overworld.asm)
-	const_def $e0
+	const_next $e0
 	const SPRITE_DAY_CARE_MON_1 ; e0
 	const SPRITE_DAY_CARE_MON_2 ; e1
 
 ; wVariableSprites indexes (see wram.asm)
-	const_def $f0
+	const_next $f0
 SPRITE_VARS EQU const_value
 	const SPRITE_CONSOLE ; f0
 	const SPRITE_DOLL_1 ; f1

constants/sprite_data_constants.asm

@@ -1,7 +1,7 @@
 ; overworld_sprite struct members (see data/sprites.asm)
 	const_def
 	const SPRITEDATA_ADDR    ; 0
-	const SPRITEDATA_ADDR_HI ; 1
+	const_skip ; high SPRITEDATA_ADDR byte
 	const SPRITEDATA_SIZE    ; 2
 	const SPRITEDATA_BANK    ; 3
 	const SPRITEDATA_TYPE    ; 4

constants/trainer_constants.asm

@@ -1,5 +1,8 @@
+__trainer_class__ = 0
+
 trainerclass: MACRO
-	enum \1
+\1 EQU __trainer_class__
+__trainer_class__ = __trainer_class__ + 1
 const_value = 1
 ENDM
 
@@ -15,8 +18,7 @@ ENDM
 ; - BTTrainerClassSprites (see data/trainers/sprites.asm)
 ; - BTTrainerClassGenders (see data/trainers/genders.asm)
 ; trainer constants are Trainers indexes, for the sub-tables of TrainerGroups (see data/trainers/parties.asm)
-	enum_start
+CHRIS EQU __trainer_class__
-CHRIS EQU __enum__
 	trainerclass TRAINER_NONE ; 0
 	const PHONECONTACT_MOM
 	const PHONECONTACT_BIKESHOP
@@ -24,7 +26,7 @@ CHRIS EQU __enum__
 	const PHONECONTACT_ELM
 	const PHONECONTACT_BUENA
 
-KRIS EQU __enum__
+KRIS EQU __trainer_class__
 	trainerclass FALKNER ; 1
 	const FALKNER1
 
@@ -700,4 +702,4 @@ KRIS EQU __enum__
 	trainerclass MYSTICALMAN ; 43
 	const EUSINE
 
-NUM_TRAINER_CLASSES EQU __enum__
+NUM_TRAINER_CLASSES EQU __trainer_class__

constants/trainer_data_constants.asm

@@ -4,16 +4,14 @@
 	const TRNATTR_ITEM2           ; 1
 	const TRNATTR_BASEMONEY       ; 2
 	const TRNATTR_AI_MOVE_WEIGHTS ; 3
-	const TRNATTR_AI2             ; 4
+	const_skip ; high TRNATTR_AI_MOVE_WEIGHTS byte
 	const TRNATTR_AI_ITEM_SWITCH  ; 5
-	const TRNATTR_AI4             ; 6
+	const_skip ; high TRNATTR_AI_ITEM_SWITCH byte
 NUM_TRAINER_ATTRIBUTES EQU const_value
 
 ; TRNATTR_AI_MOVE_WEIGHTS bit flags (wEnemyTrainerAIFlags)
 ; AIScoringPointers indexes (see engine/battle/ai/move.asm)
 	const_def
-	const       NO_AI
-const_value = 0
 	shift_const AI_BASIC
 	shift_const AI_SETUP
 	shift_const AI_TYPES
@@ -24,27 +22,24 @@ const_value = 0
 	shift_const AI_CAUTIOUS
 	shift_const AI_STATUS
 	shift_const AI_RISKY
-	shift_const AI_10
+NO_AI EQU 0
-	shift_const AI_11
-	shift_const AI_12
-	shift_const AI_13
-	shift_const AI_14
-	shift_const AI_15
 
 ; TRNATTR_AI_ITEM_SWITCH bit flags
-CONTEXT_USE_F      EQU 6
+	const_def
-UNKNOWN_USE_F      EQU 5
+	const SWITCH_OFTEN_F     ; 0
-ALWAYS_USE_F       EQU 4
+	const SWITCH_RARELY_F    ; 1
-SWITCH_SOMETIMES_F EQU 2
+	const SWITCH_SOMETIMES_F ; 2
-SWITCH_RARELY_F    EQU 1
+	const_skip               ; 3
-SWITCH_OFTEN_F     EQU 0
+	const ALWAYS_USE_F       ; 4
+	const UNKNOWN_USE_F      ; 5
+	const CONTEXT_USE_F      ; 6
 
-CONTEXT_USE        EQU 1 << CONTEXT_USE_F
-UNKNOWN_USE        EQU 1 << UNKNOWN_USE_F
-ALWAYS_USE         EQU 1 << ALWAYS_USE_F
-SWITCH_SOMETIMES   EQU 1 << SWITCH_SOMETIMES_F
-SWITCH_RARELY      EQU 1 << SWITCH_RARELY_F
 SWITCH_OFTEN       EQU 1 << SWITCH_OFTEN_F
+SWITCH_RARELY      EQU 1 << SWITCH_RARELY_F
+SWITCH_SOMETIMES   EQU 1 << SWITCH_SOMETIMES_F
+ALWAYS_USE         EQU 1 << ALWAYS_USE_F
+UNKNOWN_USE        EQU 1 << UNKNOWN_USE_F
+CONTEXT_USE        EQU 1 << CONTEXT_USE_F
 
 ; TrainerTypes indexes (see engine/battle/read_trainer_party.asm)
 	const_def

constants/type_constants.asm

@@ -19,15 +19,7 @@ PHYSICAL EQU const_value
 	const STEEL
 
 UNUSED_TYPES EQU const_value
-	const TYPE_10
+	const_next 19
-	const TYPE_11
-	const TYPE_12
-	const TYPE_13
-	const TYPE_14
-	const TYPE_15
-	const TYPE_16
-	const TYPE_17
-	const TYPE_18
 	const CURSE_TYPE
 UNUSED_TYPES_END EQU const_value
 

data/moves/tmhm_moves.asm

@@ -2,7 +2,7 @@
 ; define constants for the item IDs and for the corresponding move values.
 
 TMHMMoves:
-; entries correspond to *_TMNUM enums (see constants/item_constants.asm)
+; entries correspond to *_TMNUM constants (see constants/item_constants.asm)
 
 ; TMs
 n = 1