Rooba
/
pokecrystal
mirror of https://github.com/pret/pokecrystal.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bgrows → * BG_MAP_WIDTH 

No dims macro
This commit is contained in:
Remy Oukaour 2017-12-29 18:59:50 -05:00
parent 586a49c8ad
commit f01434f2c0
3 changed files with 21 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engine/events/magnet_train.asm
View File

@ -262,19 +262,19 @@ SetMagnetTrainPals: ; 8cdc3
; bushes
hlbgcoord 0, 0
ld bc, 4 bgrows
ld bc, 4 * BG_MAP_WIDTH
ld a, $2
call ByteFill
; train
hlbgcoord 0, 4
ld bc, 10 bgrows
ld bc, 10 * BG_MAP_WIDTH
xor a
call ByteFill
; more bushes
hlbgcoord 0, 14
ld bc, 4 bgrows
ld bc, 4 * BG_MAP_WIDTH
ld a, $2
call ByteFill

18
engine/title.asm
View File

@ -32,7 +32,7 @@ _TitleScreen: ; 10ed67
; Clear screen palettes
hlbgcoord 0, 0
ld bc, 20 bgrows
ld bc, 20 * BG_MAP_WIDTH
xor a
call ByteFill
@ -43,7 +43,7 @@ _TitleScreen: ; 10ed67
; line 0 (copyright)
hlbgcoord 0, 0, vBGMap1
ld bc, 1 bgrows
ld bc, BG_MAP_WIDTH
ld a, 7 ; palette
call ByteFill
@ -54,27 +54,27 @@ _TitleScreen: ; 10ed67
; lines 3-4
hlbgcoord 0, 3
ld bc, 2 bgrows
ld bc, 2 * BG_MAP_WIDTH
ld a, 2
call ByteFill
; line 5
hlbgcoord 0, 5
ld bc, 1 bgrows
ld bc, BG_MAP_WIDTH
ld a, 3
call ByteFill
; line 6
hlbgcoord 0, 6
ld bc, 1 bgrows
ld bc, BG_MAP_WIDTH
ld a, 4
call ByteFill
; line 7
hlbgcoord 0, 7
ld bc, 1 bgrows
ld bc, BG_MAP_WIDTH
ld a, 5
call ByteFill
; lines 8-9
hlbgcoord 0, 8
ld bc, 2 bgrows
ld bc, 2 * BG_MAP_WIDTH
ld a, 6
call ByteFill
@ -87,7 +87,7 @@ _TitleScreen: ; 10ed67
; Suicune gfx
hlbgcoord 0, 12
ld bc, 6 bgrows ; the rest of the screen
ld bc, 6 * BG_MAP_WIDTH ; the rest of the screen
ld a, 0 | VRAM_BANK_1
call ByteFill
@ -110,7 +110,7 @@ _TitleScreen: ; 10ed67
; Clear screen tiles
hlbgcoord 0, 0
ld bc, 64 bgrows
ld bc, 64 * BG_MAP_WIDTH
ld a, " "
call ByteFill

30
macros/coords.asm
View File

@ -1,6 +1,3 @@
screenrows EQUS "* SCREEN_WIDTH"
bgrows EQUS "* BG_MAP_WIDTH"
hlcoord EQUS "coord hl,"
bccoord EQUS "coord bc,"
decoord EQUS "coord de,"
@ -8,9 +5,9 @@ decoord EQUS "coord de,"
coord: MACRO
; register, x, y[, origin]
if _NARG < 4
ld \1, (\3) screenrows + (\2) + TileMap
ld \1, (\3) * SCREEN_WIDTH + (\2) + TileMap
else
ld \1, (\3) screenrows + (\2) + \4
ld \1, (\3) * SCREEN_WIDTH + (\2) + \4
endc
ENDM
@ -21,25 +18,16 @@ debgcoord EQUS "bgcoord de,"
bgcoord: MACRO
; register, x, y[, origin]
if _NARG < 4
ld \1, (\3) bgrows + (\2) + vBGMap0
ld \1, (\3) * BG_MAP_WIDTH + (\2) + vBGMap0
else
ld \1, (\3) bgrows + (\2) + \4
ld \1, (\3) * BG_MAP_WIDTH + (\2) + \4
endc
ENDM
hldims EQUS "dims hl,"
bcdims EQUS "dims bc,"
dedims EQUS "dims de,"
dims: MACRO
; register, width, height
lb \1, \3, \2
ENDM
dwcoord: MACRO
; x, y
rept _NARG / 2
dw (\2) screenrows + (\1) + TileMap
dw (\2) * SCREEN_WIDTH + (\1) + TileMap
shift
shift
endr
@ -48,17 +36,17 @@ ENDM
ldcoord_a: MACRO
; x, y[, origin]
if _NARG < 3
ld [(\2) screenrows + (\1) + TileMap], a
ld [(\2) * SCREEN_WIDTH + (\1) + TileMap], a
else
ld [(\2) screenrows + (\1) + \3], a
ld [(\2) * SCREEN_WIDTH + (\1) + \3], a
endc
ENDM
lda_coord: MACRO
; x, y[, origin]
if _NARG < 3
ld a, [(\2) screenrows + (\1) + TileMap]
ld a, [(\2) * SCREEN_WIDTH + (\1) + TileMap]
else
ld a, [(\2) screenrows + (\1) + \3]
ld a, [(\2) * SCREEN_WIDTH + (\1) + \3]
endc
ENDM