Consolidate coord macros

This commit is contained in:
dannye 2015-07-18 15:52:03 -05:00
parent 0ad1153f16
commit 148d3f3cf2
58 changed files with 528 additions and 539 deletions

View file

@ -202,7 +202,7 @@ BattleTransition_Spiral: ; 70a72 (1c:4a72)
call BattleTransition_InwardSpiral
jr .done
.outwardSpiral
hlCoord 10, 10
coord hl, 10, 10
ld a, $3
ld [wd09f], a
ld a, l
@ -231,7 +231,7 @@ BattleTransition_Spiral: ; 70a72 (1c:4a72)
BattleTransition_InwardSpiral: ; 70aaa (1c:4aaa)
ld a, $7
ld [wWhichTrade], a
hlCoord 0, 0
coord hl, 0, 0
ld c, $11
ld de, SCREEN_WIDTH
call BattleTransition_InwardSpiral_
@ -371,20 +371,20 @@ BattleTransition_Shrink: ; 70b7f (1c:4b7f)
push bc
xor a
ld [H_AUTOBGTRANSFERENABLED], a
hlCoord 0, 7
deCoord 0, 8
coord hl, 0, 7
coord de, 0, 8
ld bc, -SCREEN_WIDTH * 2
call BattleTransition_CopyTiles1
hlCoord 0, 10
deCoord 0, 9
coord hl, 0, 10
coord de, 0, 9
ld bc, SCREEN_WIDTH * 2
call BattleTransition_CopyTiles1
hlCoord 8, 0
deCoord 9, 0
coord hl, 8, 0
coord de, 9, 0
ld bc, -2
call BattleTransition_CopyTiles2
hlCoord 11, 0
deCoord 10, 0
coord hl, 11, 0
coord de, 10, 0
ld bc, $2
call BattleTransition_CopyTiles2
ld a, $1
@ -405,20 +405,20 @@ BattleTransition_Split: ; 70bca (1c:4bca)
ld [H_AUTOBGTRANSFERENABLED], a
.loop
push bc
hlCoord 0, 16
deCoord 0, 17
coord hl, 0, 16
coord de, 0, 17
ld bc, -SCREEN_WIDTH * 2
call BattleTransition_CopyTiles1
hlCoord 0, 1
deCoord 0, 0
coord hl, 0, 1
coord de, 0, 0
ld bc, SCREEN_WIDTH * 2
call BattleTransition_CopyTiles1
hlCoord 18, 0
deCoord 19, 0
coord hl, 18, 0
coord de, 19, 0
ld bc, -2
call BattleTransition_CopyTiles2
hlCoord 1, 0
deCoord 0, 0
coord hl, 1, 0
coord de, 0, 0
ld bc, $2
call BattleTransition_CopyTiles2
call BattleTransition_TransferDelay3
@ -514,8 +514,8 @@ BattleTransition_CopyTiles2: ; 70c3f (1c:4c3f)
; used for high level wild dungeon battles
BattleTransition_VerticalStripes: ; 70c7e (1c:4c7e)
ld c, SCREEN_HEIGHT
hlCoord 0, 0
deCoord 1, 17
coord hl, 0, 0
coord de, 1, 17
xor a
ld [H_AUTOBGTRANSFERENABLED], a
.loop
@ -553,8 +553,8 @@ BattleTransition_VerticalStripes_: ; 70caa (1c:4caa)
; used for low level wild dungeon battles
BattleTransition_HorizontalStripes: ; 70cb4 (1c:4cb4)
ld c, SCREEN_WIDTH
hlCoord 0, 0
deCoord 19, 1
coord hl, 0, 0
coord de, 19, 1
xor a
ld [H_AUTOBGTRANSFERENABLED], a
.loop