aboutsummaryrefslogtreecommitdiffstats
path: root/engine/gfx
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2020-07-07 15:09:54 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2020-07-07 16:21:26 -0400
commit4a7d1513f3135a3c926233d47921b21bf8b1fab4 (patch)
tree22e14964dcd2e6dae66de392c32caf33e70c964b /engine/gfx
parentNames for more SECTIONs (diff)
downloadpokeyellow-4a7d1513f3135a3c926233d47921b21bf8b1fab4.tar.gz
pokeyellow-4a7d1513f3135a3c926233d47921b21bf8b1fab4.tar.xz
pokeyellow-4a7d1513f3135a3c926233d47921b21bf8b1fab4.zip
Use 'tile' and 'tiles' macros
Diffstat (limited to 'engine/gfx')
-rwxr-xr-xengine/gfx/load_pokedex_tiles.asm6
-rwxr-xr-xengine/gfx/mon_icons.asm4
2 files changed, 5 insertions, 5 deletions
diff --git a/engine/gfx/load_pokedex_tiles.asm b/engine/gfx/load_pokedex_tiles.asm
index 70bcf04d..a3f69171 100755
--- a/engine/gfx/load_pokedex_tiles.asm
+++ b/engine/gfx/load_pokedex_tiles.asm
@@ -2,10 +2,10 @@
LoadPokedexTilePatterns:
call LoadHpBarAndStatusTilePatterns
ld de, PokedexTileGraphics
- ld hl, vChars2 + $600
+ ld hl, vChars2 tile $60
lb bc, BANK(PokedexTileGraphics), (PokedexTileGraphicsEnd - PokedexTileGraphics) / $10
call CopyVideoData
ld de, PokeballTileGraphics
- ld hl, vChars2 + $720
- lb bc, BANK(PokeballTileGraphics), $01
+ ld hl, vChars2 tile $72
+ lb bc, BANK(PokeballTileGraphics), 1
jp CopyVideoData ; load pokeball tile for marking caught mons
diff --git a/engine/gfx/mon_icons.asm b/engine/gfx/mon_icons.asm
index 253fca35..8dd6fe75 100755
--- a/engine/gfx/mon_icons.asm
+++ b/engine/gfx/mon_icons.asm
@@ -201,11 +201,11 @@ UnusedPartyMonSpriteFunction:
ld a, [wcf91]
call GetPartyMonSpriteID
push af
- ld hl, vSprites
+ ld hl, vSprites tile $00
call .LoadTilePatterns
pop af
add $54
- ld hl, vSprites + $40
+ ld hl, vSprites tile $04
call .LoadTilePatterns
xor a
ld [wMonPartySpriteSpecies], a