diff options
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/events/heal_machine_anim.asm | 28 | ||||
| -rw-r--r-- | engine/games/card_flip.asm | 284 | ||||
| -rw-r--r-- | engine/games/unown_puzzle.asm | 36 | ||||
| -rw-r--r-- | engine/link/mystery_gift.asm | 32 | ||||
| -rw-r--r-- | engine/menus/trainer_card.asm | 16 | ||||
| -rw-r--r-- | engine/movie/unused_title.asm | 80 | ||||
| -rw-r--r-- | engine/pokedex/pokedex.asm | 184 | ||||
| -rw-r--r-- | engine/pokedex/pokedex_2.asm | 18 | ||||
| -rw-r--r-- | engine/pokemon/bills_pc.asm | 68 |
9 files changed, 373 insertions, 373 deletions
diff --git a/engine/events/heal_machine_anim.asm b/engine/events/heal_machine_anim.asm index 28b2c8a4c..2259752b3 100644 --- a/engine/events/heal_machine_anim.asm +++ b/engine/events/heal_machine_anim.asm @@ -134,25 +134,25 @@ ENDM ret .PC_ElmsLab_OAM: - dsprite 4, 0, 4, 2, $7c, PAL_OW_TREE | OBP_NUM - dsprite 4, 0, 4, 6, $7c, PAL_OW_TREE | OBP_NUM - dsprite 4, 6, 4, 0, $7d, PAL_OW_TREE | OBP_NUM - dsprite 4, 6, 5, 0, $7d, PAL_OW_TREE | OBP_NUM | X_FLIP - dsprite 5, 3, 4, 0, $7d, PAL_OW_TREE | OBP_NUM - dsprite 5, 3, 5, 0, $7d, PAL_OW_TREE | OBP_NUM | X_FLIP - dsprite 6, 0, 4, 0, $7d, PAL_OW_TREE | OBP_NUM - dsprite 6, 0, 5, 0, $7d, PAL_OW_TREE | OBP_NUM | X_FLIP + dbsprite 4, 4, 2, 0, $7c, PAL_OW_TREE | OBP_NUM + dbsprite 4, 4, 6, 0, $7c, PAL_OW_TREE | OBP_NUM + dbsprite 4, 4, 0, 6, $7d, PAL_OW_TREE | OBP_NUM + dbsprite 5, 4, 0, 6, $7d, PAL_OW_TREE | OBP_NUM | X_FLIP + dbsprite 4, 5, 0, 3, $7d, PAL_OW_TREE | OBP_NUM + dbsprite 5, 5, 0, 3, $7d, PAL_OW_TREE | OBP_NUM | X_FLIP + dbsprite 4, 6, 0, 0, $7d, PAL_OW_TREE | OBP_NUM + dbsprite 5, 6, 0, 0, $7d, PAL_OW_TREE | OBP_NUM | X_FLIP .HealMachineGFX: INCBIN "gfx/overworld/heal_machine.2bpp" .HOF_OAM: - dsprite 7, 4, 10, 1, $7d, PAL_OW_TREE | OBP_NUM - dsprite 7, 4, 10, 6, $7d, PAL_OW_TREE | OBP_NUM - dsprite 7, 3, 9, 5, $7d, PAL_OW_TREE | OBP_NUM - dsprite 7, 3, 11, 2, $7d, PAL_OW_TREE | OBP_NUM - dsprite 7, 1, 9, 1, $7d, PAL_OW_TREE | OBP_NUM - dsprite 7, 1, 11, 5, $7d, PAL_OW_TREE | OBP_NUM + dbsprite 10, 7, 1, 4, $7d, PAL_OW_TREE | OBP_NUM + dbsprite 10, 7, 6, 4, $7d, PAL_OW_TREE | OBP_NUM + dbsprite 9, 7, 5, 3, $7d, PAL_OW_TREE | OBP_NUM + dbsprite 11, 7, 2, 3, $7d, PAL_OW_TREE | OBP_NUM + dbsprite 9, 7, 1, 1, $7d, PAL_OW_TREE | OBP_NUM + dbsprite 11, 7, 5, 1, $7d, PAL_OW_TREE | OBP_NUM .LoadPalettes: call IsCGB diff --git a/engine/games/card_flip.asm b/engine/games/card_flip.asm index c130b470a..499d8a1af 100644 --- a/engine/games/card_flip.asm +++ b/engine/games/card_flip.asm @@ -1158,29 +1158,29 @@ PlaceOAMCardBorder: .SpriteData: db 18 - 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 + dbsprite 0, 0, 0, 0, $04, 0 + dbsprite 1, 0, 0, 0, $06, 0 + dbsprite 2, 0, 0, 0, $06, 0 + dbsprite 3, 0, 0, 0, $06, 0 + dbsprite 4, 0, 0, 0, $04, 0 | X_FLIP - dsprite 1, 0, 0, 0, $05, 0 - dsprite 1, 0, 4, 0, $05, 0 | X_FLIP + dbsprite 0, 1, 0, 0, $05, 0 + dbsprite 4, 1, 0, 0, $05, 0 | X_FLIP - dsprite 2, 0, 0, 0, $05, 0 - dsprite 2, 0, 4, 0, $05, 0 | X_FLIP + dbsprite 0, 2, 0, 0, $05, 0 + dbsprite 4, 2, 0, 0, $05, 0 | X_FLIP - dsprite 3, 0, 0, 0, $05, 0 - dsprite 3, 0, 4, 0, $05, 0 | X_FLIP + dbsprite 0, 3, 0, 0, $05, 0 + dbsprite 4, 3, 0, 0, $05, 0 | X_FLIP - dsprite 4, 0, 0, 0, $05, $00 - dsprite 4, 0, 4, 0, $05, 0 | X_FLIP + dbsprite 0, 4, 0, 0, $05, $00 + dbsprite 4, 4, 0, 0, $05, 0 | X_FLIP - 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 + dbsprite 0, 5, 0, 0, $04, 0 | Y_FLIP + dbsprite 1, 5, 0, 0, $06, 0 | Y_FLIP + dbsprite 2, 5, 0, 0, $06, 0 | Y_FLIP + dbsprite 3, 5, 0, 0, $06, 0 | Y_FLIP + dbsprite 4, 5, 0, 0, $04, 0 | X_FLIP | Y_FLIP ChooseCard_HandleJoypad: ld hl, hJoyLast @@ -1413,145 +1413,145 @@ ENDM .SingleTile: db 6 - dsprite 0, 0, -1, 7, $00, 0 | PRIORITY - dsprite 0, 0, 0, 0, $02, 0 | PRIORITY - dsprite 0, 0, 1, 0, $03, 0 | PRIORITY - dsprite 0, 5, -1, 7, $00, 0 | Y_FLIP | PRIORITY - dsprite 0, 5, 0, 0, $02, 0 | Y_FLIP | PRIORITY - dsprite 0, 5, 1, 0, $03, 0 | PRIORITY + dbsprite -1, 0, 7, 0, $00, 0 | PRIORITY + dbsprite 0, 0, 0, 0, $02, 0 | PRIORITY + dbsprite 1, 0, 0, 0, $03, 0 | PRIORITY + dbsprite -1, 0, 7, 5, $00, 0 | Y_FLIP | PRIORITY + dbsprite 0, 0, 0, 5, $02, 0 | Y_FLIP | PRIORITY + dbsprite 1, 0, 0, 5, $03, 0 | PRIORITY .PokeGroup: db 26 - dsprite 0, 0, -1, 7, $00, 0 | PRIORITY - dsprite 0, 0, 0, 0, $02, 0 | PRIORITY - dsprite 0, 0, 1, 0, $00, 0 | X_FLIP | PRIORITY - dsprite 1, 0, -1, 7, $01, 0 | PRIORITY - dsprite 1, 0, 1, 0, $01, 0 | X_FLIP | PRIORITY - dsprite 2, 0, -1, 7, $01, 0 | PRIORITY - dsprite 2, 0, 1, 0, $03, 0 | PRIORITY - dsprite 3, 0, -1, 7, $01, 0 | PRIORITY - dsprite 3, 0, 1, 0, $03, 0 | PRIORITY - dsprite 4, 0, -1, 7, $01, 0 | PRIORITY - dsprite 4, 0, 1, 0, $03, 0 | PRIORITY - dsprite 5, 0, -1, 7, $01, 0 | PRIORITY - dsprite 5, 0, 1, 0, $03, 0 | PRIORITY - dsprite 6, 0, -1, 7, $01, 0 | PRIORITY - dsprite 6, 0, 1, 0, $03, 0 | PRIORITY - dsprite 7, 0, -1, 7, $01, 0 | PRIORITY - dsprite 7, 0, 1, 0, $03, 0 | PRIORITY - dsprite 8, 0, -1, 7, $01, 0 | PRIORITY - dsprite 8, 0, 1, 0, $03, 0 | PRIORITY - dsprite 9, 0, -1, 7, $01, 0 | PRIORITY - dsprite 9, 0, 1, 0, $03, 0 | PRIORITY - dsprite 10, 0, -1, 7, $01, 0 | PRIORITY - dsprite 10, 0, 1, 0, $03, 0 | PRIORITY - dsprite 10, 1, -1, 7, $00, 0 | Y_FLIP | PRIORITY - dsprite 10, 1, 0, 0, $02, 0 | Y_FLIP | PRIORITY - dsprite 10, 1, 1, 0, $03, 0 | PRIORITY + dbsprite -1, 0, 7, 0, $00, 0 | PRIORITY + dbsprite 0, 0, 0, 0, $02, 0 | PRIORITY + dbsprite 1, 0, 0, 0, $00, 0 | X_FLIP | PRIORITY + dbsprite -1, 1, 7, 0, $01, 0 | PRIORITY + dbsprite 1, 1, 0, 0, $01, 0 | X_FLIP | PRIORITY + dbsprite -1, 2, 7, 0, $01, 0 | PRIORITY + dbsprite 1, 2, 0, 0, $03, 0 | PRIORITY + dbsprite -1, 3, 7, 0, $01, 0 | PRIORITY + dbsprite 1, 3, 0, 0, $03, 0 | PRIORITY + dbsprite -1, 4, 7, 0, $01, 0 | PRIORITY + dbsprite 1, 4, 0, 0, $03, 0 | PRIORITY + dbsprite -1, 5, 7, 0, $01, 0 | PRIORITY + dbsprite 1, 5, 0, 0, $03, 0 | PRIORITY + dbsprite -1, 6, 7, 0, $01, 0 | PRIORITY + dbsprite 1, 6, 0, 0, $03, 0 | PRIORITY + dbsprite -1, 7, 7, 0, $01, 0 | PRIORITY + dbsprite 1, 7, 0, 0, $03, 0 | PRIORITY + dbsprite -1, 8, 7, 0, $01, 0 | PRIORITY + dbsprite 1, 8, 0, 0, $03, 0 | PRIORITY + dbsprite -1, 9, 7, 0, $01, 0 | PRIORITY + dbsprite 1, 9, 0, 0, $03, 0 | PRIORITY + dbsprite -1, 10, 7, 0, $01, 0 | PRIORITY + dbsprite 1, 10, 0, 0, $03, 0 | PRIORITY + dbsprite -1, 10, 7, 1, $00, 0 | Y_FLIP | PRIORITY + dbsprite 0, 10, 0, 1, $02, 0 | Y_FLIP | PRIORITY + dbsprite 1, 10, 0, 1, $03, 0 | PRIORITY .NumGroup: db 20 - dsprite 0, 0, -1, 7, $00, 0 | PRIORITY - dsprite 0, 0, 0, 0, $02, 0 | PRIORITY - dsprite 0, 0, 1, 0, $02, 0 | PRIORITY - dsprite 0, 0, 2, 0, $03, 0 | PRIORITY - dsprite 0, 0, 3, 0, $02, 0 | PRIORITY - dsprite 0, 0, 4, 0, $03, 0 | PRIORITY - dsprite 0, 0, 5, 0, $02, 0 | PRIORITY - dsprite 0, 0, 6, 0, $03, 0 | PRIORITY - dsprite 0, 0, 7, 0, $02, 0 | PRIORITY - dsprite 0, 0, 8, 0, $03, 0 | PRIORITY - dsprite 0, 5, -1, 7, $00, 0 | Y_FLIP | PRIORITY - dsprite 0, 5, 0, 0, $02, 0 | Y_FLIP | PRIORITY - dsprite 0, 5, 1, 0, $02, 0 | Y_FLIP | PRIORITY - dsprite 0, 5, 2, 0, $03, 0 | PRIORITY - dsprite 0, 5, 3, 0, $02, 0 | Y_FLIP | PRIORITY - dsprite 0, 5, 4, 0, $03, 0 | PRIORITY - dsprite 0, 5, 5, 0, $02, 0 | Y_FLIP | PRIORITY - dsprite 0, 5, 6, 0, $03, 0 | PRIORITY - dsprite 0, 5, 7, 0, $02, 0 | Y_FLIP | PRIORITY - dsprite 0, 5, 8, 0, $03, 0 | PRIORITY + dbsprite -1, 0, 7, 0, $00, 0 | PRIORITY + dbsprite 0, 0, 0, 0, $02, 0 | PRIORITY + dbsprite 1, 0, 0, 0, $02, 0 | PRIORITY + dbsprite 2, 0, 0, 0, $03, 0 | PRIORITY + dbsprite 3, 0, 0, 0, $02, 0 | PRIORITY + dbsprite 4, 0, 0, 0, $03, 0 | PRIORITY + dbsprite 5, 0, 0, 0, $02, 0 | PRIORITY + dbsprite 6, 0, 0, 0, $03, 0 | PRIORITY + dbsprite 7, 0, 0, 0, $02, 0 | PRIORITY + dbsprite 8, 0, 0, 0, $03, 0 | PRIORITY + dbsprite -1, 0, 7, 5, $00, 0 | Y_FLIP | PRIORITY + dbsprite 0, 0, 0, 5, $02, 0 | Y_FLIP | PRIORITY + dbsprite 1, 0, 0, 5, $02, 0 | Y_FLIP | PRIORITY + dbsprite 2, 0, 0, 5, $03, 0 | PRIORITY + dbsprite 3, 0, 0, 5, $02, 0 | Y_FLIP | PRIORITY + dbsprite 4, 0, 0, 5, $03, 0 | PRIORITY + dbsprite 5, 0, 0, 5, $02, 0 | Y_FLIP | PRIORITY + dbsprite 6, 0, 0, 5, $03, 0 | PRIORITY + dbsprite 7, 0, 0, 5, $02, 0 | Y_FLIP | PRIORITY + dbsprite 8, 0, 0, 5, $03, 0 | PRIORITY .NumGroupPair: db 30 - dsprite 0, 0, 0, 0, $00, 0 | PRIORITY - dsprite 0, 0, 1, 0, $02, 0 | PRIORITY - dsprite 0, 0, 2, 0, $02, 0 | PRIORITY - dsprite 0, 0, 3, 0, $03, 0 | PRIORITY - dsprite 0, 0, 4, 0, $02, 0 | PRIORITY - dsprite 0, 0, 5, 0, $03, 0 | PRIORITY - dsprite 0, 0, 6, 0, $02, 0 | PRIORITY - dsprite 0, 0, 7, 0, $03, 0 | PRIORITY - dsprite 0, 0, 8, 0, $02, 0 | PRIORITY - dsprite 0, 0, 9, 0, $03, 0 | PRIORITY - dsprite 1, 0, 0, 0, $01, 0 | PRIORITY - dsprite 1, 0, 3, 0, $03, 0 | PRIORITY - dsprite 1, 0, 5, 0, $03, 0 | PRIORITY - dsprite 1, 0, 7, 0, $03, 0 | PRIORITY - dsprite 1, 0, 9, 0, $03, 0 | PRIORITY - dsprite 2, 0, 0, 0, $01, 0 | PRIORITY - dsprite 2, 0, 3, 0, $03, 0 | PRIORITY - dsprite 2, 0, 5, 0, $03, 0 | PRIORITY - dsprite 2, 0, 7, 0, $03, 0 | PRIORITY - dsprite 2, 0, 9, 0, $03, 0 | PRIORITY - dsprite 2, 1, 0, 0, $00, 0 | Y_FLIP | PRIORITY - dsprite 2, 1, 1, 0, $02, 0 | Y_FLIP | PRIORITY - dsprite 2, 1, 2, 0, $02, 0 | Y_FLIP | PRIORITY - dsprite 2, 1, 3, 0, $03, 0 | PRIORITY - dsprite 2, 1, 4, 0, $03, 0 | PRIORITY - dsprite 2, 1, 5, 0, $03, 0 | PRIORITY - dsprite 2, 1, 6, 0, $03, 0 | PRIORITY - dsprite 2, 1, 7, 0, $03, 0 | PRIORITY - dsprite 2, 1, 8, 0, $03, 0 | PRIORITY - dsprite 2, 1, 9, 0, $03, 0 | PRIORITY + dbsprite 0, 0, 0, 0, $00, 0 | PRIORITY + dbsprite 1, 0, 0, 0, $02, 0 | PRIORITY + dbsprite 2, 0, 0, 0, $02, 0 | PRIORITY + dbsprite 3, 0, 0, 0, $03, 0 | PRIORITY + dbsprite 4, 0, 0, 0, $02, 0 | PRIORITY + dbsprite 5, 0, 0, 0, $03, 0 | PRIORITY + dbsprite 6, 0, 0, 0, $02, 0 | PRIORITY + dbsprite 7, 0, 0, 0, $03, 0 | PRIORITY + dbsprite 8, 0, 0, 0, $02, 0 | PRIORITY + dbsprite 9, 0, 0, 0, $03, 0 | PRIORITY + dbsprite 0, 1, 0, 0, $01, 0 | PRIORITY + dbsprite 3, 1, 0, 0, $03, 0 | PRIORITY + dbsprite 5, 1, 0, 0, $03, 0 | PRIORITY + dbsprite 7, 1, 0, 0, $03, 0 | PRIORITY + dbsprite 9, 1, 0, 0, $03, 0 | PRIORITY + dbsprite 0, 2, 0, 0, $01, 0 | PRIORITY + dbsprite 3, 2, 0, 0, $03, 0 | PRIORITY + dbsprite 5, 2, 0, 0, $03, 0 | PRIORITY + dbsprite 7, 2, 0, 0, $03, 0 | PRIORITY + dbsprite 9, 2, 0, 0, $03, 0 | PRIORITY + dbsprite 0, 2, 0, 1, $00, 0 | Y_FLIP | PRIORITY + dbsprite 1, 2, 0, 1, $02, 0 | Y_FLIP | PRIORITY + dbsprite 2, 2, 0, 1, $02, 0 | Y_FLIP | PRIORITY + dbsprite 3, 2, 0, 1, $03, 0 | PRIORITY + dbsprite 4, 2, 0, 1, $03, 0 | PRIORITY + dbsprite 5, 2, 0, 1, $03, 0 | PRIORITY + dbsprite 6, 2, 0, 1, $03, 0 | PRIORITY + dbsprite 7, 2, 0, 1, $03, 0 | PRIORITY + dbsprite 8, 2, 0, 1, $03, 0 | PRIORITY + dbsprite 9, 2, 0, 1, $03, 0 | PRIORITY .PokeGroupPair: db 38 - dsprite 0, 0, -1, 7, $00, 0 | PRIORITY - dsprite 0, 0, 3, 0, $00, 0 | X_FLIP | PRIORITY - dsprite 1, 0, -1, 7, $01, 0 | PRIORITY - dsprite 1, 0, 3, 0, $01, 0 | X_FLIP | PRIORITY - dsprite 2, 0, -1, 7, $01, 0 | PRIORITY - dsprite 2, 0, 3, 0, $01, 0 | X_FLIP | PRIORITY - dsprite 3, 0, -1, 7, $01, 0 | PRIORITY - dsprite 3, 0, 1, 0, $03, 0 | PRIORITY - dsprite 3, 0, 3, 0, $03, 0 | PRIORITY - dsprite 4, 0, -1, 7, $01, 0 | PRIORITY - dsprite 4, 0, 1, 0, $03, 0 | PRIORITY - dsprite 4, 0, 3, 0, $03, 0 | PRIORITY - dsprite 5, 0, -1, 7, $01, 0 | PRIORITY - dsprite 5, 0, 1, 0, $03, 0 | PRIORITY - dsprite 5, 0, 3, 0, $03, 0 | PRIORITY - dsprite 6, 0, -1, 7, $01, 0 | PRIORITY - dsprite 6, 0, 1, 0, $03, 0 | PRIORITY - dsprite 6, 0, 3, 0, $03, 0 | PRIORITY - dsprite 7, 0, -1, 7, $01, 0 | PRIORITY - dsprite 7, 0, 1, 0, $03, 0 | PRIORITY - dsprite 7, 0, 3, 0, $03, 0 | PRIORITY - dsprite 8, 0, -1, 7, $01, 0 | PRIORITY - dsprite 8, 0, 1, 0, $03, 0 | PRIORITY - dsprite 8, 0, 3, 0, $03, 0 | PRIORITY - dsprite 9, 0, -1, 7, $01, 0 | PRIORITY - dsprite 9, 0, 1, 0, $03, 0 | PRIORITY - dsprite 9, 0, 3, 0, $03, 0 | PRIORITY - dsprite 10, 0, -1, 7, $01, 0 | PRIORITY - dsprite 10, 0, 1, 0, $03, 0 | PRIORITY - dsprite 10, 0, 3, 0, $03, 0 | PRIORITY - dsprite 11, 0, -1, 7, $01, 0 | PRIORITY - dsprite 11, 0, 1, 0, $03, 0 | PRIORITY - dsprite 11, 0, 3, 0, $03, 0 | PRIORITY - dsprite 11, 1, -1, 7, $00, 0 | Y_FLIP | PRIORITY - dsprite 11, 1, 0, 0, $02, 0 | Y_FLIP | PRIORITY - dsprite 11, 1, 1, 0, $03, 0 | Y_FLIP | PRIORITY - dsprite 11, 1, 2, 0, $02, 0 | Y_FLIP | PRIORITY - dsprite 11, 1, 3, 0, $03, 0 | X_FLIP | Y_FLIP | PRIORITY + dbsprite -1, 0, 7, 0, $00, 0 | PRIORITY + dbsprite 3, 0, 0, 0, $00, 0 | X_FLIP | PRIORITY + dbsprite -1, 1, 7, 0, $01, 0 | PRIORITY + dbsprite 3, 1, 0, 0, $01, 0 | X_FLIP | PRIORITY + dbsprite -1, 2, 7, 0, $01, 0 | PRIORITY + dbsprite 3, 2, 0, 0, $01, 0 | X_FLIP | PRIORITY + dbsprite -1, 3, 7, 0, $01, 0 | PRIORITY + dbsprite 1, 3, 0, 0, $03, 0 | PRIORITY + dbsprite 3, 3, 0, 0, $03, 0 | PRIORITY + dbsprite -1, 4, 7, 0, $01, 0 | PRIORITY + dbsprite 1, 4, 0, 0, $03, 0 | PRIORITY + dbsprite 3, 4, 0, 0, $03, 0 | PRIORITY + dbsprite -1, 5, 7, 0, $01, 0 | PRIORITY + dbsprite 1, 5, 0, 0, $03, 0 | PRIORITY + dbsprite 3, 5, 0, 0, $03, 0 | PRIORITY + dbsprite -1, 6, 7, 0, $01, 0 | PRIORITY + dbsprite 1, 6, 0, 0, $03, 0 | PRIORITY + dbsprite 3, 6, 0, 0, $03, 0 | PRIORITY + dbsprite -1, 7, 7, 0, $01, 0 | PRIORITY + dbsprite 1, 7, 0, 0, $03, 0 | PRIORITY + dbsprite 3, 7, 0, 0, $03, 0 | PRIORITY + dbsprite -1, 8, 7, 0, $01, 0 | PRIORITY + dbsprite 1, 8, 0, 0, $03, 0 | PRIORITY + dbsprite 3, 8, 0, 0, $03, 0 | PRIORITY + dbsprite -1, 9, 7, 0, $01, 0 | PRIORITY + dbsprite 1, 9, 0, 0, $03, 0 | PRIORITY + dbsprite 3, 9, 0, 0, $03, 0 | PRIORITY + dbsprite -1, 10, 7, 0, $01, 0 | PRIORITY + dbsprite 1, 10, 0, 0, $03, 0 | PRIORITY + dbsprite 3, 10, 0, 0, $03, 0 | PRIORITY + dbsprite -1, 11, 7, 0, $01, 0 | PRIORITY + dbsprite 1, 11, 0, 0, $03, 0 | PRIORITY + dbsprite 3, 11, 0, 0, $03, 0 | PRIORITY + dbsprite -1, 11, 7, 1, $00, 0 | Y_FLIP | PRIORITY + dbsprite 0, 11, 0, 1, $02, 0 | Y_FLIP | PRIORITY + dbsprite 1, 11, 0, 1, $03, 0 | Y_FLIP | PRIORITY + dbsprite 2, 11, 0, 1, $02, 0 | Y_FLIP | PRIORITY + dbsprite 3, 11, 0, 1, $03, 0 | X_FLIP | Y_FLIP | PRIORITY .Impossible: db 4 - dsprite 0, 0, 0, 0, $00, 0 | PRIORITY - dsprite 0, 0, 1, 0, $00, 0 | X_FLIP | PRIORITY - dsprite 1, 0, 0, 0, $00, 0 | Y_FLIP | PRIORITY - dsprite 1, 0, 1, 0, $00, 0 | X_FLIP | Y_FLIP | PRIORITY + dbsprite 0, 0, 0, 0, $00, 0 | PRIORITY + dbsprite 1, 0, 0, 0, $00, 0 | X_FLIP | PRIORITY + dbsprite 0, 1, 0, 0, $00, 0 | Y_FLIP | PRIORITY + dbsprite 1, 1, 0, 0, $00, 0 | X_FLIP | Y_FLIP | PRIORITY CardFlip_InitAttrPals: ldh a, [hCGB] diff --git a/engine/games/unown_puzzle.asm b/engine/games/unown_puzzle.asm index 15f0b2153..8a631159f 100644 --- a/engine/games/unown_puzzle.asm +++ b/engine/games/unown_puzzle.asm @@ -552,27 +552,27 @@ RedrawUnownPuzzlePieces: jr .loop .OAM_HoldingPiece: - dsprite -1, -4, -1, -4, $00, 0 - dsprite -1, -4, 0, -4, $01, 0 - dsprite -1, -4, 0, 4, $02, 0 - dsprite 0, -4, -1, -4, $0c, 0 - dsprite 0, -4, 0, -4, $0d, 0 - dsprite 0, -4, 0, 4, $0e, 0 - dsprite 0, 4, -1, -4, $18, 0 - dsprite 0, 4, 0, -4, $19, 0 - dsprite 0, 4, 0, 4, $1a, 0 + dbsprite -1, -1, -4, -4, $00, 0 + dbsprite 0, -1, -4, -4, $01, 0 + dbsprite 0, -1, 4, -4, $02, 0 + dbsprite -1, 0, -4, -4, $0c, 0 + dbsprite 0, 0, -4, -4, $0d, 0 + dbsprite 0, 0, 4, -4, $0e, 0 + dbsprite -1, 0, -4, 4, $18, 0 + dbsprite 0, 0, -4, 4, $19, 0 + dbsprite 0, 0, 4, 4, $1a, 0 db -1 .OAM_NotHoldingPiece: - dsprite -1, -4, -1, -4, $00, 0 - dsprite -1, -4, 0, -4, $01, 0 - dsprite -1, -4, 0, 4, $00, 0 | X_FLIP - dsprite 0, -4, -1, -4, $02, 0 - dsprite 0, -4, 0, -4, $03, 0 - dsprite 0, -4, 0, 4, $02, 0 | X_FLIP - dsprite 0, 4, -1, -4, $00, 0 | Y_FLIP - dsprite 0, 4, 0, -4, $01, 0 | Y_FLIP - dsprite 0, 4, 0, 4, $00, 0 | X_FLIP | Y_FLIP + dbsprite -1, -1, -4, -4, $00, 0 + dbsprite 0, -1, -4, -4, $01, 0 + dbsprite 0, -1, 4, -4, $00, 0 | X_FLIP + dbsprite -1, 0, -4, -4, $02, 0 + dbsprite 0, 0, -4, -4, $03, 0 + dbsprite 0, 0, 4, -4, $02, 0 | X_FLIP + dbsprite -1, 0, -4, 4, $00, 0 | Y_FLIP + dbsprite 0, 0, -4, 4, $01, 0 | Y_FLIP + dbsprite 0, 0, 4, 4, $00, 0 | X_FLIP | Y_FLIP db -1 UnownPuzzleCoordData: diff --git a/engine/link/mystery_gift.asm b/engine/link/mystery_gift.asm index 49e83c33e..76f94c680 100644 --- a/engine/link/mystery_gift.asm +++ b/engine/link/mystery_gift.asm @@ -1688,22 +1688,22 @@ Function1057d7: ret .OAM_data: - dsprite 2, 1, 6, 4, $00, 0 - dsprite 2, 1, 7, 4, $01, 0 - dsprite 2, 1, 8, 4, $02, 0 - dsprite 2, 1, 9, 4, $03, 0 - dsprite 3, 1, 6, 4, $04, 0 - dsprite 3, 1, 7, 4, $05, 0 - dsprite 3, 1, 8, 4, $06, 0 - dsprite 3, 1, 9, 4, $07, 0 - dsprite 0, 1, 11, 4, $00, 0 - dsprite 0, 1, 12, 4, $01, 0 - dsprite 0, 1, 13, 4, $02, 0 - dsprite 0, 1, 14, 4, $03, 0 - dsprite 1, 1, 11, 4, $04, 0 - dsprite 1, 1, 12, 4, $05, 0 - dsprite 1, 1, 13, 4, $06, 0 - dsprite 1, 1, 14, 4, $07, 0 + dbsprite 6, 2, 4, 1, $00, 0 + dbsprite 7, 2, 4, 1, $01, 0 + dbsprite 8, 2, 4, 1, $02, 0 + dbsprite 9, 2, 4, 1, $03, 0 + dbsprite 6, 3, 4, 1, $04, 0 + dbsprite 7, 3, 4, 1, $05, 0 + dbsprite 8, 3, 4, 1, $06, 0 + dbsprite 9, 3, 4, 1, $07, 0 + dbsprite 11, 0, 4, 1, $00, 0 + dbsprite 12, 0, 4, 1, $01, 0 + dbsprite 13, 0, 4, 1, $02, 0 + dbsprite 14, 0, 4, 1, $03, 0 + dbsprite 11, 1, 4, 1, $04, 0 + dbsprite 12, 1, 4, 1, $05, 0 + dbsprite 13, 1, 4, 1, $06, 0 + dbsprite 14, 1, 4, 1, $07, 0 CardTradeGFX: INCBIN "gfx/mystery_gift/card_trade.2bpp" diff --git a/engine/menus/trainer_card.asm b/engine/menus/trainer_card.asm index 67adedd1d..712032cbe 100644 --- a/engine/menus/trainer_card.asm +++ b/engine/menus/trainer_card.asm @@ -540,17 +540,17 @@ TrainerCard_Page2_3_OAMUpdate: jr .loop2 .facing1 - dsprite 0, 0, 0, 0, $00, 0 - dsprite 0, 0, 1, 0, $01, 0 - dsprite 1, 0, 0, 0, $02, 0 - dsprite 1, 0, 1, 0, $03, 0 + dbsprite 0, 0, 0, 0, $00, 0 + dbsprite 1, 0, 0, 0, $01, 0 + dbsprite 0, 1, 0, 0, $02, 0 + dbsprite 1, 1, 0, 0, $03, 0 db -1 .facing2 - dsprite 0, 0, 0, 0, $01, 0 | X_FLIP - dsprite 0, 0, 1, 0, $00, 0 | X_FLIP - dsprite 1, 0, 0, 0, $03, 0 | X_FLIP - dsprite 1, 0, 1, 0, $02, 0 | X_FLIP + dbsprite 0, 0, 0, 0, $01, 0 | X_FLIP + dbsprite 1, 0, 0, 0, $00, 0 | X_FLIP + dbsprite 0, 1, 0, 0, $03, 0 | X_FLIP + dbsprite 1, 1, 0, 0, $02, 0 | X_FLIP db -1 TrainerCard_JohtoBadgesOAM: diff --git a/engine/movie/unused_title.asm b/engine/movie/unused_title.asm index a459e9069..c086cf566 100644 --- a/engine/movie/unused_title.asm +++ b/engine/movie/unused_title.asm @@ -113,46 +113,46 @@ UnusedTitleFG_Palettes: INCLUDE "gfx/title/old_fg.pal" UnusedTitleFG_OAM: - dsprite 3, 0, 7, 0, $00, 1 - dsprite 3, 0, 8, 0, $02, 1 - dsprite 3, 0, 9, 0, $04, 1 - dsprite 3, 0, 10, 0, $06, 1 - dsprite 3, 0, 11, 0, $08, 1 - dsprite 3, 0, 12, 0, $0a, 1 - dsprite 3, 0, 13, 0, $0c, 1 - dsprite 3, 0, 14, 0, $0e, 1 - dsprite 5, 0, 7, 0, $10, 0 - dsprite 5, 0, 8, 0, $12, 0 - dsprite 5, 0, 9, 0, $14, 0 - dsprite 5, 0, 10, 0, $16, 0 - dsprite 5, 0, 11, 0, $18, 0 - dsprite 5, 0, 12, 0, $1a, 0 - dsprite 5, 0, 13, 0, $1c, 0 - dsprite 5, 0, 14, 0, $1e, 0 - dsprite 7, 0, 7, 0, $20, 0 - dsprite 7, 0, 8, 0, $22, 0 - dsprite 7, 0, 9, 0, $24, 0 - dsprite 7, 0, 10, 0, $26, 0 - dsprite 7, 0, 11, 0, $28, 0 - dsprite 7, 0, 12, 0, $2a, 0 - dsprite 7, 0, 13, 0, $2c, 0 - dsprite 7, 0, 14, 0, $2e, 0 - dsprite 9, 0, 7, 0, $30, 2 - dsprite 9, 0, 8, 0, $32, 2 - dsprite 9, 0, 9, 0, $34, 2 - dsprite 9, 0, 10, 0, $36, 2 - dsprite 9, 0, 11, 0, $38, 2 - dsprite 9, 0, 12, 0, $3a, 2 - dsprite 9, 0, 13, 0, $3c, 2 - dsprite 9, 0, 14, 0, $3e, 2 - dsprite 11, 0, 7, 0, $40, 1 - dsprite 11, 0, 8, 0, $42, 1 - dsprite 11, 0, 9, 0, $44, 1 - dsprite 11, 0, 10, 0, $46, 1 - dsprite 11, 0, 11, 0, $48, 1 - dsprite 11, 0, 12, 0, $4a, 1 - dsprite 11, 0, 13, 0, $4c, 1 - dsprite 11, 0, 14, 0, $4e, 1 + dbsprite 7, 3, 0, 0, $00, 1 + dbsprite 8, 3, 0, 0, $02, 1 + dbsprite 9, 3, 0, 0, $04, 1 + dbsprite 10, 3, 0, 0, $06, 1 + dbsprite 11, 3, 0, 0, $08, 1 + dbsprite 12, 3, 0, 0, $0a, 1 + dbsprite 13, 3, 0, 0, $0c, 1 + dbsprite 14, 3, 0, 0, $0e, 1 + dbsprite 7, 5, 0, 0, $10, 0 + dbsprite 8, 5, 0, 0, $12, 0 + dbsprite 9, 5, 0, 0, $14, 0 + dbsprite 10, 5, 0, 0, $16, 0 + dbsprite 11, 5, 0, 0, $18, 0 + dbsprite 12, 5, 0, 0, $1a, 0 + dbsprite 13, 5, 0, 0, $1c, 0 + dbsprite 14, 5, 0, 0, $1e, 0 + dbsprite 7, 7, 0, 0, $20, 0 + dbsprite 8, 7, 0, 0, $22, 0 + dbsprite 9, 7, 0, 0, $24, 0 + dbsprite 10, 7, 0, 0, $26, 0 + dbsprite 11, 7, 0, 0, $28, 0 + dbsprite 12, 7, 0, 0, $2a, 0 + dbsprite 13, 7, 0, 0, $2c, 0 + dbsprite 14, 7, 0, 0, $2e, 0 + dbsprite 7, 9, 0, 0, $30, 2 + dbsprite 8, 9, 0, 0, $32, 2 + dbsprite 9, 9, 0, 0, $34, 2 + dbsprite 10, 9, 0, 0, $36, 2 + dbsprite 11, 9, 0, 0, $38, 2 + dbsprite 12, 9, 0, 0, $3a, 2 + dbsprite 13, 9, 0, 0, $3c, 2 + dbsprite 14, 9, 0, 0, $3e, 2 + dbsprite 7, 11, 0, 0, $40, 1 + dbsprite 8, 11, 0, 0, $42, 1 + dbsprite 9, 11, 0, 0, $44, 1 + dbsprite 10, 11, 0, 0, $46, 1 + dbsprite 11, 11, 0, 0, $48, 1 + dbsprite 12, 11, 0, 0, $4a, 1 + dbsprite 13, 11, 0, 0, $4c, 1 + dbsprite 14, 11, 0, 0, $4e, 1 Function10ed51: call _TitleScreen diff --git a/engine/pokedex/pokedex.asm b/engine/pokedex/pokedex.asm index 53bd89499..24228d97f 100644 --- a/engine/pokedex/pokedex.asm +++ b/engine/pokedex/pokedex.asm @@ -1986,59 +1986,59 @@ Pokedex_PutOldModeCursorOAM: ret .CursorOAM: - dsprite 3, 0, 9, -1, $30, 7 - dsprite 2, 0, 9, -1, $31, 7 - dsprite 2, 0, 10, -1, $32, 7 - dsprite 2, 0, 11, -1, $32, 7 - dsprite 2, 0, 12, -1, $32, 7 - dsprite 2, 0, 13, -1, $33, 7 - dsprite 2, 0, 16, -2, $33, 7 | X_FLIP - dsprite 2, 0, 17, -2, $32, 7 | X_FLIP - dsprite 2, 0, 18, -2, $32, 7 | X_FLIP - dsprite 2, 0, 19, -2, $32, 7 | X_FLIP - dsprite 2, 0, 20, -2, $31, 7 | X_FLIP - dsprite 3, 0, 20, -2, $30, 7 | X_FLIP - dsprite 4, 0, 9, -1, $30, 7 | Y_FLIP - dsprite 5, 0, 9, -1, $31, 7 | Y_FLIP - dsprite 5, 0, 10, -1, $32, 7 | Y_FLIP - dsprite 5, 0, 11, -1, $32, 7 | Y_FLIP - dsprite 5, 0, 12, -1, $32, 7 | Y_FLIP - dsprite 5, 0, 13, -1, $33, 7 | Y_FLIP - dsprite 5, 0, 16, -2, $33, 7 | X_FLIP | Y_FLIP - dsprite 5, 0, 17, -2, $32, 7 | X_FLIP | Y_FLIP - dsprite 5, 0, 18, -2, $32, 7 | X_FLIP | Y_FLIP - dsprite 5, 0, 19, -2, $32, 7 | X_FLIP | Y_FLIP - dsprite 5, 0, 20, -2, $31, 7 | X_FLIP | Y_FLIP - dsprite 4, 0, 20, -2, $30, 7 | X_FLIP | Y_FLIP + dbsprite 9, 3, -1, 0, $30, 7 + dbsprite 9, 2, -1, 0, $31, 7 + dbsprite 10, 2, -1, 0, $32, 7 + dbsprite 11, 2, -1, 0, $32, 7 + dbsprite 12, 2, -1, 0, $32, 7 + dbsprite 13, 2, -1, 0, $33, 7 + dbsprite 16, 2, -2, 0, $33, 7 | X_FLIP + dbsprite 17, 2, -2, 0, $32, 7 | X_FLIP + dbsprite 18, 2, -2, 0, $32, 7 | X_FLIP + dbsprite 19, 2, -2, 0, $32, 7 | X_FLIP + dbsprite 20, 2, -2, 0, $31, 7 | X_FLIP + dbsprite 20, 3, -2, 0, $30, 7 | X_FLIP + dbsprite 9, 4, -1, 0, $30, 7 | Y_FLIP + dbsprite 9, 5, -1, 0, $31, 7 | Y_FLIP + dbsprite 10, 5, -1, 0, $32, 7 | Y_FLIP + dbsprite 11, 5, -1, 0, $32, 7 | Y_FLIP + dbsprite 12, 5, -1, 0, $32, 7 | Y_FLIP + dbsprite 13, 5, -1, 0, $33, 7 | Y_FLIP + dbsprite 16, 5, -2, 0, $33, 7 | X_FLIP | Y_FLIP + dbsprite 17, 5, -2, 0, $32, 7 | X_FLIP | Y_FLIP + dbsprite 18, 5, -2, 0, $32, 7 | X_FLIP | Y_FLIP + dbsprite 19, 5, -2, 0, $32, 7 | X_FLIP | Y_FLIP + dbsprite 20, 5, -2, 0, $31, 7 | X_FLIP | Y_FLIP + dbsprite 20, 4, -2, 0, $30, 7 | X_FLIP | Y_FLIP db -1 .CursorAtTopOAM: ; OAM data for when the cursor is at the top of the list. The tiles at the top ; are cut off so they don't show up outside the list area. - dsprite 3, 0, 9, -1, $30, 7 - dsprite 2, 0, 9, -1, $34, 7 - dsprite 2, 0, 10, -1, $35, 7 - dsprite 2, 0, 11, -1, $35, 7 - dsprite 2, 0, 12, -1, $35, 7 - dsprite 2, 0, 13, -1, $36, 7 - dsprite 2, 0, 16, -2, $36, 7 | X_FLIP - dsprite 2, 0, 17, -2, $35, 7 | X_FLIP - dsprite 2, 0, 18, -2, $35, 7 | X_FLIP - dsprite 2, 0, 19, -2, $35, 7 | X_FLIP - dsprite 2, 0, 20, -2, $34, 7 | X_FLIP - dsprite 3, 0, 20, -2, $30, 7 | X_FLIP - dsprite 4, 0, 9, -1, $30, 7 | Y_FLIP - dsprite 5, 0, 9, -1, $31, 7 | Y_FLIP - dsprite 5, 0, 10, -1, $32, 7 | Y_FLIP - dsprite 5, 0, 11, -1, $32, 7 | Y_FLIP - dsprite 5, 0, 12, -1, $32, 7 | Y_FLIP - dsprite 5, 0, 13, -1, $33, 7 | Y_FLIP - dsprite 5, 0, 16, -2, $33, 7 | X_FLIP | Y_FLIP - dsprite 5, 0, 17, -2, $32, 7 | X_FLIP | Y_FLIP - dsprite 5, 0, 18, -2, $32, 7 | X_FLIP | Y_FLIP - dsprite 5, 0, 19, -2, $32, 7 | X_FLIP | Y_FLIP - dsprite 5, 0, 20, -2, $31, 7 | X_FLIP | Y_FLIP - dsprite 4, 0, 20, -2, $30, 7 | X_FLIP | Y_FLIP + dbsprite 9, 3, -1, 0, $30, 7 + dbsprite 9, 2, -1, 0, $34, 7 + dbsprite 10, 2, -1, 0, $35, 7 + dbsprite 11, 2, -1, 0, $35, 7 + dbsprite 12, 2, -1, 0, $35, 7 + dbsprite 13, 2, -1, 0, $36, 7 + dbsprite 16, 2, -2, 0, $36, 7 | X_FLIP + dbsprite 17, 2, -2, 0, $35, 7 | X_FLIP + dbsprite 18, 2, -2, 0, $35, 7 | X_FLIP + dbsprite 19, 2, -2, 0, $35, 7 | X_FLIP + dbsprite 20, 2, -2, 0, $34, 7 | X_FLIP + dbsprite 20, 3, -2, 0, $30, 7 | X_FLIP + dbsprite 9, 4, -1, 0, $30, 7 | Y_FLIP + dbsprite 9, 5, -1, 0, $31, 7 | Y_FLIP + dbsprite 10, 5, -1, 0, $32, 7 | Y_FLIP + dbsprite 11, 5, -1, 0, $32, 7 | Y_FLIP + dbsprite 12, 5, -1, 0, $32, 7 | Y_FLIP + dbsprite 13, 5, -1, 0, $33, 7 | Y_FLIP + dbsprite 16, 5, -2, 0, $33, 7 | X_FLIP | Y_FLIP + dbsprite 17, 5, -2, 0, $32, 7 | X_FLIP | Y_FLIP + dbsprite 18, 5, -2, 0, $32, 7 | X_FLIP | Y_FLIP + dbsprite 19, 5, -2, 0, $32, 7 | X_FLIP | Y_FLIP + dbsprite 20, 5, -2, 0, $31, 7 | X_FLIP | Y_FLIP + dbsprite 20, 4, -2, 0, $30, 7 | X_FLIP | Y_FLIP db -1 Pokedex_PutNewModeABCModeCursorOAM: @@ -2047,26 +2047,26 @@ Pokedex_PutNewModeABCModeCursorOAM: ret .CursorOAM: - dsprite 3, 3, 9, -1, $30, 7 - dsprite 2, 3, 9, -1, $31, 7 - dsprite 2, 3, 10, -1, $32, 7 - dsprite 2, 3, 11, -1, $32, 7 - dsprite 2, 3, 12, -1, $33, 7 - dsprite 2, 3, 16, 0, $33, 7 | X_FLIP - dsprite 2, 3, 17, 0, $32, 7 | X_FLIP - dsprite 2, 3, 18, 0, $32, 7 | X_FLIP - dsprite 2, 3, 19, 0, $31, 7 | X_FLIP - dsprite 3, 3, 19, 0, $30, 7 | X_FLIP - dsprite 4, 3, 9, -1, $30, 7 | Y_FLIP - dsprite 5, 3, 9, -1, $31, 7 | Y_FLIP - dsprite 5, 3, 10, -1, $32, 7 | Y_FLIP - dsprite 5, 3, 11, -1, $32, 7 | Y_FLIP - dsprite 5, 3, 12, -1, $33, 7 | Y_FLIP - dsprite 5, 3, 16, 0, $33, 7 | X_FLIP | Y_FLIP - dsprite 5, 3, 17, 0, $32, 7 | X_FLIP | Y_FLIP - dsprite 5, 3, 18, 0, $32, 7 | X_FLIP | Y_FLIP - dsprite 5, 3, 19, 0, $31, 7 | X_FLIP | Y_FLIP - dsprite 4, 3, 19, 0, $30, 7 | X_FLIP | Y_FLIP + dbsprite 9, 3, -1, 3, $30, 7 + dbsprite 9, 2, -1, 3, $31, 7 + dbsprite 10, 2, -1, 3, $32, 7 + dbsprite 11, 2, -1, 3, $32, 7 + dbsprite 12, 2, -1, 3, $33, 7 + dbsprite 16, 2, 0, 3, $33, 7 | X_FLIP + dbsprite 17, 2, 0, 3, $32, 7 | X_FLIP + dbsprite 18, 2, 0, 3, $32, 7 | X_FLIP + dbsprite 19, 2, 0, 3, $31, 7 | X_FLIP + dbsprite 19, 3, 0, 3, $30, 7 | X_FLIP + dbsprite 9, 4, -1, 3, $30, 7 | Y_FLIP + dbsprite 9, 5, -1, 3, $31, 7 | Y_FLIP + dbsprite 10, 5, -1, 3, $32, 7 | Y_FLIP + dbsprite 11, 5, -1, 3, $32, 7 | Y_FLIP + dbsprite 12, 5, -1, 3, $33, 7 | Y_FLIP + dbsprite 16, 5, 0, 3, $33, 7 | X_FLIP | Y_FLIP + dbsprite 17, 5, 0, 3, $32, 7 | X_FLIP | Y_FLIP + dbsprite 18, 5, 0, 3, $32, 7 | X_FLIP | Y_FLIP + dbsprite 19, 5, 0, 3, $31, 7 | X_FLIP | Y_FLIP + dbsprite 19, 4, 0, 3, $30, 7 | X_FLIP | Y_FLIP db -1 Pokedex_UpdateSearchResultsCursorOAM: @@ -2078,30 +2078,30 @@ Pokedex_UpdateSearchResultsCursorOAM: ret .CursorOAM: - dsprite 3, 3, 9, -1, $30, 7 - dsprite 2, 3, 9, -1, $31, 7 - dsprite 2, 3, 10, -1, $32, 7 - dsprite 2, 3, 11, -1, $32, 7 - dsprite 2, 3, 12, -1, $32, 7 - dsprite 2, 3, 13, -1, $33, 7 - dsprite 2, 3, 16, -2, $33, 7 | X_FLIP - dsprite 2, 3, 17, -2, $32, 7 | X_FLIP - dsprite 2, 3, 18, -2, $32, 7 | X_FLIP - dsprite 2, 3, 19, -2, $32, 7 | X_FLIP - dsprite 2, 3, 20, -2, $31, 7 | X_FLIP - dsprite 3, 3, 20, -2, $30, 7 | X_FLIP - dsprite 4, 3, 9, -1, $30, 7 | Y_FLIP - dsprite 5, 3, 9, -1, $31, 7 | Y_FLIP - dsprite 5, 3, 10, -1, $32, 7 | Y_FLIP - dsprite 5, 3, 11, -1, $32, 7 | Y_FLIP - dsprite 5, 3, 12, -1, $32, 7 | Y_FLIP - dsprite 5, 3, 13, -1, $33, 7 | Y_FLIP - dsprite 5, 3, 16, -2, $33, 7 | X_FLIP | Y_FLIP - dsprite 5, 3, 17, -2, $32, 7 | X_FLIP | Y_FLIP - dsprite 5, 3, 18, -2, $32, 7 | X_FLIP | Y_FLIP - dsprite 5, 3, 19, -2, $32, 7 | X_FLIP | Y_FLIP - dsprite 5, 3, 20, -2, $31, 7 | X_FLIP | Y_FLIP - dsprite 4, 3, 20, -2, $30, 7 | X_FLIP | Y_FLIP + dbsprite 9, 3, -1, 3, $30, 7 + dbsprite 9, 2, -1, 3, $31, 7 + dbsprite 10, 2, -1, 3, $32, 7 + dbsprite 11, 2, -1, 3, $32, 7 + dbsprite 12, 2, -1, 3, $32, 7 + dbsprite 13, 2, -1, 3, $33, 7 + dbsprite 16, 2, -2, 3, $33, 7 | X_FLIP + dbsprite 17, 2, -2, 3, $32, 7 | X_FLIP + dbsprite 18, 2, -2, 3, $32, 7 | X_FLIP + dbsprite 19, 2, -2, 3, $32, 7 | X_FLIP + dbsprite 20, 2, -2, 3, $31, 7 | X_FLIP + dbsprite 20, 3, -2, 3, $30, 7 | X_FLIP + dbsprite 9, 4, -1, 3, $30, 7 | Y_FLIP + dbsprite 9, 5, -1, 3, $31, 7 | Y_FLIP + dbsprite 10, 5, -1, 3, $32, 7 | Y_FLIP + dbsprite 11, 5, -1, 3, $32, 7 | Y_FLIP + dbsprite 12, 5, -1, 3, $32, 7 | Y_FLIP + dbsprite 13, 5, -1, 3, $33, 7 | Y_FLIP + dbsprite 16, 5, -2, 3, $33, 7 | X_FLIP | Y_FLIP + dbsprite 17, 5, -2, 3, $32, 7 | X_FLIP | Y_FLIP + dbsprite 18, 5, -2, 3, $32, 7 | X_FLIP | Y_FLIP + dbsprite 19, 5, -2, 3, $32, 7 | X_FLIP | Y_FLIP + dbsprite 20, 5, -2, 3, $31, 7 | X_FLIP | Y_FLIP + dbsprite 20, 4, -2, 3, $30, 7 | X_FLIP | Y_FLIP db -1 Pokedex_LoadCursorOAM: diff --git a/engine/pokedex/pokedex_2.asm b/engine/pokedex/pokedex_2.asm index ac47bd484..56b191a08 100644 --- a/engine/pokedex/pokedex_2.asm +++ b/engine/pokedex/pokedex_2.asm @@ -65,15 +65,15 @@ DoDexSearchSlowpokeFrame: jr .loop .SlowpokeSpriteData: - dsprite 11, 0, 9, 0, $00, 0 - dsprite 11, 0, 10, 0, $01, 0 - dsprite 11, 0, 11, 0, $02, 0 - dsprite 12, 0, 9, 0, $10, 0 - dsprite 12, 0, 10, 0, $11, 0 - dsprite 12, 0, 11, 0, $12, 0 - dsprite 13, 0, 9, 0, $20, 0 - dsprite 13, 0, 10, 0, $21, 0 - dsprite 13, 0, 11, 0, $22, 0 + dbsprite 9, 11, 0, 0, $00, 0 + dbsprite 10, 11, 0, 0, $01, 0 + dbsprite 11, 11, 0, 0, $02, 0 + dbsprite 9, 12, 0, 0, $10, 0 + dbsprite 10, 12, 0, 0, $11, 0 + dbsprite 11, 12, 0, 0, $12, 0 + dbsprite 9, 13, 0, 0, $20, 0 + dbsprite 10, 13, 0, 0, $21, 0 + dbsprite 11, 13, 0, 0, $22, 0 db -1 DisplayDexEntry: diff --git a/engine/pokemon/bills_pc.asm b/engine/pokemon/bills_pc.asm index d3d7c9922..3b3857062 100644 --- a/engine/pokemon/bills_pc.asm +++ b/engine/pokemon/bills_pc.asm @@ -1480,30 +1480,30 @@ endr jr .loop .OAM: - dsprite 4, 6, 10, 0, $00, 0 - dsprite 4, 6, 11, 0, $00, 0 - dsprite 4, 6, 12, 0, $00, 0 - dsprite 4, 6, 13, 0, $00, 0 - dsprite 4, 6, 14, 0, $00, 0 - dsprite 4, 6, 15, 0, $00, 0 - dsprite 4, 6, 16, 0, $00, 0 - dsprite 4, 6, 17, 0, $00, 0 - dsprite 4, 6, 18, 0, $00, 0 - dsprite 4, 6, 18, 7, $00, 0 - dsprite 7, 1, 10, 0, $00, 0 | Y_FLIP - dsprite 7, 1, 11, 0, $00, 0 | Y_FLIP - dsprite 7, 1, 12, 0, $00, 0 | Y_FLIP - dsprite 7, 1, 13, 0, $00, 0 | Y_FLIP - dsprite 7, 1, 14, 0, $00, 0 | Y_FLIP - dsprite 7, 1, 15, 0, $00, 0 | Y_FLIP - dsprite 7, 1, 16, 0, $00, 0 | Y_FLIP - dsprite 7, 1, 17, 0, $00, 0 | Y_FLIP - dsprite 7, 1, 18, 0, $00, 0 | Y_FLIP - dsprite 7, 1, 18, 7, $00, 0 | Y_FLIP - dsprite 5, 6, 9, 6, $01, 0 - dsprite 6, 1, 9, 6, $01, 0 | Y_FLIP - dsprite 5, 6, 19, 1, $01, 0 | X_FLIP - dsprite 6, 1, 19, 1, $01, 0 | X_FLIP | Y_FLIP + dbsprite 10, 4, 0, 6, $00, 0 + dbsprite 11, 4, 0, 6, $00, 0 + dbsprite 12, 4, 0, 6, $00, 0 + dbsprite 13, 4, 0, 6, $00, 0 + dbsprite 14, 4, 0, 6, $00, 0 + dbsprite 15, 4, 0, 6, $00, 0 + dbsprite 16, 4, 0, 6, $00, 0 + dbsprite 17, 4, 0, 6, $00, 0 + dbsprite 18, 4, 0, 6, $00, 0 + dbsprite 18, 4, 7, 6, $00, 0 + dbsprite 10, 7, 0, 1, $00, 0 | Y_FLIP + dbsprite 11, 7, 0, 1, $00, 0 | Y_FLIP + dbsprite 12, 7, 0, 1, $00, 0 | Y_FLIP + dbsprite 13, 7, 0, 1, $00, 0 | Y_FLIP + dbsprite 14, 7, 0, 1, $00, 0 | Y_FLIP + dbsprite 15, 7, 0, 1, $00, 0 | Y_FLIP + dbsprite 16, 7, 0, 1, $00, 0 | Y_FLIP + dbsprite 17, 7, 0, 1, $00, 0 | Y_FLIP + dbsprite 18, 7, 0, 1, $00, 0 | Y_FLIP + dbsprite 18, 7, 7, 1, $00, 0 | Y_FLIP + dbsprite 9, 5, 6, 6, $01, 0 + dbsprite 9, 6, 6, 1, $01, 0 | Y_FLIP + dbsprite 19, 5, 1, 6, $01, 0 | X_FLIP + dbsprite 19, 6, 1, 1, $01, 0 | X_FLIP | Y_FLIP db -1 BillsPC_UpdateInsertCursor: @@ -1528,16 +1528,16 @@ endr jr .loop .OAM: - dsprite 4, 7, 10, 0, $06, 0 - dsprite 5, 3, 11, 0, $00, 0 | Y_FLIP - dsprite 5, 3, 12, 0, $00, 0 | Y_FLIP - dsprite 5, 3, 13, 0, $00, 0 | Y_FLIP - dsprite 5, 3, 14, 0, $00, 0 | Y_FLIP - dsprite 5, 3, 15, 0, $00, 0 | Y_FLIP - dsprite 5, 3, 16, 0, $00, 0 | Y_FLIP - dsprite 5, 3, 17, 0, $00, 0 | Y_FLIP - dsprite 5, 3, 18, 0, $00, 0 | Y_FLIP - dsprite 4, 7, 19, 0, $07, 0 + dbsprite 10, 4, 0, 7, $06, 0 + dbsprite 11, 5, 0, 3, $00, 0 | Y_FLIP + dbsprite 12, 5, 0, 3, $00, 0 | Y_FLIP + dbsprite 13, 5, 0, 3, $00, 0 | Y_FLIP + dbsprite 14, 5, 0, 3, $00, 0 | Y_FLIP + dbsprite 15, 5, 0, 3, $00, 0 | Y_FLIP + dbsprite 16, 5, 0, 3, $00, 0 | Y_FLIP + dbsprite 17, 5, 0, 3, $00, 0 | Y_FLIP + dbsprite 18, 5, 0, 3, $00, 0 | Y_FLIP + dbsprite 19, 4, 0, 7, $07, 0 db -1 Unreferenced_BillsPC_FillBox: |