Clean up specials and swarms.

4 files changed, 26 insertions, 36 deletions

diff --git a/constants/engine_flags.asm b/constants/engine_flags.asm
index 4bdadba9..2e23a342 100644
--- a/constants/engine_flags.asm
+++ b/constants/engine_flags.asm
@@ -96,7 +96,7 @@
 ; wDailyFlags1
 	const ENGINE_KURT_MAKING_BALLS
 	const ENGINE_DAILY_BUG_CONTEST ; 50
-	const ENGINE_FISH_SWARM
+	const ENGINE_SWARM
 	const ENGINE_TIME_CAPSULE
 	const ENGINE_ALL_FRUIT_TREES
 	const ENGINE_GOT_SHUCKIE_TODAY
diff --git a/constants/pokemon_data_constants.asm b/constants/pokemon_data_constants.asm
index 9edb9cab..83d5d7b6 100644
--- a/constants/pokemon_data_constants.asm
+++ b/constants/pokemon_data_constants.asm
@@ -19,7 +19,8 @@ BASE_UNKNOWN_1   EQUS "(wBaseUnknown1 - wCurBaseData)"
 BASE_EGG_STEPS   EQUS "(wBaseEggSteps - wCurBaseData)"
 BASE_UNKNOWN_2   EQUS "(wBaseUnknown2 - wCurBaseData)"
 BASE_PIC_SIZE    EQUS "(wBasePicSize - wCurBaseData)"
-BASE_PADDING     EQUS "(wBasePadding - wCurBaseData)"
+BASE_FRONTPIC    EQUS "(wBaseUnusedFrontpic - wCurBaseData)"
+BASE_BACKPIC     EQUS "(wBaseUnusedBackpic - wCurBaseData)"
 BASE_GROWTH_RATE EQUS "(wBaseGrowthRate - wCurBaseData)"
 BASE_EGG_GROUPS  EQUS "(wBaseEggGroups - wCurBaseData)"
 BASE_TMHM        EQUS "(wBaseTMHM - wCurBaseData)"
@@ -70,37 +71,38 @@ MONS_PER_BOX EQU 20
 NUM_BOXES    EQU 14
 
 ; hall of fame
-HOF_MON_LENGTH = 1 + 2 + 2 + 1 + (MON_NAME_LENGTH - 1) ; species, id, dvs, level, nick
-HOF_LENGTH = 1 + HOF_MON_LENGTH * PARTY_LENGTH + 1 ; win count, party, terminator
-NUM_HOF_TEAMS = 30
+HOF_MON_LENGTH EQU 1 + 2 + 2 + 1 + (MON_NAME_LENGTH - 1) ; species, id, dvs, level, nick
+HOF_LENGTH EQU 1 + HOF_MON_LENGTH * PARTY_LENGTH + 1 ; win count, party, terminator
+NUM_HOF_TEAMS EQU 30
 
-; evolution types
-const_value SET 1
+; evolution types (used in data/pokemon/evos_attacks.asm)
+	const_def 1
 	const EVOLVE_LEVEL
 	const EVOLVE_ITEM
 	const EVOLVE_TRADE
 	const EVOLVE_HAPPINESS
 	const EVOLVE_STAT
 
-
-; happiness evolution triggers
-const_value SET 1
+; EVOLVE_HAPPINESS triggers
+	const_def 1
 	const TR_ANYTIME
 	const TR_MORNDAY
 	const TR_NITE
 
-
-; stat evolution triggers
-const_value SET 1
+; EVOLVE_STAT triggers
+	const_def 1
 	const ATK_GT_DEF
 	const ATK_LT_DEF
 	const ATK_EQ_DEF
 
-NUM_GRASSMON EQU 7
-NUM_WATERMON EQU 3
+; wild data
+
+NUM_GRASSMON EQU 7 ; data/wild/*_grass.asm table size
+NUM_WATERMON EQU 3 ; data/wild/*_water.asm table size
 
-GRASS_WILDDATA_LENGTH EQU (NUM_GRASSMON * 2 + 1) * 3 + 2
-WATER_WILDDATA_LENGTH EQU (NUM_WATERMON * 2 + 1) * 1 + 2
+GRASS_WILDDATA_LENGTH EQU 2 + (1 + NUM_GRASSMON * 2) * 3
+WATER_WILDDATA_LENGTH EQU 2 + (1 + NUM_WATERMON * 2) * 1
+FISHGROUP_DATA_LENGTH EQU 1 + 2 * 3
 
 NUM_ROAMMON_MAPS EQU 16 ; RoamMaps table size (see data/wild/roammon_maps.asm)
 
@@ -132,12 +134,12 @@ const_value = 1
 	const HAPPINESS_FAINTED           ; 06
 	const HAPPINESS_POISONFAINT       ; 07
 	const HAPPINESS_BEATENBYSTRONGFOE ; 08
-	const HAPPINESS_YOUNGCUT1         ; 09
-	const HAPPINESS_YOUNGCUT2         ; 0a
-	const HAPPINESS_YOUNGCUT3         ; 0b
-	const HAPPINESS_OLDERCUT1         ; 0c
-	const HAPPINESS_OLDERCUT2         ; 0d
-	const HAPPINESS_OLDERCUT3         ; 0e
+	const HAPPINESS_OLDERCUT1         ; 09
+	const HAPPINESS_OLDERCUT2         ; 0a
+	const HAPPINESS_OLDERCUT3         ; 0b
+	const HAPPINESS_YOUNGCUT1         ; 0c
+	const HAPPINESS_YOUNGCUT2         ; 0d
+	const HAPPINESS_YOUNGCUT3         ; 0e
 	const HAPPINESS_BITTERPOWDER      ; 0f
 	const HAPPINESS_ENERGYROOT        ; 10
 	const HAPPINESS_REVIVALHERB       ; 11
diff --git a/constants/script_constants.asm b/constants/script_constants.asm
index 1d1e962a..49588f84 100644
--- a/constants/script_constants.asm
+++ b/constants/script_constants.asm
@@ -229,18 +229,6 @@ NUM_FRUIT_TREES EQU const_value - 1
 	const DECODESC_BIG_DOLL   ; 3
 	const DECODESC_CONSOLE    ; 4
 
-; swarm arguments
-; StoreSwarmMapIndices arguments
-	const_def
-	const SWARM_DUNSPARCE ; 0
-	const SWARM_YANMA     ; 1
-
-; ActivateFishingSwarm writebyte arguments
-	const_def
-	const FISHSWARM_NONE     ; 0
-	const FISHSWARM_QWILFISH ; 1
-	const FISHSWARM_REMORAID ; 2
-
 ; SpecialGameboyCheck return values
 	const_def
 	const GBCHECK_GB  ; 0
diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm
index 391894f0..ec956c5e 100644
--- a/constants/wram_constants.asm
+++ b/constants/wram_constants.asm
@@ -249,7 +249,7 @@ PLAYER_SURF_PIKA EQU 8
 	const_def
 	const DAILYFLAGS1_KURT_MAKING_BALLS_F             ; 0
 	const DAILYFLAGS1_BUG_CONTEST_F                   ; 1
-	const DAILYFLAGS1_FISH_SWARM_F                    ; 2
+	const DAILYFLAGS1_SWARM_F                         ; 2
 	const DAILYFLAGS1_TIME_CAPSULE_F                  ; 3
 	const DAILYFLAGS1_ALL_FRUIT_TREES_F               ; 4
 	const DAILYFLAGS1_GOT_SHUCKIE_TODAY_F             ; 5