Some cleanup before continuing.

6 files changed, 11 insertions, 100 deletions

diff --git a/constants/animation_constants.asm b/constants/battle_anim_constants.asm
index 2fbbf595..2fbbf595 100644
--- a/constants/animation_constants.asm
+++ b/constants/battle_anim_constants.asm
diff --git a/constants/battle_tower_constants.asm b/constants/battle_tower_constants.asm
deleted file mode 100755
index c690c9b0..00000000
--- a/constants/battle_tower_constants.asm
+++ /dev/null
@@ -1,39 +0,0 @@
-	const_def
-	const BATTLETOWERACTION_00
-	const BATTLETOWERACTION_01
-	const BATTLETOWERACTION_02
-	const BATTLETOWERACTION_SAVE_AND_QUIT
-	const BATTLETOWERACTION_CHALLENGECANCELED
-	const BATTLETOWERACTION_05
-	const BATTLETOWERACTION_06 ; reset stuff in SRAM bank 5
-	const BATTLETOWERACTION_SAVELEVELGROUP
-	const BATTLETOWERACTION_LOADLEVELGROUP
-	const BATTLETOWERACTION_CHECKSAVEFILEISYOURS
-	const BATTLETOWERACTION_0A
-	const BATTLETOWERACTION_CHECKMOBILEEVENT
-	const BATTLETOWERACTION_0C ; more time stuff in SRAM bank 5
-	const BATTLETOWERACTION_0D ; more time stuff in SRAM bank 5
-	const BATTLETOWERACTION_EGGTICKET ; egg ticket
-	const BATTLETOWERACTION_0F ; check w3_d090
-	const BATTLETOWERACTION_10 ; dw based on 5:a800
-	const BATTLETOWERACTION_11 ; store 0 in 5:aa8d
-	const BATTLETOWERACTION_12 ; store 1 in 5:aa8d
-	const BATTLETOWERACTION_13 ; check 5:aa8d
-	const BATTLETOWERACTION_14 ; if save file is yours: bit 0, [s1_be4f]
-	const BATTLETOWERACTION_15 ; set 0, [s1_be4f]
-	const BATTLETOWERACTION_16 ; update time in SRAM bank 5
-	const BATTLETOWERACTION_17 ; check time in SRAM bank 5
-	const BATTLETOWERACTION_18 ; level check
-	const BATTLETOWERACTION_19 ; ubers check
-	const BATTLETOWERACTION_RESETDATA ; clear data
-	const BATTLETOWERACTION_GIVEREWARD ; give reward
-	const BATTLETOWERACTION_1C ; set won challenge
-	const BATTLETOWERACTION_1D ; set received reward
-	const BATTLETOWERACTION_CHOOSEREWARD ; save options
-	const BATTLETOWERACTION_SAVEOPTIONS
-
-BATTLETOWER_NO_CHALLENGE         EQU 0
-BATTLETOWER_SAVED_AND_LEFT       EQU 1
-BATTLETOWER_CHALLENGE_IN_PROGESS EQU 2
-BATTLETOWER_WON_CHALLENGE        EQU 3
-BATTLETOWER_RECEIVED_REWARD      EQU 4
diff --git a/constants/sram_constants.asm b/constants/mobile_constants.asm
index caac8347..fc8b05a6 100755..100644
--- a/constants/sram_constants.asm
+++ b/constants/mobile_constants.asm
@@ -1,3 +1,3 @@
 ; Mobile bank 5
 sMobileLoginPassword EQU $aa4b
-LOGIN_PASSWORD_LENGTH EQU 17
+MOBILE_LOGIN_PASSWORD_LENGTH EQU 17
diff --git a/constants/pokemon_data_constants.asm b/constants/pokemon_data_constants.asm
index d29b4121..caacc8d1 100644
--- a/constants/pokemon_data_constants.asm
+++ b/constants/pokemon_data_constants.asm
@@ -62,58 +62,6 @@ GENDER_UNKNOWN EQU -1
 	const EGG_DRAGON        ; e
 	const EGG_NONE          ; f (Undiscovered)
 
-; IconPointers indexes (see data/icon_pointers.asm)
-	const_def
-	const ICON_NULL
-	const ICON_POLIWAG
-	const ICON_JIGGLYPUFF
-	const ICON_DIGLETT
-	const ICON_PIKACHU
-	const ICON_STARYU
-	const ICON_FISH
-	const ICON_BIRD
-	const ICON_MONSTER
-	const ICON_CLEFAIRY
-	const ICON_ODDISH
-	const ICON_BUG
-	const ICON_GHOST
-	const ICON_LAPRAS
-	const ICON_HUMANSHAPE
-	const ICON_FOX
-	const ICON_EQUINE
-	const ICON_SHELL
-	const ICON_BLOB
-	const ICON_SERPENT
-	const ICON_VOLTORB
-	const ICON_SQUIRTLE
-	const ICON_BULBASAUR
-	const ICON_CHARMANDER
-	const ICON_CATERPILLAR
-	const ICON_UNOWN
-	const ICON_GEODUDE
-	const ICON_FIGHTER
-	const ICON_EGG
-	const ICON_JELLYFISH
-	const ICON_MOTH
-	const ICON_BAT
-	const ICON_SNORLAX
-	const ICON_HO_OH
-	const ICON_LUGIA
-	const ICON_GYARADOS
-	const ICON_SLOWPOKE
-	const ICON_SUDOWOODO
-	const ICON_BIGMON
-
-; LoadMenuMonIcon.Jumptable indexes (see engine/gfx/mon_icons.asm)
-	const_def
-	const MONICON_PARTYMENU
-	const MONICON_NAMINGSCREEN
-	const MONICON_MOVES
-	const MONICON_TRADE
-	const MONICON_MOBILE1
-	const MONICON_MOBILE2
-	const MONICON_UNUSED
-
 ; maximum number of party pokemon
 PARTY_LENGTH EQU 6
 
diff --git a/constants/cgb_constants.asm b/constants/scgb_constants.asm
index 36cf369c..36cf369c 100755..100644
--- a/constants/cgb_constants.asm
+++ b/constants/scgb_constants.asm
diff --git a/constants/tilemap_constants.asm b/constants/tileset_constants.asm
index 0ead1444..3d68dba4 100644
--- a/constants/tilemap_constants.asm
+++ b/constants/tileset_constants.asm
@@ -29,12 +29,14 @@ const_value SET 1
 	const TILESET_DARK_CAVE            ; 1b
 	const TILESET_FOREST               ; 1c
 
+; bg palette values (see gfx/tilesets/*_palette_map.asm)
+; TilesetBGPalette indexes (see gfx/tilesets/bg_tiles.pal)
 	const_def
-	const PAL_BG_GRAY
-	const PAL_BG_RED
-	const PAL_BG_GREEN
-	const PAL_BG_WATER
-	const PAL_BG_YELLOW
-	const PAL_BG_BROWN
-	const PAL_BG_ROOF
-	const PAL_BG_TEXT
+	const PAL_BG_GRAY   ; 0
+	const PAL_BG_RED    ; 1
+	const PAL_BG_GREEN  ; 2
+	const PAL_BG_WATER  ; 3
+	const PAL_BG_YELLOW ; 4
+	const PAL_BG_BROWN  ; 5
+	const PAL_BG_ROOF   ; 6
+	const PAL_BG_TEXT   ; 7