Rename: emote_headers, sprite_headers, cry_headers, gfx_headers, tileset_headers

home/audio.asm

@@ -152,13 +152,13 @@ PlayCryHeader:: ; 3be3
 	ld a, [hROMBank]
 	push af
 
-	; Cry headers are stuck in one bank.
-	ld a, BANK(CryHeaders)
+	; Cries are stuck in one bank.
+	ld a, BANK(PokemonCries)
 	ld [hROMBank], a
 	ld [MBC3RomBank], a
 
-	ld hl, CryHeaders
-rept 6
+	ld hl, PokemonCries
+rept 6 ; sizeof(mon_cry)
 	add hl, de
 endr
 

home/cry.asm

@@ -62,11 +62,11 @@ LoadCryHeader:: ; 37f3
 
 	ld a, [hROMBank]
 	push af
-	ld a, BANK(CryHeaders)
+	ld a, BANK(PokemonCries)
 	rst Bankswitch
 
-	ld hl, CryHeaders
-rept 6
+	ld hl, PokemonCries
+rept 6 ; sizeof(mon_cry)
 	add hl, bc
 endr
 

home/map.asm

@@ -1391,7 +1391,7 @@ UpdateBGMapColumn:: ; 27f8
 	ret
 ; 2821
 
-LoadTileset:: ; 2821
+LoadTilesetGFX:: ; 2821
 	ld hl, TilesetAddress
 	ld a, [hli]
 	ld h, [hl]
@@ -2054,7 +2054,7 @@ ReloadTilesetAndPalettes:: ; 2bae
 	call SwitchToAnyMapBank
 	farcall UpdateTimeOfDayPal
 	call OverworldTextModeSwitch
-	call LoadTileset
+	call LoadTilesetGFX
 	ld a, 9
 	call SkipMusic
 	pop af
@@ -2372,17 +2372,17 @@ GetFishingGroup:: ; 2d19
 	ret
 ; 2d27
 
-LoadTilesetHeader:: ; 2d27
+LoadTileset:: ; 2d27
 	push hl
 	push bc
 
 	ld hl, Tilesets
-	ld bc, TilesetHeaderEnd - TilesetHeader
+	ld bc, TilesetEnd - Tileset
 	ld a, [wTileset]
 	call AddNTimes
 
 	ld de, TilesetBank
-	ld bc, TilesetHeaderEnd - TilesetHeader
+	ld bc, TilesetEnd - Tileset
 
 	ld a, BANK(Tilesets)
 	call FarCopyBytes