Rename: emote_headers, sprite_headers, cry_headers, gfx_headers, tileset_headers

9 files changed, 24 insertions, 24 deletions

diff --git a/constants/animation_constants.asm b/constants/animation_constants.asm
index e7c844c12..857673849 100644
--- a/constants/animation_constants.asm
+++ b/constants/animation_constants.asm
@@ -775,7 +775,7 @@ const_value SET 1
 	const ANIM_MON_EGG1
 	const ANIM_MON_EGG2
 
-; AnimObjGFX indexes (see battle/objects/gfx_headers.asm)
+; AnimObjGFX indexes (see battle/objects/object_gfx.asm)
 const_value SET 1
 	const ANIM_GFX_HIT
 	const ANIM_GFX_CUT
diff --git a/constants/battle_constants.asm b/constants/battle_constants.asm
index e9d393fcc..adfeb580d 100644
--- a/constants/battle_constants.asm
+++ b/constants/battle_constants.asm
@@ -32,14 +32,14 @@ NUM_LEVEL_STATS EQU const_value
 
 ; move struct members (see battle/moves/moves.asm)
 	const_def
-	const MOVE_ANIM
-	const MOVE_EFFECT
-	const MOVE_POWER
-	const MOVE_TYPE
-	const MOVE_ACC
-	const MOVE_PP
-	const MOVE_CHANCE
-	const MOVE_LENGTH
+	const MOVE_ANIM   ; 0
+	const MOVE_EFFECT ; 1
+	const MOVE_POWER  ; 2
+	const MOVE_TYPE   ; 3
+	const MOVE_ACC    ; 4
+	const MOVE_PP     ; 5
+	const MOVE_CHANCE ; 6
+MOVE_LENGTH EQU const_value
 
 ; stat constants
 ; indexes for:
diff --git a/constants/map_data_constants.asm b/constants/map_data_constants.asm
index 1af4215a1..d99264136 100644
--- a/constants/map_data_constants.asm
+++ b/constants/map_data_constants.asm
@@ -3,7 +3,7 @@ MAP_N_A    EQU -1
 GROUP_NONE EQU 0
 MAP_NONE   EQU 0
 
-; map header fields (see maps/map_headers.asm)
+; map header struct members (see maps/map_headers.asm)
 	const_def
 	const MAPHEADER_MAPHEADER2_BANK ; 0
 	const MAPHEADER_TILESET         ; 1
@@ -200,7 +200,7 @@ NUM_SPAWNS EQU const_value
 	const OBJECTTYPE_6
 
 
-; EmotesPointers indexes (see engine/overworld.asm)
+; Emotes indexes (see data/emotes.asm)
 	const_def
 	const EMOTE_SHOCK ; 0
 	const EMOTE_QUESTION ; 1
diff --git a/constants/map_setup_constants.asm b/constants/map_setup_constants.asm
index 0dcc2b941..7b0dfdf83 100644
--- a/constants/map_setup_constants.asm
+++ b/constants/map_setup_constants.asm
@@ -41,7 +41,7 @@ const_value SET 1
 	const map_save_screen         ; 0c
 	const map_buffer_screen       ; 0d
 	const map_load_graphics       ; 0e
-	const map_load_tileset_header ; 0f
+	const map_load_tileset        ; 0f
 	const map_time_of_day         ; 10
 	const map_palettes            ; 11
 	const map_wildmons            ; 12
diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm
index 13cb577bb..344ba66c1 100644
--- a/constants/pokemon_constants.asm
+++ b/constants/pokemon_constants.asm
@@ -1,6 +1,6 @@
 ; pokemon ids
 ; indexes for:
-; - CryHeaders (see data/pokemon/cry_headers.asm)
+; - PokemonCries (see data/pokemon/cries.asm)
 ; - BaseData (see data/pokemon/base_stats.asm)
 ; - EggMovePointers (see data/pokemon/egg_move_pointers.asm)
 ; - EvosAttacksPointers (see data/pokemon/evos_attacks_pointers.asm)
diff --git a/constants/sprite_constants.asm b/constants/sprite_constants.asm
index b008ac6c2..9e4b57c27 100644
--- a/constants/sprite_constants.asm
+++ b/constants/sprite_constants.asm
@@ -1,5 +1,5 @@
 ; sprite ids
-; SpriteHeaders indexes (see gfx/sprite_headers.asm)
+; OverworldSprites indexes (see gfx/sprite_data.asm)
 	const_def
 	const SPRITE_NONE ; 00
 	const SPRITE_CHRIS ; 01
diff --git a/constants/sprite_data_constants.asm b/constants/sprite_data_constants.asm
index 77d9e3975..0abaddd70 100644
--- a/constants/sprite_data_constants.asm
+++ b/constants/sprite_data_constants.asm
@@ -1,12 +1,12 @@
-; sprite_header struct members (see gfx/sprite_headers.asm)
+; overworld_sprite struct members (see gfx/sprite_data.asm)
 	const_def
-	const SPRITEHEADER_ADDR_LO ; 0
-	const SPRITEHEADER_ADDR_HI ; 1
-	const SPRITEHEADER_SIZE    ; 2
-	const SPRITEHEADER_BANK    ; 3
-	const SPRITEHEADER_TYPE    ; 4
-	const SPRITEHEADER_PALETTE ; 5
-NUM_SPRITEHEADER_FIELDS EQU const_value
+	const SPRITEDATA_ADDR    ; 0
+	const SPRITEDATA_ADDR_HI ; 1
+	const SPRITEDATA_SIZE    ; 2
+	const SPRITEDATA_BANK    ; 3
+	const SPRITEDATA_TYPE    ; 4
+	const SPRITEDATA_PALETTE ; 5
+NUM_SPRITEDATA_FIELDS EQU const_value
 
 ; sprite types
 const_value SET 1
diff --git a/constants/tileset_constants.asm b/constants/tileset_constants.asm
index 6a73f61d9..722de0c2b 100644
--- a/constants/tileset_constants.asm
+++ b/constants/tileset_constants.asm
@@ -1,4 +1,4 @@
-; Tilesets indexes (see tilesets/tileset_headers.asm)
+; Tilesets indexes (see tilesets/tilesets.asm)
 const_value SET 1
 	const TILESET_JOHTO_1              ; 01
 	const TILESET_JOHTO_2              ; 02
diff --git a/constants/trainer_constants.asm b/constants/trainer_constants.asm
index c41a6ed58..a5440ad80 100644
--- a/constants/trainer_constants.asm
+++ b/constants/trainer_constants.asm
@@ -678,7 +678,7 @@ KRIS EQU __enum__
 
 NUM_TRAINER_CLASSES EQU __enum__
 
-; TrainerClassAttributes fields (see data/trainers/trainer_attributes.asm)
+; TrainerClassAttributes struct members (see data/trainers/trainer_attributes.asm)
 	const_def
 	const TRNATTR_ITEM1           ; 0
 	const TRNATTR_ITEM2           ; 1