summaryrefslogtreecommitdiff
path: root/engine/events
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2018-06-25 23:14:52 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2018-06-25 23:14:52 -0400
commitaa334dc5b9ac6ed4ecfd61429c0a1da7f8a8d262 (patch)
tree7282ddf2583152a956291ac61134422044139e2e /engine/events
parenta6560d0871948863c79b1e5aeba9a8cded9ccea7 (diff)
Use specific constants for overwritten text tiles
Diffstat (limited to 'engine/events')
-rw-r--r--engine/events/field_moves.asm6
-rw-r--r--engine/events/print_unown.asm11
2 files changed, 10 insertions, 7 deletions
diff --git a/engine/events/field_moves.asm b/engine/events/field_moves.asm
index e87c2ae0d..f5ad049f2 100644
--- a/engine/events/field_moves.asm
+++ b/engine/events/field_moves.asm
@@ -20,7 +20,7 @@ BlindingFlash:
ShakeHeadbuttTree:
farcall ClearSpriteAnims
ld de, CutGrassGFX
- ld hl, vTiles1
+ ld hl, vTiles1 tile $00
lb bc, BANK(CutGrassGFX), 4
call Request2bpp
ld de, HeadbuttTreeGFX
@@ -134,11 +134,11 @@ OWCutAnimation:
.LoadCutGFX:
callfar ClearSpriteAnims ; pointless to farcall
ld de, CutGrassGFX
- ld hl, vTiles1
+ ld hl, vTiles1 tile $00
lb bc, BANK(CutGrassGFX), 4
call Request2bpp
ld de, CutTreeGFX
- ld hl, vTiles1 tile $4
+ ld hl, vTiles1 tile $04
lb bc, BANK(CutTreeGFX), 4
call Request2bpp
ret
diff --git a/engine/events/print_unown.asm b/engine/events/print_unown.asm
index ed7087e35..9e231f449 100644
--- a/engine/events/print_unown.asm
+++ b/engine/events/print_unown.asm
@@ -1,3 +1,6 @@
+UNOWNSTAMP_BOLD_A EQUS "\"♂\"" ; $ef
+UNOWNSTAMP_BOLD_B EQUS "\"♀\"" ; $f5
+
_UnownPrinter:
ld a, [wUnownDex]
and a
@@ -15,12 +18,12 @@ _UnownPrinter:
call ClearTileMap
ld de, UnownDexATile
- ld hl, vTiles1 tile $6f
+ ld hl, vTiles0 tile UNOWNSTAMP_BOLD_A
lb bc, BANK(UnownDexBTile), 1
call Request1bpp
ld de, UnownDexBTile
- ld hl, vTiles1 tile $75
+ ld hl, vTiles0 tile UNOWNSTAMP_BOLD_B
lb bc, BANK(UnownDexBTile), 1
call Request1bpp
@@ -200,8 +203,8 @@ UnownDexDoWhatString:
db "Do what?@"
UnownDexMenuString:
- db "♂ PRINT"
- next "♀ CANCEL"
+ db UNOWNSTAMP_BOLD_A, " PRINT"
+ next UNOWNSTAMP_BOLD_B, " CANCEL"
next "← PREVIOUS"
next "→ NEXT"
db "@"