diff options
author | luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> | 2018-01-30 14:52:46 -0500 |
---|---|---|
committer | luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> | 2018-01-30 14:52:46 -0500 |
commit | 0b45e2e846c8b2feb7d2c4c4ebb854db07cf06fd (patch) | |
tree | df6b2a87398c5912f878de5798cb8d19a31bc15b /mobile | |
parent | 3c7ba37de72795e46c76f791b50b4a3d89ba0c2c (diff) |
Fix wVirtualOAM labels, part 2.
Diffstat (limited to 'mobile')
-rw-r--r-- | mobile/mobile_22.asm | 6 | ||||
-rwxr-xr-x | mobile/mobile_45_sprite_engine.asm | 10 | ||||
-rwxr-xr-x | mobile/mobile_46.asm | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/mobile/mobile_22.asm b/mobile/mobile_22.asm index 08113bf66..8af7cc896 100644 --- a/mobile/mobile_22.asm +++ b/mobile/mobile_22.asm @@ -1923,7 +1923,7 @@ Function89b97: ; 89b97 (22:5b97) ld a, [hli] ld h, [hl] ld l, a - ld de, wSprite01 + ld de, wVirtualOAMSprite00 .asm_89bb4 ld a, [hli] cp $ff @@ -2013,7 +2013,7 @@ Function89c44: ; 89c44 (22:5c44) pop de ret .asm_89c4f - ld hl, wSprite01 + ld hl, wVirtualOAMSprite00 push de ld a, b ld [hli], a ; y @@ -2123,7 +2123,7 @@ Function89cdf: ; 89cdf (22:5cdf) ld c, a ld e, $2 ld a, $2 - ld hl, wSprite01 + ld hl, wVirtualOAMSprite00 .asm_89cee push af push bc diff --git a/mobile/mobile_45_sprite_engine.asm b/mobile/mobile_45_sprite_engine.asm index e9156b598..438f42107 100755 --- a/mobile/mobile_45_sprite_engine.asm +++ b/mobile/mobile_45_sprite_engine.asm @@ -22,7 +22,7 @@ Function115dc3: ; 115dc3 xor a ld [wc305], a ld a, $a0 - ld hl, wSprite32 + ld hl, wVirtualOAMSprite31 ld bc, 8 * SPRITEOAMSTRUCT_LENGTH call ByteFill ret @@ -34,7 +34,7 @@ Function115dd3: ; 115dd3 and a ret z ld a, $a0 - ld hl, wSprite32 + ld hl, wVirtualOAMSprite31 ld bc, 8 * SPRITEOAMSTRUCT_LENGTH call ByteFill call Function115e22 @@ -50,7 +50,7 @@ Function115dd3: ; 115dd3 ld d, a push de pop hl - ld de, wSprite32 + ld de, wVirtualOAMSprite31 ld a, [wc307] ld c, a ld a, [wc308] @@ -585,7 +585,7 @@ Function1162f2: ; 1162f2 ld e, a ld a, [hli] sub e - ld de, wSprite10 + ld de, wVirtualOAMSprite09 .asm_116321 push af ld a, [hli] @@ -626,7 +626,7 @@ Function1162f2: ; 1162f2 ld e, a ld a, [hli] sub e - ld de, wSprite01 + ld de, wVirtualOAMSprite00 .asm_11635a push af ld a, [hli] diff --git a/mobile/mobile_46.asm b/mobile/mobile_46.asm index 76b2bb01f..0298c075b 100755 --- a/mobile/mobile_46.asm +++ b/mobile/mobile_46.asm @@ -6921,7 +6921,7 @@ Function11b31b: ; 11b31b db $39 ; 13 Function11b397: ; 11b397 - ld de, wSprite01 + ld de, wVirtualOAMSprite00 .loop ld a, [hl] cp $ff @@ -6979,7 +6979,7 @@ Unreferenced_Function11b3b6: ; 11b3b6 ; 11b3d9 Function11b3d9: ; 11b3d9 - ld de, wSprite29 + ld de, wVirtualOAMSprite28 push de ld a, [wc7d2] dec a |