Rename: emote_headers, sprite_headers, cry_headers, gfx_headers, tileset_headers

engine/map_setup.asm

@@ -91,7 +91,7 @@ MapSetupScript_Connection: ; 153bf
 	db map_change_callback
 	db map_player_coord
 	db map_load_blocks
-	db map_load_tileset_header
+	db map_load_tileset
 	db map_save_screen
 	db map_load_objects
 	db map_fade_music
@@ -253,7 +253,7 @@ MapSetupCommands: ; 15440
 	dba SaveScreen ; 0c
 	dba BufferScreen ; 0d
 	dba LoadGraphics ; 0e
-	dba LoadTilesetHeader ; 0f
+	dba LoadTileset ; 0f
 	dba LoadMapTimeOfDay ; 10
 	dba LoadMapPalettes ; 11
 	dba LoadWildMonData ; 12

engine/overworld.asm

@@ -202,11 +202,11 @@ GetSprite: ; 1423c
 	call GetMonSprite
 	ret c
 
-	ld hl, SpriteHeaders ; address
+	ld hl, OverworldSprites + SPRITEDATA_ADDR
 	dec a
 	ld c, a
 	ld b, 0
-	ld a, 6
+	ld a, NUM_SPRITEDATA_FIELDS
 	call AddNTimes
 	; load the address into de
 	ld a, [hli]
@@ -299,11 +299,11 @@ _DoesSpriteHaveFacings:: ; 142a7
 
 	push hl
 	push bc
-	ld hl, SpriteHeaders + SPRITEHEADER_TYPE ; type
+	ld hl, OverworldSprites + SPRITEDATA_TYPE
 	dec a
 	ld c, a
 	ld b, 0
-	ld a, NUM_SPRITEHEADER_FIELDS
+	ld a, NUM_SPRITEDATA_FIELDS
 	call AddNTimes
 	ld a, [hl]
 	pop bc
@@ -324,11 +324,11 @@ _GetSpritePalette:: ; 142c4
 	call GetMonSprite
 	jr c, .is_pokemon
 
-	ld hl, SpriteHeaders + 5 ; palette
+	ld hl, OverworldSprites + SPRITEDATA_PALETTE
 	dec a
 	ld c, a
 	ld b, 0
-	ld a, 6
+	ld a, NUM_SPRITEDATA_FIELDS
 	call AddNTimes
 	ld c, [hl]
 	ret
@@ -691,8 +691,8 @@ endr
 LoadEmote:: ; 1442f
 ; Get the address of the pointer to emote c.
 	ld a, c
-	ld bc, 6
-	ld hl, EmotesPointers
+	ld bc, 6 ; sizeof(emote)
+	ld hl, Emotes
 	call AddNTimes
 ; Load the emote address into de
 	ld e, [hl]
@@ -719,10 +719,10 @@ LoadEmote:: ; 1442f
 ; 1444d
 
 
-INCLUDE "data/emote_headers.asm"
+INCLUDE "data/emotes.asm"
 
 INCLUDE "data/sprite_mons.asm"
 
 INCLUDE "data/maps/outdoor_sprites.asm"
 
-INCLUDE "gfx/sprite_headers.asm"
+INCLUDE "data/sprites.asm"

engine/warp_connection.asm

@@ -292,8 +292,8 @@ LoadMapTimeOfDay: ; 104750
 	ret
 
 LoadGraphics: ; 1047cf
-	call LoadTilesetHeader
 	call LoadTileset
+	call LoadTilesetGFX
 	xor a
 	ld [hMapAnims], a
 	xor a