summaryrefslogtreecommitdiff
path: root/gbhw.asm
diff options
context:
space:
mode:
authorsurskitty <surskitty@gmail.com>2017-12-12 00:50:55 -0500
committersurskitty <surskitty@gmail.com>2017-12-12 00:50:55 -0500
commit096afdcdaca0714612f3670a3c4a670f312c1c3f (patch)
tree0c0bedcd311ab83262e31cf6d9d4c37257143acc /gbhw.asm
parent98128cd4d8457948e7136a16e08bacff0bc3529d (diff)
parentf6942b9a136b2ee3b25159ebc4d54509a42c5266 (diff)
Merge branch 'master' of github.com:pret/pokecrystal
Diffstat (limited to 'gbhw.asm')
-rw-r--r--gbhw.asm7
1 files changed, 4 insertions, 3 deletions
diff --git a/gbhw.asm b/gbhw.asm
index 3ee05432c..4f7e7747f 100644
--- a/gbhw.asm
+++ b/gbhw.asm
@@ -36,9 +36,10 @@ OAM_X_FLIP EQU 5
OAM_Y_FLIP EQU 6
OAM_PRIORITY EQU 7 ; 0: OBJ above BG, 1: OBJ behind BG (colors 1-3)
-X_FLIP EQU 1 << OAM_X_FLIP
-Y_FLIP EQU 1 << OAM_Y_FLIP
-BEHIND_BG EQU 1 << OAM_PRIORITY
+VRAM_BANK_1 EQU 1 << OAM_TILE_BANK
+X_FLIP EQU 1 << OAM_X_FLIP
+Y_FLIP EQU 1 << OAM_Y_FLIP
+BEHIND_BG EQU 1 << OAM_PRIORITY
; Hardware registers
rJOYP EQU $ff00 ; Joypad (R/W)