summaryrefslogtreecommitdiff
path: root/constants
diff options
context:
space:
mode:
Diffstat (limited to 'constants')
-rw-r--r--constants/battle_anim_constants.asm4
-rw-r--r--constants/battle_constants.asm6
-rwxr-xr-xconstants/battle_tower_constants.asm2
-rw-r--r--constants/credits_constants.asm2
-rw-r--r--constants/item_data_constants.asm14
-rw-r--r--constants/map_data_constants.asm2
-rw-r--r--constants/map_setup_constants.asm4
-rw-r--r--constants/menu_constants.asm8
-rw-r--r--constants/pokemon_constants.asm4
-rw-r--r--constants/pokemon_data_constants.asm8
-rwxr-xr-xconstants/printer_constants.asm2
-rw-r--r--constants/script_constants.asm6
-rw-r--r--constants/sprite_constants.asm6
-rw-r--r--constants/sprite_data_constants.asm4
-rw-r--r--constants/text_constants.asm4
-rw-r--r--constants/tileset_constants.asm2
-rw-r--r--constants/wram_constants.asm4
17 files changed, 41 insertions, 41 deletions
diff --git a/constants/battle_anim_constants.asm b/constants/battle_anim_constants.asm
index c55d4e9d6..58e19462e 100644
--- a/constants/battle_anim_constants.asm
+++ b/constants/battle_anim_constants.asm
@@ -708,7 +708,7 @@ BATTLEANIMSTRUCT_LENGTH EQU const_value
const BATTLEANIMOAMSET_D7
; BattleBGEffects indexes (see engine/battle_anims/bg_effects.asm)
-const_value set 1
+ const_def 1
const ANIM_BG_FLASH_INVERTED
const ANIM_BG_FLASH_WHITE
const ANIM_BG_WHITE_HUES
@@ -764,7 +764,7 @@ const_value set 1
const ANIM_BG_35
; AnimObjGFX indexes (see data/battle_anims/object_gfx.asm)
-const_value set 1
+ const_def 1
const ANIM_GFX_HIT
const ANIM_GFX_CUT
const ANIM_GFX_FIRE
diff --git a/constants/battle_constants.asm b/constants/battle_constants.asm
index 6f4f48669..949e28ab4 100644
--- a/constants/battle_constants.asm
+++ b/constants/battle_constants.asm
@@ -55,7 +55,7 @@ MOVE_LENGTH EQU const_value
; indexes for:
; - PlayerStats and EnemyStats (see wram.asm)
; - party_struct and battle_struct members (see macros/wram.asm)
-const_value set 1
+ const_def 1
const STAT_HP
const STAT_ATK
const STAT_DEF
@@ -76,7 +76,7 @@ ATKDEFDV_SHINY EQU $EA
SPDSPCDV_SHINY EQU $AA
; battle classes (wBattleMode values)
-const_value set 1
+ const_def 1
const WILD_BATTLE
const TRAINER_BATTLE
@@ -151,7 +151,7 @@ const_value set 1
; status condition bit flags
SLP EQU %111 ; 0-7 turns
-const_value set 3
+ const_def 3
const PSN
const BRN
const FRZ
diff --git a/constants/battle_tower_constants.asm b/constants/battle_tower_constants.asm
index 71b8de8be..81e1880a0 100755
--- a/constants/battle_tower_constants.asm
+++ b/constants/battle_tower_constants.asm
@@ -47,7 +47,7 @@ BATTLE_TOWER_STRUCT_LENGTH EQU $e0 ; NAME_LENGTH + BATTLETOWER_PARTY_LENGTH * (P
MOBILE_EVENT_OBJECT_GS_BALL EQU $b
; BattleTowerText arguments (see engine/events/battle_tower/trainer_text.asm)
-const_value set 1
+ const_def 1
const BATTLETOWERTEXT_INTRO
const BATTLETOWERTEXT_WIN_TEXT
const BATTLETOWERTEXT_LOSS_TEXT
diff --git a/constants/credits_constants.asm b/constants/credits_constants.asm
index fba7583c0..7b23e11e1 100644
--- a/constants/credits_constants.asm
+++ b/constants/credits_constants.asm
@@ -105,7 +105,7 @@
const PAAD_TESTING
; CreditsScript indexes (see data/credits_script.asm)
-const_value set -7
+ const_def -7
const CREDITS_THEEND
const CREDITS_WAIT2
const CREDITS_MUSIC
diff --git a/constants/item_data_constants.asm b/constants/item_data_constants.asm
index 495469e02..1af3c47ac 100644
--- a/constants/item_data_constants.asm
+++ b/constants/item_data_constants.asm
@@ -10,7 +10,7 @@
ITEMATTR_STRUCT_LENGTH EQU const_value
; item types
-const_value set 1
+ const_def 1
const ITEM ; 1
const KEY_ITEM ; 2
const BALL ; 3
@@ -65,7 +65,7 @@ MAIL_STRUCT_LENGTH EQU $2f ; mailmsg struct
const HELD_7
const HELD_CLEANSE_TAG
-const_value set 10
+ const_def 10
const HELD_HEAL_POISON
const HELD_HEAL_FREEZE
const HELD_HEAL_BURN
@@ -74,7 +74,7 @@ const_value set 10
const HELD_HEAL_STATUS
const HELD_HEAL_CONFUSION
-const_value set 20
+ const_def 20
const HELD_PREVENT_POISON
const HELD_PREVENT_BURN
const HELD_PREVENT_FREEZE
@@ -82,7 +82,7 @@ const_value set 20
const HELD_PREVENT_PARALYZE
const HELD_PREVENT_CONFUSE
-const_value set 30
+ const_def 30
const HELD_30
const HELD_ATTACK_UP
const HELD_DEFENSE_UP
@@ -93,12 +93,12 @@ const_value set 30
const HELD_EVASION_UP
const HELD_38
-const_value set 40
+ const_def 40
const HELD_40
const HELD_41
const HELD_METAL_POWDER
-const_value set 50
+ const_def 50
const HELD_NORMAL_BOOST
const HELD_FIGHTING_BOOST
const HELD_FLYING_BOOST
@@ -117,7 +117,7 @@ const_value set 50
const HELD_DARK_BOOST
const HELD_STEEL_BOOST
-const_value set 70
+ const_def 70
const HELD_CATCH_CHANCE
const HELD_71
const HELD_ESCAPE
diff --git a/constants/map_data_constants.asm b/constants/map_data_constants.asm
index a569aec21..6e5c4b23f 100644
--- a/constants/map_data_constants.asm
+++ b/constants/map_data_constants.asm
@@ -18,7 +18,7 @@ MAP_NONE EQU 0
NUM_MAPDEF_ATTRIBUTES EQU const_value
; map environments (wEnvironment)
-const_value set 1
+ const_def 1
const TOWN
const ROUTE
const INDOOR
diff --git a/constants/map_setup_constants.asm b/constants/map_setup_constants.asm
index d9abd6e9b..a281c8813 100644
--- a/constants/map_setup_constants.asm
+++ b/constants/map_setup_constants.asm
@@ -1,6 +1,6 @@
; hMapEntryMethod values
; MapSetupScripts indexes (see data/maps/setup_scripts.asm)
-const_value set $f1
+ const_def $f1
const MAPSETUP_WARP ; f1
const MAPSETUP_CONTINUE ; f2
const MAPSETUP_RELOADMAP ; f3
@@ -67,7 +67,7 @@ const_value set $f1
map_end EQU -1
; callback types
-const_value set 1
+ const_def 1
const MAPCALLBACK_TILES
const MAPCALLBACK_OBJECTS
const MAPCALLBACK_CMDQUEUE
diff --git a/constants/menu_constants.asm b/constants/menu_constants.asm
index 08f584ff1..f1ca20ae5 100644
--- a/constants/menu_constants.asm
+++ b/constants/menu_constants.asm
@@ -35,8 +35,8 @@
; MonMenuOptions indexes (see data/mon_menu.asm)
; used by PokemonActionSubmenu (see engine/start_menu.asm)
-const_value set 1
-; moves
+ const_def 1
+ ; moves
const MONMENUITEM_CUT ; 1
const MONMENUITEM_FLY ; 2
const MONMENUITEM_SURF ; 3
@@ -51,7 +51,7 @@ const_value set 1
const MONMENUITEM_ROCKSMASH ; 12
const MONMENUITEM_MILKDRINK ; 13
const MONMENUITEM_SWEETSCENT ; 14
-; options
+ ; options
const MONMENUITEM_STATS ; 15
const MONMENUITEM_SWITCH ; 16
const MONMENUITEM_ITEM ; 17
@@ -84,7 +84,7 @@ HMENURETURN_ASM EQU %11111111
const PARTYMENUACTION_GIVE_ITEM
const PARTYMENUACTION_MOBILE ; mobile
; PrintPartyMenuActionText arguments (see engine/party_menu.asm)
-const_value set $f0
+ const_def $f0
const PARTYMENUTEXT_HEAL_PSN
const PARTYMENUTEXT_HEAL_BRN
const PARTYMENUTEXT_HEAL_FRZ
diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm
index 8b3b45100..a72145c54 100644
--- a/constants/pokemon_constants.asm
+++ b/constants/pokemon_constants.asm
@@ -18,7 +18,7 @@
; - BitmasksPointers (see gfx/pokemon/bitmask_pointers.asm)
; - FramesPointers (see gfx/pokemon/frame_pointers.asm)
; - Footprints (see gfx/footprints.asm)
-const_value set 1
+ const_def 1
const BULBASAUR ; 01
const IVYSAUR ; 02
const VENUSAUR ; 03
@@ -284,7 +284,7 @@ NUM_POKEMON EQU const_value +- 1
; - UnownAnimationIdlePointers (see gfx/pokemon/unown_idle_pointers.asm)
; - UnownBitmasksPointers (see gfx/pokemon/unown_bitmask_pointers.asm)
; - UnownFramesPointers (see gfx/pokemon/unown_frame_pointers.asm)
-const_value set 1
+ const_def 1
const UNOWN_A ; 1
const UNOWN_B ; 2
const UNOWN_C ; 3
diff --git a/constants/pokemon_data_constants.asm b/constants/pokemon_data_constants.asm
index 09a5abfd1..1a1cc6ab8 100644
--- a/constants/pokemon_data_constants.asm
+++ b/constants/pokemon_data_constants.asm
@@ -45,7 +45,7 @@ GENDERLESS EQU 255
const SLOW
; BaseEggGroups values
-const_value set 1
+ const_def 1
const MONSTER ; 1
const AMPHIBIAN ; 2
const INSECT ; 3
@@ -131,7 +131,7 @@ NUM_HOF_TEAMS = 30
; evolution types (used in data/pokemon/evos_attacks.asm)
-const_value set 1
+ const_def 1
const EVOLVE_LEVEL
const EVOLVE_ITEM
const EVOLVE_TRADE
@@ -139,13 +139,13 @@ const_value set 1
const EVOLVE_STAT
; EVOLVE_HAPPINESS triggers
-const_value set 1
+ const_def 1
const TR_ANYTIME
const TR_MORNDAY
const TR_NITE
; EVOLVE_STAT triggers
-const_value set 1
+ const_def 1
const ATK_GT_DEF
const ATK_LT_DEF
const ATK_EQ_DEF
diff --git a/constants/printer_constants.asm b/constants/printer_constants.asm
index b6b5da7e7..f0b8b4818 100755
--- a/constants/printer_constants.asm
+++ b/constants/printer_constants.asm
@@ -1,5 +1,5 @@
; wPrinterStatus
-const_value set 1
+ const_def 1
const PRINTER_STATUS_CHECKING
const PRINTER_STATUS_TRANSMITTING
const PRINTER_STATUS_PRINTING
diff --git a/constants/script_constants.asm b/constants/script_constants.asm
index eb7f9b8d6..4ffdb6c16 100644
--- a/constants/script_constants.asm
+++ b/constants/script_constants.asm
@@ -76,7 +76,7 @@ RETVAR_EXECUTE EQU (2 << 6)
; PlayerEventScriptPointers indexes (see engine/events.asm)
-const_value set -1
+ const_def -1
const PLAYEREVENT_MAPSCRIPT
const PLAYEREVENT_NONE
const PLAYEREVENT_SEENBYTRAINER
@@ -168,7 +168,7 @@ EMOTE_MEM EQU -1
; fruittree arguments
; FruitTreeItems indexes (see data/items/fruit_trees.asm)
-const_value set 1
+ const_def 1
const FRUITTREE_ROUTE_29 ; 01
const FRUITTREE_ROUTE_30_1 ; 02
const FRUITTREE_ROUTE_38 ; 03
@@ -275,7 +275,7 @@ NUM_UNOWN_PUZZLES EQU const_value
const UNOWNWORDS_HO_OH ; 3
; MoveTutor writebyte arguments
-const_value set 1
+ const_def 1
const MOVETUTOR_FLAMETHROWER ; 1
const MOVETUTOR_THUNDERBOLT ; 2
const MOVETUTOR_ICE_BEAM ; 3
diff --git a/constants/sprite_constants.asm b/constants/sprite_constants.asm
index 767d7a3c6..cef3dd486 100644
--- a/constants/sprite_constants.asm
+++ b/constants/sprite_constants.asm
@@ -106,7 +106,7 @@
const SPRITE_STANDING_YOUNGSTER ; 66
; SpriteMons indexes (see data/sprites/sprite_mons.asm)
-const_value set $80
+ const_def $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.asm)
-const_value set $e0
+ const_def $e0
const SPRITE_DAY_CARE_MON_1 ; e0
const SPRITE_DAY_CARE_MON_2 ; e1
; VariableSprites indexes (see wram.asm)
-const_value set $f0
+ const_def $f0
SPRITE_VARS EQU const_value
const SPRITE_CONSOLE ; f0
const SPRITE_DOLL_1 ; f1
diff --git a/constants/sprite_data_constants.asm b/constants/sprite_data_constants.asm
index 0ab039efa..329833b1e 100644
--- a/constants/sprite_data_constants.asm
+++ b/constants/sprite_data_constants.asm
@@ -9,7 +9,7 @@
NUM_SPRITEDATA_FIELDS EQU const_value
; sprite types
-const_value set 1
+ const_def 1
const WALKING_SPRITE ; 1
const STANDING_SPRITE ; 2
const STILL_SPRITE ; 3
@@ -27,7 +27,7 @@ const_value set 1
; object_events set bit 3 so as not to use the sprite's default palette
; MapObjectPals indexes (see gfx/overworld/npc_sprites.pal)
-const_value set (1 << 3)
+ const_def 1 << 3
const PAL_NPC_RED ; 8
const PAL_NPC_BLUE ; 9
const PAL_NPC_GREEN ; a
diff --git a/constants/text_constants.asm b/constants/text_constants.asm
index a6052065c..a64039f64 100644
--- a/constants/text_constants.asm
+++ b/constants/text_constants.asm
@@ -9,7 +9,7 @@ TRAINER_CLASS_NAME_LENGTH EQU 13
NAME_LENGTH_JAPANESE EQU 6
; GetName types (see home/names.asm)
-const_value set 1
+ const_def 1
const MON_NAME ; 1
const MOVE_NAME ; 2
const DUMMY_NAME ; 3
@@ -31,7 +31,7 @@ TEXTBOX_Y EQU SCREEN_HEIGHT - TEXTBOX_HEIGHT
TEXTBOX_INNERY EQU TEXTBOX_Y + 2
; PrintNum bit flags
-const_value set 5
+ const_def 5
const PRINTNUM_MONEY_F ; 5
const PRINTNUM_RIGHTALIGN_F ; 6
const PRINTNUM_LEADINGZEROS_F ; 7
diff --git a/constants/tileset_constants.asm b/constants/tileset_constants.asm
index 5fda5bd5b..e89714fee 100644
--- a/constants/tileset_constants.asm
+++ b/constants/tileset_constants.asm
@@ -1,5 +1,5 @@
; Tilesets indexes (see data/tilesets.asm)
-const_value set 1
+ const_def 1
const TILESET_JOHTO ; 01
const TILESET_JOHTO_MODERN ; 02
const TILESET_KANTO ; 03
diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm
index fa8edf232..65af255be 100644
--- a/constants/wram_constants.asm
+++ b/constants/wram_constants.asm
@@ -21,7 +21,7 @@ GAMETIMERPAUSE_TIMER_PAUSED_F EQU 0
GAMETIMERPAUSE_MOBILE_7_F EQU 7
; Options:: ; cfcc
-const_value set 4
+ const_def 4
const NO_TEXT_SCROLL ; 4
const STEREO ; 5
const BATTLE_SHIFT ; 6
@@ -60,7 +60,7 @@ GBPRINTER_DARKEST EQU $7f
const MENU_ACCOUNT ; 0
; WalkingDirection:: ; d043
-const_value set -1
+ const_def -1
const STANDING ; -1
const DOWN ; 0
const UP ; 1