From 78e44a8fb10307c55d53a69179b9ff7cd6f49fc0 Mon Sep 17 00:00:00 2001 From: Rangi42 Date: Mon, 30 Jun 2025 13:30:57 -0400 Subject: Use combined hardware constants --- ram/vram.asm | 4 ++-- ram/wram.asm | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'ram') diff --git a/ram/vram.asm b/ram/vram.asm index fe30b0e9..fafb5d8e 100644 --- a/ram/vram.asm +++ b/ram/vram.asm @@ -5,8 +5,8 @@ UNION vChars0:: ds $80 tiles vChars1:: ds $80 tiles vChars2:: ds $80 tiles -vBGMap0:: ds TILEMAP_WIDTH * TILEMAP_HEIGHT -vBGMap1:: ds TILEMAP_WIDTH * TILEMAP_HEIGHT +vBGMap0:: ds TILEMAP_AREA +vBGMap1:: ds TILEMAP_AREA NEXTU ; battle/menu diff --git a/ram/wram.asm b/ram/wram.asm index eff7baaa..f93d37d7 100644 --- a/ram/wram.asm +++ b/ram/wram.asm @@ -154,13 +154,13 @@ wShadowOAMEnd:: SECTION "Tilemap", WRAM0 ; buffer for tiles that are visible on screen (20 columns by 18 rows) -wTileMap:: ds SCREEN_WIDTH * SCREEN_HEIGHT +wTileMap:: ds SCREEN_AREA ; This union spans 480 bytes. UNION ; buffer for temporarily saving and restoring current screen's tiles ; (e.g. if menus are drawn on top) -wTileMapBackup:: ds SCREEN_WIDTH * SCREEN_HEIGHT +wTileMapBackup:: ds SCREEN_AREA NEXTU ; buffer for the blocks surrounding the player (6 columns by 5 rows of 4x4-tile blocks) @@ -921,7 +921,7 @@ UNION wSerialOtherGameboyRandomNumberListBlock:: ds $11 NEXTU ; second buffer for temporarily saving and restoring current screen's tiles (e.g. if menus are drawn on top) -wTileMapBackup2:: ds SCREEN_WIDTH * SCREEN_HEIGHT +wTileMapBackup2:: ds SCREEN_AREA ENDU ; This union spans 30 bytes. -- cgit v1.3.1-sl0p