diff options
-rwxr-xr-x | data/battle_anims/framesets.asm | 974 | ||||
-rwxr-xr-x | data/battle_anims/oam.asm | 1396 | ||||
-rwxr-xr-x | engine/battle_anims/engine.asm | 8 | ||||
-rwxr-xr-x | engine/battle_anims/helpers.asm | 8 | ||||
-rwxr-xr-x | engine/sprites.asm | 4 | ||||
-rw-r--r-- | wram.asm | 9 |
6 files changed, 1197 insertions, 1202 deletions
diff --git a/data/battle_anims/framesets.asm b/data/battle_anims/framesets.asm index 671d12f95..905597cfa 100755 --- a/data/battle_anims/framesets.asm +++ b/data/battle_anims/framesets.asm @@ -187,1084 +187,1084 @@ BattleAnimFrameData: ; ce85e dw .Frameset_b8 ; BATTLEANIMFRAMESET_B8 .Frameset_00: - frame BATTLEANIMOAMSET_00, $06 + frame BATTLEANIMOAMSET_00, 6 delanim .Frameset_01: - frame BATTLEANIMOAMSET_01, $06 + frame BATTLEANIMOAMSET_01, 6 delanim .Frameset_02: - frame BATTLEANIMOAMSET_02, $06 + frame BATTLEANIMOAMSET_02, 6 delanim .Frameset_03: - frame BATTLEANIMOAMSET_03, $06 + frame BATTLEANIMOAMSET_03, 6 delanim .Frameset_04: - frame BATTLEANIMOAMSET_04, $06 + frame BATTLEANIMOAMSET_04, 6 delanim .Frameset_05: - frame BATTLEANIMOAMSET_05, $06 + frame BATTLEANIMOAMSET_05, 6 delanim .Frameset_06: - frame BATTLEANIMOAMSET_06, $06 + frame BATTLEANIMOAMSET_06, 6 delanim .Frameset_07: - frame BATTLEANIMOAMSET_03, $04 - frame BATTLEANIMOAMSET_01, $01 - frame BATTLEANIMOAMSET_03, $04 - frame BATTLEANIMOAMSET_01, $01 - frame BATTLEANIMOAMSET_03, $04 - frame BATTLEANIMOAMSET_01, $01 - frame BATTLEANIMOAMSET_03, $04 - frame BATTLEANIMOAMSET_01, $01 + frame BATTLEANIMOAMSET_03, 4 + frame BATTLEANIMOAMSET_01, 1 + frame BATTLEANIMOAMSET_03, 4 + frame BATTLEANIMOAMSET_01, 1 + frame BATTLEANIMOAMSET_03, 4 + frame BATTLEANIMOAMSET_01, 1 + frame BATTLEANIMOAMSET_03, 4 + frame BATTLEANIMOAMSET_01, 1 delanim .Frameset_3e: - frame BATTLEANIMOAMSET_4B, $02 - frame BATTLEANIMOAMSET_4C, $02 - frame BATTLEANIMOAMSET_4D, $04 - frame BATTLEANIMOAMSET_4E, $02 + frame BATTLEANIMOAMSET_4B, 2 + frame BATTLEANIMOAMSET_4C, 2 + frame BATTLEANIMOAMSET_4D, 4 + frame BATTLEANIMOAMSET_4E, 2 dorepeat 2 - frame BATTLEANIMOAMSET_4E, $02 + frame BATTLEANIMOAMSET_4E, 2 dorepeat 2 - frame BATTLEANIMOAMSET_4E, $02 + frame BATTLEANIMOAMSET_4E, 2 dorepeat 2 - frame BATTLEANIMOAMSET_4E, $02 + frame BATTLEANIMOAMSET_4E, 2 delanim .Frameset_3f: - frame BATTLEANIMOAMSET_4B, $42 - frame BATTLEANIMOAMSET_4C, $42 - frame BATTLEANIMOAMSET_4D, $44 - frame BATTLEANIMOAMSET_4E, $42 + frame BATTLEANIMOAMSET_4B, 2, OAM_X_FLIP + frame BATTLEANIMOAMSET_4C, 2, OAM_X_FLIP + frame BATTLEANIMOAMSET_4D, 4, OAM_X_FLIP + frame BATTLEANIMOAMSET_4E, 2, OAM_X_FLIP dorepeat 2 - frame BATTLEANIMOAMSET_4E, $42 + frame BATTLEANIMOAMSET_4E, 2, OAM_X_FLIP dorepeat 2 - frame BATTLEANIMOAMSET_4E, $42 + frame BATTLEANIMOAMSET_4E, 2, OAM_X_FLIP dorepeat 2 - frame BATTLEANIMOAMSET_4E, $42 + frame BATTLEANIMOAMSET_4E, 2, OAM_X_FLIP delanim .Frameset_40: - frame BATTLEANIMOAMSET_4B, $c2 - frame BATTLEANIMOAMSET_4C, $c2 - frame BATTLEANIMOAMSET_4D, $c4 - frame BATTLEANIMOAMSET_4E, $c2 + frame BATTLEANIMOAMSET_4B, 2, OAM_X_FLIP, OAM_Y_FLIP + frame BATTLEANIMOAMSET_4C, 2, OAM_X_FLIP, OAM_Y_FLIP + frame BATTLEANIMOAMSET_4D, 4, OAM_X_FLIP, OAM_Y_FLIP + frame BATTLEANIMOAMSET_4E, 2, OAM_X_FLIP, OAM_Y_FLIP dorepeat 2 - frame BATTLEANIMOAMSET_4E, $c2 + frame BATTLEANIMOAMSET_4E, 2, OAM_X_FLIP, OAM_Y_FLIP dorepeat 2 - frame BATTLEANIMOAMSET_4E, $c2 + frame BATTLEANIMOAMSET_4E, 2, OAM_X_FLIP, OAM_Y_FLIP dorepeat 2 - frame BATTLEANIMOAMSET_4E, $c2 + frame BATTLEANIMOAMSET_4E, 2, OAM_X_FLIP, OAM_Y_FLIP delanim .Frameset_41: - frame BATTLEANIMOAMSET_4B, $01 - frame BATTLEANIMOAMSET_4C, $01 - frame BATTLEANIMOAMSET_4D, $01 - frame BATTLEANIMOAMSET_4F, $01 - frame BATTLEANIMOAMSET_50, $01 - frame BATTLEANIMOAMSET_51, $01 - frame BATTLEANIMOAMSET_52, $02 + frame BATTLEANIMOAMSET_4B, 1 + frame BATTLEANIMOAMSET_4C, 1 + frame BATTLEANIMOAMSET_4D, 1 + frame BATTLEANIMOAMSET_4F, 1 + frame BATTLEANIMOAMSET_50, 1 + frame BATTLEANIMOAMSET_51, 1 + frame BATTLEANIMOAMSET_52, 2 dorepeat 2 - frame BATTLEANIMOAMSET_52, $02 + frame BATTLEANIMOAMSET_52, 2 dorepeat 2 - frame BATTLEANIMOAMSET_52, $02 + frame BATTLEANIMOAMSET_52, 2 dorepeat 2 - frame BATTLEANIMOAMSET_52, $02 + frame BATTLEANIMOAMSET_52, 2 delanim .Frameset_42: - frame BATTLEANIMOAMSET_4B, $41 - frame BATTLEANIMOAMSET_4C, $41 - frame BATTLEANIMOAMSET_4D, $41 - frame BATTLEANIMOAMSET_4F, $41 - frame BATTLEANIMOAMSET_50, $41 - frame BATTLEANIMOAMSET_51, $41 - frame BATTLEANIMOAMSET_52, $42 + frame BATTLEANIMOAMSET_4B, 1, OAM_X_FLIP + frame BATTLEANIMOAMSET_4C, 1, OAM_X_FLIP + frame BATTLEANIMOAMSET_4D, 1, OAM_X_FLIP + frame BATTLEANIMOAMSET_4F, 1, OAM_X_FLIP + frame BATTLEANIMOAMSET_50, 1, OAM_X_FLIP + frame BATTLEANIMOAMSET_51, 1, OAM_X_FLIP + frame BATTLEANIMOAMSET_52, 2, OAM_X_FLIP dorepeat 2 - frame BATTLEANIMOAMSET_52, $42 + frame BATTLEANIMOAMSET_52, 2, OAM_X_FLIP dorepeat 2 - frame BATTLEANIMOAMSET_52, $42 + frame BATTLEANIMOAMSET_52, 2, OAM_X_FLIP dorepeat 2 - frame BATTLEANIMOAMSET_52, $42 + frame BATTLEANIMOAMSET_52, 2, OAM_X_FLIP delanim .Frameset_08: - frame BATTLEANIMOAMSET_00, $03 - frame BATTLEANIMOAMSET_07, $03 - frame BATTLEANIMOAMSET_08, $03 - frame BATTLEANIMOAMSET_09, $03 + frame BATTLEANIMOAMSET_00, 3 + frame BATTLEANIMOAMSET_07, 3 + frame BATTLEANIMOAMSET_08, 3 + frame BATTLEANIMOAMSET_09, 3 delanim .Frameset_09: - frame BATTLEANIMOAMSET_0A, $07 - frame BATTLEANIMOAMSET_0B, $07 - frame BATTLEANIMOAMSET_0A, $07 - frame BATTLEANIMOAMSET_0B, $47 + frame BATTLEANIMOAMSET_0A, 7 + frame BATTLEANIMOAMSET_0B, 7 + frame BATTLEANIMOAMSET_0A, 7 + frame BATTLEANIMOAMSET_0B, 7, OAM_X_FLIP dorestart .Frameset_0a: - frame BATTLEANIMOAMSET_0C, $08 + frame BATTLEANIMOAMSET_0C, 8 endanim .Frameset_0b: - frame BATTLEANIMOAMSET_0D, $08 + frame BATTLEANIMOAMSET_0D, 8 endanim .Frameset_0c: - frame BATTLEANIMOAMSET_0A, $08 + frame BATTLEANIMOAMSET_0A, 8 endanim .Frameset_0d: - frame BATTLEANIMOAMSET_0A, $07 - frame BATTLEANIMOAMSET_0B, $07 - frame BATTLEANIMOAMSET_0A, $07 - frame BATTLEANIMOAMSET_0B, $47 - frame BATTLEANIMOAMSET_0A, $07 + frame BATTLEANIMOAMSET_0A, 7 + frame BATTLEANIMOAMSET_0B, 7 + frame BATTLEANIMOAMSET_0A, 7 + frame BATTLEANIMOAMSET_0B, 7, OAM_X_FLIP + frame BATTLEANIMOAMSET_0A, 7 endanim .Frameset_0e: - frame BATTLEANIMOAMSET_0A, $08 + frame BATTLEANIMOAMSET_0A, 8 endanim .Frameset_0f: - frame BATTLEANIMOAMSET_0A, $04 - frame BATTLEANIMOAMSET_0E, $04 + frame BATTLEANIMOAMSET_0A, 4 + frame BATTLEANIMOAMSET_0E, 4 dorestart .Frameset_10: - frame BATTLEANIMOAMSET_0F, $04 - frame BATTLEANIMOAMSET_10, $04 + frame BATTLEANIMOAMSET_0F, 4 + frame BATTLEANIMOAMSET_10, 4 dorestart .Frameset_11: - frame BATTLEANIMOAMSET_10, $04 - frame BATTLEANIMOAMSET_0F, $04 - frame BATTLEANIMOAMSET_0E, $04 - frame BATTLEANIMOAMSET_0A, $04 - frame BATTLEANIMOAMSET_0E, $04 - frame BATTLEANIMOAMSET_0A, $04 - frame BATTLEANIMOAMSET_0E, $04 - frame BATTLEANIMOAMSET_0A, $04 + frame BATTLEANIMOAMSET_10, 4 + frame BATTLEANIMOAMSET_0F, 4 + frame BATTLEANIMOAMSET_0E, 4 + frame BATTLEANIMOAMSET_0A, 4 + frame BATTLEANIMOAMSET_0E, 4 + frame BATTLEANIMOAMSET_0A, 4 + frame BATTLEANIMOAMSET_0E, 4 + frame BATTLEANIMOAMSET_0A, 4 delanim .Frameset_12: - frame BATTLEANIMOAMSET_10, $01 - frame BATTLEANIMOAMSET_0F, $01 - frame BATTLEANIMOAMSET_12, $01 - frame BATTLEANIMOAMSET_11, $01 - frame BATTLEANIMOAMSET_12, $01 - frame BATTLEANIMOAMSET_0F, $01 + frame BATTLEANIMOAMSET_10, 1 + frame BATTLEANIMOAMSET_0F, 1 + frame BATTLEANIMOAMSET_12, 1 + frame BATTLEANIMOAMSET_11, 1 + frame BATTLEANIMOAMSET_12, 1 + frame BATTLEANIMOAMSET_0F, 1 dorestart .Frameset_13: - frame BATTLEANIMOAMSET_10, $03 - frame BATTLEANIMOAMSET_0F, $03 - frame BATTLEANIMOAMSET_12, $01 + frame BATTLEANIMOAMSET_10, 3 + frame BATTLEANIMOAMSET_0F, 3 + frame BATTLEANIMOAMSET_12, 1 dorepeat 1 - frame BATTLEANIMOAMSET_12, $01 + frame BATTLEANIMOAMSET_12, 1 dorepeat 1 - frame BATTLEANIMOAMSET_12, $01 + frame BATTLEANIMOAMSET_12, 1 dorepeat 1 - frame BATTLEANIMOAMSET_12, $01 + frame BATTLEANIMOAMSET_12, 1 dorepeat 1 - frame BATTLEANIMOAMSET_12, $03 + frame BATTLEANIMOAMSET_12, 3 delanim .Frameset_14: - frame BATTLEANIMOAMSET_13, $14 + frame BATTLEANIMOAMSET_13, 20 delanim .Frameset_15: - frame BATTLEANIMOAMSET_10, $01 - frame BATTLEANIMOAMSET_0F, $01 + frame BATTLEANIMOAMSET_10, 1 + frame BATTLEANIMOAMSET_0F, 1 dorestart .Frameset_16: - frame BATTLEANIMOAMSET_14, $08 + frame BATTLEANIMOAMSET_14, 8 endanim .Frameset_17: - frame BATTLEANIMOAMSET_17, $04 - frame BATTLEANIMOAMSET_16, $08 - frame BATTLEANIMOAMSET_15, $08 - frame BATTLEANIMOAMSET_16, $08 - frame BATTLEANIMOAMSET_17, $04 - frame BATTLEANIMOAMSET_17, $04 - frame BATTLEANIMOAMSET_16, $48 - frame BATTLEANIMOAMSET_15, $48 - frame BATTLEANIMOAMSET_16, $48 - frame BATTLEANIMOAMSET_17, $04 + frame BATTLEANIMOAMSET_17, 4 + frame BATTLEANIMOAMSET_16, 8 + frame BATTLEANIMOAMSET_15, 8 + frame BATTLEANIMOAMSET_16, 8 + frame BATTLEANIMOAMSET_17, 4 + frame BATTLEANIMOAMSET_17, 4 + frame BATTLEANIMOAMSET_16, 8, OAM_X_FLIP + frame BATTLEANIMOAMSET_15, 8, OAM_X_FLIP + frame BATTLEANIMOAMSET_16, 8, OAM_X_FLIP + frame BATTLEANIMOAMSET_17, 4 dorestart .Frameset_56: - frame BATTLEANIMOAMSET_69, $08 + frame BATTLEANIMOAMSET_69, 8 endanim .Frameset_57: - frame BATTLEANIMOAMSET_69, $20 - frame BATTLEANIMOAMSET_6A, $04 - frame BATTLEANIMOAMSET_6B, $04 - frame BATTLEANIMOAMSET_6D, $04 - frame BATTLEANIMOAMSET_6C, $04 + frame BATTLEANIMOAMSET_69, 32 + frame BATTLEANIMOAMSET_6A, 4 + frame BATTLEANIMOAMSET_6B, 4 + frame BATTLEANIMOAMSET_6D, 4 + frame BATTLEANIMOAMSET_6C, 4 endanim .Frameset_58: - frame BATTLEANIMOAMSET_6C, $08 - frame BATTLEANIMOAMSET_6D, $08 + frame BATTLEANIMOAMSET_6C, 8 + frame BATTLEANIMOAMSET_6D, 8 dorestart .Frameset_18: - frame BATTLEANIMOAMSET_18, $04 - frame BATTLEANIMOAMSET_19, $04 - frame BATTLEANIMOAMSET_1A, $04 + frame BATTLEANIMOAMSET_18, 4 + frame BATTLEANIMOAMSET_19, 4 + frame BATTLEANIMOAMSET_1A, 4 delanim .Frameset_19: - frame BATTLEANIMOAMSET_1B, $08 + frame BATTLEANIMOAMSET_1B, 8 endanim .Frameset_1a: - frame BATTLEANIMOAMSET_0F, $08 + frame BATTLEANIMOAMSET_0F, 8 endanim .Frameset_1b: - frame BATTLEANIMOAMSET_1C, $08 + frame BATTLEANIMOAMSET_1C, 8 endanim .Frameset_1c: - frame BATTLEANIMOAMSET_0A, $08 + frame BATTLEANIMOAMSET_0A, 8 delanim .Frameset_1d: - frame BATTLEANIMOAMSET_1D, $08 + frame BATTLEANIMOAMSET_1D, 8 endanim .Frameset_1e: - frame BATTLEANIMOAMSET_17, $08 + frame BATTLEANIMOAMSET_17, 8 endanim .Frameset_1f: - frame BATTLEANIMOAMSET_0F, $03 - frame BATTLEANIMOAMSET_10, $03 - frame BATTLEANIMOAMSET_1E, $03 + frame BATTLEANIMOAMSET_0F, 3 + frame BATTLEANIMOAMSET_10, 3 + frame BATTLEANIMOAMSET_1E, 3 endanim .Frameset_20: - frame BATTLEANIMOAMSET_1F, $10 - frame BATTLEANIMOAMSET_20, $03 + frame BATTLEANIMOAMSET_1F, 16 + frame BATTLEANIMOAMSET_20, 3 delanim .Frameset_21: - frame BATTLEANIMOAMSET_20, $08 + frame BATTLEANIMOAMSET_20, 8 endanim .Frameset_22: - frame BATTLEANIMOAMSET_20, $08 - frame BATTLEANIMOAMSET_21, $08 - frame BATTLEANIMOAMSET_1B, $08 - frame BATTLEANIMOAMSET_21, $08 + frame BATTLEANIMOAMSET_20, 8 + frame BATTLEANIMOAMSET_21, 8 + frame BATTLEANIMOAMSET_1B, 8 + frame BATTLEANIMOAMSET_21, 8 dorestart .Frameset_23: - frame BATTLEANIMOAMSET_22, $08 + frame BATTLEANIMOAMSET_22, 8 endanim .Frameset_24: - frame BATTLEANIMOAMSET_1B, $08 + frame BATTLEANIMOAMSET_1B, 8 endanim .Frameset_25: - frame BATTLEANIMOAMSET_23, $08 + frame BATTLEANIMOAMSET_23, 8 endanim .Frameset_26: - frame BATTLEANIMOAMSET_24, $08 + frame BATTLEANIMOAMSET_24, 8 endanim .Frameset_27: - frame BATTLEANIMOAMSET_25, $08 + frame BATTLEANIMOAMSET_25, 8 endanim .Frameset_28: - frame BATTLEANIMOAMSET_26, $08 - frame BATTLEANIMOAMSET_27, $08 + frame BATTLEANIMOAMSET_26, 8 + frame BATTLEANIMOAMSET_27, 8 endanim .Frameset_29: - frame BATTLEANIMOAMSET_28, $08 - frame BATTLEANIMOAMSET_29, $08 + frame BATTLEANIMOAMSET_28, 8 + frame BATTLEANIMOAMSET_29, 8 delanim .Frameset_2a: - frame BATTLEANIMOAMSET_2A, $01 - frame BATTLEANIMOAMSET_2B, $01 - frame BATTLEANIMOAMSET_2C, $01 - frame BATTLEANIMOAMSET_2D, $01 - frame BATTLEANIMOAMSET_2E, $01 - frame BATTLEANIMOAMSET_2D, $01 - frame BATTLEANIMOAMSET_2C, $01 - frame BATTLEANIMOAMSET_2B, $01 - frame BATTLEANIMOAMSET_2A, $01 + frame BATTLEANIMOAMSET_2A, 1 + frame BATTLEANIMOAMSET_2B, 1 + frame BATTLEANIMOAMSET_2C, 1 + frame BATTLEANIMOAMSET_2D, 1 + frame BATTLEANIMOAMSET_2E, 1 + frame BATTLEANIMOAMSET_2D, 1 + frame BATTLEANIMOAMSET_2C, 1 + frame BATTLEANIMOAMSET_2B, 1 + frame BATTLEANIMOAMSET_2A, 1 delanim .Frameset_2b: - frame BATTLEANIMOAMSET_14, $01 - frame BATTLEANIMOAMSET_15, $01 + frame BATTLEANIMOAMSET_14, 1 + frame BATTLEANIMOAMSET_15, 1 dorestart .Frameset_2c: - frame BATTLEANIMOAMSET_2F, $04 - frame BATTLEANIMOAMSET_30, $28 + frame BATTLEANIMOAMSET_2F, 4 + frame BATTLEANIMOAMSET_30, 40 delanim .Frameset_2d: - frame BATTLEANIMOAMSET_31, $08 + frame BATTLEANIMOAMSET_31, 8 endanim .Frameset_2e: - frame BATTLEANIMOAMSET_32, $20 - frame BATTLEANIMOAMSET_33, $20 - frame BATTLEANIMOAMSET_34, $20 - frame BATTLEANIMOAMSET_35, $20 ; fallthrough + frame BATTLEANIMOAMSET_32, 32 + frame BATTLEANIMOAMSET_33, 32 + frame BATTLEANIMOAMSET_34, 32 + frame BATTLEANIMOAMSET_35, 32 ; fallthrough .Frameset_2f: dorepeat 2 - frame BATTLEANIMOAMSET_35, $04 + frame BATTLEANIMOAMSET_35, 4 dorepeat 2 - frame BATTLEANIMOAMSET_35, $04 + frame BATTLEANIMOAMSET_35, 4 dorepeat 2 - frame BATTLEANIMOAMSET_35, $04 + frame BATTLEANIMOAMSET_35, 4 dorepeat 2 - frame BATTLEANIMOAMSET_35, $04 + frame BATTLEANIMOAMSET_35, 4 delanim .Frameset_30: - frame BATTLEANIMOAMSET_14, $04 - frame BATTLEANIMOAMSET_15, $04 + frame BATTLEANIMOAMSET_14, 4 + frame BATTLEANIMOAMSET_15, 4 dorestart .Frameset_31: - frame BATTLEANIMOAMSET_36, $02 - frame BATTLEANIMOAMSET_37, $02 - frame BATTLEANIMOAMSET_38, $02 - frame BATTLEANIMOAMSET_39, $20 + frame BATTLEANIMOAMSET_36, 2 + frame BATTLEANIMOAMSET_37, 2 + frame BATTLEANIMOAMSET_38, 2 + frame BATTLEANIMOAMSET_39, 32 delanim .Frameset_32: - frame BATTLEANIMOAMSET_3A, $02 - frame BATTLEANIMOAMSET_3B, $02 - frame BATTLEANIMOAMSET_3C, $02 - frame BATTLEANIMOAMSET_3D, $20 + frame BATTLEANIMOAMSET_3A, 2 + frame BATTLEANIMOAMSET_3B, 2 + frame BATTLEANIMOAMSET_3C, 2 + frame BATTLEANIMOAMSET_3D, 32 delanim .Frameset_33: - frame BATTLEANIMOAMSET_3A, $42 - frame BATTLEANIMOAMSET_3B, $42 - frame BATTLEANIMOAMSET_3C, $42 - frame BATTLEANIMOAMSET_3D, $60 + frame BATTLEANIMOAMSET_3A, 2, OAM_X_FLIP + frame BATTLEANIMOAMSET_3B, 2, OAM_X_FLIP + frame BATTLEANIMOAMSET_3C, 2, OAM_X_FLIP + frame BATTLEANIMOAMSET_3D, 32, OAM_X_FLIP delanim .Frameset_34: - frame BATTLEANIMOAMSET_3E, $08 - frame BATTLEANIMOAMSET_3F, $08 - frame BATTLEANIMOAMSET_40, $08 + frame BATTLEANIMOAMSET_3E, 8 + frame BATTLEANIMOAMSET_3F, 8 + frame BATTLEANIMOAMSET_40, 8 endanim .Frameset_35: - frame BATTLEANIMOAMSET_40, $02 + frame BATTLEANIMOAMSET_40, 2 dorepeat 2 - frame BATTLEANIMOAMSET_40, $02 + frame BATTLEANIMOAMSET_40, 2 dorepeat 2 - frame BATTLEANIMOAMSET_41, $02 + frame BATTLEANIMOAMSET_41, 2 dorepeat 2 - frame BATTLEANIMOAMSET_41, $02 + frame BATTLEANIMOAMSET_41, 2 dorepeat 2 dorestart .Frameset_36: - frame BATTLEANIMOAMSET_42, $02 - frame BATTLEANIMOAMSET_43, $02 - frame BATTLEANIMOAMSET_44, $02 - frame BATTLEANIMOAMSET_45, $02 + frame BATTLEANIMOAMSET_42, 2 + frame BATTLEANIMOAMSET_43, 2 + frame BATTLEANIMOAMSET_44, 2 + frame BATTLEANIMOAMSET_45, 2 dorestart .Frameset_37: - frame BATTLEANIMOAMSET_19, $02 + frame BATTLEANIMOAMSET_19, 2 dorepeat 2 dorestart .Frameset_38: - frame BATTLEANIMOAMSET_46, $04 - frame BATTLEANIMOAMSET_47, $04 + frame BATTLEANIMOAMSET_46, 4 + frame BATTLEANIMOAMSET_47, 4 dorestart .Frameset_39: - frame BATTLEANIMOAMSET_18, $02 + frame BATTLEANIMOAMSET_18, 2 dorepeat 2 dorestart .Frameset_3a: - frame BATTLEANIMOAMSET_48, $08 + frame BATTLEANIMOAMSET_48, 8 endanim .Frameset_3b: - frame BATTLEANIMOAMSET_48, $48 + frame BATTLEANIMOAMSET_48, 8, OAM_X_FLIP endanim .Frameset_3c: - frame BATTLEANIMOAMSET_49, $08 + frame BATTLEANIMOAMSET_49, 8 endanim .Frameset_3d: - frame BATTLEANIMOAMSET_4A, $08 + frame BATTLEANIMOAMSET_4A, 8 endanim .Frameset_43: - frame BATTLEANIMOAMSET_20, $10 - frame BATTLEANIMOAMSET_1F, $10 - frame BATTLEANIMOAMSET_1E, $10 + frame BATTLEANIMOAMSET_20, 16 + frame BATTLEANIMOAMSET_1F, 16 + frame BATTLEANIMOAMSET_1E, 16 endanim .Frameset_4c: - frame BATTLEANIMOAMSET_20, $08 - frame BATTLEANIMOAMSET_1F, $08 - frame BATTLEANIMOAMSET_1E, $08 + frame BATTLEANIMOAMSET_20, 8 + frame BATTLEANIMOAMSET_1F, 8 + frame BATTLEANIMOAMSET_1E, 8 endanim .Frameset_44: dorepeat 20 - frame BATTLEANIMOAMSET_55, $28 - frame BATTLEANIMOAMSET_54, $28 - frame BATTLEANIMOAMSET_53, $14 + frame BATTLEANIMOAMSET_55, 40 + frame BATTLEANIMOAMSET_54, 40 + frame BATTLEANIMOAMSET_53, 20 dorepeat 4 - frame BATTLEANIMOAMSET_53, $04 + frame BATTLEANIMOAMSET_53, 4 dorepeat 4 - frame BATTLEANIMOAMSET_53, $04 + frame BATTLEANIMOAMSET_53, 4 dorepeat 4 - frame BATTLEANIMOAMSET_53, $04 + frame BATTLEANIMOAMSET_53, 4 delanim .Frameset_7e: - frame BATTLEANIMOAMSET_1E, $08 - frame BATTLEANIMOAMSET_1F, $08 - frame BATTLEANIMOAMSET_20, $08 + frame BATTLEANIMOAMSET_1E, 8 + frame BATTLEANIMOAMSET_1F, 8 + frame BATTLEANIMOAMSET_20, 8 delanim .Frameset_45: dorepeat 0 - frame BATTLEANIMOAMSET_14, $00 - frame BATTLEANIMOAMSET_15, $00 - frame BATTLEANIMOAMSET_14, $40 + frame BATTLEANIMOAMSET_14, 0 + frame BATTLEANIMOAMSET_15, 0 + frame BATTLEANIMOAMSET_14, 0, OAM_X_FLIP dorepeat 0 - frame BATTLEANIMOAMSET_16, $40 - frame BATTLEANIMOAMSET_15, $00 - frame BATTLEANIMOAMSET_16, $00 + frame BATTLEANIMOAMSET_16, 0, OAM_X_FLIP + frame BATTLEANIMOAMSET_15, 0 + frame BATTLEANIMOAMSET_16, 0 dorestart .Frameset_46: - frame BATTLEANIMOAMSET_56, $02 - frame BATTLEANIMOAMSET_57, $04 + frame BATTLEANIMOAMSET_56, 2 + frame BATTLEANIMOAMSET_57, 4 delanim .Frameset_47: - frame BATTLEANIMOAMSET_56, $c2 - frame BATTLEANIMOAMSET_57, $c4 + frame BATTLEANIMOAMSET_56, 2, OAM_X_FLIP, OAM_Y_FLIP + frame BATTLEANIMOAMSET_57, 4, OAM_X_FLIP, OAM_Y_FLIP delanim .Frameset_48: - frame BATTLEANIMOAMSET_56, $01 - frame BATTLEANIMOAMSET_57, $01 - frame BATTLEANIMOAMSET_58, $01 - frame BATTLEANIMOAMSET_57, $c1 - frame BATTLEANIMOAMSET_58, $c1 - frame BATTLEANIMOAMSET_57, $02 + frame BATTLEANIMOAMSET_56, 1 + frame BATTLEANIMOAMSET_57, 1 + frame BATTLEANIMOAMSET_58, 1 + frame BATTLEANIMOAMSET_57, 1, OAM_X_FLIP, OAM_Y_FLIP + frame BATTLEANIMOAMSET_58, 1, OAM_X_FLIP, OAM_Y_FLIP + frame BATTLEANIMOAMSET_57, 2 delanim .Frameset_49: - frame BATTLEANIMOAMSET_56, $c1 - frame BATTLEANIMOAMSET_57, $c1 - frame BATTLEANIMOAMSET_58, $c1 - frame BATTLEANIMOAMSET_57, $01 - frame BATTLEANIMOAMSET_58, $01 - frame BATTLEANIMOAMSET_57, $c2 + frame BATTLEANIMOAMSET_56, 1, OAM_X_FLIP, OAM_Y_FLIP + frame BATTLEANIMOAMSET_57, 1, OAM_X_FLIP, OAM_Y_FLIP + frame BATTLEANIMOAMSET_58, 1, OAM_X_FLIP, OAM_Y_FLIP + frame BATTLEANIMOAMSET_57, 1 + frame BATTLEANIMOAMSET_58, 1 + frame BATTLEANIMOAMSET_57, 2, OAM_X_FLIP, OAM_Y_FLIP delanim .Frameset_4a: - frame BATTLEANIMOAMSET_57, $c1 - frame BATTLEANIMOAMSET_58, $c1 - frame BATTLEANIMOAMSET_57, $01 - frame BATTLEANIMOAMSET_58, $01 + frame BATTLEANIMOAMSET_57, 1, OAM_X_FLIP, OAM_Y_FLIP + frame BATTLEANIMOAMSET_58, 1, OAM_X_FLIP, OAM_Y_FLIP + frame BATTLEANIMOAMSET_57, 1 + frame BATTLEANIMOAMSET_58, 1 dorestart .Frameset_4b: - frame BATTLEANIMOAMSET_59, $01 - frame BATTLEANIMOAMSET_5A, $01 - frame BATTLEANIMOAMSET_5B, $01 - frame BATTLEANIMOAMSET_5C, $02 + frame BATTLEANIMOAMSET_59, 1 + frame BATTLEANIMOAMSET_5A, 1 + frame BATTLEANIMOAMSET_5B, 1 + frame BATTLEANIMOAMSET_5C, 2 delanim .Frameset_4d: - frame BATTLEANIMOAMSET_0A, $0a - frame BATTLEANIMOAMSET_0B, $43 - frame BATTLEANIMOAMSET_5D, $43 - frame BATTLEANIMOAMSET_0B, $c3 - frame BATTLEANIMOAMSET_0A, $82 - frame BATTLEANIMOAMSET_0B, $81 - frame BATTLEANIMOAMSET_5D, $01 - frame BATTLEANIMOAMSET_0B, $01 + frame BATTLEANIMOAMSET_0A, 10 + frame BATTLEANIMOAMSET_0B, 3, OAM_X_FLIP + frame BATTLEANIMOAMSET_5D, 3, OAM_X_FLIP + frame BATTLEANIMOAMSET_0B, 3, OAM_X_FLIP, OAM_Y_FLIP + frame BATTLEANIMOAMSET_0A, 2, OAM_Y_FLIP + frame BATTLEANIMOAMSET_0B, 1, OAM_Y_FLIP + frame BATTLEANIMOAMSET_5D, 1 + frame BATTLEANIMOAMSET_0B, 1 dorestart .Frameset_4e: - frame BATTLEANIMOAMSET_0A, $03 - frame BATTLEANIMOAMSET_0B, $47 - frame BATTLEANIMOAMSET_0A, $07 - frame BATTLEANIMOAMSET_0B, $07 - frame BATTLEANIMOAMSET_0A, $03 + frame BATTLEANIMOAMSET_0A, 3 + frame BATTLEANIMOAMSET_0B, 7, OAM_X_FLIP + frame BATTLEANIMOAMSET_0A, 7 + frame BATTLEANIMOAMSET_0B, 7 + frame BATTLEANIMOAMSET_0A, 3 dorestart .Frameset_4f: - frame BATTLEANIMOAMSET_5E, $20 - frame BATTLEANIMOAMSET_5E, $20 + frame BATTLEANIMOAMSET_5E, 32 + frame BATTLEANIMOAMSET_5E, 32 delanim .Frameset_50: - frame BATTLEANIMOAMSET_5F, $20 - frame BATTLEANIMOAMSET_5F, $20 + frame BATTLEANIMOAMSET_5F, 32 + frame BATTLEANIMOAMSET_5F, 32 delanim .Frameset_51: - frame BATTLEANIMOAMSET_60, $08 + frame BATTLEANIMOAMSET_60, 8 endanim .Frameset_52: - frame BATTLEANIMOAMSET_61, $01 - frame BATTLEANIMOAMSET_62, $01 - frame BATTLEANIMOAMSET_63, $01 + frame BATTLEANIMOAMSET_61, 1 + frame BATTLEANIMOAMSET_62, 1 + frame BATTLEANIMOAMSET_63, 1 endanim .Frameset_53: - frame BATTLEANIMOAMSET_63, $07 - frame BATTLEANIMOAMSET_64, $07 + frame BATTLEANIMOAMSET_63, 7 + frame BATTLEANIMOAMSET_64, 7 dorestart .Frameset_54: - frame BATTLEANIMOAMSET_65, $01 - frame BATTLEANIMOAMSET_66, $01 - frame BATTLEANIMOAMSET_67, $01 + frame BATTLEANIMOAMSET_65, 1 + frame BATTLEANIMOAMSET_66, 1 + frame BATTLEANIMOAMSET_67, 1 endanim .Frameset_55: - frame BATTLEANIMOAMSET_67, $07 - frame BATTLEANIMOAMSET_68, $07 + frame BATTLEANIMOAMSET_67, 7 + frame BATTLEANIMOAMSET_68, 7 dorestart .Frameset_59: - frame BATTLEANIMOAMSET_6E, $08 + frame BATTLEANIMOAMSET_6E, 8 endanim .Frameset_5a: - frame BATTLEANIMOAMSET_6F, $08 + frame BATTLEANIMOAMSET_6F, 8 endanim .Frameset_5b: - frame BATTLEANIMOAMSET_6E, $88 + frame BATTLEANIMOAMSET_6E, 8, OAM_Y_FLIP endanim .Frameset_5c: - frame BATTLEANIMOAMSET_18, $04 - frame BATTLEANIMOAMSET_70, $04 - frame BATTLEANIMOAMSET_71, $04 - frame BATTLEANIMOAMSET_72, $04 - frame BATTLEANIMOAMSET_73, $04 + frame BATTLEANIMOAMSET_18, 4 + frame BATTLEANIMOAMSET_70, 4 + frame BATTLEANIMOAMSET_71, 4 + frame BATTLEANIMOAMSET_72, 4 + frame BATTLEANIMOAMSET_73, 4 delanim .Frameset_5d: - frame BATTLEANIMOAMSET_74, $04 - frame BATTLEANIMOAMSET_75, $04 + frame BATTLEANIMOAMSET_74, 4 + frame BATTLEANIMOAMSET_75, 4 dorestart .Frameset_5e: - frame BATTLEANIMOAMSET_14, $08 + frame BATTLEANIMOAMSET_14, 8 endanim .Frameset_7a: - frame BATTLEANIMOAMSET_74, $03 - frame BATTLEANIMOAMSET_14, $03 - frame BATTLEANIMOAMSET_15, $03 - frame BATTLEANIMOAMSET_14, $03 - frame BATTLEANIMOAMSET_15, $03 + frame BATTLEANIMOAMSET_74, 3 + frame BATTLEANIMOAMSET_14, 3 + frame BATTLEANIMOAMSET_15, 3 + frame BATTLEANIMOAMSET_14, 3 + frame BATTLEANIMOAMSET_15, 3 delanim .Frameset_af: - frame BATTLEANIMOAMSET_14, $00 - frame BATTLEANIMOAMSET_15, $00 - frame BATTLEANIMOAMSET_14, $00 - frame BATTLEANIMOAMSET_15, $00 - frame BATTLEANIMOAMSET_74, $0c + frame BATTLEANIMOAMSET_14, 0 + frame BATTLEANIMOAMSET_15, 0 + frame BATTLEANIMOAMSET_14, 0 + frame BATTLEANIMOAMSET_15, 0 + frame BATTLEANIMOAMSET_74, 12 delanim .Frameset_5f: - frame BATTLEANIMOAMSET_76, $08 + frame BATTLEANIMOAMSET_76, 8 endanim .Frameset_60: - frame BATTLEANIMOAMSET_77, $01 - frame BATTLEANIMOAMSET_78, $01 - frame BATTLEANIMOAMSET_79, $01 - frame BATTLEANIMOAMSET_7A, $01 - frame BATTLEANIMOAMSET_7B, $01 - frame BATTLEANIMOAMSET_7C, $01 - frame BATTLEANIMOAMSET_7D, $01 - frame BATTLEANIMOAMSET_7C, $c1 - frame BATTLEANIMOAMSET_7B, $c1 - frame BATTLEANIMOAMSET_7A, $c1 - frame BATTLEANIMOAMSET_79, $c1 - frame BATTLEANIMOAMSET_78, $c1 - frame BATTLEANIMOAMSET_77, $c1 + frame BATTLEANIMOAMSET_77, 1 + frame BATTLEANIMOAMSET_78, 1 + frame BATTLEANIMOAMSET_79, 1 + frame BATTLEANIMOAMSET_7A, 1 + frame BATTLEANIMOAMSET_7B, 1 + frame BATTLEANIMOAMSET_7C, 1 + frame BATTLEANIMOAMSET_7D, 1 + frame BATTLEANIMOAMSET_7C, 1, OAM_X_FLIP, OAM_Y_FLIP + frame BATTLEANIMOAMSET_7B, 1, OAM_X_FLIP, OAM_Y_FLIP + frame BATTLEANIMOAMSET_7A, 1, OAM_X_FLIP, OAM_Y_FLIP + frame BATTLEANIMOAMSET_79, 1, OAM_X_FLIP, OAM_Y_FLIP + frame BATTLEANIMOAMSET_78, 1, OAM_X_FLIP, OAM_Y_FLIP + frame BATTLEANIMOAMSET_77, 1, OAM_X_FLIP, OAM_Y_FLIP delanim .Frameset_61: - frame BATTLEANIMOAMSET_1B, $04 - frame BATTLEANIMOAMSET_7E, $04 + frame BATTLEANIMOAMSET_1B, 4 + frame BATTLEANIMOAMSET_7E, 4 dorestart .Frameset_62: - frame BATTLEANIMOAMSET_1B, $44 - frame BATTLEANIMOAMSET_7E, $44 + frame BATTLEANIMOAMSET_1B, 4, OAM_X_FLIP + frame BATTLEANIMOAMSET_7E, 4, OAM_X_FLIP dorestart .Frameset_63: - frame BATTLEANIMOAMSET_7F, $08 + frame BATTLEANIMOAMSET_7F, 8 endanim .Frameset_64: - frame BATTLEANIMOAMSET_25, $08 + frame BATTLEANIMOAMSET_25, 8 endanim .Frameset_65: - frame BATTLEANIMOAMSET_80, $08 + frame BATTLEANIMOAMSET_80, 8 endanim .Frameset_66: - frame BATTLEANIMOAMSET_83, $07 - frame BATTLEANIMOAMSET_82, $07 - frame BATTLEANIMOAMSET_81, $07 - frame BATTLEANIMOAMSET_82, $07 - frame BATTLEANIMOAMSET_83, $07 - frame BATTLEANIMOAMSET_82, $07 - frame BATTLEANIMOAMSET_81, $07 + frame BATTLEANIMOAMSET_83, 7 + frame BATTLEANIMOAMSET_82, 7 + frame BATTLEANIMOAMSET_81, 7 + frame BATTLEANIMOAMSET_82, 7 + frame BATTLEANIMOAMSET_83, 7 + frame BATTLEANIMOAMSET_82, 7 + frame BATTLEANIMOAMSET_81, 7 delanim .Frameset_67: - frame BATTLEANIMOAMSET_1B, $10 + frame BATTLEANIMOAMSET_1B, 16 delanim .Frameset_68: dorepeat 15 - frame BATTLEANIMOAMSET_84, $0f - frame BATTLEANIMOAMSET_85, $0f - frame BATTLEANIMOAMSET_29, $0f - frame BATTLEANIMOAMSET_28, $0f - frame BATTLEANIMOAMSET_86, $20 + frame BATTLEANIMOAMSET_84, 15 + frame BATTLEANIMOAMSET_85, 15 + frame BATTLEANIMOAMSET_29, 15 + frame BATTLEANIMOAMSET_28, 15 + frame BATTLEANIMOAMSET_86, 32 delanim .Frameset_69: - frame BATTLEANIMOAMSET_1B, $03 - frame BATTLEANIMOAMSET_87, $03 - frame BATTLEANIMOAMSET_88, $03 - frame BATTLEANIMOAMSET_89, $03 + frame BATTLEANIMOAMSET_1B, 3 + frame BATTLEANIMOAMSET_87, 3 + frame BATTLEANIMOAMSET_88, 3 + frame BATTLEANIMOAMSET_89, 3 delanim .Frameset_6a: - frame BATTLEANIMOAMSET_8A, $02 - frame BATTLEANIMOAMSET_8B, $02 - frame BATTLEANIMOAMSET_8C, $02 - frame BATTLEANIMOAMSET_8D, $02 + frame BATTLEANIMOAMSET_8A, 2 + frame BATTLEANIMOAMSET_8B, 2 + frame BATTLEANIMOAMSET_8C, 2 + frame BATTLEANIMOAMSET_8D, 2 delanim .Frameset_6b: - frame BATTLEANIMOAMSET_61, $02 - frame BATTLEANIMOAMSET_62, $02 - frame BATTLEANIMOAMSET_63, $02 + frame BATTLEANIMOAMSET_61, 2 + frame BATTLEANIMOAMSET_62, 2 + frame BATTLEANIMOAMSET_63, 2 endanim .Frameset_6c: - frame BATTLEANIMOAMSET_65, $02 - frame BATTLEANIMOAMSET_66, $02 - frame BATTLEANIMOAMSET_67, $02 + frame BATTLEANIMOAMSET_65, 2 + frame BATTLEANIMOAMSET_66, 2 + frame BATTLEANIMOAMSET_67, 2 endanim .Frameset_6d: - frame BATTLEANIMOAMSET_8E, $08 + frame BATTLEANIMOAMSET_8E, 8 endanim .Frameset_6e: - frame BATTLEANIMOAMSET_8E, $48 + frame BATTLEANIMOAMSET_8E, 8, OAM_X_FLIP endanim .Frameset_6f: - frame BATTLEANIMOAMSET_8F, $10 - frame BATTLEANIMOAMSET_90, $10 + frame BATTLEANIMOAMSET_8F, 16 + frame BATTLEANIMOAMSET_90, 16 dorestart .Frameset_70: - frame BATTLEANIMOAMSET_91, $10 - frame BATTLEANIMOAMSET_92, $10 + frame BATTLEANIMOAMSET_91, 16 + frame BATTLEANIMOAMSET_92, 16 dorestart .Frameset_71: - frame BATTLEANIMOAMSET_93, $08 + frame BATTLEANIMOAMSET_93, 8 endanim .Frameset_72: - frame BATTLEANIMOAMSET_1E, $08 + frame BATTLEANIMOAMSET_1E, 8 endanim .Frameset_73: - frame BATTLEANIMOAMSET_1B, $07 - frame BATTLEANIMOAMSET_94, $07 + frame BATTLEANIMOAMSET_1B, 7 + frame BATTLEANIMOAMSET_94, 7 dorestart .Frameset_74: - frame BATTLEANIMOAMSET_95, $08 + frame BATTLEANIMOAMSET_95, 8 endanim .Frameset_75: - frame BATTLEANIMOAMSET_96, $08 + frame BATTLEANIMOAMSET_96, 8 endanim .Frameset_76: - frame BATTLEANIMOAMSET_95, $08 + frame BATTLEANIMOAMSET_95, 8 endanim .Frameset_77: - frame BATTLEANIMOAMSET_97, $01 - frame BATTLEANIMOAMSET_97, $41 + frame BATTLEANIMOAMSET_97, 1 + frame BATTLEANIMOAMSET_97, 1, OAM_X_FLIP dorestart .Frameset_78: - frame BATTLEANIMOAMSET_98, $08 + frame BATTLEANIMOAMSET_98, 8 endanim .Frameset_79: - frame BATTLEANIMOAMSET_99, $20 - frame BATTLEANIMOAMSET_99, $20 - frame BATTLEANIMOAMSET_99, $20 - frame BATTLEANIMOAMSET_99, $20 - frame BATTLEANIMOAMSET_99, $20 - frame BATTLEANIMOAMSET_9A, $08 + frame BATTLEANIMOAMSET_99, 32 + frame BATTLEANIMOAMSET_99, 32 + frame BATTLEANIMOAMSET_99, 32 + frame BATTLEANIMOAMSET_99, 32 + frame BATTLEANIMOAMSET_99, 32 + frame BATTLEANIMOAMSET_9A, 8 endanim .Frameset_7b: - frame BATTLEANIMOAMSET_9B, $08 + frame BATTLEANIMOAMSET_9B, 8 endanim .Frameset_7c: - frame BATTLEANIMOAMSET_9C, $02 - frame BATTLEANIMOAMSET_9D, $02 - frame BATTLEANIMOAMSET_9E, $08 + frame BATTLEANIMOAMSET_9C, 2 + frame BATTLEANIMOAMSET_9D, 2 + frame BATTLEANIMOAMSET_9E, 8 dorepeat 2 - frame BATTLEANIMOAMSET_9E, $02 + frame BATTLEANIMOAMSET_9E, 2 dorepeat 2 - frame BATTLEANIMOAMSET_9E, $02 + frame BATTLEANIMOAMSET_9E, 2 dorepeat 2 - frame BATTLEANIMOAMSET_9E, $02 + frame BATTLEANIMOAMSET_9E, 2 delanim .Frameset_7d: - frame BATTLEANIMOAMSET_9F, $08 + frame BATTLEANIMOAMSET_9F, 8 endanim .Frameset_7f: - frame BATTLEANIMOAMSET_0F, $08 + frame BATTLEANIMOAMSET_0F, 8 endanim .Frameset_80: - frame BATTLEANIMOAMSET_6B, $18 + frame BATTLEANIMOAMSET_6B, 24 delanim .Frameset_81: - frame BATTLEANIMOAMSET_A0, $01 ; fallthrough + frame BATTLEANIMOAMSET_A0, 1 ; fallthrough .Frameset_82: - frame BATTLEANIMOAMSET_A1, $01 ; fallthrough + frame BATTLEANIMOAMSET_A1, 1 ; fallthrough .Frameset_83: - frame BATTLEANIMOAMSET_A2, $01 + frame BATTLEANIMOAMSET_A2, 1 delanim .Frameset_84: - frame BATTLEANIMOAMSET_A3, $08 + frame BATTLEANIMOAMSET_A3, 8 endanim .Frameset_85: - frame BATTLEANIMOAMSET_A4, $04 - frame BATTLEANIMOAMSET_A5, $04 - frame BATTLEANIMOAMSET_A6, $04 - frame BATTLEANIMOAMSET_A7, $04 - frame BATTLEANIMOAMSET_A6, $44 - frame BATTLEANIMOAMSET_A5, $44 + frame BATTLEANIMOAMSET_A4, 4 + frame BATTLEANIMOAMSET_A5, 4 + frame BATTLEANIMOAMSET_A6, 4 + frame BATTLEANIMOAMSET_A7, 4 + frame BATTLEANIMOAMSET_A6, 4, OAM_X_FLIP + frame BATTLEANIMOAMSET_A5, 4, OAM_X_FLIP dorestart .Frameset_86: - frame BATTLEANIMOAMSET_A8, $04 - frame BATTLEANIMOAMSET_A9, $04 - frame BATTLEANIMOAMSET_AA, $04 - frame BATTLEANIMOAMSET_AB, $04 - frame BATTLEANIMOAMSET_AA, $44 - frame BATTLEANIMOAMSET_A9, $44 + frame BATTLEANIMOAMSET_A8, 4 + frame BATTLEANIMOAMSET_A9, 4 + frame BATTLEANIMOAMSET_AA, 4 + frame BATTLEANIMOAMSET_AB, 4 + frame BATTLEANIMOAMSET_AA, 4, OAM_X_FLIP + frame BATTLEANIMOAMSET_A9, 4, OAM_X_FLIP dorestart .Frameset_87: - frame BATTLEANIMOAMSET_1B, $08 + frame BATTLEANIMOAMSET_1B, 8 endanim .Frameset_88: - frame BATTLEANIMOAMSET_AC, $08 + frame BATTLEANIMOAMSET_AC, 8 endanim .Frameset_89: - frame BATTLEANIMOAMSET_AD, $08 + frame BATTLEANIMOAMSET_AD, 8 endanim .Frameset_8a: - frame BATTLEANIMOAMSET_AE, $08 + frame BATTLEANIMOAMSET_AE, 8 endanim .Frameset_8b: - frame BATTLEANIMOAMSET_AF, $08 + frame BATTLEANIMOAMSET_AF, 8 endanim .Frameset_8c: - frame BATTLEANIMOAMSET_B0, $20 + frame BATTLEANIMOAMSET_B0, 32 delanim .Frameset_8d: - frame BATTLEANIMOAMSET_B1, $07 - frame BATTLEANIMOAMSET_B1, $47 + frame BATTLEANIMOAMSET_B1, 7 + frame BATTLEANIMOAMSET_B1, 7, OAM_X_FLIP dorestart .Frameset_8e: - frame BATTLEANIMOAMSET_B2, $08 + frame BATTLEANIMOAMSET_B2, 8 endanim .Frameset_8f: - frame BATTLEANIMOAMSET_B3, $08 + frame BATTLEANIMOAMSET_B3, 8 endanim .Frameset_90: - frame BATTLEANIMOAMSET_B3, $48 + frame BATTLEANIMOAMSET_B3, 8, OAM_X_FLIP endanim .Frameset_91: - frame BATTLEANIMOAMSET_B3, $88 + frame BATTLEANIMOAMSET_B3, 8, OAM_Y_FLIP endanim .Frameset_92: - frame BATTLEANIMOAMSET_B3, $c8 + frame BATTLEANIMOAMSET_B3, 8, OAM_X_FLIP, OAM_Y_FLIP endanim .Frameset_93: - frame BATTLEANIMOAMSET_B5, $08 + frame BATTLEANIMOAMSET_B5, 8 endanim .Frameset_94: - frame BATTLEANIMOAMSET_B5, $48 + frame BATTLEANIMOAMSET_B5, 8, OAM_X_FLIP endanim .Frameset_95: - frame BATTLEANIMOAMSET_B5, $88 + frame BATTLEANIMOAMSET_B5, 8, OAM_Y_FLIP endanim .Frameset_96: - frame BATTLEANIMOAMSET_B5, $c8 + frame BATTLEANIMOAMSET_B5, 8, OAM_X_FLIP, OAM_Y_FLIP endanim .Frameset_97: - frame BATTLEANIMOAMSET_B4, $08 + frame BATTLEANIMOAMSET_B4, 8 endanim .Frameset_98: - frame BATTLEANIMOAMSET_6B, $08 + frame BATTLEANIMOAMSET_6B, 8 endanim .Frameset_99: - frame BATTLEANIMOAMSET_B6, $08 + frame BATTLEANIMOAMSET_B6, 8 endanim .Frameset_9a: - frame BATTLEANIMOAMSET_B7, $20 + frame BATTLEANIMOAMSET_B7, 32 endanim .Frameset_9b: - frame BATTLEANIMOAMSET_1B, $20 + frame BATTLEANIMOAMSET_1B, 32 endanim .Frameset_9c: - frame BATTLEANIMOAMSET_B8, $20 + frame BATTLEANIMOAMSET_B8, 32 endanim .Frameset_9d: - frame BATTLEANIMOAMSET_B8, $60 + frame BATTLEANIMOAMSET_B8, 32, OAM_X_FLIP endanim .Frameset_9e: - frame BATTLEANIMOAMSET_B9, $20 + frame BATTLEANIMOAMSET_B9, 32 endanim .Frameset_9f: - frame BATTLEANIMOAMSET_BA, $20 + frame BATTLEANIMOAMSET_BA, 32 endanim .Frameset_a0: - frame BATTLEANIMOAMSET_BB, $60 + frame BATTLEANIMOAMSET_BB, 32, OAM_X_FLIP endanim .Frameset_a1: - frame BATTLEANIMOAMSET_BB, $20 + frame BATTLEANIMOAMSET_BB, 32 endanim .Frameset_a2: - frame BATTLEANIMOAMSET_BC, $20 + frame BATTLEANIMOAMSET_BC, 32 endanim .Frameset_a3: - frame BATTLEANIMOAMSET_BD, $0b - frame BATTLEANIMOAMSET_BE, $0b - frame BATTLEANIMOAMSET_1B, $0b + frame BATTLEANIMOAMSET_BD, 11 + frame BATTLEANIMOAMSET_BE, 11 + frame BATTLEANIMOAMSET_1B, 11 delanim .Frameset_a4: - frame BATTLEANIMOAMSET_BF, $04 - frame BATTLEANIMOAMSET_C0, $04 - frame BATTLEANIMOAMSET_C1, $04 + frame BATTLEANIMOAMSET_BF, 4 + frame BATTLEANIMOAMSET_C0, 4 + frame BATTLEANIMOAMSET_C1, 4 delanim .Frameset_a5: - frame BATTLEANIMOAMSET_C2, $20 - frame BATTLEANIMOAMSET_C2, $20 + frame BATTLEANIMOAMSET_C2, 32 + frame BATTLEANIMOAMSET_C2, 32 delanim .Frameset_a6: - frame BATTLEANIMOAMSET_4B, $02 - frame BATTLEANIMOAMSET_4C, $02 - frame BATTLEANIMOAMSET_4D, $20 - frame BATTLEANIMOAMSET_4D, $20 - frame BATTLEANIMOAMSET_4D, $20 - frame BATTLEANIMOAMSET_4F, $01 - frame BATTLEANIMOAMSET_50, $01 - frame BATTLEANIMOAMSET_51, $01 - frame BATTLEANIMOAMSET_52, $02 + frame BATTLEANIMOAMSET_4B, 2 + frame BATTLEANIMOAMSET_4C, 2 + frame BATTLEANIMOAMSET_4D, 32 + frame BATTLEANIMOAMSET_4D, 32 + frame BATTLEANIMOAMSET_4D, 32 + frame BATTLEANIMOAMSET_4F, 1 + frame BATTLEANIMOAMSET_50, 1 + frame BATTLEANIMOAMSET_51, 1 + frame BATTLEANIMOAMSET_52, 2 dorepeat 2 - frame BATTLEANIMOAMSET_52, $02 + frame BATTLEANIMOAMSET_52, 2 dorepeat 2 - frame BATTLEANIMOAMSET_52, $02 + frame BATTLEANIMOAMSET_52, 2 dorepeat 2 - frame BATTLEANIMOAMSET_52, $02 + frame BATTLEANIMOAMSET_52, 2 delanim .Frameset_a7: - frame BATTLEANIMOAMSET_4B, $c2 - frame BATTLEANIMOAMSET_4C, $c2 - frame BATTLEANIMOAMSET_4D, $e0 - frame BATTLEANIMOAMSET_4D, $e0 - frame BATTLEANIMOAMSET_4D, $e0 - frame BATTLEANIMOAMSET_4F, $c1 - frame BATTLEANIMOAMSET_50, $c1 - frame BATTLEANIMOAMSET_51, $c1 - frame BATTLEANIMOAMSET_52, $c2 + frame BATTLEANIMOAMSET_4B, 2, OAM_X_FLIP, OAM_Y_FLIP + frame BATTLEANIMOAMSET_4C, 2, OAM_X_FLIP, OAM_Y_FLIP + frame BATTLEANIMOAMSET_4D, 32, OAM_X_FLIP, OAM_Y_FLIP + frame BATTLEANIMOAMSET_4D, 32, OAM_X_FLIP, OAM_Y_FLIP + frame BATTLEANIMOAMSET_4D, 32, OAM_X_FLIP, OAM_Y_FLIP + frame BATTLEANIMOAMSET_4F, 1, OAM_X_FLIP, OAM_Y_FLIP + frame BATTLEANIMOAMSET_50, 1, OAM_X_FLIP, OAM_Y_FLIP + frame BATTLEANIMOAMSET_51, 1, OAM_X_FLIP, OAM_Y_FLIP + frame BATTLEANIMOAMSET_52, 2, OAM_X_FLIP, OAM_Y_FLIP dorepeat 2 - frame BATTLEANIMOAMSET_52, $c2 + frame BATTLEANIMOAMSET_52, 2, OAM_X_FLIP, OAM_Y_FLIP dorepeat 2 - frame BATTLEANIMOAMSET_52, $c2 + frame BATTLEANIMOAMSET_52, 2, OAM_X_FLIP, OAM_Y_FLIP dorepeat 2 - frame BATTLEANIMOAMSET_52, $c2 + frame BATTLEANIMOAMSET_52, 2, OAM_X_FLIP, OAM_Y_FLIP delanim .Frameset_a8: - frame BATTLEANIMOAMSET_C3, $01 - frame BATTLEANIMOAMSET_C3, $c1 + frame BATTLEANIMOAMSET_C3, 1 + frame BATTLEANIMOAMSET_C3, 1, OAM_X_FLIP, OAM_Y_FLIP dorestart .Frameset_a9: - frame BATTLEANIMOAMSET_C4, $20 + frame BATTLEANIMOAMSET_C4, 32 endanim .Frameset_aa: - frame BATTLEANIMOAMSET_C5, $04 - frame BATTLEANIMOAMSET_C6, $04 - frame BATTLEANIMOAMSET_C7, $04 + frame BATTLEANIMOAMSET_C5, 4 + frame BATTLEANIMOAMSET_C6, 4 + frame BATTLEANIMOAMSET_C7, 4 delanim .Frameset_ab: - frame BATTLEANIMOAMSET_C8, $01 - frame BATTLEANIMOAMSET_C8, $41 + frame BATTLEANIMOAMSET_C8, 1 + frame BATTLEANIMOAMSET_C8, 1, OAM_X_FLIP dorestart .Frameset_ac: - frame BATTLEANIMOAMSET_C9, $03 - frame BATTLEANIMOAMSET_05, $03 + frame BATTLEANIMOAMSET_C9, 3 + frame BATTLEANIMOAMSET_05, 3 delanim .Frameset_ad: - frame BATTLEANIMOAMSET_CA, $20 - frame BATTLEANIMOAMSET_CB, $03 - frame BATTLEANIMOAMSET_CA, $03 - frame BATTLEANIMOAMSET_CB, $03 + frame BATTLEANIMOAMSET_CA, 32 + frame BATTLEANIMOAMSET_CB, 3 + frame BATTLEANIMOAMSET_CA, 3 + frame BATTLEANIMOAMSET_CB, 3 dorestart .Frameset_ae: - frame BATTLEANIMOAMSET_03, $a0 + frame BATTLEANIMOAMSET_03, 32, OAM_Y_FLIP endanim .Frameset_b0: - frame BATTLEANIMOAMSET_CC, $20 + frame BATTLEANIMOAMSET_CC, 32 endanim .Frameset_b1: - frame BATTLEANIMOAMSET_7F, $02 - frame BATTLEANIMOAMSET_25, $02 - frame BATTLEANIMOAMSET_80, $02 - frame BATTLEANIMOAMSET_25, $02 + frame BATTLEANIMOAMSET_7F, 2 + frame BATTLEANIMOAMSET_25, 2 + frame BATTLEANIMOAMSET_80, 2 + frame BATTLEANIMOAMSET_25, 2 dorestart .Frameset_b2: - frame BATTLEANIMOAMSET_CD, $04 - frame BATTLEANIMOAMSET_CE, $04 - frame BATTLEANIMOAMSET_CD, $c4 - frame BATTLEANIMOAMSET_CE, $c4 + frame BATTLEANIMOAMSET_CD, 4 + frame BATTLEANIMOAMSET_CE, 4 + frame BATTLEANIMOAMSET_CD, 4, OAM_X_FLIP, OAM_Y_FLIP + frame BATTLEANIMOAMSET_CE, 4, OAM_X_FLIP, OAM_Y_FLIP dorestart .Frameset_b3: - frame BATTLEANIMOAMSET_CF, $04 - frame BATTLEANIMOAMSET_D0, $04 - frame BATTLEANIMOAMSET_D1, $04 - frame BATTLEANIMOAMSET_D2, $04 + frame BATTLEANIMOAMSET_CF, 4 + frame BATTLEANIMOAMSET_D0, 4 + frame BATTLEANIMOAMSET_D1, 4 + frame BATTLEANIMOAMSET_D2, 4 delanim .Frameset_b4: - frame BATTLEANIMOAMSET_D3, $20 + frame BATTLEANIMOAMSET_D3, 32 endanim .Frameset_b5: - frame BATTLEANIMOAMSET_D4, $08 + frame BATTLEANIMOAMSET_D4, 8 endanim .Frameset_b6: - frame BATTLEANIMOAMSET_D5, $08 + frame BATTLEANIMOAMSET_D5, 8 endanim .Frameset_b7: - frame BATTLEANIMOAMSET_D6, $08 + frame BATTLEANIMOAMSET_D6, 8 endanim .Frameset_b8: - frame BATTLEANIMOAMSET_D7, $08 + frame BATTLEANIMOAMSET_D7, 8 endanim ; ceeae diff --git a/data/battle_anims/oam.asm b/data/battle_anims/oam.asm index 5d88977bd..d4b0b6978 100755 --- a/data/battle_anims/oam.asm +++ b/data/battle_anims/oam.asm @@ -219,868 +219,868 @@ BattleAnimOAMData: ; ceeae dbbw $00, 12, .OAMData_d7 ; BATTLEANIMOAMSET_D7 .OAMData_11: - dsprite -1, 0, -1, 4, $00, $00 - dsprite 0, 0, -1, 4, $01, $00 + dsprite -1, 0, -1, 4, $00, $0 + dsprite 0, 0, -1, 4, $01, $0 .OAMData_56: - dsprite -1, 4, -1, 0, $00, $00 - dsprite -1, 4, 0, 0, $01, $00 + dsprite -1, 4, -1, 0, $00, $0 + dsprite -1, 4, 0, 0, $01, $0 .OAMData_03: - dsprite -1, 0, -1, 0, $00, $00 - dsprite -1, 0, 0, 0, $01, $00 - dsprite 0, 0, -1, 0, $02, $00 - dsprite 0, 0, 0, 0, $03, $00 + 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 .OAMData_02: - dsprite -1, 0, -1, 0, $00, $00 - dsprite -1, 0, 0, 0, $00, $20 - dsprite 0, 0, -1, 0, $00, $40 - dsprite 0, 0, 0, 0, $00, $60 + 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 .OAMData_c3: - dsprite -2, 4, -2, 4, $00, $00 - dsprite -2, 4, -1, 4, $01, $00 - dsprite -2, 4, 0, 4, $02, $00 - dsprite -1, 4, -2, 4, $03, $00 - dsprite -1, 4, -1, 4, $04, $00 - dsprite -1, 4, 0, 4, $05, $00 - dsprite 0, 4, -2, 4, $06, $00 - dsprite 0, 4, -1, 4, $07, $00 - dsprite 0, 4, 0, 4, $08, $00 + 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 .OAMData_01: - dsprite -2, 4, -2, 4, $00, $00 - dsprite -2, 4, -1, 4, $01, $00 - dsprite -2, 4, 0, 4, $00, $20 - dsprite -1, 4, -2, 4, $02, $00 - dsprite -1, 4, -1, 4, $03, $00 - dsprite -1, 4, 0, 4, $02, $60 - dsprite 0, 4, -2, 4, $00, $40 - dsprite 0, 4, -1, 4, $01, $60 - dsprite 0, 4, 0, 4, $00, $60 + 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 .OAMData_cf: - dsprite -2, 0, -2, 4, $00, $00 - dsprite -2, 0, -1, 4, $01, $00 - dsprite -2, 0, 0, 4, $02, $00 - dsprite -1, 0, -2, 4, $03, $00 - dsprite -1, 0, -1, 4, $04, $00 - dsprite -1, 0, 0, 4, $05, $00 - dsprite 0, 0, -2, 4, $05, $60 - dsprite 0, 0, -1, 4, $04, $60 - dsprite 0, 0, 0, 4, $03, $60 - dsprite 1, 0, -2, 4, $02, $60 - dsprite 1, 0, -1, 4, $01, $60 - dsprite 1, 0, 0, 4, $00, $60 + 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 .OAMData_1c: - dsprite -2, 0, -2, 0, $00, $00 - dsprite -2, 0, -1, 0, $01, $00 - dsprite -2, 0, 0, 0, $02, $00 - dsprite -2, 0, 1, 0, $03, $00 - dsprite -1, 0, -2, 0, $04, $00 - dsprite -1, 0, -1, 0, $05, $00 - dsprite -1, 0, 0, 0, $06, $00 - dsprite -1, 0, 1, 0, $07, $00 - dsprite 0, 0, -2, 0, $08, $00 - dsprite 0, 0, -1, 0, $09, $00 - dsprite 0, 0, 0, 0, $0a, $00 - dsprite 0, 0, 1, 0, $0b, $00 - dsprite 1, 0, -2, 0, $0c, $00 - dsprite 1, 0, -1, 0, $0d, $00 - dsprite 1, 0, 0, 0, $0e, $00 - dsprite 1, 0, 1, 0, $0f, $00 + 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 .OAMData_00: - dsprite -2, 0, -2, 0, $00, $00 - dsprite -2, 0, -1, 0, $01, $00 - dsprite -1, 0, -2, 0, $02, $00 - dsprite -1, 0, -1, 0, $03, $00 - dsprite -2, 0, 0, 0, $01, $20 - dsprite -2, 0, 1, 0, $00, $20 - dsprite -1, 0, 0, 0, $03, $20 - dsprite -1, 0, 1, 0, $02, $20 - dsprite 0, 0, -2, 0, $02, $40 - dsprite 0, 0, -1, 0, $03, $40 - dsprite 1, 0, -2, 0, $00, $40 - dsprite 1, 0, -1, 0, $01, $40 - dsprite 0, 0, 0, 0, $03, $60 - dsprite 0, 0, 1, 0, $02, $60 - dsprite 1, 0, 0, 0, $01, $60 - dsprite 1, 0, 1, 0, $00, $60 + 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 .OAMData_09: - dsprite -3, 4, -3, 4, $00, $00 - dsprite -3, 4, -2, 4, $01, $00 - dsprite -2, 4, -3, 4, $02, $00 - dsprite -2, 4, -2, 4, $03, $00 - dsprite -3, 4, 0, 4, $01, $20 - dsprite -3, 4, 1, 4, $00, $20 - dsprite -2, 4, 0, 4, $03, $20 - dsprite -2, 4, 1, 4, $02, $20 - dsprite 0, 4, -3, 4, $02, $40 - dsprite 0, 4, -2, 4, $03, $40 - dsprite 1, 4, -3, 4, $00, $40 - dsprite 1, 4, -2, 4, $01, $40 - dsprite 0, 4, 0, 4, $03, $60 - dsprite 0, 4, 1, 4, $02, $60 - dsprite 1, 4, 0, 4, $01, $60 - dsprite 1, 4, 1, 4, $00, $60 + 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 .OAMData_0c: - dsprite -1, 4, -1, 0, $00, $00 - dsprite -1, 4, 0, 0, $00, $20 + dsprite -1, 4, -1, 0, $00, $0 + dsprite -1, 4, 0, 0, $00, X_FLIP .OAMData_6a: - dsprite 0, 0, -1, 0, $00, $00 - dsprite 0, 0, 0, 0, $00, $20 + dsprite 0, 0, -1, 0, $00, $0 + dsprite 0, 0, 0, 0, $00, X_FLIP .OAMData_04: - dsprite -1, 0, -1, 0, $00, $00 - dsprite -1, 0, 0, 0, $00, $20 - dsprite 0, 0, -1, 0, $01, $00 - dsprite 0, 0, 0, 0, $01, $20 + 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 .OAMData_5d: - dsprite -1, 0, -1, 0, $00, $00 - dsprite -1, 0, 0, 0, $01, $00 - dsprite 0, 0, -1, 0, $00, $40 - dsprite 0, 0, 0, 0, $01, $40 + 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 .OAMData_13: - dsprite -1, 2, -1, 0, $02, $00 - dsprite 0, 2, -1, 0, $03, $00 - dsprite -2, 6, 0, 0, $02, $00 - dsprite -1, 6, 0, 0, $03, $00 + 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 .OAMData_22: - dsprite 1, 0, -11, 0, $01, $00 - dsprite 0, 0, -10, 0, $02, $00 - dsprite 0, 0, -9, 0, $03, $00 - dsprite 0, 0, -8, 0, $00, $00 - dsprite 0, 0, -7, 0, $03, $00 - dsprite 0, 0, -6, 0, $00, $00 - dsprite 0, 0, -5, 0, $03, $00 - dsprite 0, 0, -4, 0, $00, $00 - dsprite 0, 0, -3, 0, $03, $00 - dsprite 0, 0, -2, 0, $00, $00 - dsprite 0, 0, -1, 0, $01, $00 - dsprite -1, 0, 0, 0, $02, $00 - dsprite -1, 0, 1, 0, $03, $00 - dsprite -1, 0, 2, 0, $00, $00 - dsprite -1, 0, 3, 0, $03, $00 - dsprite -1, 0, 4, 0, $00, $00 - dsprite -1, 0, 5, 0, $03, $00 - dsprite -1, 0, 6, 0, $00, $00 - dsprite -1, 0, 7, 0, $03, $00 - dsprite -1, 0, 8, 0, $00, $00 - dsprite -1, 0, 9, 0, $01, $00 - dsprite -2, 0, 10, 0, $02, $00 + 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 .OAMData_2a: - dsprite -3, 4, -1, 0, $00, $00 - dsprite -3, 4, 0, 0, $00, $20 - dsprite -2, 4, -1, 0, $01, $00 - dsprite -2, 4, 0, 0, $01, $20 - dsprite -1, 4, -1, 4, $02, $00 + 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 .OAMData_2b: - dsprite -4, 4, -1, 0, $00, $00 - dsprite -4, 4, 0, 0, $00, $20 - dsprite -3, 4, -1, 0, $01, $00 - dsprite -3, 4, 0, 0, $01, $20 - dsprite -2, 4, -1, 4, $02, $00 - dsprite -1, 4, -1, 4, $02, $00 + 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 .OAMData_2c: - dsprite -5, 4, -1, 0, $00, $00 - dsprite -5, 4, 0, 0, $00, $20 - dsprite -4, 4, -1, 0, $01, $00 - dsprite -4, 4, 0, 0, $01, $20 - dsprite -3, 4, -1, 4, $02, $00 - dsprite -2, 4, -1, 4, $02, $00 - dsprite -1, 4, -1, 4, $02, $00 + 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 .OAMData_2d: - dsprite -6, 4, -1, 0, $00, $00 - dsprite -6, 4, 0, 0, $00, $20 - dsprite -5, 4, -1, 0, $01, $00 - dsprite -5, 4, 0, 0, $01, $20 - dsprite -4, 4, -1, 4, $02, $00 - dsprite -3, 4, -1, 4, $02, $00 - dsprite -2, 4, -1, 4, $02, $00 - dsprite -1, 4, -1, 4, $02, $00 + 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 .OAMData_2e: - dsprite -7, 4, -1, 0, $00, $00 - dsprite -7, 4, 0, 0, $00, $20 - dsprite -6, 4, -1, 0, $01, $00 - dsprite -6, 4, 0, 0, $01, $20 - dsprite -5, 4, -1, 4, $02, $00 - dsprite -4, 4, -1, 4, $02, $00 - dsprite -3, 4, -1, 4, $02, $00 - dsprite -2, 4, -1, 4, $02, $00 - dsprite -1, 4, -1, 4, $02, $00 + 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 .OAMData_2f: - dsprite -1, 0, -1, 0, $00, $00 - dsprite -1, 0, 0, 0, $00, $20 - dsprite 0, 0, -1, 0, $01, $00 - dsprite 0, 0, 0, 0, $00, $60 + 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 .OAMData_30: - dsprite -1, 0, -1, 0, $00, $00 - dsprite -1, 0, 0, 0, $01, $00 - dsprite 0, 0, -1, 0, $01, $60 - dsprite 0, 0, 0, 0, $00, $60 + 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 .OAMData_31: - dsprite -2, 4, -1, 0, $00, $00 - dsprite -2, 4, 0, 0, $01, $00 - dsprite -1, 4, -1, 0, $02, $00 - dsprite -1, 4, 0, 0, $03, $00 - dsprite 0, 4, -1, 0, $04, $00 - dsprite 0, 4, 0, 0, $05, $00 + 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 .OAMData_76: - dsprite -1, 5, -1, 0, $00, $00 - dsprite -1, 1, 0, 0, $00, $00 + dsprite -1, 5, -1, 0, $00, $0 + dsprite -1, 1, 0, 0, $00, $0 .OAMData_32: - dsprite -1, 0, -2, 4, $00, $00 - dsprite -1, 0, 0, 4, $00, $00 - dsprite -3, 0, -2, 4, $00, $00 - dsprite -3, 0, 0, 4, $00, $00 - dsprite -2, 0, -3, 4, $00, $00 - dsprite -2, 0, -2, 4, $01, $00 - dsprite -2, 0, -1, 4, $00, $00 - dsprite -2, 0, 0, 4, $01, $00 - dsprite -2, 0, 1, 4, $00, $00 - dsprite -1, 0, -4, 4, $00, $00 - dsprite -1, 0, -3, 4, $01, $00 - dsprite -1, 0, -1, 4, $01, $00 - dsprite -1, 0, 1, 4, $01, $00 - dsprite -1, 0, 2, 4, $00, $00 + 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 .OAMData_33: - dsprite -2, 0, -2, 4, $00, $00 - dsprite -2, 0, 0, 4, $00, $00 - dsprite -1, 0, -3, 4, $00, $00 - dsprite -1, 0, -2, 4, $01, $00 - dsprite -1, 0, -1, 4, $00, $00 - dsprite -1, 0, 0, 4, $01, $00 - dsprite -1, 0, 1, 4, $00, $00 - dsprite -4, 0, -2, 4, $00, $00 - dsprite -4, 0, 0, 4, $00, $00 - dsprite -3, 0, -3, 4, $00, $00 - dsprite -3, 0, -2, 4, $01, $00 - dsprite -3, 0, -1, 4, $00, $00 - dsprite -3, 0, 0, 4, $01, $00 - dsprite -3, 0, 1, 4, $00, $00 - dsprite -2, 0, -4, 4, $00, $00 - dsprite -2, 0, -3, 4, $01, $00 - dsprite -2, 0, -1, 4, $01, $00 - dsprite -2, 0, 1, 4, $01, $00 - dsprite -2, 0, 2, 4, $00, $00 - dsprite -1, 0, -4, 4, $01, $00 - dsprite -1, 0, 2, 4, $01, $00 + 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 .OAMData_36: - dsprite -7, 4, -1, 0, $00, $00 - dsprite -7, 4, 0, 0, $01, $00 - dsprite -6, 4, -1, 0, $02, $00 - dsprite -6, 4, 0, 0, $03, $00 - dsprite -5, 4, -1, 0, $04, $00 - dsprite -5, 4, 0, 0, $05, $00 - dsprite -4, 4, -1, 0, $06, $00 - dsprite -4, 4, 0, 0, $07, $00 - dsprite -3, 4, -1, 0, $08, $00 - dsprite -3, 4, 0, 0, $09, $00 - dsprite -2, 4, -1, 0, $0a, $00 - dsprite -2, 4, 0, 0, $0b, $00 - dsprite -1, 4, -1, 0, $0c, $00 - dsprite -1, 4, 0, 0, $0d, $00 + 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 .OAMData_3a: - dsprite -7, 4, -1, 0, $0c, $00 - dsprite -7, 4, 0, 0, $0d, $00 - dsprite -6, 4, -1, 0, $08, $00 - dsprite -6, 4, 0, 0, $09, $00 - dsprite -5, 4, -1, 0, $04, $00 - dsprite -5, 4, 0, 0, $05, $00 - dsprite -4, 4, -1, 0, $00, $00 - dsprite -4, 4, 0, 0, $01, $00 - dsprite -3, 4, -1, 0, $02, $00 - dsprite -3, 4, 0, 0, $03, $00 - dsprite -2, 4, 0, 0, $02, $00 - dsprite -2, 4, 1, 0, $03, $00 - dsprite -1, 4, 0, 0, $0a, $00 - dsprite -1, 4, 1, 0, $0b, $00 + 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 .OAMData_3e: - dsprite 1, 4, -2, 0, $00, $40 - dsprite 1, 4, -1, 0, $02, $40 - dsprite 1, 4, 0, 0, $02, $60 - dsprite 1, 4, 1, 0, $00, $60 - dsprite -1, 4, -3, 0, $09, $20 - dsprite -1, 4, -2, 0, $08, $20 - dsprite -1, 4, -1, 0, $06, $00 - dsprite -1, 4, 0, 0, $07, $00 - dsprite -1, 4, 1, 0, $08, $00 - dsprite -1, 4, 2, 0, $09, $00 - dsprite 0, 4, -3, 0, $01, $20 - dsprite 0, 4, -2, 0, $00, $20 - dsprite 0, 4, -1, 0, $0c, $00 - dsprite 0, 4, 0, 0, $0d, $00 - dsprite 0, 4, 1, 0, $00, $00 - dsprite 0, 4, 2, 0, $01, $00 - dsprite -3, 4, -2, 0, $00, $00 - dsprite -3, 4, -1, 0, $02, $00 - dsprite -3, 4, 0, 0, $02, $20 - dsprite -3, 4, 1, 0, $00, $20 - dsprite -2, 4, -3, 0, $03, $20 - dsprite -2, 4, -2, 0, $02, $20 - dsprite -2, 4, -1, 0, $04, $00 - dsprite -2, 4, 0, 0, $05, $00 - dsprite -2, 4, 1, 0, $02, $00 - dsprite -2, 4, 2, 0, $03, $00 + 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 .OAMData_41: - dsprite -3, 4, -2, 0, $00, $00 - dsprite -3, 4, -1, 0, $02, $00 - dsprite -3, 4, 0, 0, $02, $20 - dsprite -3, 4, 1, 0, $00, $20 - dsprite -2, 4, -3, 4, $00, $00 - dsprite -2, 4, -2, 4, $01, $00 - dsprite -2, 4, -1, 0, $05, $20 - dsprite -2, 4, 0, 0, $04, $20 - dsprite -2, 4, 0, 4, $01, $20 - dsprite -2, 4, 1, 4, $00, $20 - dsprite -1, 4, -3, 4, $02, $00 - dsprite -1, 4, -2, 4, $03, $00 - dsprite -1, 4, -1, 0, $07, $20 - dsprite -1, 4, 0, 0, $06, $20 - dsprite -1, 4, 0, 4, $03, $20 - dsprite -1, 4, 1, 4, $02, $20 - dsprite 0, 4, -3, 4, $04, $00 - dsprite 0, 4, -2, 4, $05, $00 - dsprite 0, 4, -1, 0, $0d, $20 - dsprite 0, 4, 0, 0, $0c, $20 - dsprite 0, 4, 0, 4, $05, $20 - dsprite 0, 4, 1, 4, $04, $20 - dsprite 1, 4, -2, 0, $00, $40 - dsprite 1, 4, -1, 0, $02, $40 - dsprite 1, 4, 0, 0, $02, $60 - dsprite 1, 4, 1, 0, $00, $60 + 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 .OAMData_42: - dsprite -3, 0, -1, 4, $02, $00 - dsprite 2, 0, -1, 4, $02, $60 - dsprite -1, 4, -3, 0, $01, $00 - dsprite -1, 4, 2, 0, $01, $60 - dsprite -4, 0, -1, 4, $02, $00 - dsprite 3, 0, -1, 4, $02, $60 - dsprite -1, 4, -4, 0, $01, $00 - dsprite -1, 4, 3, 0, $01, $60 + 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 .OAMData_44: - dsprite -3, 5, -3, 5, $00, $20 - dsprite -3, 5, 1, 3, $00, $00 - dsprite 1, 3, -3, 5, $00, $60 - dsprite 1, 3, 1, 3, $00, $40 - dsprite -4, 5, -4, 5, $00, $20 - dsprite -4, 5, 2, 3, $00, $00 - dsprite 2, 3, -4, 5, $00, $60 - dsprite 2, 3, 2, 3, $00, $40 + 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 .OAMData_46: - dsprite -3, 4, -1, 4, $02, $00 - dsprite 1, 4, -1, 4, $02, $60 - dsprite -1, 4, -3, 4, $01, $00 - dsprite -1, 4, 1, 4, $01, $60 + 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 .OAMData_47: - dsprite -2, 0, -2, 0, $00, $20 - dsprite -2, 0, 1, 0, $00, $00 - dsprite 1, 0, -2, 0, $00, $60 - dsprite 1, 0, 1, 0, $00, $40 + 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 .OAMData_48: - dsprite -3, 0, -1, 4, $00, $00 - dsprite -2, 0, -1, 2, $00, $00 - dsprite -1, 0, -1, 0, $00, $00 - dsprite 0, 0, -1, 0, $00, $00 - dsprite 1, 0, -1, 2, $00, $00 - dsprite 2, 0, -1, 4, $00, $00 + 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 .OAMData_49: - dsprite -1, 4, -2, 0, $00, $20 - dsprite -1, 2, -1, 0, $00, $20 - dsprite -1, 2, 0, 0, $00, $00 - dsprite -1, 4, 1, 0, $00, $00 + 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 .OAMData_4a: - dsprite -1, 4, -1, 0, $00, $60 - dsprite -1, 4, 0, 0, $00, $40 + dsprite -1, 4, -1, 0, $00, X_FLIP | Y_FLIP + dsprite -1, 4, 0, 0, $00, Y_FLIP .OAMData_0f: - dsprite -1, 4, -1, 4, $00, $00 - dsprite -1, 4, -2, 4, $01, $00 - dsprite -1, 4, -1, 4, $01, $20 - dsprite 0, 4, -2, 4, $01, $40 - dsprite 0, 4, -1, 4, $01, $60 + 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 .OAMData_4c: - dsprite -1, 4, -1, 4, $00, $00 - dsprite 0, 2, -2, 6, $00, $00 - dsprite 0, 2, -3, 6, $01, $00 - dsprite 0, 2, -2, 6, $01, $20 - dsprite 1, 2, -3, 6, $01, $40 - dsprite 1, 2, -2, 6, $01, $60 + 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 .OAMData_4d: - dsprite -1, 4, -1, 4, $00, $00 - dsprite 0, 2, -2, 6, $00, $00 - dsprite 1, 0, -2, 0, $00, $00 - dsprite 1, 0, -3, 0, $01, $00 - dsprite 1, 0, -2, 0, $01, $20 - dsprite 2, 0, -3, 0, $01, $40 - dsprite 2, 0, -2, 0, $01, $60 + 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 .OAMData_4f: - dsprite -1, 4, -1, 4, $00, $00 - dsprite 0, 2, -2, 6, $00, $00 - dsprite 1, 0, -2, 0, $00, $00 - dsprite 1, 6, -3, 2, $00, $00 - dsprite 1, 6, -4, 2, $01, $00 - dsprite 1, 6, -3, 2, $01, $20 - dsprite 2, 6, -4, 2, $01, $40 - dsprite 2, 6, -3, 2, $01, $60 + 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 .OAMData_50: - dsprite -1, 4, -1, 4, $00, $00 - dsprite 0, 2, -2, 6, $00, $00 - dsprite 1, 0, -2, 0, $00, $00 - dsprite 1, 6, -3, 2, $00, $00 - dsprite 2, 4, -4, 4, $00, $00 - dsprite 2, 4, -5, 4, $01, $00 - dsprite 2, 4, -4, 4, $01, $20 - dsprite 3, 4, -5, 4, $01, $40 - dsprite 3, 4, -4, 4, $01, $60 + 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 .OAMData_51: - dsprite -1, 4, -1, 4, $00, $00 - dsprite 0, 2, -2, 6, $00, $00 - dsprite 1, 0, -2, 0, $00, $00 - dsprite 1, 6, -3, 2, $00, $00 - dsprite 2, 4, -4, 4, $00, $00 - dsprite 3, 2, -5, 6, $00, $00 - dsprite 3, 2, -6, 6, $01, $00 - dsprite 3, 2, -5, 6, $01, $20 - dsprite 4, 2, -6, 6, $01, $40 - dsprite 4, 2, -5, 6, $01, $60 + 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 .OAMData_59: - dsprite -1, 4, -2, 0, $00, $00 - dsprite -1, 4, -1, 0, $01, $00 - dsprite -1, 4, 0, 0, $01, $20 - dsprite -1, 4, 1, 0, $00, $20 + 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 .OAMData_5a: - dsprite -1, 4, -2, 0, $02, $00 - dsprite -1, 4, -1, 0, $01, $00 - dsprite -1, 4, 0, 0, $01, $20 - dsprite -1, 4, 1, 0, $02, $20 + 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 .OAMData_60: - dsprite -1, 0, -1, 4, $00, $00 + dsprite -1, 0, -1, 4, $00, $0 .OAMData_69: - dsprite 0, 0, -1, 4, $00, $00 + dsprite 0, 0, -1, 4, $00, $0 .OAMData_61: - dsprite -1, 4, -4, 4, $00, $00 - dsprite -1, 4, -3, 4, $01, $00 - dsprite -1, 4, -2, 4, $02, $00 - dsprite -1, 4, -1, 4, $03, $00 - dsprite -1, 4, 0, 4, $04, $00 - dsprite -1, 4, 1, 4, $05, $00 - dsprite -1, 4, 2, 4, $06, $00 - dsprite -2, 4, 1, 4, $07, $00 - dsprite -2, 4, 2, 4, $08, $00 + 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 .OAMData_65: - dsprite -2, 4, -4, 4, $08, $20 - dsprite -2, 4, -3, 4, $07, $20 - dsprite -1, 4, -4, 4, $06, $20 - dsprite -1, 4, -3, 4, $05, $20 - dsprite -1, 4, -2, 4, $04, $20 - dsprite -1, 4, -1, 4, $03, $20 - dsprite -1, 4, 0, 4, $02, $20 - dsprite -1, 4, 1, 4, $01, $20 - dsprite -1, 4, 2, 4, $00, $20 + 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 .OAMData_d4: - dsprite 0, 0, -4, 4, $00, $10 - dsprite 0, 0, -3, 4, $01, $10 - dsprite 0, 0, -2, 4, $02, $10 - dsprite 0, 0, -1, 4, $03, $10 - dsprite 0, 0, 0, 4, $04, $10 - dsprite 0, 0, 1, 4, $05, $10 - dsprite 0, 0, 2, 4, $06, $10 + 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 .OAMData_d6: - dsprite -1, 0, -4, 4, $00, $10 - dsprite 0, 0, -4, 4, $01, $10 - dsprite -1, 0, -3, 4, $02, $10 - dsprite 0, 0, -3, 4, $03, $10 - dsprite -1, 0, -2, 4, $04, $10 - dsprite 0, 0, -2, 4, $05, $10 - dsprite -1, 0, -1, 4, $06, $10 - dsprite 0, 0, -1, 4, $07, $10 - dsprite -1, 0, 0, 4, $08, $10 - dsprite 0, 0, 0, 4, $09, $10 - dsprite -1, 0, 1, 4, $0a, $10 - dsprite 0, 0, 1, 4, $0b, $10 - dsprite -1, 0, 2, 4, $0c, $10 - dsprite 0, 0, 2, 4, $0d, $10 + 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 .OAMData_d5: - dsprite 0, 0, -3, 0, $00, $11 - dsprite 0, 0, -2, 0, $01, $11 - dsprite 0, 0, -1, 0, $02, $11 - dsprite 0, 0, 0, 0, $03, $11 - dsprite 0, 0, 1, 0, $04, $11 - dsprite 0, 0, 2, 0, $05, $11 + 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 .OAMData_d7: - dsprite 0, 0, -3, 0, $00, $11 - dsprite 1, 0, -3, 0, $01, $11 - dsprite 0, 0, -2, 0, $02, $11 - dsprite 1, 0, -2, 0, $03, $11 - dsprite 0, 0, -1, 0, $04, $11 - dsprite 1, 0, -1, 0, $05, $11 - dsprite 0, 0, 0, 0, $06, $11 - dsprite 1, 0, 0, 0, $07, $11 - dsprite 0, 0, 1, 0, $08, $11 - dsprite 1, 0, 1, 0, $09, $11 - dsprite 0, 0, 2, 0, $0a, $11 - dsprite 1, 0, 2, 0, $0b, $11 + 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 .OAMData_6e: - dsprite -2, 4, 0, 4, $00, $00 - dsprite -1, 4, -2, 4, $01, $00 - dsprite -1, 4, -1, 4, $02, $00 - dsprite -1, 4, 0, 4, $03, $00 - dsprite 0, 4, -2, 4, $04, $00 + 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 .OAMData_6f: - dsprite -1, 4, -2, 4, $00, $00 - dsprite -1, 4, -1, 4, $01, $00 - dsprite -1, 4, 0, 4, $02, $00 + dsprite -1, 4, -2, 4, $00, $0 + dsprite -1, 4, -1, 4, $01, $0 + dsprite -1, 4, 0, 4, $02, $0 .OAMData_77: - dsprite -4, 4, 1, 4, $01, $60 + dsprite -4, 4, 1, 4, $01, X_FLIP | Y_FLIP .OAMData_78: - dsprite -4, 4, 1, 4, $00, $00 - dsprite -4, 4, 0, 4, $01, $60 - dsprite -3, 4, 1, 4, $01, $60 + 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 .OAMData_79: - dsprite -4, 4, 1, 4, $01, $00 - dsprite -4, 4, 0, 4, $00, $00 - dsprite -4, 4, -1, 4, $01, $60 - dsprite -3, 4, 1, 4, $00, $00 - dsprite -3, 4, 0, 4, $01, $60 - dsprite -2, 4, 1, 4, $01, $60 + 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 .OAMData_7a: - dsprite -4, 4, -2, 4, $01, $60 - dsprite -4, 4, -1, 4, $00, $00 - dsprite -4, 4, 0, 4, $01, $00 - dsprite -3, 4, -1, 4, $01, $60 - dsprite -3, 4, 0, 4, $00, $00 - dsprite -3, 4, 1, 4, $01, $00 - dsprite -2, 4, 0, 4, $01, $60 - dsprite -2, 4, 1, 4, $00, $00 - dsprite -1, 4, 1, 4, $01, $60 + 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 .OAMData_7b: - dsprite -4, 4, -3, 4, $01, $60 - dsprite -4, 4, -2, 4, $00, $00 - dsprite -4, 4, -1, 4, $01, $00 - dsprite -3, 4, -2, 4, $01, $60 - dsprite -3, 4, -1, 4, $00, $00 - dsprite -3, 4, 0, 4, $01, $00 - dsprite -2, 4, -1, 4, $01, $60 - dsprite -2, 4, 0, 4, $00, $00 - dsprite -2, 4, 1, 4, $01, $00 - dsprite -1, 4, 0, 4, $01, $60 - dsprite -1, 4, 1, 4, $00, $00 - dsprite 0, 4, 1, 4, $01, $60 + 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 .OAMData_7c: - dsprite -4, 4, -3, 4, $00, $00 - dsprite -4, 4, -2, 4, $01, $00 - dsprite -3, 4, -3, 4, $01, $60 - dsprite -3, 4, -2, 4, $00, $00 - dsprite -3, 4, -1, 4, $01, $00 - dsprite -2, 4, -2, 4, $01, $60 - dsprite -2, 4, -1, 4, $00, $00 - dsprite -2, 4, 0, 4, $01, $00 - dsprite -1, 4, -1, 4, $01, $60 - dsprite -1, 4, 0, 4, $00, $00 - dsprite -1, 4, 1, 4, $01, $00 - dsprite 0, 4, 0, 4, $01, $60 - dsprite 0, 4, 1, 4, $00, $00 - dsprite 1, 4, 1, 4, $01, $60 + 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 .OAMData_7d: - dsprite -4, 4, -3, 4, $01, $00 - dsprite -3, 4, -3, 4, $00, $00 - dsprite -3, 4, -2, 4, $01, $00 - dsprite -2, 4, -3, 4, $01, $60 - dsprite -2, 4, -2, 4, $00, $00 - dsprite -2, 4, -1, 4, $01, $00 - dsprite -1, 4, -2, 4, $01, $60 - dsprite -1, 4, -1, 4, $00, $00 - dsprite -1, 4, 0, 4, $01, $00 - dsprite 0, 4, -1, 4, $01, $60 - dsprite 0, 4, 0, 4, $00, $00 - dsprite 0, 4, 1, 4, $01, $00 - dsprite 1, 4, 0, 4, $01, $60 - dsprite 1, 4, 1, 4, $00, $00 - dsprite 2, 4, 1, 4, $01, $60 + 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 .OAMData_70: - dsprite -2, 0, -1, 0, $00, $00 - dsprite -1, 0, -1, 0, $01, $00 - dsprite -2, 0, 0, 0, $00, $20 - dsprite -1, 0, 0, 0, $01, $20 - dsprite 0, 0, -1, 0, $01, $40 - dsprite 1, 0, -1, 0, $00, $40 - dsprite 0, 0, 0, 0, $01, $60 - dsprite 1, 0, 0, 0, $00, $60 + 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 .OAMData_81: - dsprite -1, 0, -1, 0, $00, $00 - dsprite -1, 0, 0, 0, $01, $00 - dsprite 0, 0, -1, 0, $01, $60 - dsprite 0, 0, 0, 0, $00, $60 + 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 .OAMData_87: - dsprite -2, 4, -1, 0, $00, $00 - dsprite -2, 4, 0, 0, $01, $00 - dsprite -1, 4, -1, 0, $02, $00 - dsprite -1, 4, 0, 0, $03, $00 - dsprite -1, 4, -1, 0, $00, $00 - dsprite -1, 4, 0, 0, $01, $00 - dsprite 0, 4, -1, 0, $02, $00 - dsprite 0, 4, 0, 0, $03, $00 - dsprite -3, 4, -1, 0, $00, $00 - dsprite -3, 4, 0, 0, $01, $00 - dsprite -2, 4, -1, 0, $02, $00 - dsprite -2, 4, 0, 0, $03, $00 - dsprite 0, 4, -1, 0, $00, $00 - dsprite 0, 4, 0, 0, $01, $00 - dsprite 1, 4, -1, 0, $02, $00 - dsprite 1, 4, 0, 0, $03, $00 + 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 .OAMData_88: - dsprite -2, 0, -1, 0, $00, $00 - dsprite -2, 0, 0, 0, $01, $00 - dsprite -1, 0, -1, 0, $02, $00 - dsprite -1, 0, 0, 0, $03, $00 - dsprite -1, 0, -1, 0, $00, $00 - dsprite -1, 0, 0, 0, $01, $00 - dsprite 0, 0, -1, 0, $02, $00 - dsprite 0, 0, 0, 0, $03, $00 - dsprite 0, 0, -1, 0, $00, $00 - dsprite 0, 0, 0, 0, $01, $00 - dsprite 1, 0, -1, 0, $02, $00 - dsprite 1, 0, 0, 0, $03, $00 + 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 .OAMData_8a: - dsprite -1, 4, -1, 4, $00, $00 - dsprite -1, 0, 0, 4, $00, $00 - dsprite -2, 4, 1, 4, $00, $00 - dsprite -2, 0, 2, 4, $00, $00 - dsprite -3, 4, 3, 4, $00, $00 - dsprite -3, 0, 4, 4, $00, $00 - dsprite -4, 0, 5, 4, $00, $00 - dsprite -5, 4, 6, 4, $00, $00 + 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 .OAMData_8e: - dsprite -3, 4, -1, 4, $00, $00 - dsprite -2, 4, -1, 4, $01, $00 - dsprite -1, 4, -1, 4, $02, $00 - dsprite 0, 4, -1, 4, $01, $40 - dsprite 1, 4, -1, 4, $00, $40 + 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 .OAMData_8f: - dsprite -1, 4, -2, 0, $00, $00 - dsprite -1, 4, -1, 0, $01, $00 - dsprite -1, 4, 0, 0, $02, $00 - dsprite -1, 4, 1, 0, $03, $00 + 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 .OAMData_93: - dsprite -1, 0, -2, 4, $00, $00 - dsprite -1, 0, -1, 4, $01, $00 - dsprite -1, 0, 0, 4, $02, $00 - dsprite 0, 0, -2, 4, $03, $00 - dsprite 0, 0, -1, 4, $04, $00 - dsprite 0, 0, 0, 4, $05, $00 + 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 .OAMData_99: - dsprite -1, 0, -1, 0, $00, $00 - dsprite -1, 0, 0, 0, $05, $00 - dsprite 0, 0, -1, 0, $01, $00 - dsprite 0, 0, 0, 0, $05, $00 + 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 .OAMData_9b: - dsprite -4, 4, 1, 0, $00, $00 - dsprite -4, 4, 2, 0, $01, $00 - dsprite -3, 4, -1, 0, $02, $00 - dsprite -3, 4, 0, 0, $03, $00 - dsprite -3, 4, 1, 0, $04, $00 - dsprite -3, 4, 2, 0, $05, $00 - dsprite -3, 4, 3, 0, $06, $00 - dsprite -2, 4, -2, 0, $07, $00 - dsprite -2, 4, -1, 0, $08, $00 - dsprite -2, 4, 0, 0, $09, $00 - dsprite -2, 4, 1, 0, $0a, $00 - dsprite -2, 4, 2, 0, $0b, $00 - dsprite -2, 4, 3, 0, $0c, $00 - dsprite -2, 4, 4, 0, $0d, $00 - dsprite -1, 4, -3, 0, $0e, $00 - dsprite -1, 4, -2, 0, $0f, $00 - dsprite -1, 4, -1, 0, $10, $00 - dsprite -1, 4, 0, 0, $11, $00 - dsprite -1, 4, 1, 0, $12, $00 - dsprite -1, 4, 2, 0, $13, $00 - dsprite 0, 4, -5, 0, $14, $00 - dsprite 0, 4, -4, 0, $15, $00 - dsprite 0, 4, -3, 0, $16, $00 - dsprite 0, 4, -2, 0, $17, $00 - dsprite 0, 4, -1, 0, $18, $00 - dsprite 0, 4, 0, 0, $19, $00 - dsprite 0, 4, 1, 0, $1a, $00 - dsprite 0, 4, 2, 0, $1b, $00 - dsprite 0, 4, 3, 0, $1c, $00 - dsprite 1, 4, -5, 0, $1d, $00 - dsprite 1, 4, -4, 0, $1e, $00 - dsprite 1, 4, -2, 0, $1f, $00 - dsprite 1, 4, -1, 0, $20, $00 - dsprite 1, 4, 0, 0, $21, $00 - dsprite 1, 4, 1, 0, $22, $00 - dsprite 2, 4, 0, 0, $23, $00 + 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 .OAMData_9c: - dsprite 0, 4, -1, 0, $02, $00 - dsprite 0, 4, 0, 0, $03, $00 - dsprite -1, 4, -1, 0, $01, $00 - dsprite -1, 4, 0, 0, $01, $20 - dsprite -2, 4, -1, 0, $00, $00 - dsprite -2, 4, 0, 0, $00, $20 + 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 .OAMData_9f: - dsprite -1, 0, -2, 0, $00, $00 - dsprite -1, 0, -1, 0, $01, $00 - dsprite -1, 0, 0, 0, $02, $00 - dsprite -1, 0, 1, 0, $03, $00 - dsprite 0, 0, -2, 0, $04, $00 - dsprite 0, 0, -1, 0, $05, $00 - dsprite 0, 0, 0, 0, $06, $00 - dsprite 0, 0, 1, 0, $07, $00 + 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 .OAMData_a0: - dsprite -2, 4, -1, 4, $00, $00 - dsprite -1, 4, -1, 4, $00, $00 - dsprite 0, 4, -1, 4, $00, $00 - dsprite -3, 4, -1, 4, $00, $00 - dsprite 1, 4, -1, 4, $00, $00 - dsprite -4, 4, -1, 4, $00, $00 - dsprite 2, 4, -1, 4, $00, $00 + 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 .OAMData_a4: - dsprite -2, 4, -2, 4, $00, $00 - dsprite -2, 4, -1, 4, $01, $00 - dsprite -2, 4, 0, 4, $02, $00 - dsprite -1, 4, -2, 4, $03, $00 - dsprite -1, 4, -1, 4, $04, $00 - dsprite -1, 4, 0, 4, $05, $00 - dsprite 0, 4, -2, 4, $00, $40 - dsprite 0, 4, -1, 4, $01, $40 - dsprite 0, 4, 0, 4, $02, $40 + 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 .OAMData_ac: - dsprite -1, 4, -2, 0, $00, $00 - dsprite -1, 4, -1, 0, $01, $00 - dsprite -1, 4, 0, 0, $01, $20 - dsprite -1, 4, 1, 0, $00, $20 + 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 .OAMData_bc: - dsprite -1, 4, -3, 0, $00, $00 - dsprite -1, 4, -2, 0, $01, $00 - dsprite -1, 4, -1, 0, $02, $00 - dsprite -1, 4, 0, 0, $02, $20 - dsprite -1, 4, 1, 0, $01, $20 - dsprite -1, 4, 2, 0, $00, $20 + 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 .OAMData_c1: - dsprite -2, 0, -2, 0, $00, $00 - dsprite -2, 0, -1, 0, $01, $00 - dsprite -2, 0, 0, 0, $02, $00 - dsprite -2, 0, 1, 0, $00, $20 - dsprite -1, 0, -2, 0, $03, $00 - dsprite -1, 0, -1, 0, $04, $00 - dsprite -1, 0, 0, 0, $04, $20 - dsprite -1, 0, 1, 0, $05, $00 - dsprite 0, 0, -2, 0, $05, $60 - dsprite 0, 0, -1, 0, $04, $40 - dsprite 0, 0, 0, 0, $04, $60 - dsprite 0, 0, 1, 0, $03, $60 - dsprite 1, 0, -2, 0, $00, $40 - dsprite 1, 0, -1, 0, $02, $60 - dsprite 1, 0, 0, 0, $01, $60 - dsprite 1, 0, 1, 0, $00, $60 + 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 .OAMData_c2: - dsprite -1, 0, -2, 0, $00, $00 - dsprite -1, 0, -1, 0, $01, $00 - dsprite -1, 0, 0, 0, $00, $60 - dsprite 0, 0, -1, 0, $00, $00 - dsprite 0, 0, 0, 0, $01, $00 - dsprite 0, 0, 1, 0, $00, $60 + 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 .OAMData_c8: - dsprite -1, 0, 1, 4, $00, $00 - dsprite -1, 0, 2, 4, $01, $00 - dsprite 0, 0, -1, 4, $02, $00 - dsprite 0, 0, 0, 4, $03, $00 - dsprite 0, 0, 1, 4, $04, $00 - dsprite 0, 0, 2, 4, $05, $00 + 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 .OAMData_ca: - dsprite -1, 0, -1, 0, $00, $00 - dsprite -1, 0, 0, 0, $01, $60 - dsprite 0, 0, -1, 0, $01, $00 - dsprite 0, 0, 0, 0, $01, $20 + 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 .OAMData_cc: - dsprite -2, 0, -13, 4, $00, $00 - dsprite -4, 0, -11, 4, $00, $00 - dsprite -1, 0, -9, 4, $00, $00 - dsprite -5, 0, -7, 4, $00, $00 - dsprite -3, 0, -5, 4, $00, $00 - dsprite -5, 0, -3, 4, $00, $00 - dsprite -3, 0, -1, 4, $00, $00 - dsprite -3, 0, 0, 4, $00, $00 - dsprite -5, 0, 2, 4, $00, $00 - dsprite 0, 0, 4, 4, $00, $00 - dsprite -2, 0, 6, 4, $00, $00 - dsprite -4, 0, 8, 4, $00, $00 - dsprite -2, 0, 10, 4, $00, $00 + 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 ; cfcf6 diff --git a/engine/battle_anims/engine.asm b/engine/battle_anims/engine.asm index ae3bdde28..55adeae8c 100755 --- a/engine/battle_anims/engine.asm +++ b/engine/battle_anims/engine.asm @@ -88,7 +88,7 @@ BattleAnimOAMUpdate: ; cca09 jp z, .delete push af ld hl, wBattleAnimTempOAMFlags - ld a, [wBattleAnimTemp7] + ld a, [wBattleAnimTempAddSubFlags] xor [hl] and $e0 ld [hl], a @@ -200,7 +200,7 @@ InitBattleAnimBuffer: ; ccaaa and %10000000 ld [wBattleAnimTempOAMFlags], a xor a - ld [wBattleAnimTemp7], a + ld [wBattleAnimTempAddSubFlags], a ld hl, BATTLEANIMSTRUCT_PALETTE add hl, bc ld a, [hl] @@ -208,7 +208,7 @@ InitBattleAnimBuffer: ; ccaaa ld hl, BATTLEANIMSTRUCT_02 add hl, bc ld a, [hl] - ld [wBattleAnimTemp1], a + ld [wBattleAnimTempField02], a ld hl, BATTLEANIMSTRUCT_TILEID add hl, bc ld a, [hli] @@ -239,7 +239,7 @@ InitBattleAnimBuffer: ; ccaaa ld [wBattleAnimTempXCoord], a ld a, [hli] ld d, a - ld a, [wBattleAnimTemp1] + ld a, [wBattleAnimTempField02] cp $ff jr nz, .check_kinesis_softboiled_milkdrink ld a, 5 * 8 diff --git a/engine/battle_anims/helpers.asm b/engine/battle_anims/helpers.asm index a692211d3..0a00b65a4 100755 --- a/engine/battle_anims/helpers.asm +++ b/engine/battle_anims/helpers.asm @@ -29,10 +29,11 @@ GetBattleAnimFrame: ; ce7d1 inc [hl] call .GetPointer ld a, [hli] - cp -2 + cp dorestart_command jr z, .restart - cp -1 + cp endanim_command jr z, .repeat_last + push af ld a, [hl] push hl @@ -41,12 +42,11 @@ GetBattleAnimFrame: ; ce7d1 add hl, bc ld [hl], a pop hl - .okay ld a, [hl] and $c0 srl a - ld [wBattleAnimTemp7], a + ld [wBattleAnimTempAddSubFlags], a pop af ret diff --git a/engine/sprites.asm b/engine/sprites.asm index b52c9642b..4a33eb5cf 100755 --- a/engine/sprites.asm +++ b/engine/sprites.asm @@ -444,9 +444,9 @@ GetSpriteAnimFrame: ; 8d132 inc [hl] call .GetPointer ; load pointer from SpriteAnimFrameData ld a, [hli] - cp -2 + cp dorestart_command jr z, .restart - cp -1 + cp endanim_command jr z, .repeat_last push af @@ -2941,21 +2941,16 @@ wBattleAnimTemp0:: db wBattleAnimTemp1:: db wBattleAnimTemp2:: db wBattleAnimTemp3:: db -wBattleAnimTemp4:: db -wBattleAnimTemp5:: db -wBattleAnimTemp6:: db -wBattleAnimTemp7:: db -wBattleAnimTemp8:: db NEXTU ; d419 wBattleAnimTempOAMFlags:: db - ds 1 +wBattleAnimTempField02:: db wBattleAnimTempTileID:: db wBattleAnimTempXCoord:: db wBattleAnimTempYCoord:: db wBattleAnimTempXOffset:: db wBattleAnimTempYOffset:: db - ds 1 +wBattleAnimTempAddSubFlags:: db wBattleAnimTempPalette:: db ENDU ; d422 |