summaryrefslogtreecommitdiff
path: root/constants
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2020-10-23 20:39:20 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2020-10-26 20:30:09 -0400
commit46f6cc4d41494c044f1091491c712afc2a5bfd3a (patch)
treefee103b542f99af23954d6610029b481e8f6742b /constants
parent26ddba8cfd8f035c06bd6419b64a6c4d7dbc226f (diff)
Comment, remove, or revise many unreferenced labels
Diffstat (limited to 'constants')
-rw-r--r--constants/map_constants.asm2
-rw-r--r--constants/map_data_constants.asm2
-rw-r--r--constants/pokemon_data_constants.asm3
-rw-r--r--constants/trainer_constants.asm2
4 files changed, 4 insertions, 5 deletions
diff --git a/constants/map_constants.asm b/constants/map_constants.asm
index 33b1e25b..9e80b883 100644
--- a/constants/map_constants.asm
+++ b/constants/map_constants.asm
@@ -1,5 +1,5 @@
newgroup: MACRO
-const_value = const_value + 1
+ const_skip
__map_value__ = 1
ENDM
diff --git a/constants/map_data_constants.asm b/constants/map_data_constants.asm
index 386d7229..1679e6cd 100644
--- a/constants/map_data_constants.asm
+++ b/constants/map_data_constants.asm
@@ -66,7 +66,7 @@ NUM_MAP_PALETTES EQU const_value
shift_const NORTH
; SpawnPoints indexes (see data/maps/spawn_points.asm)
-const_value = -1
+ const_def -1
const SPAWN_N_A
const SPAWN_HOME
const SPAWN_DEBUG
diff --git a/constants/pokemon_data_constants.asm b/constants/pokemon_data_constants.asm
index 7729161e..6946b692 100644
--- a/constants/pokemon_data_constants.asm
+++ b/constants/pokemon_data_constants.asm
@@ -160,7 +160,7 @@ NUM_TREEMON_SETS EQU const_value
const TREEMON_SCORE_RARE ; 2
; ChangeHappiness arguments (see data/happiness_changes.asm)
-const_value = 1
+ const_def 1
const HAPPINESS_GAINLEVEL ; 01
const HAPPINESS_USEDITEM ; 02
const HAPPINESS_USEDXITEM ; 03
@@ -179,7 +179,6 @@ const_value = 1
const HAPPINESS_ENERGYROOT ; 10
const HAPPINESS_REVIVALHERB ; 11
const HAPPINESS_GROOMING ; 12
- const HAPPINESS_GAINLEVELATHOME ; 13
; significant happiness values
BASE_HAPPINESS EQU 70
diff --git a/constants/trainer_constants.asm b/constants/trainer_constants.asm
index deb8791a..3e685928 100644
--- a/constants/trainer_constants.asm
+++ b/constants/trainer_constants.asm
@@ -3,7 +3,7 @@ __trainer_class__ = 0
trainerclass: MACRO
\1 EQU __trainer_class__
__trainer_class__ = __trainer_class__ + 1
-const_value = 1
+ const_def 1
ENDM
; trainer class ids