aboutsummaryrefslogtreecommitdiffstats
path: root/engine/menus
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/menus
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/menus')
-rwxr-xr-xengine/menus/naming_screen.asm2
-rwxr-xr-xengine/menus/start_sub_menus.asm34
2 files changed, 18 insertions, 18 deletions
diff --git a/engine/menus/naming_screen.asm b/engine/menus/naming_screen.asm
index a16c9501..8ca2ec9b 100755
--- a/engine/menus/naming_screen.asm
+++ b/engine/menus/naming_screen.asm
@@ -325,7 +325,7 @@ DisplayNamingScreen:
LoadEDTile:
ld de, ED_Tile
- ld hl, vFont + $700
+ ld hl, vFont tile $70
ld bc, (ED_TileEnd - ED_Tile) / $8
; to fix the graphical bug on poor emulators
;lb bc, BANK(ED_Tile), (ED_TileEnd - ED_Tile) / $8
diff --git a/engine/menus/start_sub_menus.asm b/engine/menus/start_sub_menus.asm
index 8f1a2d61..a845592f 100755
--- a/engine/menus/start_sub_menus.asm
+++ b/engine/menus/start_sub_menus.asm
@@ -485,39 +485,39 @@ DrawTrainerInfo:
call TrainerInfo_DrawVerticalLine
hlcoord 1, 2
call TrainerInfo_DrawVerticalLine
- ld hl, vChars2 + $70
- ld de, vChars2
- ld bc, $70 * 4
+ ld hl, vChars2 tile $07
+ ld de, vChars2 tile $00
+ ld bc, $1c tiles
call CopyData
ld hl, TrainerInfoTextBoxTileGraphics ; trainer info text box tile patterns
- ld de, vChars2 + $770
- ld bc, $80
+ ld de, vChars2 tile $77
+ ld bc, 8 tiles
push bc
call TrainerInfo_FarCopyData
ld hl, BlankLeaderNames
- ld de, vChars2 + $600
- ld bc, $170
+ ld de, vChars2 tile $60
+ ld bc, $17 tiles
call TrainerInfo_FarCopyData
pop bc
ld hl, BadgeNumbersTileGraphics ; badge number tile patterns
- ld de, vChars1 + $580
+ ld de, vChars1 tile $58
call TrainerInfo_FarCopyData
ld hl, GymLeaderFaceAndBadgeTileGraphics ; gym leader face and badge tile patterns
- ld de, vChars2 + $200
- ld bc, $400
- ld a, $03
+ ld de, vChars2 tile $20
+ ld bc, 8 * 8 tiles
+ ld a, BANK(GymLeaderFaceAndBadgeTileGraphics)
call FarCopyData2
ld hl, TextBoxGraphics
- ld de, $d0
+ ld de, 13 tiles
add hl, de ; hl = colon tile pattern
- ld de, vChars1 + $560
- ld bc, $10
- ld a, $04
+ ld de, vChars1 tile $56
+ ld bc, 1 tiles
+ ld a, BANK(TextBoxGraphics)
push bc
call FarCopyData2
pop bc
- ld hl, TrainerInfoTextBoxTileGraphics + $80 ; background tile pattern
- ld de, vChars1 + $570
+ ld hl, TrainerInfoTextBoxTileGraphics tile 8 ; background tile pattern
+ ld de, vChars1 tile $57
call TrainerInfo_FarCopyData
call EnableLCD
ld hl, wTrainerInfoTextBoxWidthPlus1