From 0ef004a4db9428f6350815c199ac5aa6379fc773 Mon Sep 17 00:00:00 2001 From: Rangi Date: Sat, 4 Apr 2020 16:00:30 -0400 Subject: [PATCH] `dsprite y, ypx, x, xpx, off, attr` -> `dbsprite x, y, xpx, ypx, off, attr` --- data/battle_anims/oam.asm | 1396 ++++++++++++------------- data/sprite_anims/oam.asm | 1508 +++++++++++++-------------- engine/events/heal_machine_anim.asm | 28 +- engine/games/card_flip.asm | 284 ++--- engine/games/unown_puzzle.asm | 36 +- engine/link/mystery_gift.asm | 32 +- engine/menus/trainer_card.asm | 16 +- engine/movie/unused_title.asm | 80 +- engine/pokedex/pokedex.asm | 184 ++-- engine/pokedex/pokedex_2.asm | 18 +- engine/pokemon/bills_pc.asm | 68 +- macros/gfx.asm | 6 +- macros/legacy.asm | 5 + mobile/mobile_45_sprite_engine.asm | 178 ++-- 14 files changed, 1922 insertions(+), 1917 deletions(-) diff --git a/data/battle_anims/oam.asm b/data/battle_anims/oam.asm index 42c9c8295..4bf4a331e 100644 --- a/data/battle_anims/oam.asm +++ b/data/battle_anims/oam.asm @@ -219,867 +219,867 @@ BattleAnimOAMData: dbbw $00, 12, .OAMData_d7 ; BATTLEANIMOAMSET_D7 .OAMData_11: - dsprite -1, 0, -1, 4, $00, $0 - dsprite 0, 0, -1, 4, $01, $0 + dbsprite -1, -1, 4, 0, $00, $0 + dbsprite -1, 0, 4, 0, $01, $0 .OAMData_56: - dsprite -1, 4, -1, 0, $00, $0 - dsprite -1, 4, 0, 0, $01, $0 + dbsprite -1, -1, 0, 4, $00, $0 + dbsprite 0, -1, 0, 4, $01, $0 .OAMData_03: - dsprite -1, 0, -1, 0, $00, $0 - dsprite -1, 0, 0, 0, $01, $0 - dsprite 0, 0, -1, 0, $02, $0 - dsprite 0, 0, 0, 0, $03, $0 + dbsprite -1, -1, 0, 0, $00, $0 + dbsprite 0, -1, 0, 0, $01, $0 + dbsprite -1, 0, 0, 0, $02, $0 + dbsprite 0, 0, 0, 0, $03, $0 .OAMData_02: - dsprite -1, 0, -1, 0, $00, $0 - dsprite -1, 0, 0, 0, $00, X_FLIP - dsprite 0, 0, -1, 0, $00, Y_FLIP - dsprite 0, 0, 0, 0, $00, X_FLIP | Y_FLIP + dbsprite -1, -1, 0, 0, $00, $0 + dbsprite 0, -1, 0, 0, $00, X_FLIP + dbsprite -1, 0, 0, 0, $00, Y_FLIP + dbsprite 0, 0, 0, 0, $00, X_FLIP | Y_FLIP .OAMData_c3: - dsprite -2, 4, -2, 4, $00, $0 - dsprite -2, 4, -1, 4, $01, $0 - dsprite -2, 4, 0, 4, $02, $0 - dsprite -1, 4, -2, 4, $03, $0 - dsprite -1, 4, -1, 4, $04, $0 - dsprite -1, 4, 0, 4, $05, $0 - dsprite 0, 4, -2, 4, $06, $0 - dsprite 0, 4, -1, 4, $07, $0 - dsprite 0, 4, 0, 4, $08, $0 + dbsprite -2, -2, 4, 4, $00, $0 + dbsprite -1, -2, 4, 4, $01, $0 + dbsprite 0, -2, 4, 4, $02, $0 + dbsprite -2, -1, 4, 4, $03, $0 + dbsprite -1, -1, 4, 4, $04, $0 + dbsprite 0, -1, 4, 4, $05, $0 + dbsprite -2, 0, 4, 4, $06, $0 + dbsprite -1, 0, 4, 4, $07, $0 + dbsprite 0, 0, 4, 4, $08, $0 .OAMData_01: - dsprite -2, 4, -2, 4, $00, $0 - dsprite -2, 4, -1, 4, $01, $0 - dsprite -2, 4, 0, 4, $00, X_FLIP - dsprite -1, 4, -2, 4, $02, $0 - dsprite -1, 4, -1, 4, $03, $0 - dsprite -1, 4, 0, 4, $02, X_FLIP | Y_FLIP - dsprite 0, 4, -2, 4, $00, Y_FLIP - dsprite 0, 4, -1, 4, $01, X_FLIP | Y_FLIP - dsprite 0, 4, 0, 4, $00, X_FLIP | Y_FLIP + dbsprite -2, -2, 4, 4, $00, $0 + dbsprite -1, -2, 4, 4, $01, $0 + dbsprite 0, -2, 4, 4, $00, X_FLIP + dbsprite -2, -1, 4, 4, $02, $0 + dbsprite -1, -1, 4, 4, $03, $0 + dbsprite 0, -1, 4, 4, $02, X_FLIP | Y_FLIP + dbsprite -2, 0, 4, 4, $00, Y_FLIP + dbsprite -1, 0, 4, 4, $01, X_FLIP | Y_FLIP + dbsprite 0, 0, 4, 4, $00, X_FLIP | Y_FLIP .OAMData_cf: - dsprite -2, 0, -2, 4, $00, $0 - dsprite -2, 0, -1, 4, $01, $0 - dsprite -2, 0, 0, 4, $02, $0 - dsprite -1, 0, -2, 4, $03, $0 - dsprite -1, 0, -1, 4, $04, $0 - dsprite -1, 0, 0, 4, $05, $0 - dsprite 0, 0, -2, 4, $05, X_FLIP | Y_FLIP - dsprite 0, 0, -1, 4, $04, X_FLIP | Y_FLIP - dsprite 0, 0, 0, 4, $03, X_FLIP | Y_FLIP - dsprite 1, 0, -2, 4, $02, X_FLIP | Y_FLIP - dsprite 1, 0, -1, 4, $01, X_FLIP | Y_FLIP - dsprite 1, 0, 0, 4, $00, X_FLIP | Y_FLIP + dbsprite -2, -2, 4, 0, $00, $0 + dbsprite -1, -2, 4, 0, $01, $0 + dbsprite 0, -2, 4, 0, $02, $0 + dbsprite -2, -1, 4, 0, $03, $0 + dbsprite -1, -1, 4, 0, $04, $0 + dbsprite 0, -1, 4, 0, $05, $0 + dbsprite -2, 0, 4, 0, $05, X_FLIP | Y_FLIP + dbsprite -1, 0, 4, 0, $04, X_FLIP | Y_FLIP + dbsprite 0, 0, 4, 0, $03, X_FLIP | Y_FLIP + dbsprite -2, 1, 4, 0, $02, X_FLIP | Y_FLIP + dbsprite -1, 1, 4, 0, $01, X_FLIP | Y_FLIP + dbsprite 0, 1, 4, 0, $00, X_FLIP | Y_FLIP .OAMData_1c: - dsprite -2, 0, -2, 0, $00, $0 - dsprite -2, 0, -1, 0, $01, $0 - dsprite -2, 0, 0, 0, $02, $0 - dsprite -2, 0, 1, 0, $03, $0 - dsprite -1, 0, -2, 0, $04, $0 - dsprite -1, 0, -1, 0, $05, $0 - dsprite -1, 0, 0, 0, $06, $0 - dsprite -1, 0, 1, 0, $07, $0 - dsprite 0, 0, -2, 0, $08, $0 - dsprite 0, 0, -1, 0, $09, $0 - dsprite 0, 0, 0, 0, $0a, $0 - dsprite 0, 0, 1, 0, $0b, $0 - dsprite 1, 0, -2, 0, $0c, $0 - dsprite 1, 0, -1, 0, $0d, $0 - dsprite 1, 0, 0, 0, $0e, $0 - dsprite 1, 0, 1, 0, $0f, $0 + dbsprite -2, -2, 0, 0, $00, $0 + dbsprite -1, -2, 0, 0, $01, $0 + dbsprite 0, -2, 0, 0, $02, $0 + dbsprite 1, -2, 0, 0, $03, $0 + dbsprite -2, -1, 0, 0, $04, $0 + dbsprite -1, -1, 0, 0, $05, $0 + dbsprite 0, -1, 0, 0, $06, $0 + dbsprite 1, -1, 0, 0, $07, $0 + dbsprite -2, 0, 0, 0, $08, $0 + dbsprite -1, 0, 0, 0, $09, $0 + dbsprite 0, 0, 0, 0, $0a, $0 + dbsprite 1, 0, 0, 0, $0b, $0 + dbsprite -2, 1, 0, 0, $0c, $0 + dbsprite -1, 1, 0, 0, $0d, $0 + dbsprite 0, 1, 0, 0, $0e, $0 + dbsprite 1, 1, 0, 0, $0f, $0 .OAMData_00: - dsprite -2, 0, -2, 0, $00, $0 - dsprite -2, 0, -1, 0, $01, $0 - dsprite -1, 0, -2, 0, $02, $0 - dsprite -1, 0, -1, 0, $03, $0 - dsprite -2, 0, 0, 0, $01, X_FLIP - dsprite -2, 0, 1, 0, $00, X_FLIP - dsprite -1, 0, 0, 0, $03, X_FLIP - dsprite -1, 0, 1, 0, $02, X_FLIP - dsprite 0, 0, -2, 0, $02, Y_FLIP - dsprite 0, 0, -1, 0, $03, Y_FLIP - dsprite 1, 0, -2, 0, $00, Y_FLIP - dsprite 1, 0, -1, 0, $01, Y_FLIP - dsprite 0, 0, 0, 0, $03, X_FLIP | Y_FLIP - dsprite 0, 0, 1, 0, $02, X_FLIP | Y_FLIP - dsprite 1, 0, 0, 0, $01, X_FLIP | Y_FLIP - dsprite 1, 0, 1, 0, $00, X_FLIP | Y_FLIP + dbsprite -2, -2, 0, 0, $00, $0 + dbsprite -1, -2, 0, 0, $01, $0 + dbsprite -2, -1, 0, 0, $02, $0 + dbsprite -1, -1, 0, 0, $03, $0 + dbsprite 0, -2, 0, 0, $01, X_FLIP + dbsprite 1, -2, 0, 0, $00, X_FLIP + dbsprite 0, -1, 0, 0, $03, X_FLIP + dbsprite 1, -1, 0, 0, $02, X_FLIP + dbsprite -2, 0, 0, 0, $02, Y_FLIP + dbsprite -1, 0, 0, 0, $03, Y_FLIP + dbsprite -2, 1, 0, 0, $00, Y_FLIP + dbsprite -1, 1, 0, 0, $01, Y_FLIP + dbsprite 0, 0, 0, 0, $03, X_FLIP | Y_FLIP + dbsprite 1, 0, 0, 0, $02, X_FLIP | Y_FLIP + dbsprite 0, 1, 0, 0, $01, X_FLIP | Y_FLIP + dbsprite 1, 1, 0, 0, $00, X_FLIP | Y_FLIP .OAMData_09: - dsprite -3, 4, -3, 4, $00, $0 - dsprite -3, 4, -2, 4, $01, $0 - dsprite -2, 4, -3, 4, $02, $0 - dsprite -2, 4, -2, 4, $03, $0 - dsprite -3, 4, 0, 4, $01, X_FLIP - dsprite -3, 4, 1, 4, $00, X_FLIP - dsprite -2, 4, 0, 4, $03, X_FLIP - dsprite -2, 4, 1, 4, $02, X_FLIP - dsprite 0, 4, -3, 4, $02, Y_FLIP - dsprite 0, 4, -2, 4, $03, Y_FLIP - dsprite 1, 4, -3, 4, $00, Y_FLIP - dsprite 1, 4, -2, 4, $01, Y_FLIP - dsprite 0, 4, 0, 4, $03, X_FLIP | Y_FLIP - dsprite 0, 4, 1, 4, $02, X_FLIP | Y_FLIP - dsprite 1, 4, 0, 4, $01, X_FLIP | Y_FLIP - dsprite 1, 4, 1, 4, $00, X_FLIP | Y_FLIP + dbsprite -3, -3, 4, 4, $00, $0 + dbsprite -2, -3, 4, 4, $01, $0 + dbsprite -3, -2, 4, 4, $02, $0 + dbsprite -2, -2, 4, 4, $03, $0 + dbsprite 0, -3, 4, 4, $01, X_FLIP + dbsprite 1, -3, 4, 4, $00, X_FLIP + dbsprite 0, -2, 4, 4, $03, X_FLIP + dbsprite 1, -2, 4, 4, $02, X_FLIP + dbsprite -3, 0, 4, 4, $02, Y_FLIP + dbsprite -2, 0, 4, 4, $03, Y_FLIP + dbsprite -3, 1, 4, 4, $00, Y_FLIP + dbsprite -2, 1, 4, 4, $01, Y_FLIP + dbsprite 0, 0, 4, 4, $03, X_FLIP | Y_FLIP + dbsprite 1, 0, 4, 4, $02, X_FLIP | Y_FLIP + dbsprite 0, 1, 4, 4, $01, X_FLIP | Y_FLIP + dbsprite 1, 1, 4, 4, $00, X_FLIP | Y_FLIP .OAMData_0c: - dsprite -1, 4, -1, 0, $00, $0 - dsprite -1, 4, 0, 0, $00, X_FLIP + dbsprite -1, -1, 0, 4, $00, $0 + dbsprite 0, -1, 0, 4, $00, X_FLIP .OAMData_6a: - dsprite 0, 0, -1, 0, $00, $0 - dsprite 0, 0, 0, 0, $00, X_FLIP + dbsprite -1, 0, 0, 0, $00, $0 + dbsprite 0, 0, 0, 0, $00, X_FLIP .OAMData_04: - dsprite -1, 0, -1, 0, $00, $0 - dsprite -1, 0, 0, 0, $00, X_FLIP - dsprite 0, 0, -1, 0, $01, $0 - dsprite 0, 0, 0, 0, $01, X_FLIP + dbsprite -1, -1, 0, 0, $00, $0 + dbsprite 0, -1, 0, 0, $00, X_FLIP + dbsprite -1, 0, 0, 0, $01, $0 + dbsprite 0, 0, 0, 0, $01, X_FLIP .OAMData_5d: - dsprite -1, 0, -1, 0, $00, $0 - dsprite -1, 0, 0, 0, $01, $0 - dsprite 0, 0, -1, 0, $00, Y_FLIP - dsprite 0, 0, 0, 0, $01, Y_FLIP + dbsprite -1, -1, 0, 0, $00, $0 + dbsprite 0, -1, 0, 0, $01, $0 + dbsprite -1, 0, 0, 0, $00, Y_FLIP + dbsprite 0, 0, 0, 0, $01, Y_FLIP .OAMData_13: - dsprite -1, 2, -1, 0, $02, $0 - dsprite 0, 2, -1, 0, $03, $0 - dsprite -2, 6, 0, 0, $02, $0 - dsprite -1, 6, 0, 0, $03, $0 + dbsprite -1, -1, 0, 2, $02, $0 + dbsprite -1, 0, 0, 2, $03, $0 + dbsprite 0, -2, 0, 6, $02, $0 + dbsprite 0, -1, 0, 6, $03, $0 .OAMData_22: - dsprite 1, 0, -11, 0, $01, $0 - dsprite 0, 0, -10, 0, $02, $0 - dsprite 0, 0, -9, 0, $03, $0 - dsprite 0, 0, -8, 0, $00, $0 - dsprite 0, 0, -7, 0, $03, $0 - dsprite 0, 0, -6, 0, $00, $0 - dsprite 0, 0, -5, 0, $03, $0 - dsprite 0, 0, -4, 0, $00, $0 - dsprite 0, 0, -3, 0, $03, $0 - dsprite 0, 0, -2, 0, $00, $0 - dsprite 0, 0, -1, 0, $01, $0 - dsprite -1, 0, 0, 0, $02, $0 - dsprite -1, 0, 1, 0, $03, $0 - dsprite -1, 0, 2, 0, $00, $0 - dsprite -1, 0, 3, 0, $03, $0 - dsprite -1, 0, 4, 0, $00, $0 - dsprite -1, 0, 5, 0, $03, $0 - dsprite -1, 0, 6, 0, $00, $0 - dsprite -1, 0, 7, 0, $03, $0 - dsprite -1, 0, 8, 0, $00, $0 - dsprite -1, 0, 9, 0, $01, $0 - dsprite -2, 0, 10, 0, $02, $0 + dbsprite -11, 1, 0, 0, $01, $0 + dbsprite -10, 0, 0, 0, $02, $0 + dbsprite -9, 0, 0, 0, $03, $0 + dbsprite -8, 0, 0, 0, $00, $0 + dbsprite -7, 0, 0, 0, $03, $0 + dbsprite -6, 0, 0, 0, $00, $0 + dbsprite -5, 0, 0, 0, $03, $0 + dbsprite -4, 0, 0, 0, $00, $0 + dbsprite -3, 0, 0, 0, $03, $0 + dbsprite -2, 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 + dbsprite 2, -1, 0, 0, $00, $0 + dbsprite 3, -1, 0, 0, $03, $0 + dbsprite 4, -1, 0, 0, $00, $0 + dbsprite 5, -1, 0, 0, $03, $0 + dbsprite 6, -1, 0, 0, $00, $0 + dbsprite 7, -1, 0, 0, $03, $0 + dbsprite 8, -1, 0, 0, $00, $0 + dbsprite 9, -1, 0, 0, $01, $0 + dbsprite 10, -2, 0, 0, $02, $0 .OAMData_2a: - dsprite -3, 4, -1, 0, $00, $0 - dsprite -3, 4, 0, 0, $00, X_FLIP - dsprite -2, 4, -1, 0, $01, $0 - dsprite -2, 4, 0, 0, $01, X_FLIP - dsprite -1, 4, -1, 4, $02, $0 + dbsprite -1, -3, 0, 4, $00, $0 + dbsprite 0, -3, 0, 4, $00, X_FLIP + dbsprite -1, -2, 0, 4, $01, $0 + dbsprite 0, -2, 0, 4, $01, X_FLIP + dbsprite -1, -1, 4, 4, $02, $0 .OAMData_2b: - dsprite -4, 4, -1, 0, $00, $0 - dsprite -4, 4, 0, 0, $00, X_FLIP - dsprite -3, 4, -1, 0, $01, $0 - dsprite -3, 4, 0, 0, $01, X_FLIP - dsprite -2, 4, -1, 4, $02, $0 - dsprite -1, 4, -1, 4, $02, $0 + dbsprite -1, -4, 0, 4, $00, $0 + dbsprite 0, -4, 0, 4, $00, X_FLIP + dbsprite -1, -3, 0, 4, $01, $0 + dbsprite 0, -3, 0, 4, $01, X_FLIP + dbsprite -1, -2, 4, 4, $02, $0 + dbsprite -1, -1, 4, 4, $02, $0 .OAMData_2c: - dsprite -5, 4, -1, 0, $00, $0 - dsprite -5, 4, 0, 0, $00, X_FLIP - dsprite -4, 4, -1, 0, $01, $0 - dsprite -4, 4, 0, 0, $01, X_FLIP - dsprite -3, 4, -1, 4, $02, $0 - dsprite -2, 4, -1, 4, $02, $0 - dsprite -1, 4, -1, 4, $02, $0 + dbsprite -1, -5, 0, 4, $00, $0 + dbsprite 0, -5, 0, 4, $00, X_FLIP + dbsprite -1, -4, 0, 4, $01, $0 + dbsprite 0, -4, 0, 4, $01, X_FLIP + dbsprite -1, -3, 4, 4, $02, $0 + dbsprite -1, -2, 4, 4, $02, $0 + dbsprite -1, -1, 4, 4, $02, $0 .OAMData_2d: - dsprite -6, 4, -1, 0, $00, $0 - dsprite -6, 4, 0, 0, $00, X_FLIP - dsprite -5, 4, -1, 0, $01, $0 - dsprite -5, 4, 0, 0, $01, X_FLIP - dsprite -4, 4, -1, 4, $02, $0 - dsprite -3, 4, -1, 4, $02, $0 - dsprite -2, 4, -1, 4, $02, $0 - dsprite -1, 4, -1, 4, $02, $0 + dbsprite -1, -6, 0, 4, $00, $0 + dbsprite 0, -6, 0, 4, $00, X_FLIP + dbsprite -1, -5, 0, 4, $01, $0 + dbsprite 0, -5, 0, 4, $01, X_FLIP + dbsprite -1, -4, 4, 4, $02, $0 + dbsprite -1, -3, 4, 4, $02, $0 + dbsprite -1, -2, 4, 4, $02, $0 + dbsprite -1, -1, 4, 4, $02, $0 .OAMData_2e: - dsprite -7, 4, -1, 0, $00, $0 - dsprite -7, 4, 0, 0, $00, X_FLIP - dsprite -6, 4, -1, 0, $01, $0 - dsprite -6, 4, 0, 0, $01, X_FLIP - dsprite -5, 4, -1, 4, $02, $0 - dsprite -4, 4, -1, 4, $02, $0 - dsprite -3, 4, -1, 4, $02, $0 - dsprite -2, 4, -1, 4, $02, $0 - dsprite -1, 4, -1, 4, $02, $0 + dbsprite -1, -7, 0, 4, $00, $0 + dbsprite 0, -7, 0, 4, $00, X_FLIP + dbsprite -1, -6, 0, 4, $01, $0 + dbsprite 0, -6, 0, 4, $01, X_FLIP + dbsprite -1, -5, 4, 4, $02, $0 + dbsprite -1, -4, 4, 4, $02, $0 + dbsprite -1, -3, 4, 4, $02, $0 + dbsprite -1, -2, 4, 4, $02, $0 + dbsprite -1, -1, 4, 4, $02, $0 .OAMData_2f: - dsprite -1, 0, -1, 0, $00, $0 - dsprite -1, 0, 0, 0, $00, X_FLIP - dsprite 0, 0, -1, 0, $01, $0 - dsprite 0, 0, 0, 0, $00, X_FLIP | Y_FLIP + dbsprite -1, -1, 0, 0, $00, $0 + dbsprite 0, -1, 0, 0, $00, X_FLIP + dbsprite -1, 0, 0, 0, $01, $0 + dbsprite 0, 0, 0, 0, $00, X_FLIP | Y_FLIP .OAMData_30: - dsprite -1, 0, -1, 0, $00, $0 - dsprite -1, 0, 0, 0, $01, $0 - dsprite 0, 0, -1, 0, $01, X_FLIP | Y_FLIP - dsprite 0, 0, 0, 0, $00, X_FLIP | Y_FLIP + dbsprite -1, -1, 0, 0, $00, $0 + dbsprite 0, -1, 0, 0, $01, $0 + dbsprite -1, 0, 0, 0, $01, X_FLIP | Y_FLIP + dbsprite 0, 0, 0, 0, $00, X_FLIP | Y_FLIP .OAMData_31: - dsprite -2, 4, -1, 0, $00, $0 - dsprite -2, 4, 0, 0, $01, $0 - dsprite -1, 4, -1, 0, $02, $0 - dsprite -1, 4, 0, 0, $03, $0 - dsprite 0, 4, -1, 0, $04, $0 - dsprite 0, 4, 0, 0, $05, $0 + dbsprite -1, -2, 0, 4, $00, $0 + dbsprite 0, -2, 0, 4, $01, $0 + dbsprite -1, -1, 0, 4, $02, $0 + dbsprite 0, -1, 0, 4, $03, $0 + dbsprite -1, 0, 0, 4, $04, $0 + dbsprite 0, 0, 0, 4, $05, $0 .OAMData_76: - dsprite -1, 5, -1, 0, $00, $0 - dsprite -1, 1, 0, 0, $00, $0 + dbsprite -1, -1, 0, 5, $00, $0 + dbsprite 0, -1, 0, 1, $00, $0 .OAMData_32: - dsprite -1, 0, -2, 4, $00, $0 - dsprite -1, 0, 0, 4, $00, $0 - dsprite -3, 0, -2, 4, $00, $0 - dsprite -3, 0, 0, 4, $00, $0 - dsprite -2, 0, -3, 4, $00, $0 - dsprite -2, 0, -2, 4, $01, $0 - dsprite -2, 0, -1, 4, $00, $0 - dsprite -2, 0, 0, 4, $01, $0 - dsprite -2, 0, 1, 4, $00, $0 - dsprite -1, 0, -4, 4, $00, $0 - dsprite -1, 0, -3, 4, $01, $0 - dsprite -1, 0, -1, 4, $01, $0 - dsprite -1, 0, 1, 4, $01, $0 - dsprite -1, 0, 2, 4, $00, $0 + dbsprite -2, -1, 4, 0, $00, $0 + dbsprite 0, -1, 4, 0, $00, $0 + dbsprite -2, -3, 4, 0, $00, $0 + dbsprite 0, -3, 4, 0, $00, $0 + dbsprite -3, -2, 4, 0, $00, $0 + dbsprite -2, -2, 4, 0, $01, $0 + dbsprite -1, -2, 4, 0, $00, $0 + dbsprite 0, -2, 4, 0, $01, $0 + dbsprite 1, -2, 4, 0, $00, $0 + dbsprite -4, -1, 4, 0, $00, $0 + dbsprite -3, -1, 4, 0, $01, $0 + dbsprite -1, -1, 4, 0, $01, $0 + dbsprite 1, -1, 4, 0, $01, $0 + dbsprite 2, -1, 4, 0, $00, $0 .OAMData_33: - dsprite -2, 0, -2, 4, $00, $0 - dsprite -2, 0, 0, 4, $00, $0 - dsprite -1, 0, -3, 4, $00, $0 - dsprite -1, 0, -2, 4, $01, $0 - dsprite -1, 0, -1, 4, $00, $0 - dsprite -1, 0, 0, 4, $01, $0 - dsprite -1, 0, 1, 4, $00, $0 - dsprite -4, 0, -2, 4, $00, $0 - dsprite -4, 0, 0, 4, $00, $0 - dsprite -3, 0, -3, 4, $00, $0 - dsprite -3, 0, -2, 4, $01, $0 - dsprite -3, 0, -1, 4, $00, $0 - dsprite -3, 0, 0, 4, $01, $0 - dsprite -3, 0, 1, 4, $00, $0 - dsprite -2, 0, -4, 4, $00, $0 - dsprite -2, 0, -3, 4, $01, $0 - dsprite -2, 0, -1, 4, $01, $0 - dsprite -2, 0, 1, 4, $01, $0 - dsprite -2, 0, 2, 4, $00, $0 - dsprite -1, 0, -4, 4, $01, $0 - dsprite -1, 0, 2, 4, $01, $0 + dbsprite -2, -2, 4, 0, $00, $0 + dbsprite 0, -2, 4, 0, $00, $0 + dbsprite -3, -1, 4, 0, $00, $0 + dbsprite -2, -1, 4, 0, $01, $0 + dbsprite -1, -1, 4, 0, $00, $0 + dbsprite 0, -1, 4, 0, $01, $0 + dbsprite 1, -1, 4, 0, $00, $0 + dbsprite -2, -4, 4, 0, $00, $0 + dbsprite 0, -4, 4, 0, $00, $0 + dbsprite -3, -3, 4, 0, $00, $0 + dbsprite -2, -3, 4, 0, $01, $0 + dbsprite -1, -3, 4, 0, $00, $0 + dbsprite 0, -3, 4, 0, $01, $0 + dbsprite 1, -3, 4, 0, $00, $0 + dbsprite -4, -2, 4, 0, $00, $0 + dbsprite -3, -2, 4, 0, $01, $0 + dbsprite -1, -2, 4, 0, $01, $0 + dbsprite 1, -2, 4, 0, $01, $0 + dbsprite 2, -2, 4, 0, $00, $0 + dbsprite -4, -1, 4, 0, $01, $0 + dbsprite 2, -1, 4, 0, $01, $0 .OAMData_36: - dsprite -7, 4, -1, 0, $00, $0 - dsprite -7, 4, 0, 0, $01, $0 - dsprite -6, 4, -1, 0, $02, $0 - dsprite -6, 4, 0, 0, $03, $0 - dsprite -5, 4, -1, 0, $04, $0 - dsprite -5, 4, 0, 0, $05, $0 - dsprite -4, 4, -1, 0, $06, $0 - dsprite -4, 4, 0, 0, $07, $0 - dsprite -3, 4, -1, 0, $08, $0 - dsprite -3, 4, 0, 0, $09, $0 - dsprite -2, 4, -1, 0, $0a, $0 - dsprite -2, 4, 0, 0, $0b, $0 - dsprite -1, 4, -1, 0, $0c, $0 - dsprite -1, 4, 0, 0, $0d, $0 + dbsprite -1, -7, 0, 4, $00, $0 + dbsprite 0, -7, 0, 4, $01, $0 + dbsprite -1, -6, 0, 4, $02, $0 + dbsprite 0, -6, 0, 4, $03, $0 + dbsprite -1, -5, 0, 4, $04, $0 + dbsprite 0, -5, 0, 4, $05, $0 + dbsprite -1, -4, 0, 4, $06, $0 + dbsprite 0, -4, 0, 4, $07, $0 + dbsprite -1, -3, 0, 4, $08, $0 + dbsprite 0, -3, 0, 4, $09, $0 + dbsprite -1, -2, 0, 4, $0a, $0 + dbsprite 0, -2, 0, 4, $0b, $0 + dbsprite -1, -1, 0, 4, $0c, $0 + dbsprite 0, -1, 0, 4, $0d, $0 .OAMData_3a: - dsprite -7, 4, -1, 0, $0c, $0 - dsprite -7, 4, 0, 0, $0d, $0 - dsprite -6, 4, -1, 0, $08, $0 - dsprite -6, 4, 0, 0, $09, $0 - dsprite -5, 4, -1, 0, $04, $0 - dsprite -5, 4, 0, 0, $05, $0 - dsprite -4, 4, -1, 0, $00, $0 - dsprite -4, 4, 0, 0, $01, $0 - dsprite -3, 4, -1, 0, $02, $0 - dsprite -3, 4, 0, 0, $03, $0 - dsprite -2, 4, 0, 0, $02, $0 - dsprite -2, 4, 1, 0, $03, $0 - dsprite -1, 4, 0, 0, $0a, $0 - dsprite -1, 4, 1, 0, $0b, $0 + dbsprite -1, -7, 0, 4, $0c, $0 + dbsprite 0, -7, 0, 4, $0d, $0 + dbsprite -1, -6, 0, 4, $08, $0 + dbsprite 0, -6, 0, 4, $09, $0 + dbsprite -1, -5, 0, 4, $04, $0 + dbsprite 0, -5, 0, 4, $05, $0 + dbsprite -1, -4, 0, 4, $00, $0 + dbsprite 0, -4, 0, 4, $01, $0 + dbsprite -1, -3, 0, 4, $02, $0 + dbsprite 0, -3, 0, 4, $03, $0 + dbsprite 0, -2, 0, 4, $02, $0 + dbsprite 1, -2, 0, 4, $03, $0 + dbsprite 0, -1, 0, 4, $0a, $0 + dbsprite 1, -1, 0, 4, $0b, $0 .OAMData_3e: - dsprite 1, 4, -2, 0, $00, Y_FLIP - dsprite 1, 4, -1, 0, $02, Y_FLIP - dsprite 1, 4, 0, 0, $02, X_FLIP | Y_FLIP - dsprite 1, 4, 1, 0, $00, X_FLIP | Y_FLIP - dsprite -1, 4, -3, 0, $09, X_FLIP - dsprite -1, 4, -2, 0, $08, X_FLIP - dsprite -1, 4, -1, 0, $06, $0 - dsprite -1, 4, 0, 0, $07, $0 - dsprite -1, 4, 1, 0, $08, $0 - dsprite -1, 4, 2, 0, $09, $0 - dsprite 0, 4, -3, 0, $01, X_FLIP - dsprite 0, 4, -2, 0, $00, X_FLIP - dsprite 0, 4, -1, 0, $0c, $0 - dsprite 0, 4, 0, 0, $0d, $0 - dsprite 0, 4, 1, 0, $00, $0 - dsprite 0, 4, 2, 0, $01, $0 - dsprite -3, 4, -2, 0, $00, $0 - dsprite -3, 4, -1, 0, $02, $0 - dsprite -3, 4, 0, 0, $02, X_FLIP - dsprite -3, 4, 1, 0, $00, X_FLIP - dsprite -2, 4, -3, 0, $03, X_FLIP - dsprite -2, 4, -2, 0, $02, X_FLIP - dsprite -2, 4, -1, 0, $04, $0 - dsprite -2, 4, 0, 0, $05, $0 - dsprite -2, 4, 1, 0, $02, $0 - dsprite -2, 4, 2, 0, $03, $0 + dbsprite -2, 1, 0, 4, $00, Y_FLIP + dbsprite -1, 1, 0, 4, $02, Y_FLIP + dbsprite 0, 1, 0, 4, $02, X_FLIP | Y_FLIP + dbsprite 1, 1, 0, 4, $00, X_FLIP | Y_FLIP + dbsprite -3, -1, 0, 4, $09, X_FLIP + dbsprite -2, -1, 0, 4, $08, X_FLIP + dbsprite -1, -1, 0, 4, $06, $0 + dbsprite 0, -1, 0, 4, $07, $0 + dbsprite 1, -1, 0, 4, $08, $0 + dbsprite 2, -1, 0, 4, $09, $0 + dbsprite -3, 0, 0, 4, $01, X_FLIP + dbsprite -2, 0, 0, 4, $00, X_FLIP + dbsprite -1, 0, 0, 4, $0c, $0 + dbsprite 0, 0, 0, 4, $0d, $0 + dbsprite 1, 0, 0, 4, $00, $0 + dbsprite 2, 0, 0, 4, $01, $0 + dbsprite -2, -3, 0, 4, $00, $0 + dbsprite -1, -3, 0, 4, $02, $0 + dbsprite 0, -3, 0, 4, $02, X_FLIP + dbsprite 1, -3, 0, 4, $00, X_FLIP + dbsprite -3, -2, 0, 4, $03, X_FLIP + dbsprite -2, -2, 0, 4, $02, X_FLIP + dbsprite -1, -2, 0, 4, $04, $0 + dbsprite 0, -2, 0, 4, $05, $0 + dbsprite 1, -2, 0, 4, $02, $0 + dbsprite 2, -2, 0, 4, $03, $0 .OAMData_41: - dsprite -3, 4, -2, 0, $00, $0 - dsprite -3, 4, -1, 0, $02, $0 - dsprite -3, 4, 0, 0, $02, X_FLIP - dsprite -3, 4, 1, 0, $00, X_FLIP - dsprite -2, 4, -3, 4, $00, $0 - dsprite -2, 4, -2, 4, $01, $0 - dsprite -2, 4, -1, 0, $05, X_FLIP - dsprite -2, 4, 0, 0, $04, X_FLIP - dsprite -2, 4, 0, 4, $01, X_FLIP - dsprite -2, 4, 1, 4, $00, X_FLIP - dsprite -1, 4, -3, 4, $02, $0 - dsprite -1, 4, -2, 4, $03, $0 - dsprite -1, 4, -1, 0, $07, X_FLIP - dsprite -1, 4, 0, 0, $06, X_FLIP - dsprite -1, 4, 0, 4, $03, X_FLIP - dsprite -1, 4, 1, 4, $02, X_FLIP - dsprite 0, 4, -3, 4, $04, $0 - dsprite 0, 4, -2, 4, $05, $0 - dsprite 0, 4, -1, 0, $0d, X_FLIP - dsprite 0, 4, 0, 0, $0c, X_FLIP - dsprite 0, 4, 0, 4, $05, X_FLIP - dsprite 0, 4, 1, 4, $04, X_FLIP - dsprite 1, 4, -2, 0, $00, Y_FLIP - dsprite 1, 4, -1, 0, $02, Y_FLIP - dsprite 1, 4, 0, 0, $02, X_FLIP | Y_FLIP - dsprite 1, 4, 1, 0, $00, X_FLIP | Y_FLIP + dbsprite -2, -3, 0, 4, $00, $0 + dbsprite -1, -3, 0, 4, $02, $0 + dbsprite 0, -3, 0, 4, $02, X_FLIP + dbsprite 1, -3, 0, 4, $00, X_FLIP + dbsprite -3, -2, 4, 4, $00, $0 + dbsprite -2, -2, 4, 4, $01, $0 + dbsprite -1, -2, 0, 4, $05, X_FLIP + dbsprite 0, -2, 0, 4, $04, X_FLIP + dbsprite 0, -2, 4, 4, $01, X_FLIP + dbsprite 1, -2, 4, 4, $00, X_FLIP + dbsprite -3, -1, 4, 4, $02, $0 + dbsprite -2, -1, 4, 4, $03, $0 + dbsprite -1, -1, 0, 4, $07, X_FLIP + dbsprite 0, -1, 0, 4, $06, X_FLIP + dbsprite 0, -1, 4, 4, $03, X_FLIP + dbsprite 1, -1, 4, 4, $02, X_FLIP + dbsprite -3, 0, 4, 4, $04, $0 + dbsprite -2, 0, 4, 4, $05, $0 + dbsprite -1, 0, 0, 4, $0d, X_FLIP + dbsprite 0, 0, 0, 4, $0c, X_FLIP + dbsprite 0, 0, 4, 4, $05, X_FLIP + dbsprite 1, 0, 4, 4, $04, X_FLIP + dbsprite -2, 1, 0, 4, $00, Y_FLIP + dbsprite -1, 1, 0, 4, $02, Y_FLIP + dbsprite 0, 1, 0, 4, $02, X_FLIP | Y_FLIP + dbsprite 1, 1, 0, 4, $00, X_FLIP | Y_FLIP .OAMData_42: - dsprite -3, 0, -1, 4, $02, $0 - dsprite 2, 0, -1, 4, $02, X_FLIP | Y_FLIP - dsprite -1, 4, -3, 0, $01, $0 - dsprite -1, 4, 2, 0, $01, X_FLIP | Y_FLIP - dsprite -4, 0, -1, 4, $02, $0 - dsprite 3, 0, -1, 4, $02, X_FLIP | Y_FLIP - dsprite -1, 4, -4, 0, $01, $0 - dsprite -1, 4, 3, 0, $01, X_FLIP | Y_FLIP + dbsprite -1, -3, 4, 0, $02, $0 + dbsprite -1, 2, 4, 0, $02, X_FLIP | Y_FLIP + dbsprite -3, -1, 0, 4, $01, $0 + dbsprite 2, -1, 0, 4, $01, X_FLIP | Y_FLIP + dbsprite -1, -4, 4, 0, $02, $0 + dbsprite -1, 3, 4, 0, $02, X_FLIP | Y_FLIP + dbsprite -4, -1, 0, 4, $01, $0 + dbsprite 3, -1, 0, 4, $01, X_FLIP | Y_FLIP .OAMData_44: - dsprite -3, 5, -3, 5, $00, X_FLIP - dsprite -3, 5, 1, 3, $00, $0 - dsprite 1, 3, -3, 5, $00, X_FLIP | Y_FLIP - dsprite 1, 3, 1, 3, $00, Y_FLIP - dsprite -4, 5, -4, 5, $00, X_FLIP - dsprite -4, 5, 2, 3, $00, $0 - dsprite 2, 3, -4, 5, $00, X_FLIP | Y_FLIP - dsprite 2, 3, 2, 3, $00, Y_FLIP + dbsprite -3, -3, 5, 5, $00, X_FLIP + dbsprite 1, -3, 3, 5, $00, $0 + dbsprite -3, 1, 5, 3, $00, X_FLIP | Y_FLIP + dbsprite 1, 1, 3, 3, $00, Y_FLIP + dbsprite -4, -4, 5, 5, $00, X_FLIP + dbsprite 2, -4, 3, 5, $00, $0 + dbsprite -4, 2, 5, 3, $00, X_FLIP | Y_FLIP + dbsprite 2, 2, 3, 3, $00, Y_FLIP .OAMData_46: - dsprite -3, 4, -1, 4, $02, $0 - dsprite 1, 4, -1, 4, $02, X_FLIP | Y_FLIP - dsprite -1, 4, -3, 4, $01, $0 - dsprite -1, 4, 1, 4, $01, X_FLIP | Y_FLIP + dbsprite -1, -3, 4, 4, $02, $0 + dbsprite -1, 1, 4, 4, $02, X_FLIP | Y_FLIP + dbsprite -3, -1, 4, 4, $01, $0 + dbsprite 1, -1, 4, 4, $01, X_FLIP | Y_FLIP .OAMData_47: - dsprite -2, 0, -2, 0, $00, X_FLIP - dsprite -2, 0, 1, 0, $00, $0 - dsprite 1, 0, -2, 0, $00, X_FLIP | Y_FLIP - dsprite 1, 0, 1, 0, $00, Y_FLIP + dbsprite -2, -2, 0, 0, $00, X_FLIP + dbsprite 1, -2, 0, 0, $00, $0 + dbsprite -2, 1, 0, 0, $00, X_FLIP | Y_FLIP + dbsprite 1, 1, 0, 0, $00, Y_FLIP .OAMData_48: - dsprite -3, 0, -1, 4, $00, $0 - dsprite -2, 0, -1, 2, $00, $0 - dsprite -1, 0, -1, 0, $00, $0 - dsprite 0, 0, -1, 0, $00, $0 - dsprite 1, 0, -1, 2, $00, $0 - dsprite 2, 0, -1, 4, $00, $0 + dbsprite -1, -3, 4, 0, $00, $0 + dbsprite -1, -2, 2, 0, $00, $0 + dbsprite -1, -1, 0, 0, $00, $0 + dbsprite -1, 0, 0, 0, $00, $0 + dbsprite -1, 1, 2, 0, $00, $0 + dbsprite -1, 2, 4, 0, $00, $0 .OAMData_49: - dsprite -1, 4, -2, 0, $00, X_FLIP - dsprite -1, 2, -1, 0, $00, X_FLIP - dsprite -1, 2, 0, 0, $00, $0 - dsprite -1, 4, 1, 0, $00, $0 + dbsprite -2, -1, 0, 4, $00, X_FLIP + dbsprite -1, -1, 0, 2, $00, X_FLIP + dbsprite 0, -1, 0, 2, $00, $0 + dbsprite 1, -1, 0, 4, $00, $0 .OAMData_4a: - dsprite -1, 4, -1, 0, $00, X_FLIP | Y_FLIP - dsprite -1, 4, 0, 0, $00, Y_FLIP + dbsprite -1, -1, 0, 4, $00, X_FLIP | Y_FLIP + dbsprite 0, -1, 0, 4, $00, Y_FLIP .OAMData_0f: - dsprite -1, 4, -1, 4, $00, $0 - dsprite -1, 4, -2, 4, $01, $0 - dsprite -1, 4, -1, 4, $01, X_FLIP - dsprite 0, 4, -2, 4, $01, Y_FLIP - dsprite 0, 4, -1, 4, $01, X_FLIP | Y_FLIP + dbsprite -1, -1, 4, 4, $00, $0 + dbsprite -2, -1, 4, 4, $01, $0 + dbsprite -1, -1, 4, 4, $01, X_FLIP + dbsprite -2, 0, 4, 4, $01, Y_FLIP + dbsprite -1, 0, 4, 4, $01, X_FLIP | Y_FLIP .OAMData_4c: - dsprite -1, 4, -1, 4, $00, $0 - dsprite 0, 2, -2, 6, $00, $0 - dsprite 0, 2, -3, 6, $01, $0 - dsprite 0, 2, -2, 6, $01, X_FLIP - dsprite 1, 2, -3, 6, $01, Y_FLIP - dsprite 1, 2, -2, 6, $01, X_FLIP | Y_FLIP + dbsprite -1, -1, 4, 4, $00, $0 + dbsprite -2, 0, 6, 2, $00, $0 + dbsprite -3, 0, 6, 2, $01, $0 + dbsprite -2, 0, 6, 2, $01, X_FLIP + dbsprite -3, 1, 6, 2, $01, Y_FLIP + dbsprite -2, 1, 6, 2, $01, X_FLIP | Y_FLIP .OAMData_4d: - dsprite -1, 4, -1, 4, $00, $0 - dsprite 0, 2, -2, 6, $00, $0 - dsprite 1, 0, -2, 0, $00, $0 - dsprite 1, 0, -3, 0, $01, $0 - dsprite 1, 0, -2, 0, $01, X_FLIP - dsprite 2, 0, -3, 0, $01, Y_FLIP - dsprite 2, 0, -2, 0, $01, X_FLIP | Y_FLIP + dbsprite -1, -1, 4, 4, $00, $0 + dbsprite -2, 0, 6, 2, $00, $0 + dbsprite -2, 1, 0, 0, $00, $0 + dbsprite -3, 1, 0, 0, $01, $0 + dbsprite -2, 1, 0, 0, $01, X_FLIP + dbsprite -3, 2, 0, 0, $01, Y_FLIP + dbsprite -2, 2, 0, 0, $01, X_FLIP | Y_FLIP .OAMData_4f: - dsprite -1, 4, -1, 4, $00, $0 - dsprite 0, 2, -2, 6, $00, $0 - dsprite 1, 0, -2, 0, $00, $0 - dsprite 1, 6, -3, 2, $00, $0 - dsprite 1, 6, -4, 2, $01, $0 - dsprite 1, 6, -3, 2, $01, X_FLIP - dsprite 2, 6, -4, 2, $01, Y_FLIP - dsprite 2, 6, -3, 2, $01, X_FLIP | Y_FLIP + dbsprite -1, -1, 4, 4, $00, $0 + dbsprite -2, 0, 6, 2, $00, $0 + dbsprite -2, 1, 0, 0, $00, $0 + dbsprite -3, 1, 2, 6, $00, $0 + dbsprite -4, 1, 2, 6, $01, $0 + dbsprite -3, 1, 2, 6, $01, X_FLIP + dbsprite -4, 2, 2, 6, $01, Y_FLIP + dbsprite -3, 2, 2, 6, $01, X_FLIP | Y_FLIP .OAMData_50: - dsprite -1, 4, -1, 4, $00, $0 - dsprite 0, 2, -2, 6, $00, $0 - dsprite 1, 0, -2, 0, $00, $0 - dsprite 1, 6, -3, 2, $00, $0 - dsprite 2, 4, -4, 4, $00, $0 - dsprite 2, 4, -5, 4, $01, $0 - dsprite 2, 4, -4, 4, $01, X_FLIP - dsprite 3, 4, -5, 4, $01, Y_FLIP - dsprite 3, 4, -4, 4, $01, X_FLIP | Y_FLIP + dbsprite -1, -1, 4, 4, $00, $0 + dbsprite -2, 0, 6, 2, $00, $0 + dbsprite -2, 1, 0, 0, $00, $0 + dbsprite -3, 1, 2, 6, $00, $0 + dbsprite -4, 2, 4, 4, $00, $0 + dbsprite -5, 2, 4, 4, $01, $0 + dbsprite -4, 2, 4, 4, $01, X_FLIP + dbsprite -5, 3, 4, 4, $01, Y_FLIP + dbsprite -4, 3, 4, 4, $01, X_FLIP | Y_FLIP .OAMData_51: - dsprite -1, 4, -1, 4, $00, $0 - dsprite 0, 2, -2, 6, $00, $0 - dsprite 1, 0, -2, 0, $00, $0 - dsprite 1, 6, -3, 2, $00, $0 - dsprite 2, 4, -4, 4, $00, $0 - dsprite 3, 2, -5, 6, $00, $0 - dsprite 3, 2, -6, 6, $01, $0 - dsprite 3, 2, -5, 6, $01, X_FLIP - dsprite 4, 2, -6, 6, $01, Y_FLIP - dsprite 4, 2, -5, 6, $01, X_FLIP | Y_FLIP + dbsprite -1, -1, 4, 4, $00, $0 + dbsprite -2, 0, 6, 2, $00, $0 + dbsprite -2, 1, 0, 0, $00, $0 + dbsprite -3, 1, 2, 6, $00, $0 + dbsprite -4, 2, 4, 4, $00, $0 + dbsprite -5, 3, 6, 2, $00, $0 + dbsprite -6, 3, 6, 2, $01, $0 + dbsprite -5, 3, 6, 2, $01, X_FLIP + dbsprite -6, 4, 6, 2, $01, Y_FLIP + dbsprite -5, 4, 6, 2, $01, X_FLIP | Y_FLIP .OAMData_59: - dsprite -1, 4, -2, 0, $00, $0 - dsprite -1, 4, -1, 0, $01, $0 - dsprite -1, 4, 0, 0, $01, X_FLIP - dsprite -1, 4, 1, 0, $00, X_FLIP + dbsprite -2, -1, 0, 4, $00, $0 + dbsprite -1, -1, 0, 4, $01, $0 + dbsprite 0, -1, 0, 4, $01, X_FLIP + dbsprite 1, -1, 0, 4, $00, X_FLIP .OAMData_5a: - dsprite -1, 4, -2, 0, $02, $0 - dsprite -1, 4, -1, 0, $01, $0 - dsprite -1, 4, 0, 0, $01, X_FLIP - dsprite -1, 4, 1, 0, $02, X_FLIP + dbsprite -2, -1, 0, 4, $02, $0 + dbsprite -1, -1, 0, 4, $01, $0 + dbsprite 0, -1, 0, 4, $01, X_FLIP + dbsprite 1, -1, 0, 4, $02, X_FLIP .OAMData_60: - dsprite -1, 0, -1, 4, $00, $0 + dbsprite -1, -1, 4, 0, $00, $0 .OAMData_69: - dsprite 0, 0, -1, 4, $00, $0 + dbsprite -1, 0, 4, 0, $00, $0 .OAMData_61: - dsprite -1, 4, -4, 4, $00, $0 - dsprite -1, 4, -3, 4, $01, $0 - dsprite -1, 4, -2, 4, $02, $0 - dsprite -1, 4, -1, 4, $03, $0 - dsprite -1, 4, 0, 4, $04, $0 - dsprite -1, 4, 1, 4, $05, $0 - dsprite -1, 4, 2, 4, $06, $0 - dsprite -2, 4, 1, 4, $07, $0 - dsprite -2, 4, 2, 4, $08, $0 + dbsprite -4, -1, 4, 4, $00, $0 + dbsprite -3, -1, 4, 4, $01, $0 + dbsprite -2, -1, 4, 4, $02, $0 + dbsprite -1, -1, 4, 4, $03, $0 + dbsprite 0, -1, 4, 4, $04, $0 + dbsprite 1, -1, 4, 4, $05, $0 + dbsprite 2, -1, 4, 4, $06, $0 + dbsprite 1, -2, 4, 4, $07, $0 + dbsprite 2, -2, 4, 4, $08, $0 .OAMData_65: - dsprite -2, 4, -4, 4, $08, X_FLIP - dsprite -2, 4, -3, 4, $07, X_FLIP - dsprite -1, 4, -4, 4, $06, X_FLIP - dsprite -1, 4, -3, 4, $05, X_FLIP - dsprite -1, 4, -2, 4, $04, X_FLIP - dsprite -1, 4, -1, 4, $03, X_FLIP - dsprite -1, 4, 0, 4, $02, X_FLIP - dsprite -1, 4, 1, 4, $01, X_FLIP - dsprite -1, 4, 2, 4, $00, X_FLIP + dbsprite -4, -2, 4, 4, $08, X_FLIP + dbsprite -3, -2, 4, 4, $07, X_FLIP + dbsprite -4, -1, 4, 4, $06, X_FLIP + dbsprite -3, -1, 4, 4, $05, X_FLIP + dbsprite -2, -1, 4, 4, $04, X_FLIP + dbsprite -1, -1, 4, 4, $03, X_FLIP + dbsprite 0, -1, 4, 4, $02, X_FLIP + dbsprite 1, -1, 4, 4, $01, X_FLIP + dbsprite 2, -1, 4, 4, $00, X_FLIP .OAMData_d4: - dsprite 0, 0, -4, 4, $00, OBP_NUM - dsprite 0, 0, -3, 4, $01, OBP_NUM - dsprite 0, 0, -2, 4, $02, OBP_NUM - dsprite 0, 0, -1, 4, $03, OBP_NUM - dsprite 0, 0, 0, 4, $04, OBP_NUM - dsprite 0, 0, 1, 4, $05, OBP_NUM - dsprite 0, 0, 2, 4, $06, OBP_NUM + dbsprite -4, 0, 4, 0, $00, OBP_NUM + dbsprite -3, 0, 4, 0, $01, OBP_NUM + dbsprite -2, 0, 4, 0, $02, OBP_NUM + dbsprite -1, 0, 4, 0, $03, OBP_NUM + dbsprite 0, 0, 4, 0, $04, OBP_NUM + dbsprite 1, 0, 4, 0, $05, OBP_NUM + dbsprite 2, 0, 4, 0, $06, OBP_NUM .OAMData_d6: - dsprite -1, 0, -4, 4, $00, OBP_NUM - dsprite 0, 0, -4, 4, $01, OBP_NUM - dsprite -1, 0, -3, 4, $02, OBP_NUM - dsprite 0, 0, -3, 4, $03, OBP_NUM - dsprite -1, 0, -2, 4, $04, OBP_NUM - dsprite 0, 0, -2, 4, $05, OBP_NUM - dsprite -1, 0, -1, 4, $06, OBP_NUM - dsprite 0, 0, -1, 4, $07, OBP_NUM - dsprite -1, 0, 0, 4, $08, OBP_NUM - dsprite 0, 0, 0, 4, $09, OBP_NUM - dsprite -1, 0, 1, 4, $0a, OBP_NUM - dsprite 0, 0, 1, 4, $0b, OBP_NUM - dsprite -1, 0, 2, 4, $0c, OBP_NUM - dsprite 0, 0, 2, 4, $0d, OBP_NUM + dbsprite -4, -1, 4, 0, $00, OBP_NUM + dbsprite -4, 0, 4, 0, $01, OBP_NUM + dbsprite -3, -1, 4, 0, $02, OBP_NUM + dbsprite -3, 0, 4, 0, $03, OBP_NUM + dbsprite -2, -1, 4, 0, $04, OBP_NUM + dbsprite -2, 0, 4, 0, $05, OBP_NUM + dbsprite -1, -1, 4, 0, $06, OBP_NUM + dbsprite -1, 0, 4, 0, $07, OBP_NUM + dbsprite 0, -1, 4, 0, $08, OBP_NUM + dbsprite 0, 0, 4, 0, $09, OBP_NUM + dbsprite 1, -1, 4, 0, $0a, OBP_NUM + dbsprite 1, 0, 4, 0, $0b, OBP_NUM + dbsprite 2, -1, 4, 0, $0c, OBP_NUM + dbsprite 2, 0, 4, 0, $0d, OBP_NUM .OAMData_d5: - dsprite 0, 0, -3, 0, $00, $1 | OBP_NUM - dsprite 0, 0, -2, 0, $01, $1 | OBP_NUM - dsprite 0, 0, -1, 0, $02, $1 | OBP_NUM - dsprite 0, 0, 0, 0, $03, $1 | OBP_NUM - dsprite 0, 0, 1, 0, $04, $1 | OBP_NUM - dsprite 0, 0, 2, 0, $05, $1 | OBP_NUM + dbsprite -3, 0, 0, 0, $00, $1 | OBP_NUM + dbsprite -2, 0, 0, 0, $01, $1 | OBP_NUM + dbsprite -1, 0, 0, 0, $02, $1 | OBP_NUM + dbsprite 0, 0, 0, 0, $03, $1 | OBP_NUM + dbsprite 1, 0, 0, 0, $04, $1 | OBP_NUM + dbsprite 2, 0, 0, 0, $05, $1 | OBP_NUM .OAMData_d7: - dsprite 0, 0, -3, 0, $00, $1 | OBP_NUM - dsprite 1, 0, -3, 0, $01, $1 | OBP_NUM - dsprite 0, 0, -2, 0, $02, $1 | OBP_NUM - dsprite 1, 0, -2, 0, $03, $1 | OBP_NUM - dsprite 0, 0, -1, 0, $04, $1 | OBP_NUM - dsprite 1, 0, -1, 0, $05, $1 | OBP_NUM - dsprite 0, 0, 0, 0, $06, $1 | OBP_NUM - dsprite 1, 0, 0, 0, $07, $1 | OBP_NUM - dsprite 0, 0, 1, 0, $08, $1 | OBP_NUM - dsprite 1, 0, 1, 0, $09, $1 | OBP_NUM - dsprite 0, 0, 2, 0, $0a, $1 | OBP_NUM - dsprite 1, 0, 2, 0, $0b, $1 | OBP_NUM + dbsprite -3, 0, 0, 0, $00, $1 | OBP_NUM + dbsprite -3, 1, 0, 0, $01, $1 | OBP_NUM + dbsprite -2, 0, 0, 0, $02, $1 | OBP_NUM + dbsprite -2, 1, 0, 0, $03, $1 | OBP_NUM + dbsprite -1, 0, 0, 0, $04, $1 | OBP_NUM + dbsprite -1, 1, 0, 0, $05, $1 | OBP_NUM + dbsprite 0, 0, 0, 0, $06, $1 | OBP_NUM + dbsprite 0, 1, 0, 0, $07, $1 | OBP_NUM + dbsprite 1, 0, 0, 0, $08, $1 | OBP_NUM + dbsprite 1, 1, 0, 0, $09, $1 | OBP_NUM + dbsprite 2, 0, 0, 0, $0a, $1 | OBP_NUM + dbsprite 2, 1, 0, 0, $0b, $1 | OBP_NUM .OAMData_6e: - dsprite -2, 4, 0, 4, $00, $0 - dsprite -1, 4, -2, 4, $01, $0 - dsprite -1, 4, -1, 4, $02, $0 - dsprite -1, 4, 0, 4, $03, $0 - dsprite 0, 4, -2, 4, $04, $0 + dbsprite 0, -2, 4, 4, $00, $0 + dbsprite -2, -1, 4, 4, $01, $0 + dbsprite -1, -1, 4, 4, $02, $0 + dbsprite 0, -1, 4, 4, $03, $0 + dbsprite -2, 0, 4, 4, $04, $0 .OAMData_6f: - dsprite -1, 4, -2, 4, $00, $0 - dsprite -1, 4, -1, 4, $01, $0 - dsprite -1, 4, 0, 4, $02, $0 + dbsprite -2, -1, 4, 4, $00, $0 + dbsprite -1, -1, 4, 4, $01, $0 + dbsprite 0, -1, 4, 4, $02, $0 .OAMData_77: - dsprite -4, 4, 1, 4, $01, X_FLIP | Y_FLIP + dbsprite 1, -4, 4, 4, $01, X_FLIP | Y_FLIP .OAMData_78: - dsprite -4, 4, 1, 4, $00, $0 - dsprite -4, 4, 0, 4, $01, X_FLIP | Y_FLIP - dsprite -3, 4, 1, 4, $01, X_FLIP | Y_FLIP + dbsprite 1, -4, 4, 4, $00, $0 + dbsprite 0, -4, 4, 4, $01, X_FLIP | Y_FLIP + dbsprite 1, -3, 4, 4, $01, X_FLIP | Y_FLIP .OAMData_79: - dsprite -4, 4, 1, 4, $01, $0 - dsprite -4, 4, 0, 4, $00, $0 - dsprite -4, 4, -1, 4, $01, X_FLIP | Y_FLIP - dsprite -3, 4, 1, 4, $00, $0 - dsprite -3, 4, 0, 4, $01, X_FLIP | Y_FLIP - dsprite -2, 4, 1, 4, $01, X_FLIP | Y_FLIP + dbsprite 1, -4, 4, 4, $01, $0 + dbsprite 0, -4, 4, 4, $00, $0 + dbsprite -1, -4, 4, 4, $01, X_FLIP | Y_FLIP + dbsprite 1, -3, 4, 4, $00, $0 + dbsprite 0, -3, 4, 4, $01, X_FLIP | Y_FLIP + dbsprite 1, -2, 4, 4, $01, X_FLIP | Y_FLIP .OAMData_7a: - dsprite -4, 4, -2, 4, $01, X_FLIP | Y_FLIP - dsprite -4, 4, -1, 4, $00, $0 - dsprite -4, 4, 0, 4, $01, $0 - dsprite -3, 4, -1, 4, $01, X_FLIP | Y_FLIP - dsprite -3, 4, 0, 4, $00, $0 - dsprite -3, 4, 1, 4, $01, $0 - dsprite -2, 4, 0, 4, $01, X_FLIP | Y_FLIP - dsprite -2, 4, 1, 4, $00, $0 - dsprite -1, 4, 1, 4, $01, X_FLIP | Y_FLIP + dbsprite -2, -4, 4, 4, $01, X_FLIP | Y_FLIP + dbsprite -1, -4, 4, 4, $00, $0 + dbsprite 0, -4, 4, 4, $01, $0 + dbsprite -1, -3, 4, 4, $01, X_FLIP | Y_FLIP + dbsprite 0, -3, 4, 4, $00, $0 + dbsprite 1, -3, 4, 4, $01, $0 + dbsprite 0, -2, 4, 4, $01, X_FLIP | Y_FLIP + dbsprite 1, -2, 4, 4, $00, $0 + dbsprite 1, -1, 4, 4, $01, X_FLIP | Y_FLIP .OAMData_7b: - dsprite -4, 4, -3, 4, $01, X_FLIP | Y_FLIP - dsprite -4, 4, -2, 4, $00, $0 - dsprite -4, 4, -1, 4, $01, $0 - dsprite -3, 4, -2, 4, $01, X_FLIP | Y_FLIP - dsprite -3, 4, -1, 4, $00, $0 - dsprite -3, 4, 0, 4, $01, $0 - dsprite -2, 4, -1, 4, $01, X_FLIP | Y_FLIP - dsprite -2, 4, 0, 4, $00, $0 - dsprite -2, 4, 1, 4, $01, $0 - dsprite -1, 4, 0, 4, $01, X_FLIP | Y_FLIP - dsprite -1, 4, 1, 4, $00, $0 - dsprite 0, 4, 1, 4, $01, X_FLIP | Y_FLIP + dbsprite -3, -4, 4, 4, $01, X_FLIP | Y_FLIP + dbsprite -2, -4, 4, 4, $00, $0 + dbsprite -1, -4, 4, 4, $01, $0 + dbsprite -2, -3, 4, 4, $01, X_FLIP | Y_FLIP + dbsprite -1, -3, 4, 4, $00, $0 + dbsprite 0, -3, 4, 4, $01, $0 + dbsprite -1, -2, 4, 4, $01, X_FLIP | Y_FLIP + dbsprite 0, -2, 4, 4, $00, $0 + dbsprite 1, -2, 4, 4, $01, $0 + dbsprite 0, -1, 4, 4, $01, X_FLIP | Y_FLIP + dbsprite 1, -1, 4, 4, $00, $0 + dbsprite 1, 0, 4, 4, $01, X_FLIP | Y_FLIP .OAMData_7c: - dsprite -4, 4, -3, 4, $00, $0 - dsprite -4, 4, -2, 4, $01, $0 - dsprite -3, 4, -3, 4, $01, X_FLIP | Y_FLIP - dsprite -3, 4, -2, 4, $00, $0 - dsprite -3, 4, -1, 4, $01, $0 - dsprite -2, 4, -2, 4, $01, X_FLIP | Y_FLIP - dsprite -2, 4, -1, 4, $00, $0 - dsprite -2, 4, 0, 4, $01, $0 - dsprite -1, 4, -1, 4, $01, X_FLIP | Y_FLIP - dsprite -1, 4, 0, 4, $00, $0 - dsprite -1, 4, 1, 4, $01, $0 - dsprite 0, 4, 0, 4, $01, X_FLIP | Y_FLIP - dsprite 0, 4, 1, 4, $00, $0 - dsprite 1, 4, 1, 4, $01, X_FLIP | Y_FLIP + dbsprite -3, -4, 4, 4, $00, $0 + dbsprite -2, -4, 4, 4, $01, $0 + dbsprite -3, -3, 4, 4, $01, X_FLIP | Y_FLIP + dbsprite -2, -3, 4, 4, $00, $0 + dbsprite -1, -3, 4, 4, $01, $0 + dbsprite -2, -2, 4, 4, $01, X_FLIP | Y_FLIP + dbsprite -1, -2, 4, 4, $00, $0 + dbsprite 0, -2, 4, 4, $01, $0 + dbsprite -1, -1, 4, 4, $01, X_FLIP | Y_FLIP + dbsprite 0, -1, 4, 4, $00, $0 + dbsprite 1, -1, 4, 4, $01, $0 + dbsprite 0, 0, 4, 4, $01, X_FLIP | Y_FLIP + dbsprite 1, 0, 4, 4, $00, $0 + dbsprite 1, 1, 4, 4, $01, X_FLIP | Y_FLIP .OAMData_7d: - dsprite -4, 4, -3, 4, $01, $0 - dsprite -3, 4, -3, 4, $00, $0 - dsprite -3, 4, -2, 4, $01, $0 - dsprite -2, 4, -3, 4, $01, X_FLIP | Y_FLIP - dsprite -2, 4, -2, 4, $00, $0 - dsprite -2, 4, -1, 4, $01, $0 - dsprite -1, 4, -2, 4, $01, X_FLIP | Y_FLIP - dsprite -1, 4, -1, 4, $00, $0 - dsprite -1, 4, 0, 4, $01, $0 - dsprite 0, 4, -1, 4, $01, X_FLIP | Y_FLIP - dsprite 0, 4, 0, 4, $00, $0 - dsprite 0, 4, 1, 4, $01, $0 - dsprite 1, 4, 0, 4, $01, X_FLIP | Y_FLIP - dsprite 1, 4, 1, 4, $00, $0 - dsprite 2, 4, 1, 4, $01, X_FLIP | Y_FLIP + dbsprite -3, -4, 4, 4, $01, $0 + dbsprite -3, -3, 4, 4, $00, $0 + dbsprite -2, -3, 4, 4, $01, $0 + dbsprite -3, -2, 4, 4, $01, X_FLIP | Y_FLIP + dbsprite -2, -2, 4, 4, $00, $0 + dbsprite -1, -2, 4, 4, $01, $0 + dbsprite -2, -1, 4, 4, $01, X_FLIP | Y_FLIP + dbsprite -1, -1, 4, 4, $00, $0 + dbsprite 0, -1, 4, 4, $01, $0 + dbsprite -1, 0, 4, 4, $01, X_FLIP | Y_FLIP + dbsprite 0, 0, 4, 4, $00, $0 + dbsprite 1, 0, 4, 4, $01, $0 + dbsprite 0, 1, 4, 4, $01, X_FLIP | Y_FLIP + dbsprite 1, 1, 4, 4, $00, $0 + dbsprite 1, 2, 4, 4, $01, X_FLIP | Y_FLIP .OAMData_70: - dsprite -2, 0, -1, 0, $00, $0 - dsprite -1, 0, -1, 0, $01, $0 - dsprite -2, 0, 0, 0, $00, X_FLIP - dsprite -1, 0, 0, 0, $01, X_FLIP - dsprite 0, 0, -1, 0, $01, Y_FLIP - dsprite 1, 0, -1, 0, $00, Y_FLIP - dsprite 0, 0, 0, 0, $01, X_FLIP | Y_FLIP - dsprite 1, 0, 0, 0, $00, X_FLIP | Y_FLIP + dbsprite -1, -2, 0, 0, $00, $0 + dbsprite -1, -1, 0, 0, $01, $0 + dbsprite 0, -2, 0, 0, $00, X_FLIP + dbsprite 0, -1, 0, 0, $01, X_FLIP + dbsprite -1, 0, 0, 0, $01, Y_FLIP + dbsprite -1, 1, 0, 0, $00, Y_FLIP + dbsprite 0, 0, 0, 0, $01, X_FLIP | Y_FLIP + dbsprite 0, 1, 0, 0, $00, X_FLIP | Y_FLIP .OAMData_81: - dsprite -1, 0, -1, 0, $00, $0 - dsprite -1, 0, 0, 0, $01, $0 - dsprite 0, 0, -1, 0, $01, X_FLIP | Y_FLIP - dsprite 0, 0, 0, 0, $00, X_FLIP | Y_FLIP + dbsprite -1, -1, 0, 0, $00, $0 + dbsprite 0, -1, 0, 0, $01, $0 + dbsprite -1, 0, 0, 0, $01, X_FLIP | Y_FLIP + dbsprite 0, 0, 0, 0, $00, X_FLIP | Y_FLIP .OAMData_87: - dsprite -2, 4, -1, 0, $00, $0 - dsprite -2, 4, 0, 0, $01, $0 - dsprite -1, 4, -1, 0, $02, $0 - dsprite -1, 4, 0, 0, $03, $0 - dsprite -1, 4, -1, 0, $00, $0 - dsprite -1, 4, 0, 0, $01, $0 - dsprite 0, 4, -1, 0, $02, $0 - dsprite 0, 4, 0, 0, $03, $0 - dsprite -3, 4, -1, 0, $00, $0 - dsprite -3, 4, 0, 0, $01, $0 - dsprite -2, 4, -1, 0, $02, $0 - dsprite -2, 4, 0, 0, $03, $0 - dsprite 0, 4, -1, 0, $00, $0 - dsprite 0, 4, 0, 0, $01, $0 - dsprite 1, 4, -1, 0, $02, $0 - dsprite 1, 4, 0, 0, $03, $0 + dbsprite -1, -2, 0, 4, $00, $0 + dbsprite 0, -2, 0, 4, $01, $0 + dbsprite -1, -1, 0, 4, $02, $0 + dbsprite 0, -1, 0, 4, $03, $0 + dbsprite -1, -1, 0, 4, $00, $0 + dbsprite 0, -1, 0, 4, $01, $0 + dbsprite -1, 0, 0, 4, $02, $0 + dbsprite 0, 0, 0, 4, $03, $0 + dbsprite -1, -3, 0, 4, $00, $0 + dbsprite 0, -3, 0, 4, $01, $0 + dbsprite -1, -2, 0, 4, $02, $0 + dbsprite 0, -2, 0, 4, $03, $0 + dbsprite -1, 0, 0, 4, $00, $0 + dbsprite 0, 0, 0, 4, $01, $0 + dbsprite -1, 1, 0, 4, $02, $0 + dbsprite 0, 1, 0, 4, $03, $0 .OAMData_88: - dsprite -2, 0, -1, 0, $00, $0 - dsprite -2, 0, 0, 0, $01, $0 - dsprite -1, 0, -1, 0, $02, $0 - dsprite -1, 0, 0, 0, $03, $0 - dsprite -1, 0, -1, 0, $00, $0 - dsprite -1, 0, 0, 0, $01, $0 - dsprite 0, 0, -1, 0, $02, $0 - dsprite 0, 0, 0, 0, $03, $0 - dsprite 0, 0, -1, 0, $00, $0 - dsprite 0, 0, 0, 0, $01, $0 - dsprite 1, 0, -1, 0, $02, $0 - dsprite 1, 0, 0, 0, $03, $0 + dbsprite -1, -2, 0, 0, $00, $0 + dbsprite 0, -2, 0, 0, $01, $0 + dbsprite -1, -1, 0, 0, $02, $0 + dbsprite 0, -1, 0, 0, $03, $0 + dbsprite -1, -1, 0, 0, $00, $0 + dbsprite 0, -1, 0, 0, $01, $0 + dbsprite -1, 0, 0, 0, $02, $0 + dbsprite 0, 0, 0, 0, $03, $0 + dbsprite -1, 0, 0, 0, $00, $0 + dbsprite 0, 0, 0, 0, $01, $0 + dbsprite -1, 1, 0, 0, $02, $0 + dbsprite 0, 1, 0, 0, $03, $0 .OAMData_8a: - dsprite -1, 4, -1, 4, $00, $0 - dsprite -1, 0, 0, 4, $00, $0 - dsprite -2, 4, 1, 4, $00, $0 - dsprite -2, 0, 2, 4, $00, $0 - dsprite -3, 4, 3, 4, $00, $0 - dsprite -3, 0, 4, 4, $00, $0 - dsprite -4, 0, 5, 4, $00, $0 - dsprite -5, 4, 6, 4, $00, $0 + dbsprite -1, -1, 4, 4, $00, $0 + dbsprite 0, -1, 4, 0, $00, $0 + dbsprite 1, -2, 4, 4, $00, $0 + dbsprite 2, -2, 4, 0, $00, $0 + dbsprite 3, -3, 4, 4, $00, $0 + dbsprite 4, -3, 4, 0, $00, $0 + dbsprite 5, -4, 4, 0, $00, $0 + dbsprite 6, -5, 4, 4, $00, $0 .OAMData_8e: - dsprite -3, 4, -1, 4, $00, $0 - dsprite -2, 4, -1, 4, $01, $0 - dsprite -1, 4, -1, 4, $02, $0 - dsprite 0, 4, -1, 4, $01, Y_FLIP - dsprite 1, 4, -1, 4, $00, Y_FLIP + dbsprite -1, -3, 4, 4, $00, $0 + dbsprite -1, -2, 4, 4, $01, $0 + dbsprite -1, -1, 4, 4, $02, $0 + dbsprite -1, 0, 4, 4, $01, Y_FLIP + dbsprite -1, 1, 4, 4, $00, Y_FLIP .OAMData_8f: - dsprite -1, 4, -2, 0, $00, $0 - dsprite -1, 4, -1, 0, $01, $0 - dsprite -1, 4, 0, 0, $02, $0 - dsprite -1, 4, 1, 0, $03, $0 + dbsprite -2, -1, 0, 4, $00, $0 + dbsprite -1, -1, 0, 4, $01, $0 + dbsprite 0, -1, 0, 4, $02, $0 + dbsprite 1, -1, 0, 4, $03, $0 .OAMData_93: - dsprite -1, 0, -2, 4, $00, $0 - dsprite -1, 0, -1, 4, $01, $0 - dsprite -1, 0, 0, 4, $02, $0 - dsprite 0, 0, -2, 4, $03, $0 - dsprite 0, 0, -1, 4, $04, $0 - dsprite 0, 0, 0, 4, $05, $0 + dbsprite -2, -1, 4, 0, $00, $0 + dbsprite -1, -1, 4, 0, $01, $0 + dbsprite 0, -1, 4, 0, $02, $0 + dbsprite -2, 0, 4, 0, $03, $0 + dbsprite -1, 0, 4, 0, $04, $0 + dbsprite 0, 0, 4, 0, $05, $0 .OAMData_99: - dsprite -1, 0, -1, 0, $00, $0 - dsprite -1, 0, 0, 0, $05, $0 - dsprite 0, 0, -1, 0, $01, $0 - dsprite 0, 0, 0, 0, $05, $0 + dbsprite -1, -1, 0, 0, $00, $0 + dbsprite 0, -1, 0, 0, $05, $0 + dbsprite -1, 0, 0, 0, $01, $0 + dbsprite 0, 0, 0, 0, $05, $0 .OAMData_9b: - dsprite -4, 4, 1, 0, $00, $0 - dsprite -4, 4, 2, 0, $01, $0 - dsprite -3, 4, -1, 0, $02, $0 - dsprite -3, 4, 0, 0, $03, $0 - dsprite -3, 4, 1, 0, $04, $0 - dsprite -3, 4, 2, 0, $05, $0 - dsprite -3, 4, 3, 0, $06, $0 - dsprite -2, 4, -2, 0, $07, $0 - dsprite -2, 4, -1, 0, $08, $0 - dsprite -2, 4, 0, 0, $09, $0 - dsprite -2, 4, 1, 0, $0a, $0 - dsprite -2, 4, 2, 0, $0b, $0 - dsprite -2, 4, 3, 0, $0c, $0 - dsprite -2, 4, 4, 0, $0d, $0 - dsprite -1, 4, -3, 0, $0e, $0 - dsprite -1, 4, -2, 0, $0f, $0 - dsprite -1, 4, -1, 0, $10, $0 - dsprite -1, 4, 0, 0, $11, $0 - dsprite -1, 4, 1, 0, $12, $0 - dsprite -1, 4, 2, 0, $13, $0 - dsprite 0, 4, -5, 0, $14, $0 - dsprite 0, 4, -4, 0, $15, $0 - dsprite 0, 4, -3, 0, $16, $0 - dsprite 0, 4, -2, 0, $17, $0 - dsprite 0, 4, -1, 0, $18, $0 - dsprite 0, 4, 0, 0, $19, $0 - dsprite 0, 4, 1, 0, $1a, $0 - dsprite 0, 4, 2, 0, $1b, $0 - dsprite 0, 4, 3, 0, $1c, $0 - dsprite 1, 4, -5, 0, $1d, $0 - dsprite 1, 4, -4, 0, $1e, $0 - dsprite 1, 4, -2, 0, $1f, $0 - dsprite 1, 4, -1, 0, $20, $0 - dsprite 1, 4, 0, 0, $21, $0 - dsprite 1, 4, 1, 0, $22, $0 - dsprite 2, 4, 0, 0, $23, $0 + dbsprite 1, -4, 0, 4, $00, $0 + dbsprite 2, -4, 0, 4, $01, $0 + dbsprite -1, -3, 0, 4, $02, $0 + dbsprite 0, -3, 0, 4, $03, $0 + dbsprite 1, -3, 0, 4, $04, $0 + dbsprite 2, -3, 0, 4, $05, $0 + dbsprite 3, -3, 0, 4, $06, $0 + dbsprite -2, -2, 0, 4, $07, $0 + dbsprite -1, -2, 0, 4, $08, $0 + dbsprite 0, -2, 0, 4, $09, $0 + dbsprite 1, -2, 0, 4, $0a, $0 + dbsprite 2, -2, 0, 4, $0b, $0 + dbsprite 3, -2, 0, 4, $0c, $0 + dbsprite 4, -2, 0, 4, $0d, $0 + dbsprite -3, -1, 0, 4, $0e, $0 + dbsprite -2, -1, 0, 4, $0f, $0 + dbsprite -1, -1, 0, 4, $10, $0 + dbsprite 0, -1, 0, 4, $11, $0 + dbsprite 1, -1, 0, 4, $12, $0 + dbsprite 2, -1, 0, 4, $13, $0 + dbsprite -5, 0, 0, 4, $14, $0 + dbsprite -4, 0, 0, 4, $15, $0 + dbsprite -3, 0, 0, 4, $16, $0 + dbsprite -2, 0, 0, 4, $17, $0 + dbsprite -1, 0, 0, 4, $18, $0 + dbsprite 0, 0, 0, 4, $19, $0 + dbsprite 1, 0, 0, 4, $1a, $0 + dbsprite 2, 0, 0, 4, $1b, $0 + dbsprite 3, 0, 0, 4, $1c, $0 + dbsprite -5, 1, 0, 4, $1d, $0 + dbsprite -4, 1, 0, 4, $1e, $0 + dbsprite -2, 1, 0, 4, $1f, $0 + dbsprite -1, 1, 0, 4, $20, $0 + dbsprite 0, 1, 0, 4, $21, $0 + dbsprite 1, 1, 0, 4, $22, $0 + dbsprite 0, 2, 0, 4, $23, $0 .OAMData_9c: - dsprite 0, 4, -1, 0, $02, $0 - dsprite 0, 4, 0, 0, $03, $0 - dsprite -1, 4, -1, 0, $01, $0 - dsprite -1, 4, 0, 0, $01, X_FLIP - dsprite -2, 4, -1, 0, $00, $0 - dsprite -2, 4, 0, 0, $00, X_FLIP + dbsprite -1, 0, 0, 4, $02, $0 + dbsprite 0, 0, 0, 4, $03, $0 + dbsprite -1, -1, 0, 4, $01, $0 + dbsprite 0, -1, 0, 4, $01, X_FLIP + dbsprite -1, -2, 0, 4, $00, $0 + dbsprite 0, -2, 0, 4, $00, X_FLIP .OAMData_9f: - dsprite -1, 0, -2, 0, $00, $0 - dsprite -1, 0, -1, 0, $01, $0 - dsprite -1, 0, 0, 0, $02, $0 - dsprite -1, 0, 1, 0, $03, $0 - dsprite 0, 0, -2, 0, $04, $0 - dsprite 0, 0, -1, 0, $05, $0 - dsprite 0, 0, 0, 0, $06, $0 - dsprite 0, 0, 1, 0, $07, $0 + dbsprite -2, -1, 0, 0, $00, $0 + dbsprite -1, -1, 0, 0, $01, $0 + dbsprite 0, -1, 0, 0, $02, $0 + dbsprite 1, -1, 0, 0, $03, $0 + dbsprite -2, 0, 0, 0, $04, $0 + dbsprite -1, 0, 0, 0, $05, $0 + dbsprite 0, 0, 0, 0, $06, $0 + dbsprite 1, 0, 0, 0, $07, $0 .OAMData_a0: - dsprite -2, 4, -1, 4, $00, $0 - dsprite -1, 4, -1, 4, $00, $0 - dsprite 0, 4, -1, 4, $00, $0 - dsprite -3, 4, -1, 4, $00, $0 - dsprite 1, 4, -1, 4, $00, $0 - dsprite -4, 4, -1, 4, $00, $0 - dsprite 2, 4, -1, 4, $00, $0 + dbsprite -1, -2, 4, 4, $00, $0 + dbsprite -1, -1, 4, 4, $00, $0 + dbsprite -1, 0, 4, 4, $00, $0 + dbsprite -1, -3, 4, 4, $00, $0 + dbsprite -1, 1, 4, 4, $00, $0 + dbsprite -1, -4, 4, 4, $00, $0 + dbsprite -1, 2, 4, 4, $00, $0 .OAMData_a4: - dsprite -2, 4, -2, 4, $00, $0 - dsprite -2, 4, -1, 4, $01, $0 - dsprite -2, 4, 0, 4, $02, $0 - dsprite -1, 4, -2, 4, $03, $0 - dsprite -1, 4, -1, 4, $04, $0 - dsprite -1, 4, 0, 4, $05, $0 - dsprite 0, 4, -2, 4, $00, Y_FLIP - dsprite 0, 4, -1, 4, $01, Y_FLIP - dsprite 0, 4, 0, 4, $02, Y_FLIP + dbsprite -2, -2, 4, 4, $00, $0 + dbsprite -1, -2, 4, 4, $01, $0 + dbsprite 0, -2, 4, 4, $02, $0 + dbsprite -2, -1, 4, 4, $03, $0 + dbsprite -1, -1, 4, 4, $04, $0 + dbsprite 0, -1, 4, 4, $05, $0 + dbsprite -2, 0, 4, 4, $00, Y_FLIP + dbsprite -1, 0, 4, 4, $01, Y_FLIP + dbsprite 0, 0, 4, 4, $02, Y_FLIP .OAMData_ac: - dsprite -1, 4, -2, 0, $00, $0 - dsprite -1, 4, -1, 0, $01, $0 - dsprite -1, 4, 0, 0, $01, X_FLIP - dsprite -1, 4, 1, 0, $00, X_FLIP + dbsprite -2, -1, 0, 4, $00, $0 + dbsprite -1, -1, 0, 4, $01, $0 + dbsprite 0, -1, 0, 4, $01, X_FLIP + dbsprite 1, -1, 0, 4, $00, X_FLIP .OAMData_bc: - dsprite -1, 4, -3, 0, $00, $0 - dsprite -1, 4, -2, 0, $01, $0 - dsprite -1, 4, -1, 0, $02, $0 - dsprite -1, 4, 0, 0, $02, X_FLIP - dsprite -1, 4, 1, 0, $01, X_FLIP - dsprite -1, 4, 2, 0, $00, X_FLIP + dbsprite -3, -1, 0, 4, $00, $0 + dbsprite -2, -1, 0, 4, $01, $0 + dbsprite -1, -1, 0, 4, $02, $0 + dbsprite 0, -1, 0, 4, $02, X_FLIP + dbsprite 1, -1, 0, 4, $01, X_FLIP + dbsprite 2, -1, 0, 4, $00, X_FLIP .OAMData_c1: - dsprite -2, 0, -2, 0, $00, $0 - dsprite -2, 0, -1, 0, $01, $0 - dsprite -2, 0, 0, 0, $02, $0 - dsprite -2, 0, 1, 0, $00, X_FLIP - dsprite -1, 0, -2, 0, $03, $0 - dsprite -1, 0, -1, 0, $04, $0 - dsprite -1, 0, 0, 0, $04, X_FLIP - dsprite -1, 0, 1, 0, $05, $0 - dsprite 0, 0, -2, 0, $05, X_FLIP | Y_FLIP - dsprite 0, 0, -1, 0, $04, Y_FLIP - dsprite 0, 0, 0, 0, $04, X_FLIP | Y_FLIP - dsprite 0, 0, 1, 0, $03, X_FLIP | Y_FLIP - dsprite 1, 0, -2, 0, $00, Y_FLIP - dsprite 1, 0, -1, 0, $02, X_FLIP | Y_FLIP - dsprite 1, 0, 0, 0, $01, X_FLIP | Y_FLIP - dsprite 1, 0, 1, 0, $00, X_FLIP | Y_FLIP + dbsprite -2, -2, 0, 0, $00, $0 + dbsprite -1, -2, 0, 0, $01, $0 + dbsprite 0, -2, 0, 0, $02, $0 + dbsprite 1, -2, 0, 0, $00, X_FLIP + dbsprite -2, -1, 0, 0, $03, $0 + dbsprite -1, -1, 0, 0, $04, $0 + dbsprite 0, -1, 0, 0, $04, X_FLIP + dbsprite 1, -1, 0, 0, $05, $0 + dbsprite -2, 0, 0, 0, $05, X_FLIP | Y_FLIP + dbsprite -1, 0, 0, 0, $04, Y_FLIP + dbsprite 0, 0, 0, 0, $04, X_FLIP | Y_FLIP + dbsprite 1, 0, 0, 0, $03, X_FLIP | Y_FLIP + dbsprite -2, 1, 0, 0, $00, Y_FLIP + dbsprite -1, 1, 0, 0, $02, X_FLIP | Y_FLIP + dbsprite 0, 1, 0, 0, $01, X_FLIP | Y_FLIP + dbsprite 1, 1, 0, 0, $00, X_FLIP | Y_FLIP .OAMData_c2: - dsprite -1, 0, -2, 0, $00, $0 - dsprite -1, 0, -1, 0, $01, $0 - dsprite -1, 0, 0, 0, $00, X_FLIP | Y_FLIP - dsprite 0, 0, -1, 0, $00, $0 - dsprite 0, 0, 0, 0, $01, $0 - dsprite 0, 0, 1, 0, $00, X_FLIP | Y_FLIP + dbsprite -2, -1, 0, 0, $00, $0 + dbsprite -1, -1, 0, 0, $01, $0 + dbsprite 0, -1, 0, 0, $00, X_FLIP | Y_FLIP + dbsprite -1, 0, 0, 0, $00, $0 + dbsprite 0, 0, 0, 0, $01, $0 + dbsprite 1, 0, 0, 0, $00, X_FLIP | Y_FLIP .OAMData_c8: - dsprite -1, 0, 1, 4, $00, $0 - dsprite -1, 0, 2, 4, $01, $0 - dsprite 0, 0, -1, 4, $02, $0 - dsprite 0, 0, 0, 4, $03, $0 - dsprite 0, 0, 1, 4, $04, $0 - dsprite 0, 0, 2, 4, $05, $0 + dbsprite 1, -1, 4, 0, $00, $0 + dbsprite 2, -1, 4, 0, $01, $0 + dbsprite -1, 0, 4, 0, $02, $0 + dbsprite 0, 0, 4, 0, $03, $0 + dbsprite 1, 0, 4, 0, $04, $0 + dbsprite 2, 0, 4, 0, $05, $0 .OAMData_ca: - dsprite -1, 0, -1, 0, $00, $0 - dsprite -1, 0, 0, 0, $01, X_FLIP | Y_FLIP - dsprite 0, 0, -1, 0, $01, $0 - dsprite 0, 0, 0, 0, $01, X_FLIP + dbsprite -1, -1, 0, 0, $00, $0 + dbsprite 0, -1, 0, 0, $01, X_FLIP | Y_FLIP + dbsprite -1, 0, 0, 0, $01, $0 + dbsprite 0, 0, 0, 0, $01, X_FLIP .OAMData_cc: - dsprite -2, 0, -13, 4, $00, $0 - dsprite -4, 0, -11, 4, $00, $0 - dsprite -1, 0, -9, 4, $00, $0 - dsprite -5, 0, -7, 4, $00, $0 - dsprite -3, 0, -5, 4, $00, $0 - dsprite -5, 0, -3, 4, $00, $0 - dsprite -3, 0, -1, 4, $00, $0 - dsprite -3, 0, 0, 4, $00, $0 - dsprite -5, 0, 2, 4, $00, $0 - dsprite 0, 0, 4, 4, $00, $0 - dsprite -2, 0, 6, 4, $00, $0 - dsprite -4, 0, 8, 4, $00, $0 - dsprite -2, 0, 10, 4, $00, $0 + dbsprite -13, -2, 4, 0, $00, $0 + dbsprite -11, -4, 4, 0, $00, $0 + dbsprite -9, -1, 4, 0, $00, $0 + dbsprite -7, -5, 4, 0, $00, $0 + dbsprite -5, -3, 4, 0, $00, $0 + dbsprite -3, -5, 4, 0, $00, $0 + dbsprite -1, -3, 4, 0, $00, $0 + dbsprite 0, -3, 4, 0, $00, $0 + dbsprite 2, -5, 4, 0, $00, $0 + dbsprite 4, 0, 4, 0, $00, $0 + dbsprite 6, -2, 4, 0, $00, $0 + dbsprite 8, -4, 4, 0, $00, $0 + dbsprite 10, -2, 4, 0, $00, $0 diff --git a/data/sprite_anims/oam.asm b/data/sprite_anims/oam.asm index ece914e0c..23591c6b7 100644 --- a/data/sprite_anims/oam.asm +++ b/data/sprite_anims/oam.asm @@ -144,985 +144,985 @@ SpriteAnimOAMData: .OAMData_1x1_Palette0: db 1 - dsprite -1, 4, -1, 4, $00, 0 + dbsprite -1, -1, 4, 4, $00, 0 .OAMData_GSIntroShellder: db 4 - dsprite -1, 0, -1, 0, $00, 0 - dsprite -1, 0, 0, 0, $01, 0 - dsprite 0, 0, -1, 0, $10, 0 - dsprite 0, 0, 0, 0, $11, 0 + dbsprite -1, -1, 0, 0, $00, 0 + dbsprite 0, -1, 0, 0, $01, 0 + dbsprite -1, 0, 0, 0, $10, 0 + dbsprite 0, 0, 0, 0, $11, 0 .OAMData_GSIntroStar: db 4 - dsprite -1, 0, -1, 0, $00, 0 - dsprite -1, 0, 0, 0, $00, 0 | X_FLIP - dsprite 0, 0, -1, 0, $01, 0 - dsprite 0, 0, 0, 0, $01, 0 | X_FLIP + dbsprite -1, -1, 0, 0, $00, 0 + dbsprite 0, -1, 0, 0, $00, 0 | X_FLIP + dbsprite -1, 0, 0, 0, $01, 0 + dbsprite 0, 0, 0, 0, $01, 0 | X_FLIP .OAMData_TradePokeBall1: db 4 - dsprite -1, 0, -1, 0, $00, 0 | PRIORITY - dsprite -1, 0, 0, 0, $00, 0 | X_FLIP | PRIORITY - dsprite 0, 0, -1, 0, $01, 0 | PRIORITY - dsprite 0, 0, 0, 0, $01, 0 | X_FLIP | PRIORITY + dbsprite -1, -1, 0, 0, $00, 0 | PRIORITY + dbsprite 0, -1, 0, 0, $00, 0 | X_FLIP | PRIORITY + dbsprite -1, 0, 0, 0, $01, 0 | PRIORITY + dbsprite 0, 0, 0, 0, $01, 0 | X_FLIP | PRIORITY .OAMData_IntroUnownF2_1: db 4 - dsprite -1, 0, -1, 0, $00, 0 - dsprite -1, 0, 0, 0, $00, 0 | X_FLIP - dsprite 0, 0, -1, 0, $00, 0 | Y_FLIP - dsprite 0, 0, 0, 0, $00, 0 | X_FLIP | Y_FLIP + dbsprite -1, -1, 0, 0, $00, 0 + dbsprite 0, -1, 0, 0, $00, 0 | X_FLIP + dbsprite -1, 0, 0, 0, $00, 0 | Y_FLIP + dbsprite 0, 0, 0, 0, $00, 0 | X_FLIP | Y_FLIP .OAMData_TradeTubeBulge: db 4 - dsprite -1, 0, -1, 0, $00, 7 - dsprite -1, 0, 0, 0, $00, 7 | X_FLIP - dsprite 0, 0, -1, 0, $00, 7 | Y_FLIP - dsprite 0, 0, 0, 0, $00, 7 | X_FLIP | Y_FLIP + dbsprite -1, -1, 0, 0, $00, 7 + dbsprite 0, -1, 0, 0, $00, 7 | X_FLIP + dbsprite -1, 0, 0, 0, $00, 7 | Y_FLIP + dbsprite 0, 0, 0, 0, $00, 7 | X_FLIP | Y_FLIP ; unused db 4 - dsprite -1, 0, -1, 0, $00, 0 | PRIORITY - dsprite -1, 0, 0, 0, $00, 0 | X_FLIP | PRIORITY - dsprite 0, 0, -1, 0, $00, 0 | Y_FLIP | PRIORITY - dsprite 0, 0, 0, 0, $00, 0 | X_FLIP | Y_FLIP | PRIORITY + dbsprite -1, -1, 0, 0, $00, 0 | PRIORITY + dbsprite 0, -1, 0, 0, $00, 0 | X_FLIP | PRIORITY + dbsprite -1, 0, 0, 0, $00, 0 | Y_FLIP | PRIORITY + dbsprite 0, 0, 0, 0, $00, 0 | X_FLIP | Y_FLIP | PRIORITY .OAMData_TradePoofBubble: db 16 - dsprite -2, 0, -2, 0, $00, 0 - dsprite -2, 0, -1, 0, $01, 0 - dsprite -1, 0, -2, 0, $02, 0 - dsprite -1, 0, -1, 0, $03, 0 - dsprite -2, 0, 0, 0, $01, 0 | X_FLIP - dsprite -2, 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 - dsprite 0, 0, -2, 0, $02, 0 | Y_FLIP - dsprite 0, 0, -1, 0, $03, 0 | Y_FLIP - dsprite 1, 0, -2, 0, $00, 0 | Y_FLIP - dsprite 1, 0, -1, 0, $01, 0 | Y_FLIP - dsprite 0, 0, 0, 0, $03, 0 | X_FLIP | Y_FLIP - dsprite 0, 0, 1, 0, $02, 0 | X_FLIP | Y_FLIP - dsprite 1, 0, 0, 0, $01, 0 | X_FLIP | Y_FLIP - dsprite 1, 0, 1, 0, $00, 0 | X_FLIP | Y_FLIP + dbsprite -2, -2, 0, 0, $00, 0 + dbsprite -1, -2, 0, 0, $01, 0 + dbsprite -2, -1, 0, 0, $02, 0 + dbsprite -1, -1, 0, 0, $03, 0 + dbsprite 0, -2, 0, 0, $01, 0 | X_FLIP + dbsprite 1, -2, 0, 0, $00, 0 | X_FLIP + dbsprite 0, -1, 0, 0, $03, 0 | X_FLIP + dbsprite 1, -1, 0, 0, $02, 0 | X_FLIP + dbsprite -2, 0, 0, 0, $02, 0 | Y_FLIP + dbsprite -1, 0, 0, 0, $03, 0 | Y_FLIP + dbsprite -2, 1, 0, 0, $00, 0 | Y_FLIP + dbsprite -1, 1, 0, 0, $01, 0 | Y_FLIP + dbsprite 0, 0, 0, 0, $03, 0 | X_FLIP | Y_FLIP + dbsprite 1, 0, 0, 0, $02, 0 | X_FLIP | Y_FLIP + dbsprite 0, 1, 0, 0, $01, 0 | X_FLIP | Y_FLIP + dbsprite 1, 1, 0, 0, $00, 0 | X_FLIP | Y_FLIP .OAMData_GSIntroBigFireball: db 36 - dsprite -3, 0, -3, 0, $00, 0 - dsprite -3, 0, -2, 0, $01, 0 - dsprite -3, 0, -1, 0, $02, 0 - dsprite -2, 0, -3, 0, $03, 0 - dsprite -2, 0, -2, 0, $04, 0 - dsprite -2, 0, -1, 0, $05, 0 - dsprite -1, 0, -3, 0, $06, 0 - dsprite -1, 0, -2, 0, $05, 0 - dsprite -1, 0, -1, 0, $05, 0 - dsprite -3, 0, 0, 0, $02, 0 | X_FLIP - dsprite -3, 0, 1, 0, $01, 0 | X_FLIP - dsprite -3, 0, 2, 0, $00, 0 | X_FLIP - dsprite -2, 0, 0, 0, $05, 0 | X_FLIP - dsprite -2, 0, 1, 0, $04, 0 | X_FLIP - dsprite -2, 0, 2, 0, $03, 0 | X_FLIP - dsprite -1, 0, 0, 0, $05, 0 | X_FLIP - dsprite -1, 0, 1, 0, $05, 0 | X_FLIP - dsprite -1, 0, 2, 0, $06, 0 | X_FLIP - dsprite 0, 0, -3, 0, $06, 0 | Y_FLIP - dsprite 0, 0, -2, 0, $05, 0 | Y_FLIP - dsprite 0, 0, -1, 0, $05, 0 | Y_FLIP - dsprite 1, 0, -3, 0, $03, 0 | Y_FLIP - dsprite 1, 0, -2, 0, $04, 0 | Y_FLIP - dsprite 1, 0, -1, 0, $05, 0 | Y_FLIP - dsprite 2, 0, -3, 0, $00, 0 | Y_FLIP - dsprite 2, 0, -2, 0, $01, 0 | Y_FLIP - dsprite 2, 0, -1, 0, $02, 0 | Y_FLIP - dsprite 0, 0, 0, 0, $05, 0 | X_FLIP | Y_FLIP - dsprite 0, 0, 1, 0, $05, 0 | X_FLIP | Y_FLIP - dsprite 0, 0, 2, 0, $06, 0 | X_FLIP | Y_FLIP - dsprite 1, 0, 0, 0, $05, 0 | X_FLIP | Y_FLIP - dsprite 1, 0, 1, 0, $04, 0 | X_FLIP | Y_FLIP - dsprite 1, 0, 2, 0, $03, 0 | X_FLIP | Y_FLIP - dsprite 2, 0, 0, 0, $02, 0 | X_FLIP | Y_FLIP - dsprite 2, 0, 1, 0, $01, 0 | X_FLIP | Y_FLIP - dsprite 2, 0, 2, 0, $00, 0 | X_FLIP | Y_FLIP + dbsprite -3, -3, 0, 0, $00, 0 + dbsprite -2, -3, 0, 0, $01, 0 + dbsprite -1, -3, 0, 0, $02, 0 + dbsprite -3, -2, 0, 0, $03, 0 + dbsprite -2, -2, 0, 0, $04, 0 + dbsprite -1, -2, 0, 0, $05, 0 + dbsprite -3, -1, 0, 0, $06, 0 + dbsprite -2, -1, 0, 0, $05, 0 + dbsprite -1, -1, 0, 0, $05, 0 + dbsprite 0, -3, 0, 0, $02, 0 | X_FLIP + dbsprite 1, -3, 0, 0, $01, 0 | X_FLIP + dbsprite 2, -3, 0, 0, $00, 0 | X_FLIP + dbsprite 0, -2, 0, 0, $05, 0 | X_FLIP + dbsprite 1, -2, 0, 0, $04, 0 | X_FLIP + dbsprite 2, -2, 0, 0, $03, 0 | X_FLIP + dbsprite 0, -1, 0, 0, $05, 0 | X_FLIP + dbsprite 1, -1, 0, 0, $05, 0 | X_FLIP + dbsprite 2, -1, 0, 0, $06, 0 | X_FLIP + dbsprite -3, 0, 0, 0, $06, 0 | Y_FLIP + dbsprite -2, 0, 0, 0, $05, 0 | Y_FLIP + dbsprite -1, 0, 0, 0, $05, 0 | Y_FLIP + dbsprite -3, 1, 0, 0, $03, 0 | Y_FLIP + dbsprite -2, 1, 0, 0, $04, 0 | Y_FLIP + dbsprite -1, 1, 0, 0, $05, 0 | Y_FLIP + dbsprite -3, 2, 0, 0, $00, 0 | Y_FLIP + dbsprite -2, 2, 0, 0, $01, 0 | Y_FLIP + dbsprite -1, 2, 0, 0, $02, 0 | Y_FLIP + dbsprite 0, 0, 0, 0, $05, 0 | X_FLIP | Y_FLIP + dbsprite 1, 0, 0, 0, $05, 0 | X_FLIP | Y_FLIP + dbsprite 2, 0, 0, 0, $06, 0 | X_FLIP | Y_FLIP + dbsprite 0, 1, 0, 0, $05, 0 | X_FLIP | Y_FLIP + dbsprite 1, 1, 0, 0, $04, 0 | X_FLIP | Y_FLIP + dbsprite 2, 1, 0, 0, $03, 0 | X_FLIP | Y_FLIP + dbsprite 0, 2, 0, 0, $02, 0 | X_FLIP | Y_FLIP + dbsprite 1, 2, 0, 0, $01, 0 | X_FLIP | Y_FLIP + dbsprite 2, 2, 0, 0, $00, 0 | X_FLIP | Y_FLIP .OAMData_Unused43_4A: db 9 - dsprite -2, 4, -2, 4, $00, 0 - dsprite -2, 4, -1, 4, $01, 0 - dsprite -2, 4, 0, 4, $02, 0 - dsprite -1, 4, -2, 4, $10, 0 - dsprite -1, 4, -1, 4, $11, 0 - dsprite -1, 4, 0, 4, $12, 0 - dsprite 0, 4, -2, 4, $20, 0 - dsprite 0, 4, -1, 4, $21, 0 - dsprite 0, 4, 0, 4, $22, 0 + dbsprite -2, -2, 4, 4, $00, 0 + dbsprite -1, -2, 4, 4, $01, 0 + dbsprite 0, -2, 4, 4, $02, 0 + dbsprite -2, -1, 4, 4, $10, 0 + dbsprite -1, -1, 4, 4, $11, 0 + dbsprite 0, -1, 4, 4, $12, 0 + dbsprite -2, 0, 4, 4, $20, 0 + dbsprite -1, 0, 4, 4, $21, 0 + dbsprite 0, 0, 4, 4, $22, 0 .OAMData_GSIntroJigglypuffPikachu: db 16 - dsprite -2, 0, -2, 0, $00, 0 - dsprite -2, 0, -1, 0, $01, 0 - dsprite -2, 0, 0, 0, $02, 0 - dsprite -2, 0, 1, 0, $03, 0 - dsprite -1, 0, -2, 0, $10, 0 - dsprite -1, 0, -1, 0, $11, 0 - dsprite -1, 0, 0, 0, $12, 0 - dsprite -1, 0, 1, 0, $13, 0 - dsprite 0, 0, -2, 0, $20, 0 - dsprite 0, 0, -1, 0, $21, 0 - dsprite 0, 0, 0, 0, $22, 0 - dsprite 0, 0, 1, 0, $23, 0 - dsprite 1, 0, -2, 0, $30, 0 - dsprite 1, 0, -1, 0, $31, 0 - dsprite 1, 0, 0, 0, $32, 0 - dsprite 1, 0, 1, 0, $33, 0 + dbsprite -2, -2, 0, 0, $00, 0 + dbsprite -1, -2, 0, 0, $01, 0 + dbsprite 0, -2, 0, 0, $02, 0 + dbsprite 1, -2, 0, 0, $03, 0 + dbsprite -2, -1, 0, 0, $10, 0 + dbsprite -1, -1, 0, 0, $11, 0 + dbsprite 0, -1, 0, 0, $12, 0 + dbsprite 1, -1, 0, 0, $13, 0 + dbsprite -2, 0, 0, 0, $20, 0 + dbsprite -1, 0, 0, 0, $21, 0 + dbsprite 0, 0, 0, 0, $22, 0 + dbsprite 1, 0, 0, 0, $23, 0 + dbsprite -2, 1, 0, 0, $30, 0 + dbsprite -1, 1, 0, 0, $31, 0 + dbsprite 0, 1, 0, 0, $32, 0 + dbsprite 1, 1, 0, 0, $33, 0 .OAMData_GSIntroStarter: db 25 - dsprite -3, 4, -3, 4, $00, 0 - dsprite -2, 4, -3, 4, $01, 0 - dsprite -1, 4, -3, 4, $02, 0 - dsprite 0, 4, -3, 4, $03, 0 - dsprite 1, 4, -3, 4, $04, 0 - dsprite -3, 4, -2, 4, $05, 0 - dsprite -2, 4, -2, 4, $06, 0 - dsprite -1, 4, -2, 4, $07, 0 - dsprite 0, 4, -2, 4, $08, 0 - dsprite 1, 4, -2, 4, $09, 0 - dsprite -3, 4, -1, 4, $0a, 0 - dsprite -2, 4, -1, 4, $0b, 0 - dsprite -1, 4, -1, 4, $0c, 0 - dsprite 0, 4, -1, 4, $0d, 0 - dsprite 1, 4, -1, 4, $0e, 0 - dsprite -3, 4, 0, 4, $0f, 0 - dsprite -2, 4, 0, 4, $10, 0 - dsprite -1, 4, 0, 4, $11, 0 - dsprite 0, 4, 0, 4, $12, 0 - dsprite 1, 4, 0, 4, $13, 0 - dsprite -3, 4, 1, 4, $14, 0 - dsprite -2, 4, 1, 4, $15, 0 - dsprite -1, 4, 1, 4, $16, 0 - dsprite 0, 4, 1, 4, $17, 0 - dsprite 1, 4, 1, 4, $18, 0 + dbsprite -3, -3, 4, 4, $00, 0 + dbsprite -3, -2, 4, 4, $01, 0 + dbsprite -3, -1, 4, 4, $02, 0 + dbsprite -3, 0, 4, 4, $03, 0 + dbsprite -3, 1, 4, 4, $04, 0 + dbsprite -2, -3, 4, 4, $05, 0 + dbsprite -2, -2, 4, 4, $06, 0 + dbsprite -2, -1, 4, 4, $07, 0 + dbsprite -2, 0, 4, 4, $08, 0 + dbsprite -2, 1, 4, 4, $09, 0 + dbsprite -1, -3, 4, 4, $0a, 0 + dbsprite -1, -2, 4, 4, $0b, 0 + dbsprite -1, -1, 4, 4, $0c, 0 + dbsprite -1, 0, 4, 4, $0d, 0 + dbsprite -1, 1, 4, 4, $0e, 0 + dbsprite 0, -3, 4, 4, $0f, 0 + dbsprite 0, -2, 4, 4, $10, 0 + dbsprite 0, -1, 4, 4, $11, 0 + dbsprite 0, 0, 4, 4, $12, 0 + dbsprite 0, 1, 4, 4, $13, 0 + dbsprite 1, -3, 4, 4, $14, 0 + dbsprite 1, -2, 4, 4, $15, 0 + dbsprite 1, -1, 4, 4, $16, 0 + dbsprite 1, 0, 4, 4, $17, 0 + dbsprite 1, 1, 4, 4, $18, 0 ; unused db 36 - dsprite -3, 0, -3, 0, $00, 0 - dsprite -3, 0, -2, 0, $01, 0 - dsprite -3, 0, -1, 0, $02, 0 - dsprite -3, 0, 0, 0, $03, 0 - dsprite -3, 0, 1, 0, $04, 0 - dsprite -3, 0, 2, 0, $05, 0 - dsprite -2, 0, -3, 0, $06, 0 - dsprite -2, 0, -2, 0, $07, 0 - dsprite -2, 0, -1, 0, $08, 0 - dsprite -2, 0, 0, 0, $09, 0 - dsprite -2, 0, 1, 0, $0a, 0 - dsprite -2, 0, 2, 0, $0b, 0 - dsprite -1, 0, -3, 0, $0c, 0 - dsprite -1, 0, -2, 0, $0d, 0 - dsprite -1, 0, -1, 0, $0e, 0 - dsprite -1, 0, 0, 0, $0f, 0 - dsprite -1, 0, 1, 0, $10, 0 - dsprite -1, 0, 2, 0, $11, 0 - dsprite 0, 0, -3, 0, $12, 0 - dsprite 0, 0, -2, 0, $13, 0 - dsprite 0, 0, -1, 0, $14, 0 - dsprite 0, 0, 0, 0, $15, 0 - dsprite 0, 0, 1, 0, $16, 0 - dsprite 0, 0, 2, 0, $17, 0 - dsprite 1, 0, -3, 0, $18, 0 - dsprite 1, 0, -2, 0, $19, 0 - dsprite 1, 0, -1, 0, $1a, 0 - dsprite 1, 0, 0, 0, $1b, 0 - dsprite 1, 0, 1, 0, $1c, 0 - dsprite 1, 0, 2, 0, $1d, 0 - dsprite 2, 0, -3, 0, $1e, 0 - dsprite 2, 0, -2, 0, $1f, 0 - dsprite 2, 0, -1, 0, $20, 0 - dsprite 2, 0, 0, 0, $21, 0 - dsprite 2, 0, 1, 0, $22, 0 - dsprite 2, 0, 2, 0, $23, 0 + dbsprite -3, -3, 0, 0, $00, 0 + dbsprite -2, -3, 0, 0, $01, 0 + dbsprite -1, -3, 0, 0, $02, 0 + dbsprite 0, -3, 0, 0, $03, 0 + dbsprite 1, -3, 0, 0, $04, 0 + dbsprite 2, -3, 0, 0, $05, 0 + dbsprite -3, -2, 0, 0, $06, 0 + dbsprite -2, -2, 0, 0, $07, 0 + dbsprite -1, -2, 0, 0, $08, 0 + dbsprite 0, -2, 0, 0, $09, 0 + dbsprite 1, -2, 0, 0, $0a, 0 + dbsprite 2, -2, 0, 0, $0b, 0 + dbsprite -3, -1, 0, 0, $0c, 0 + dbsprite -2, -1, 0, 0, $0d, 0 + dbsprite -1, -1, 0, 0, $0e, 0 + dbsprite 0, -1, 0, 0, $0f, 0 + dbsprite 1, -1, 0, 0, $10, 0 + dbsprite 2, -1, 0, 0, $11, 0 + dbsprite -3, 0, 0, 0, $12, 0 + dbsprite -2, 0, 0, 0, $13, 0 + dbsprite -1, 0, 0, 0, $14, 0 + dbsprite 0, 0, 0, 0, $15, 0 + dbsprite 1, 0, 0, 0, $16, 0 + dbsprite 2, 0, 0, 0, $17, 0 + dbsprite -3, 1, 0, 0, $18, 0 + dbsprite -2, 1, 0, 0, $19, 0 + dbsprite -1, 1, 0, 0, $1a, 0 + dbsprite 0, 1, 0, 0, $1b, 0 + dbsprite 1, 1, 0, 0, $1c, 0 + dbsprite 2, 1, 0, 0, $1d, 0 + dbsprite -3, 2, 0, 0, $1e, 0 + dbsprite -2, 2, 0, 0, $1f, 0 + dbsprite -1, 2, 0, 0, $20, 0 + dbsprite 0, 2, 0, 0, $21, 0 + dbsprite 1, 2, 0, 0, $22, 0 + dbsprite 2, 2, 0, 0, $23, 0 .OAMData_RedWalk: db 4 - dsprite -1, 0, -1, 0, $00, PAL_OW_RED - dsprite -1, 0, 0, 0, $01, PAL_OW_RED - dsprite 0, 0, -1, 0, $02, PAL_OW_RED - dsprite 0, 0, 0, 0, $03, PAL_OW_RED + dbsprite -1, -1, 0, 0, $00, PAL_OW_RED + dbsprite 0, -1, 0, 0, $01, PAL_OW_RED + dbsprite -1, 0, 0, 0, $02, PAL_OW_RED + dbsprite 0, 0, 0, 0, $03, PAL_OW_RED .OAMData_MagnetTrainRed: db 4 - dsprite -1, 0, -1, 0, $00, PAL_OW_RED | PRIORITY - dsprite -1, 0, 0, 0, $01, PAL_OW_RED | PRIORITY - dsprite 0, 0, -1, 0, $02, PAL_OW_RED | PRIORITY - dsprite 0, 0, 0, 0, $03, PAL_OW_RED | PRIORITY + dbsprite -1, -1, 0, 0, $00, PAL_OW_RED | PRIORITY + dbsprite 0, -1, 0, 0, $01, PAL_OW_RED | PRIORITY + dbsprite -1, 0, 0, 0, $02, PAL_OW_RED | PRIORITY + dbsprite 0, 0, 0, 0, $03, PAL_OW_RED | PRIORITY .OAMData_PartyMonWithMail1: db 4 - dsprite -1, 0, -1, 0, $00, PAL_OW_RED - dsprite -1, 0, 0, 0, $01, PAL_OW_RED - dsprite 0, 0, -1, 0, $08, PAL_OW_RED - dsprite 0, 0, 0, 0, $03, PAL_OW_RED + dbsprite -1, -1, 0, 0, $00, PAL_OW_RED + dbsprite 0, -1, 0, 0, $01, PAL_OW_RED + dbsprite -1, 0, 0, 0, $08, PAL_OW_RED + dbsprite 0, 0, 0, 0, $03, PAL_OW_RED .OAMData_PartyMonWithMail2: db 4 - dsprite -1, 0, -1, 0, $04, PAL_OW_RED - dsprite -1, 0, 0, 0, $05, PAL_OW_RED - dsprite 0, 0, -1, 0, $08, PAL_OW_RED - dsprite 0, 0, 0, 0, $07, PAL_OW_RED + dbsprite -1, -1, 0, 0, $04, PAL_OW_RED + dbsprite 0, -1, 0, 0, $05, PAL_OW_RED + dbsprite -1, 0, 0, 0, $08, PAL_OW_RED + dbsprite 0, 0, 0, 0, $07, PAL_OW_RED .OAMData_PartyMonWithItem1: db 4 - dsprite -1, 0, -1, 0, $00, PAL_OW_RED - dsprite -1, 0, 0, 0, $01, PAL_OW_RED - dsprite 0, 0, -1, 0, $09, PAL_OW_RED - dsprite 0, 0, 0, 0, $03, PAL_OW_RED + dbsprite -1, -1, 0, 0, $00, PAL_OW_RED + dbsprite 0, -1, 0, 0, $01, PAL_OW_RED + dbsprite -1, 0, 0, 0, $09, PAL_OW_RED + dbsprite 0, 0, 0, 0, $03, PAL_OW_RED .OAMData_PartyMonWithItem2: db 4 - dsprite -1, 0, -1, 0, $04, PAL_OW_RED - dsprite -1, 0, 0, 0, $05, PAL_OW_RED - dsprite 0, 0, -1, 0, $09, PAL_OW_RED - dsprite 0, 0, 0, 0, $07, PAL_OW_RED + dbsprite -1, -1, 0, 0, $04, PAL_OW_RED + dbsprite 0, -1, 0, 0, $05, PAL_OW_RED + dbsprite -1, 0, 0, 0, $09, PAL_OW_RED + dbsprite 0, 0, 0, 0, $07, PAL_OW_RED .OAMData_GSIntroMagikarp: db 6 - dsprite -1, 0, -2, 4, $00, 1 - dsprite -1, 0, -1, 4, $01, 1 - dsprite -1, 0, 0, 4, $02, 1 - dsprite 0, 0, -2, 4, $10, 1 - dsprite 0, 0, -1, 4, $11, 1 - dsprite 0, 0, 0, 4, $12, 1 + dbsprite -2, -1, 4, 0, $00, 1 + dbsprite -1, -1, 4, 0, $01, 1 + dbsprite 0, -1, 4, 0, $02, 1 + dbsprite -2, 0, 4, 0, $10, 1 + dbsprite -1, 0, 4, 0, $11, 1 + dbsprite 0, 0, 4, 0, $12, 1 .OAMData_GSIntroLapras: db 29 - dsprite -3, 0, -3, 0, $00, 0 - dsprite -3, 0, -2, 0, $01, 0 - dsprite -3, 0, -1, 0, $02, 0 - dsprite -3, 0, 0, 0, $03, 0 - dsprite -2, 0, -3, 0, $10, 0 - dsprite -2, 0, -2, 0, $11, 0 - dsprite -2, 0, -1, 0, $12, 0 - dsprite -2, 0, 0, 0, $13, 0 - dsprite -1, 0, -3, 0, $20, 0 - dsprite -1, 0, -2, 0, $21, 0 - dsprite -1, 0, -1, 0, $22, 0 - dsprite -1, 0, 0, 0, $23, 0 - dsprite -1, 0, 1, 0, $24, 0 - dsprite 0, 0, -3, 0, $30, 0 | PRIORITY - dsprite 0, 0, -2, 0, $31, 0 | PRIORITY - dsprite 0, 0, -1, 0, $32, 0 | PRIORITY - dsprite 0, 0, 0, 0, $33, 0 | PRIORITY - dsprite 0, 0, 1, 0, $34, 0 | PRIORITY - dsprite 1, 0, -3, 0, $40, 0 | PRIORITY - dsprite 1, 0, -2, 0, $41, 0 | PRIORITY - dsprite 1, 0, -1, 0, $42, 0 | PRIORITY - dsprite 1, 0, 0, 0, $43, 0 | PRIORITY - dsprite 1, 0, 1, 0, $44, 0 | PRIORITY - dsprite 1, 0, 2, 0, $45, 0 | PRIORITY - dsprite 2, 0, -2, 0, $51, 0 | PRIORITY - dsprite 2, 0, -1, 0, $52, 0 | PRIORITY - dsprite 2, 0, 0, 0, $53, 0 | PRIORITY - dsprite 2, 0, 1, 0, $54, 0 | PRIORITY - dsprite 2, 0, 2, 0, $55, 0 | PRIORITY + dbsprite -3, -3, 0, 0, $00, 0 + dbsprite -2, -3, 0, 0, $01, 0 + dbsprite -1, -3, 0, 0, $02, 0 + dbsprite 0, -3, 0, 0, $03, 0 + dbsprite -3, -2, 0, 0, $10, 0 + dbsprite -2, -2, 0, 0, $11, 0 + dbsprite -1, -2, 0, 0, $12, 0 + dbsprite 0, -2, 0, 0, $13, 0 + dbsprite -3, -1, 0, 0, $20, 0 + dbsprite -2, -1, 0, 0, $21, 0 + dbsprite -1, -1, 0, 0, $22, 0 + dbsprite 0, -1, 0, 0, $23, 0 + dbsprite 1, -1, 0, 0, $24, 0 + dbsprite -3, 0, 0, 0, $30, 0 | PRIORITY + dbsprite -2, 0, 0, 0, $31, 0 | PRIORITY + dbsprite -1, 0, 0, 0, $32, 0 | PRIORITY + dbsprite 0, 0, 0, 0, $33, 0 | PRIORITY + dbsprite 1, 0, 0, 0, $34, 0 | PRIORITY + dbsprite -3, 1, 0, 0, $40, 0 | PRIORITY + dbsprite -2, 1, 0, 0, $41, 0 | PRIORITY + dbsprite -1, 1, 0, 0, $42, 0 | PRIORITY + dbsprite 0, 1, 0, 0, $43, 0 | PRIORITY + dbsprite 1, 1, 0, 0, $44, 0 | PRIORITY + dbsprite 2, 1, 0, 0, $45, 0 | PRIORITY + dbsprite -2, 2, 0, 0, $51, 0 | PRIORITY + dbsprite -1, 2, 0, 0, $52, 0 | PRIORITY + dbsprite 0, 2, 0, 0, $53, 0 | PRIORITY + dbsprite 1, 2, 0, 0, $54, 0 | PRIORITY + dbsprite 2, 2, 0, 0, $55, 0 | PRIORITY .OAMData_GSIntroNote: db 2 - dsprite -1, 0, -1, 4, $00, 0 - dsprite 0, 0, -1, 4, $10, 0 + dbsprite -1, -1, 4, 0, $00, 0 + dbsprite -1, 0, 4, 0, $10, 0 .OAMData_GSIntroPikachuTail: db 5 - dsprite -2, 0, 3, 0, $00, 0 - dsprite -2, 0, 4, 0, $01, 0 - dsprite -1, 0, 2, 0, $02, 0 - dsprite -1, 0, 3, 0, $03, 0 - dsprite 0, 0, 2, 0, $04, 0 + dbsprite 3, -2, 0, 0, $00, 0 + dbsprite 4, -2, 0, 0, $01, 0 + dbsprite 2, -1, 0, 0, $02, 0 + dbsprite 3, -1, 0, 0, $03, 0 + dbsprite 2, 0, 0, 0, $04, 0 .OAMData_Leaf: db 1 - dsprite -1, 4, -1, 4, $00, PAL_OW_TREE + dbsprite -1, -1, 4, 4, $00, PAL_OW_TREE .OAMData_Tree: db 4 - dsprite -1, 0, -1, 0, $00, PAL_OW_TREE - dsprite -1, 0, 0, 0, $01, PAL_OW_TREE - dsprite 0, 0, -1, 0, $02, PAL_OW_TREE - dsprite 0, 0, 0, 0, $03, PAL_OW_TREE + dbsprite -1, -1, 0, 0, $00, PAL_OW_TREE + dbsprite 0, -1, 0, 0, $01, PAL_OW_TREE + dbsprite -1, 0, 0, 0, $02, PAL_OW_TREE + dbsprite 0, 0, 0, 0, $03, PAL_OW_TREE .OAMData_TextEntryCursor: db 4 - dsprite -1, 7, -1, 7, $00, 0 - dsprite -1, 7, 0, 0, $00, 0 | X_FLIP - dsprite 0, 0, -1, 7, $00, 0 | Y_FLIP - dsprite 0, 0, 0, 0, $00, 0 | X_FLIP | Y_FLIP + dbsprite -1, -1, 7, 7, $00, 0 + dbsprite 0, -1, 0, 7, $00, 0 | X_FLIP + dbsprite -1, 0, 7, 0, $00, 0 | Y_FLIP + dbsprite 0, 0, 0, 0, $00, 0 | X_FLIP | Y_FLIP .OAMData_TextEntryCursorBig: db 10 - dsprite -1, 7, 0, 0, $00, 0 - dsprite -1, 7, 1, 0, $01, 0 - dsprite -1, 7, 2, 0, $01, 0 - dsprite -1, 7, 3, 0, $01, 0 - dsprite -1, 7, 4, 0, $00, 0 | X_FLIP - dsprite 0, 0, 0, 0, $00, 0 | Y_FLIP - dsprite 0, 0, 1, 0, $01, 0 | Y_FLIP - dsprite 0, 0, 2, 0, $01, 0 | Y_FLIP - dsprite 0, 0, 3, 0, $01, 0 | Y_FLIP - dsprite 0, 0, 4, 0, $00, 0 | X_FLIP | Y_FLIP + dbsprite 0, -1, 0, 7, $00, 0 + dbsprite 1, -1, 0, 7, $01, 0 + dbsprite 2, -1, 0, 7, $01, 0 + dbsprite 3, -1, 0, 7, $01, 0 + dbsprite 4, -1, 0, 7, $00, 0 | X_FLIP + dbsprite 0, 0, 0, 0, $00, 0 | Y_FLIP + dbsprite 1, 0, 0, 0, $01, 0 | Y_FLIP + dbsprite 2, 0, 0, 0, $01, 0 | Y_FLIP + dbsprite 3, 0, 0, 0, $01, 0 | Y_FLIP + dbsprite 4, 0, 0, 0, $00, 0 | X_FLIP | Y_FLIP .OAMData_GSIntroGameFreakLogo: db 15 - dsprite -3, 4, -2, 4, $00, 1 | OBP_NUM - dsprite -3, 4, -1, 4, $01, 1 | OBP_NUM - dsprite -3, 4, 0, 4, $02, 1 | OBP_NUM - dsprite -2, 4, -2, 4, $03, 1 | OBP_NUM - dsprite -2, 4, -1, 4, $04, 1 | OBP_NUM - dsprite -2, 4, 0, 4, $05, 1 | OBP_NUM - dsprite -1, 4, -2, 4, $06, 1 | OBP_NUM - dsprite -1, 4, -1, 4, $07, 1 | OBP_NUM - dsprite -1, 4, 0, 4, $08, 1 | OBP_NUM - dsprite 0, 4, -2, 4, $09, 1 | OBP_NUM - dsprite 0, 4, -1, 4, $0a, 1 | OBP_NUM - dsprite 0, 4, 0, 4, $0b, 1 | OBP_NUM - dsprite 1, 4, -2, 4, $0c, 1 | OBP_NUM - dsprite 1, 4, -1, 4, $0d, 1 | OBP_NUM - dsprite 1, 4, 0, 4, $0e, 1 | OBP_NUM + dbsprite -2, -3, 4, 4, $00, 1 | OBP_NUM + dbsprite -1, -3, 4, 4, $01, 1 | OBP_NUM + dbsprite 0, -3, 4, 4, $02, 1 | OBP_NUM + dbsprite -2, -2, 4, 4, $03, 1 | OBP_NUM + dbsprite -1, -2, 4, 4, $04, 1 | OBP_NUM + dbsprite 0, -2, 4, 4, $05, 1 | OBP_NUM + dbsprite -2, -1, 4, 4, $06, 1 | OBP_NUM + dbsprite -1, -1, 4, 4, $07, 1 | OBP_NUM + dbsprite 0, -1, 4, 4, $08, 1 | OBP_NUM + dbsprite -2, 0, 4, 4, $09, 1 | OBP_NUM + dbsprite -1, 0, 4, 4, $0a, 1 | OBP_NUM + dbsprite 0, 0, 4, 4, $0b, 1 | OBP_NUM + dbsprite -2, 1, 4, 4, $0c, 1 | OBP_NUM + dbsprite -1, 1, 4, 4, $0d, 1 | OBP_NUM + dbsprite 0, 1, 4, 4, $0e, 1 | OBP_NUM .OAMData_SlotsGolem: db 6 - dsprite -2, 4, -2, 4, $00, 5 | OBP_NUM - dsprite -2, 4, -1, 4, $02, 5 | OBP_NUM - dsprite -2, 4, 0, 4, $00, 5 | OBP_NUM | X_FLIP - dsprite 0, 4, -2, 4, $04, 5 | OBP_NUM - dsprite 0, 4, -1, 4, $06, 5 | OBP_NUM - dsprite 0, 4, 0, 4, $04, 5 | OBP_NUM | X_FLIP + dbsprite -2, -2, 4, 4, $00, 5 | OBP_NUM + dbsprite -1, -2, 4, 4, $02, 5 | OBP_NUM + dbsprite 0, -2, 4, 4, $00, 5 | OBP_NUM | X_FLIP + dbsprite -2, 0, 4, 4, $04, 5 | OBP_NUM + dbsprite -1, 0, 4, 4, $06, 5 | OBP_NUM + dbsprite 0, 0, 4, 4, $04, 5 | OBP_NUM | X_FLIP .OAMData_SlotsChansey1: db 6 - dsprite -2, 4, -2, 4, $00, 6 | OBP_NUM - dsprite -2, 4, -1, 4, $02, 6 | OBP_NUM - dsprite -2, 4, 0, 4, $04, 6 | OBP_NUM - dsprite 0, 4, -2, 4, $06, 6 | OBP_NUM - dsprite 0, 4, -1, 4, $08, 6 | OBP_NUM - dsprite 0, 4, 0, 4, $0a, 6 | OBP_NUM + dbsprite -2, -2, 4, 4, $00, 6 | OBP_NUM + dbsprite -1, -2, 4, 4, $02, 6 | OBP_NUM + dbsprite 0, -2, 4, 4, $04, 6 | OBP_NUM + dbsprite -2, 0, 4, 4, $06, 6 | OBP_NUM + dbsprite -1, 0, 4, 4, $08, 6 | OBP_NUM + dbsprite 0, 0, 4, 4, $0a, 6 | OBP_NUM .OAMData_SlotsChansey2: db 6 - dsprite -2, 4, -2, 4, $00, 6 | OBP_NUM - dsprite -2, 4, -1, 4, $02, 6 | OBP_NUM - dsprite -2, 4, 0, 4, $04, 6 | OBP_NUM - dsprite 0, 4, -2, 4, $0c, 6 | OBP_NUM - dsprite 0, 4, -1, 4, $0e, 6 | OBP_NUM - dsprite 0, 4, 0, 4, $10, 6 | OBP_NUM + dbsprite -2, -2, 4, 4, $00, 6 | OBP_NUM + dbsprite -1, -2, 4, 4, $02, 6 | OBP_NUM + dbsprite 0, -2, 4, 4, $04, 6 | OBP_NUM + dbsprite -2, 0, 4, 4, $0c, 6 | OBP_NUM + dbsprite -1, 0, 4, 4, $0e, 6 | OBP_NUM + dbsprite 0, 0, 4, 4, $10, 6 | OBP_NUM .OAMData_SlotsChansey3: db 6 - dsprite -2, 4, -2, 4, $00, 6 | OBP_NUM - dsprite -2, 4, -1, 4, $02, 6 | OBP_NUM - dsprite -2, 4, 0, 4, $04, 6 | OBP_NUM - dsprite 0, 4, -2, 4, $12, 6 | OBP_NUM - dsprite 0, 4, -1, 4, $14, 6 | OBP_NUM - dsprite 0, 4, 0, 4, $16, 6 | OBP_NUM + dbsprite -2, -2, 4, 4, $00, 6 | OBP_NUM + dbsprite -1, -2, 4, 4, $02, 6 | OBP_NUM + dbsprite 0, -2, 4, 4, $04, 6 | OBP_NUM + dbsprite -2, 0, 4, 4, $12, 6 | OBP_NUM + dbsprite -1, 0, 4, 4, $14, 6 | OBP_NUM + dbsprite 0, 0, 4, 4, $16, 6 | OBP_NUM .OAMData_SlotsChansey4: db 6 - dsprite -2, 4, -2, 4, $00, 6 | OBP_NUM - dsprite -2, 4, -1, 4, $02, 6 | OBP_NUM - dsprite -2, 4, 0, 4, $04, 6 | OBP_NUM - dsprite 0, 4, -2, 4, $18, 6 | OBP_NUM - dsprite 0, 4, -1, 4, $1a, 6 | OBP_NUM - dsprite 0, 4, 0, 4, $1c, 6 | OBP_NUM + dbsprite -2, -2, 4, 4, $00, 6 | OBP_NUM + dbsprite -1, -2, 4, 4, $02, 6 | OBP_NUM + dbsprite 0, -2, 4, 4, $04, 6 | OBP_NUM + dbsprite -2, 0, 4, 4, $18, 6 | OBP_NUM + dbsprite -1, 0, 4, 4, $1a, 6 | OBP_NUM + dbsprite 0, 0, 4, 4, $1c, 6 | OBP_NUM .OAMData_SlotsChansey5: db 6 - dsprite -2, 4, -2, 4, $1e, 6 | OBP_NUM - dsprite -2, 4, -1, 4, $20, 6 | OBP_NUM - dsprite -2, 4, 0, 4, $22, 6 | OBP_NUM - dsprite 0, 4, -2, 4, $24, 6 | OBP_NUM - dsprite 0, 4, -1, 4, $26, 6 | OBP_NUM - dsprite 0, 4, 0, 4, $28, 6 | OBP_NUM + dbsprite -2, -2, 4, 4, $1e, 6 | OBP_NUM + dbsprite -1, -2, 4, 4, $20, 6 | OBP_NUM + dbsprite 0, -2, 4, 4, $22, 6 | OBP_NUM + dbsprite -2, 0, 4, 4, $24, 6 | OBP_NUM + dbsprite -1, 0, 4, 4, $26, 6 | OBP_NUM + dbsprite 0, 0, 4, 4, $28, 6 | OBP_NUM .OAMData_RadioTuningKnob: db 3 - dsprite -2, 4, -1, 4, $00, 0 | OBP_NUM - dsprite -1, 4, -1, 4, $00, 0 | OBP_NUM - dsprite 0, 4, -1, 4, $00, 0 | OBP_NUM + dbsprite -1, -2, 4, 4, $00, 0 | OBP_NUM + dbsprite -1, -1, 4, 4, $00, 0 | OBP_NUM + dbsprite -1, 0, 4, 4, $00, 0 | OBP_NUM .OAMData_Unused4B: db 6 - dsprite 0, 0, 0, 0, $00, 0 - dsprite 0, 0, 1, 0, $01, 0 - dsprite 0, 0, 2, 0, $01, 0 - dsprite 0, 0, 3, 0, $01, 0 - dsprite 0, 0, 4, 0, $02, 0 - dsprite 0, 0, 5, 0, $03, 0 + dbsprite 0, 0, 0, 0, $00, 0 + dbsprite 1, 0, 0, 0, $01, 0 + dbsprite 2, 0, 0, 0, $01, 0 + dbsprite 3, 0, 0, 0, $01, 0 + dbsprite 4, 0, 0, 0, $02, 0 + dbsprite 5, 0, 0, 0, $03, 0 .OAMData_Unused4C: db 4 - dsprite 0, 0, 0, 0, $00, 0 - dsprite 0, 0, 1, 0, $01, 0 - dsprite 0, 0, 2, 0, $02, 0 - dsprite 0, 0, 3, 0, $03, 0 + dbsprite 0, 0, 0, 0, $00, 0 + dbsprite 1, 0, 0, 0, $01, 0 + dbsprite 2, 0, 0, 0, $02, 0 + dbsprite 3, 0, 0, 0, $03, 0 .OAMData_CutTree2: db 4 - dsprite -1, 0, -2, 6, $00, PAL_OW_TREE - dsprite -1, 0, 0, 2, $01, PAL_OW_TREE - dsprite 0, 0, -2, 6, $02, PAL_OW_TREE - dsprite 0, 0, 0, 2, $03, PAL_OW_TREE + dbsprite -2, -1, 6, 0, $00, PAL_OW_TREE + dbsprite 0, -1, 2, 0, $01, PAL_OW_TREE + dbsprite -2, 0, 6, 0, $02, PAL_OW_TREE + dbsprite 0, 0, 2, 0, $03, PAL_OW_TREE .OAMData_CutTree3: db 4 - dsprite -1, 0, -2, 4, $00, PAL_OW_TREE - dsprite -1, 0, 0, 4, $01, PAL_OW_TREE - dsprite 0, 0, -2, 4, $02, PAL_OW_TREE - dsprite 0, 0, 0, 4, $03, PAL_OW_TREE + dbsprite -2, -1, 4, 0, $00, PAL_OW_TREE + dbsprite 0, -1, 4, 0, $01, PAL_OW_TREE + dbsprite -2, 0, 4, 0, $02, PAL_OW_TREE + dbsprite 0, 0, 4, 0, $03, PAL_OW_TREE .OAMData_CutTree4: db 4 - dsprite -1, 0, -2, 0, $00, PAL_OW_TREE - dsprite -1, 0, 1, 0, $01, PAL_OW_TREE - dsprite 0, 0, -2, 0, $02, PAL_OW_TREE - dsprite 0, 0, 1, 0, $03, PAL_OW_TREE + dbsprite -2, -1, 0, 0, $00, PAL_OW_TREE + dbsprite 1, -1, 0, 0, $01, PAL_OW_TREE + dbsprite -2, 0, 0, 0, $02, PAL_OW_TREE + dbsprite 1, 0, 0, 0, $03, PAL_OW_TREE .OAMData_GSIntroHoOh1: db 19 - dsprite -1, 0, -4, 0, $00, 0 - dsprite -2, 0, -3, 0, $02, 0 - dsprite 0, 0, -3, 0, $04, 0 - dsprite -3, 0, -2, 0, $06, 0 - dsprite -1, 0, -2, 0, $08, 0 - dsprite 1, 0, -2, 0, $0a, 0 - dsprite -3, 0, -1, 0, $0c, 0 - dsprite -1, 0, -1, 0, $0e, 0 - dsprite 1, 0, -1, 0, $10, 0 - dsprite -3, 0, 0, 0, $12, 0 - dsprite -1, 0, 0, 0, $14, 0 - dsprite 1, 0, 0, 0, $16, 0 - dsprite -3, 0, 1, 0, $18, 0 - dsprite -1, 0, 1, 0, $1a, 0 - dsprite 1, 0, 1, 0, $1c, 0 - dsprite -1, 0, 2, 0, $1e, 0 - dsprite 1, 0, 2, 0, $20, 0 - dsprite -2, 0, 3, 0, $22, 0 - dsprite 0, 0, 3, 0, $24, 0 + dbsprite -4, -1, 0, 0, $00, 0 + dbsprite -3, -2, 0, 0, $02, 0 + dbsprite -3, 0, 0, 0, $04, 0 + dbsprite -2, -3, 0, 0, $06, 0 + dbsprite -2, -1, 0, 0, $08, 0 + dbsprite -2, 1, 0, 0, $0a, 0 + dbsprite -1, -3, 0, 0, $0c, 0 + dbsprite -1, -1, 0, 0, $0e, 0 + dbsprite -1, 1, 0, 0, $10, 0 + dbsprite 0, -3, 0, 0, $12, 0 + dbsprite 0, -1, 0, 0, $14, 0 + dbsprite 0, 1, 0, 0, $16, 0 + dbsprite 1, -3, 0, 0, $18, 0 + dbsprite 1, -1, 0, 0, $1a, 0 + dbsprite 1, 1, 0, 0, $1c, 0 + dbsprite 2, -1, 0, 0, $1e, 0 + dbsprite 2, 1, 0, 0, $20, 0 + dbsprite 3, -2, 0, 0, $22, 0 + dbsprite 3, 0, 0, 0, $24, 0 .OAMData_GSIntroHoOh2: db 16 - dsprite -1, 0, -4, 0, $00, 0 - dsprite -2, 0, -3, 0, $02, 0 - dsprite 0, 0, -3, 0, $04, 0 - dsprite -1, 0, -2, 0, $26, 0 - dsprite 1, 0, -2, 0, $0a, 0 - dsprite -3, 0, -1, 0, $28, 0 - dsprite -1, 0, -1, 0, $2a, 0 - dsprite 1, 0, -1, 0, $10, 0 - dsprite -1, 0, 0, 0, $2c, 0 - dsprite 1, 0, 0, 0, $16, 0 - dsprite -1, 0, 1, 0, $30, 0 - dsprite 1, 0, 1, 0, $1c, 0 - dsprite -1, 0, 2, 0, $1e, 0 - dsprite 1, 0, 2, 0, $20, 0 - dsprite -2, 0, 3, 0, $22, 0 - dsprite 0, 0, 3, 0, $24, 0 + dbsprite -4, -1, 0, 0, $00, 0 + dbsprite -3, -2, 0, 0, $02, 0 + dbsprite -3, 0, 0, 0, $04, 0 + dbsprite -2, -1, 0, 0, $26, 0 + dbsprite -2, 1, 0, 0, $0a, 0 + dbsprite -1, -3, 0, 0, $28, 0 + dbsprite -1, -1, 0, 0, $2a, 0 + dbsprite -1, 1, 0, 0, $10, 0 + dbsprite 0, -1, 0, 0, $2c, 0 + dbsprite 0, 1, 0, 0, $16, 0 + dbsprite 1, -1, 0, 0, $30, 0 + dbsprite 1, 1, 0, 0, $1c, 0 + dbsprite 2, -1, 0, 0, $1e, 0 + dbsprite 2, 1, 0, 0, $20, 0 + dbsprite 3, -2, 0, 0, $22, 0 + dbsprite 3, 0, 0, 0, $24, 0 .OAMData_GSIntroHoOh3: db 15 - dsprite -1, 0, -4, 0, $00, 0 - dsprite -2, 0, -3, 0, $02, 0 - dsprite 0, 0, -3, 0, $32, 0 - dsprite -1, 0, -2, 0, $34, 0 - dsprite 1, 0, -2, 0, $36, 0 - dsprite -1, 0, -1, 0, $38, 0 - dsprite 1, 0, -1, 0, $3a, 0 - dsprite -1, 0, 0, 0, $3c, 0 - dsprite 1, 0, 0, 0, $3e, 0 - dsprite -1, 0, 1, 0, $30, 0 - dsprite 1, 0, 1, 0, $1c, 0 - dsprite -1, 0, 2, 0, $1e, 0 - dsprite 1, 0, 2, 0, $20, 0 - dsprite -2, 0, 3, 0, $22, 0 - dsprite 0, 0, 3, 0, $24, 0 + dbsprite -4, -1, 0, 0, $00, 0 + dbsprite -3, -2, 0, 0, $02, 0 + dbsprite -3, 0, 0, 0, $32, 0 + dbsprite -2, -1, 0, 0, $34, 0 + dbsprite -2, 1, 0, 0, $36, 0 + dbsprite -1, -1, 0, 0, $38, 0 + dbsprite -1, 1, 0, 0, $3a, 0 + dbsprite 0, -1, 0, 0, $3c, 0 + dbsprite 0, 1, 0, 0, $3e, 0 + dbsprite 1, -1, 0, 0, $30, 0 + dbsprite 1, 1, 0, 0, $1c, 0 + dbsprite 2, -1, 0, 0, $1e, 0 + dbsprite 2, 1, 0, 0, $20, 0 + dbsprite 3, -2, 0, 0, $22, 0 + dbsprite 3, 0, 0, 0, $24, 0 .OAMData_GSIntroHoOh4: db 17 - dsprite -1, 0, -4, 0, $00, 0 - dsprite -2, 0, -3, 0, $02, 0 - dsprite 0, 0, -3, 0, $04, 0 - dsprite -1, 0, -2, 0, $40, 0 - dsprite 1, 0, -2, 0, $42, 0 - dsprite 3, 0, -2, 0, $44, 0 - dsprite -1, 0, -1, 0, $46, 0 - dsprite 1, 0, -1, 0, $48, 0 - dsprite 3, 0, -1, 0, $4a, 0 - dsprite -1, 0, 0, 0, $4c, 0 - dsprite 1, 0, 0, 0, $4e, 0 - dsprite -1, 0, 1, 0, $30, 0 - dsprite 1, 0, 1, 0, $1c, 0 - dsprite -1, 0, 2, 0, $1e, 0 - dsprite 1, 0, 2, 0, $20, 0 - dsprite -2, 0, 3, 0, $22, 0 - dsprite 0, 0, 3, 0, $24, 0 + dbsprite -4, -1, 0, 0, $00, 0 + dbsprite -3, -2, 0, 0, $02, 0 + dbsprite -3, 0, 0, 0, $04, 0 + dbsprite -2, -1, 0, 0, $40, 0 + dbsprite -2, 1, 0, 0, $42, 0 + dbsprite -2, 3, 0, 0, $44, 0 + dbsprite -1, -1, 0, 0, $46, 0 + dbsprite -1, 1, 0, 0, $48, 0 + dbsprite -1, 3, 0, 0, $4a, 0 + dbsprite 0, -1, 0, 0, $4c, 0 + dbsprite 0, 1, 0, 0, $4e, 0 + dbsprite 1, -1, 0, 0, $30, 0 + dbsprite 1, 1, 0, 0, $1c, 0 + dbsprite 2, -1, 0, 0, $1e, 0 + dbsprite 2, 1, 0, 0, $20, 0 + dbsprite 3, -2, 0, 0, $22, 0 + dbsprite 3, 0, 0, 0, $24, 0 .OAMData_GSIntroHoOh5: db 17 - dsprite -1, 0, -4, 0, $00, 0 - dsprite -2, 0, -3, 0, $02, 0 - dsprite 0, 0, -3, 0, $04, 0 - dsprite -1, 0, -2, 0, $50, 0 - dsprite 1, 0, -2, 0, $0a, 0 - dsprite -3, 0, -1, 0, $52, 0 - dsprite -1, 0, -1, 0, $54, 0 - dsprite 1, 0, -1, 0, $10, 0 - dsprite -3, 0, 0, 0, $56, 0 - dsprite -1, 0, 0, 0, $2e, 0 - dsprite 1, 0, 0, 0, $16, 0 - dsprite -1, 0, 1, 0, $30, 0 - dsprite 1, 0, 1, 0, $1c, 0 - dsprite -1, 0, 2, 0, $1e, 0 - dsprite 1, 0, 2, 0, $20, 0 - dsprite -2, 0, 3, 0, $22, 0 - dsprite 0, 0, 3, 0, $24, 0 + dbsprite -4, -1, 0, 0, $00, 0 + dbsprite -3, -2, 0, 0, $02, 0 + dbsprite -3, 0, 0, 0, $04, 0 + dbsprite -2, -1, 0, 0, $50, 0 + dbsprite -2, 1, 0, 0, $0a, 0 + dbsprite -1, -3, 0, 0, $52, 0 + dbsprite -1, -1, 0, 0, $54, 0 + dbsprite -1, 1, 0, 0, $10, 0 + dbsprite 0, -3, 0, 0, $56, 0 + dbsprite 0, -1, 0, 0, $2e, 0 + dbsprite 0, 1, 0, 0, $16, 0 + dbsprite 1, -1, 0, 0, $30, 0 + dbsprite 1, 1, 0, 0, $1c, 0 + dbsprite 2, -1, 0, 0, $1e, 0 + dbsprite 2, 1, 0, 0, $20, 0 + dbsprite 3, -2, 0, 0, $22, 0 + dbsprite 3, 0, 0, 0, $24, 0 .OAMData_GSTitleTrail: db 1 - dsprite -1, 4, -1, 4, $00, 1 | OBP_NUM + dbsprite -1, -1, 4, 4, $00, 1 | OBP_NUM .OAMData_EZChatCursor1: db 12 - dsprite 0, 0, 0, 0, $30, 0 - dsprite 0, 0, 1, 0, $31, 0 - dsprite 0, 0, 2, 0, $31, 0 - dsprite 0, 0, 3, 0, $31, 0 - dsprite 0, 0, 4, 0, $31, 0 - dsprite 0, 0, 5, 0, $32, 0 - dsprite 1, 0, 0, 0, $33, 0 - dsprite 1, 0, 1, 0, $34, 0 - dsprite 1, 0, 2, 0, $34, 0 - dsprite 1, 0, 3, 0, $34, 0 - dsprite 1, 0, 4, 0, $34, 0 - dsprite 1, 0, 5, 0, $35, 0 + dbsprite 0, 0, 0, 0, $30, 0 + dbsprite 1, 0, 0, 0, $31, 0 + dbsprite 2, 0, 0, 0, $31, 0 + dbsprite 3, 0, 0, 0, $31, 0 + dbsprite 4, 0, 0, 0, $31, 0 + dbsprite 5, 0, 0, 0, $32, 0 + dbsprite 0, 1, 0, 0, $33, 0 + dbsprite 1, 1, 0, 0, $34, 0 + dbsprite 2, 1, 0, 0, $34, 0 + dbsprite 3, 1, 0, 0, $34, 0 + dbsprite 4, 1, 0, 0, $34, 0 + dbsprite 5, 1, 0, 0, $35, 0 .OAMData_EZChatCursor2: db 1 - dsprite 0, 0, 0, 0, $ed, 0 + dbsprite 0, 0, 0, 0, $ed, 0 .OAMData_EZChatCursor3: db 4 - dsprite -1, 7, -1, 7, $30, 0 - dsprite -1, 7, 0, 1, $32, 0 - dsprite 0, 1, -1, 7, $33, 0 - dsprite 0, 1, 0, 1, $35, 0 + dbsprite -1, -1, 7, 7, $30, 0 + dbsprite 0, -1, 1, 7, $32, 0 + dbsprite -1, 0, 7, 1, $33, 0 + dbsprite 0, 0, 1, 1, $35, 0 .OAMData_EZChatCursor4: db 8 - dsprite -1, 7, -1, 7, $30, 0 - dsprite -1, 7, 0, 4, $31, 0 - dsprite -1, 7, 1, 4, $31, 0 - dsprite -1, 7, 2, 1, $32, 0 - dsprite 0, 1, -1, 7, $33, 0 - dsprite 0, 1, 0, 4, $34, 0 - dsprite 0, 1, 1, 4, $34, 0 - dsprite 0, 1, 2, 1, $35, 0 + dbsprite -1, -1, 7, 7, $30, 0 + dbsprite 0, -1, 4, 7, $31, 0 + dbsprite 1, -1, 4, 7, $31, 0 + dbsprite 2, -1, 1, 7, $32, 0 + dbsprite -1, 0, 7, 1, $33, 0 + dbsprite 0, 0, 4, 1, $34, 0 + dbsprite 1, 0, 4, 1, $34, 0 + dbsprite 2, 0, 1, 1, $35, 0 .OAMData_EZChatCursor5: db 1 - dsprite 0, 0, 0, 0, $34, 0 + dbsprite 0, 0, 0, 0, $34, 0 .OAMData_EZChatCursor6: db 2 - dsprite 0, 0, 0, 0, $30, 0 - dsprite 1, 0, 0, 0, $33, 0 + dbsprite 0, 0, 0, 0, $30, 0 + dbsprite 0, 1, 0, 0, $33, 0 .OAMData_EZChatCursor7: db 2 - dsprite 0, 0, 0, 0, $32, 0 - dsprite 1, 0, 0, 0, $35, 0 + dbsprite 0, 0, 0, 0, $32, 0 + dbsprite 0, 1, 0, 0, $35, 0 .OAMData_BlueWalk: db 4 - dsprite -1, 0, -1, 0, $00, PAL_OW_BLUE - dsprite -1, 0, 0, 0, $01, PAL_OW_BLUE - dsprite 0, 0, -1, 0, $02, PAL_OW_BLUE - dsprite 0, 0, 0, 0, $03, PAL_OW_BLUE + dbsprite -1, -1, 0, 0, $00, PAL_OW_BLUE + dbsprite 0, -1, 0, 0, $01, PAL_OW_BLUE + dbsprite -1, 0, 0, 0, $02, PAL_OW_BLUE + dbsprite 0, 0, 0, 0, $03, PAL_OW_BLUE .OAMData_MagnetTrainBlue: db 4 - dsprite -1, 0, -1, 0, $00, PAL_OW_BLUE | PRIORITY - dsprite -1, 0, 0, 0, $01, PAL_OW_BLUE | PRIORITY - dsprite 0, 0, -1, 0, $02, PAL_OW_BLUE | PRIORITY - dsprite 0, 0, 0, 0, $03, PAL_OW_BLUE | PRIORITY + dbsprite -1, -1, 0, 0, $00, PAL_OW_BLUE | PRIORITY + dbsprite 0, -1, 0, 0, $01, PAL_OW_BLUE | PRIORITY + dbsprite -1, 0, 0, 0, $02, PAL_OW_BLUE | PRIORITY + dbsprite 0, 0, 0, 0, $03, PAL_OW_BLUE | PRIORITY .OAMData_MobileTradeCableBulge: db 1 - dsprite -1, 4, -1, 4, $00, 2 + dbsprite -1, -1, 4, 4, $00, 2 .OAMData_MobileTradeSentPulse: db 4 - dsprite -2, 0, -1, 4, $00, 3 - dsprite -1, 0, -1, 4, $01, 3 - dsprite 0, 0, -1, 4, $02, 3 - dsprite 1, 0, -1, 4, $03, 3 + dbsprite -1, -2, 4, 0, $00, 3 + dbsprite -1, -1, 4, 0, $01, 3 + dbsprite -1, 0, 4, 0, $02, 3 + dbsprite -1, 1, 4, 0, $03, 3 .OAMData_MobileTradeOTPulse: db 4 - dsprite -2, 0, -1, 4, $03, 4 | Y_FLIP - dsprite -1, 0, -1, 4, $02, 4 | Y_FLIP - dsprite 0, 0, -1, 4, $01, 4 | Y_FLIP - dsprite 1, 0, -1, 4, $00, 4 | Y_FLIP + dbsprite -1, -2, 4, 0, $03, 4 | Y_FLIP + dbsprite -1, -1, 4, 0, $02, 4 | Y_FLIP + dbsprite -1, 0, 4, 0, $01, 4 | Y_FLIP + dbsprite -1, 1, 4, 0, $00, 4 | Y_FLIP .OAMData_MobileTradePing1: db 4 - dsprite -1, 0, -1, 0, $00, 1 - dsprite -1, 0, 0, 0, $00, 1 | X_FLIP - dsprite 0, 0, -1, 0, $00, 1 | Y_FLIP - dsprite 0, 0, 0, 0, $00, 1 | X_FLIP | Y_FLIP + dbsprite -1, -1, 0, 0, $00, 1 + dbsprite 0, -1, 0, 0, $00, 1 | X_FLIP + dbsprite -1, 0, 0, 0, $00, 1 | Y_FLIP + dbsprite 0, 0, 0, 0, $00, 1 | X_FLIP | Y_FLIP .OAMData_MobileTradePing2: db 8 - dsprite -2, 4, -2, 4, $00, 1 - dsprite -2, 4, -1, 4, $01, 1 - dsprite -2, 4, 0, 4, $00, 1 | X_FLIP - dsprite -1, 4, -2, 4, $02, 1 - dsprite -1, 4, 0, 4, $02, 1 | X_FLIP - dsprite 0, 4, -2, 4, $00, 1 | Y_FLIP - dsprite 0, 4, -1, 4, $01, 1 | Y_FLIP - dsprite 0, 4, 0, 4, $00, 1 | X_FLIP | Y_FLIP + dbsprite -2, -2, 4, 4, $00, 1 + dbsprite -1, -2, 4, 4, $01, 1 + dbsprite 0, -2, 4, 4, $00, 1 | X_FLIP + dbsprite -2, -1, 4, 4, $02, 1 + dbsprite 0, -1, 4, 4, $02, 1 | X_FLIP + dbsprite -2, 0, 4, 4, $00, 1 | Y_FLIP + dbsprite -1, 0, 4, 4, $01, 1 | Y_FLIP + dbsprite 0, 0, 4, 4, $00, 1 | X_FLIP | Y_FLIP .OAMData_MobileTradePing3: db 12 - dsprite -2, 0, -2, 0, $00, 1 - dsprite -2, 0, -1, 0, $01, 1 - dsprite -1, 0, -2, 0, $02, 1 - dsprite -2, 0, 0, 0, $01, 1 | X_FLIP - dsprite -2, 0, 1, 0, $00, 1 | X_FLIP - dsprite -1, 0, 1, 0, $02, 1 | X_FLIP - dsprite 0, 0, -2, 0, $02, 1 | Y_FLIP - dsprite 1, 0, -2, 0, $00, 1 | Y_FLIP - dsprite 1, 0, -1, 0, $01, 1 | Y_FLIP - dsprite 0, 0, 1, 0, $02, 1 | X_FLIP | Y_FLIP - dsprite 1, 0, 0, 0, $01, 1 | X_FLIP | Y_FLIP - dsprite 1, 0, 1, 0, $00, 1 | X_FLIP | Y_FLIP + dbsprite -2, -2, 0, 0, $00, 1 + dbsprite -1, -2, 0, 0, $01, 1 + dbsprite -2, -1, 0, 0, $02, 1 + dbsprite 0, -2, 0, 0, $01, 1 | X_FLIP + dbsprite 1, -2, 0, 0, $00, 1 | X_FLIP + dbsprite 1, -1, 0, 0, $02, 1 | X_FLIP + dbsprite -2, 0, 0, 0, $02, 1 | Y_FLIP + dbsprite -2, 1, 0, 0, $00, 1 | Y_FLIP + dbsprite -1, 1, 0, 0, $01, 1 | Y_FLIP + dbsprite 1, 0, 0, 0, $02, 1 | X_FLIP | Y_FLIP + dbsprite 0, 1, 0, 0, $01, 1 | X_FLIP | Y_FLIP + dbsprite 1, 1, 0, 0, $00, 1 | X_FLIP | Y_FLIP .OAMData_IntroSuicune1: db 36 - dsprite -3, 0, 1, 0, $05, 0 - dsprite -3, 0, 2, 0, $06, 0 - dsprite -3, 0, 3, 0, $07, 0 - dsprite -2, 0, -3, 0, $11, 0 - dsprite -2, 0, -2, 0, $12, 0 - dsprite -2, 0, -1, 0, $13, 0 - dsprite -2, 0, 0, 0, $14, 0 - dsprite -2, 0, 1, 0, $15, 0 - dsprite -2, 0, 2, 0, $16, 0 - dsprite -2, 0, 3, 0, $17, 0 - dsprite -1, 0, -4, 0, $20, 0 - dsprite -1, 0, -3, 0, $21, 0 - dsprite -1, 0, -2, 0, $22, 0 - dsprite -1, 0, -1, 0, $23, 0 - dsprite -1, 0, 0, 0, $24, 0 - dsprite -1, 0, 1, 0, $25, 0 - dsprite -1, 0, 2, 0, $26, 0 - dsprite -1, 0, 3, 0, $27, 0 - dsprite 0, 0, -4, 0, $30, 0 - dsprite 0, 0, -3, 0, $31, 0 - dsprite 0, 0, -2, 0, $32, 0 - dsprite 0, 0, -1, 0, $33, 0 - dsprite 0, 0, 0, 0, $34, 0 - dsprite 0, 0, 1, 0, $35, 0 - dsprite 0, 0, 2, 0, $36, 0 - dsprite 1, 0, -4, 0, $40, 0 - dsprite 1, 0, -3, 0, $41, 0 - dsprite 1, 0, -2, 0, $42, 0 - dsprite 1, 0, -1, 0, $43, 0 - dsprite 1, 0, 0, 0, $44, 0 - dsprite 1, 0, 1, 0, $45, 0 - dsprite 1, 0, 2, 0, $46, 0 - dsprite 1, 0, 3, 0, $47, 0 - dsprite 2, 0, -4, 0, $50, 0 - dsprite 2, 0, -3, 0, $51, 0 - dsprite 2, 0, 3, 0, $57, 0 + dbsprite 1, -3, 0, 0, $05, 0 + dbsprite 2, -3, 0, 0, $06, 0 + dbsprite 3, -3, 0, 0, $07, 0 + dbsprite -3, -2, 0, 0, $11, 0 + dbsprite -2, -2, 0, 0, $12, 0 + dbsprite -1, -2, 0, 0, $13, 0 + dbsprite 0, -2, 0, 0, $14, 0 + dbsprite 1, -2, 0, 0, $15, 0 + dbsprite 2, -2, 0, 0, $16, 0 + dbsprite 3, -2, 0, 0, $17, 0 + dbsprite -4, -1, 0, 0, $20, 0 + dbsprite -3, -1, 0, 0, $21, 0 + dbsprite -2, -1, 0, 0, $22, 0 + dbsprite -1, -1, 0, 0, $23, 0 + dbsprite 0, -1, 0, 0, $24, 0 + dbsprite 1, -1, 0, 0, $25, 0 + dbsprite 2, -1, 0, 0, $26, 0 + dbsprite 3, -1, 0, 0, $27, 0 + dbsprite -4, 0, 0, 0, $30, 0 + dbsprite -3, 0, 0, 0, $31, 0 + dbsprite -2, 0, 0, 0, $32, 0 + dbsprite -1, 0, 0, 0, $33, 0 + dbsprite 0, 0, 0, 0, $34, 0 + dbsprite 1, 0, 0, 0, $35, 0 + dbsprite 2, 0, 0, 0, $36, 0 + dbsprite -4, 1, 0, 0, $40, 0 + dbsprite -3, 1, 0, 0, $41, 0 + dbsprite -2, 1, 0, 0, $42, 0 + dbsprite -1, 1, 0, 0, $43, 0 + dbsprite 0, 1, 0, 0, $44, 0 + dbsprite 1, 1, 0, 0, $45, 0 + dbsprite 2, 1, 0, 0, $46, 0 + dbsprite 3, 1, 0, 0, $47, 0 + dbsprite -4, 2, 0, 0, $50, 0 + dbsprite -3, 2, 0, 0, $51, 0 + dbsprite 3, 2, 0, 0, $57, 0 .OAMData_IntroSuicune2: db 28 - dsprite -3, 0, 0, 0, $04, 0 - dsprite -3, 0, 1, 0, $05, 0 - dsprite -3, 0, 2, 0, $06, 0 - dsprite -2, 0, -3, 0, $11, 0 - dsprite -2, 0, -2, 0, $12, 0 - dsprite -2, 0, -1, 0, $13, 0 - dsprite -2, 0, 0, 0, $14, 0 - dsprite -2, 0, 1, 0, $15, 0 - dsprite -2, 0, 2, 0, $16, 0 - dsprite -1, 0, -3, 0, $21, 0 - dsprite -1, 0, -2, 0, $22, 0 - dsprite -1, 0, -1, 0, $23, 0 - dsprite -1, 0, 0, 0, $24, 0 - dsprite -1, 0, 1, 0, $25, 0 - dsprite -1, 0, 2, 0, $26, 0 - dsprite 0, 0, -4, 0, $30, 0 - dsprite 0, 0, -3, 0, $31, 0 - dsprite 0, 0, -2, 0, $32, 0 - dsprite 0, 0, -1, 0, $33, 0 - dsprite 0, 0, 0, 0, $34, 0 - dsprite 0, 0, 1, 0, $35, 0 - dsprite 1, 0, -2, 0, $42, 0 - dsprite 1, 0, -1, 0, $43, 0 - dsprite 1, 0, 0, 0, $44, 0 - dsprite 1, 0, 1, 0, $45, 0 - dsprite 2, 0, -1, 0, $53, 0 - dsprite 2, 0, 0, 0, $54, 0 - dsprite 2, 0, 1, 0, $55, 0 + dbsprite 0, -3, 0, 0, $04, 0 + dbsprite 1, -3, 0, 0, $05, 0 + dbsprite 2, -3, 0, 0, $06, 0 + dbsprite -3, -2, 0, 0, $11, 0 + dbsprite -2, -2, 0, 0, $12, 0 + dbsprite -1, -2, 0, 0, $13, 0 + dbsprite 0, -2, 0, 0, $14, 0 + dbsprite 1, -2, 0, 0, $15, 0 + dbsprite 2, -2, 0, 0, $16, 0 + dbsprite -3, -1, 0, 0, $21, 0 + dbsprite -2, -1, 0, 0, $22, 0 + dbsprite -1, -1, 0, 0, $23, 0 + dbsprite 0, -1, 0, 0, $24, 0 + dbsprite 1, -1, 0, 0, $25, 0 + dbsprite 2, -1, 0, 0, $26, 0 + dbsprite -4, 0, 0, 0, $30, 0 + dbsprite -3, 0, 0, 0, $31, 0 + dbsprite -2, 0, 0, 0, $32, 0 + dbsprite -1, 0, 0, 0, $33, 0 + dbsprite 0, 0, 0, 0, $34, 0 + dbsprite 1, 0, 0, 0, $35, 0 + dbsprite -2, 1, 0, 0, $42, 0 + dbsprite -1, 1, 0, 0, $43, 0 + dbsprite 0, 1, 0, 0, $44, 0 + dbsprite 1, 1, 0, 0, $45, 0 + dbsprite -1, 2, 0, 0, $53, 0 + dbsprite 0, 2, 0, 0, $54, 0 + dbsprite 1, 2, 0, 0, $55, 0 .OAMData_IntroSuicune3: db 30 - dsprite -3, 0, 0, 0, $04, 0 - dsprite -3, 0, 1, 0, $05, 0 - dsprite -2, 0, -3, 0, $11, 0 - dsprite -2, 0, -2, 0, $12, 0 - dsprite -2, 0, -1, 0, $13, 0 - dsprite -2, 0, 0, 0, $14, 0 - dsprite -2, 0, 1, 0, $15, 0 - dsprite -2, 0, 2, 0, $16, 0 - dsprite -2, 0, 3, 0, $17, 0 - dsprite -1, 0, -4, 0, $20, 0 - dsprite -1, 0, -3, 0, $21, 0 - dsprite -1, 0, -2, 0, $22, 0 - dsprite -1, 0, -1, 0, $23, 0 - dsprite -1, 0, 0, 0, $24, 0 - dsprite -1, 0, 1, 0, $25, 0 - dsprite -1, 0, 2, 0, $26, 0 - dsprite 0, 0, -4, 0, $30, 0 - dsprite 0, 0, -3, 0, $31, 0 - dsprite 0, 0, -2, 0, $32, 0 - dsprite 0, 0, -1, 0, $33, 0 - dsprite 0, 0, 0, 0, $34, 0 - dsprite 0, 0, 1, 0, $35, 0 - dsprite 1, 0, -2, 0, $42, 0 - dsprite 1, 0, -1, 0, $43, 0 - dsprite 1, 0, 0, 0, $44, 0 - dsprite 1, 0, 1, 0, $45, 0 - dsprite 2, 0, -2, 0, $52, 0 - dsprite 2, 0, -1, 0, $53, 0 - dsprite 2, 0, 0, 0, $54, 0 - dsprite 2, 0, 1, 0, $55, 0 + dbsprite 0, -3, 0, 0, $04, 0 + dbsprite 1, -3, 0, 0, $05, 0 + dbsprite -3, -2, 0, 0, $11, 0 + dbsprite -2, -2, 0, 0, $12, 0 + dbsprite -1, -2, 0, 0, $13, 0 + dbsprite 0, -2, 0, 0, $14, 0 + dbsprite 1, -2, 0, 0, $15, 0 + dbsprite 2, -2, 0, 0, $16, 0 + dbsprite 3, -2, 0, 0, $17, 0 + dbsprite -4, -1, 0, 0, $20, 0 + dbsprite -3, -1, 0, 0, $21, 0 + dbsprite -2, -1, 0, 0, $22, 0 + dbsprite -1, -1, 0, 0, $23, 0 + dbsprite 0, -1, 0, 0, $24, 0 + dbsprite 1, -1, 0, 0, $25, 0 + dbsprite 2, -1, 0, 0, $26, 0 + dbsprite -4, 0, 0, 0, $30, 0 + dbsprite -3, 0, 0, 0, $31, 0 + dbsprite -2, 0, 0, 0, $32, 0 + dbsprite -1, 0, 0, 0, $33, 0 + dbsprite 0, 0, 0, 0, $34, 0 + dbsprite 1, 0, 0, 0, $35, 0 + dbsprite -2, 1, 0, 0, $42, 0 + dbsprite -1, 1, 0, 0, $43, 0 + dbsprite 0, 1, 0, 0, $44, 0 + dbsprite 1, 1, 0, 0, $45, 0 + dbsprite -2, 2, 0, 0, $52, 0 + dbsprite -1, 2, 0, 0, $53, 0 + dbsprite 0, 2, 0, 0, $54, 0 + dbsprite 1, 2, 0, 0, $55, 0 .OAMData_IntroSuicune4: db 31 - dsprite -2, 0, -3, 0, $11, 0 - dsprite -2, 0, -2, 0, $12, 0 - dsprite -2, 0, -1, 0, $13, 0 - dsprite -2, 0, 0, 0, $14, 0 - dsprite -2, 0, 1, 0, $15, 0 - dsprite -2, 0, 2, 0, $16, 0 - dsprite -2, 0, 3, 0, $17, 0 - dsprite -1, 0, -4, 0, $20, 0 - dsprite -1, 0, -3, 0, $21, 0 - dsprite -1, 0, -2, 0, $22, 0 - dsprite -1, 0, -1, 0, $23, 0 - dsprite -1, 0, 0, 0, $24, 0 - dsprite -1, 0, 1, 0, $25, 0 - dsprite -1, 0, 2, 0, $26, 0 - dsprite -1, 0, 3, 0, $27, 0 - dsprite 0, 0, -4, 0, $30, 0 - dsprite 0, 0, -3, 0, $31, 0 - dsprite 0, 0, -2, 0, $32, 0 - dsprite 0, 0, -1, 0, $33, 0 - dsprite 0, 0, 0, 0, $34, 0 - dsprite 0, 0, 1, 0, $35, 0 - dsprite 0, 0, 2, 0, $36, 0 - dsprite 1, 0, -3, 0, $41, 0 - dsprite 1, 0, -2, 0, $42, 0 - dsprite 1, 0, -1, 0, $43, 0 - dsprite 1, 0, 0, 0, $44, 0 - dsprite 1, 0, 1, 0, $45, 0 - dsprite 2, 0, -3, 0, $51, 0 - dsprite 2, 0, -2, 0, $52, 0 - dsprite 2, 0, 0, 0, $54, 0 - dsprite 2, 0, 1, 0, $55, 0 + dbsprite -3, -2, 0, 0, $11, 0 + dbsprite -2, -2, 0, 0, $12, 0 + dbsprite -1, -2, 0, 0, $13, 0 + dbsprite 0, -2, 0, 0, $14, 0 + dbsprite 1, -2, 0, 0, $15, 0 + dbsprite 2, -2, 0, 0, $16, 0 + dbsprite 3, -2, 0, 0, $17, 0 + dbsprite -4, -1, 0, 0, $20, 0 + dbsprite -3, -1, 0, 0, $21, 0 + dbsprite -2, -1, 0, 0, $22, 0 + dbsprite -1, -1, 0, 0, $23, 0 + dbsprite 0, -1, 0, 0, $24, 0 + dbsprite 1, -1, 0, 0, $25, 0 + dbsprite 2, -1, 0, 0, $26, 0 + dbsprite 3, -1, 0, 0, $27, 0 + dbsprite -4, 0, 0, 0, $30, 0 + dbsprite -3, 0, 0, 0, $31, 0 + dbsprite -2, 0, 0, 0, $32, 0 + dbsprite -1, 0, 0, 0, $33, 0 + dbsprite 0, 0, 0, 0, $34, 0 + dbsprite 1, 0, 0, 0, $35, 0 + dbsprite 2, 0, 0, 0, $36, 0 + dbsprite -3, 1, 0, 0, $41, 0 + dbsprite -2, 1, 0, 0, $42, 0 + dbsprite -1, 1, 0, 0, $43, 0 + dbsprite 0, 1, 0, 0, $44, 0 + dbsprite 1, 1, 0, 0, $45, 0 + dbsprite -3, 2, 0, 0, $51, 0 + dbsprite -2, 2, 0, 0, $52, 0 + dbsprite 0, 2, 0, 0, $54, 0 + dbsprite 1, 2, 0, 0, $55, 0 .OAMData_IntroPichu: db 25 - dsprite -3, 4, -3, 4, $00, 1 | VRAM_BANK_1 - dsprite -3, 4, -2, 4, $01, 1 | VRAM_BANK_1 - dsprite -3, 4, -1, 4, $02, 1 | VRAM_BANK_1 - dsprite -3, 4, 0, 4, $03, 1 | VRAM_BANK_1 - dsprite -3, 4, 1, 4, $04, 1 | VRAM_BANK_1 - dsprite -2, 4, -3, 4, $10, 1 | VRAM_BANK_1 - dsprite -2, 4, -2, 4, $11, 1 | VRAM_BANK_1 - dsprite -2, 4, -1, 4, $12, 1 | VRAM_BANK_1 - dsprite -2, 4, 0, 4, $13, 1 | VRAM_BANK_1 - dsprite -2, 4, 1, 4, $14, 1 | VRAM_BANK_1 - dsprite -1, 4, -3, 4, $20, 1 | VRAM_BANK_1 - dsprite -1, 4, -2, 4, $21, 1 | VRAM_BANK_1 - dsprite -1, 4, -1, 4, $22, 1 | VRAM_BANK_1 - dsprite -1, 4, 0, 4, $23, 1 | VRAM_BANK_1 - dsprite -1, 4, 1, 4, $24, 1 | VRAM_BANK_1 - dsprite 0, 4, -3, 4, $30, 1 | VRAM_BANK_1 - dsprite 0, 4, -2, 4, $31, 1 | VRAM_BANK_1 - dsprite 0, 4, -1, 4, $32, 1 | VRAM_BANK_1 - dsprite 0, 4, 0, 4, $33, 1 | VRAM_BANK_1 - dsprite 0, 4, 1, 4, $34, 1 | VRAM_BANK_1 - dsprite 1, 4, -3, 4, $40, 1 | VRAM_BANK_1 - dsprite 1, 4, -2, 4, $41, 1 | VRAM_BANK_1 - dsprite 1, 4, -1, 4, $42, 1 | VRAM_BANK_1 - dsprite 1, 4, 0, 4, $43, 1 | VRAM_BANK_1 - dsprite 1, 4, 1, 4, $44, 1 | VRAM_BANK_1 + dbsprite -3, -3, 4, 4, $00, 1 | VRAM_BANK_1 + dbsprite -2, -3, 4, 4, $01, 1 | VRAM_BANK_1 + dbsprite -1, -3, 4, 4, $02, 1 | VRAM_BANK_1 + dbsprite 0, -3, 4, 4, $03, 1 | VRAM_BANK_1 + dbsprite 1, -3, 4, 4, $04, 1 | VRAM_BANK_1 + dbsprite -3, -2, 4, 4, $10, 1 | VRAM_BANK_1 + dbsprite -2, -2, 4, 4, $11, 1 | VRAM_BANK_1 + dbsprite -1, -2, 4, 4, $12, 1 | VRAM_BANK_1 + dbsprite 0, -2, 4, 4, $13, 1 | VRAM_BANK_1 + dbsprite 1, -2, 4, 4, $14, 1 | VRAM_BANK_1 + dbsprite -3, -1, 4, 4, $20, 1 | VRAM_BANK_1 + dbsprite -2, -1, 4, 4, $21, 1 | VRAM_BANK_1 + dbsprite -1, -1, 4, 4, $22, 1 | VRAM_BANK_1 + dbsprite 0, -1, 4, 4, $23, 1 | VRAM_BANK_1 + dbsprite 1, -1, 4, 4, $24, 1 | VRAM_BANK_1 + dbsprite -3, 0, 4, 4, $30, 1 | VRAM_BANK_1 + dbsprite -2, 0, 4, 4, $31, 1 | VRAM_BANK_1 + dbsprite -1, 0, 4, 4, $32, 1 | VRAM_BANK_1 + dbsprite 0, 0, 4, 4, $33, 1 | VRAM_BANK_1 + dbsprite 1, 0, 4, 4, $34, 1 | VRAM_BANK_1 + dbsprite -3, 1, 4, 4, $40, 1 | VRAM_BANK_1 + dbsprite -2, 1, 4, 4, $41, 1 | VRAM_BANK_1 + dbsprite -1, 1, 4, 4, $42, 1 | VRAM_BANK_1 + dbsprite 0, 1, 4, 4, $43, 1 | VRAM_BANK_1 + dbsprite 1, 1, 4, 4, $44, 1 | VRAM_BANK_1 .OAMData_IntroWooper: db 16 - dsprite -2, 0, -3, 4, $00, 2 | VRAM_BANK_1 - dsprite -2, 0, -2, 4, $01, 2 | VRAM_BANK_1 - dsprite -2, 0, -1, 4, $02, 2 | VRAM_BANK_1 - dsprite -2, 0, 0, 4, $03, 2 | VRAM_BANK_1 - dsprite -1, 0, -3, 4, $04, 2 | VRAM_BANK_1 - dsprite -1, 0, -2, 4, $05, 2 | VRAM_BANK_1 - dsprite -1, 0, -1, 4, $06, 2 | VRAM_BANK_1 - dsprite -1, 0, 0, 4, $07, 2 | VRAM_BANK_1 - dsprite 0, 0, -3, 4, $08, 2 | VRAM_BANK_1 - dsprite 0, 0, -2, 4, $09, 2 | VRAM_BANK_1 - dsprite 0, 0, -1, 4, $0a, 2 | VRAM_BANK_1 - dsprite 0, 0, 0, 4, $0b, 2 | VRAM_BANK_1 - dsprite 1, 0, -3, 4, $0c, 2 | VRAM_BANK_1 - dsprite 1, 0, -2, 4, $0d, 2 | VRAM_BANK_1 - dsprite 1, 0, -1, 4, $0e, 2 | VRAM_BANK_1 - dsprite 1, 0, 0, 4, $0f, 2 | VRAM_BANK_1 + dbsprite -3, -2, 4, 0, $00, 2 | VRAM_BANK_1 + dbsprite -2, -2, 4, 0, $01, 2 | VRAM_BANK_1 + dbsprite -1, -2, 4, 0, $02, 2 | VRAM_BANK_1 + dbsprite 0, -2, 4, 0, $03, 2 | VRAM_BANK_1 + dbsprite -3, -1, 4, 0, $04, 2 | VRAM_BANK_1 + dbsprite -2, -1, 4, 0, $05, 2 | VRAM_BANK_1 + dbsprite -1, -1, 4, 0, $06, 2 | VRAM_BANK_1 + dbsprite 0, -1, 4, 0, $07, 2 | VRAM_BANK_1 + dbsprite -3, 0, 4, 0, $08, 2 | VRAM_BANK_1 + dbsprite -2, 0, 4, 0, $09, 2 | VRAM_BANK_1 + dbsprite -1, 0, 4, 0, $0a, 2 | VRAM_BANK_1 + dbsprite 0, 0, 4, 0, $0b, 2 | VRAM_BANK_1 + dbsprite -3, 1, 4, 0, $0c, 2 | VRAM_BANK_1 + dbsprite -2, 1, 4, 0, $0d, 2 | VRAM_BANK_1 + dbsprite -1, 1, 4, 0, $0e, 2 | VRAM_BANK_1 + dbsprite 0, 1, 4, 0, $0f, 2 | VRAM_BANK_1 .OAMData_IntroUnown1: db 1 - dsprite -1, 4, -1, 4, $00, 0 + dbsprite -1, -1, 4, 4, $00, 0 .OAMData_IntroUnown2: db 3 - dsprite 0, 0, -1, 0, $00, 0 - dsprite -1, 0, -1, 0, $01, 0 - dsprite -1, 0, 0, 0, $02, 0 + dbsprite -1, 0, 0, 0, $00, 0 + dbsprite -1, -1, 0, 0, $01, 0 + dbsprite 0, -1, 0, 0, $02, 0 .OAMData_IntroUnown3: db 7 - dsprite 1, 0, -2, 0, $00, 0 - dsprite 0, 0, -2, 0, $01, 0 - dsprite -1, 0, -2, 0, $02, 0 - dsprite -1, 0, -1, 0, $03, 0 - dsprite -2, 0, -1, 0, $04, 0 - dsprite -2, 0, 0, 0, $05, 0 - dsprite -2, 0, 1, 0, $06, 0 + dbsprite -2, 1, 0, 0, $00, 0 + dbsprite -2, 0, 0, 0, $01, 0 + dbsprite -2, -1, 0, 0, $02, 0 + dbsprite -1, -1, 0, 0, $03, 0 + dbsprite -1, -2, 0, 0, $04, 0 + dbsprite 0, -2, 0, 0, $05, 0 + dbsprite 1, -2, 0, 0, $06, 0 .OAMData_IntroUnownF2_2: db 8 - dsprite -1, 0, -2, 0, $00, 0 - dsprite -1, 0, -1, 0, $01, 0 - dsprite -1, 0, 0, 0, $01, 0 | X_FLIP - dsprite -1, 0, 1, 0, $00, 0 | X_FLIP - dsprite 0, 0, -2, 0, $00, 0 | Y_FLIP - dsprite 0, 0, -1, 0, $01, 0 | Y_FLIP - dsprite 0, 0, 0, 0, $01, 0 | X_FLIP | Y_FLIP - dsprite 0, 0, 1, 0, $00, 0 | X_FLIP | Y_FLIP + dbsprite -2, -1, 0, 0, $00, 0 + dbsprite -1, -1, 0, 0, $01, 0 + dbsprite 0, -1, 0, 0, $01, 0 | X_FLIP + dbsprite 1, -1, 0, 0, $00, 0 | X_FLIP + dbsprite -2, 0, 0, 0, $00, 0 | Y_FLIP + dbsprite -1, 0, 0, 0, $01, 0 | Y_FLIP + dbsprite 0, 0, 0, 0, $01, 0 | X_FLIP | Y_FLIP + dbsprite 1, 0, 0, 0, $00, 0 | X_FLIP | Y_FLIP .OAMData_IntroUnownF2_3: db 12 - dsprite -3, 0, -1, 0, $00, 0 - dsprite -2, 0, -1, 0, $01, 0 - dsprite -1, 0, -1, 0, $02, 0 - dsprite -3, 0, 0, 0, $00, 0 | X_FLIP - dsprite -2, 0, 0, 0, $01, 0 | X_FLIP - dsprite -1, 0, 0, 0, $02, 0 | X_FLIP - dsprite 0, 0, -1, 0, $02, 0 | Y_FLIP - dsprite 1, 0, -1, 0, $01, 0 | Y_FLIP - dsprite 2, 0, -1, 0, $00, 0 | Y_FLIP - dsprite 0, 0, 0, 0, $02, 0 | X_FLIP | Y_FLIP - dsprite 1, 0, 0, 0, $01, 0 | X_FLIP | Y_FLIP - dsprite 2, 0, 0, 0, $00, 0 | X_FLIP | Y_FLIP + dbsprite -1, -3, 0, 0, $00, 0 + dbsprite -1, -2, 0, 0, $01, 0 + dbsprite -1, -1, 0, 0, $02, 0 + dbsprite 0, -3, 0, 0, $00, 0 | X_FLIP + dbsprite 0, -2, 0, 0, $01, 0 | X_FLIP + dbsprite 0, -1, 0, 0, $02, 0 | X_FLIP + dbsprite -1, 0, 0, 0, $02, 0 | Y_FLIP + dbsprite -1, 1, 0, 0, $01, 0 | Y_FLIP + dbsprite -1, 2, 0, 0, $00, 0 | Y_FLIP + dbsprite 0, 0, 0, 0, $02, 0 | X_FLIP | Y_FLIP + dbsprite 0, 1, 0, 0, $01, 0 | X_FLIP | Y_FLIP + dbsprite 0, 2, 0, 0, $00, 0 | X_FLIP | Y_FLIP .OAMData_IntroUnownF2_4_5: db 20 - dsprite -3, 4, -2, 0, $00, 0 - dsprite -3, 4, -1, 0, $01, 0 - dsprite -3, 4, 0, 0, $02, 0 - dsprite -3, 4, 1, 0, $03, 0 - dsprite -2, 4, -2, 0, $04, 0 - dsprite -2, 4, -1, 0, $05, 0 - dsprite -2, 4, 0, 0, $06, 0 - dsprite -2, 4, 1, 0, $07, 0 - dsprite -1, 4, -2, 0, $08, 0 - dsprite -1, 4, -1, 0, $09, 0 - dsprite -1, 4, 0, 0, $0a, 0 - dsprite -1, 4, 1, 0, $0b, 0 - dsprite 0, 4, -2, 0, $0c, 0 - dsprite 0, 4, -1, 0, $0d, 0 - dsprite 0, 4, 0, 0, $0e, 0 - dsprite 0, 4, 1, 0, $0f, 0 - dsprite 1, 4, -2, 0, $10, 0 - dsprite 1, 4, -1, 0, $11, 0 - dsprite 1, 4, 0, 0, $12, 0 - dsprite 1, 4, 1, 0, $13, 0 + dbsprite -2, -3, 0, 4, $00, 0 + dbsprite -1, -3, 0, 4, $01, 0 + dbsprite 0, -3, 0, 4, $02, 0 + dbsprite 1, -3, 0, 4, $03, 0 + dbsprite -2, -2, 0, 4, $04, 0 + dbsprite -1, -2, 0, 4, $05, 0 + dbsprite 0, -2, 0, 4, $06, 0 + dbsprite 1, -2, 0, 4, $07, 0 + dbsprite -2, -1, 0, 4, $08, 0 + dbsprite -1, -1, 0, 4, $09, 0 + dbsprite 0, -1, 0, 4, $0a, 0 + dbsprite 1, -1, 0, 4, $0b, 0 + dbsprite -2, 0, 0, 4, $0c, 0 + dbsprite -1, 0, 0, 4, $0d, 0 + dbsprite 0, 0, 0, 4, $0e, 0 + dbsprite 1, 0, 0, 4, $0f, 0 + dbsprite -2, 1, 0, 4, $10, 0 + dbsprite -1, 1, 0, 4, $11, 0 + dbsprite 0, 1, 0, 4, $12, 0 + dbsprite 1, 1, 0, 4, $13, 0 .OAMData_IntroSuicuneAway: db 20 - dsprite 0, 0, 1, 0, $00, 1 | PRIORITY - dsprite 1, 0, 2, 0, $00, 1 | PRIORITY - dsprite 2, 0, 3, 0, $00, 1 | PRIORITY - dsprite 3, 0, 4, 0, $00, 1 | PRIORITY - dsprite 4, 0, 5, 0, $00, 1 | PRIORITY - dsprite 3, 0, 6, 0, $00, 1 | PRIORITY - dsprite 2, 0, 7, 0, $00, 1 | PRIORITY - dsprite 1, 0, 8, 0, $00, 1 | PRIORITY - dsprite 0, 0, 9, 0, $00, 1 | PRIORITY - dsprite 1, 0, 10, 0, $00, 1 | PRIORITY - dsprite 2, 0, 11, 0, $00, 1 | PRIORITY - dsprite 3, 0, 12, 0, $00, 1 | PRIORITY - dsprite 4, 0, 13, 0, $00, 1 | PRIORITY - dsprite 3, 0, 14, 0, $00, 1 | PRIORITY - dsprite 2, 0, 15, 0, $00, 1 | PRIORITY - dsprite 1, 0, 16, 0, $00, 1 | PRIORITY - dsprite 0, 0, -15, 0, $00, 1 | PRIORITY - dsprite 1, 0, -14, 0, $00, 1 | PRIORITY - dsprite 2, 0, -13, 0, $00, 1 | PRIORITY - dsprite 3, 0, -12, 0, $00, 1 | PRIORITY + dbsprite 1, 0, 0, 0, $00, 1 | PRIORITY + dbsprite 2, 1, 0, 0, $00, 1 | PRIORITY + dbsprite 3, 2, 0, 0, $00, 1 | PRIORITY + dbsprite 4, 3, 0, 0, $00, 1 | PRIORITY + dbsprite 5, 4, 0, 0, $00, 1 | PRIORITY + dbsprite 6, 3, 0, 0, $00, 1 | PRIORITY + dbsprite 7, 2, 0, 0, $00, 1 | PRIORITY + dbsprite 8, 1, 0, 0, $00, 1 | PRIORITY + dbsprite 9, 0, 0, 0, $00, 1 | PRIORITY + dbsprite 10, 1, 0, 0, $00, 1 | PRIORITY + dbsprite 11, 2, 0, 0, $00, 1 | PRIORITY + dbsprite 12, 3, 0, 0, $00, 1 | PRIORITY + dbsprite 13, 4, 0, 0, $00, 1 | PRIORITY + dbsprite 14, 3, 0, 0, $00, 1 | PRIORITY + dbsprite 15, 2, 0, 0, $00, 1 | PRIORITY + dbsprite 16, 1, 0, 0, $00, 1 | PRIORITY + dbsprite -15, 0, 0, 0, $00, 1 | PRIORITY + dbsprite -14, 1, 0, 0, $00, 1 | PRIORITY + dbsprite -13, 2, 0, 0, $00, 1 | PRIORITY + dbsprite -12, 3, 0, 0, $00, 1 | PRIORITY .OAMData_Celebi: db 4 - dsprite -1, 0, -1, 0, $00, PAL_OW_GREEN - dsprite -1, 0, 0, 0, $01, PAL_OW_GREEN - dsprite 0, 0, -1, 0, $02, PAL_OW_GREEN - dsprite 0, 0, 0, 0, $03, PAL_OW_GREEN + dbsprite -1, -1, 0, 0, $00, PAL_OW_GREEN + dbsprite 0, -1, 0, 0, $01, PAL_OW_GREEN + dbsprite -1, 0, 0, 0, $02, PAL_OW_GREEN + dbsprite 0, 0, 0, 0, $03, PAL_OW_GREEN .OAMData_GameFreakLogo1_3: db 9 - dsprite -2, 0, -2, 4, $00, 1 - dsprite -2, 0, -1, 4, $01, 1 - dsprite -2, 0, 0, 4, $02, 1 - dsprite -1, 0, -2, 4, $10, 1 - dsprite -1, 0, -1, 4, $11, 1 - dsprite -1, 0, 0, 4, $12, 1 - dsprite 0, 0, -2, 4, $20, 1 - dsprite 0, 0, -1, 4, $21, 1 - dsprite 0, 0, 0, 4, $22, 1 + dbsprite -2, -2, 4, 0, $00, 1 + dbsprite -1, -2, 4, 0, $01, 1 + dbsprite 0, -2, 4, 0, $02, 1 + dbsprite -2, -1, 4, 0, $10, 1 + dbsprite -1, -1, 4, 0, $11, 1 + dbsprite 0, -1, 4, 0, $12, 1 + dbsprite -2, 0, 4, 0, $20, 1 + dbsprite -1, 0, 4, 0, $21, 1 + dbsprite 0, 0, 4, 0, $22, 1 .OAMData_GameFreakLogo4_11: db 24 - dsprite -5, 0, -2, 4, $00, 1 - dsprite -5, 0, -1, 4, $01, 1 - dsprite -5, 0, 0, 4, $02, 1 - dsprite -5, 0, 1, 4, $03, 1 - dsprite -4, 0, -2, 4, $10, 1 - dsprite -4, 0, -1, 4, $11, 1 - dsprite -4, 0, 0, 4, $12, 1 - dsprite -4, 0, 1, 4, $13, 1 - dsprite -3, 0, -2, 4, $20, 1 - dsprite -3, 0, -1, 4, $21, 1 - dsprite -3, 0, 0, 4, $22, 1 - dsprite -3, 0, 1, 4, $23, 1 - dsprite -2, 0, -2, 4, $30, 1 - dsprite -2, 0, -1, 4, $31, 1 - dsprite -2, 0, 0, 4, $32, 1 - dsprite -2, 0, 1, 4, $33, 1 - dsprite -1, 0, -2, 4, $40, 1 - dsprite -1, 0, -1, 4, $41, 1 - dsprite -1, 0, 0, 4, $42, 1 - dsprite -1, 0, 1, 4, $43, 1 - dsprite 0, 0, -2, 4, $50, 1 - dsprite 0, 0, -1, 4, $51, 1 - dsprite 0, 0, 0, 4, $52, 1 - dsprite 0, 0, 1, 4, $53, 1 + dbsprite -2, -5, 4, 0, $00, 1 + dbsprite -1, -5, 4, 0, $01, 1 + dbsprite 0, -5, 4, 0, $02, 1 + dbsprite 1, -5, 4, 0, $03, 1 + dbsprite -2, -4, 4, 0, $10, 1 + dbsprite -1, -4, 4, 0, $11, 1 + dbsprite 0, -4, 4, 0, $12, 1 + dbsprite 1, -4, 4, 0, $13, 1 + dbsprite -2, -3, 4, 0, $20, 1 + dbsprite -1, -3, 4, 0, $21, 1 + dbsprite 0, -3, 4, 0, $22, 1 + dbsprite 1, -3, 4, 0, $23, 1 + dbsprite -2, -2, 4, 0, $30, 1 + dbsprite -1, -2, 4, 0, $31, 1 + dbsprite 0, -2, 4, 0, $32, 1 + dbsprite 1, -2, 4, 0, $33, 1 + dbsprite -2, -1, 4, 0, $40, 1 + dbsprite -1, -1, 4, 0, $41, 1 + dbsprite 0, -1, 4, 0, $42, 1 + dbsprite 1, -1, 4, 0, $43, 1 + dbsprite -2, 0, 4, 0, $50, 1 + dbsprite -1, 0, 4, 0, $51, 1 + dbsprite 0, 0, 4, 0, $52, 1 + dbsprite 1, 0, 4, 0, $53, 1 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: diff --git a/macros/gfx.asm b/macros/gfx.asm index e9851501a..2c67cfc8a 100644 --- a/macros/gfx.asm +++ b/macros/gfx.asm @@ -44,7 +44,7 @@ ENDM depixel EQUS "ldpixel de," bcpixel EQUS "ldpixel bc," -dsprite: MACRO -; y tile, y pixel, x tile, x pixel, vtile offset, attributes - db (\1 * TILE_WIDTH) % $100 + \2, (\3 * TILE_WIDTH) % $100 + \4, \5, \6 +dbsprite: MACRO +; x tile, y tile, x pixel, y pixel, vtile offset, attributes + db (\2 * TILE_WIDTH) % $100 + \4, (\1 * TILE_WIDTH) % $100 + \3, \5, \6 ENDM diff --git a/macros/legacy.asm b/macros/legacy.asm index 6234b8343..8c6f2a9dd 100644 --- a/macros/legacy.asm +++ b/macros/legacy.asm @@ -6,6 +6,11 @@ callba EQUS "farcall" callab EQUS "callfar" +; macros/gfx.asm +dsprite: MACRO + dbsprite \2, \4, \1, \3, \5, \6 +ENDM + ; macros/scripts/audio.asm __ EQU 0 CC EQU 13 diff --git a/mobile/mobile_45_sprite_engine.asm b/mobile/mobile_45_sprite_engine.asm index 1d7cad672..b666683e2 100644 --- a/mobile/mobile_45_sprite_engine.asm +++ b/mobile/mobile_45_sprite_engine.asm @@ -172,140 +172,140 @@ Unknown_115e86: Unknown_115ea6: db 4 - dsprite 1, 0, 0, 0, $60, $01 - dsprite 1, 0, 1, 0, $61, $01 - dsprite 2, 0, 0, 0, $62, $01 - dsprite 2, 0, 1, 0, $63, $01 + dbsprite 0, 1, 0, 0, $60, $01 + dbsprite 1, 1, 0, 0, $61, $01 + dbsprite 0, 2, 0, 0, $62, $01 + dbsprite 1, 2, 0, 0, $63, $01 Unknown_115eb7: db 5 - dsprite 0, 0, 1, 0, $64, $00 - dsprite 1, 0, 0, 0, $60, $01 - dsprite 1, 0, 1, 0, $61, $01 - dsprite 2, 0, 0, 0, $62, $01 - dsprite 2, 0, 1, 0, $63, $01 + dbsprite 1, 0, 0, 0, $64, $00 + dbsprite 0, 1, 0, 0, $60, $01 + dbsprite 1, 1, 0, 0, $61, $01 + dbsprite 0, 2, 0, 0, $62, $01 + dbsprite 1, 2, 0, 0, $63, $01 Unknown_115ecc: db 5 - dsprite 0, 0, 1, 0, $65, $00 - dsprite 1, 0, 0, 0, $60, $01 - dsprite 1, 0, 1, 0, $61, $01 - dsprite 2, 0, 0, 0, $62, $01 - dsprite 2, 0, 1, 0, $63, $01 + dbsprite 1, 0, 0, 0, $65, $00 + dbsprite 0, 1, 0, 0, $60, $01 + dbsprite 1, 1, 0, 0, $61, $01 + dbsprite 0, 2, 0, 0, $62, $01 + dbsprite 1, 2, 0, 0, $63, $01 Unknown_115ee1: db 5 - dsprite 0, 0, 1, 0, $66, $00 - dsprite 1, 0, 0, 0, $60, $01 - dsprite 1, 0, 1, 0, $61, $01 - dsprite 2, 0, 0, 0, $62, $01 - dsprite 2, 0, 1, 0, $63, $01 + dbsprite 1, 0, 0, 0, $66, $00 + dbsprite 0, 1, 0, 0, $60, $01 + dbsprite 1, 1, 0, 0, $61, $01 + dbsprite 0, 2, 0, 0, $62, $01 + dbsprite 1, 2, 0, 0, $63, $01 Unknown_115ef6: db 7 - dsprite 0, 0, 0, 0, $67, $01 - dsprite 1, 0, 0, 0, $68, $01 - dsprite 2, 0, 0, 0, $6d, $00 - dsprite 2, 0, 1, 0, $69, $00 - dsprite 2, 0, 2, 0, $6a, $00 - dsprite 3, 0, 1, 0, $6b, $00 - dsprite 3, 0, 2, 0, $6c, $00 + dbsprite 0, 0, 0, 0, $67, $01 + dbsprite 0, 1, 0, 0, $68, $01 + dbsprite 0, 2, 0, 0, $6d, $00 + dbsprite 1, 2, 0, 0, $69, $00 + dbsprite 2, 2, 0, 0, $6a, $00 + dbsprite 1, 3, 0, 0, $6b, $00 + dbsprite 2, 3, 0, 0, $6c, $00 Unknown_115f13: db 7 - dsprite 0, 0, 0, 0, $67, $01 - dsprite 1, 0, 0, 0, $68, $01 - dsprite 2, 0, 0, 0, $6e, $00 - dsprite 2, 0, 1, 0, $69, $00 - dsprite 2, 0, 2, 0, $6a, $00 - dsprite 3, 0, 1, 0, $6b, $00 - dsprite 3, 0, 2, 0, $6c, $00 + dbsprite 0, 0, 0, 0, $67, $01 + dbsprite 0, 1, 0, 0, $68, $01 + dbsprite 0, 2, 0, 0, $6e, $00 + dbsprite 1, 2, 0, 0, $69, $00 + dbsprite 2, 2, 0, 0, $6a, $00 + dbsprite 1, 3, 0, 0, $6b, $00 + dbsprite 2, 3, 0, 0, $6c, $00 Unknown_115f30: db 7 - dsprite 0, 0, 0, 0, $67, $01 - dsprite 1, 0, 0, 0, $68, $01 - dsprite 2, 0, 0, 0, $6f, $00 - dsprite 2, 0, 1, 0, $69, $00 - dsprite 2, 0, 2, 0, $6a, $00 - dsprite 3, 0, 1, 0, $6b, $00 - dsprite 3, 0, 2, 0, $6c, $00 + dbsprite 0, 0, 0, 0, $67, $01 + dbsprite 0, 1, 0, 0, $68, $01 + dbsprite 0, 2, 0, 0, $6f, $00 + dbsprite 1, 2, 0, 0, $69, $00 + dbsprite 2, 2, 0, 0, $6a, $00 + dbsprite 1, 3, 0, 0, $6b, $00 + dbsprite 2, 3, 0, 0, $6c, $00 Unknown_115f4d: db 7 - dsprite 0, 0, 0, 0, $67, $01 - dsprite 1, 0, 0, 0, $68, $01 - dsprite 2, 0, 0, 0, $70, $00 - dsprite 2, 0, 1, 0, $69, $00 - dsprite 2, 0, 2, 0, $6a, $00 - dsprite 3, 0, 1, 0, $6b, $00 - dsprite 3, 0, 2, 0, $6c, $00 + dbsprite 0, 0, 0, 0, $67, $01 + dbsprite 0, 1, 0, 0, $68, $01 + dbsprite 0, 2, 0, 0, $70, $00 + dbsprite 1, 2, 0, 0, $69, $00 + dbsprite 2, 2, 0, 0, $6a, $00 + dbsprite 1, 3, 0, 0, $6b, $00 + dbsprite 2, 3, 0, 0, $6c, $00 Unknown_115f6a: db 7 - dsprite 0, 0, 0, 0, $67, $01 - dsprite 1, 0, 0, 0, $68, $01 - dsprite 2, 0, 0, 0, $71, $00 - dsprite 2, 0, 1, 0, $69, $00 - dsprite 2, 0, 2, 0, $6a, $00 - dsprite 3, 0, 1, 0, $6b, $00 - dsprite 3, 0, 2, 0, $6c, $00 + dbsprite 0, 0, 0, 0, $67, $01 + dbsprite 0, 1, 0, 0, $68, $01 + dbsprite 0, 2, 0, 0, $71, $00 + dbsprite 1, 2, 0, 0, $69, $00 + dbsprite 2, 2, 0, 0, $6a, $00 + dbsprite 1, 3, 0, 0, $6b, $00 + dbsprite 2, 3, 0, 0, $6c, $00 Unknown_115f87: db 5 - dsprite 0, 0, 1, 0, $72, $00 - dsprite 1, 0, 0, 0, $60, $01 - dsprite 1, 0, 1, 0, $61, $01 - dsprite 2, 0, 0, 0, $62, $01 - dsprite 2, 0, 1, 0, $63, $01 + dbsprite 1, 0, 0, 0, $72, $00 + dbsprite 0, 1, 0, 0, $60, $01 + dbsprite 1, 1, 0, 0, $61, $01 + dbsprite 0, 2, 0, 0, $62, $01 + dbsprite 1, 2, 0, 0, $63, $01 Unknown_115f9c: db 5 - dsprite 0, 0, 1, 0, $73, $00 - dsprite 1, 0, 0, 0, $60, $01 - dsprite 1, 0, 1, 0, $61, $01 - dsprite 2, 0, 0, 0, $62, $01 - dsprite 2, 0, 1, 0, $63, $01 + dbsprite 1, 0, 0, 0, $73, $00 + dbsprite 0, 1, 0, 0, $60, $01 + dbsprite 1, 1, 0, 0, $61, $01 + dbsprite 0, 2, 0, 0, $62, $01 + dbsprite 1, 2, 0, 0, $63, $01 Unknown_115fb1: db 5 - dsprite 0, 1, 1, 0, $64, $60 - dsprite 1, 0, 0, 0, $60, $01 - dsprite 1, 0, 1, 0, $61, $01 - dsprite 2, 0, 0, 0, $62, $01 - dsprite 2, 0, 1, 0, $63, $01 + dbsprite 1, 0, 0, 1, $64, $60 + dbsprite 0, 1, 0, 0, $60, $01 + dbsprite 1, 1, 0, 0, $61, $01 + dbsprite 0, 2, 0, 0, $62, $01 + dbsprite 1, 2, 0, 0, $63, $01 Unknown_115fc6: db 5 - dsprite 0, 1, 1, 0, $65, $60 - dsprite 1, 0, 0, 0, $60, $01 - dsprite 1, 0, 1, 0, $61, $01 - dsprite 2, 0, 0, 0, $62, $01 - dsprite 2, 0, 1, 0, $63, $01 + dbsprite 1, 0, 0, 1, $65, $60 + dbsprite 0, 1, 0, 0, $60, $01 + dbsprite 1, 1, 0, 0, $61, $01 + dbsprite 0, 2, 0, 0, $62, $01 + dbsprite 1, 2, 0, 0, $63, $01 Unknown_115fdb: db 5 - dsprite 0, 1, 1, 0, $66, $60 - dsprite 1, 0, 0, 0, $60, $01 - dsprite 1, 0, 1, 0, $61, $01 - dsprite 2, 0, 0, 0, $62, $01 - dsprite 2, 0, 1, 0, $63, $01 + dbsprite 1, 0, 0, 1, $66, $60 + dbsprite 0, 1, 0, 0, $60, $01 + dbsprite 1, 1, 0, 0, $61, $01 + dbsprite 0, 2, 0, 0, $62, $01 + dbsprite 1, 2, 0, 0, $63, $01 Unknown_115ff0: db 5 - dsprite 0, 1, 1, 0, $72, $60 - dsprite 1, 0, 0, 0, $60, $01 - dsprite 1, 0, 1, 0, $61, $01 - dsprite 2, 0, 0, 0, $62, $01 - dsprite 2, 0, 1, 0, $63, $01 + dbsprite 1, 0, 0, 1, $72, $60 + dbsprite 0, 1, 0, 0, $60, $01 + dbsprite 1, 1, 0, 0, $61, $01 + dbsprite 0, 2, 0, 0, $62, $01 + dbsprite 1, 2, 0, 0, $63, $01 Unknown_116005: db 5 - dsprite 0, 1, 1, 0, $73, $60 - dsprite 1, 0, 0, 0, $60, $01 - dsprite 1, 0, 1, 0, $61, $01 - dsprite 2, 0, 0, 0, $62, $01 - dsprite 2, 0, 1, 0, $63, $01 + dbsprite 1, 0, 0, 1, $73, $60 + dbsprite 0, 1, 0, 0, $60, $01 + dbsprite 1, 1, 0, 0, $61, $01 + dbsprite 0, 2, 0, 0, $62, $01 + dbsprite 1, 2, 0, 0, $63, $01 MobileDialingGFX:: INCBIN "gfx/mobile/dialing.2bpp"