From f3326786259f4e53c06b7565369add7605bea8ba Mon Sep 17 00:00:00 2001
From: Narishma-gb <194818981+Narishma-gb@users.noreply.github.com>
Date: Tue, 18 Nov 2025 21:17:31 +0100
Subject: Use more hardware and graphics constants (#532)

- Use `OBJ_SIZE` and `TILE_SIZE` from hardware.inc.
- `SPRITESTATEDATA1_LENGTH`, `NUM_SPRITESTATEDATA_STRUCTS`
  and `TILE_1BPP_SIZE` are used in some places.
- Highlight an oversight in `OakSpeech` where several
  direct MBC bank switches are requested.
- Remove redundant comments in home/overworld.asm.
- Add unreferenced `FillBgMap` function to avoid a byte
  of dead code.
- Some constants added in wram.asm.
- Correctly separate the commented code in `SaveMainData`.
---
 engine/battle/core.asm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'engine/battle/core.asm')

diff --git a/engine/battle/core.asm b/engine/battle/core.asm
index 87abf2e8..0916176c 100644
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -106,8 +106,8 @@ SlidePlayerAndEnemySilhouettesOnScreen:
 SlidePlayerHeadLeft:
 	push bc
 	ld hl, wShadowOAMSprite00XCoord
-	ld c, $15 ; number of OAM entries
-	ld de, $4 ; size of OAM entry
+	ld c, 7 * 3 ; number of OAM entries
+	ld de, OBJ_SIZE
 .loop
 	dec [hl] ; decrement X
 	dec [hl] ; decrement X
@@ -6655,11 +6655,11 @@ LoadHudTilePatterns:
 .lcdEnabled
 	ld de, BattleHudTiles1
 	ld hl, vChars2 tile $6d
-	lb bc, BANK(BattleHudTiles1), (BattleHudTiles1End - BattleHudTiles1) / $8
+	lb bc, BANK(BattleHudTiles1), (BattleHudTiles1End - BattleHudTiles1) / TILE_1BPP_SIZE
 	call CopyVideoDataDouble
 	ld de, BattleHudTiles2
 	ld hl, vChars2 tile $73
-	lb bc, BANK(BattleHudTiles2), (BattleHudTiles3End - BattleHudTiles2) / $8
+	lb bc, BANK(BattleHudTiles2), (BattleHudTiles3End - BattleHudTiles2) / TILE_1BPP_SIZE
 	jp CopyVideoDataDouble
 
 PrintEmptyString:
@@ -7040,14 +7040,14 @@ LoadMonBackPic:
 	ld b, 7
 	ld c, 8
 	call ClearScreenArea
-	ld hl,  wMonHBackSprite - wMonHeader
+	ld hl, wMonHBackSprite - wMonHeader
 	call UncompressMonSprite
 	predef ScaleSpriteByTwo
 	ld de, vBackPic
 	call InterlaceMergeSpriteBuffers ; combine the two buffers to a single 2bpp sprite
 	ld hl, vSprites
 	ld de, vBackPic
-	ld c, (2 * SPRITEBUFFERSIZE) / 16 ; count of 16-byte chunks to be copied
+	ld c, (2 * SPRITEBUFFERSIZE) / TILE_SIZE ; count of 16-byte chunks to be copied
 	ldh a, [hLoadedROMBank]
 	ld b, a
 	jp CopyVideoData
-- 
cgit v1.3.1-sl0p