From 4a7d1513f3135a3c926233d47921b21bf8b1fab4 Mon Sep 17 00:00:00 2001
From: Rangi <remy.oukaour+rangi42@gmail.com>
Date: Tue, 7 Jul 2020 15:09:54 -0400
Subject: Use 'tile' and 'tiles' macros

---
 engine/battle/animations.asm            | 3 ++-
 engine/battle/battle_transitions.asm    | 8 +++-----
 engine/battle/core.asm                  | 8 ++++----
 engine/battle/draw_hud_pokeball_gfx.asm | 2 +-
 4 files changed, 10 insertions(+), 11 deletions(-)

(limited to 'engine/battle')

diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm
index 9f7b728a..4e836510 100755
--- a/engine/battle/animations.asm
+++ b/engine/battle/animations.asm
@@ -341,7 +341,7 @@ LoadAnimationTileset:
 	ld e, a
 	ld a, [hl]
 	ld d, a ; de = address of tileset
-	ld hl, vSprites + $310
+	ld hl, vSprites tile $31
 	ld b, BANK(AnimationTileset1) ; ROM bank
 	ld a, [wTempTilesetNumTiles]
 	ld c, a ; number of tiles
@@ -373,6 +373,7 @@ ENDC
 IF DEF(_BLUE)
 	INCBIN "gfx/slots/blue_slots_2.2bpp"
 ENDC
+SlotMachineTiles2End:
 
 MoveAnimation:
 	push hl
diff --git a/engine/battle/battle_transitions.asm b/engine/battle/battle_transitions.asm
index e563855d..34b3fbdb 100644
--- a/engine/battle/battle_transitions.asm
+++ b/engine/battle/battle_transitions.asm
@@ -154,14 +154,12 @@ GetBattleTransitionID_IsDungeonMap:
 INCLUDE "data/maps/dungeon_maps.asm"
 
 LoadBattleTransitionTile:
-	ld hl, vChars1 + $7f0
+	ld hl, vChars1 tile $7f
 	ld de, BattleTransitionTile
-	lb bc, BANK(BattleTransitionTile), (BattleTransitionTileEnd - BattleTransitionTile) / $10
+	lb bc, BANK(BattleTransitionTile), 1
 	jp CopyVideoData
 
-BattleTransitionTile:
-	INCBIN "gfx/overworld/battle_transition.2bpp"
-BattleTransitionTileEnd:
+BattleTransitionTile: INCBIN "gfx/overworld/battle_transition.2bpp"
 
 BattleTransition_BlackScreen:
 	ld a, $ff
diff --git a/engine/battle/core.asm b/engine/battle/core.asm
index 859f30d5..5cf8a45d 100755
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -6610,22 +6610,22 @@ LoadHudTilePatterns:
 	jr c, .lcdEnabled
 .lcdDisabled
 	ld hl, BattleHudTiles1
-	ld de, vChars2 + $6d0
+	ld de, vChars2 tile $6d
 	ld bc, BattleHudTiles1End - BattleHudTiles1
 	ld a, BANK(BattleHudTiles1)
 	call FarCopyDataDouble
 	ld hl, BattleHudTiles2
-	ld de, vChars2 + $730
+	ld de, vChars2 tile $73
 	ld bc, BattleHudTiles3End - BattleHudTiles2
 	ld a, BANK(BattleHudTiles2)
 	jp FarCopyDataDouble
 .lcdEnabled
 	ld de, BattleHudTiles1
-	ld hl, vChars2 + $6d0
+	ld hl, vChars2 tile $6d
 	lb bc, BANK(BattleHudTiles1), (BattleHudTiles1End - BattleHudTiles1) / $8
 	call CopyVideoDataDouble
 	ld de, BattleHudTiles2
-	ld hl, vChars2 + $730
+	ld hl, vChars2 tile $73
 	lb bc, BANK(BattleHudTiles2), (BattleHudTiles3End - BattleHudTiles2) / $8
 	jp CopyVideoDataDouble
 
diff --git a/engine/battle/draw_hud_pokeball_gfx.asm b/engine/battle/draw_hud_pokeball_gfx.asm
index 8cd9528d..097a0fcc 100644
--- a/engine/battle/draw_hud_pokeball_gfx.asm
+++ b/engine/battle/draw_hud_pokeball_gfx.asm
@@ -12,7 +12,7 @@ DrawEnemyPokeballs:
 
 LoadPartyPokeballGfx:
 	ld de, PokeballTileGraphics
-	ld hl, vSprites + $310
+	ld hl, vSprites tile $31
 	lb bc, BANK(PokeballTileGraphics), (PokeballTileGraphicsEnd - PokeballTileGraphics) / $10
 	jp CopyVideoData
 
-- 
cgit v1.2.3