summaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@gmail.com>2015-10-14 09:29:15 -0400
committerPikalaxALT <PikalaxALT@gmail.com>2015-10-14 09:29:15 -0400
commit1e2ff967aa11ed0bcdd1dd069bde67724d3851c2 (patch)
tree21c66604d72b4c3df9d463555252869d43046a50 /engine
parentf399315a489c7eff28ec1941c41d12264fb38039 (diff)
Replaced "ldtile" and "dwtile" with the "tile" equs macro
Diffstat (limited to 'engine')
-rw-r--r--engine/credits.asm6
-rw-r--r--engine/pack.asm2
-rw-r--r--engine/pokedex.asm14
-rw-r--r--engine/title.asm12
4 files changed, 17 insertions, 17 deletions
diff --git a/engine/credits.asm b/engine/credits.asm
index 449fc0ac0..e5849c2ba 100644
--- a/engine/credits.asm
+++ b/engine/credits.asm
@@ -148,17 +148,17 @@ Function109847:: ; 109847
jr nz, .asm_10986a
ld de, CreditsBorderGFX
- ld hl, $9200
+ ld hl, VTiles2 tile $20
lb bc, BANK(CreditsBorderGFX), $09
call Request2bpp
ld de, CopyrightGFX
- ld hl, $9600
+ ld hl, VTiles2 tile $60
lb bc, BANK(CopyrightGFX), $1d
call Request2bpp
ld de, TheEndGFX
- ld hl, $9400
+ ld hl, VTiles2 tile $40
lb bc, BANK(TheEndGFX), $10
call Request2bpp
diff --git a/engine/pack.asm b/engine/pack.asm
index 84413e1cb..ed8d197bc 100644
--- a/engine/pack.asm
+++ b/engine/pack.asm
@@ -1292,7 +1292,7 @@ endr
ld a, [hli]
ld e, a
ld d, [hl]
- ld hl, $9500
+ ld hl, VTiles2 tile $50
lb bc, BANK(PackGFX), 15
call Request2bpp
ret
diff --git a/engine/pokedex.asm b/engine/pokedex.asm
index 970863675..2712b51be 100644
--- a/engine/pokedex.asm
+++ b/engine/pokedex.asm
@@ -836,7 +836,7 @@ Function405df: ; 405df (10:45df)
.asm_40603
ld hl, PokedexLZ
- ld de, $9310
+ ld de, VTiles2 tile $31
lb bc, BANK(PokedexLZ), $3a
call Functione73
@@ -2460,7 +2460,7 @@ Function4147b: ; 4147b
push hl
ld e, l
ld d, h
- ld hl, $9620
+ ld hl, VTiles2 tile $62
lb bc, BANK(Footprints), 2
call Request1bpp
pop hl
@@ -2472,7 +2472,7 @@ Function4147b: ; 4147b
ld e, l
ld d, h
- ld hl, $9640
+ ld hl, VTiles2 tile $64
lb bc, BANK(Footprints), 2
call Request1bpp
@@ -2488,7 +2488,7 @@ Function414b7: ; 414b7
call ByteFill
call Function414fb
call Functione5f
- ld hl, $9600
+ ld hl, VTiles2 tile $60
ld bc, $0200
call Function41504
call Function41a24
@@ -2498,7 +2498,7 @@ Function414b7: ; 414b7
.asm_414e0
ld hl, PokedexLZ
- ld de, $9310
+ ld de, VTiles2 tile $31
call Decompress
.asm_414e9
@@ -2554,7 +2554,7 @@ Function41a2c: ; 41a2c
ld bc, $1b0
call Function41504
ld de, sScratch + $188
- ld hl, $9400
+ ld hl, VTiles2 tile $40
lb bc, BANK(Function41a2c), $1b
call Request2bpp
call CloseSRAM
@@ -2575,7 +2575,7 @@ Function41a58: ; 41a58 (10:5a58)
ld a, UNOWN
ld [CurPartySpecies], a
call GetBaseData
- ld de, $9000
+ ld de, VTiles2 tile $00
predef GetFrontpic
pop af
ld [UnownLetter], a
diff --git a/engine/title.asm b/engine/title.asm
index 2e151c389..675bab2f3 100644
--- a/engine/title.asm
+++ b/engine/title.asm
@@ -53,27 +53,27 @@ _TitleScreen: ; 10ed67
; Apply logo gradient:
; lines 3-4
- ld hl, $9860 ; (0,3)
+ ld hl, VBGMap0 tile $06 ; (0,3)
ld bc, $0040 ; 2 rows
ld a, 2
call ByteFill
; line 5
- ld hl, $98a0 ; (0,5)
+ ld hl, VBGMap0 tile $0a ; (0,5)
ld bc, $0020 ; 1 row
ld a, 3
call ByteFill
; line 6
- ld hl, $98c0 ; (0,6)
+ ld hl, VBGMap0 tile $0c ; (0,6)
ld bc, $0020 ; 1 row
ld a, 4
call ByteFill
; line 7
- ld hl, $98e0 ; (0,7)
+ ld hl, VBGMap0 tile $0e ; (0,7)
ld bc, $0020 ; 1 row
ld a, 5
call ByteFill
; lines 8-9
- ld hl, $9900 ; (0,8)
+ ld hl, VBGMap0 tile $10 ; (0,8)
ld bc, $0040 ; 2 rows
ld a, 6
call ByteFill
@@ -86,7 +86,7 @@ _TitleScreen: ; 10ed67
call ByteFill
; Suicune gfx
- ld hl, $9980 ; (0,12)
+ ld hl, VBGMap0 tile $18 ; (0,12)
ld bc, $00c0 ; the rest of the screen
ld a, 8
call ByteFill