diff options
author | PikalaxALT <PikalaxALT@gmail.com> | 2015-10-14 09:29:15 -0400 |
---|---|---|
committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-10-14 09:29:15 -0400 |
commit | 1e2ff967aa11ed0bcdd1dd069bde67724d3851c2 (patch) | |
tree | 21c66604d72b4c3df9d463555252869d43046a50 /misc | |
parent | f399315a489c7eff28ec1941c41d12264fb38039 (diff) |
Replaced "ldtile" and "dwtile" with the "tile" equs macro
Diffstat (limited to 'misc')
-rw-r--r-- | misc/crystal_misc.asm | 6 | ||||
-rw-r--r-- | misc/mobile_42.asm | 24 | ||||
-rw-r--r-- | misc/mobile_45.asm | 16 | ||||
-rw-r--r-- | misc/mobile_5f.asm | 18 |
4 files changed, 32 insertions, 32 deletions
diff --git a/misc/crystal_misc.asm b/misc/crystal_misc.asm index 67bef18bc..ac0800a85 100644 --- a/misc/crystal_misc.asm +++ b/misc/crystal_misc.asm @@ -721,17 +721,17 @@ Function17aba0: ; 17aba0 (5e:6ba0) push af ld a, $1 ld [rVBK], a ; $ff00+$4f - ld hl, $9000 + ld hl, VTiles2 tile $00 ld de, GFX_17afa5 lb bc, BANK(GFX_17afa5), $80 call Get2bpp pop af ld [rVBK], a ; $ff00+$4f - ld hl, $8000 + ld hl, VTiles0 tile $00 ld de, GFX_17afa5 + $4c0 lb bc, BANK(GFX_17afa5), 5 call Get2bpp - ld hl, $8050 + ld hl, VTiles0 tile $05 ld de, GFX_11601a lb bc, BANK(GFX_11601a), 4 call Get2bpp diff --git a/misc/mobile_42.asm b/misc/mobile_42.asm index a66e375ea..98597b6a1 100644 --- a/misc/mobile_42.asm +++ b/misc/mobile_42.asm @@ -141,7 +141,7 @@ Function1080b7: ; 1080b7 ld a, $0 ld [rVBK], a ld hl, LZ_108d27 - ld de, $8200 + ld de, VTiles0 tile $20 call Decompress call EnableLCD xor a @@ -158,7 +158,7 @@ Function1080b7: ; 1080b7 lb bc, BANK(TradeBallGFX), $06 call Request2bpp ld de, TradePoofGFX - ld hl, $8060 + ld hl, VTiles0 tile $06 lb bc, BANK(TradePoofGFX), $0c call Request2bpp xor a @@ -167,11 +167,11 @@ Function1080b7: ; 1080b7 ld [hl], $0 ld a, [$c6d0] ld hl, $c6fd - ld de, $8300 + ld de, VTiles0 tile $30 call Function1081e9 ld a, [wc702] ld hl, wc72f - ld de, $9310 + ld de, VTiles2 tile $31 call Function1081e9 ld a, [$c6d0] ld de, $c6d1 @@ -587,7 +587,7 @@ Function10842c: ; 10842c lb bc, BANK(TradeBallGFX), $06 call Request2bpp ld de, TradePoofGFX - ld hl, $8060 + ld hl, VTiles0 tile $06 lb bc, BANK(TradePoofGFX), $0c call Request2bpp ld a, [$c6fd] @@ -661,7 +661,7 @@ Function1084d7: ; 1084d7 lb bc, BANK(TradeBallGFX), $06 call Request2bpp ld de, TradePoofGFX - ld hl, $8060 + ld hl, VTiles0 tile $06 lb bc, BANK(TradePoofGFX), $0c call Request2bpp xor a @@ -730,7 +730,7 @@ Function108589: ; 108589 lb bc, BANK(TradeBallGFX), $06 call Request2bpp ld de, TradePoofGFX - ld hl, $8060 + ld hl, VTiles0 tile $06 lb bc, BANK(TradePoofGFX), $0c call Request2bpp xor a @@ -832,7 +832,7 @@ Function108689: ; 108689 ld a, $0 ld [rVBK], a ld hl, LZ_108d27 - ld de, $8200 + ld de, VTiles0 tile $20 call Decompress call Function108c80 call Function108c6d @@ -876,7 +876,7 @@ Function1086f4: ; 1086f4 ld a, $0 ld [rVBK], a ld hl, LZ_108d27 - ld de, $8200 + ld de, VTiles0 tile $20 call Decompress call Function108c80 call Function108c6d @@ -1195,11 +1195,11 @@ Function10893d: ; 10893d ; 10895e Function10895e: ; 10895e - ld de, $8300 + ld de, VTiles0 tile $30 jr asm_108966 Function108963: - ld de, $9310 + ld de, VTiles2 tile $31 asm_108966 call DelayFrame @@ -1405,7 +1405,7 @@ Function108ad4: ; 108ad4 .asm_108adf ld a, $1 ld [rVBK], a - ld hl, $94a0 + ld hl, VTiles2 tile $4a lb bc, $42, $10 call Functiondc9 call DelayFrame diff --git a/misc/mobile_45.asm b/misc/mobile_45.asm index 17300348a..c4cfb88bd 100644 --- a/misc/mobile_45.asm +++ b/misc/mobile_45.asm @@ -5268,7 +5268,7 @@ Function115d80: ; 115d80 Function115d99: ; 115d99 ld de, GFX_11601a - ld hl, $8600 + ld hl, VTiles0 tile $60 lb bc, BANK(GFX_11601a), $14 call Get2bpp xor a @@ -22297,7 +22297,7 @@ Function16d696: ; 16d696 Function16d69a: ; 16d69a ld de, GFX_16cfc1 + $300 - ld hl, $9760 + ld hl, VTiles2 tile $76 lb bc, BANK(GFX_16cfc1), 8 call Get2bpp ret @@ -24486,7 +24486,7 @@ Function170d02: ; 170d02 ld a, $1 ld [rVBK], a ld de, GFX_171848 - ld hl, $8c10 + ld hl, VTiles1 tile $41 lb bc, BANK(GFX_171848), $18 call Get2bpp xor a @@ -24869,11 +24869,11 @@ String_171c73: ; 171c73 Function171c87: ; 171c87 (5c:5c87) call DisableLCD ld hl, GFX_171db1 - ld de, $9000 + ld de, VTiles2 tile $00 ld bc, $6e0 call CopyBytes ld hl, LZ_172abd - ld de, $8000 + ld de, VTiles0 tile $00 call Decompress call EnableLCD ld hl, Tilemap_172491 @@ -24941,11 +24941,11 @@ endr Function171d2b: ; 171d2b (5c:5d2b) call DisableLCD ld hl, GFX_171db1 - ld de, $9000 + ld de, VTiles2 tile $00 ld bc, $6e0 call CopyBytes ld hl, LZ_172abd - ld de, $8000 + ld de, VTiles0 tile $00 call Decompress call EnableLCD ld hl, Tilemap_172685 @@ -25040,7 +25040,7 @@ Function172e78: ; 172e78 (5c:6e78) call ByteFill call DisableLCD ld hl, GFX_172f1f - ld de, $9000 + ld de, VTiles2 tile $00 ld bc, $610 call CopyBytes call EnableLCD diff --git a/misc/mobile_5f.asm b/misc/mobile_5f.asm index d722a59d4..5bf223626 100644 --- a/misc/mobile_5f.asm +++ b/misc/mobile_5f.asm @@ -60,7 +60,7 @@ Function17c000: ; 17c000 ld [rSVBK], a ld hl, MobileSelectGFX - ld de, $8300 + ld de, VTiles0 tile $30 ld bc, $200 call CopyBytes @@ -629,7 +629,7 @@ Function17d370: ; 17d370 call ClearScreen callba Function104061 call DisableLCD - ld hl, $8ee0 + ld hl, VTiles1 tile $6e ld de, $c608 ld bc, $0010 call CopyBytes @@ -640,17 +640,17 @@ Function17d370: ; 17d370 ld bc, $0480 call CopyBytes xor a - ld hl, $97f0 + ld hl, VTiles2 tile $7f ld bc, $0010 call ByteFill ld hl, $c608 - ld de, $8ee0 + ld de, VTiles1 tile $6e ld bc, $0010 call CopyBytes xor a ld [rVBK], a ld hl, GFX_17eb7e - ld de, $9600 + ld de, VTiles2 tile $60 ld bc, $0010 call CopyBytes call EnableLCD @@ -677,7 +677,7 @@ Function17d3f6: ; 17d3f6 Function17d405: call DisableLCD - ld hl, $8ee0 + ld hl, VTiles1 tile $6e ld de, $c608 ld bc, $0010 call CopyBytes @@ -688,11 +688,11 @@ Function17d405: ld bc, $0480 call CopyBytes xor a - ld hl, $97f0 + ld hl, VTiles2 tile $7f ld bc, $0010 call ByteFill ld hl, $c608 - ld de, $8ee0 + ld de, VTiles1 tile $6e ld bc, $0010 call CopyBytes xor a @@ -2980,7 +2980,7 @@ Function17e2a7: ; 17e2a7 ld [wcf66], a callba Function118233 ld de, GFX_17eb7e - ld hl, $9600 + ld hl, VTiles2 tile $60 lb bc, BANK(GFX_17eb7e), 1 call Get2bpp ld a, [wc300] |