From 88465686cf64103effcf08ec9be276283d1f68c7 Mon Sep 17 00:00:00 2001 From: Rangi Date: Wed, 30 Jan 2019 18:59:48 -0500 Subject: Remove the nested UNION within battle WRAM --- engine/games/unown_puzzle.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'engine') diff --git a/engine/games/unown_puzzle.asm b/engine/games/unown_puzzle.asm index f6bbd18d2..4dfebb9b0 100644 --- a/engine/games/unown_puzzle.asm +++ b/engine/games/unown_puzzle.asm @@ -14,8 +14,8 @@ _UnownPuzzle: xor a ldh [hBGMapMode], a call DisableLCD - ld hl, wc608 ; includes wPuzzlePieces - ld bc, wc7e8 - wc608 + ld hl, wUnownPuzzle ; includes wPuzzlePieces + ld bc, wUnownPuzzleEnd - wUnownPuzzle xor a call ByteFill ld hl, UnownPuzzleCursorGFX -- cgit v1.2.3 From 60cdc65293705a0ce484167117c7c4505200ffbb Mon Sep 17 00:00:00 2001 From: Rangi Date: Wed, 30 Jan 2019 19:46:45 -0500 Subject: wc7e8 -> wUnusedC7E8 (similar to wUnusedD102) --- engine/overworld/warp_connection.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engine') diff --git a/engine/overworld/warp_connection.asm b/engine/overworld/warp_connection.asm index b39d424a7..2630ad913 100644 --- a/engine/overworld/warp_connection.asm +++ b/engine/overworld/warp_connection.asm @@ -1,6 +1,6 @@ HandleNewMap: - call Clearwc7e8 + call ClearUnusedC7E8 call ResetMapBufferEventFlags call ResetFlashIfOutOfCave call GetCurrentMapSceneID -- cgit v1.2.3 From 6cbdd245fc9332b083435476165ef86800550a08 Mon Sep 17 00:00:00 2001 From: Rangi Date: Wed, 6 Feb 2019 23:52:50 -0500 Subject: $8 = HIGH(vTiles1 - vTiles0) --- engine/overworld/overworld.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engine') diff --git a/engine/overworld/overworld.asm b/engine/overworld/overworld.asm index ab9770ee5..e47645f2c 100644 --- a/engine/overworld/overworld.asm +++ b/engine/overworld/overworld.asm @@ -594,7 +594,7 @@ endr jr c, .done ld a, h - add $8 + add HIGH(vTiles1 - vTiles0) ld h, a call .CopyToVram -- cgit v1.2.3 From 32c34a36191aa4e80bbaba90463e9c07576cedd3 Mon Sep 17 00:00:00 2001 From: Rangi Date: Fri, 8 Feb 2019 15:38:31 -0500 Subject: Separate the 200-byte c608-to-c6d0 union and the 280-byte c6d0-to-c7e8 union --- engine/rtc/timeset.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engine') diff --git a/engine/rtc/timeset.asm b/engine/rtc/timeset.asm index 366dd2460..3275d313a 100644 --- a/engine/rtc/timeset.asm +++ b/engine/rtc/timeset.asm @@ -44,7 +44,7 @@ InitClock: ld hl, Text_WokeUpOak call PrintText ld hl, wTimeSetBuffer - ld bc, 50 + ld bc, wTimeSetBufferEnd - wTimeSetBuffer xor a call ByteFill ld a, 10 ; default hour = 10 AM -- cgit v1.2.3