pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-09-08 08:13:02 -07:00
Code Issues Packages Projects Releases Wiki Activity

Use OAM flags in dsprite data

Browse Source
This commit is contained in:
Remy Oukaour
2018-01-02 17:26:23 -05:00
parent 41de67edbd
commit 4f01dff6c2
6 changed files with 312 additions and 312 deletions
Download Patch File Download Diff File Expand all files Collapse all files

282
engine/card_flip.asm
View File

@@ -1210,29 +1210,29 @@ PlaceOAMCardBorder: ; e0849
.SpriteData: ; e0853
db 18
dsprite 0, 0, 0, 0, $04, $00
dsprite 0, 0, 1, 0, $06, $00
dsprite 0, 0, 2, 0, $06, $00
dsprite 0, 0, 3, 0, $06, $00
dsprite 0, 0, 4, 0, $04, $20
dsprite 0, 0, 0, 0, $04, 0
dsprite 0, 0, 1, 0, $06, 0
dsprite 0, 0, 2, 0, $06, 0
dsprite 0, 0, 3, 0, $06, 0
dsprite 0, 0, 4, 0, $04, 0 | X_FLIP
dsprite 1, 0, 0, 0, $05, $00
dsprite 1, 0, 4, 0, $05, $20
dsprite 1, 0, 0, 0, $05, 0
dsprite 1, 0, 4, 0, $05, 0 | X_FLIP
dsprite 2, 0, 0, 0, $05, $00
dsprite 2, 0, 4, 0, $05, $20
dsprite 2, 0, 0, 0, $05, 0
dsprite 2, 0, 4, 0, $05, 0 | X_FLIP
dsprite 3, 0, 0, 0, $05, $00
dsprite 3, 0, 4, 0, $05, $20
dsprite 3, 0, 0, 0, $05, 0
dsprite 3, 0, 4, 0, $05, 0 | X_FLIP
dsprite 4, 0, 0, 0, $05, $00
dsprite 4, 0, 4, 0, $05, $20
dsprite 4, 0, 4, 0, $05, 0 | X_FLIP
dsprite 5, 0, 0, 0, $04, $40
dsprite 5, 0, 1, 0, $06, $40
dsprite 5, 0, 2, 0, $06, $40
dsprite 5, 0, 3, 0, $06, $40
dsprite 5, 0, 4, 0, $04, $60
dsprite 5, 0, 0, 0, $04, 0 | Y_FLIP
dsprite 5, 0, 1, 0, $06, 0 | Y_FLIP
dsprite 5, 0, 2, 0, $06, 0 | Y_FLIP
dsprite 5, 0, 3, 0, $06, 0 | Y_FLIP
dsprite 5, 0, 4, 0, $04, 0 | X_FLIP | Y_FLIP
; e089c
ChooseCard_HandleJoypad: ; e089c
@@ -1471,145 +1471,145 @@ ENDM
.SingleTile: ; e0a41
db 6
dsprite 0, 0, -1, 7, $00, $80
dsprite 0, 0, 0, 0, $02, $80
dsprite 0, 0, 1, 0, $03, $80
dsprite 0, 5, -1, 7, $00, $c0
dsprite 0, 5, 0, 0, $02, $c0
dsprite 0, 5, 1, 0, $03, $80
dsprite 0, 0, -1, 7, $00, 0 | BEHIND_BG
dsprite 0, 0, 0, 0, $02, 0 | BEHIND_BG
dsprite 0, 0, 1, 0, $03, 0 | BEHIND_BG
dsprite 0, 5, -1, 7, $00, 0 | Y_FLIP | BEHIND_BG
dsprite 0, 5, 0, 0, $02, 0 | Y_FLIP | BEHIND_BG
dsprite 0, 5, 1, 0, $03, 0 | BEHIND_BG
.PokeGroup: ; e0a5a
db 26
dsprite 0, 0, -1, 7, $00, $80
dsprite 0, 0, 0, 0, $02, $80
dsprite 0, 0, 1, 0, $00, $a0
dsprite 1, 0, -1, 7, $01, $80
dsprite 1, 0, 1, 0, $01, $a0
dsprite 2, 0, -1, 7, $01, $80
dsprite 2, 0, 1, 0, $03, $80
dsprite 3, 0, -1, 7, $01, $80
dsprite 3, 0, 1, 0, $03, $80
dsprite 4, 0, -1, 7, $01, $80
dsprite 4, 0, 1, 0, $03, $80
dsprite 5, 0, -1, 7, $01, $80
dsprite 5, 0, 1, 0, $03, $80
dsprite 6, 0, -1, 7, $01, $80
dsprite 6, 0, 1, 0, $03, $80
dsprite 7, 0, -1, 7, $01, $80
dsprite 7, 0, 1, 0, $03, $80
dsprite 8, 0, -1, 7, $01, $80
dsprite 8, 0, 1, 0, $03, $80
dsprite 9, 0, -1, 7, $01, $80
dsprite 9, 0, 1, 0, $03, $80
dsprite 10, 0, -1, 7, $01, $80
dsprite 10, 0, 1, 0, $03, $80
dsprite 10, 1, -1, 7, $00, $c0
dsprite 10, 1, 0, 0, $02, $c0
dsprite 10, 1, 1, 0, $03, $80
dsprite 0, 0, -1, 7, $00, 0 | BEHIND_BG
dsprite 0, 0, 0, 0, $02, 0 | BEHIND_BG
dsprite 0, 0, 1, 0, $00, 0 | X_FLIP | BEHIND_BG
dsprite 1, 0, -1, 7, $01, 0 | BEHIND_BG
dsprite 1, 0, 1, 0, $01, 0 | X_FLIP | BEHIND_BG
dsprite 2, 0, -1, 7, $01, 0 | BEHIND_BG
dsprite 2, 0, 1, 0, $03, 0 | BEHIND_BG
dsprite 3, 0, -1, 7, $01, 0 | BEHIND_BG
dsprite 3, 0, 1, 0, $03, 0 | BEHIND_BG
dsprite 4, 0, -1, 7, $01, 0 | BEHIND_BG
dsprite 4, 0, 1, 0, $03, 0 | BEHIND_BG
dsprite 5, 0, -1, 7, $01, 0 | BEHIND_BG
dsprite 5, 0, 1, 0, $03, 0 | BEHIND_BG
dsprite 6, 0, -1, 7, $01, 0 | BEHIND_BG
dsprite 6, 0, 1, 0, $03, 0 | BEHIND_BG
dsprite 7, 0, -1, 7, $01, 0 | BEHIND_BG
dsprite 7, 0, 1, 0, $03, 0 | BEHIND_BG
dsprite 8, 0, -1, 7, $01, 0 | BEHIND_BG
dsprite 8, 0, 1, 0, $03, 0 | BEHIND_BG
dsprite 9, 0, -1, 7, $01, 0 | BEHIND_BG
dsprite 9, 0, 1, 0, $03, 0 | BEHIND_BG
dsprite 10, 0, -1, 7, $01, 0 | BEHIND_BG
dsprite 10, 0, 1, 0, $03, 0 | BEHIND_BG
dsprite 10, 1, -1, 7, $00, 0 | Y_FLIP | BEHIND_BG
dsprite 10, 1, 0, 0, $02, 0 | Y_FLIP | BEHIND_BG
dsprite 10, 1, 1, 0, $03, 0 | BEHIND_BG
.NumGroup: ; e0ac3
db 20
dsprite 0, 0, -1, 7, $00, $80
dsprite 0, 0, 0, 0, $02, $80
dsprite 0, 0, 1, 0, $02, $80
dsprite 0, 0, 2, 0, $03, $80
dsprite 0, 0, 3, 0, $02, $80
dsprite 0, 0, 4, 0, $03, $80
dsprite 0, 0, 5, 0, $02, $80
dsprite 0, 0, 6, 0, $03, $80
dsprite 0, 0, 7, 0, $02, $80
dsprite 0, 0, 8, 0, $03, $80
dsprite 0, 5, -1, 7, $00, $c0
dsprite 0, 5, 0, 0, $02, $c0
dsprite 0, 5, 1, 0, $02, $c0
dsprite 0, 5, 2, 0, $03, $80
dsprite 0, 5, 3, 0, $02, $c0
dsprite 0, 5, 4, 0, $03, $80
dsprite 0, 5, 5, 0, $02, $c0
dsprite 0, 5, 6, 0, $03, $80
dsprite 0, 5, 7, 0, $02, $c0
dsprite 0, 5, 8, 0, $03, $80
dsprite 0, 0, -1, 7, $00, 0 | BEHIND_BG
dsprite 0, 0, 0, 0, $02, 0 | BEHIND_BG
dsprite 0, 0, 1, 0, $02, 0 | BEHIND_BG
dsprite 0, 0, 2, 0, $03, 0 | BEHIND_BG
dsprite 0, 0, 3, 0, $02, 0 | BEHIND_BG
dsprite 0, 0, 4, 0, $03, 0 | BEHIND_BG
dsprite 0, 0, 5, 0, $02, 0 | BEHIND_BG
dsprite 0, 0, 6, 0, $03, 0 | BEHIND_BG
dsprite 0, 0, 7, 0, $02, 0 | BEHIND_BG
dsprite 0, 0, 8, 0, $03, 0 | BEHIND_BG
dsprite 0, 5, -1, 7, $00, 0 | Y_FLIP | BEHIND_BG
dsprite 0, 5, 0, 0, $02, 0 | Y_FLIP | BEHIND_BG
dsprite 0, 5, 1, 0, $02, 0 | Y_FLIP | BEHIND_BG
dsprite 0, 5, 2, 0, $03, 0 | BEHIND_BG
dsprite 0, 5, 3, 0, $02, 0 | Y_FLIP | BEHIND_BG
dsprite 0, 5, 4, 0, $03, 0 | BEHIND_BG
dsprite 0, 5, 5, 0, $02, 0 | Y_FLIP | BEHIND_BG
dsprite 0, 5, 6, 0, $03, 0 | BEHIND_BG
dsprite 0, 5, 7, 0, $02, 0 | Y_FLIP | BEHIND_BG
dsprite 0, 5, 8, 0, $03, 0 | BEHIND_BG
.NumGroupPair: ; e0b14
db 30
dsprite 0, 0, 0, 0, $00, $80
dsprite 0, 0, 1, 0, $02, $80
dsprite 0, 0, 2, 0, $02, $80
dsprite 0, 0, 3, 0, $03, $80
dsprite 0, 0, 4, 0, $02, $80
dsprite 0, 0, 5, 0, $03, $80
dsprite 0, 0, 6, 0, $02, $80
dsprite 0, 0, 7, 0, $03, $80
dsprite 0, 0, 8, 0, $02, $80
dsprite 0, 0, 9, 0, $03, $80
dsprite 1, 0, 0, 0, $01, $80
dsprite 1, 0, 3, 0, $03, $80
dsprite 1, 0, 5, 0, $03, $80
dsprite 1, 0, 7, 0, $03, $80
dsprite 1, 0, 9, 0, $03, $80
dsprite 2, 0, 0, 0, $01, $80
dsprite 2, 0, 3, 0, $03, $80
dsprite 2, 0, 5, 0, $03, $80
dsprite 2, 0, 7, 0, $03, $80
dsprite 2, 0, 9, 0, $03, $80
dsprite 2, 1, 0, 0, $00, $c0
dsprite 2, 1, 1, 0, $02, $c0
dsprite 2, 1, 2, 0, $02, $c0
dsprite 2, 1, 3, 0, $03, $80
dsprite 2, 1, 4, 0, $03, $80
dsprite 2, 1, 5, 0, $03, $80
dsprite 2, 1, 6, 0, $03, $80
dsprite 2, 1, 7, 0, $03, $80
dsprite 2, 1, 8, 0, $03, $80
dsprite 2, 1, 9, 0, $03, $80
dsprite 0, 0, 0, 0, $00, 0 | BEHIND_BG
dsprite 0, 0, 1, 0, $02, 0 | BEHIND_BG
dsprite 0, 0, 2, 0, $02, 0 | BEHIND_BG
dsprite 0, 0, 3, 0, $03, 0 | BEHIND_BG
dsprite 0, 0, 4, 0, $02, 0 | BEHIND_BG
dsprite 0, 0, 5, 0, $03, 0 | BEHIND_BG
dsprite 0, 0, 6, 0, $02, 0 | BEHIND_BG
dsprite 0, 0, 7, 0, $03, 0 | BEHIND_BG
dsprite 0, 0, 8, 0, $02, 0 | BEHIND_BG
dsprite 0, 0, 9, 0, $03, 0 | BEHIND_BG
dsprite 1, 0, 0, 0, $01, 0 | BEHIND_BG
dsprite 1, 0, 3, 0, $03, 0 | BEHIND_BG
dsprite 1, 0, 5, 0, $03, 0 | BEHIND_BG
dsprite 1, 0, 7, 0, $03, 0 | BEHIND_BG
dsprite 1, 0, 9, 0, $03, 0 | BEHIND_BG
dsprite 2, 0, 0, 0, $01, 0 | BEHIND_BG
dsprite 2, 0, 3, 0, $03, 0 | BEHIND_BG
dsprite 2, 0, 5, 0, $03, 0 | BEHIND_BG
dsprite 2, 0, 7, 0, $03, 0 | BEHIND_BG
dsprite 2, 0, 9, 0, $03, 0 | BEHIND_BG
dsprite 2, 1, 0, 0, $00, 0 | Y_FLIP | BEHIND_BG
dsprite 2, 1, 1, 0, $02, 0 | Y_FLIP | BEHIND_BG
dsprite 2, 1, 2, 0, $02, 0 | Y_FLIP | BEHIND_BG
dsprite 2, 1, 3, 0, $03, 0 | BEHIND_BG
dsprite 2, 1, 4, 0, $03, 0 | BEHIND_BG
dsprite 2, 1, 5, 0, $03, 0 | BEHIND_BG
dsprite 2, 1, 6, 0, $03, 0 | BEHIND_BG
dsprite 2, 1, 7, 0, $03, 0 | BEHIND_BG
dsprite 2, 1, 8, 0, $03, 0 | BEHIND_BG
dsprite 2, 1, 9, 0, $03, 0 | BEHIND_BG
.PokeGroupPair: ; e0b8d
db 38
dsprite 0, 0, -1, 7, $00, $80
dsprite 0, 0, 3, 0, $00, $a0
dsprite 1, 0, -1, 7, $01, $80
dsprite 1, 0, 3, 0, $01, $a0
dsprite 2, 0, -1, 7, $01, $80
dsprite 2, 0, 3, 0, $01, $a0
dsprite 3, 0, -1, 7, $01, $80
dsprite 3, 0, 1, 0, $03, $80
dsprite 3, 0, 3, 0, $03, $80
dsprite 4, 0, -1, 7, $01, $80
dsprite 4, 0, 1, 0, $03, $80
dsprite 4, 0, 3, 0, $03, $80
dsprite 5, 0, -1, 7, $01, $80
dsprite 5, 0, 1, 0, $03, $80
dsprite 5, 0, 3, 0, $03, $80
dsprite 6, 0, -1, 7, $01, $80
dsprite 6, 0, 1, 0, $03, $80
dsprite 6, 0, 3, 0, $03, $80
dsprite 7, 0, -1, 7, $01, $80
dsprite 7, 0, 1, 0, $03, $80
dsprite 7, 0, 3, 0, $03, $80
dsprite 8, 0, -1, 7, $01, $80
dsprite 8, 0, 1, 0, $03, $80
dsprite 8, 0, 3, 0, $03, $80
dsprite 9, 0, -1, 7, $01, $80
dsprite 9, 0, 1, 0, $03, $80
dsprite 9, 0, 3, 0, $03, $80
dsprite 10, 0, -1, 7, $01, $80
dsprite 10, 0, 1, 0, $03, $80
dsprite 10, 0, 3, 0, $03, $80
dsprite 11, 0, -1, 7, $01, $80
dsprite 11, 0, 1, 0, $03, $80
dsprite 11, 0, 3, 0, $03, $80
dsprite 11, 1, -1, 7, $00, $c0
dsprite 11, 1, 0, 0, $02, $c0
dsprite 11, 1, 1, 0, $03, $c0
dsprite 11, 1, 2, 0, $02, $c0
dsprite 11, 1, 3, 0, $03, $e0
dsprite 0, 0, -1, 7, $00, 0 | BEHIND_BG
dsprite 0, 0, 3, 0, $00, 0 | X_FLIP | BEHIND_BG
dsprite 1, 0, -1, 7, $01, 0 | BEHIND_BG
dsprite 1, 0, 3, 0, $01, 0 | X_FLIP | BEHIND_BG
dsprite 2, 0, -1, 7, $01, 0 | BEHIND_BG
dsprite 2, 0, 3, 0, $01, 0 | X_FLIP | BEHIND_BG
dsprite 3, 0, -1, 7, $01, 0 | BEHIND_BG
dsprite 3, 0, 1, 0, $03, 0 | BEHIND_BG
dsprite 3, 0, 3, 0, $03, 0 | BEHIND_BG
dsprite 4, 0, -1, 7, $01, 0 | BEHIND_BG
dsprite 4, 0, 1, 0, $03, 0 | BEHIND_BG
dsprite 4, 0, 3, 0, $03, 0 | BEHIND_BG
dsprite 5, 0, -1, 7, $01, 0 | BEHIND_BG
dsprite 5, 0, 1, 0, $03, 0 | BEHIND_BG
dsprite 5, 0, 3, 0, $03, 0 | BEHIND_BG
dsprite 6, 0, -1, 7, $01, 0 | BEHIND_BG
dsprite 6, 0, 1, 0, $03, 0 | BEHIND_BG
dsprite 6, 0, 3, 0, $03, 0 | BEHIND_BG
dsprite 7, 0, -1, 7, $01, 0 | BEHIND_BG
dsprite 7, 0, 1, 0, $03, 0 | BEHIND_BG
dsprite 7, 0, 3, 0, $03, 0 | BEHIND_BG
dsprite 8, 0, -1, 7, $01, 0 | BEHIND_BG
dsprite 8, 0, 1, 0, $03, 0 | BEHIND_BG
dsprite 8, 0, 3, 0, $03, 0 | BEHIND_BG
dsprite 9, 0, -1, 7, $01, 0 | BEHIND_BG
dsprite 9, 0, 1, 0, $03, 0 | BEHIND_BG
dsprite 9, 0, 3, 0, $03, 0 | BEHIND_BG
dsprite 10, 0, -1, 7, $01, 0 | BEHIND_BG
dsprite 10, 0, 1, 0, $03, 0 | BEHIND_BG
dsprite 10, 0, 3, 0, $03, 0 | BEHIND_BG
dsprite 11, 0, -1, 7, $01, 0 | BEHIND_BG
dsprite 11, 0, 1, 0, $03, 0 | BEHIND_BG
dsprite 11, 0, 3, 0, $03, 0 | BEHIND_BG
dsprite 11, 1, -1, 7, $00, 0 | Y_FLIP | BEHIND_BG
dsprite 11, 1, 0, 0, $02, 0 | Y_FLIP | BEHIND_BG
dsprite 11, 1, 1, 0, $03, 0 | Y_FLIP | BEHIND_BG
dsprite 11, 1, 2, 0, $02, 0 | Y_FLIP | BEHIND_BG
dsprite 11, 1, 3, 0, $03, 0 | X_FLIP | Y_FLIP | BEHIND_BG
.Impossible: ; e0c26
db 4
dsprite 0, 0, 0, 0, $00, $80
dsprite 0, 0, 1, 0, $00, $a0
dsprite 1, 0, 0, 0, $00, $c0
dsprite 1, 0, 1, 0, $00, $e0
dsprite 0, 0, 0, 0, $00, 0 | BEHIND_BG
dsprite 0, 0, 1, 0, $00, 0 | X_FLIP | BEHIND_BG
dsprite 1, 0, 0, 0, $00, 0 | Y_FLIP | BEHIND_BG
dsprite 1, 0, 1, 0, $00, 0 | X_FLIP | Y_FLIP | BEHIND_BG
; e0c37
CardFlip_InitAttrPals: ; e0c37 (38:4c37)