diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-07-19 23:04:16 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-19 23:04:16 -0400 |
| commit | 0177688ad4d923c4970009fa87df48605bb43ed6 (patch) | |
| tree | 4c44fbb1813e78eb00f7c1690d2c23099a49113b /constants/oam_constants.asm | |
| parent | Merge pull request #277 from Rangi42/master (diff) | |
| parent | Missingno's Pokédex weight is two bytes like the rest (diff) | |
| download | pokeyellow-0177688ad4d923c4970009fa87df48605bb43ed6.tar.gz pokeyellow-0177688ad4d923c4970009fa87df48605bb43ed6.tar.xz pokeyellow-0177688ad4d923c4970009fa87df48605bb43ed6.zip | |
Merge pull request #279 from Rangi42/master
Identify sprite and battle animation data
Diffstat (limited to 'constants/oam_constants.asm')
| -rwxr-xr-x | constants/oam_constants.asm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/constants/oam_constants.asm b/constants/oam_constants.asm index 2d34048d..f0f06025 100755 --- a/constants/oam_constants.asm +++ b/constants/oam_constants.asm @@ -13,6 +13,7 @@ OAM_Y_FLIP EQU 6 OAM_PRIORITY EQU 7 ; 0: OBJ above BG, 1: OBJ behind BG (colors 1-3) ; OAM attribute masks -OAM_HFLIP EQU 1 << OAM_X_FLIP ; horizontal flip -OAM_VFLIP EQU 1 << OAM_Y_FLIP ; vertical flip +OAM_OBP1 EQU 1 << OAM_OBP_NUM ; OBJ palette 1 +OAM_HFLIP EQU 1 << OAM_X_FLIP ; horizontal flip +OAM_VFLIP EQU 1 << OAM_Y_FLIP ; vertical flip OAM_BEHIND_BG EQU 1 << OAM_PRIORITY ; behind bg (except color 0) |