diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2019-02-09 18:03:07 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-09 18:03:07 -0500 |
| commit | b791198f74e55ff6a96d33784d9661854dbca113 (patch) | |
| tree | 17c78e5808c557144605884de2cdc99ddfdd0ebd /engine | |
| parent | 4fe0d93d4c0536b3517ba4b58822e5f6b1019382 (diff) | |
| parent | 349664ec15995b40151378bbfc405930d47a3c5c (diff) | |
Merge pull request #596 from Rangi42/master
Remove the nested UNION within battle WRAM
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/games/unown_puzzle.asm | 4 | ||||
| -rw-r--r-- | engine/overworld/overworld.asm | 2 | ||||
| -rw-r--r-- | engine/overworld/warp_connection.asm | 2 | ||||
| -rw-r--r-- | engine/rtc/timeset.asm | 2 |
4 files changed, 5 insertions, 5 deletions
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 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 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 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 |