From dba7f59d83c0850c86dd3009d63b2bdeeb0fed68 Mon Sep 17 00:00:00 2001 From: Rangi Date: Sun, 15 Jul 2018 11:58:01 -0400 Subject: More OAM coordinate consistency --- mobile/mobile_22_2.asm | 2 +- mobile/mobile_46.asm | 2 +- mobile/mobile_5c.asm | 2 +- mobile/mobile_5f.asm | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) (limited to 'mobile') diff --git a/mobile/mobile_22_2.asm b/mobile/mobile_22_2.asm index 260e62073..be1c897d8 100644 --- a/mobile/mobile_22_2.asm +++ b/mobile/mobile_22_2.asm @@ -586,7 +586,7 @@ Function8b690: ld a, BANK(GFX_17afa5) call FarCopyBytes ld hl, GFX_17afa5 + $514 + $160 - ld de, vTiles1 tile $6e + ld de, vTiles0 tile $ee ld bc, $10 ld a, BANK(GFX_17afa5) call FarCopyBytes diff --git a/mobile/mobile_46.asm b/mobile/mobile_46.asm index 43ddf5201..95e1f5ac5 100644 --- a/mobile/mobile_46.asm +++ b/mobile/mobile_46.asm @@ -5543,7 +5543,7 @@ Function11ac51: call Function11b314 call Function11acb7 call Function11ad6e - ld a, 30 * 4 + ld a, 30 * SPRITEOAMSTRUCT_LENGTH ld [wCurrSpriteOAMAddr], a farcall DoNextFrameForAllSprites farcall ReloadMapPart diff --git a/mobile/mobile_5c.asm b/mobile/mobile_5c.asm index 2874ce65a..0b4d05014 100644 --- a/mobile/mobile_5c.asm +++ b/mobile/mobile_5c.asm @@ -279,7 +279,7 @@ Function170d02: ld a, $1 ld [rVBK], a ld de, GFX_171848 - ld hl, vTiles1 tile $41 + ld hl, vTiles0 tile $c1 lb bc, BANK(GFX_171848), 24 call Get2bpp xor a diff --git a/mobile/mobile_5f.asm b/mobile/mobile_5f.asm index ed2b5188c..505d6cdbd 100644 --- a/mobile/mobile_5f.asm +++ b/mobile/mobile_5f.asm @@ -605,7 +605,7 @@ Function17d370: call ClearScreen farcall ReloadMapPart call DisableLCD - ld hl, vTiles1 tile $6e + ld hl, vTiles0 tile $ee ld de, $c608 ld bc, 1 tiles call CopyBytes @@ -620,7 +620,7 @@ Function17d370: ld bc, 1 tiles call ByteFill ld hl, $c608 - ld de, vTiles1 tile $6e + ld de, vTiles0 tile $ee ld bc, 1 tiles call CopyBytes xor a @@ -652,7 +652,7 @@ Function17d3f6: Function17d405: call DisableLCD - ld hl, vTiles1 tile $6e + ld hl, vTiles0 tile $ee ld de, $c608 ld bc, 1 tiles call CopyBytes @@ -667,7 +667,7 @@ Function17d405: ld bc, 1 tiles call ByteFill ld hl, $c608 - ld de, vTiles1 tile $6e + ld de, vTiles0 tile $ee ld bc, 1 tiles call CopyBytes xor a -- cgit v1.2.3