diff options
Diffstat (limited to 'data')
183 files changed, 4027 insertions, 3873 deletions
diff --git a/data/battle_anims/base_coords.asm b/data/battle_anims/base_coords.asm new file mode 100644 index 00000000..ad67baff --- /dev/null +++ b/data/battle_anims/base_coords.asm @@ -0,0 +1,178 @@ +FrameBlockBaseCoords: + db $10, $68 ; BASECOORD_00 + db $10, $70 ; BASECOORD_01 + db $10, $78 ; BASECOORD_02 + db $10, $80 ; BASECOORD_03 + db $10, $88 ; BASECOORD_04 + db $10, $90 ; BASECOORD_05 + db $10, $98 ; BASECOORD_06 + db $18, $68 ; BASECOORD_07 + db $18, $70 ; BASECOORD_08 + db $18, $78 ; BASECOORD_09 + db $34, $28 ; BASECOORD_0A + db $18, $80 ; BASECOORD_0B + db $18, $88 ; BASECOORD_0C + db $18, $98 ; BASECOORD_0D + db $20, $68 ; BASECOORD_0E + db $20, $70 ; BASECOORD_0F + db $20, $78 ; BASECOORD_10 + db $20, $80 ; BASECOORD_11 + db $20, $88 ; BASECOORD_12 + db $20, $90 ; BASECOORD_13 + db $20, $98 ; BASECOORD_14 + db $28, $68 ; BASECOORD_15 + db $28, $70 ; BASECOORD_16 + db $28, $78 ; BASECOORD_17 + db $28, $80 ; BASECOORD_18 + db $28, $88 ; BASECOORD_19 + db $30, $68 ; BASECOORD_1A + db $30, $70 ; BASECOORD_1B + db $30, $78 ; BASECOORD_1C + db $30, $80 ; BASECOORD_1D + db $30, $90 ; BASECOORD_1E + db $30, $98 ; BASECOORD_1F + db $38, $68 ; BASECOORD_20 + db $38, $78 ; BASECOORD_21 + db $38, $80 ; BASECOORD_22 + db $38, $88 ; BASECOORD_23 + db $40, $68 ; BASECOORD_24 + db $40, $70 ; BASECOORD_25 + db $40, $78 ; BASECOORD_26 + db $40, $80 ; BASECOORD_27 + db $40, $88 ; BASECOORD_28 + db $40, $98 ; BASECOORD_29 + db $10, $60 ; BASECOORD_2A + db $18, $60 ; BASECOORD_2B + db $20, $60 ; BASECOORD_2C + db $28, $60 ; BASECOORD_2D + db $30, $60 ; BASECOORD_2E + db $40, $60 ; BASECOORD_2F + db $58, $28 ; BASECOORD_30 + db $43, $38 ; BASECOORD_31 + db $33, $48 ; BASECOORD_32 + db $20, $58 ; BASECOORD_33 + db $32, $78 ; BASECOORD_34 + db $58, $58 ; BASECOORD_35 + db $2C, $6C ; BASECOORD_36 + db $34, $80 ; BASECOORD_37 + db $48, $70 ; BASECOORD_38 + db $42, $36 ; BASECOORD_39 + db $38, $44 ; BASECOORD_3A + db $40, $52 ; BASECOORD_3B + db $48, $60 ; BASECOORD_3C + db $3E, $6E ; BASECOORD_3D + db $28, $7C ; BASECOORD_3E + db $28, $8A ; BASECOORD_3F + db $50, $3C ; BASECOORD_40 + db $48, $50 ; BASECOORD_41 + db $40, $64 ; BASECOORD_42 + db $38, $38 ; BASECOORD_43 + db $50, $30 ; BASECOORD_44 + db $50, $38 ; BASECOORD_45 + db $50, $40 ; BASECOORD_46 + db $50, $48 ; BASECOORD_47 + db $50, $50 ; BASECOORD_48 + db $48, $58 ; BASECOORD_49 + db $50, $44 ; BASECOORD_4A + db $48, $48 ; BASECOORD_4B + db $48, $4C ; BASECOORD_4C + db $40, $50 ; BASECOORD_4D + db $40, $54 ; BASECOORD_4E + db $38, $58 ; BASECOORD_4F + db $38, $5C ; BASECOORD_50 + db $30, $64 ; BASECOORD_51 + db $48, $40 ; BASECOORD_52 + db $48, $39 ; BASECOORD_53 + db $24, $88 ; BASECOORD_54 + db $24, $70 ; BASECOORD_55 + db $1C, $70 ; BASECOORD_56 + db $1C, $88 ; BASECOORD_57 + db $34, $68 ; BASECOORD_58 + db $34, $88 ; BASECOORD_59 + db $68, $50 ; BASECOORD_5A + db $60, $50 ; BASECOORD_5B + db $68, $60 ; BASECOORD_5C + db $58, $50 ; BASECOORD_5D + db $60, $60 ; BASECOORD_5E + db $68, $40 ; BASECOORD_5F + db $40, $40 ; BASECOORD_60 + db $38, $40 ; BASECOORD_61 + db $0B, $60 ; BASECOORD_62 + db $44, $48 ; BASECOORD_63 + db $40, $14 ; BASECOORD_64 + db $48, $1C ; BASECOORD_65 + db $50, $24 ; BASECOORD_66 + db $4C, $24 ; BASECOORD_67 + db $10, $62 ; BASECOORD_68 + db $12, $62 ; BASECOORD_69 + db $12, $60 ; BASECOORD_6A + db $20, $72 ; BASECOORD_6B + db $22, $72 ; BASECOORD_6C + db $22, $70 ; BASECOORD_6D + db $28, $62 ; BASECOORD_6E + db $50, $0A ; BASECOORD_6F + db $52, $0A ; BASECOORD_70 + db $38, $30 ; BASECOORD_71 + db $40, $48 ; BASECOORD_72 + db $30, $48 ; BASECOORD_73 + db $40, $30 ; BASECOORD_74 + db $30, $40 ; BASECOORD_75 + db $38, $48 ; BASECOORD_76 + db $40, $4A ; BASECOORD_77 + db $48, $4B ; BASECOORD_78 + db $50, $4C ; BASECOORD_79 + db $58, $4D ; BASECOORD_7A + db $60, $4D ; BASECOORD_7B + db $68, $4D ; BASECOORD_7C + db $38, $10 ; BASECOORD_7D + db $50, $10 ; BASECOORD_7E + db $38, $28 ; BASECOORD_7F + db $48, $18 ; BASECOORD_80 + db $40, $20 ; BASECOORD_81 + db $48, $20 ; BASECOORD_82 + db $40, $3C ; BASECOORD_83 + db $38, $50 ; BASECOORD_84 + db $28, $64 ; BASECOORD_85 + db $1C, $90 ; BASECOORD_86 + db $24, $80 ; BASECOORD_87 + db $2C, $70 ; BASECOORD_88 + db $30, $38 ; BASECOORD_89 + db $10, $50 ; BASECOORD_8A + db $3C, $40 ; BASECOORD_8B + db $40, $58 ; BASECOORD_8C + db $30, $58 ; BASECOORD_8D + db $58, $48 ; BASECOORD_8E + db $50, $58 ; BASECOORD_8F + db $48, $68 ; BASECOORD_90 + db $40, $18 ; BASECOORD_91 + db $28, $58 ; BASECOORD_92 + db $40, $38 ; BASECOORD_93 + db $48, $38 ; BASECOORD_94 + db $08, $70 ; BASECOORD_95 + db $44, $1C ; BASECOORD_96 + db $3C, $58 ; BASECOORD_97 + db $38, $60 ; BASECOORD_98 + db $08, $60 ; BASECOORD_99 + db $38, $70 ; BASECOORD_9A + db $38, $6C ; BASECOORD_9B + db $38, $64 ; BASECOORD_9C + db $1C, $74 ; BASECOORD_9D + db $2E, $74 ; BASECOORD_9E + db $34, $50 ; BASECOORD_9F + db $2F, $60 ; BASECOORD_A0 + db $31, $70 ; BASECOORD_A1 + db $4C, $30 ; BASECOORD_A2 + db $3B, $40 ; BASECOORD_A3 + db $2D, $50 ; BASECOORD_A4 + db $26, $60 ; BASECOORD_A5 + db $2D, $70 ; BASECOORD_A6 + db $28, $50 ; BASECOORD_A7 + db $1E, $60 ; BASECOORD_A8 + db $29, $70 ; BASECOORD_A9 + db $16, $60 ; BASECOORD_AA + db $14, $58 ; BASECOORD_AB + db $12, $54 ; BASECOORD_AC + db $14, $50 ; BASECOORD_AD + db $18, $4C ; BASECOORD_AE + db $1C, $48 ; BASECOORD_AF + db $48, $28 ; BASECOORD_B0 diff --git a/data/battle_anims/frame_blocks.asm b/data/battle_anims/frame_blocks.asm new file mode 100644 index 00000000..8b9b0919 --- /dev/null +++ b/data/battle_anims/frame_blocks.asm @@ -0,0 +1,1238 @@ +FrameBlockPointers: + dw FrameBlock00 + dw FrameBlock01 + dw FrameBlock02 + dw FrameBlock03 + dw FrameBlock04 + dw FrameBlock05 + dw FrameBlock06 + dw FrameBlock07 + dw FrameBlock08 + dw FrameBlock09 + dw FrameBlock0a + dw FrameBlock0b + dw FrameBlock0c + dw FrameBlock0d + dw FrameBlock0e + dw FrameBlock0f + dw FrameBlock10 + dw FrameBlock11 + dw FrameBlock12 + dw FrameBlock13 + dw FrameBlock14 + dw FrameBlock15 + dw FrameBlock16 + dw FrameBlock17 + dw FrameBlock18 + dw FrameBlock19 + dw FrameBlock1a + dw FrameBlock1b + dw FrameBlock1c + dw FrameBlock1d + dw FrameBlock1e + dw FrameBlock1f + dw FrameBlock20 + dw FrameBlock21 + dw FrameBlock22 + dw FrameBlock23 + dw FrameBlock24 + dw FrameBlock25 + dw FrameBlock26 + dw FrameBlock27 + dw FrameBlock28 + dw FrameBlock29 + dw FrameBlock2a + dw FrameBlock2b + dw FrameBlock2c + dw FrameBlock2d + dw FrameBlock2e + dw FrameBlock2f + dw FrameBlock30 + dw FrameBlock31 + dw FrameBlock32 + dw FrameBlock33 + dw FrameBlock34 + dw FrameBlock35 + dw FrameBlock36 + dw FrameBlock37 + dw FrameBlock38 + dw FrameBlock39 + dw FrameBlock3a + dw FrameBlock3b + dw FrameBlock3c + dw FrameBlock3d + dw FrameBlock3e + dw FrameBlock3f + dw FrameBlock40 + dw FrameBlock41 + dw FrameBlock42 + dw FrameBlock43 + dw FrameBlock44 + dw FrameBlock45 + dw FrameBlock46 + dw FrameBlock47 + dw SmallBlackCircleFrameBlock + dw LargeBlackCircleFrameBlock + dw FrameBlock4a + dw FrameBlock4b + dw FrameBlock4c + dw FrameBlock4d + dw FrameBlock4e + dw FrameBlock4f + dw FrameBlock50 + dw FrameBlock51 + dw FrameBlock52 + dw FrameBlock53 + dw FrameBlock54 + dw FrameBlock55 + dw FrameBlock56 + dw FrameBlock57 + dw FrameBlock58 + dw FrameBlock59 + dw FrameBlock5a + dw FrameBlock5b + dw FrameBlock5c + dw FrameBlock5d + dw FrameBlock5e + dw FrameBlock5f + dw FrameBlock60 + dw FrameBlock61 + dw FrameBlock62 + dw FrameBlock63 + dw FrameBlock64 + dw FrameBlock65 + dw FrameBlock66 + dw FrameBlock67 + dw FrameBlock68 + dw FrameBlock69 + dw FrameBlock6a + dw FrameBlock6b + dw FrameBlock6c + dw FrameBlock6d + dw FrameBlock6e + dw FrameBlock6f + dw FrameBlock70 + dw FrameBlock71 + dw FrameBlock72 + dw FrameBlock73 + dw FrameBlock74 + dw FrameBlock75 + dw FrameBlock76 + dw FrameBlock77 + dw FrameBlock78 + dw FrameBlock79 + +FrameBlock01: + db 9 ; # + dbsprite 0, 0, 0, 0, $2c, 0 + dbsprite 1, 0, 0, 0, $2d, 0 + dbsprite 2, 0, 0, 0, $2c, OAM_HFLIP + dbsprite 0, 1, 0, 0, $3c, 0 + dbsprite 1, 1, 0, 0, $3d, 0 + dbsprite 2, 1, 0, 0, $3c, OAM_HFLIP + dbsprite 0, 2, 0, 0, $2c, OAM_VFLIP + dbsprite 1, 2, 0, 0, $2d, OAM_VFLIP + dbsprite 2, 2, 0, 0, $2c, OAM_HFLIP | OAM_VFLIP + +FrameBlock02: + db 16 ; # + dbsprite 0, 0, 0, 0, $20, 0 + dbsprite 1, 0, 0, 0, $21, 0 + dbsprite 2, 0, 0, 0, $21, OAM_HFLIP + dbsprite 3, 0, 0, 0, $20, OAM_HFLIP + dbsprite 0, 1, 0, 0, $30, 0 + dbsprite 1, 1, 0, 0, $31, 0 + dbsprite 2, 1, 0, 0, $31, OAM_HFLIP + dbsprite 3, 1, 0, 0, $30, OAM_HFLIP + dbsprite 0, 2, 0, 0, $30, OAM_VFLIP + dbsprite 1, 2, 0, 0, $31, OAM_VFLIP + dbsprite 2, 2, 0, 0, $31, OAM_HFLIP | OAM_VFLIP + dbsprite 3, 2, 0, 0, $30, OAM_HFLIP | OAM_VFLIP + dbsprite 0, 3, 0, 0, $20, OAM_VFLIP + dbsprite 1, 3, 0, 0, $21, OAM_VFLIP + dbsprite 2, 3, 0, 0, $21, OAM_HFLIP | OAM_VFLIP + dbsprite 3, 3, 0, 0, $20, OAM_HFLIP | OAM_VFLIP + +FrameBlock03: + db 4 ; # + dbsprite 0, 0, 0, 0, $02, 0 + dbsprite 1, 0, 0, 0, $02, OAM_HFLIP + dbsprite 0, 1, 0, 0, $12, 0 + dbsprite 1, 1, 0, 0, $12, OAM_HFLIP + +FrameBlock04: + db 4 ; # + dbsprite 0, 0, 0, 0, $06, 0 + dbsprite 1, 0, 0, 0, $07, 0 + dbsprite 0, 1, 0, 0, $16, 0 + dbsprite 1, 1, 0, 0, $17, 0 + +FrameBlock05: + db 4 ; # + dbsprite 0, 0, 0, 0, $07, OAM_HFLIP + dbsprite 1, 0, 0, 0, $06, OAM_HFLIP + dbsprite 0, 1, 0, 0, $17, OAM_HFLIP + dbsprite 1, 1, 0, 0, $16, OAM_HFLIP + +FrameBlock06: + db 12 ; # + dbsprite 1, 0, 0, 0, $23, 0 + dbsprite 0, 1, 0, 0, $32, 0 + dbsprite 1, 1, 0, 0, $33, 0 + dbsprite 2, 0, 0, 0, $23, OAM_HFLIP + dbsprite 2, 1, 0, 0, $33, OAM_HFLIP + dbsprite 3, 1, 0, 0, $32, OAM_HFLIP + dbsprite 0, 2, 0, 0, $32, OAM_VFLIP + dbsprite 1, 2, 0, 0, $33, OAM_VFLIP + dbsprite 1, 3, 0, 0, $23, OAM_VFLIP + dbsprite 2, 2, 0, 0, $33, OAM_HFLIP | OAM_VFLIP + dbsprite 3, 2, 0, 0, $32, OAM_HFLIP | OAM_VFLIP + dbsprite 2, 3, 0, 0, $23, OAM_HFLIP | OAM_VFLIP + +FrameBlock07: + db 16 ; # + dbsprite 0, 0, 0, 0, $20, 0 + dbsprite 1, 0, 0, 0, $21, 0 + dbsprite 0, 1, 0, 0, $30, 0 + dbsprite 1, 1, 0, 0, $31, 0 + dbsprite 2, 0, 0, 0, $21, OAM_HFLIP + dbsprite 3, 0, 0, 0, $20, OAM_HFLIP + dbsprite 2, 1, 0, 0, $31, OAM_HFLIP + dbsprite 3, 1, 0, 0, $30, OAM_HFLIP + dbsprite 0, 2, 0, 0, $30, OAM_VFLIP + dbsprite 1, 2, 0, 0, $31, OAM_VFLIP + dbsprite 0, 3, 0, 0, $20, OAM_VFLIP + dbsprite 1, 3, 0, 0, $21, OAM_VFLIP + dbsprite 2, 2, 0, 0, $31, OAM_HFLIP | OAM_VFLIP + dbsprite 3, 2, 0, 0, $30, OAM_HFLIP | OAM_VFLIP + dbsprite 2, 3, 0, 0, $21, OAM_HFLIP | OAM_VFLIP + dbsprite 3, 3, 0, 0, $20, OAM_HFLIP | OAM_VFLIP + +FrameBlock08: + db 16 ; # + dbsprite 0, 0, 0, 0, $20, 0 + dbsprite 1, 0, 0, 0, $21, 0 + dbsprite 0, 1, 0, 0, $30, 0 + dbsprite 1, 1, 0, 0, $31, 0 + dbsprite 3, 0, 0, 0, $21, OAM_HFLIP + dbsprite 4, 0, 0, 0, $20, OAM_HFLIP + dbsprite 3, 1, 0, 0, $31, OAM_HFLIP + dbsprite 4, 1, 0, 0, $30, OAM_HFLIP + dbsprite 0, 3, 0, 0, $30, OAM_VFLIP + dbsprite 1, 3, 0, 0, $31, OAM_VFLIP + dbsprite 0, 4, 0, 0, $20, OAM_VFLIP + dbsprite 1, 4, 0, 0, $21, OAM_VFLIP + dbsprite 3, 3, 0, 0, $31, OAM_HFLIP | OAM_VFLIP + dbsprite 4, 3, 0, 0, $30, OAM_HFLIP | OAM_VFLIP + dbsprite 3, 4, 0, 0, $21, OAM_HFLIP | OAM_VFLIP + dbsprite 4, 4, 0, 0, $20, OAM_HFLIP | OAM_VFLIP + +FrameBlock09: + db 12 ; # + dbsprite 0, 0, 0, 0, $24, 0 + dbsprite 1, 0, 0, 0, $25, 0 + dbsprite 0, 1, 0, 0, $34, 0 + dbsprite 3, 0, 0, 0, $25, OAM_HFLIP + dbsprite 4, 0, 0, 0, $24, OAM_HFLIP + dbsprite 4, 1, 0, 0, $34, OAM_HFLIP + dbsprite 0, 3, 0, 0, $34, OAM_VFLIP + dbsprite 0, 4, 0, 0, $24, OAM_VFLIP + dbsprite 1, 4, 0, 0, $25, OAM_VFLIP + dbsprite 4, 3, 0, 0, $34, OAM_HFLIP | OAM_VFLIP + dbsprite 3, 4, 0, 0, $25, OAM_HFLIP | OAM_VFLIP + dbsprite 4, 4, 0, 0, $24, OAM_HFLIP | OAM_VFLIP + +FrameBlock0a: + db 12 ; # + dbsprite 0, 0, 0, 0, $24, 0 + dbsprite 1, 0, 0, 0, $25, 0 + dbsprite 0, 1, 0, 0, $34, 0 + dbsprite 4, 0, 0, 0, $25, OAM_HFLIP + dbsprite 5, 0, 0, 0, $24, OAM_HFLIP + dbsprite 5, 1, 0, 0, $34, OAM_HFLIP + dbsprite 0, 4, 0, 0, $34, OAM_VFLIP + dbsprite 0, 5, 0, 0, $24, OAM_VFLIP + dbsprite 1, 5, 0, 0, $25, OAM_VFLIP + dbsprite 5, 4, 0, 0, $34, OAM_HFLIP | OAM_VFLIP + dbsprite 4, 5, 0, 0, $25, OAM_HFLIP | OAM_VFLIP + dbsprite 5, 5, 0, 0, $24, OAM_HFLIP | OAM_VFLIP + +FrameBlock0b: + db 4 ; # + dbsprite 0, 0, 0, 0, $05, 0 + dbsprite 1, 0, 0, 0, $05, OAM_HFLIP + dbsprite 0, 1, 0, 0, $15, 0 + dbsprite 1, 1, 0, 0, $15, OAM_HFLIP + +FrameBlock0c: + db 4 ; # + dbsprite 0, 0, 0, 0, $04, 0 + dbsprite 1, 0, 0, 0, $04, OAM_HFLIP + dbsprite 0, 1, 0, 0, $14, 0 + dbsprite 1, 1, 0, 0, $14, OAM_HFLIP + +FrameBlock0d: + db 8 ; # + dbsprite 0, 0, 0, 0, $0c, 0 + dbsprite 1, 0, 0, 0, $0d, 0 + dbsprite 0, 1, 0, 0, $1c, 0 + dbsprite 1, 1, 0, 0, $1d, 0 + dbsprite 0, 2, 0, 0, $1d, OAM_HFLIP | OAM_VFLIP + dbsprite 1, 2, 0, 0, $1c, OAM_HFLIP | OAM_VFLIP + dbsprite 0, 3, 0, 0, $0d, OAM_HFLIP | OAM_VFLIP + dbsprite 1, 3, 0, 0, $0c, OAM_HFLIP | OAM_VFLIP + +FrameBlock0e: + db 4 ; # + dbsprite 0, 4, 0, 0, $0c, 0 + dbsprite 1, 4, 0, 0, $0d, 0 + dbsprite 0, 5, 0, 0, $1c, 0 + dbsprite 1, 5, 0, 0, $1d, 0 + +FrameBlock0f: + db 4 ; # + dbsprite 0, 6, 0, 0, $1d, OAM_HFLIP | OAM_VFLIP + dbsprite 1, 6, 0, 0, $1c, OAM_HFLIP | OAM_VFLIP + dbsprite 0, 7, 0, 0, $0d, OAM_HFLIP | OAM_VFLIP + dbsprite 1, 7, 0, 0, $0c, OAM_HFLIP | OAM_VFLIP + +FrameBlock10: + db 8 ; # + dbsprite 0, 0, 0, 0, $0e, 0 + dbsprite 1, 0, 0, 0, $0f, 0 + dbsprite 0, 1, 0, 0, $1e, 0 + dbsprite 1, 1, 0, 0, $1f, 0 + dbsprite 2, 0, 0, 0, $0f, OAM_HFLIP + dbsprite 3, 0, 0, 0, $0e, OAM_HFLIP + dbsprite 2, 1, 0, 0, $1f, OAM_HFLIP + dbsprite 3, 1, 0, 0, $1e, OAM_HFLIP + +FrameBlock11: + db 8 ; # + dbsprite 0, 0, 0, 0, $0e, 0 + dbsprite 1, 0, 0, 0, $0f, 0 + dbsprite 0, 1, 0, 0, $1e, 0 + dbsprite 1, 1, 0, 0, $1f, 0 + dbsprite 4, 0, 0, 0, $0f, OAM_HFLIP + dbsprite 5, 0, 0, 0, $0e, OAM_HFLIP + dbsprite 4, 1, 0, 0, $1f, OAM_HFLIP + dbsprite 5, 1, 0, 0, $1e, OAM_HFLIP + +FrameBlock12: + db 3 ; # + dbsprite 0, 0, 0, 0, $37, 0 + dbsprite 2, 1, 0, 0, $37, 0 + dbsprite 4, 0, 0, 0, $37, 0 + +FrameBlock13: + db 4 ; # + dbsprite 0, 0, 0, 0, $36, 0 + dbsprite 1, 0, 0, 0, $36, OAM_HFLIP + dbsprite 0, 1, 0, 0, $36, OAM_VFLIP + dbsprite 1, 1, 0, 0, $36, OAM_HFLIP | OAM_VFLIP + +FrameBlock14: + db 8 ; # + dbsprite 2, 0, 0, 0, $28, 0 + dbsprite 3, 0, 0, 0, $28, OAM_HFLIP + dbsprite 2, 1, 0, 0, $38, 0 + dbsprite 3, 1, 0, 0, $38, OAM_HFLIP + dbsprite 4, 0, 0, 0, $36, 0 + dbsprite 5, 0, 0, 0, $36, OAM_HFLIP + dbsprite 4, 1, 0, 0, $36, OAM_VFLIP + dbsprite 5, 1, 0, 0, $36, OAM_HFLIP | OAM_VFLIP + +FrameBlock15: + db 12 ; # + dbsprite 0, 0, 0, 0, $28, 0 + dbsprite 1, 0, 0, 0, $28, OAM_HFLIP + dbsprite 0, 1, 0, 0, $38, 0 + dbsprite 1, 1, 0, 0, $38, OAM_HFLIP + dbsprite 2, 0, 0, 0, $29, 0 + dbsprite 3, 0, 0, 0, $29, OAM_HFLIP + dbsprite 2, 1, 0, 0, $39, 0 + dbsprite 3, 1, 0, 0, $39, OAM_HFLIP + dbsprite 4, 0, 0, 0, $28, 0 + dbsprite 5, 0, 0, 0, $28, OAM_HFLIP + dbsprite 4, 1, 0, 0, $38, 0 + dbsprite 5, 1, 0, 0, $38, OAM_HFLIP + +FrameBlock16: + db 8 ; # + dbsprite 0, 0, 0, 0, $29, 0 + dbsprite 1, 0, 0, 0, $29, OAM_HFLIP + dbsprite 0, 1, 0, 0, $39, 0 + dbsprite 1, 1, 0, 0, $39, OAM_HFLIP + dbsprite 4, 0, 0, 0, $29, 0 + dbsprite 5, 0, 0, 0, $29, OAM_HFLIP + dbsprite 4, 1, 0, 0, $39, 0 + dbsprite 5, 1, 0, 0, $39, OAM_HFLIP + +FrameBlock17: + db 4 ; # + dbsprite 0, 0, 0, 0, $08, 0 + dbsprite 1, 0, 0, 0, $09, 0 + dbsprite 0, 1, 0, 0, $18, 0 + dbsprite 1, 1, 0, 0, $19, 0 + +FrameBlock18: + db 1 ; # + dbsprite 0, 3, 0, 0, $45, OAM_HFLIP | OAM_VFLIP + +FrameBlock19: + db 2 ; # + dbsprite 1, 3, 0, 0, $45, 0 + dbsprite 1, 2, 0, 0, $46, OAM_HFLIP | OAM_VFLIP + +FrameBlock1a: + db 2 ; # + dbsprite 2, 2, 0, 0, $45, OAM_HFLIP | OAM_VFLIP + dbsprite 2, 3, 0, 0, $46, 0 + +FrameBlock1b: + db 2 ; # + dbsprite 3, 2, 0, 0, $45, 0 + dbsprite 3, 1, 0, 0, $46, OAM_HFLIP | OAM_VFLIP + +FrameBlock1c: + db 2 ; # + dbsprite 4, 1, 0, 0, $45, OAM_HFLIP | OAM_VFLIP + dbsprite 4, 2, 0, 0, $46, 0 + +FrameBlock1d: + db 2 ; # + dbsprite 5, 1, 0, 0, $45, 0 + dbsprite 5, 0, 0, 0, $46, OAM_HFLIP | OAM_VFLIP + +FrameBlock1e: + db 2 ; # + dbsprite 6, 0, 0, 0, $45, OAM_HFLIP | OAM_VFLIP + dbsprite 6, 1, 0, 0, $46, 0 + +FrameBlock75: + db 4 ; # + dbsprite 0, 0, 0, 0, $43, 0 + dbsprite 1, 0, 0, 0, $43, OAM_HFLIP + dbsprite 0, 1, 0, 0, $22, 0 + dbsprite 1, 1, 0, 0, $43, OAM_HFLIP | OAM_VFLIP + +FrameBlock1f: + db 2 ; # + dbsprite 0, 0, 0, 0, $03, 0 + dbsprite 6, 0, 0, 0, $03, OAM_HFLIP + +FrameBlock20: + db 6 ; # + dbsprite 0, 0, 0, 0, $03, 0 + dbsprite 6, 0, 0, 0, $03, OAM_HFLIP + dbsprite 1, 1, 0, 0, $03, 0 + dbsprite 5, 1, 0, 0, $03, OAM_HFLIP + dbsprite 0, 1, 0, 0, $13, 0 + dbsprite 6, 1, 0, 0, $13, OAM_HFLIP + +FrameBlock21: + db 12 ; # + dbsprite 0, 0, 0, 0, $03, 0 + dbsprite 6, 0, 0, 0, $03, OAM_HFLIP + dbsprite 1, 1, 0, 0, $03, 0 + dbsprite 5, 1, 0, 0, $03, OAM_HFLIP + dbsprite 0, 1, 0, 0, $13, 0 + dbsprite 6, 1, 0, 0, $13, OAM_HFLIP + dbsprite 2, 2, 0, 0, $03, 0 + dbsprite 4, 2, 0, 0, $03, OAM_HFLIP + dbsprite 1, 2, 0, 0, $13, 0 + dbsprite 5, 2, 0, 0, $13, OAM_HFLIP + dbsprite 0, 2, 0, 0, $03, 0 + dbsprite 6, 2, 0, 0, $03, OAM_HFLIP + +FrameBlock22: + db 19 ; # + dbsprite 0, 0, 0, 0, $03, 0 + dbsprite 0, 1, 0, 0, $13, 0 + dbsprite 0, 2, 0, 0, $03, 0 + dbsprite 0, 3, 0, 0, $13, 0 + dbsprite 1, 1, 0, 0, $03, 0 + dbsprite 1, 2, 0, 0, $13, 0 + dbsprite 1, 3, 0, 0, $03, 0 + dbsprite 2, 2, 0, 0, $03, 0 + dbsprite 2, 3, 0, 0, $13, 0 + dbsprite 3, 3, 0, 0, $03, 0 + dbsprite 4, 2, 0, 0, $03, OAM_HFLIP + dbsprite 4, 3, 0, 0, $13, OAM_HFLIP + dbsprite 5, 1, 0, 0, $03, OAM_HFLIP + dbsprite 5, 2, 0, 0, $13, OAM_HFLIP + dbsprite 5, 3, 0, 0, $03, OAM_HFLIP + dbsprite 6, 0, 0, 0, $03, OAM_HFLIP + dbsprite 6, 1, 0, 0, $13, OAM_HFLIP + dbsprite 6, 2, 0, 0, $03, OAM_HFLIP + dbsprite 6, 3, 0, 0, $13, OAM_HFLIP + +FrameBlock23: + db 4 ; # + dbsprite 0, 0, 0, 0, $0a, 0 + dbsprite 1, 0, 0, 0, $0b, 0 + dbsprite 0, 1, 0, 0, $1a, 0 + dbsprite 1, 1, 0, 0, $1b, 0 + +FrameBlock24: + db 2 ; # + dbsprite 0, 1, 0, 0, $0a, 0 + dbsprite 1, 1, 0, 0, $0b, 0 + +FrameBlock25: + db 12 ; # + dbsprite 0, 2, 0, 0, $0a, 0 + dbsprite 1, 2, 0, 0, $0b, 0 + dbsprite 0, 3, 0, 0, $1a, 0 + dbsprite 1, 3, 0, 0, $1b, 0 + dbsprite 2, 0, 0, 0, $0a, 0 + dbsprite 3, 0, 0, 0, $0b, 0 + dbsprite 2, 1, 0, 0, $1a, 0 + dbsprite 3, 1, 0, 0, $1b, 0 + dbsprite 4, 1, 0, 0, $0a, 0 + dbsprite 5, 1, 0, 0, $0b, 0 + dbsprite 4, 2, 0, 0, $1a, 0 + dbsprite 5, 2, 0, 0, $1b, 0 + +FrameBlock26: + db 4 ; # + dbsprite 2, 0, 0, 0, $44, 0 + dbsprite 3, 0, 0, 0, $44, OAM_HFLIP + dbsprite 2, 1, 0, 0, $44, OAM_VFLIP + dbsprite 3, 1, 0, 0, $44, OAM_HFLIP | OAM_VFLIP + +FrameBlock27: + db 5 ; # + dbsprite 1, 1, 0, 0, $44, 0 + dbsprite 2, 1, 0, 0, $44, OAM_HFLIP + dbsprite 1, 2, 0, 0, $44, OAM_VFLIP + dbsprite 2, 2, 0, 0, $44, OAM_HFLIP | OAM_VFLIP + dbsprite 3, 0, 0, 0, $47, 0 + +FrameBlock28: + db 6 ; # + dbsprite 0, 2, 0, 0, $44, 0 + dbsprite 1, 2, 0, 0, $44, OAM_HFLIP + dbsprite 0, 3, 0, 0, $44, OAM_VFLIP + dbsprite 1, 3, 0, 0, $44, OAM_HFLIP | OAM_VFLIP + dbsprite 2, 1, 0, 0, $47, 0 + dbsprite 2, 0, 6, 2, $47, 0 + +FrameBlock29: + db 4 ; # + dbsprite 0, 3, 0, 0, $47, 0 + dbsprite 0, 2, 6, 2, $47, 0 + dbsprite 1, 1, 4, 4, $47, 0 + dbsprite 2, 0, 2, 6, $47, 0 + +FrameBlock2a: + db 4 ; # + dbsprite 0, 0, 0, 0, $44, 0 + dbsprite 1, 0, 0, 0, $44, OAM_HFLIP + dbsprite 0, 1, 0, 0, $44, OAM_VFLIP + dbsprite 1, 1, 0, 0, $44, OAM_HFLIP | OAM_VFLIP + +FrameBlock2b: + db 2 ; # + dbsprite 0, 0, 2, 6, $47, 0 + dbsprite 1, 0, 0, 0, $47, 0 + +FrameBlock2c: + db 1 ; # + dbsprite 0, 20, 0, 0, $4d, 0 + +FrameBlock2d: + db 8 ; # + dbsprite 0, 0, 0, 0, $26, 0 + dbsprite 1, 0, 0, 0, $27, 0 + dbsprite 0, 1, 0, 0, $36, 0 + dbsprite 1, 1, 0, 0, $37, 0 + dbsprite 0, 2, 0, 0, $28, 0 + dbsprite 1, 2, 0, 0, $29, 0 + dbsprite 0, 3, 0, 0, $38, 0 + dbsprite 1, 3, 0, 0, $39, 0 + +FrameBlock2e: + db 8 ; # + dbsprite 0, 0, 0, 0, $27, OAM_HFLIP + dbsprite 1, 0, 0, 0, $26, OAM_HFLIP + dbsprite 0, 1, 0, 0, $37, OAM_HFLIP + dbsprite 1, 1, 0, 0, $36, OAM_HFLIP + dbsprite 0, 2, 0, 0, $29, OAM_HFLIP + dbsprite 1, 2, 0, 0, $28, OAM_HFLIP + dbsprite 0, 3, 0, 0, $39, OAM_HFLIP + dbsprite 1, 3, 0, 0, $38, OAM_HFLIP + +FrameBlock2f: + db 4 ; # + dbsprite 0, 0, 0, 0, $0c, 0 + dbsprite 1, 0, 0, 0, $0d, 0 + dbsprite 0, 1, 0, 0, $0c, OAM_VFLIP + dbsprite 1, 1, 0, 0, $0d, OAM_VFLIP + +FrameBlock30: + db 4 ; # + dbsprite 0, 0, 0, 0, $44, 0 + dbsprite 1, 0, 0, 0, $44, OAM_HFLIP + dbsprite 0, 1, 0, 0, $44, OAM_VFLIP + dbsprite 1, 1, 0, 0, $44, OAM_HFLIP | OAM_VFLIP + +FrameBlock31: + db 1 ; # + dbsprite 0, 0, 0, 0, $45, 0 + +FrameBlock32: + db 7 ; # + dbsprite 0, 0, 0, 0, $4d, 0 + dbsprite 1, 0, 0, 0, $2f, 0 + dbsprite 2, 0, 0, 0, $4d, OAM_HFLIP + dbsprite 0, 1, 0, 0, $4e, 0 + dbsprite 1, 1, 0, 0, $07, 0 + dbsprite 2, 1, 0, 0, $4e, OAM_HFLIP + dbsprite 1, 2, 0, 0, $3f, 0 + +FrameBlock33: + db 7 ; # + dbsprite 1, 0, 0, 0, $3f, OAM_VFLIP + dbsprite 0, 1, 0, 0, $4e, OAM_VFLIP + dbsprite 1, 1, 0, 0, $07, OAM_VFLIP + dbsprite 2, 1, 0, 0, $4e, OAM_HFLIP | OAM_VFLIP + dbsprite 0, 2, 0, 0, $4d, OAM_VFLIP + dbsprite 1, 2, 0, 0, $2f, OAM_VFLIP + dbsprite 2, 2, 0, 0, $4d, OAM_HFLIP | OAM_VFLIP + +FrameBlock34: + db 1 ; # + dbsprite 0, 20, 0, 0, $00, OAM_OBP1 + +FrameBlock35: + db 6 ; # + dbsprite 0, 0, 0, 0, $2a, 0 + dbsprite 1, 0, 0, 0, $2b, 0 + dbsprite 0, 1, 0, 0, $3a, 0 + dbsprite 0, 2, 0, 0, $3a, OAM_VFLIP + dbsprite 0, 3, 0, 0, $2a, OAM_VFLIP + dbsprite 1, 3, 0, 0, $2b, OAM_VFLIP + +FrameBlock36: + db 4 ; # + dbsprite 0, 0, 0, 0, $00, 0 + dbsprite 1, 0, 0, 0, $01, 0 + dbsprite 0, 1, 0, 0, $10, 0 + dbsprite 1, 1, 0, 0, $11, 0 + +FrameBlock37: + db 4 ; # + dbsprite 0, 0, 0, 0, $01, OAM_BEHIND_BG | OAM_HFLIP + dbsprite 1, 0, 0, 0, $00, OAM_BEHIND_BG | OAM_HFLIP + dbsprite 0, 1, 0, 0, $11, OAM_BEHIND_BG | OAM_HFLIP + dbsprite 1, 1, 0, 0, $10, OAM_BEHIND_BG | OAM_HFLIP + +FrameBlock38: + db 4 ; # + dbsprite 0, 0, 0, 0, $0a, 0 + dbsprite 1, 0, 0, 0, $0b, 0 + dbsprite 0, 1, 0, 0, $1a, 0 + dbsprite 1, 1, 0, 0, $1b, 0 + +FrameBlock39: + db 4 ; # + dbsprite 0, 0, 0, 0, $0b, OAM_HFLIP + dbsprite 1, 0, 0, 0, $0a, OAM_HFLIP + dbsprite 0, 1, 0, 0, $1b, OAM_HFLIP + dbsprite 1, 1, 0, 0, $1a, OAM_HFLIP + +FrameBlock3a: + db 4 ; # + dbsprite 0, 4, 0, 0, $05, 0 + dbsprite 1, 4, 0, 0, $05, OAM_HFLIP + dbsprite 0, 5, 0, 0, $15, 0 + dbsprite 1, 5, 0, 0, $15, OAM_HFLIP + +FrameBlock3b: + db 5 ; # + dbsprite 0, 3, 0, 0, $04, 0 + dbsprite 1, 3, 0, 0, $04, OAM_HFLIP + dbsprite 0, 4, 0, 0, $14, 0 + dbsprite 1, 4, 0, 0, $14, OAM_HFLIP + dbsprite 0, 5, 4, 0, $41, 0 + +FrameBlock3c: + db 6 ; # + dbsprite 0, 2, 0, 0, $05, 0 + dbsprite 1, 2, 0, 0, $05, OAM_HFLIP + dbsprite 0, 3, 0, 0, $15, 0 + dbsprite 1, 3, 0, 0, $15, OAM_HFLIP + dbsprite 0, 4, 4, 0, $42, 0 + dbsprite 0, 5, 4, 0, $42, 0 + +FrameBlock3d: + db 7 ; # + dbsprite 0, 1, 0, 0, $04, 0 + dbsprite 1, 1, 0, 0, $04, OAM_HFLIP + dbsprite 0, 2, 0, 0, $14, 0 + dbsprite 1, 2, 0, 0, $14, OAM_HFLIP + dbsprite 0, 3, 4, 0, $41, 0 + dbsprite 0, 4, 4, 0, $41, 0 + dbsprite 0, 5, 4, 0, $41, 0 + +FrameBlock3e: + db 8 ; # + dbsprite 0, 0, 0, 0, $05, 0 + dbsprite 1, 0, 0, 0, $05, OAM_HFLIP + dbsprite 0, 1, 0, 0, $15, 0 + dbsprite 1, 1, 0, 0, $15, OAM_HFLIP + dbsprite 0, 2, 4, 0, $42, 0 + dbsprite 0, 3, 4, 0, $42, 0 + dbsprite 0, 4, 4, 0, $42, 0 + dbsprite 0, 5, 4, 0, $42, 0 + +FrameBlock3f: + db 8 ; # + dbsprite 0, 0, 0, 0, $04, 0 + dbsprite 1, 0, 0, 0, $04, OAM_HFLIP + dbsprite 0, 1, 0, 0, $14, 0 + dbsprite 1, 1, 0, 0, $14, OAM_HFLIP + dbsprite 0, 2, 4, 0, $41, 0 + dbsprite 0, 3, 4, 0, $41, 0 + dbsprite 0, 4, 4, 0, $41, 0 + dbsprite 0, 5, 4, 0, $41, 0 + +FrameBlock40: + db 3 ; # + dbsprite 0, 0, 0, 0, $3d, 0 + dbsprite 1, 0, 0, 0, $3d, 0 + dbsprite 1, 1, 0, 0, $3d, 0 + +FrameBlock41: + db 4 ; # + dbsprite 0, 0, 0, 0, $06, 0 + dbsprite 1, 0, 0, 0, $06, OAM_HFLIP + dbsprite 0, 1, 0, 0, $16, 0 + dbsprite 1, 1, 0, 0, $17, 0 + +FrameBlock42: + db 11 ; # + dbsprite 2, 0, 0, 0, $42, 0 + dbsprite 0, 1, 0, 0, $42, 0 + dbsprite 1, 1, 0, 0, $42, 0 + dbsprite 2, 1, 0, 0, $42, 0 + dbsprite 3, 1, 0, 0, $42, 0 + dbsprite 4, 1, 0, 0, $42, 0 + dbsprite 2, 2, 0, 0, $42, 0 + dbsprite 1, 3, 0, 0, $42, 0 + dbsprite 3, 3, 0, 0, $42, 0 + dbsprite 0, 4, 0, 0, $42, 0 + dbsprite 4, 4, 0, 0, $42, 0 + +FrameBlock43: + db 11 ; # + dbsprite 2, 0, 0, 0, $41, 0 + dbsprite 0, 1, 0, 0, $41, 0 + dbsprite 1, 1, 0, 0, $41, 0 + dbsprite 2, 1, 0, 0, $41, 0 + dbsprite 3, 1, 0, 0, $41, 0 + dbsprite 4, 1, 0, 0, $41, 0 + dbsprite 2, 2, 0, 0, $41, 0 + dbsprite 1, 3, 0, 0, $41, 0 + dbsprite 3, 3, 0, 0, $41, 0 + dbsprite 0, 4, 0, 0, $41, 0 + dbsprite 4, 4, 0, 0, $41, 0 + +FrameBlock44: + db 4 ; # + dbsprite 0, 0, 0, 0, $49, 0 + dbsprite 5, 0, 0, 0, $49, 0 + dbsprite 0, 5, 0, 0, $49, 0 + dbsprite 5, 5, 0, 0, $49, 0 + +FrameBlock45: + db 4 ; # + dbsprite 0, 0, 0, 0, $49, 0 + dbsprite 3, 0, 0, 0, $49, 0 + dbsprite 0, 3, 0, 0, $49, 0 + dbsprite 3, 3, 0, 0, $49, 0 + +FrameBlock46: + db 4 ; # + dbsprite 0, 0, 0, 0, $49, 0 + dbsprite 1, 0, 0, 0, $49, 0 + dbsprite 0, 1, 0, 0, $49, 0 + dbsprite 1, 1, 0, 0, $49, 0 + +FrameBlock47: + db 4 ; # + dbsprite 0, 0, 0, 0, $43, 0 + dbsprite 1, 0, 0, 0, $43, OAM_HFLIP + dbsprite 0, 1, 0, 0, $43, OAM_VFLIP + dbsprite 1, 1, 0, 0, $43, OAM_HFLIP | OAM_VFLIP + +SmallBlackCircleFrameBlock: + db 4 ; # + dbsprite 1, 1, 0, 0, $33, 0 + dbsprite 2, 1, 0, 0, $33, OAM_HFLIP + dbsprite 1, 2, 0, 0, $33, OAM_VFLIP + dbsprite 2, 2, 0, 0, $33, OAM_HFLIP | OAM_VFLIP + +LargeBlackCircleFrameBlock: + db 16 ; # + dbsprite 0, 0, 0, 0, $22, 0 + dbsprite 1, 0, 0, 0, $23, 0 + dbsprite 2, 0, 0, 0, $23, OAM_HFLIP + dbsprite 3, 0, 0, 0, $22, OAM_HFLIP + dbsprite 0, 1, 0, 0, $32, 0 + dbsprite 1, 1, 0, 0, $43, 0 + dbsprite 2, 1, 0, 0, $43, OAM_HFLIP + dbsprite 3, 1, 0, 0, $32, OAM_HFLIP + dbsprite 0, 2, 0, 0, $32, OAM_VFLIP + dbsprite 1, 2, 0, 0, $43, OAM_VFLIP + dbsprite 2, 2, 0, 0, $43, OAM_HFLIP | OAM_VFLIP + dbsprite 3, 2, 0, 0, $32, OAM_HFLIP | OAM_VFLIP + dbsprite 0, 3, 0, 0, $22, OAM_VFLIP + dbsprite 1, 3, 0, 0, $23, OAM_VFLIP + dbsprite 2, 3, 0, 0, $23, OAM_HFLIP | OAM_VFLIP + dbsprite 3, 3, 0, 0, $22, OAM_HFLIP | OAM_VFLIP + +FrameBlock71: + db 16 ; # + dbsprite 0, 0, 0, 0, $22, 0 + dbsprite 1, 0, 0, 0, $3b, 0 + dbsprite 2, 0, 0, 0, $23, OAM_HFLIP + dbsprite 3, 0, 0, 0, $22, OAM_HFLIP + dbsprite 0, 1, 0, 0, $32, 0 + dbsprite 1, 1, 0, 0, $43, 0 + dbsprite 2, 1, 0, 0, $43, OAM_HFLIP + dbsprite 3, 1, 0, 0, $32, OAM_HFLIP + dbsprite 0, 2, 0, 0, $32, OAM_VFLIP + dbsprite 1, 2, 0, 0, $43, OAM_VFLIP + dbsprite 2, 2, 0, 0, $43, OAM_HFLIP | OAM_VFLIP + dbsprite 3, 2, 0, 0, $32, OAM_HFLIP | OAM_VFLIP + dbsprite 0, 3, 0, 0, $22, OAM_VFLIP + dbsprite 1, 3, 0, 0, $23, OAM_VFLIP + dbsprite 2, 3, 0, 0, $23, OAM_HFLIP | OAM_VFLIP + dbsprite 3, 3, 0, 0, $22, OAM_HFLIP | OAM_VFLIP + +FrameBlock72: + db 12 ; # + dbsprite 0, 0, 0, 0, $32, 0 + dbsprite 1, 0, 0, 0, $43, 0 + dbsprite 2, 0, 0, 0, $43, OAM_HFLIP + dbsprite 3, 0, 0, 0, $32, OAM_HFLIP + dbsprite 0, 1, 0, 0, $32, OAM_VFLIP + dbsprite 1, 1, 0, 0, $43, OAM_VFLIP + dbsprite 2, 1, 0, 0, $43, OAM_HFLIP | OAM_VFLIP + dbsprite 3, 1, 0, 0, $32, OAM_HFLIP | OAM_VFLIP + dbsprite 0, 2, 0, 0, $22, OAM_VFLIP + dbsprite 1, 2, 0, 0, $23, OAM_VFLIP + dbsprite 2, 2, 0, 0, $23, OAM_HFLIP | OAM_VFLIP + dbsprite 3, 2, 0, 0, $22, OAM_HFLIP | OAM_VFLIP + +FrameBlock73: + db 8 ; # + dbsprite 0, 0, 0, 0, $32, OAM_VFLIP + dbsprite 1, 0, 0, 0, $43, OAM_VFLIP + dbsprite 2, 0, 0, 0, $43, OAM_HFLIP | OAM_VFLIP + dbsprite 3, 0, 0, 0, $32, OAM_HFLIP | OAM_VFLIP + dbsprite 0, 1, 0, 0, $22, OAM_VFLIP + dbsprite 1, 1, 0, 0, $23, OAM_VFLIP + dbsprite 2, 1, 0, 0, $23, OAM_HFLIP | OAM_VFLIP + dbsprite 3, 1, 0, 0, $22, OAM_HFLIP | OAM_VFLIP + +FrameBlock74: + db 4 ; # + dbsprite 0, 0, 0, 0, $22, OAM_VFLIP + dbsprite 1, 0, 0, 0, $23, OAM_VFLIP + dbsprite 2, 0, 0, 0, $23, OAM_HFLIP | OAM_VFLIP + dbsprite 3, 0, 0, 0, $22, OAM_HFLIP | OAM_VFLIP + +FrameBlock4a: + db 4 ; # + dbsprite 3, 1, 0, 0, $4c, OAM_HFLIP + dbsprite 1, 4, 0, 0, $4b, 0 + dbsprite 4, 6, 0, 0, $4c, 0 + dbsprite 6, 3, 0, 0, $4b, OAM_VFLIP + +FrameBlock4b: + db 4 ; # + dbsprite 3, 0, 0, 0, $4c, 0 + dbsprite 0, 4, 0, 0, $4b, OAM_VFLIP + dbsprite 4, 7, 0, 0, $4c, OAM_HFLIP + dbsprite 7, 3, 0, 0, $4b, 0 + +FrameBlock4c: + db 4 ; # + dbsprite 1, 2, 0, 0, $4a, OAM_VFLIP + dbsprite 2, 6, 0, 0, $4a, 0 + dbsprite 6, 5, 0, 0, $4a, OAM_HFLIP + dbsprite 5, 1, 0, 0, $4a, OAM_HFLIP | OAM_VFLIP + +FrameBlock4d: + db 4 ; # + dbsprite 0, 1, 0, 0, $4a, OAM_HFLIP + dbsprite 1, 7, 0, 0, $4a, OAM_HFLIP | OAM_VFLIP + dbsprite 7, 6, 0, 0, $4a, OAM_VFLIP + dbsprite 6, 0, 0, 0, $4a, 0 + +FrameBlock4e: + db 8 ; # + dbsprite 6, 0, 0, 0, $44, 0 + dbsprite 7, 0, 0, 0, $44, OAM_HFLIP + dbsprite 6, 1, 0, 0, $44, OAM_VFLIP + dbsprite 7, 1, 0, 0, $44, OAM_HFLIP | OAM_VFLIP + dbsprite 1, 4, 2, 6, $44, 0 + dbsprite 2, 4, 2, 6, $44, OAM_HFLIP + dbsprite 1, 5, 2, 6, $44, OAM_VFLIP + dbsprite 2, 5, 2, 6, $44, OAM_HFLIP | OAM_VFLIP + +FrameBlock4f: + db 12 ; # + dbsprite 4, 1, 2, 6, $44, 0 + dbsprite 5, 1, 2, 6, $44, OAM_HFLIP + dbsprite 4, 2, 2, 6, $44, OAM_VFLIP + dbsprite 5, 2, 2, 6, $44, OAM_HFLIP | OAM_VFLIP + dbsprite 6, 0, 2, 6, $47, 0 + dbsprite 7, 0, 0, 0, $47, 0 + dbsprite 2, 3, 6, 2, $44, 0 + dbsprite 3, 3, 6, 2, $44, OAM_HFLIP + dbsprite 2, 4, 6, 2, $44, OAM_VFLIP + dbsprite 3, 4, 6, 2, $44, OAM_HFLIP | OAM_VFLIP + dbsprite 1, 6, 0, 0, $47, 0 + dbsprite 1, 5, 6, 2, $47, 0 + +FrameBlock50: + db 8 ; # + dbsprite 6, 0, 2, 6, $47, 0 + dbsprite 7, 0, 0, 0, $47, 0 + dbsprite 4, 2, 6, 2, $47, 0 + dbsprite 5, 1, 4, 4, $47, 0 + dbsprite 3, 3, 2, 6, $47, 0 + dbsprite 4, 3, 0, 0, $47, 0 + dbsprite 1, 5, 6, 2, $47, 0 + dbsprite 2, 4, 4, 4, $47, 0 + +FrameBlock51: + db 8 ; # + dbsprite 0, 0, 0, 0, $35, OAM_HFLIP + dbsprite 0, 1, 0, 0, $35, OAM_VFLIP + dbsprite 0, 2, 0, 0, $35, 0 + dbsprite 0, 3, 0, 0, $35, OAM_HFLIP | OAM_VFLIP + dbsprite 8, 0, 0, 0, $35, 0 + dbsprite 8, 1, 0, 0, $35, OAM_HFLIP | OAM_VFLIP + dbsprite 8, 2, 0, 0, $35, OAM_HFLIP + dbsprite 8, 3, 0, 0, $35, OAM_VFLIP + +FrameBlock52: + db 4 ; # + dbsprite 0, 0, 0, 0, $2a, 0 + dbsprite 1, 0, 0, 0, $2b, 0 + dbsprite 0, 1, 0, 0, $3a, 0 + dbsprite 1, 1, 0, 0, $3b, 0 + +FrameBlock53: + db 3 ; # + dbsprite 0, 0, 0, 0, $3f, 0 + dbsprite 1, 0, 0, 0, $3f, 0 + dbsprite 0, 1, 6, 0, $3f, 0 + +FrameBlock54: + db 4 ; # + dbsprite 0, 0, 0, 0, $0e, 0 + dbsprite 1, 0, 0, 0, $0e, OAM_HFLIP + dbsprite 0, 1, 0, 0, $0f, 0 + dbsprite 1, 1, 0, 0, $0f, OAM_HFLIP + +FrameBlock55: + db 3 ; # + dbsprite 0, 2, 0, 0, $2c, 0 + dbsprite 1, 2, 0, 0, $3c, 0 + dbsprite 2, 2, 0, 0, $2d, 0 + +FrameBlock56: + db 6 ; # + dbsprite 2, 2, 0, 0, $31, 0 + dbsprite 3, 2, 0, 0, $31, 0 + dbsprite 2, 1, 0, 0, $2c, 0 + dbsprite 3, 1, 0, 0, $3c, 0 + dbsprite 4, 1, 0, 0, $2d, 0 + dbsprite 4, 2, 0, 0, $2d, 0 + +FrameBlock57: + db 9 ; # + dbsprite 4, 1, 0, 0, $31, 0 + dbsprite 4, 2, 0, 0, $31, 0 + dbsprite 5, 1, 0, 0, $31, 0 + dbsprite 5, 2, 0, 0, $31, 0 + dbsprite 4, 0, 0, 0, $2c, 0 + dbsprite 5, 0, 0, 0, $3c, 0 + dbsprite 6, 0, 0, 0, $2d, 0 + dbsprite 6, 1, 0, 0, $2d, 0 + dbsprite 6, 2, 0, 0, $2d, 0 + +FrameBlock58: + db 7 ; # + dbsprite 0, 0, 0, 0, $46, 0 + dbsprite 0, 1, 2, 0, $47, 0 + dbsprite 0, 2, 3, 0, $48, 0 + dbsprite 0, 3, 4, 0, $48, 0 + dbsprite 0, 4, 5, 0, $48, 0 + dbsprite 0, 5, 5, 0, $48, 0 + dbsprite 0, 6, 5, 0, $48, 0 + +FrameBlock59: + db 1 ; # + dbsprite 0, 0, 0, 0, $42, 0 + +FrameBlock5a: + db 12 ; # + dbsprite 0, 0, 0, 0, $24, 0 + dbsprite 1, 0, 0, 0, $25, 0 + dbsprite 0, 1, 0, 0, $34, 0 + dbsprite 2, 0, 0, 0, $25, OAM_HFLIP + dbsprite 3, 0, 0, 0, $24, OAM_HFLIP + dbsprite 3, 1, 0, 0, $34, OAM_HFLIP + dbsprite 0, 2, 0, 0, $34, OAM_VFLIP + dbsprite 0, 3, 0, 0, $24, OAM_VFLIP + dbsprite 1, 3, 0, 0, $25, OAM_VFLIP + dbsprite 3, 2, 0, 0, $34, OAM_HFLIP | OAM_VFLIP + dbsprite 2, 3, 0, 0, $25, OAM_HFLIP | OAM_VFLIP + dbsprite 3, 3, 0, 0, $24, OAM_HFLIP | OAM_VFLIP + +FrameBlock5b: + db 4 ; # + dbsprite 0, 0, 0, 0, $43, 0 + dbsprite 1, 0, 0, 0, $43, OAM_HFLIP + dbsprite 0, 1, 0, 0, $43, OAM_VFLIP + dbsprite 1, 1, 0, 0, $43, OAM_HFLIP | OAM_VFLIP + +FrameBlock5c: + db 8 ; # + dbsprite 0, 0, 0, 0, $49, 0 + dbsprite 1, 0, 0, 2, $49, 0 + dbsprite 0, 3, 0, 0, $49, 0 + dbsprite 2, 2, 0, 0, $49, 0 + dbsprite 0, 1, 0, 0, $43, 0 + dbsprite 1, 1, 0, 0, $43, OAM_HFLIP + dbsprite 0, 2, 0, 0, $43, OAM_VFLIP + dbsprite 1, 2, 0, 0, $43, OAM_HFLIP | OAM_VFLIP + +FrameBlock5d: + db 11 ; # + dbsprite 0, 0, 0, 0, $49, 0 + dbsprite 0, 3, 2, 0, $49, 0 + dbsprite 2, 2, 0, 4, $49, 0 + dbsprite 0, 1, 0, 0, $43, 0 + dbsprite 1, 0, 0, 0, $43, OAM_HFLIP + dbsprite 0, 2, 0, 0, $43, OAM_VFLIP + dbsprite 1, 2, 0, 0, $43, OAM_HFLIP | OAM_VFLIP + dbsprite 1, 0, 0, 4, $43, 0 + dbsprite 2, 0, 0, 4, $43, OAM_HFLIP + dbsprite 1, 1, 0, 4, $43, OAM_VFLIP + dbsprite 2, 1, 0, 4, $43, OAM_HFLIP | OAM_VFLIP + +FrameBlock5e: + db 15 ; # + dbsprite 1, 0, 0, 0, $49, 0 + dbsprite 2, 1, 0, 0, $49, 0 + dbsprite 0, 4, 0, 0, $49, 0 + dbsprite 0, 1, 0, 0, $43, 0 + dbsprite 1, 1, 0, 0, $43, OAM_HFLIP + dbsprite 0, 2, 0, 0, $43, OAM_VFLIP + dbsprite 1, 2, 0, 0, $43, OAM_HFLIP | OAM_VFLIP + dbsprite 2, 2, 0, 0, $43, 0 + dbsprite 3, 2, 0, 0, $43, OAM_HFLIP + dbsprite 2, 3, 0, 0, $43, OAM_VFLIP + dbsprite 3, 3, 0, 0, $43, OAM_HFLIP | OAM_VFLIP + dbsprite 1, 4, 0, 0, $43, 0 + dbsprite 2, 4, 0, 0, $43, OAM_HFLIP + dbsprite 1, 5, 0, 0, $43, OAM_VFLIP + dbsprite 2, 5, 0, 0, $43, OAM_HFLIP | OAM_VFLIP + +FrameBlock5f: + db 4 ; # + dbsprite 0, 0, 0, 0, $49, 0 + dbsprite 2, 0, 0, 0, $49, 0 + dbsprite 4, 0, 0, 0, $49, 0 + dbsprite 6, 0, 0, 0, $49, 0 + +FrameBlock60: + db 8 ; # + dbsprite 0, 0, 0, 0, $49, 0 + dbsprite 2, 0, 0, 0, $49, 0 + dbsprite 4, 0, 0, 0, $49, 0 + dbsprite 6, 0, 0, 0, $49, 0 + dbsprite 1, 1, 0, 0, $49, 0 + dbsprite 3, 1, 0, 0, $49, 0 + dbsprite 5, 1, 0, 0, $49, 0 + dbsprite 7, 1, 0, 0, $49, 0 + +FrameBlock61: + db 12 ; # + dbsprite 0, 0, 0, 0, $49, 0 + dbsprite 2, 0, 0, 0, $49, 0 + dbsprite 4, 0, 0, 0, $49, 0 + dbsprite 6, 0, 0, 0, $49, 0 + dbsprite 1, 1, 0, 0, $49, 0 + dbsprite 3, 1, 0, 0, $49, 0 + dbsprite 5, 1, 0, 0, $49, 0 + dbsprite 7, 1, 0, 0, $49, 0 + dbsprite 0, 2, 0, 0, $49, 0 + dbsprite 2, 2, 0, 0, $49, 0 + dbsprite 4, 2, 0, 0, $49, 0 + dbsprite 6, 2, 0, 0, $49, 0 + +FrameBlock62: + db 15 ; # + dbsprite 0, 0, 0, 0, $49, 0 + dbsprite 2, 0, 0, 0, $49, 0 + dbsprite 4, 0, 0, 0, $49, 0 + dbsprite 6, 0, 0, 0, $49, 0 + dbsprite 1, 1, 0, 0, $49, 0 + dbsprite 3, 1, 0, 0, $49, 0 + dbsprite 5, 1, 0, 0, $49, 0 + dbsprite 7, 1, 0, 0, $49, 0 + dbsprite 0, 2, 0, 0, $49, 0 + dbsprite 2, 2, 0, 0, $49, 0 + dbsprite 4, 2, 0, 0, $49, 0 + dbsprite 6, 2, 0, 0, $49, 0 + dbsprite 1, 3, 0, 0, $49, 0 + dbsprite 3, 3, 0, 0, $49, 0 + dbsprite 5, 3, 0, 0, $49, 0 + dbsprite 7, 3, 0, 0, $49, 0 + +FrameBlock63: + db 6 ; # + dbsprite 0, 2, 0, 0, $26, 0 + dbsprite 1, 2, 0, 0, $27, 0 + dbsprite 2, 1, 0, 0, $26, 0 + dbsprite 3, 1, 0, 0, $27, 0 + dbsprite 4, 0, 0, 0, $26, 0 + dbsprite 5, 0, 0, 0, $27, 0 + +FrameBlock64: + db 6 ; # + dbsprite 0, 3, 0, 0, $27, 0 + dbsprite 1, 2, 0, 0, $26, 0 + dbsprite 2, 2, 0, 0, $27, 0 + dbsprite 3, 1, 0, 0, $26, 0 + dbsprite 4, 1, 0, 0, $27, 0 + dbsprite 5, 0, 0, 0, $26, 0 + +FrameBlock65: + db 6 ; # + dbsprite 0, 0, 0, 0, $1c, 0 + dbsprite 1, 0, 0, 0, $1d, 0 + dbsprite 0, 2, 0, 0, $1c, 0 + dbsprite 1, 2, 0, 0, $1d, 0 + dbsprite 0, 4, 0, 0, $1c, 0 + dbsprite 1, 4, 0, 0, $1d, 0 + +FrameBlock66: + db 2 ; # + dbsprite 0, 0, 0, 0, $03, 0 + dbsprite 0, 1, 0, 0, $13, 0 + +FrameBlock67: + db 1 ; # + dbsprite 0, 0, 0, 0, $03, 0 + +FrameBlock68: + db 4 ; # + dbsprite 0, 0, 0, 0, $03, 0 + dbsprite 1, 0, 0, 0, $03, OAM_HFLIP + dbsprite 0, 1, 0, 0, $13, 0 + dbsprite 1, 1, 0, 0, $13, OAM_HFLIP + +FrameBlock69: + db 1 ; # + dbsprite 0, 0, 0, 0, $06, 0 + +FrameBlock6a: + db 8 ; # + dbsprite 0, 0, 0, 0, $2e, 0 + dbsprite 6, 0, 0, 0, $2e, OAM_HFLIP + dbsprite 0, 6, 0, 0, $2e, OAM_VFLIP + dbsprite 6, 6, 0, 0, $2e, OAM_HFLIP | OAM_VFLIP + dbsprite 3, 0, 0, 0, $2f, 0 + dbsprite 3, 6, 0, 0, $2f, OAM_VFLIP + dbsprite 0, 3, 0, 0, $3e, 0 + dbsprite 6, 3, 0, 0, $3e, OAM_HFLIP + +FrameBlock6b: + db 8 ; # + dbsprite 0, 0, 0, 0, $2e, 0 + dbsprite 4, 0, 0, 0, $2e, OAM_HFLIP + dbsprite 0, 4, 0, 0, $2e, OAM_VFLIP + dbsprite 4, 4, 0, 0, $2e, OAM_HFLIP | OAM_VFLIP + dbsprite 2, 0, 0, 0, $2f, 0 + dbsprite 2, 4, 0, 0, $2f, OAM_VFLIP + dbsprite 0, 2, 0, 0, $3e, 0 + dbsprite 4, 2, 0, 0, $3e, OAM_HFLIP + +FrameBlock6c: + db 8 ; # + dbsprite 0, 0, 0, 0, $2e, 0 + dbsprite 2, 0, 0, 0, $2e, OAM_HFLIP + dbsprite 0, 2, 0, 0, $2e, OAM_VFLIP + dbsprite 2, 2, 0, 0, $2e, OAM_HFLIP | OAM_VFLIP + dbsprite 1, 0, 0, 0, $2f, 0 + dbsprite 1, 2, 0, 0, $2f, OAM_VFLIP + dbsprite 0, 1, 0, 0, $3e, 0 + dbsprite 2, 1, 0, 0, $3e, OAM_HFLIP + +FrameBlock6d: + db 2 ; # + dbsprite 0, 0, 0, 0, $1e, 0 + dbsprite 1, 0, 0, 0, $1f, 0 + +FrameBlock6e: + db 4 ; # + dbsprite 0, 0, 0, 0, $48, 0 + dbsprite 1, 0, 0, 0, $48, OAM_HFLIP + dbsprite 0, 1, 0, 0, $12, 0 + dbsprite 1, 1, 0, 0, $12, OAM_HFLIP + +FrameBlock6f: + db 4 ; # + dbsprite 0, 0, 0, 0, $4a, 0 + dbsprite 1, 0, 0, 0, $07, 0 + dbsprite 0, 1, 0, 0, $16, 0 + dbsprite 1, 1, 0, 0, $17, 0 + +FrameBlock70: + db 4 ; # + dbsprite 0, 0, 0, 0, $07, OAM_HFLIP + dbsprite 1, 0, 0, 0, $4a, OAM_HFLIP + dbsprite 0, 1, 0, 0, $17, OAM_HFLIP + dbsprite 1, 1, 0, 0, $16, OAM_HFLIP + +FrameBlock76: + db 7 ; # + dbsprite 2, 0, 0, 0, $2f, 0 + dbsprite 1, 0, 0, 1, $2f, 0 + dbsprite 3, 0, 0, 1, $2f, 0 + dbsprite 0, 0, 0, 2, $2e, 0 + dbsprite 4, 0, 0, 2, $2e, OAM_HFLIP + dbsprite 0, 1, 0, 2, $3e, 0 + dbsprite 4, 1, 0, 2, $3e, OAM_HFLIP + +FrameBlock77: + db 4 ; # + dbsprite 0, 0, 2, 0, $4b, 0 + dbsprite 1, 0, 2, 0, $4c, 0 + dbsprite 0, 1, 0, 0, $4c, OAM_HFLIP | OAM_VFLIP + dbsprite 1, 1, 0, 0, $4b, OAM_HFLIP | OAM_VFLIP + +FrameBlock78: + db 1 ; # + dbsprite 0, 0, 0, 0, $4d, 0 + +FrameBlock79: + db 1 ; # + dbsprite 0, 0, 0, 0, $4e, 0 + +INCLUDE "data/battle_anims/base_coords.asm" + +FrameBlock00: + db 0 ; # + + db $00 ; unused diff --git a/data/battle_anims/special_effect_pointers.asm b/data/battle_anims/special_effect_pointers.asm new file mode 100644 index 00000000..4e2fb857 --- /dev/null +++ b/data/battle_anims/special_effect_pointers.asm @@ -0,0 +1,47 @@ +special_effect: MACRO + db \1 + dw \2 +ENDM + +SpecialEffectPointers: + ; special effect id, effect routine address + special_effect SE_DARK_SCREEN_FLASH, AnimationFlashScreen ; $FE + special_effect SE_DARK_SCREEN_PALETTE, AnimationDarkScreenPalette ; $FD + special_effect SE_RESET_SCREEN_PALETTE, AnimationResetScreenPalette ; $FC + special_effect SE_SHAKE_SCREEN, AnimationShakeScreen ; $FB + special_effect SE_WATER_DROPLETS_EVERYWHERE, AnimationWaterDropletsEverywhere ; $FA + special_effect SE_DARKEN_MON_PALETTE, AnimationDarkenMonPalette ; $F9 + special_effect SE_FLASH_SCREEN_LONG, AnimationFlashScreenLong ; $F8 + special_effect SE_SLIDE_MON_UP, AnimationSlideMonUp ; $F7 + special_effect SE_SLIDE_MON_DOWN, AnimationSlideMonDown ; $F6 + special_effect SE_FLASH_MON_PIC, AnimationFlashMonPic ; $F5 + special_effect SE_SLIDE_MON_OFF, AnimationSlideMonOff ; $F4 + special_effect SE_BLINK_MON, AnimationBlinkMon ; $F3 + special_effect SE_MOVE_MON_HORIZONTALLY, AnimationMoveMonHorizontally ; $F2 + special_effect SE_RESET_MON_POSITION, AnimationResetMonPosition ; $F1 + special_effect SE_LIGHT_SCREEN_PALETTE, AnimationLightScreenPalette ; $F0 + special_effect SE_HIDE_MON_PIC, AnimationHideMonPic ; $EF + special_effect SE_SQUISH_MON_PIC, AnimationSquishMonPic ; $EE + special_effect SE_SHOOT_BALLS_UPWARD, AnimationShootBallsUpward ; $ED + special_effect SE_SHOOT_MANY_BALLS_UPWARD, AnimationShootManyBallsUpward ; $EC + special_effect SE_BOUNCE_UP_AND_DOWN, AnimationBoundUpAndDown ; $EB + special_effect SE_MINIMIZE_MON, AnimationMinimizeMon ; $EA + special_effect SE_SLIDE_MON_DOWN_AND_HIDE, AnimationSlideMonDownAndHide ; $E9 + special_effect SE_TRANSFORM_MON, AnimationTransformMon ; $E8 + special_effect SE_LEAVES_FALLING, AnimationLeavesFalling ; $E7 + special_effect SE_PETALS_FALLING, AnimationPetalsFalling ; $E6 + special_effect SE_SLIDE_MON_HALF_OFF, AnimationSlideMonHalfOff ; $E5 + special_effect SE_SHAKE_ENEMY_HUD, AnimationShakeEnemyHUD ; $E4 + special_effect SE_SHAKE_ENEMY_HUD_2, AnimationShakeEnemyHUD ; $E3 unused + special_effect SE_SPIRAL_BALLS_INWARD, AnimationSpiralBallsInward ; $E2 + special_effect SE_DELAY_ANIMATION_10, AnimationDelay10 ; $E1 + special_effect SE_FLASH_ENEMY_MON_PIC, AnimationFlashEnemyMonPic ; $E0 unused + special_effect SE_HIDE_ENEMY_MON_PIC, AnimationHideEnemyMonPic ; $DF + special_effect SE_BLINK_ENEMY_MON, AnimationBlinkEnemyMon ; $DE + special_effect SE_SHOW_MON_PIC, AnimationShowMonPic ; $DD + special_effect SE_SHOW_ENEMY_MON_PIC, AnimationShowEnemyMonPic ; $DC + special_effect SE_SLIDE_ENEMY_MON_OFF, AnimationSlideEnemyMonOff ; $DB + special_effect SE_SHAKE_BACK_AND_FORTH, AnimationShakeBackAndForth ; $DA + special_effect SE_SUBSTITUTE_MON, AnimationSubstitute ; $D9 + special_effect SE_WAVY_SCREEN, AnimationWavyScreen ; $D8 + db -1 ; end diff --git a/data/battle_anims/special_effects.asm b/data/battle_anims/special_effects.asm new file mode 100644 index 00000000..98385d47 --- /dev/null +++ b/data/battle_anims/special_effects.asm @@ -0,0 +1,32 @@ +anim_special_effect: MACRO + db \1 + dw \2 +ENDM + +AnimationIdSpecialEffects: + ; animation id, effect routine address + anim_special_effect MEGA_PUNCH, AnimationFlashScreen + anim_special_effect GUILLOTINE, AnimationFlashScreen + anim_special_effect MEGA_KICK, AnimationFlashScreen + anim_special_effect HEADBUTT, AnimationFlashScreen + anim_special_effect TAIL_WHIP, TailWhipAnimationUnused + anim_special_effect GROWL, DoGrowlSpecialEffects + anim_special_effect DISABLE, AnimationFlashScreen + anim_special_effect BLIZZARD, DoBlizzardSpecialEffects + anim_special_effect BUBBLEBEAM, AnimationFlashScreen + anim_special_effect HYPER_BEAM, FlashScreenEveryFourFrameBlocks + anim_special_effect THUNDERBOLT, FlashScreenEveryEightFrameBlocks + anim_special_effect REFLECT, AnimationFlashScreen + anim_special_effect SELFDESTRUCT, DoExplodeSpecialEffects + anim_special_effect SPORE, AnimationFlashScreen + anim_special_effect EXPLOSION, DoExplodeSpecialEffects + anim_special_effect ROCK_SLIDE, DoRockSlideSpecialEffects + anim_special_effect TRADE_BALL_DROP_ANIM, TradeHidePokemon + anim_special_effect TRADE_BALL_SHAKE_ANIM, TradeShakePokeball + anim_special_effect TRADE_BALL_TILT_ANIM, TradeJumpPokeball + anim_special_effect TOSS_ANIM, DoBallTossSpecialEffects + anim_special_effect SHAKE_ANIM, DoBallShakeSpecialEffects + anim_special_effect POOF_ANIM, DoPoofSpecialEffects + anim_special_effect GREATTOSS_ANIM, DoBallTossSpecialEffects + anim_special_effect ULTRATOSS_ANIM, DoBallTossSpecialEffects + db -1 ; end diff --git a/data/battle_anims/subanimations.asm b/data/battle_anims/subanimations.asm new file mode 100644 index 00000000..bbdc45c0 --- /dev/null +++ b/data/battle_anims/subanimations.asm @@ -0,0 +1,954 @@ +SubanimationPointers: + dw Subanimation00 + dw Subanimation01 + dw Subanimation02 + dw Subanimation03 + dw Subanimation04 + dw Subanimation05 + dw Subanimation06 + dw Subanimation07 + dw Subanimation08 + dw Subanimation09 + dw Subanimation0a + dw Subanimation0b + dw Subanimation0c + dw Subanimation0d + dw Subanimation0e + dw Subanimation0f + dw Subanimation10 + dw Subanimation11 + dw Subanimation12 + dw Subanimation13 + dw Subanimation14 + dw Subanimation15 + dw Subanimation16 + dw Subanimation17 + dw Subanimation18 + dw Subanimation19 + dw Subanimation1a + dw Subanimation1b + dw Subanimation1c + dw Subanimation1d + dw Subanimation1e + dw Subanimation1f + dw Subanimation20 + dw Subanimation21 + dw Subanimation22 + dw Subanimation23 + dw Subanimation24 + dw Subanimation25 + dw Subanimation26 + dw Subanimation27 + dw Subanimation28 + dw Subanimation29 + dw Subanimation2a + dw Subanimation2b + dw Subanimation2c + dw Subanimation2d + dw Subanimation2e + dw Subanimation2f + dw Subanimation30 + dw Subanimation31 + dw Subanimation32 + dw Subanimation33 + dw Subanimation34 + dw Subanimation35 + dw Subanimation36 + dw Subanimation37 + dw Subanimation38 + dw Subanimation39 + dw Subanimation3a + dw Subanimation3b + dw Subanimation3c + dw Subanimation3d + dw Subanimation3e + dw Subanimation3f + dw Subanimation40 + dw Subanimation41 + dw Subanimation42 + dw Subanimation43 + dw Subanimation44 + dw Subanimation45 + dw Subanimation46 + dw Subanimation47 + dw Subanimation48 + dw Subanimation49 + dw Subanimation4a + dw Subanimation4b + dw Subanimation4c + dw Subanimation4d + dw Subanimation4e + dw Subanimation4f + dw Subanimation50 + dw Subanimation51 + dw Subanimation52 + dw Subanimation53 + dw Subanimation54 + dw Subanimation55 + +; format: +; subanim type, count +; REPT count +; db frame block id, base coordinate id, frame block mode +; endr + +subanim: MACRO + db (\1 << 5) | \2 +ENDM + +Subanimation04: + subanim SUBANIMTYPE_HFLIP, 3 + db FRAMEBLOCK_02, BASECOORD_1A, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_02, BASECOORD_10, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_02, BASECOORD_03, FRAMEBLOCKMODE_00 + +Subanimation05: + subanim SUBANIMTYPE_HFLIP, 1 + db FRAMEBLOCK_02, BASECOORD_10, FRAMEBLOCKMODE_00 + +Subanimation08: + subanim SUBANIMTYPE_NORMAL, 11 + db FRAMEBLOCK_03, BASECOORD_30, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_44, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_94, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_60, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_76, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_9F, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_8D, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_A0, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_1A, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_A1, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_34, FRAMEBLOCKMODE_00 + +Subanimation07: + subanim SUBANIMTYPE_NORMAL, 11 + db FRAMEBLOCK_03, BASECOORD_30, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_A2, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_31, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_A3, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_32, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_A4, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_92, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_A5, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_15, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_A6, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_34, FRAMEBLOCKMODE_00 + +Subanimation06: + subanim SUBANIMTYPE_NORMAL, 11 + db FRAMEBLOCK_03, BASECOORD_30, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_A2, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_93, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_61, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_73, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_A7, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_33, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_A8, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_0E, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_A9, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_34, FRAMEBLOCKMODE_00 + +Subanimation09: + subanim SUBANIMTYPE_NORMAL, 4 + db FRAMEBLOCK_03, BASECOORD_21, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_04, BASECOORD_21, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_03, BASECOORD_21, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_05, BASECOORD_21, FRAMEBLOCKMODE_04 + +Subanimation0a: + subanim SUBANIMTYPE_HFLIP, 6 + db FRAMEBLOCK_06, BASECOORD_1B, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_07, BASECOORD_1B, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_08, BASECOORD_36, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_09, BASECOORD_36, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_0A, BASECOORD_15, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_0A, BASECOORD_15, FRAMEBLOCKMODE_00 + +Subanimation0b: + subanim SUBANIMTYPE_NORMAL, 4 + db FRAMEBLOCK_01, BASECOORD_2D, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_2F, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_35, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_4D, FRAMEBLOCKMODE_00 + +Subanimation55: + subanim SUBANIMTYPE_HFLIP, 1 + db FRAMEBLOCK_01, BASECOORD_9D, FRAMEBLOCKMODE_00 + +Subanimation11: + subanim SUBANIMTYPE_HFLIP, 12 + db FRAMEBLOCK_0B, BASECOORD_26, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_0C, BASECOORD_26, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_0B, BASECOORD_26, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_0C, BASECOORD_26, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_0B, BASECOORD_28, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_0C, BASECOORD_28, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_0B, BASECOORD_28, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_0C, BASECOORD_28, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_0B, BASECOORD_27, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_0C, BASECOORD_27, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_0B, BASECOORD_27, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_0C, BASECOORD_27, FRAMEBLOCKMODE_00 + +Subanimation2b: + subanim SUBANIMTYPE_HFLIP, 11 + db FRAMEBLOCK_0D, BASECOORD_03, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_0E, BASECOORD_03, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_0F, BASECOORD_03, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_0D, BASECOORD_11, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_0D, BASECOORD_11, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_0D, BASECOORD_37, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_0D, BASECOORD_37, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_10, BASECOORD_21, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_10, BASECOORD_21, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_11, BASECOORD_1B, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_11, BASECOORD_1B, FRAMEBLOCKMODE_00 + +Subanimation2c: + subanim SUBANIMTYPE_HFLIP, 12 + db FRAMEBLOCK_12, BASECOORD_01, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_12, BASECOORD_0F, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_12, BASECOORD_1B, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_12, BASECOORD_25, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_13, BASECOORD_38, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_13, BASECOORD_38, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_14, BASECOORD_38, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_14, BASECOORD_38, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_15, BASECOORD_38, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_15, BASECOORD_38, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_16, BASECOORD_38, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_16, BASECOORD_38, FRAMEBLOCKMODE_00 + +Subanimation12: + subanim SUBANIMTYPE_COORDFLIP, 9 + db FRAMEBLOCK_17, BASECOORD_30, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_17, BASECOORD_39, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_17, BASECOORD_3A, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_17, BASECOORD_3B, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_17, BASECOORD_3C, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_17, BASECOORD_3D, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_17, BASECOORD_3E, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_17, BASECOORD_3F, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_17, BASECOORD_1F, FRAMEBLOCKMODE_00 + +Subanimation00: + subanim SUBANIMTYPE_HFLIP, 1 + db FRAMEBLOCK_01, BASECOORD_17, FRAMEBLOCKMODE_00 + +Subanimation01: + subanim SUBANIMTYPE_HFLIP, 2 + db FRAMEBLOCK_01, BASECOORD_0F, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_01, BASECOORD_1D, FRAMEBLOCKMODE_00 + +Subanimation02: + subanim SUBANIMTYPE_HFLIP, 3 + db FRAMEBLOCK_01, BASECOORD_12, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_01, BASECOORD_15, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_01, BASECOORD_1C, FRAMEBLOCKMODE_00 + +Subanimation03: + subanim SUBANIMTYPE_HFLIP, 4 + db FRAMEBLOCK_01, BASECOORD_0B, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_01, BASECOORD_11, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_01, BASECOORD_18, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_01, BASECOORD_1D, FRAMEBLOCKMODE_00 + +Subanimation0c: + subanim SUBANIMTYPE_HFLIP, 3 + db FRAMEBLOCK_0C, BASECOORD_20, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_0C, BASECOORD_21, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_0C, BASECOORD_23, FRAMEBLOCKMODE_00 + +Subanimation0d: + subanim SUBANIMTYPE_HFLIP, 6 + db FRAMEBLOCK_0C, BASECOORD_20, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_0C, BASECOORD_15, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_0C, BASECOORD_21, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_0C, BASECOORD_17, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_0C, BASECOORD_23, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_0C, BASECOORD_19, FRAMEBLOCKMODE_00 + +Subanimation0e: + subanim SUBANIMTYPE_HFLIP, 9 + db FRAMEBLOCK_0C, BASECOORD_20, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_0C, BASECOORD_15, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_0C, BASECOORD_07, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_0C, BASECOORD_21, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_0C, BASECOORD_17, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_0C, BASECOORD_09, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_0C, BASECOORD_23, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_0C, BASECOORD_19, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_0C, BASECOORD_0C, FRAMEBLOCKMODE_00 + +Subanimation1f: + subanim SUBANIMTYPE_REVERSE, 5 + db FRAMEBLOCK_0C, BASECOORD_30, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_0C, BASECOORD_40, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_0C, BASECOORD_41, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_0C, BASECOORD_42, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_0C, BASECOORD_21, FRAMEBLOCKMODE_00 + +Subanimation2e: + subanim SUBANIMTYPE_HVFLIP, 14 + db FRAMEBLOCK_18, BASECOORD_43, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_75, BASECOORD_52, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_19, BASECOORD_43, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_75, BASECOORD_63, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_1A, BASECOORD_43, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_75, BASECOORD_4D, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_1B, BASECOORD_43, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_75, BASECOORD_97, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_1C, BASECOORD_43, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_75, BASECOORD_98, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_1D, BASECOORD_43, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_75, BASECOORD_58, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_1E, BASECOORD_43, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_75, BASECOORD_1B, FRAMEBLOCKMODE_00 + +Subanimation2f: + subanim SUBANIMTYPE_HFLIP, 4 + db FRAMEBLOCK_1F, BASECOORD_24, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_20, BASECOORD_20, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_21, BASECOORD_1A, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_22, BASECOORD_15, FRAMEBLOCKMODE_00 + +Subanimation30: + subanim SUBANIMTYPE_HFLIP, 18 + db FRAMEBLOCK_23, BASECOORD_00, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_23, BASECOORD_02, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_23, BASECOORD_04, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_23, BASECOORD_07, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_23, BASECOORD_02, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_23, BASECOORD_04, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_23, BASECOORD_0E, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_23, BASECOORD_02, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_23, BASECOORD_0C, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_25, BASECOORD_07, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_25, BASECOORD_0E, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_25, BASECOORD_15, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_24, BASECOORD_24, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_23, BASECOORD_1C, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_23, BASECOORD_23, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_23, BASECOORD_21, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_24, BASECOORD_28, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_24, BASECOORD_28, FRAMEBLOCKMODE_00 + +Subanimation0f: + subanim SUBANIMTYPE_HFLIP, 12 + db FRAMEBLOCK_26, BASECOORD_0E, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_26, BASECOORD_16, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_26, BASECOORD_1C, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_27, BASECOORD_0E, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_27, BASECOORD_16, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_27, BASECOORD_1C, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_28, BASECOORD_0E, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_28, BASECOORD_16, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_28, BASECOORD_1C, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_29, BASECOORD_0E, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_29, BASECOORD_16, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_29, BASECOORD_1C, FRAMEBLOCKMODE_00 + +Subanimation16: + subanim SUBANIMTYPE_HFLIP, 12 + db FRAMEBLOCK_2A, BASECOORD_05, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_2B, BASECOORD_05, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_2B, BASECOORD_0C, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_2A, BASECOORD_11, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_2B, BASECOORD_11, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_2B, BASECOORD_17, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_2A, BASECOORD_1B, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_2B, BASECOORD_1B, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_2B, BASECOORD_20, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_2A, BASECOORD_2F, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_2C, BASECOORD_00, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_2C, BASECOORD_00, FRAMEBLOCKMODE_00 + +Subanimation10: + subanim SUBANIMTYPE_REVERSE, 8 + db FRAMEBLOCK_2D, BASECOORD_44, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_2E, BASECOORD_45, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_2D, BASECOORD_46, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_2E, BASECOORD_47, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_2D, BASECOORD_48, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_2E, BASECOORD_49, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_2D, BASECOORD_2F, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_2E, BASECOORD_1A, FRAMEBLOCKMODE_00 + +Subanimation31: + subanim SUBANIMTYPE_HVFLIP, 10 + db FRAMEBLOCK_2F, BASECOORD_46, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_2F, BASECOORD_4A, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_2F, BASECOORD_4B, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_2F, BASECOORD_4C, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_2F, BASECOORD_4D, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_2F, BASECOORD_4E, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_2F, BASECOORD_4F, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_2F, BASECOORD_50, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_2F, BASECOORD_2E, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_2F, BASECOORD_51, FRAMEBLOCKMODE_00 + +Subanimation13: + subanim SUBANIMTYPE_REVERSE, 6 + db FRAMEBLOCK_30, BASECOORD_31, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_30, BASECOORD_32, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_30, BASECOORD_92, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_30, BASECOORD_0E, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_30, BASECOORD_0F, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_30, BASECOORD_10, FRAMEBLOCKMODE_00 + +Subanimation14: + subanim SUBANIMTYPE_HFLIP, 9 + db FRAMEBLOCK_30, BASECOORD_10, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_30, BASECOORD_10, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_31, BASECOORD_1C, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_31, BASECOORD_21, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_31, BASECOORD_26, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_30, BASECOORD_10, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_31, BASECOORD_1D, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_31, BASECOORD_22, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_31, BASECOORD_27, FRAMEBLOCKMODE_00 + +Subanimation41: + subanim SUBANIMTYPE_REVERSE, 5 + db FRAMEBLOCK_03, BASECOORD_31, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_32, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_92, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_0E, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_03, BASECOORD_10, FRAMEBLOCKMODE_00 + +Subanimation42: + subanim SUBANIMTYPE_HFLIP, 3 + db FRAMEBLOCK_SMALL_BLACK_CIRCLE, BASECOORD_08, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_LARGE_BLACK_CIRCLE, BASECOORD_08, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_5A, BASECOORD_08, FRAMEBLOCKMODE_00 + +Subanimation15: + subanim SUBANIMTYPE_HVFLIP, 2 + db FRAMEBLOCK_35, BASECOORD_52, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_35, BASECOORD_53, FRAMEBLOCKMODE_00 + +Subanimation17: + subanim SUBANIMTYPE_HFLIP, 4 + db FRAMEBLOCK_36, BASECOORD_54, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_36, BASECOORD_55, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_37, BASECOORD_56, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_37, BASECOORD_57, FRAMEBLOCKMODE_00 + +Subanimation18: + subanim SUBANIMTYPE_ENEMY, 4 + db FRAMEBLOCK_36, BASECOORD_54, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_36, BASECOORD_55, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_37, BASECOORD_56, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_37, BASECOORD_57, FRAMEBLOCKMODE_00 + +Subanimation40: + subanim SUBANIMTYPE_HFLIP, 6 + db FRAMEBLOCK_17, BASECOORD_54, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_17, BASECOORD_55, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_17, BASECOORD_0E, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_17, BASECOORD_56, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_17, BASECOORD_57, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_17, BASECOORD_13, FRAMEBLOCKMODE_00 + +Subanimation19: + subanim SUBANIMTYPE_REVERSE, 12 + db FRAMEBLOCK_38, BASECOORD_31, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_39, BASECOORD_31, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_38, BASECOORD_32, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_39, BASECOORD_32, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_38, BASECOORD_92, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_39, BASECOORD_92, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_38, BASECOORD_0E, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_39, BASECOORD_0E, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_38, BASECOORD_0F, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_39, BASECOORD_0F, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_38, BASECOORD_10, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_39, BASECOORD_10, FRAMEBLOCKMODE_00 + +Subanimation1a: + subanim SUBANIMTYPE_HFLIP, 16 + db FRAMEBLOCK_3A, BASECOORD_08, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_3B, BASECOORD_08, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_3C, BASECOORD_08, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_3D, BASECOORD_08, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_3E, BASECOORD_08, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_3F, BASECOORD_08, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_3E, BASECOORD_08, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_3F, BASECOORD_08, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_3A, BASECOORD_0B, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_3B, BASECOORD_0B, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_3C, BASECOORD_0B, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_3D, BASECOORD_0B, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_3E, BASECOORD_0B, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_3F, BASECOORD_0B, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_3E, BASECOORD_0B, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_3F, BASECOORD_0B, FRAMEBLOCKMODE_00 + +Subanimation1b: + subanim SUBANIMTYPE_REVERSE, 4 + db FRAMEBLOCK_40, BASECOORD_31, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_40, BASECOORD_32, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_40, BASECOORD_92, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_40, BASECOORD_15, FRAMEBLOCKMODE_00 + +Subanimation1c: + subanim SUBANIMTYPE_HFLIP, 3 + db FRAMEBLOCK_41, BASECOORD_58, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_41, BASECOORD_59, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_41, BASECOORD_21, FRAMEBLOCKMODE_00 + +Subanimation1d: + subanim SUBANIMTYPE_ENEMY, 15 + db FRAMEBLOCK_24, BASECOORD_9A, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_23, BASECOORD_1B, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_24, BASECOORD_22, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_23, BASECOORD_16, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_23, BASECOORD_1D, FRAMEBLOCKMODE_02 + db FRAMEBLOCK_24, BASECOORD_98, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_25, BASECOORD_2C, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_25, BASECOORD_2A, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_25, BASECOORD_99, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_25, BASECOORD_62, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_25, BASECOORD_99, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_25, BASECOORD_62, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_25, BASECOORD_99, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_25, BASECOORD_62, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_25, BASECOORD_99, FRAMEBLOCKMODE_03 + +Subanimation1e: + subanim SUBANIMTYPE_NORMAL, 1 + db FRAMEBLOCK_25, BASECOORD_75, FRAMEBLOCKMODE_00 + +Subanimation20: + subanim SUBANIMTYPE_HFLIP, 2 + db FRAMEBLOCK_42, BASECOORD_07, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_43, BASECOORD_07, FRAMEBLOCKMODE_00 + +Subanimation21: + subanim SUBANIMTYPE_HFLIP, 3 + db FRAMEBLOCK_44, BASECOORD_00, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_45, BASECOORD_08, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_46, BASECOORD_10, FRAMEBLOCKMODE_02 + +Subanimation22: + subanim SUBANIMTYPE_REVERSE, 11 + db FRAMEBLOCK_47, BASECOORD_10, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_47, BASECOORD_56, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_47, BASECOORD_07, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_47, BASECOORD_AA, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_47, BASECOORD_AB, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_47, BASECOORD_AC, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_47, BASECOORD_AD, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_47, BASECOORD_AE, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_47, BASECOORD_AF, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_47, BASECOORD_89, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_47, BASECOORD_B0, FRAMEBLOCKMODE_00 + +Subanimation2d: + subanim SUBANIMTYPE_COORDFLIP, 6 + db FRAMEBLOCK_44, BASECOORD_64, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_45, BASECOORD_65, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_46, BASECOORD_66, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_47, BASECOORD_66, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_47, BASECOORD_66, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_47, BASECOORD_66, FRAMEBLOCKMODE_00 + +Subanimation39: + subanim SUBANIMTYPE_COORDFLIP, 1 + db FRAMEBLOCK_47, BASECOORD_67, FRAMEBLOCKMODE_00 + +Subanimation4e: + subanim SUBANIMTYPE_HFLIP, 1 + db FRAMEBLOCK_71, BASECOORD_0F, FRAMEBLOCKMODE_03 + +Subanimation4f: + subanim SUBANIMTYPE_HFLIP, 7 + db FRAMEBLOCK_71, BASECOORD_0F, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_71, BASECOORD_08, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_71, BASECOORD_01, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_71, BASECOORD_95, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_72, BASECOORD_95, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_73, BASECOORD_95, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_74, BASECOORD_95, FRAMEBLOCKMODE_00 + +Subanimation50: + subanim SUBANIMTYPE_HFLIP, 8 + db FRAMEBLOCK_74, BASECOORD_95, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_73, BASECOORD_95, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_72, BASECOORD_95, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_71, BASECOORD_95, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_71, BASECOORD_01, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_71, BASECOORD_08, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_71, BASECOORD_0F, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_71, BASECOORD_16, FRAMEBLOCKMODE_00 + +Subanimation29: + subanim SUBANIMTYPE_HFLIP, 29 + db FRAMEBLOCK_SMALL_BLACK_CIRCLE, BASECOORD_0F, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_4A, BASECOORD_68, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_4B, BASECOORD_2A, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_LARGE_BLACK_CIRCLE, BASECOORD_0F, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_4A, BASECOORD_68, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_4B, BASECOORD_2A, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_4C, BASECOORD_6A, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_4D, BASECOORD_69, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_LARGE_BLACK_CIRCLE, BASECOORD_6B, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_4C, BASECOORD_6A, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_4D, BASECOORD_69, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_4A, BASECOORD_68, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_4B, BASECOORD_2A, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_LARGE_BLACK_CIRCLE, BASECOORD_6C, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_4A, BASECOORD_68, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_4B, BASECOORD_2A, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_4C, BASECOORD_6A, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_4D, BASECOORD_69, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_LARGE_BLACK_CIRCLE, BASECOORD_6D, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_4C, BASECOORD_6A, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_4D, BASECOORD_2A, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_4A, BASECOORD_68, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_4B, BASECOORD_2A, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_LARGE_BLACK_CIRCLE, BASECOORD_0F, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_4A, BASECOORD_68, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_4B, BASECOORD_2A, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_4C, BASECOORD_6A, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_4D, BASECOORD_2A, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_LARGE_BLACK_CIRCLE, BASECOORD_6B, FRAMEBLOCKMODE_00 + +Subanimation2a: + subanim SUBANIMTYPE_HFLIP, 4 + db FRAMEBLOCK_4E, BASECOORD_2B, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_4F, BASECOORD_2B, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_50, BASECOORD_2B, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_50, BASECOORD_2B, FRAMEBLOCKMODE_00 + +Subanimation23: + subanim SUBANIMTYPE_HFLIP, 2 + db FRAMEBLOCK_51, BASECOORD_2D, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_51, BASECOORD_6E, FRAMEBLOCKMODE_00 + +Subanimation24: + subanim SUBANIMTYPE_ENEMY, 2 + db FRAMEBLOCK_51, BASECOORD_2D, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_51, BASECOORD_6E, FRAMEBLOCKMODE_00 + +Subanimation25: + subanim SUBANIMTYPE_COORDFLIP, 2 + db FRAMEBLOCK_52, BASECOORD_71, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_52, BASECOORD_72, FRAMEBLOCKMODE_00 + +Subanimation26: + subanim SUBANIMTYPE_NORMAL, 2 + db FRAMEBLOCK_52, BASECOORD_01, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_52, BASECOORD_2C, FRAMEBLOCKMODE_00 + +Subanimation3a: + subanim SUBANIMTYPE_COORDFLIP, 3 + db FRAMEBLOCK_53, BASECOORD_71, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_53, BASECOORD_7F, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_53, BASECOORD_81, FRAMEBLOCKMODE_00 + +Subanimation3b: + subanim SUBANIMTYPE_NORMAL, 3 + db FRAMEBLOCK_53, BASECOORD_01, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_53, BASECOORD_15, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_53, BASECOORD_2C, FRAMEBLOCKMODE_00 + +Subanimation27: + subanim SUBANIMTYPE_ENEMY, 2 + db FRAMEBLOCK_54, BASECOORD_01, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_54, BASECOORD_2C, FRAMEBLOCKMODE_00 + +Subanimation28: + subanim SUBANIMTYPE_HVFLIP, 3 + db FRAMEBLOCK_55, BASECOORD_73, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_56, BASECOORD_73, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_57, BASECOORD_73, FRAMEBLOCKMODE_00 + +Subanimation32: + subanim SUBANIMTYPE_COORDFLIP, 3 + db FRAMEBLOCK_47, BASECOORD_74, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_47, BASECOORD_43, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_47, BASECOORD_75, FRAMEBLOCKMODE_00 + +Subanimation33: + subanim SUBANIMTYPE_HVFLIP, 6 + db FRAMEBLOCK_58, BASECOORD_76, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_34, BASECOORD_76, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_58, BASECOORD_76, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_34, BASECOORD_76, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_58, BASECOORD_76, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_34, BASECOORD_76, FRAMEBLOCKMODE_00 + +Subanimation3c: + subanim SUBANIMTYPE_COORDFLIP, 7 + db FRAMEBLOCK_59, BASECOORD_79, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_59, BASECOORD_7B, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_59, BASECOORD_77, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_59, BASECOORD_7A, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_59, BASECOORD_78, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_59, BASECOORD_7C, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_59, BASECOORD_76, FRAMEBLOCKMODE_00 + +Subanimation3d: + subanim SUBANIMTYPE_NORMAL, 8 + db FRAMEBLOCK_3A, BASECOORD_4D, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_3B, BASECOORD_4D, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_3C, BASECOORD_4D, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_3D, BASECOORD_4D, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_3E, BASECOORD_4D, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_3F, BASECOORD_4D, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_3E, BASECOORD_4D, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_3F, BASECOORD_4D, FRAMEBLOCKMODE_00 + +Subanimation34: + subanim SUBANIMTYPE_HVFLIP, 21 + db FRAMEBLOCK_SMALL_BLACK_CIRCLE, BASECOORD_7D, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_LARGE_BLACK_CIRCLE, BASECOORD_7D, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_5A, BASECOORD_7D, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_SMALL_BLACK_CIRCLE, BASECOORD_30, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_LARGE_BLACK_CIRCLE, BASECOORD_30, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_5A, BASECOORD_30, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_SMALL_BLACK_CIRCLE, BASECOORD_7E, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_LARGE_BLACK_CIRCLE, BASECOORD_7E, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_5A, BASECOORD_7E, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_SMALL_BLACK_CIRCLE, BASECOORD_7F, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_LARGE_BLACK_CIRCLE, BASECOORD_7F, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_5A, BASECOORD_7F, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_SMALL_BLACK_CIRCLE, BASECOORD_80, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_LARGE_BLACK_CIRCLE, BASECOORD_80, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_5A, BASECOORD_80, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_SMALL_BLACK_CIRCLE, BASECOORD_81, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_LARGE_BLACK_CIRCLE, BASECOORD_81, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_5A, BASECOORD_81, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_SMALL_BLACK_CIRCLE, BASECOORD_82, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_LARGE_BLACK_CIRCLE, BASECOORD_82, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_5A, BASECOORD_82, FRAMEBLOCKMODE_00 + +Subanimation35: + subanim SUBANIMTYPE_HVFLIP, 4 + db FRAMEBLOCK_5B, BASECOORD_83, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_5C, BASECOORD_84, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_5D, BASECOORD_85, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_5E, BASECOORD_09, FRAMEBLOCKMODE_00 + +Subanimation36: + subanim SUBANIMTYPE_HFLIP, 8 + db FRAMEBLOCK_5F, BASECOORD_2A, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_5F, BASECOORD_00, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_60, BASECOORD_2A, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_60, BASECOORD_00, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_61, BASECOORD_2A, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_61, BASECOORD_00, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_62, BASECOORD_2A, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_62, BASECOORD_00, FRAMEBLOCKMODE_00 + +Subanimation37: + subanim SUBANIMTYPE_HVFLIP, 10 + db FRAMEBLOCK_63, BASECOORD_89, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_64, BASECOORD_75, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_63, BASECOORD_76, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_65, BASECOORD_0D, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_65, BASECOORD_86, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_65, BASECOORD_12, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_65, BASECOORD_87, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_65, BASECOORD_17, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_65, BASECOORD_88, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_65, BASECOORD_1A, FRAMEBLOCKMODE_00 + +Subanimation38: + subanim SUBANIMTYPE_HFLIP, 16 + db FRAMEBLOCK_66, BASECOORD_8A, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_66, BASECOORD_33, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_66, BASECOORD_2E, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_67, BASECOORD_24, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_66, BASECOORD_01, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_66, BASECOORD_10, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_66, BASECOORD_1D, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_67, BASECOORD_28, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_66, BASECOORD_2A, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_66, BASECOORD_0E, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_66, BASECOORD_1B, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_67, BASECOORD_26, FRAMEBLOCKMODE_03 + db FRAMEBLOCK_66, BASECOORD_03, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_66, BASECOORD_12, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_66, BASECOORD_1E, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_67, BASECOORD_29, FRAMEBLOCKMODE_00 + +Subanimation3e: + subanim SUBANIMTYPE_REVERSE, 18 + db FRAMEBLOCK_02, BASECOORD_31, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_34, BASECOORD_31, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_02, BASECOORD_31, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_02, BASECOORD_32, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_34, BASECOORD_32, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_02, BASECOORD_32, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_02, BASECOORD_92, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_34, BASECOORD_92, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_02, BASECOORD_92, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_02, BASECOORD_0E, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_34, BASECOORD_0E, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_02, BASECOORD_0E, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_02, BASECOORD_0F, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_34, BASECOORD_0F, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_02, BASECOORD_0F, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_02, BASECOORD_10, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_34, BASECOORD_10, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_02, BASECOORD_10, FRAMEBLOCKMODE_00 + +Subanimation3f: + subanim SUBANIMTYPE_COORDFLIP, 18 + db FRAMEBLOCK_68, BASECOORD_4B, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_68, BASECOORD_8C, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_68, BASECOORD_20, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_68, BASECOORD_1C, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_68, BASECOORD_19, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_68, BASECOORD_14, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_68, BASECOORD_76, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_68, BASECOORD_8D, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_68, BASECOORD_15, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_68, BASECOORD_10, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_68, BASECOORD_0C, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_68, BASECOORD_06, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_68, BASECOORD_8E, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_68, BASECOORD_8F, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_68, BASECOORD_90, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_68, BASECOORD_26, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_68, BASECOORD_23, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_68, BASECOORD_1F, FRAMEBLOCKMODE_00 + +Subanimation44: + subanim SUBANIMTYPE_HVFLIP, 12 + db FRAMEBLOCK_69, BASECOORD_4B, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_69, BASECOORD_8C, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_69, BASECOORD_20, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_69, BASECOORD_1C, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_69, BASECOORD_19, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_69, BASECOORD_14, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_69, BASECOORD_76, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_69, BASECOORD_8D, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_69, BASECOORD_15, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_69, BASECOORD_10, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_69, BASECOORD_0C, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_69, BASECOORD_06, FRAMEBLOCKMODE_00 + +Subanimation43: + subanim SUBANIMTYPE_ENEMY, 3 + db FRAMEBLOCK_6A, BASECOORD_07, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_6B, BASECOORD_0F, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_6C, BASECOORD_17, FRAMEBLOCKMODE_00 + +Subanimation45: + subanim SUBANIMTYPE_HVFLIP, 4 + db FRAMEBLOCK_6D, BASECOORD_8B, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_6D, BASECOORD_84, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_6D, BASECOORD_63, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_6D, BASECOORD_8C, FRAMEBLOCKMODE_00 + +Subanimation46: + subanim SUBANIMTYPE_HVFLIP, 6 + db FRAMEBLOCK_6D, BASECOORD_8B, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_6D, BASECOORD_84, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_6D, BASECOORD_63, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_6D, BASECOORD_8C, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_6D, BASECOORD_0A, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_6D, BASECOORD_89, FRAMEBLOCKMODE_00 + +Subanimation47: + subanim SUBANIMTYPE_HVFLIP, 3 + db FRAMEBLOCK_06, BASECOORD_82, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_07, BASECOORD_82, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_08, BASECOORD_96, FRAMEBLOCKMODE_00 + +Subanimation48: + subanim SUBANIMTYPE_NORMAL, 6 + db FRAMEBLOCK_03, BASECOORD_41, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_03, BASECOORD_48, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_04, BASECOORD_48, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_03, BASECOORD_48, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_05, BASECOORD_48, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_03, BASECOORD_48, FRAMEBLOCKMODE_03 + +Subanimation49: + subanim SUBANIMTYPE_NORMAL, 4 + db FRAMEBLOCK_04, BASECOORD_48, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_03, BASECOORD_48, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_05, BASECOORD_48, FRAMEBLOCKMODE_04 + db FRAMEBLOCK_03, BASECOORD_48, FRAMEBLOCKMODE_03 + +Subanimation4a: + subanim SUBANIMTYPE_NORMAL, 1 + db FRAMEBLOCK_04, BASECOORD_84, FRAMEBLOCKMODE_03 + +Subanimation4b: + subanim SUBANIMTYPE_NORMAL, 3 + db FRAMEBLOCK_06, BASECOORD_72, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_07, BASECOORD_72, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_08, BASECOORD_72, FRAMEBLOCKMODE_00 + +Subanimation4c: + subanim SUBANIMTYPE_COORDFLIP, 8 + db FRAMEBLOCK_6F, BASECOORD_30, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_6E, BASECOORD_30, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_70, BASECOORD_30, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_6E, BASECOORD_30, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_6F, BASECOORD_30, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_6E, BASECOORD_30, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_70, BASECOORD_30, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_6E, BASECOORD_30, FRAMEBLOCKMODE_00 + +Subanimation4d: + subanim SUBANIMTYPE_HVFLIP, 6 + db FRAMEBLOCK_32, BASECOORD_4B, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_33, BASECOORD_4F, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_32, BASECOORD_20, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_33, BASECOORD_16, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_32, BASECOORD_19, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_33, BASECOORD_0D, FRAMEBLOCKMODE_00 + +Subanimation51: + subanim SUBANIMTYPE_ENEMY, 6 + db FRAMEBLOCK_76, BASECOORD_1B, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_34, BASECOORD_1B, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_76, BASECOORD_1B, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_34, BASECOORD_1B, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_76, BASECOORD_1B, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_34, BASECOORD_1B, FRAMEBLOCKMODE_00 + +Subanimation52: + subanim SUBANIMTYPE_HFLIP, 7 + db FRAMEBLOCK_77, BASECOORD_25, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_77, BASECOORD_9B, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_77, BASECOORD_1A, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_77, BASECOORD_9C, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_77, BASECOORD_2F, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_77, BASECOORD_50, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_77, BASECOORD_8C, FRAMEBLOCKMODE_00 + +Subanimation53: + subanim SUBANIMTYPE_NORMAL, 12 + db FRAMEBLOCK_78, BASECOORD_30, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_78, BASECOORD_A2, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_78, BASECOORD_93, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_78, BASECOORD_61, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_78, BASECOORD_73, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_78, BASECOORD_A7, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_78, BASECOORD_33, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_78, BASECOORD_A8, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_78, BASECOORD_0E, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_78, BASECOORD_A9, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_78, BASECOORD_34, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_01, BASECOORD_9E, FRAMEBLOCKMODE_00 + +Subanimation54: + subanim SUBANIMTYPE_NORMAL, 11 + db FRAMEBLOCK_79, BASECOORD_30, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_79, BASECOORD_A2, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_79, BASECOORD_93, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_79, BASECOORD_61, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_79, BASECOORD_73, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_79, BASECOORD_A7, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_79, BASECOORD_33, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_79, BASECOORD_A8, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_79, BASECOORD_0E, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_79, BASECOORD_A9, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_79, BASECOORD_34, FRAMEBLOCKMODE_00 diff --git a/data/icon_pointers.asm b/data/icon_pointers.asm index ce35f3fe..305dfcb1 100644 --- a/data/icon_pointers.asm +++ b/data/icon_pointers.asm @@ -7,9 +7,9 @@ ENDM MonPartySpritePointers: ; gfx pointer, gfx tile offset, # tiles, vSprites tile offset - mon_icon_header SlowbroSprite, 12, 4, $00 - mon_icon_header BallSprite, 0, 8, $04 - mon_icon_header ClefairySprite, 12, 4, $0c + mon_icon_header MonsterSprite, 12, 4, $00 + mon_icon_header PokeBallSprite, 0, 8, $04 + mon_icon_header FairySprite, 12, 4, $0c mon_icon_header BirdSprite, 12, 4, $10 mon_icon_header SeelSprite, 0, 4, $14 mon_icon_header BugIconFrame2, 0, 1, $18 @@ -21,9 +21,9 @@ MonPartySpritePointers: mon_icon_header QuadrupedIconFrame1, 0, 1, $24 mon_icon_header QuadrupedIconFrame1, 1, 1, $26 mon_icon_header TradeBubbleIconGFX, 0, 4, $38 - mon_icon_header SlowbroSprite, 0, 4, $40 - mon_icon_header BallSprite, 0, 8, $44 - mon_icon_header ClefairySprite, 0, 4, $4c + mon_icon_header MonsterSprite, 0, 4, $40 + mon_icon_header PokeBallSprite, 0, 8, $44 + mon_icon_header FairySprite, 0, 4, $4c mon_icon_header BirdSprite, 0, 4, $50 mon_icon_header SeelSprite, 12, 4, $54 mon_icon_header BugIconFrame1, 0, 1, $58 diff --git a/data/items/key_items.asm b/data/items/key_items.asm index afa586af..aca8cf81 100755 --- a/data/items/key_items.asm +++ b/data/items/key_items.asm @@ -1,12 +1,103 @@ +key_item_bits: MACRO +_bit = 0 +_byte = 0 +REPT _NARG +_byte = _byte | ((\1) << _bit) +_bit = _bit + 1 +IF _bit == 8 + db _byte +_byte = 0 +_bit = 0 +ENDC +SHIFT +ENDR +IF _bit > 0 + db _byte +ENDC +ENDM + KeyItemBitfield: - db %11110000 - db %00000001 - db %11110000 - db %01001111 - db %00000000 - db %10011111 - db %00000000 - db %11000000 - db %11110000 - db %00111011 - db %00000000 + key_item_bits \ + FALSE, \ ; MASTER_BALL + FALSE, \ ; ULTRA_BALL + FALSE, \ ; GREAT_BALL + FALSE, \ ; POKE_BALL + TRUE, \ ; TOWN_MAP + TRUE, \ ; BICYCLE + TRUE, \ ; SURFBOARD + TRUE, \ ; SAFARI_BALL + TRUE, \ ; POKEDEX + FALSE, \ ; MOON_STONE + FALSE, \ ; ANTIDOTE + FALSE, \ ; BURN_HEAL + FALSE, \ ; ICE_HEAL + FALSE, \ ; AWAKENING + FALSE, \ ; PARLYZ_HEAL + FALSE, \ ; FULL_RESTORE + FALSE, \ ; MAX_POTION + FALSE, \ ; HYPER_POTION + FALSE, \ ; SUPER_POTION + FALSE, \ ; POTION + TRUE, \ ; BOULDERBADGE + TRUE, \ ; CASCADEBADGE + TRUE, \ ; THUNDERBADGE + TRUE, \ ; RAINBOWBADGE + TRUE, \ ; SOULBADGE + TRUE, \ ; MARSHBADGE + TRUE, \ ; VOLCANOBADGE + TRUE, \ ; EARTHBADGE + FALSE, \ ; ESCAPE_ROPE + FALSE, \ ; REPEL + TRUE, \ ; OLD_AMBER + FALSE, \ ; FIRE_STONE + FALSE, \ ; THUNDER_STONE + FALSE, \ ; WATER_STONE + FALSE, \ ; HP_UP + FALSE, \ ; PROTEIN + FALSE, \ ; IRON + FALSE, \ ; CARBOS + FALSE, \ ; CALCIUM + FALSE, \ ; RARE_CANDY + TRUE, \ ; DOME_FOSSIL + TRUE, \ ; HELIX_FOSSIL + TRUE, \ ; SECRET_KEY + TRUE, \ ; UNUSED_ITEM + TRUE, \ ; BIKE_VOUCHER + FALSE, \ ; X_ACCURACY + FALSE, \ ; LEAF_STONE + TRUE, \ ; CARD_KEY + FALSE, \ ; NUGGET + FALSE, \ ; PP_UP_2 + FALSE, \ ; POKE_DOLL + FALSE, \ ; FULL_HEAL + FALSE, \ ; REVIVE + FALSE, \ ; MAX_REVIVE + FALSE, \ ; GUARD_SPEC + FALSE, \ ; SUPER_REPEL + FALSE, \ ; MAX_REPEL + FALSE, \ ; DIRE_HIT + FALSE, \ ; COIN + FALSE, \ ; FRESH_WATER + FALSE, \ ; SODA_POP + FALSE, \ ; LEMONADE + TRUE, \ ; S_S_TICKET + TRUE, \ ; GOLD_TEETH + FALSE, \ ; X_ATTACK + FALSE, \ ; X_DEFEND + FALSE, \ ; X_SPEED + FALSE, \ ; X_SPECIAL + TRUE, \ ; COIN_CASE + TRUE, \ ; OAKS_PARCEL + TRUE, \ ; ITEMFINDER + TRUE, \ ; SILPH_SCOPE + TRUE, \ ; POKE_FLUTE + TRUE, \ ; LIFT_KEY + FALSE, \ ; EXP_ALL + TRUE, \ ; OLD_ROD + TRUE, \ ; GOOD_ROD + TRUE, \ ; SUPER_ROD + FALSE, \ ; PP_UP + FALSE, \ ; ETHER + FALSE, \ ; MAX_ETHER + FALSE, \ ; ELIXER + FALSE ; MAX_ELIXER diff --git a/data/maps/objects/BikeShop.asm b/data/maps/objects/BikeShop.asm index acfd7294..cf321c2a 100755 --- a/data/maps/objects/BikeShop.asm +++ b/data/maps/objects/BikeShop.asm @@ -8,9 +8,9 @@ BikeShop_Object: db 0 ; signs db 3 ; objects - object SPRITE_BIKE_SHOP_GUY, 6, 2, STAY, NONE, 1 ; person - object SPRITE_MOM_GEISHA, 5, 6, WALK, 1, 2 ; person - object SPRITE_BUG_CATCHER, 1, 3, STAY, UP, 3 ; person + object SPRITE_BIKE_SHOP_CLERK, 6, 2, STAY, NONE, 1 ; person + object SPRITE_MIDDLE_AGED_WOMAN, 5, 6, WALK, 1, 2 ; person + object SPRITE_YOUNGSTER, 1, 3, STAY, UP, 3 ; person ; warp-to warp_to 2, 7, BIKE_SHOP_WIDTH diff --git a/data/maps/objects/BillsHouse.asm b/data/maps/objects/BillsHouse.asm index c0ddf2ec..1bfd96b9 100755 --- a/data/maps/objects/BillsHouse.asm +++ b/data/maps/objects/BillsHouse.asm @@ -8,9 +8,9 @@ BillsHouse_Object: db 0 ; signs db 3 ; objects - object SPRITE_SLOWBRO, 6, 5, STAY, NONE, 1 ; person - object SPRITE_BLACK_HAIR_BOY_2, 4, 4, STAY, NONE, 2 ; person - object SPRITE_BLACK_HAIR_BOY_2, 6, 5, STAY, NONE, 3 ; person + object SPRITE_MONSTER, 6, 5, STAY, NONE, 1 ; person + object SPRITE_SUPER_NERD, 4, 4, STAY, NONE, 2 ; person + object SPRITE_SUPER_NERD, 6, 5, STAY, NONE, 3 ; person ; warp-to warp_to 2, 7, BILLS_HOUSE_WIDTH diff --git a/data/maps/objects/BluesHouse.asm b/data/maps/objects/BluesHouse.asm index 8681787c..3dbdad84 100755 --- a/data/maps/objects/BluesHouse.asm +++ b/data/maps/objects/BluesHouse.asm @@ -10,7 +10,7 @@ BluesHouse_Object: db 3 ; objects object SPRITE_DAISY, 2, 3, STAY, RIGHT, 1 ; Daisy, sitting by map object SPRITE_DAISY, 6, 4, WALK, 1, 2, 0 ; Daisy, walking around - object SPRITE_BOOK_MAP_DEX, 3, 3, STAY, NONE, 3, 0 ; map on table + object SPRITE_POKEDEX, 3, 3, STAY, NONE, 3, 0 ; map on table ; warp-to warp_to 2, 7, BLUES_HOUSE_WIDTH diff --git a/data/maps/objects/CeladonChiefHouse.asm b/data/maps/objects/CeladonChiefHouse.asm index d912bf94..28206d10 100755 --- a/data/maps/objects/CeladonChiefHouse.asm +++ b/data/maps/objects/CeladonChiefHouse.asm @@ -8,7 +8,7 @@ CeladonChiefHouse_Object: db 0 ; signs db 3 ; objects - object SPRITE_OLD_PERSON, 4, 2, STAY, DOWN, 1 ; person + object SPRITE_GRAMPS, 4, 2, STAY, DOWN, 1 ; person object SPRITE_ROCKET, 1, 4, WALK, 0, 2 ; person object SPRITE_SAILOR, 5, 6, STAY, LEFT, 3 ; person diff --git a/data/maps/objects/CeladonCity.asm b/data/maps/objects/CeladonCity.asm index 005fc61e..446f6754 100755 --- a/data/maps/objects/CeladonCity.asm +++ b/data/maps/objects/CeladonCity.asm @@ -29,12 +29,12 @@ CeladonCity_Object: db 9 ; objects object SPRITE_LITTLE_GIRL, 8, 17, WALK, 0, 1 ; person - object SPRITE_OLD_PERSON, 11, 28, STAY, UP, 2 ; person + object SPRITE_GRAMPS, 11, 28, STAY, UP, 2 ; person object SPRITE_GIRL, 14, 19, WALK, 1, 3 ; person - object SPRITE_OLD_PERSON, 25, 22, STAY, DOWN, 4 ; person - object SPRITE_OLD_PERSON, 22, 16, STAY, DOWN, 5 ; person - object SPRITE_FISHER2, 32, 12, STAY, LEFT, 6 ; person - object SPRITE_SLOWBRO, 30, 12, STAY, RIGHT, 7 ; person + object SPRITE_GRAMPS, 25, 22, STAY, DOWN, 4 ; person + object SPRITE_GRAMPS, 22, 16, STAY, DOWN, 5 ; person + object SPRITE_FISHER, 32, 12, STAY, LEFT, 6 ; person + object SPRITE_MONSTER, 30, 12, STAY, RIGHT, 7 ; person object SPRITE_ROCKET, 32, 29, WALK, 2, 8 ; person object SPRITE_ROCKET, 42, 14, WALK, 2, 9 ; person diff --git a/data/maps/objects/CeladonDiner.asm b/data/maps/objects/CeladonDiner.asm index b2f42e48..c0925ca2 100755 --- a/data/maps/objects/CeladonDiner.asm +++ b/data/maps/objects/CeladonDiner.asm @@ -9,10 +9,10 @@ CeladonDiner_Object: db 5 ; objects object SPRITE_COOK, 8, 5, WALK, 2, 1 ; person - object SPRITE_MOM_GEISHA, 7, 2, STAY, NONE, 2 ; person - object SPRITE_FAT_BALD_GUY, 1, 4, STAY, DOWN, 3 ; person - object SPRITE_FISHER2, 5, 3, STAY, RIGHT, 4 ; person - object SPRITE_GYM_HELPER, 0, 1, STAY, DOWN, 5 ; person + object SPRITE_MIDDLE_AGED_WOMAN, 7, 2, STAY, NONE, 2 ; person + object SPRITE_MIDDLE_AGED_MAN, 1, 4, STAY, DOWN, 3 ; person + object SPRITE_FISHER, 5, 3, STAY, RIGHT, 4 ; person + object SPRITE_GYM_GUIDE, 0, 1, STAY, DOWN, 5 ; person ; warp-to warp_to 3, 7, CELADON_DINER_WIDTH diff --git a/data/maps/objects/CeladonGym.asm b/data/maps/objects/CeladonGym.asm index a38ef4e8..be186d55 100755 --- a/data/maps/objects/CeladonGym.asm +++ b/data/maps/objects/CeladonGym.asm @@ -9,13 +9,13 @@ CeladonGym_Object: db 8 ; objects object SPRITE_ERIKA, 4, 3, STAY, DOWN, 1, OPP_ERIKA, 1 - object SPRITE_LASS, 2, 11, STAY, RIGHT, 2, OPP_LASS, 17 - object SPRITE_FOULARD_WOMAN, 7, 10, STAY, LEFT, 3, OPP_BEAUTY, 1 - object SPRITE_LASS, 9, 5, STAY, DOWN, 4, OPP_JR_TRAINER_F, 11 - object SPRITE_FOULARD_WOMAN, 1, 5, STAY, DOWN, 5, OPP_BEAUTY, 2 - object SPRITE_LASS, 6, 3, STAY, DOWN, 6, OPP_LASS, 18 - object SPRITE_FOULARD_WOMAN, 3, 3, STAY, DOWN, 7, OPP_BEAUTY, 3 - object SPRITE_LASS, 5, 3, STAY, DOWN, 8, OPP_COOLTRAINER_F, 1 + object SPRITE_COOLTRAINER_F, 2, 11, STAY, RIGHT, 2, OPP_LASS, 17 + object SPRITE_BEAUTY, 7, 10, STAY, LEFT, 3, OPP_BEAUTY, 1 + object SPRITE_COOLTRAINER_F, 9, 5, STAY, DOWN, 4, OPP_JR_TRAINER_F, 11 + object SPRITE_BEAUTY, 1, 5, STAY, DOWN, 5, OPP_BEAUTY, 2 + object SPRITE_COOLTRAINER_F, 6, 3, STAY, DOWN, 6, OPP_LASS, 18 + object SPRITE_BEAUTY, 3, 3, STAY, DOWN, 7, OPP_BEAUTY, 3 + object SPRITE_COOLTRAINER_F, 5, 3, STAY, DOWN, 8, OPP_COOLTRAINER_F, 1 ; warp-to warp_to 4, 17, CELADON_GYM_WIDTH diff --git a/data/maps/objects/CeladonHotel.asm b/data/maps/objects/CeladonHotel.asm index 642950bd..afa55936 100755 --- a/data/maps/objects/CeladonHotel.asm +++ b/data/maps/objects/CeladonHotel.asm @@ -8,9 +8,9 @@ CeladonHotel_Object: db 0 ; signs db 3 ; objects - object SPRITE_OLD_MEDIUM_WOMAN, 3, 1, STAY, DOWN, 1 ; person - object SPRITE_FOULARD_WOMAN, 2, 4, STAY, NONE, 2 ; person - object SPRITE_BLACK_HAIR_BOY_2, 8, 4, WALK, 2, 3 ; person + object SPRITE_GRANNY, 3, 1, STAY, DOWN, 1 ; person + object SPRITE_BEAUTY, 2, 4, STAY, NONE, 2 ; person + object SPRITE_SUPER_NERD, 8, 4, WALK, 2, 3 ; person ; warp-to warp_to 3, 7, CELADON_HOTEL_WIDTH diff --git a/data/maps/objects/CeladonMansion1F.asm b/data/maps/objects/CeladonMansion1F.asm index 7f5b684b..1e142d44 100755 --- a/data/maps/objects/CeladonMansion1F.asm +++ b/data/maps/objects/CeladonMansion1F.asm @@ -12,10 +12,10 @@ CeladonMansion1F_Object: sign 4, 9, 5 ; CeladonMansion1Text5 db 4 ; objects - object SPRITE_SLOWBRO, 0, 5, STAY, RIGHT, 1 ; person - object SPRITE_OLD_MEDIUM_WOMAN, 1, 5, STAY, DOWN, 2 ; person - object SPRITE_CLEFAIRY, 1, 8, WALK, 2, 3 ; person - object SPRITE_SLOWBRO, 4, 4, WALK, 1, 4 ; person + object SPRITE_MONSTER, 0, 5, STAY, RIGHT, 1 ; person + object SPRITE_GRANNY, 1, 5, STAY, DOWN, 2 ; person + object SPRITE_FAIRY, 1, 8, WALK, 2, 3 ; person + object SPRITE_MONSTER, 4, 4, WALK, 1, 4 ; person ; warp-to warp_to 4, 11, CELADON_MANSION_1F_WIDTH diff --git a/data/maps/objects/CeladonMansion3F.asm b/data/maps/objects/CeladonMansion3F.asm index 32701f14..9ff614c7 100755 --- a/data/maps/objects/CeladonMansion3F.asm +++ b/data/maps/objects/CeladonMansion3F.asm @@ -14,10 +14,10 @@ CeladonMansion3F_Object: sign 4, 9, 8 ; CeladonMansion3Text8 db 4 ; objects - object SPRITE_BIKE_SHOP_GUY, 0, 4, STAY, UP, 1 ; person - object SPRITE_MART_GUY, 3, 4, STAY, UP, 2 ; person - object SPRITE_BLACK_HAIR_BOY_2, 0, 7, STAY, UP, 3 ; person - object SPRITE_LAPRAS_GIVER, 2, 3, STAY, NONE, 4 ; person + object SPRITE_BIKE_SHOP_CLERK, 0, 4, STAY, UP, 1 ; person + object SPRITE_CLERK, 3, 4, STAY, UP, 2 ; person + object SPRITE_SUPER_NERD, 0, 7, STAY, UP, 3 ; person + object SPRITE_SILPH_WORKER, 2, 3, STAY, NONE, 4 ; person ; warp-to warp_to 6, 1, CELADON_MANSION_3F_WIDTH ; CELADON_MANSION_2F diff --git a/data/maps/objects/CeladonMansionRoofHouse.asm b/data/maps/objects/CeladonMansionRoofHouse.asm index b6a6149f..d0318820 100755 --- a/data/maps/objects/CeladonMansionRoofHouse.asm +++ b/data/maps/objects/CeladonMansionRoofHouse.asm @@ -9,7 +9,7 @@ CeladonMansionRoofHouse_Object: db 2 ; objects object SPRITE_HIKER, 2, 2, STAY, DOWN, 1 ; person - object SPRITE_BALL, 4, 3, STAY, NONE, 2 ; person + object SPRITE_POKE_BALL, 4, 3, STAY, NONE, 2 ; person ; warp-to warp_to 2, 7, CELADON_MANSION_ROOF_HOUSE_WIDTH ; CELADON_MANSION_ROOF diff --git a/data/maps/objects/CeladonMart1F.asm b/data/maps/objects/CeladonMart1F.asm index 3403e12c..6f4762fa 100755 --- a/data/maps/objects/CeladonMart1F.asm +++ b/data/maps/objects/CeladonMart1F.asm @@ -14,7 +14,7 @@ CeladonMart1F_Object: sign 14, 1, 3 ; CeladonMart1Text3 db 1 ; objects - object SPRITE_CABLE_CLUB_WOMAN, 8, 3, STAY, DOWN, 1 ; person + object SPRITE_LINK_RECEPTIONIST, 8, 3, STAY, DOWN, 1 ; person ; warp-to warp_to 2, 7, CELADON_MART_1F_WIDTH diff --git a/data/maps/objects/CeladonMart2F.asm b/data/maps/objects/CeladonMart2F.asm index 2f5f428e..5cc5c6e2 100755 --- a/data/maps/objects/CeladonMart2F.asm +++ b/data/maps/objects/CeladonMart2F.asm @@ -10,9 +10,9 @@ CeladonMart2F_Object: sign 14, 1, 5 ; CeladonMart2Text5 db 4 ; objects - object SPRITE_MART_GUY, 5, 3, STAY, DOWN, 1 ; person - object SPRITE_MART_GUY, 6, 3, STAY, DOWN, 2 ; person - object SPRITE_FAT_BALD_GUY, 19, 5, STAY, NONE, 3 ; person + object SPRITE_CLERK, 5, 3, STAY, DOWN, 1 ; person + object SPRITE_CLERK, 6, 3, STAY, DOWN, 2 ; person + object SPRITE_MIDDLE_AGED_MAN, 19, 5, STAY, NONE, 3 ; person object SPRITE_GIRL, 14, 4, WALK, 1, 4 ; person ; warp-to diff --git a/data/maps/objects/CeladonMart3F.asm b/data/maps/objects/CeladonMart3F.asm index 6dfce535..04a4c2f0 100755 --- a/data/maps/objects/CeladonMart3F.asm +++ b/data/maps/objects/CeladonMart3F.asm @@ -21,11 +21,11 @@ CeladonMart3F_Object: sign 10, 1, 17 ; CeladonMart3Text17 db 5 ; objects - object SPRITE_MART_GUY, 16, 5, STAY, NONE, 1 ; person - object SPRITE_GAMEBOY_KID_COPY, 11, 6, STAY, RIGHT, 2 ; person - object SPRITE_GAMEBOY_KID_COPY, 7, 2, STAY, DOWN, 3 ; person - object SPRITE_GAMEBOY_KID_COPY, 8, 2, STAY, DOWN, 4 ; person - object SPRITE_YOUNG_BOY, 2, 5, STAY, UP, 5 ; person + object SPRITE_CLERK, 16, 5, STAY, NONE, 1 ; person + object SPRITE_GAMEBOY_KID, 11, 6, STAY, RIGHT, 2 ; person + object SPRITE_GAMEBOY_KID, 7, 2, STAY, DOWN, 3 ; person + object SPRITE_GAMEBOY_KID, 8, 2, STAY, DOWN, 4 ; person + object SPRITE_LITTLE_BOY, 2, 5, STAY, UP, 5 ; person ; warp-to warp_to 12, 1, CELADON_MART_3F_WIDTH ; CELADON_MART_4F diff --git a/data/maps/objects/CeladonMart4F.asm b/data/maps/objects/CeladonMart4F.asm index 18ba3bdc..8f71b4b0 100755 --- a/data/maps/objects/CeladonMart4F.asm +++ b/data/maps/objects/CeladonMart4F.asm @@ -10,9 +10,9 @@ CeladonMart4F_Object: sign 14, 1, 4 ; CeladonMart4Text4 db 3 ; objects - object SPRITE_MART_GUY, 5, 7, STAY, NONE, 1 ; person - object SPRITE_BLACK_HAIR_BOY_2, 15, 5, WALK, 2, 2 ; person - object SPRITE_BUG_CATCHER, 5, 2, WALK, 2, 3 ; person + object SPRITE_CLERK, 5, 7, STAY, NONE, 1 ; person + object SPRITE_SUPER_NERD, 15, 5, WALK, 2, 2 ; person + object SPRITE_YOUNGSTER, 5, 2, WALK, 2, 3 ; person ; warp-to warp_to 12, 1, CELADON_MART_4F_WIDTH ; CELADON_MART_3F diff --git a/data/maps/objects/CeladonMart5F.asm b/data/maps/objects/CeladonMart5F.asm index fb1201c9..4d3fb865 100755 --- a/data/maps/objects/CeladonMart5F.asm +++ b/data/maps/objects/CeladonMart5F.asm @@ -12,8 +12,8 @@ CeladonMart5F_Object: db 4 ; objects object SPRITE_GENTLEMAN, 14, 5, WALK, 1, 1 ; person object SPRITE_SAILOR, 2, 6, STAY, NONE, 2 ; person - object SPRITE_MART_GUY, 5, 3, STAY, DOWN, 3 ; person - object SPRITE_MART_GUY, 6, 3, STAY, DOWN, 4 ; person + object SPRITE_CLERK, 5, 3, STAY, DOWN, 3 ; person + object SPRITE_CLERK, 6, 3, STAY, DOWN, 4 ; person ; warp-to warp_to 12, 1, CELADON_MART_5F_WIDTH ; CELADON_MART_ROOF diff --git a/data/maps/objects/CeladonMartRoof.asm b/data/maps/objects/CeladonMartRoof.asm index 05cef2d4..4e81b9a3 100755 --- a/data/maps/objects/CeladonMartRoof.asm +++ b/data/maps/objects/CeladonMartRoof.asm @@ -11,7 +11,7 @@ CeladonMartRoof_Object: sign 13, 2, 6 ; CeladonMartRoofText6 db 2 ; objects - object SPRITE_BLACK_HAIR_BOY_2, 10, 4, STAY, LEFT, 1 ; person + object SPRITE_SUPER_NERD, 10, 4, STAY, LEFT, 1 ; person object SPRITE_LITTLE_GIRL, 5, 5, WALK, 0, 2 ; person ; warp-to diff --git a/data/maps/objects/CeladonPokecenter.asm b/data/maps/objects/CeladonPokecenter.asm index feddb996..3a48cd95 100755 --- a/data/maps/objects/CeladonPokecenter.asm +++ b/data/maps/objects/CeladonPokecenter.asm @@ -10,8 +10,8 @@ CeladonPokecenter_Object: db 4 ; objects object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person object SPRITE_GENTLEMAN, 7, 3, WALK, 2, 2 ; person - object SPRITE_FOULARD_WOMAN, 10, 5, WALK, 0, 3 ; person - object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person + object SPRITE_BEAUTY, 10, 5, WALK, 0, 3 ; person + object SPRITE_LINK_RECEPTIONIST, 11, 2, STAY, DOWN, 4 ; person ; warp-to warp_to 3, 7, CELADON_POKECENTER_WIDTH diff --git a/data/maps/objects/CeruleanBadgeHouse.asm b/data/maps/objects/CeruleanBadgeHouse.asm index eb6ac206..985d989c 100755 --- a/data/maps/objects/CeruleanBadgeHouse.asm +++ b/data/maps/objects/CeruleanBadgeHouse.asm @@ -9,7 +9,7 @@ CeruleanBadgeHouse_Object: db 0 ; signs db 1 ; objects - object SPRITE_FAT_BALD_GUY, 5, 3, STAY, RIGHT, 1 ; person + object SPRITE_MIDDLE_AGED_MAN, 5, 3, STAY, RIGHT, 1 ; person ; warp-to warp_to 2, 0, CERULEAN_BADGE_HOUSE_WIDTH diff --git a/data/maps/objects/CeruleanCave1F.asm b/data/maps/objects/CeruleanCave1F.asm index 713f88ef..80283f09 100755 --- a/data/maps/objects/CeruleanCave1F.asm +++ b/data/maps/objects/CeruleanCave1F.asm @@ -15,9 +15,9 @@ CeruleanCave1F_Object: db 0 ; signs db 3 ; objects - object SPRITE_BALL, 7, 13, STAY, NONE, 1, FULL_RESTORE - object SPRITE_BALL, 19, 3, STAY, NONE, 2, MAX_ELIXER - object SPRITE_BALL, 5, 0, STAY, NONE, 3, NUGGET + object SPRITE_POKE_BALL, 7, 13, STAY, NONE, 1, FULL_RESTORE + object SPRITE_POKE_BALL, 19, 3, STAY, NONE, 2, MAX_ELIXER + object SPRITE_POKE_BALL, 5, 0, STAY, NONE, 3, NUGGET ; warp-to warp_to 24, 17, CERULEAN_CAVE_1F_WIDTH diff --git a/data/maps/objects/CeruleanCave2F.asm b/data/maps/objects/CeruleanCave2F.asm index f8312da0..26dee8ef 100755 --- a/data/maps/objects/CeruleanCave2F.asm +++ b/data/maps/objects/CeruleanCave2F.asm @@ -12,9 +12,9 @@ CeruleanCave2F_Object: db 0 ; signs db 3 ; objects - object SPRITE_BALL, 29, 9, STAY, NONE, 1, PP_UP - object SPRITE_BALL, 4, 15, STAY, NONE, 2, ULTRA_BALL - object SPRITE_BALL, 13, 6, STAY, NONE, 3, FULL_RESTORE + object SPRITE_POKE_BALL, 29, 9, STAY, NONE, 1, PP_UP + object SPRITE_POKE_BALL, 4, 15, STAY, NONE, 2, ULTRA_BALL + object SPRITE_POKE_BALL, 13, 6, STAY, NONE, 3, FULL_RESTORE ; warp-to warp_to 29, 1, CERULEAN_CAVE_2F_WIDTH ; CERULEAN_CAVE_1F diff --git a/data/maps/objects/CeruleanCaveB1F.asm b/data/maps/objects/CeruleanCaveB1F.asm index 461f77aa..642ff0c7 100755 --- a/data/maps/objects/CeruleanCaveB1F.asm +++ b/data/maps/objects/CeruleanCaveB1F.asm @@ -7,9 +7,9 @@ CeruleanCaveB1F_Object: db 0 ; signs db 3 ; objects - object SPRITE_SLOWBRO, 27, 13, STAY, DOWN, 1, MEWTWO, 70 - object SPRITE_BALL, 16, 9, STAY, NONE, 2, ULTRA_BALL - object SPRITE_BALL, 18, 1, STAY, NONE, 3, MAX_REVIVE + object SPRITE_MONSTER, 27, 13, STAY, DOWN, 1, MEWTWO, 70 + object SPRITE_POKE_BALL, 16, 9, STAY, NONE, 2, ULTRA_BALL + object SPRITE_POKE_BALL, 18, 1, STAY, NONE, 3, MAX_REVIVE ; warp-to warp_to 3, 6, CERULEAN_CAVE_B1F_WIDTH ; CERULEAN_CAVE_1F diff --git a/data/maps/objects/CeruleanCity.asm b/data/maps/objects/CeruleanCity.asm index d5adcfd7..858fcb28 100755 --- a/data/maps/objects/CeruleanCity.asm +++ b/data/maps/objects/CeruleanCity.asm @@ -24,14 +24,14 @@ CeruleanCity_Object: db 11 ; objects object SPRITE_BLUE, 20, 2, STAY, DOWN, 1 ; person object SPRITE_ROCKET, 30, 8, STAY, NONE, 2, OPP_ROCKET, 5 - object SPRITE_BLACK_HAIR_BOY_1, 31, 20, STAY, DOWN, 3 ; person - object SPRITE_BLACK_HAIR_BOY_2, 15, 18, WALK, 1, 4 ; person - object SPRITE_BLACK_HAIR_BOY_2, 9, 21, WALK, 2, 5 ; person + object SPRITE_COOLTRAINER_M, 31, 20, STAY, DOWN, 3 ; person + object SPRITE_SUPER_NERD, 15, 18, WALK, 1, 4 ; person + object SPRITE_SUPER_NERD, 9, 21, WALK, 2, 5 ; person object SPRITE_GUARD, 28, 12, STAY, DOWN, 6 ; person - object SPRITE_LASS, 29, 26, STAY, LEFT, 7 ; person - object SPRITE_SLOWBRO, 28, 26, STAY, DOWN, 8 ; person - object SPRITE_LASS, 9, 27, WALK, 2, 9 ; person - object SPRITE_BLACK_HAIR_BOY_2, 4, 12, STAY, DOWN, 10 ; person + object SPRITE_COOLTRAINER_F, 29, 26, STAY, LEFT, 7 ; person + object SPRITE_MONSTER, 28, 26, STAY, DOWN, 8 ; person + object SPRITE_COOLTRAINER_F, 9, 27, WALK, 2, 9 ; person + object SPRITE_SUPER_NERD, 4, 12, STAY, DOWN, 10 ; person object SPRITE_GUARD, 27, 12, STAY, DOWN, 11 ; person ; warp-to diff --git a/data/maps/objects/CeruleanGym.asm b/data/maps/objects/CeruleanGym.asm index 76cf3c3d..a8c9f106 100755 --- a/data/maps/objects/CeruleanGym.asm +++ b/data/maps/objects/CeruleanGym.asm @@ -9,9 +9,9 @@ CeruleanGym_Object: db 4 ; objects object SPRITE_BRUNETTE_GIRL, 4, 2, STAY, DOWN, 1, OPP_MISTY, 1 - object SPRITE_LASS, 2, 3, STAY, RIGHT, 2, OPP_JR_TRAINER_F, 1 + object SPRITE_COOLTRAINER_F, 2, 3, STAY, RIGHT, 2, OPP_JR_TRAINER_F, 1 object SPRITE_SWIMMER, 8, 7, STAY, LEFT, 3, OPP_SWIMMER, 1 - object SPRITE_GYM_HELPER, 7, 10, STAY, DOWN, 4 ; person + object SPRITE_GYM_GUIDE, 7, 10, STAY, DOWN, 4 ; person ; warp-to warp_to 4, 13, CERULEAN_GYM_WIDTH diff --git a/data/maps/objects/CeruleanMart.asm b/data/maps/objects/CeruleanMart.asm index 16e3fa5f..d724c08b 100755 --- a/data/maps/objects/CeruleanMart.asm +++ b/data/maps/objects/CeruleanMart.asm @@ -8,9 +8,9 @@ CeruleanMart_Object: db 0 ; signs db 3 ; objects - object SPRITE_MART_GUY, 0, 5, STAY, RIGHT, 1 ; person - object SPRITE_BLACK_HAIR_BOY_1, 3, 4, WALK, 1, 2 ; person - object SPRITE_LASS, 6, 2, WALK, 2, 3 ; person + object SPRITE_CLERK, 0, 5, STAY, RIGHT, 1 ; person + object SPRITE_COOLTRAINER_M, 3, 4, WALK, 1, 2 ; person + object SPRITE_COOLTRAINER_F, 6, 2, WALK, 2, 3 ; person ; warp-to warp_to 3, 7, CERULEAN_MART_WIDTH diff --git a/data/maps/objects/CeruleanPokecenter.asm b/data/maps/objects/CeruleanPokecenter.asm index 23fab3b9..0f485dfe 100755 --- a/data/maps/objects/CeruleanPokecenter.asm +++ b/data/maps/objects/CeruleanPokecenter.asm @@ -9,9 +9,9 @@ CeruleanPokecenter_Object: db 4 ; objects object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person - object SPRITE_BLACK_HAIR_BOY_2, 10, 5, WALK, 0, 2 ; person + object SPRITE_SUPER_NERD, 10, 5, WALK, 0, 2 ; person object SPRITE_GENTLEMAN, 4, 3, STAY, DOWN, 3 ; person - object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person + object SPRITE_LINK_RECEPTIONIST, 11, 2, STAY, DOWN, 4 ; person ; warp-to warp_to 3, 7, CERULEAN_POKECENTER_WIDTH diff --git a/data/maps/objects/CeruleanTradeHouse.asm b/data/maps/objects/CeruleanTradeHouse.asm index ccf1a693..f5f37344 100755 --- a/data/maps/objects/CeruleanTradeHouse.asm +++ b/data/maps/objects/CeruleanTradeHouse.asm @@ -8,7 +8,7 @@ CeruleanTradeHouse_Object: db 0 ; signs db 2 ; objects - object SPRITE_OLD_MEDIUM_WOMAN, 5, 4, STAY, LEFT, 1 ; person + object SPRITE_GRANNY, 5, 4, STAY, LEFT, 1 ; person object SPRITE_GAMBLER, 1, 2, STAY, NONE, 2 ; person ; warp-to diff --git a/data/maps/objects/CeruleanTrashedHouse.asm b/data/maps/objects/CeruleanTrashedHouse.asm index 43b3b1dd..0ea45a1c 100755 --- a/data/maps/objects/CeruleanTrashedHouse.asm +++ b/data/maps/objects/CeruleanTrashedHouse.asm @@ -10,7 +10,7 @@ CeruleanTrashedHouse_Object: sign 3, 0, 3 ; CeruleanHouseTrashedText3 db 2 ; objects - object SPRITE_FISHER, 2, 1, STAY, DOWN, 1 ; person + object SPRITE_FISHING_GURU, 2, 1, STAY, DOWN, 1 ; person object SPRITE_GIRL, 5, 6, WALK, 2, 2 ; person ; warp-to diff --git a/data/maps/objects/CinnabarGym.asm b/data/maps/objects/CinnabarGym.asm index f0b200f0..6548ddb8 100755 --- a/data/maps/objects/CinnabarGym.asm +++ b/data/maps/objects/CinnabarGym.asm @@ -8,15 +8,15 @@ CinnabarGym_Object: db 0 ; signs db 9 ; objects - object SPRITE_FAT_BALD_GUY, 3, 3, STAY, DOWN, 1, OPP_BLAINE, 1 - object SPRITE_BLACK_HAIR_BOY_2, 17, 2, STAY, DOWN, 2, OPP_SUPER_NERD, 9 - object SPRITE_BLACK_HAIR_BOY_2, 17, 8, STAY, DOWN, 3, OPP_BURGLAR, 4 - object SPRITE_BLACK_HAIR_BOY_2, 11, 4, STAY, DOWN, 4, OPP_SUPER_NERD, 10 - object SPRITE_BLACK_HAIR_BOY_2, 11, 8, STAY, DOWN, 5, OPP_BURGLAR, 5 - object SPRITE_BLACK_HAIR_BOY_2, 11, 14, STAY, DOWN, 6, OPP_SUPER_NERD, 11 - object SPRITE_BLACK_HAIR_BOY_2, 3, 14, STAY, DOWN, 7, OPP_BURGLAR, 6 - object SPRITE_BLACK_HAIR_BOY_2, 3, 8, STAY, DOWN, 8, OPP_SUPER_NERD, 12 - object SPRITE_GYM_HELPER, 16, 13, STAY, DOWN, 9 ; person + object SPRITE_MIDDLE_AGED_MAN, 3, 3, STAY, DOWN, 1, OPP_BLAINE, 1 + object SPRITE_SUPER_NERD, 17, 2, STAY, DOWN, 2, OPP_SUPER_NERD, 9 + object SPRITE_SUPER_NERD, 17, 8, STAY, DOWN, 3, OPP_BURGLAR, 4 + object SPRITE_SUPER_NERD, 11, 4, STAY, DOWN, 4, OPP_SUPER_NERD, 10 + object SPRITE_SUPER_NERD, 11, 8, STAY, DOWN, 5, OPP_BURGLAR, 5 + object SPRITE_SUPER_NERD, 11, 14, STAY, DOWN, 6, OPP_SUPER_NERD, 11 + object SPRITE_SUPER_NERD, 3, 14, STAY, DOWN, 7, OPP_BURGLAR, 6 + object SPRITE_SUPER_NERD, 3, 8, STAY, DOWN, 8, OPP_SUPER_NERD, 12 + object SPRITE_GYM_GUIDE, 16, 13, STAY, DOWN, 9 ; person ; warp-to warp_to 16, 17, CINNABAR_GYM_WIDTH diff --git a/data/maps/objects/CinnabarLab.asm b/data/maps/objects/CinnabarLab.asm index 1a2320dd..9398dc1e 100755 --- a/data/maps/objects/CinnabarLab.asm +++ b/data/maps/objects/CinnabarLab.asm @@ -15,7 +15,7 @@ CinnabarLab_Object: sign 17, 4, 5 ; Lab1Text5 db 1 ; objects - object SPRITE_FISHER, 1, 3, STAY, NONE, 1 ; person + object SPRITE_FISHING_GURU, 1, 3, STAY, NONE, 1 ; person ; warp-to warp_to 2, 7, CINNABAR_LAB_WIDTH diff --git a/data/maps/objects/CinnabarLabFossilRoom.asm b/data/maps/objects/CinnabarLabFossilRoom.asm index d31502e6..d77c26df 100755 --- a/data/maps/objects/CinnabarLabFossilRoom.asm +++ b/data/maps/objects/CinnabarLabFossilRoom.asm @@ -8,8 +8,8 @@ CinnabarLabFossilRoom_Object: db 0 ; signs db 2 ; objects - object SPRITE_OAK_AIDE, 5, 2, WALK, 2, 1 ; person - object SPRITE_OAK_AIDE, 7, 6, STAY, UP, 2 ; person + object SPRITE_SCIENTIST, 5, 2, WALK, 2, 1 ; person + object SPRITE_SCIENTIST, 7, 6, STAY, UP, 2 ; person ; warp-to warp_to 2, 7, CINNABAR_LAB_FOSSIL_ROOM_WIDTH ; CINNABAR_LAB diff --git a/data/maps/objects/CinnabarLabMetronomeRoom.asm b/data/maps/objects/CinnabarLabMetronomeRoom.asm index 37f93d43..06f4fb99 100755 --- a/data/maps/objects/CinnabarLabMetronomeRoom.asm +++ b/data/maps/objects/CinnabarLabMetronomeRoom.asm @@ -11,8 +11,8 @@ CinnabarLabMetronomeRoom_Object: sign 2, 1, 5 ; Lab3Text5 db 2 ; objects - object SPRITE_OAK_AIDE, 7, 2, STAY, DOWN, 1 ; person - object SPRITE_OAK_AIDE, 2, 3, WALK, 2, 2 ; person + object SPRITE_SCIENTIST, 7, 2, STAY, DOWN, 1 ; person + object SPRITE_SCIENTIST, 2, 3, WALK, 2, 2 ; person ; warp-to warp_to 2, 7, CINNABAR_LAB_METRONOME_ROOM_WIDTH ; CINNABAR_LAB diff --git a/data/maps/objects/CinnabarLabTradeRoom.asm b/data/maps/objects/CinnabarLabTradeRoom.asm index 449cc914..de9a7d96 100755 --- a/data/maps/objects/CinnabarLabTradeRoom.asm +++ b/data/maps/objects/CinnabarLabTradeRoom.asm @@ -8,9 +8,9 @@ CinnabarLabTradeRoom_Object: db 0 ; signs db 3 ; objects - object SPRITE_BLACK_HAIR_BOY_2, 3, 2, STAY, DOWN, 1 ; person - object SPRITE_OLD_PERSON, 1, 4, STAY, NONE, 2 ; person - object SPRITE_FOULARD_WOMAN, 5, 5, STAY, UP, 3 ; person + object SPRITE_SUPER_NERD, 3, 2, STAY, DOWN, 1 ; person + object SPRITE_GRAMPS, 1, 4, STAY, NONE, 2 ; person + object SPRITE_BEAUTY, 5, 5, STAY, UP, 3 ; person ; warp-to warp_to 2, 7, CINNABAR_LAB_TRADE_ROOM_WIDTH ; CINNABAR_LAB diff --git a/data/maps/objects/CinnabarMart.asm b/data/maps/objects/CinnabarMart.asm index a4f9215c..206492a7 100755 --- a/data/maps/objects/CinnabarMart.asm +++ b/data/maps/objects/CinnabarMart.asm @@ -8,9 +8,9 @@ CinnabarMart_Object: db 0 ; signs db 3 ; objects - object SPRITE_MART_GUY, 0, 5, STAY, RIGHT, 1 ; person + object SPRITE_CLERK, 0, 5, STAY, RIGHT, 1 ; person object SPRITE_ERIKA, 6, 2, STAY, NONE, 2 ; person - object SPRITE_OAK_AIDE, 3, 4, STAY, NONE, 3 ; person + object SPRITE_SCIENTIST, 3, 4, STAY, NONE, 3 ; person ; warp-to warp_to 3, 7, CINNABAR_MART_WIDTH diff --git a/data/maps/objects/CinnabarPokecenter.asm b/data/maps/objects/CinnabarPokecenter.asm index ac7df5ac..06af2353 100755 --- a/data/maps/objects/CinnabarPokecenter.asm +++ b/data/maps/objects/CinnabarPokecenter.asm @@ -9,9 +9,9 @@ CinnabarPokecenter_Object: db 4 ; objects object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person - object SPRITE_LASS, 9, 4, WALK, 0, 2 ; person + object SPRITE_COOLTRAINER_F, 9, 4, WALK, 0, 2 ; person object SPRITE_GENTLEMAN, 2, 6, STAY, NONE, 3 ; person - object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person + object SPRITE_LINK_RECEPTIONIST, 11, 2, STAY, DOWN, 4 ; person ; warp-to warp_to 3, 7, CINNABAR_POKECENTER_WIDTH diff --git a/data/maps/objects/CopycatsHouse1F.asm b/data/maps/objects/CopycatsHouse1F.asm index fe79991e..e02339cd 100755 --- a/data/maps/objects/CopycatsHouse1F.asm +++ b/data/maps/objects/CopycatsHouse1F.asm @@ -9,9 +9,9 @@ CopycatsHouse1F_Object: db 0 ; signs db 3 ; objects - object SPRITE_MOM_GEISHA, 2, 2, STAY, DOWN, 1 ; person - object SPRITE_FAT_BALD_GUY, 5, 4, STAY, LEFT, 2 ; person - object SPRITE_CLEFAIRY, 1, 4, WALK, 1, 3 ; person + object SPRITE_MIDDLE_AGED_WOMAN, 2, 2, STAY, DOWN, 1 ; person + object SPRITE_MIDDLE_AGED_MAN, 5, 4, STAY, LEFT, 2 ; person + object SPRITE_FAIRY, 1, 4, WALK, 1, 3 ; person ; warp-to warp_to 2, 7, COPYCATS_HOUSE_1F_WIDTH diff --git a/data/maps/objects/CopycatsHouse2F.asm b/data/maps/objects/CopycatsHouse2F.asm index 18b56419..73d7daf2 100755 --- a/data/maps/objects/CopycatsHouse2F.asm +++ b/data/maps/objects/CopycatsHouse2F.asm @@ -11,9 +11,9 @@ CopycatsHouse2F_Object: db 5 ; objects object SPRITE_BRUNETTE_GIRL, 4, 3, WALK, 0, 1 ; person object SPRITE_BIRD, 4, 6, WALK, 2, 2 ; person - object SPRITE_SLOWBRO, 5, 1, STAY, DOWN, 3 ; person + object SPRITE_MONSTER, 5, 1, STAY, DOWN, 3 ; person object SPRITE_BIRD, 2, 0, STAY, DOWN, 4 ; person - object SPRITE_CLEFAIRY, 1, 6, STAY, RIGHT, 5 ; person + object SPRITE_FAIRY, 1, 6, STAY, RIGHT, 5 ; person ; warp-to warp_to 7, 1, COPYCATS_HOUSE_2F_WIDTH ; COPYCATS_HOUSE_1F diff --git a/data/maps/objects/DiglettsCaveRoute2.asm b/data/maps/objects/DiglettsCaveRoute2.asm index 1a3742e8..082f6ac6 100755 --- a/data/maps/objects/DiglettsCaveRoute2.asm +++ b/data/maps/objects/DiglettsCaveRoute2.asm @@ -9,7 +9,7 @@ DiglettsCaveRoute2_Object: db 0 ; signs db 1 ; objects - object SPRITE_FISHER, 3, 3, STAY, NONE, 1 ; person + object SPRITE_FISHING_GURU, 3, 3, STAY, NONE, 1 ; person ; warp-to warp_to 2, 7, DIGLETTS_CAVE_ROUTE_2_WIDTH diff --git a/data/maps/objects/FightingDojo.asm b/data/maps/objects/FightingDojo.asm index 7e3f0745..ecd00bfb 100755 --- a/data/maps/objects/FightingDojo.asm +++ b/data/maps/objects/FightingDojo.asm @@ -13,8 +13,8 @@ FightingDojo_Object: object SPRITE_HIKER, 3, 6, STAY, RIGHT, 3, OPP_BLACKBELT, 3 object SPRITE_HIKER, 5, 5, STAY, LEFT, 4, OPP_BLACKBELT, 4 object SPRITE_HIKER, 5, 7, STAY, LEFT, 5, OPP_BLACKBELT, 5 - object SPRITE_BALL, 4, 1, STAY, NONE, 6 ; person - object SPRITE_BALL, 5, 1, STAY, NONE, 7 ; person + object SPRITE_POKE_BALL, 4, 1, STAY, NONE, 6 ; person + object SPRITE_POKE_BALL, 5, 1, STAY, NONE, 7 ; person ; warp-to warp_to 4, 11, FIGHTING_DOJO_WIDTH diff --git a/data/maps/objects/FuchsiaBillsGrandpasHouse.asm b/data/maps/objects/FuchsiaBillsGrandpasHouse.asm index 2004acc3..86ebf409 100755 --- a/data/maps/objects/FuchsiaBillsGrandpasHouse.asm +++ b/data/maps/objects/FuchsiaBillsGrandpasHouse.asm @@ -8,9 +8,9 @@ FuchsiaBillsGrandpasHouse_Object: db 0 ; signs db 3 ; objects - object SPRITE_MOM_GEISHA, 2, 3, STAY, RIGHT, 1 ; person + object SPRITE_MIDDLE_AGED_WOMAN, 2, 3, STAY, RIGHT, 1 ; person object SPRITE_GAMBLER, 7, 2, STAY, UP, 2 ; person - object SPRITE_BUG_CATCHER, 5, 5, STAY, NONE, 3 ; person + object SPRITE_YOUNGSTER, 5, 5, STAY, NONE, 3 ; person ; warp-to warp_to 2, 7, FUCHSIA_BILLS_GRANDPAS_HOUSE_WIDTH diff --git a/data/maps/objects/FuchsiaCity.asm b/data/maps/objects/FuchsiaCity.asm index 09c97b02..5a09f864 100755 --- a/data/maps/objects/FuchsiaCity.asm +++ b/data/maps/objects/FuchsiaCity.asm @@ -29,16 +29,16 @@ FuchsiaCity_Object: sign 7, 7, 24 ; FuchsiaCityText24 db 10 ; objects - object SPRITE_BUG_CATCHER, 10, 12, WALK, 2, 1 ; person + object SPRITE_YOUNGSTER, 10, 12, WALK, 2, 1 ; person object SPRITE_GAMBLER, 28, 17, WALK, 2, 2 ; person - object SPRITE_FISHER2, 30, 14, STAY, DOWN, 3 ; person - object SPRITE_BUG_CATCHER, 24, 8, STAY, UP, 4 ; person - object SPRITE_CLEFAIRY, 31, 5, WALK, 0, 5 ; person - object SPRITE_BALL, 25, 6, STAY, NONE, 6 ; person - object SPRITE_SLOWBRO, 12, 6, WALK, 2, 7 ; person - object SPRITE_SLOWBRO, 30, 12, WALK, 2, 8 ; person + object SPRITE_FISHER, 30, 14, STAY, DOWN, 3 ; person + object SPRITE_YOUNGSTER, 24, 8, STAY, UP, 4 ; person + object SPRITE_FAIRY, 31, 5, WALK, 0, 5 ; person + object SPRITE_POKE_BALL, 25, 6, STAY, NONE, 6 ; person + object SPRITE_MONSTER, 12, 6, WALK, 2, 7 ; person + object SPRITE_MONSTER, 30, 12, WALK, 2, 8 ; person object SPRITE_SEEL, 8, 17, WALK, 0, 9 ; person - object SPRITE_OMANYTE, 6, 5, STAY, NONE, 10 ; person + object SPRITE_FOSSIL, 6, 5, STAY, NONE, 10 ; person ; warp-to warp_to 5, 13, FUCHSIA_CITY_WIDTH ; FUCHSIA_MART diff --git a/data/maps/objects/FuchsiaGoodRodHouse.asm b/data/maps/objects/FuchsiaGoodRodHouse.asm index fbb94117..b036171b 100755 --- a/data/maps/objects/FuchsiaGoodRodHouse.asm +++ b/data/maps/objects/FuchsiaGoodRodHouse.asm @@ -9,7 +9,7 @@ FuchsiaGoodRodHouse_Object: db 0 ; signs db 1 ; objects - object SPRITE_FISHER, 5, 3, STAY, RIGHT, 1 ; person + object SPRITE_FISHING_GURU, 5, 3, STAY, RIGHT, 1 ; person ; warp-to warp_to 2, 0, FUCHSIA_GOOD_ROD_HOUSE_WIDTH diff --git a/data/maps/objects/FuchsiaGym.asm b/data/maps/objects/FuchsiaGym.asm index 5558fa12..6687de41 100755 --- a/data/maps/objects/FuchsiaGym.asm +++ b/data/maps/objects/FuchsiaGym.asm @@ -8,14 +8,14 @@ FuchsiaGym_Object: db 0 ; signs db 8 ; objects - object SPRITE_BLACKBELT, 4, 10, STAY, DOWN, 1, OPP_KOGA, 1 + object SPRITE_KOGA, 4, 10, STAY, DOWN, 1, OPP_KOGA, 1 object SPRITE_ROCKER, 8, 13, STAY, DOWN, 2, OPP_JUGGLER, 7 object SPRITE_ROCKER, 7, 8, STAY, RIGHT, 3, OPP_JUGGLER, 3 object SPRITE_ROCKER, 1, 12, STAY, DOWN, 4, OPP_JUGGLER, 8 object SPRITE_ROCKER, 3, 5, STAY, UP, 5, OPP_TAMER, 1 object SPRITE_ROCKER, 8, 2, STAY, DOWN, 6, OPP_TAMER, 2 object SPRITE_ROCKER, 2, 7, STAY, LEFT, 7, OPP_JUGGLER, 4 - object SPRITE_GYM_HELPER, 7, 15, STAY, DOWN, 8 ; person + object SPRITE_GYM_GUIDE, 7, 15, STAY, DOWN, 8 ; person ; warp-to warp_to 4, 17, FUCHSIA_GYM_WIDTH diff --git a/data/maps/objects/FuchsiaMart.asm b/data/maps/objects/FuchsiaMart.asm index 83aae080..f9f7ad9c 100755 --- a/data/maps/objects/FuchsiaMart.asm +++ b/data/maps/objects/FuchsiaMart.asm @@ -8,9 +8,9 @@ FuchsiaMart_Object: db 0 ; signs db 3 ; objects - object SPRITE_MART_GUY, 0, 5, STAY, RIGHT, 1 ; person - object SPRITE_FAT_BALD_GUY, 4, 2, STAY, NONE, 2 ; person - object SPRITE_LASS, 6, 5, WALK, 1, 3 ; person + object SPRITE_CLERK, 0, 5, STAY, RIGHT, 1 ; person + object SPRITE_MIDDLE_AGED_MAN, 4, 2, STAY, NONE, 2 ; person + object SPRITE_COOLTRAINER_F, 6, 5, WALK, 1, 3 ; person ; warp-to warp_to 3, 7, FUCHSIA_MART_WIDTH diff --git a/data/maps/objects/FuchsiaMeetingRoom.asm b/data/maps/objects/FuchsiaMeetingRoom.asm index be15088a..24c2c15e 100755 --- a/data/maps/objects/FuchsiaMeetingRoom.asm +++ b/data/maps/objects/FuchsiaMeetingRoom.asm @@ -8,9 +8,9 @@ FuchsiaMeetingRoom_Object: db 0 ; signs db 3 ; objects - object SPRITE_WHITE_PLAYER, 4, 1, STAY, DOWN, 1 ; person - object SPRITE_WHITE_PLAYER, 0, 2, STAY, UP, 2 ; person - object SPRITE_WHITE_PLAYER, 10, 1, STAY, DOWN, 3 ; person + object SPRITE_SAFARI_ZONE_WORKER, 4, 1, STAY, DOWN, 1 ; person + object SPRITE_SAFARI_ZONE_WORKER, 0, 2, STAY, UP, 2 ; person + object SPRITE_SAFARI_ZONE_WORKER, 10, 1, STAY, DOWN, 3 ; person ; warp-to warp_to 4, 7, FUCHSIA_MEETING_ROOM_WIDTH diff --git a/data/maps/objects/FuchsiaPokecenter.asm b/data/maps/objects/FuchsiaPokecenter.asm index 03eb657a..31f1cdc9 100755 --- a/data/maps/objects/FuchsiaPokecenter.asm +++ b/data/maps/objects/FuchsiaPokecenter.asm @@ -10,8 +10,8 @@ FuchsiaPokecenter_Object: db 4 ; objects object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person object SPRITE_ROCKER, 2, 3, STAY, NONE, 2 ; person - object SPRITE_LASS, 6, 5, WALK, 2, 3 ; person - object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person + object SPRITE_COOLTRAINER_F, 6, 5, WALK, 2, 3 ; person + object SPRITE_LINK_RECEPTIONIST, 11, 2, STAY, DOWN, 4 ; person ; warp-to warp_to 3, 7, FUCHSIA_POKECENTER_WIDTH diff --git a/data/maps/objects/GameCorner.asm b/data/maps/objects/GameCorner.asm index c528f45f..dc7b6f00 100755 --- a/data/maps/objects/GameCorner.asm +++ b/data/maps/objects/GameCorner.asm @@ -10,15 +10,15 @@ GameCorner_Object: sign 9, 4, 12 ; CeladonGameCornerText12 db 11 ; objects - object SPRITE_FOULARD_WOMAN, 2, 6, STAY, DOWN, 1 ; person - object SPRITE_MART_GUY, 5, 6, STAY, DOWN, 2 ; person - object SPRITE_FAT_BALD_GUY, 2, 10, STAY, LEFT, 3 ; person - object SPRITE_FOULARD_WOMAN, 2, 13, STAY, LEFT, 4 ; person - object SPRITE_FISHER, 5, 11, STAY, RIGHT, 5 ; person - object SPRITE_MOM_GEISHA, 8, 11, STAY, LEFT, 6 ; person - object SPRITE_GYM_HELPER, 8, 14, STAY, LEFT, 7 ; person + object SPRITE_BEAUTY, 2, 6, STAY, DOWN, 1 ; person + object SPRITE_CLERK, 5, 6, STAY, DOWN, 2 ; person + object SPRITE_MIDDLE_AGED_MAN, 2, 10, STAY, LEFT, 3 ; person + object SPRITE_BEAUTY, 2, 13, STAY, LEFT, 4 ; person + object SPRITE_FISHING_GURU, 5, 11, STAY, RIGHT, 5 ; person + object SPRITE_MIDDLE_AGED_WOMAN, 8, 11, STAY, LEFT, 6 ; person + object SPRITE_GYM_GUIDE, 8, 14, STAY, LEFT, 7 ; person object SPRITE_GAMBLER, 11, 15, STAY, RIGHT, 8 ; person - object SPRITE_MART_GUY, 14, 11, STAY, LEFT, 9 ; person + object SPRITE_CLERK, 14, 11, STAY, LEFT, 9 ; person object SPRITE_GENTLEMAN, 17, 13, STAY, RIGHT, 10 ; person object SPRITE_ROCKET, 9, 5, STAY, UP, 11, OPP_ROCKET, 7 diff --git a/data/maps/objects/IndigoPlateauLobby.asm b/data/maps/objects/IndigoPlateauLobby.asm index e20563db..7bcb8a23 100755 --- a/data/maps/objects/IndigoPlateauLobby.asm +++ b/data/maps/objects/IndigoPlateauLobby.asm @@ -10,10 +10,10 @@ IndigoPlateauLobby_Object: db 5 ; objects object SPRITE_NURSE, 7, 5, STAY, DOWN, 1 ; person - object SPRITE_GYM_HELPER, 4, 9, STAY, RIGHT, 2 ; person - object SPRITE_LASS, 5, 1, STAY, DOWN, 3 ; person - object SPRITE_MART_GUY, 0, 5, STAY, RIGHT, 4 ; person - object SPRITE_CABLE_CLUB_WOMAN, 13, 6, STAY, DOWN, 5 ; person + object SPRITE_GYM_GUIDE, 4, 9, STAY, RIGHT, 2 ; person + object SPRITE_COOLTRAINER_F, 5, 1, STAY, DOWN, 3 ; person + object SPRITE_CLERK, 0, 5, STAY, RIGHT, 4 ; person + object SPRITE_LINK_RECEPTIONIST, 13, 6, STAY, DOWN, 5 ; person ; warp-to warp_to 7, 11, INDIGO_PLATEAU_LOBBY_WIDTH diff --git a/data/maps/objects/LavenderCuboneHouse.asm b/data/maps/objects/LavenderCuboneHouse.asm index 62cd8848..12761cd2 100755 --- a/data/maps/objects/LavenderCuboneHouse.asm +++ b/data/maps/objects/LavenderCuboneHouse.asm @@ -8,7 +8,7 @@ LavenderCuboneHouse_Object: db 0 ; signs db 2 ; objects - object SPRITE_SLOWBRO, 3, 5, STAY, UP, 1 ; person + object SPRITE_MONSTER, 3, 5, STAY, UP, 1 ; person object SPRITE_BRUNETTE_GIRL, 2, 4, STAY, RIGHT, 2 ; person ; warp-to diff --git a/data/maps/objects/LavenderMart.asm b/data/maps/objects/LavenderMart.asm index 788260f8..b11b8df5 100755 --- a/data/maps/objects/LavenderMart.asm +++ b/data/maps/objects/LavenderMart.asm @@ -8,9 +8,9 @@ LavenderMart_Object: db 0 ; signs db 3 ; objects - object SPRITE_MART_GUY, 0, 5, STAY, RIGHT, 1 ; person + object SPRITE_CLERK, 0, 5, STAY, RIGHT, 1 ; person object SPRITE_BALDING_GUY, 3, 4, STAY, NONE, 2 ; person - object SPRITE_BLACK_HAIR_BOY_1, 7, 2, STAY, NONE, 3 ; person + object SPRITE_COOLTRAINER_M, 7, 2, STAY, NONE, 3 ; person ; warp-to warp_to 3, 7, LAVENDER_MART_WIDTH diff --git a/data/maps/objects/LavenderPokecenter.asm b/data/maps/objects/LavenderPokecenter.asm index 09a0b509..61d978b4 100755 --- a/data/maps/objects/LavenderPokecenter.asm +++ b/data/maps/objects/LavenderPokecenter.asm @@ -11,7 +11,7 @@ LavenderPokecenter_Object: object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person object SPRITE_GENTLEMAN, 5, 3, STAY, NONE, 2 ; person object SPRITE_LITTLE_GIRL, 2, 6, WALK, 1, 3 ; person - object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person + object SPRITE_LINK_RECEPTIONIST, 11, 2, STAY, DOWN, 4 ; person ; warp-to warp_to 3, 7, LAVENDER_POKECENTER_WIDTH diff --git a/data/maps/objects/LavenderTown.asm b/data/maps/objects/LavenderTown.asm index 4aead666..3c7b2965 100755 --- a/data/maps/objects/LavenderTown.asm +++ b/data/maps/objects/LavenderTown.asm @@ -19,8 +19,8 @@ LavenderTown_Object: db 3 ; objects object SPRITE_LITTLE_GIRL, 15, 9, WALK, 0, 1 ; person - object SPRITE_BLACK_HAIR_BOY_1, 9, 10, STAY, NONE, 2 ; person - object SPRITE_BLACK_HAIR_BOY_2, 8, 7, WALK, 2, 3 ; person + object SPRITE_COOLTRAINER_M, 9, 10, STAY, NONE, 2 ; person + object SPRITE_SUPER_NERD, 8, 7, WALK, 2, 3 ; person ; warp-to warp_to 3, 5, LAVENDER_TOWN_WIDTH ; LAVENDER_POKECENTER diff --git a/data/maps/objects/MrFujisHouse.asm b/data/maps/objects/MrFujisHouse.asm index b06aa392..289d3a81 100755 --- a/data/maps/objects/MrFujisHouse.asm +++ b/data/maps/objects/MrFujisHouse.asm @@ -8,12 +8,12 @@ MrFujisHouse_Object: db 0 ; signs db 6 ; objects - object SPRITE_BLACK_HAIR_BOY_2, 3, 5, STAY, NONE, 1 ; person + object SPRITE_SUPER_NERD, 3, 5, STAY, NONE, 1 ; person object SPRITE_LITTLE_GIRL, 6, 3, STAY, DOWN, 2 ; person - object SPRITE_SLOWBRO, 6, 4, STAY, UP, 3 ; person - object SPRITE_SLOWBRO, 1, 3, STAY, NONE, 4 ; person + object SPRITE_MONSTER, 6, 4, STAY, UP, 3 ; person + object SPRITE_MONSTER, 1, 3, STAY, NONE, 4 ; person object SPRITE_MR_FUJI, 3, 1, STAY, NONE, 5 ; person - object SPRITE_BOOK_MAP_DEX, 3, 3, STAY, NONE, 6 ; person + object SPRITE_POKEDEX, 3, 3, STAY, NONE, 6 ; person ; warp-to warp_to 2, 7, MR_FUJIS_HOUSE_WIDTH diff --git a/data/maps/objects/MrPsychicsHouse.asm b/data/maps/objects/MrPsychicsHouse.asm index 33c9dc62..e5296682 100755 --- a/data/maps/objects/MrPsychicsHouse.asm +++ b/data/maps/objects/MrPsychicsHouse.asm @@ -8,7 +8,7 @@ MrPsychicsHouse_Object: db 0 ; signs db 1 ; objects - object SPRITE_FISHER, 5, 3, STAY, LEFT, 1 ; person + object SPRITE_FISHING_GURU, 5, 3, STAY, LEFT, 1 ; person ; warp-to warp_to 2, 7, MR_PSYCHICS_HOUSE_WIDTH diff --git a/data/maps/objects/MtMoon1F.asm b/data/maps/objects/MtMoon1F.asm index 16f931f4..b82ab9e0 100755 --- a/data/maps/objects/MtMoon1F.asm +++ b/data/maps/objects/MtMoon1F.asm @@ -13,18 +13,18 @@ MtMoon1F_Object: db 13 ; objects object SPRITE_HIKER, 5, 6, STAY, DOWN, 1, OPP_HIKER, 1 - object SPRITE_BUG_CATCHER, 12, 16, STAY, RIGHT, 2, OPP_YOUNGSTER, 3 - object SPRITE_LASS, 30, 4, STAY, DOWN, 3, OPP_LASS, 5 - object SPRITE_BLACK_HAIR_BOY_2, 24, 31, STAY, UP, 4, OPP_SUPER_NERD, 1 - object SPRITE_LASS, 16, 23, STAY, DOWN, 5, OPP_LASS, 6 - object SPRITE_BUG_CATCHER, 7, 22, STAY, DOWN, 6, OPP_BUG_CATCHER, 7 - object SPRITE_BUG_CATCHER, 30, 27, STAY, RIGHT, 7, OPP_BUG_CATCHER, 8 - object SPRITE_BALL, 2, 20, STAY, NONE, 8, POTION - object SPRITE_BALL, 2, 2, STAY, NONE, 9, MOON_STONE - object SPRITE_BALL, 35, 31, STAY, NONE, 10, RARE_CANDY - object SPRITE_BALL, 36, 23, STAY, NONE, 11, ESCAPE_ROPE - object SPRITE_BALL, 20, 33, STAY, NONE, 12, POTION - object SPRITE_BALL, 5, 32, STAY, NONE, 13, TM_WATER_GUN + object SPRITE_YOUNGSTER, 12, 16, STAY, RIGHT, 2, OPP_YOUNGSTER, 3 + object SPRITE_COOLTRAINER_F, 30, 4, STAY, DOWN, 3, OPP_LASS, 5 + object SPRITE_SUPER_NERD, 24, 31, STAY, UP, 4, OPP_SUPER_NERD, 1 + object SPRITE_COOLTRAINER_F, 16, 23, STAY, DOWN, 5, OPP_LASS, 6 + object SPRITE_YOUNGSTER, 7, 22, STAY, DOWN, 6, OPP_BUG_CATCHER, 7 + object SPRITE_YOUNGSTER, 30, 27, STAY, RIGHT, 7, OPP_BUG_CATCHER, 8 + object SPRITE_POKE_BALL, 2, 20, STAY, NONE, 8, POTION + object SPRITE_POKE_BALL, 2, 2, STAY, NONE, 9, MOON_STONE + object SPRITE_POKE_BALL, 35, 31, STAY, NONE, 10, RARE_CANDY + object SPRITE_POKE_BALL, 36, 23, STAY, NONE, 11, ESCAPE_ROPE + object SPRITE_POKE_BALL, 20, 33, STAY, NONE, 12, POTION + object SPRITE_POKE_BALL, 5, 32, STAY, NONE, 13, TM_WATER_GUN ; warp-to warp_to 14, 35, MT_MOON_1F_WIDTH diff --git a/data/maps/objects/MtMoonB2F.asm b/data/maps/objects/MtMoonB2F.asm index 6c90514d..0303406d 100755 --- a/data/maps/objects/MtMoonB2F.asm +++ b/data/maps/objects/MtMoonB2F.asm @@ -10,15 +10,15 @@ MtMoonB2F_Object: db 0 ; signs db 9 ; objects - object SPRITE_BLACK_HAIR_BOY_2, 12, 8, STAY, RIGHT, 1, OPP_SUPER_NERD, 2 + object SPRITE_SUPER_NERD, 12, 8, STAY, RIGHT, 1, OPP_SUPER_NERD, 2 object SPRITE_ROCKET, 11, 16, STAY, DOWN, 2, OPP_ROCKET, 1 object SPRITE_ROCKET, 15, 22, STAY, DOWN, 3, OPP_ROCKET, 2 object SPRITE_ROCKET, 29, 11, STAY, UP, 4, OPP_ROCKET, 3 object SPRITE_ROCKET, 29, 17, STAY, LEFT, 5, OPP_ROCKET, 4 - object SPRITE_OMANYTE, 12, 6, STAY, NONE, 6 ; person - object SPRITE_OMANYTE, 13, 6, STAY, NONE, 7 ; person - object SPRITE_BALL, 25, 21, STAY, NONE, 8, HP_UP - object SPRITE_BALL, 29, 5, STAY, NONE, 9, TM_MEGA_PUNCH + object SPRITE_FOSSIL, 12, 6, STAY, NONE, 6 ; person + object SPRITE_FOSSIL, 13, 6, STAY, NONE, 7 ; person + object SPRITE_POKE_BALL, 25, 21, STAY, NONE, 8, HP_UP + object SPRITE_POKE_BALL, 29, 5, STAY, NONE, 9, TM_MEGA_PUNCH ; warp-to warp_to 25, 9, MT_MOON_B2F_WIDTH ; MT_MOON_B1F diff --git a/data/maps/objects/MtMoonPokecenter.asm b/data/maps/objects/MtMoonPokecenter.asm index 5a33a235..55fc4d29 100755 --- a/data/maps/objects/MtMoonPokecenter.asm +++ b/data/maps/objects/MtMoonPokecenter.asm @@ -9,11 +9,11 @@ MtMoonPokecenter_Object: db 6 ; objects object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person - object SPRITE_BUG_CATCHER, 4, 3, STAY, UP, 2 ; person + object SPRITE_YOUNGSTER, 4, 3, STAY, UP, 2 ; person object SPRITE_GENTLEMAN, 7, 3, STAY, UP, 3 ; person - object SPRITE_FAT_BALD_GUY, 10, 6, WALK, 2, 4 ; person + object SPRITE_MIDDLE_AGED_MAN, 10, 6, WALK, 2, 4 ; person object SPRITE_CLIPBOARD, 7, 2, STAY, NONE, 5 ; person - object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 6 ; person + object SPRITE_LINK_RECEPTIONIST, 11, 2, STAY, DOWN, 6 ; person ; warp-to warp_to 3, 7, MT_MOON_POKECENTER_WIDTH diff --git a/data/maps/objects/Museum1F.asm b/data/maps/objects/Museum1F.asm index 207dfbf2..bc9ef031 100755 --- a/data/maps/objects/Museum1F.asm +++ b/data/maps/objects/Museum1F.asm @@ -11,10 +11,10 @@ Museum1F_Object: db 0 ; signs db 5 ; objects - object SPRITE_OAK_AIDE, 12, 4, STAY, LEFT, 1 ; person + object SPRITE_SCIENTIST, 12, 4, STAY, LEFT, 1 ; person object SPRITE_GAMBLER, 1, 4, STAY, NONE, 2 ; person - object SPRITE_OAK_AIDE, 15, 2, STAY, DOWN, 3 ; person - object SPRITE_OAK_AIDE, 17, 4, STAY, NONE, 4 ; person + object SPRITE_SCIENTIST, 15, 2, STAY, DOWN, 3 ; person + object SPRITE_SCIENTIST, 17, 4, STAY, NONE, 4 ; person object SPRITE_OLD_AMBER, 16, 2, STAY, NONE, 5 ; person ; warp-to diff --git a/data/maps/objects/Museum2F.asm b/data/maps/objects/Museum2F.asm index 80815820..a07fa944 100755 --- a/data/maps/objects/Museum2F.asm +++ b/data/maps/objects/Museum2F.asm @@ -9,9 +9,9 @@ Museum2F_Object: sign 2, 5, 7 ; Museum2FText7 db 5 ; objects - object SPRITE_BUG_CATCHER, 1, 7, WALK, 2, 1 ; person - object SPRITE_OLD_PERSON, 0, 5, STAY, DOWN, 2 ; person - object SPRITE_OAK_AIDE, 7, 5, STAY, DOWN, 3 ; person + object SPRITE_YOUNGSTER, 1, 7, WALK, 2, 1 ; person + object SPRITE_GRAMPS, 0, 5, STAY, DOWN, 2 ; person + object SPRITE_SCIENTIST, 7, 5, STAY, DOWN, 3 ; person object SPRITE_BRUNETTE_GIRL, 11, 5, STAY, NONE, 4 ; person object SPRITE_HIKER, 12, 5, STAY, DOWN, 5 ; person diff --git a/data/maps/objects/NameRatersHouse.asm b/data/maps/objects/NameRatersHouse.asm index 11187394..f95d179d 100755 --- a/data/maps/objects/NameRatersHouse.asm +++ b/data/maps/objects/NameRatersHouse.asm @@ -8,7 +8,7 @@ NameRatersHouse_Object: db 0 ; signs db 1 ; objects - object SPRITE_MR_MASTERBALL, 5, 3, STAY, LEFT, 1 ; person + object SPRITE_SILPH_PRESIDENT, 5, 3, STAY, LEFT, 1 ; person ; warp-to warp_to 2, 7, NAME_RATERS_HOUSE_WIDTH diff --git a/data/maps/objects/OaksLab.asm b/data/maps/objects/OaksLab.asm index 676683b4..3e1a90c0 100755 --- a/data/maps/objects/OaksLab.asm +++ b/data/maps/objects/OaksLab.asm @@ -8,17 +8,17 @@ OaksLab_Object: db 0 ; signs db 11 ; objects - object SPRITE_BLUE, 4, 3, STAY, NONE, 1, OPP_SONY1, 1 - object SPRITE_BALL, 6, 3, STAY, NONE, 2 ; person - object SPRITE_BALL, 7, 3, STAY, NONE, 3 ; person - object SPRITE_BALL, 8, 3, STAY, NONE, 4 ; person + object SPRITE_BLUE, 4, 3, STAY, NONE, 1, OPP_RIVAL1, 1 + object SPRITE_POKE_BALL, 6, 3, STAY, NONE, 2 ; person + object SPRITE_POKE_BALL, 7, 3, STAY, NONE, 3 ; person + object SPRITE_POKE_BALL, 8, 3, STAY, NONE, 4 ; person object SPRITE_OAK, 5, 2, STAY, DOWN, 5 ; person - object SPRITE_BOOK_MAP_DEX, 2, 1, STAY, NONE, 6 ; person - object SPRITE_BOOK_MAP_DEX, 3, 1, STAY, NONE, 7 ; person + object SPRITE_POKEDEX, 2, 1, STAY, NONE, 6 ; person + object SPRITE_POKEDEX, 3, 1, STAY, NONE, 7 ; person object SPRITE_OAK, 5, 10, STAY, UP, 8 ; person object SPRITE_GIRL, 1, 9, WALK, 1, 9 ; person - object SPRITE_OAK_AIDE, 2, 10, STAY, NONE, 10 ; person - object SPRITE_OAK_AIDE, 8, 10, STAY, NONE, 11 ; person + object SPRITE_SCIENTIST, 2, 10, STAY, NONE, 10 ; person + object SPRITE_SCIENTIST, 8, 10, STAY, NONE, 11 ; person ; warp-to warp_to 4, 11, OAKS_LAB_WIDTH diff --git a/data/maps/objects/PalletTown.asm b/data/maps/objects/PalletTown.asm index 68b01175..a385df65 100755 --- a/data/maps/objects/PalletTown.asm +++ b/data/maps/objects/PalletTown.asm @@ -15,7 +15,7 @@ PalletTown_Object: db 3 ; objects object SPRITE_OAK, 8, 5, STAY, NONE, 1 ; person object SPRITE_GIRL, 3, 8, WALK, 0, 2 ; person - object SPRITE_FISHER2, 11, 14, WALK, 0, 3 ; person + object SPRITE_FISHER, 11, 14, WALK, 0, 3 ; person ; warp-to warp_to 5, 5, PALLET_TOWN_WIDTH ; REDS_HOUSE_1F diff --git a/data/maps/objects/PewterCity.asm b/data/maps/objects/PewterCity.asm index e1a3eecb..4a0c25e0 100755 --- a/data/maps/objects/PewterCity.asm +++ b/data/maps/objects/PewterCity.asm @@ -20,11 +20,11 @@ PewterCity_Object: sign 25, 23, 12 ; PewterCityText12 db 5 ; objects - object SPRITE_LASS, 8, 15, STAY, NONE, 1 ; person - object SPRITE_BLACK_HAIR_BOY_1, 17, 25, STAY, NONE, 2 ; person - object SPRITE_BLACK_HAIR_BOY_2, 27, 17, STAY, NONE, 3 ; person - object SPRITE_BLACK_HAIR_BOY_2, 26, 25, WALK, 2, 4 ; person - object SPRITE_BUG_CATCHER, 35, 16, STAY, DOWN, 5 ; person + object SPRITE_COOLTRAINER_F, 8, 15, STAY, NONE, 1 ; person + object SPRITE_COOLTRAINER_M, 17, 25, STAY, NONE, 2 ; person + object SPRITE_SUPER_NERD, 27, 17, STAY, NONE, 3 ; person + object SPRITE_SUPER_NERD, 26, 25, WALK, 2, 4 ; person + object SPRITE_YOUNGSTER, 35, 16, STAY, DOWN, 5 ; person ; warp-to warp_to 14, 7, PEWTER_CITY_WIDTH ; MUSEUM_1F diff --git a/data/maps/objects/PewterGym.asm b/data/maps/objects/PewterGym.asm index 514ae416..adc8076e 100755 --- a/data/maps/objects/PewterGym.asm +++ b/data/maps/objects/PewterGym.asm @@ -8,9 +8,9 @@ PewterGym_Object: db 0 ; signs db 3 ; objects - object SPRITE_BLACK_HAIR_BOY_2, 4, 1, STAY, DOWN, 1, OPP_BROCK, 1 - object SPRITE_BLACK_HAIR_BOY_1, 3, 6, STAY, RIGHT, 2, OPP_JR_TRAINER_M, 1 - object SPRITE_GYM_HELPER, 7, 10, STAY, DOWN, 3 ; person + object SPRITE_SUPER_NERD, 4, 1, STAY, DOWN, 1, OPP_BROCK, 1 + object SPRITE_COOLTRAINER_M, 3, 6, STAY, RIGHT, 2, OPP_JR_TRAINER_M, 1 + object SPRITE_GYM_GUIDE, 7, 10, STAY, DOWN, 3 ; person ; warp-to warp_to 4, 13, PEWTER_GYM_WIDTH diff --git a/data/maps/objects/PewterMart.asm b/data/maps/objects/PewterMart.asm index 76616662..3c096825 100755 --- a/data/maps/objects/PewterMart.asm +++ b/data/maps/objects/PewterMart.asm @@ -8,9 +8,9 @@ PewterMart_Object: db 0 ; signs db 3 ; objects - object SPRITE_MART_GUY, 0, 5, STAY, RIGHT, 1 ; person - object SPRITE_BUG_CATCHER, 3, 3, WALK, 1, 2 ; person - object SPRITE_BLACK_HAIR_BOY_2, 5, 5, STAY, NONE, 3 ; person + object SPRITE_CLERK, 0, 5, STAY, RIGHT, 1 ; person + object SPRITE_YOUNGSTER, 3, 3, WALK, 1, 2 ; person + object SPRITE_SUPER_NERD, 5, 5, STAY, NONE, 3 ; person ; warp-to warp_to 3, 7, PEWTER_MART_WIDTH diff --git a/data/maps/objects/PewterNidoranHouse.asm b/data/maps/objects/PewterNidoranHouse.asm index 26baa645..8d57ecae 100755 --- a/data/maps/objects/PewterNidoranHouse.asm +++ b/data/maps/objects/PewterNidoranHouse.asm @@ -8,9 +8,9 @@ PewterNidoranHouse_Object: db 0 ; signs db 3 ; objects - object SPRITE_SLOWBRO, 4, 5, STAY, LEFT, 1 ; person - object SPRITE_YOUNG_BOY, 3, 5, STAY, RIGHT, 2 ; person - object SPRITE_FAT_BALD_GUY, 1, 2, STAY, NONE, 3 ; person + object SPRITE_MONSTER, 4, 5, STAY, LEFT, 1 ; person + object SPRITE_LITTLE_BOY, 3, 5, STAY, RIGHT, 2 ; person + object SPRITE_MIDDLE_AGED_MAN, 1, 2, STAY, NONE, 3 ; person ; warp-to warp_to 2, 7, PEWTER_NIDORAN_HOUSE_WIDTH diff --git a/data/maps/objects/PewterPokecenter.asm b/data/maps/objects/PewterPokecenter.asm index 5cffa28c..4ecabf91 100755 --- a/data/maps/objects/PewterPokecenter.asm +++ b/data/maps/objects/PewterPokecenter.asm @@ -10,8 +10,8 @@ PewterPokecenter_Object: db 4 ; objects object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person object SPRITE_GENTLEMAN, 11, 7, STAY, LEFT, 2 ; person - object SPRITE_CLEFAIRY, 1, 3, STAY, DOWN, 3 ; person - object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person + object SPRITE_FAIRY, 1, 3, STAY, DOWN, 3 ; person + object SPRITE_LINK_RECEPTIONIST, 11, 2, STAY, DOWN, 4 ; person ; warp-to warp_to 3, 7, PEWTER_POKECENTER_WIDTH diff --git a/data/maps/objects/PewterSpeechHouse.asm b/data/maps/objects/PewterSpeechHouse.asm index f3fa88b6..b1c91002 100755 --- a/data/maps/objects/PewterSpeechHouse.asm +++ b/data/maps/objects/PewterSpeechHouse.asm @@ -9,7 +9,7 @@ PewterSpeechHouse_Object: db 2 ; objects object SPRITE_GAMBLER, 2, 3, STAY, RIGHT, 1 ; person - object SPRITE_BUG_CATCHER, 4, 5, STAY, NONE, 2 ; person + object SPRITE_YOUNGSTER, 4, 5, STAY, NONE, 2 ; person ; warp-to warp_to 2, 7, PEWTER_SPEECH_HOUSE_WIDTH diff --git a/data/maps/objects/PokemonFanClub.asm b/data/maps/objects/PokemonFanClub.asm index 4de8e162..33d187bc 100755 --- a/data/maps/objects/PokemonFanClub.asm +++ b/data/maps/objects/PokemonFanClub.asm @@ -10,12 +10,12 @@ PokemonFanClub_Object: sign 6, 0, 8 ; FanClubText8 db 6 ; objects - object SPRITE_FISHER2, 6, 3, STAY, LEFT, 1 ; person + object SPRITE_FISHER, 6, 3, STAY, LEFT, 1 ; person object SPRITE_GIRL, 1, 3, STAY, RIGHT, 2 ; person - object SPRITE_CLEFAIRY, 6, 4, STAY, LEFT, 3 ; person + object SPRITE_FAIRY, 6, 4, STAY, LEFT, 3 ; person object SPRITE_SEEL, 1, 4, STAY, RIGHT, 4 ; person object SPRITE_GENTLEMAN, 3, 1, STAY, DOWN, 5 ; person - object SPRITE_CABLE_CLUB_WOMAN, 5, 1, STAY, DOWN, 6 ; person + object SPRITE_LINK_RECEPTIONIST, 5, 1, STAY, DOWN, 6 ; person ; warp-to warp_to 2, 7, POKEMON_FAN_CLUB_WIDTH diff --git a/data/maps/objects/PokemonMansion1F.asm b/data/maps/objects/PokemonMansion1F.asm index 5830cb28..7d89e914 100755 --- a/data/maps/objects/PokemonMansion1F.asm +++ b/data/maps/objects/PokemonMansion1F.asm @@ -14,9 +14,9 @@ PokemonMansion1F_Object: db 0 ; signs db 3 ; objects - object SPRITE_OAK_AIDE, 17, 17, STAY, LEFT, 1, OPP_SCIENTIST, 4 - object SPRITE_BALL, 14, 3, STAY, NONE, 2, ESCAPE_ROPE - object SPRITE_BALL, 18, 21, STAY, NONE, 3, CARBOS + object SPRITE_SCIENTIST, 17, 17, STAY, LEFT, 1, OPP_SCIENTIST, 4 + object SPRITE_POKE_BALL, 14, 3, STAY, NONE, 2, ESCAPE_ROPE + object SPRITE_POKE_BALL, 18, 21, STAY, NONE, 3, CARBOS ; warp-to warp_to 4, 27, POKEMON_MANSION_1F_WIDTH diff --git a/data/maps/objects/PokemonMansion2F.asm b/data/maps/objects/PokemonMansion2F.asm index 6c0cc5f8..1df7d282 100755 --- a/data/maps/objects/PokemonMansion2F.asm +++ b/data/maps/objects/PokemonMansion2F.asm @@ -10,10 +10,10 @@ PokemonMansion2F_Object: db 0 ; signs db 4 ; objects - object SPRITE_BLACK_HAIR_BOY_2, 3, 17, WALK, 2, 1, OPP_BURGLAR, 7 - object SPRITE_BALL, 28, 7, STAY, NONE, 2, CALCIUM - object SPRITE_BOOK_MAP_DEX, 18, 2, STAY, NONE, 3 ; person - object SPRITE_BOOK_MAP_DEX, 3, 22, STAY, NONE, 4 ; person + object SPRITE_SUPER_NERD, 3, 17, WALK, 2, 1, OPP_BURGLAR, 7 + object SPRITE_POKE_BALL, 28, 7, STAY, NONE, 2, CALCIUM + object SPRITE_POKEDEX, 18, 2, STAY, NONE, 3 ; person + object SPRITE_POKEDEX, 3, 22, STAY, NONE, 4 ; person ; warp-to warp_to 5, 10, POKEMON_MANSION_2F_WIDTH ; POKEMON_MANSION_1F diff --git a/data/maps/objects/PokemonMansion3F.asm b/data/maps/objects/PokemonMansion3F.asm index 7c8c9c22..fc0149c9 100755 --- a/data/maps/objects/PokemonMansion3F.asm +++ b/data/maps/objects/PokemonMansion3F.asm @@ -9,11 +9,11 @@ PokemonMansion3F_Object: db 0 ; signs db 5 ; objects - object SPRITE_BLACK_HAIR_BOY_2, 5, 11, WALK, 2, 1, OPP_BURGLAR, 8 - object SPRITE_OAK_AIDE, 20, 11, STAY, LEFT, 2, OPP_SCIENTIST, 12 - object SPRITE_BALL, 1, 16, STAY, NONE, 3, MAX_POTION - object SPRITE_BALL, 25, 5, STAY, NONE, 4, IRON - object SPRITE_BOOK_MAP_DEX, 6, 12, STAY, NONE, 5 ; person + object SPRITE_SUPER_NERD, 5, 11, WALK, 2, 1, OPP_BURGLAR, 8 + object SPRITE_SCIENTIST, 20, 11, STAY, LEFT, 2, OPP_SCIENTIST, 12 + object SPRITE_POKE_BALL, 1, 16, STAY, NONE, 3, MAX_POTION + object SPRITE_POKE_BALL, 25, 5, STAY, NONE, 4, IRON + object SPRITE_POKEDEX, 6, 12, STAY, NONE, 5 ; person ; warp-to warp_to 7, 10, POKEMON_MANSION_3F_WIDTH ; POKEMON_MANSION_2F diff --git a/data/maps/objects/PokemonMansionB1F.asm b/data/maps/objects/PokemonMansionB1F.asm index 1a6d6f32..0cb994ed 100755 --- a/data/maps/objects/PokemonMansionB1F.asm +++ b/data/maps/objects/PokemonMansionB1F.asm @@ -7,14 +7,14 @@ PokemonMansionB1F_Object: db 0 ; signs db 8 ; objects - object SPRITE_BLACK_HAIR_BOY_2, 16, 23, STAY, NONE, 1, OPP_BURGLAR, 9 - object SPRITE_OAK_AIDE, 27, 11, STAY, DOWN, 2, OPP_SCIENTIST, 13 - object SPRITE_BALL, 10, 2, STAY, NONE, 3, RARE_CANDY - object SPRITE_BALL, 1, 22, STAY, NONE, 4, FULL_RESTORE - object SPRITE_BALL, 19, 25, STAY, NONE, 5, TM_BLIZZARD - object SPRITE_BALL, 5, 4, STAY, NONE, 6, TM_SOLARBEAM - object SPRITE_BOOK_MAP_DEX, 16, 20, STAY, NONE, 7 ; person - object SPRITE_BALL, 5, 13, STAY, NONE, 8, SECRET_KEY + object SPRITE_SUPER_NERD, 16, 23, STAY, NONE, 1, OPP_BURGLAR, 9 + object SPRITE_SCIENTIST, 27, 11, STAY, DOWN, 2, OPP_SCIENTIST, 13 + object SPRITE_POKE_BALL, 10, 2, STAY, NONE, 3, RARE_CANDY + object SPRITE_POKE_BALL, 1, 22, STAY, NONE, 4, FULL_RESTORE + object SPRITE_POKE_BALL, 19, 25, STAY, NONE, 5, TM_BLIZZARD + object SPRITE_POKE_BALL, 5, 4, STAY, NONE, 6, TM_SOLARBEAM + object SPRITE_POKEDEX, 16, 20, STAY, NONE, 7 ; person + object SPRITE_POKE_BALL, 5, 13, STAY, NONE, 8, SECRET_KEY ; warp-to warp_to 23, 22, POKEMON_MANSION_B1F_WIDTH ; POKEMON_MANSION_1F diff --git a/data/maps/objects/PokemonTower1F.asm b/data/maps/objects/PokemonTower1F.asm index f92969e1..a9d48594 100755 --- a/data/maps/objects/PokemonTower1F.asm +++ b/data/maps/objects/PokemonTower1F.asm @@ -9,11 +9,11 @@ PokemonTower1F_Object: db 0 ; signs db 5 ; objects - object SPRITE_CABLE_CLUB_WOMAN, 15, 13, STAY, UP, 1 ; person - object SPRITE_MOM_GEISHA, 6, 8, STAY, NONE, 2 ; person + object SPRITE_LINK_RECEPTIONIST, 15, 13, STAY, UP, 1 ; person + object SPRITE_MIDDLE_AGED_WOMAN, 6, 8, STAY, NONE, 2 ; person object SPRITE_BALDING_GUY, 8, 12, STAY, NONE, 3 ; person object SPRITE_GIRL, 13, 7, STAY, NONE, 4 ; person - object SPRITE_MEDIUM, 17, 7, STAY, LEFT, 5 ; person + object SPRITE_CHANNELER, 17, 7, STAY, LEFT, 5 ; person ; warp-to warp_to 10, 17, POKEMON_TOWER_1F_WIDTH diff --git a/data/maps/objects/PokemonTower2F.asm b/data/maps/objects/PokemonTower2F.asm index 5ce437d1..2b52c1ba 100755 --- a/data/maps/objects/PokemonTower2F.asm +++ b/data/maps/objects/PokemonTower2F.asm @@ -9,7 +9,7 @@ PokemonTower2F_Object: db 2 ; objects object SPRITE_BLUE, 14, 5, STAY, NONE, 1 ; person - object SPRITE_MEDIUM, 3, 7, STAY, RIGHT, 2 ; person + object SPRITE_CHANNELER, 3, 7, STAY, RIGHT, 2 ; person ; warp-to warp_to 3, 9, POKEMON_TOWER_2F_WIDTH ; POKEMON_TOWER_3F diff --git a/data/maps/objects/PokemonTower3F.asm b/data/maps/objects/PokemonTower3F.asm index 79b83f88..21322813 100755 --- a/data/maps/objects/PokemonTower3F.asm +++ b/data/maps/objects/PokemonTower3F.asm @@ -8,10 +8,10 @@ PokemonTower3F_Object: db 0 ; signs db 4 ; objects - object SPRITE_MEDIUM, 12, 3, STAY, LEFT, 1, OPP_CHANNELER, 5 - object SPRITE_MEDIUM, 9, 8, STAY, DOWN, 2, OPP_CHANNELER, 6 - object SPRITE_MEDIUM, 10, 13, STAY, DOWN, 3, OPP_CHANNELER, 8 - object SPRITE_BALL, 12, 1, STAY, NONE, 4, ESCAPE_ROPE + object SPRITE_CHANNELER, 12, 3, STAY, LEFT, 1, OPP_CHANNELER, 5 + object SPRITE_CHANNELER, 9, 8, STAY, DOWN, 2, OPP_CHANNELER, 6 + object SPRITE_CHANNELER, 10, 13, STAY, DOWN, 3, OPP_CHANNELER, 8 + object SPRITE_POKE_BALL, 12, 1, STAY, NONE, 4, ESCAPE_ROPE ; warp-to warp_to 3, 9, POKEMON_TOWER_3F_WIDTH ; POKEMON_TOWER_2F diff --git a/data/maps/objects/PokemonTower4F.asm b/data/maps/objects/PokemonTower4F.asm index db86c02c..25ef7cb1 100755 --- a/data/maps/objects/PokemonTower4F.asm +++ b/data/maps/objects/PokemonTower4F.asm @@ -8,12 +8,12 @@ PokemonTower4F_Object: db 0 ; signs db 6 ; objects - object SPRITE_MEDIUM, 5, 10, STAY, RIGHT, 1, OPP_CHANNELER, 9 - object SPRITE_MEDIUM, 15, 7, STAY, DOWN, 2, OPP_CHANNELER, 10 - object SPRITE_MEDIUM, 14, 12, STAY, LEFT, 3, OPP_CHANNELER, 12 - object SPRITE_BALL, 12, 10, STAY, NONE, 4, ELIXER - object SPRITE_BALL, 9, 10, STAY, NONE, 5, AWAKENING - object SPRITE_BALL, 12, 16, STAY, NONE, 6, HP_UP + object SPRITE_CHANNELER, 5, 10, STAY, RIGHT, 1, OPP_CHANNELER, 9 + object SPRITE_CHANNELER, 15, 7, STAY, DOWN, 2, OPP_CHANNELER, 10 + object SPRITE_CHANNELER, 14, 12, STAY, LEFT, 3, OPP_CHANNELER, 12 + object SPRITE_POKE_BALL, 12, 10, STAY, NONE, 4, ELIXER + object SPRITE_POKE_BALL, 9, 10, STAY, NONE, 5, AWAKENING + object SPRITE_POKE_BALL, 12, 16, STAY, NONE, 6, HP_UP ; warp-to warp_to 3, 9, POKEMON_TOWER_4F_WIDTH ; POKEMON_TOWER_5F diff --git a/data/maps/objects/PokemonTower5F.asm b/data/maps/objects/PokemonTower5F.asm index b482871f..4dc7d13b 100755 --- a/data/maps/objects/PokemonTower5F.asm +++ b/data/maps/objects/PokemonTower5F.asm @@ -8,12 +8,12 @@ PokemonTower5F_Object: db 0 ; signs db 6 ; objects - object SPRITE_MEDIUM, 12, 8, STAY, NONE, 1 ; person - object SPRITE_MEDIUM, 17, 7, STAY, LEFT, 2, OPP_CHANNELER, 14 - object SPRITE_MEDIUM, 14, 3, STAY, LEFT, 3, OPP_CHANNELER, 16 - object SPRITE_MEDIUM, 6, 10, STAY, RIGHT, 4, OPP_CHANNELER, 17 - object SPRITE_MEDIUM, 9, 16, STAY, RIGHT, 5, OPP_CHANNELER, 18 - object SPRITE_BALL, 6, 14, STAY, NONE, 6, NUGGET + object SPRITE_CHANNELER, 12, 8, STAY, NONE, 1 ; person + object SPRITE_CHANNELER, 17, 7, STAY, LEFT, 2, OPP_CHANNELER, 14 + object SPRITE_CHANNELER, 14, 3, STAY, LEFT, 3, OPP_CHANNELER, 16 + object SPRITE_CHANNELER, 6, 10, STAY, RIGHT, 4, OPP_CHANNELER, 17 + object SPRITE_CHANNELER, 9, 16, STAY, RIGHT, 5, OPP_CHANNELER, 18 + object SPRITE_POKE_BALL, 6, 14, STAY, NONE, 6, NUGGET ; warp-to warp_to 3, 9, POKEMON_TOWER_5F_WIDTH ; POKEMON_TOWER_4F diff --git a/data/maps/objects/PokemonTower6F.asm b/data/maps/objects/PokemonTower6F.asm index 823fe78a..361e4e86 100755 --- a/data/maps/objects/PokemonTower6F.asm +++ b/data/maps/objects/PokemonTower6F.asm @@ -8,11 +8,11 @@ PokemonTower6F_Object: db 0 ; signs db 5 ; objects - object SPRITE_MEDIUM, 12, 10, STAY, RIGHT, 1, OPP_CHANNELER, 19 - object SPRITE_MEDIUM, 9, 5, STAY, DOWN, 2, OPP_CHANNELER, 20 - object SPRITE_MEDIUM, 16, 5, STAY, LEFT, 3, OPP_CHANNELER, 21 - object SPRITE_BALL, 6, 8, STAY, NONE, 4, RARE_CANDY - object SPRITE_BALL, 14, 14, STAY, NONE, 5, X_ACCURACY + object SPRITE_CHANNELER, 12, 10, STAY, RIGHT, 1, OPP_CHANNELER, 19 + object SPRITE_CHANNELER, 9, 5, STAY, DOWN, 2, OPP_CHANNELER, 20 + object SPRITE_CHANNELER, 16, 5, STAY, LEFT, 3, OPP_CHANNELER, 21 + object SPRITE_POKE_BALL, 6, 8, STAY, NONE, 4, RARE_CANDY + object SPRITE_POKE_BALL, 14, 14, STAY, NONE, 5, X_ACCURACY ; warp-to warp_to 18, 9, POKEMON_TOWER_6F_WIDTH ; POKEMON_TOWER_5F diff --git a/data/maps/objects/PowerPlant.asm b/data/maps/objects/PowerPlant.asm index 646652d6..f9261140 100755 --- a/data/maps/objects/PowerPlant.asm +++ b/data/maps/objects/PowerPlant.asm @@ -9,20 +9,20 @@ PowerPlant_Object: db 0 ; signs db 14 ; objects - object SPRITE_BALL, 9, 20, STAY, NONE, 1, VOLTORB, 40 - object SPRITE_BALL, 32, 18, STAY, NONE, 2, VOLTORB, 40 - object SPRITE_BALL, 21, 25, STAY, NONE, 3, VOLTORB, 40 - object SPRITE_BALL, 25, 18, STAY, NONE, 4, ELECTRODE, 43 - object SPRITE_BALL, 23, 34, STAY, NONE, 5, VOLTORB, 40 - object SPRITE_BALL, 26, 28, STAY, NONE, 6, VOLTORB, 40 - object SPRITE_BALL, 21, 14, STAY, NONE, 7, ELECTRODE, 43 - object SPRITE_BALL, 37, 32, STAY, NONE, 8, VOLTORB, 40 + object SPRITE_POKE_BALL, 9, 20, STAY, NONE, 1, VOLTORB, 40 + object SPRITE_POKE_BALL, 32, 18, STAY, NONE, 2, VOLTORB, 40 + object SPRITE_POKE_BALL, 21, 25, STAY, NONE, 3, VOLTORB, 40 + object SPRITE_POKE_BALL, 25, 18, STAY, NONE, 4, ELECTRODE, 43 + object SPRITE_POKE_BALL, 23, 34, STAY, NONE, 5, VOLTORB, 40 + object SPRITE_POKE_BALL, 26, 28, STAY, NONE, 6, VOLTORB, 40 + object SPRITE_POKE_BALL, 21, 14, STAY, NONE, 7, ELECTRODE, 43 + object SPRITE_POKE_BALL, 37, 32, STAY, NONE, 8, VOLTORB, 40 object SPRITE_BIRD, 4, 9, STAY, UP, 9, ZAPDOS, 50 - object SPRITE_BALL, 7, 25, STAY, NONE, 10, CARBOS - object SPRITE_BALL, 28, 3, STAY, NONE, 11, HP_UP - object SPRITE_BALL, 34, 3, STAY, NONE, 12, RARE_CANDY - object SPRITE_BALL, 26, 32, STAY, NONE, 13, TM_THUNDER - object SPRITE_BALL, 20, 32, STAY, NONE, 14, TM_REFLECT + object SPRITE_POKE_BALL, 7, 25, STAY, NONE, 10, CARBOS + object SPRITE_POKE_BALL, 28, 3, STAY, NONE, 11, HP_UP + object SPRITE_POKE_BALL, 34, 3, STAY, NONE, 12, RARE_CANDY + object SPRITE_POKE_BALL, 26, 32, STAY, NONE, 13, TM_THUNDER + object SPRITE_POKE_BALL, 20, 32, STAY, NONE, 14, TM_REFLECT ; warp-to warp_to 4, 35, POWER_PLANT_WIDTH diff --git a/data/maps/objects/RockTunnel1F.asm b/data/maps/objects/RockTunnel1F.asm index 11400eaa..21186cde 100755 --- a/data/maps/objects/RockTunnel1F.asm +++ b/data/maps/objects/RockTunnel1F.asm @@ -18,10 +18,10 @@ RockTunnel1F_Object: object SPRITE_HIKER, 7, 5, STAY, DOWN, 1, OPP_HIKER, 12 object SPRITE_HIKER, 5, 16, STAY, DOWN, 2, OPP_HIKER, 13 object SPRITE_HIKER, 17, 15, STAY, LEFT, 3, OPP_HIKER, 14 - object SPRITE_BLACK_HAIR_BOY_2, 23, 8, STAY, LEFT, 4, OPP_POKEMANIAC, 7 - object SPRITE_LASS, 37, 21, STAY, LEFT, 5, OPP_JR_TRAINER_F, 17 - object SPRITE_LASS, 22, 24, STAY, DOWN, 6, OPP_JR_TRAINER_F, 18 - object SPRITE_LASS, 32, 24, STAY, RIGHT, 7, OPP_JR_TRAINER_F, 19 + object SPRITE_SUPER_NERD, 23, 8, STAY, LEFT, 4, OPP_POKEMANIAC, 7 + object SPRITE_COOLTRAINER_F, 37, 21, STAY, LEFT, 5, OPP_JR_TRAINER_F, 17 + object SPRITE_COOLTRAINER_F, 22, 24, STAY, DOWN, 6, OPP_JR_TRAINER_F, 18 + object SPRITE_COOLTRAINER_F, 32, 24, STAY, RIGHT, 7, OPP_JR_TRAINER_F, 19 ; warp-to warp_to 15, 3, ROCK_TUNNEL_1F_WIDTH diff --git a/data/maps/objects/RockTunnelB1F.asm b/data/maps/objects/RockTunnelB1F.asm index f562168e..95b237f5 100755 --- a/data/maps/objects/RockTunnelB1F.asm +++ b/data/maps/objects/RockTunnelB1F.asm @@ -10,14 +10,14 @@ RockTunnelB1F_Object: db 0 ; signs db 8 ; objects - object SPRITE_LASS, 11, 13, STAY, DOWN, 1, OPP_JR_TRAINER_F, 9 + object SPRITE_COOLTRAINER_F, 11, 13, STAY, DOWN, 1, OPP_JR_TRAINER_F, 9 object SPRITE_HIKER, 6, 10, STAY, DOWN, 2, OPP_HIKER, 9 - object SPRITE_BLACK_HAIR_BOY_2, 3, 5, STAY, DOWN, 3, OPP_POKEMANIAC, 3 - object SPRITE_BLACK_HAIR_BOY_2, 20, 21, STAY, RIGHT, 4, OPP_POKEMANIAC, 4 + object SPRITE_SUPER_NERD, 3, 5, STAY, DOWN, 3, OPP_POKEMANIAC, 3 + object SPRITE_SUPER_NERD, 20, 21, STAY, RIGHT, 4, OPP_POKEMANIAC, 4 object SPRITE_HIKER, 30, 10, STAY, DOWN, 5, OPP_HIKER, 10 - object SPRITE_LASS, 14, 28, STAY, RIGHT, 6, OPP_JR_TRAINER_F, 10 + object SPRITE_COOLTRAINER_F, 14, 28, STAY, RIGHT, 6, OPP_JR_TRAINER_F, 10 object SPRITE_HIKER, 33, 5, STAY, RIGHT, 7, OPP_HIKER, 11 - object SPRITE_BLACK_HAIR_BOY_2, 26, 30, STAY, DOWN, 8, OPP_POKEMANIAC, 5 + object SPRITE_SUPER_NERD, 26, 30, STAY, DOWN, 8, OPP_POKEMANIAC, 5 ; warp-to warp_to 33, 25, ROCK_TUNNEL_B1F_WIDTH ; ROCK_TUNNEL_1F diff --git a/data/maps/objects/RockTunnelPokecenter.asm b/data/maps/objects/RockTunnelPokecenter.asm index 87ddf1b4..a0527467 100755 --- a/data/maps/objects/RockTunnelPokecenter.asm +++ b/data/maps/objects/RockTunnelPokecenter.asm @@ -10,8 +10,8 @@ RockTunnelPokecenter_Object: db 4 ; objects object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person object SPRITE_GENTLEMAN, 7, 3, WALK, 2, 2 ; person - object SPRITE_FISHER2, 2, 5, STAY, NONE, 3 ; person - object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person + object SPRITE_FISHER, 2, 5, STAY, NONE, 3 ; person + object SPRITE_LINK_RECEPTIONIST, 11, 2, STAY, DOWN, 4 ; person ; warp-to warp_to 3, 7, ROCK_TUNNEL_POKECENTER_WIDTH diff --git a/data/maps/objects/RocketHideoutB1F.asm b/data/maps/objects/RocketHideoutB1F.asm index 99537510..9de04769 100755 --- a/data/maps/objects/RocketHideoutB1F.asm +++ b/data/maps/objects/RocketHideoutB1F.asm @@ -16,8 +16,8 @@ RocketHideoutB1F_Object: object SPRITE_ROCKET, 18, 17, STAY, DOWN, 3, OPP_ROCKET, 10 object SPRITE_ROCKET, 15, 25, STAY, RIGHT, 4, OPP_ROCKET, 11 object SPRITE_ROCKET, 28, 18, STAY, LEFT, 5, OPP_ROCKET, 12 - object SPRITE_BALL, 11, 14, STAY, NONE, 6, ESCAPE_ROPE - object SPRITE_BALL, 9, 17, STAY, NONE, 7, HYPER_POTION + object SPRITE_POKE_BALL, 11, 14, STAY, NONE, 6, ESCAPE_ROPE + object SPRITE_POKE_BALL, 9, 17, STAY, NONE, 7, HYPER_POTION ; warp-to warp_to 23, 2, ROCKET_HIDEOUT_B1F_WIDTH ; ROCKET_HIDEOUT_B2F diff --git a/data/maps/objects/RocketHideoutB2F.asm b/data/maps/objects/RocketHideoutB2F.asm index b0836736..ee4f81cd 100755 --- a/data/maps/objects/RocketHideoutB2F.asm +++ b/data/maps/objects/RocketHideoutB2F.asm @@ -12,10 +12,10 @@ RocketHideoutB2F_Object: db 5 ; objects object SPRITE_ROCKET, 20, 12, STAY, DOWN, 1, OPP_ROCKET, 13 - object SPRITE_BALL, 1, 11, STAY, NONE, 2, MOON_STONE - object SPRITE_BALL, 16, 8, STAY, NONE, 3, NUGGET - object SPRITE_BALL, 6, 12, STAY, NONE, 4, TM_HORN_DRILL - object SPRITE_BALL, 3, 21, STAY, NONE, 5, SUPER_POTION + object SPRITE_POKE_BALL, 1, 11, STAY, NONE, 2, MOON_STONE + object SPRITE_POKE_BALL, 16, 8, STAY, NONE, 3, NUGGET + object SPRITE_POKE_BALL, 6, 12, STAY, NONE, 4, TM_HORN_DRILL + object SPRITE_POKE_BALL, 3, 21, STAY, NONE, 5, SUPER_POTION ; warp-to warp_to 27, 8, ROCKET_HIDEOUT_B2F_WIDTH ; ROCKET_HIDEOUT_B1F diff --git a/data/maps/objects/RocketHideoutB3F.asm b/data/maps/objects/RocketHideoutB3F.asm index 86ab03fe..2b0d7e5a 100755 --- a/data/maps/objects/RocketHideoutB3F.asm +++ b/data/maps/objects/RocketHideoutB3F.asm @@ -10,8 +10,8 @@ RocketHideoutB3F_Object: db 4 ; objects object SPRITE_ROCKET, 10, 22, STAY, RIGHT, 1, OPP_ROCKET, 14 object SPRITE_ROCKET, 26, 12, STAY, UP, 2, OPP_ROCKET, 15 - object SPRITE_BALL, 26, 17, STAY, NONE, 3, TM_DOUBLE_EDGE - object SPRITE_BALL, 20, 14, STAY, NONE, 4, RARE_CANDY + object SPRITE_POKE_BALL, 26, 17, STAY, NONE, 3, TM_DOUBLE_EDGE + object SPRITE_POKE_BALL, 20, 14, STAY, NONE, 4, RARE_CANDY ; warp-to warp_to 25, 6, ROCKET_HIDEOUT_B3F_WIDTH ; ROCKET_HIDEOUT_B2F diff --git a/data/maps/objects/RocketHideoutB4F.asm b/data/maps/objects/RocketHideoutB4F.asm index 9ca7aeed..1f095595 100755 --- a/data/maps/objects/RocketHideoutB4F.asm +++ b/data/maps/objects/RocketHideoutB4F.asm @@ -13,11 +13,11 @@ RocketHideoutB4F_Object: object SPRITE_ROCKET, 23, 12, STAY, DOWN, 2, OPP_ROCKET, 16 object SPRITE_ROCKET, 26, 12, STAY, DOWN, 3, OPP_ROCKET, 17 object SPRITE_ROCKET, 11, 2, STAY, DOWN, 4, OPP_ROCKET, 18 - object SPRITE_BALL, 10, 12, STAY, NONE, 5, HP_UP - object SPRITE_BALL, 9, 4, STAY, NONE, 6, TM_RAZOR_WIND - object SPRITE_BALL, 12, 20, STAY, NONE, 7, IRON - object SPRITE_BALL, 25, 2, STAY, NONE, 8, SILPH_SCOPE - object SPRITE_BALL, 10, 2, STAY, NONE, 9, LIFT_KEY + object SPRITE_POKE_BALL, 10, 12, STAY, NONE, 5, HP_UP + object SPRITE_POKE_BALL, 9, 4, STAY, NONE, 6, TM_RAZOR_WIND + object SPRITE_POKE_BALL, 12, 20, STAY, NONE, 7, IRON + object SPRITE_POKE_BALL, 25, 2, STAY, NONE, 8, SILPH_SCOPE + object SPRITE_POKE_BALL, 10, 2, STAY, NONE, 9, LIFT_KEY ; warp-to warp_to 19, 10, ROCKET_HIDEOUT_B4F_WIDTH ; ROCKET_HIDEOUT_B3F diff --git a/data/maps/objects/Route1.asm b/data/maps/objects/Route1.asm index 0815fe67..7d0de139 100755 --- a/data/maps/objects/Route1.asm +++ b/data/maps/objects/Route1.asm @@ -7,8 +7,8 @@ Route1_Object: sign 9, 27, 3 ; Route1Text3 db 2 ; objects - object SPRITE_BUG_CATCHER, 5, 24, WALK, 1, 1 ; person - object SPRITE_BUG_CATCHER, 15, 13, WALK, 2, 2 ; person + object SPRITE_YOUNGSTER, 5, 24, WALK, 1, 1 ; person + object SPRITE_YOUNGSTER, 15, 13, WALK, 2, 2 ; person ; warp-to (unused) warp_to 2, 7, 4 diff --git a/data/maps/objects/Route10.asm b/data/maps/objects/Route10.asm index 12850577..a9c3a188 100755 --- a/data/maps/objects/Route10.asm +++ b/data/maps/objects/Route10.asm @@ -14,12 +14,12 @@ Route10_Object: sign 5, 41, 10 ; Route10Text10 db 6 ; objects - object SPRITE_BLACK_HAIR_BOY_2, 10, 44, STAY, LEFT, 1, OPP_POKEMANIAC, 1 + object SPRITE_SUPER_NERD, 10, 44, STAY, LEFT, 1, OPP_POKEMANIAC, 1 object SPRITE_HIKER, 3, 57, STAY, UP, 2, OPP_HIKER, 7 - object SPRITE_BLACK_HAIR_BOY_2, 14, 64, STAY, LEFT, 3, OPP_POKEMANIAC, 2 - object SPRITE_LASS, 7, 25, STAY, LEFT, 4, OPP_JR_TRAINER_F, 7 + object SPRITE_SUPER_NERD, 14, 64, STAY, LEFT, 3, OPP_POKEMANIAC, 2 + object SPRITE_COOLTRAINER_F, 7, 25, STAY, LEFT, 4, OPP_JR_TRAINER_F, 7 object SPRITE_HIKER, 3, 61, STAY, DOWN, 5, OPP_HIKER, 8 - object SPRITE_LASS, 7, 54, STAY, DOWN, 6, OPP_JR_TRAINER_F, 8 + object SPRITE_COOLTRAINER_F, 7, 54, STAY, DOWN, 6, OPP_JR_TRAINER_F, 8 ; warp-to warp_to 11, 19, ROUTE_10_WIDTH ; ROCK_TUNNEL_POKECENTER diff --git a/data/maps/objects/Route11.asm b/data/maps/objects/Route11.asm index 5ed232f5..6f7241cf 100755 --- a/data/maps/objects/Route11.asm +++ b/data/maps/objects/Route11.asm @@ -14,14 +14,14 @@ Route11_Object: db 10 ; objects object SPRITE_GAMBLER, 10, 14, STAY, DOWN, 1, OPP_GAMBLER, 1 object SPRITE_GAMBLER, 26, 9, STAY, DOWN, 2, OPP_GAMBLER, 2 - object SPRITE_BUG_CATCHER, 13, 5, STAY, LEFT, 3, OPP_YOUNGSTER, 9 - object SPRITE_BLACK_HAIR_BOY_2, 36, 11, STAY, DOWN, 4, OPP_ENGINEER, 2 - object SPRITE_BUG_CATCHER, 22, 4, STAY, UP, 5, OPP_YOUNGSTER, 10 + object SPRITE_YOUNGSTER, 13, 5, STAY, LEFT, 3, OPP_YOUNGSTER, 9 + object SPRITE_SUPER_NERD, 36, 11, STAY, DOWN, 4, OPP_ENGINEER, 2 + object SPRITE_YOUNGSTER, 22, 4, STAY, UP, 5, OPP_YOUNGSTER, 10 object SPRITE_GAMBLER, 45, 7, STAY, DOWN, 6, OPP_GAMBLER, 3 object SPRITE_GAMBLER, 33, 3, STAY, UP, 7, OPP_GAMBLER, 4 - object SPRITE_BUG_CATCHER, 43, 5, STAY, RIGHT, 8, OPP_YOUNGSTER, 11 - object SPRITE_BLACK_HAIR_BOY_2, 45, 16, STAY, LEFT, 9, OPP_ENGINEER, 3 - object SPRITE_BUG_CATCHER, 22, 12, STAY, UP, 10, OPP_YOUNGSTER, 12 + object SPRITE_YOUNGSTER, 43, 5, STAY, RIGHT, 8, OPP_YOUNGSTER, 11 + object SPRITE_SUPER_NERD, 45, 16, STAY, LEFT, 9, OPP_ENGINEER, 3 + object SPRITE_YOUNGSTER, 22, 12, STAY, UP, 10, OPP_YOUNGSTER, 12 ; warp-to warp_to 49, 8, ROUTE_11_WIDTH ; ROUTE_11_GATE_1F diff --git a/data/maps/objects/Route11Gate2F.asm b/data/maps/objects/Route11Gate2F.asm index bf305bba..3730bae0 100755 --- a/data/maps/objects/Route11Gate2F.asm +++ b/data/maps/objects/Route11Gate2F.asm @@ -9,8 +9,8 @@ Route11Gate2F_Object: sign 6, 2, 4 ; Route11GateUpstairsText4 db 2 ; objects - object SPRITE_BUG_CATCHER, 4, 2, WALK, 2, 1 ; person - object SPRITE_OAK_AIDE, 2, 6, STAY, NONE, 2 ; person + object SPRITE_YOUNGSTER, 4, 2, WALK, 2, 1 ; person + object SPRITE_SCIENTIST, 2, 6, STAY, NONE, 2 ; person ; warp-to warp_to 7, 7, ROUTE_11_GATE_2F_WIDTH ; ROUTE_11_GATE_1F diff --git a/data/maps/objects/Route12.asm b/data/maps/objects/Route12.asm index 6cce9529..212b05c8 100755 --- a/data/maps/objects/Route12.asm +++ b/data/maps/objects/Route12.asm @@ -13,15 +13,15 @@ Route12_Object: db 10 ; objects object SPRITE_SNORLAX, 10, 62, STAY, DOWN, 1 ; person - object SPRITE_FISHER2, 14, 31, STAY, LEFT, 2, OPP_FISHER, 3 - object SPRITE_FISHER2, 5, 39, STAY, UP, 3, OPP_FISHER, 4 - object SPRITE_BLACK_HAIR_BOY_1, 11, 92, STAY, LEFT, 4, OPP_JR_TRAINER_M, 9 - object SPRITE_BLACK_HAIR_BOY_2, 14, 76, STAY, UP, 5, OPP_ROCKER, 2 - object SPRITE_FISHER2, 12, 40, STAY, LEFT, 6, OPP_FISHER, 5 - object SPRITE_FISHER2, 9, 52, STAY, RIGHT, 7, OPP_FISHER, 6 - object SPRITE_FISHER2, 6, 87, STAY, DOWN, 8, OPP_FISHER, 11 - object SPRITE_BALL, 14, 35, STAY, NONE, 9, TM_PAY_DAY - object SPRITE_BALL, 5, 89, STAY, NONE, 10, IRON + object SPRITE_FISHER, 14, 31, STAY, LEFT, 2, OPP_FISHER, 3 + object SPRITE_FISHER, 5, 39, STAY, UP, 3, OPP_FISHER, 4 + object SPRITE_COOLTRAINER_M, 11, 92, STAY, LEFT, 4, OPP_JR_TRAINER_M, 9 + object SPRITE_SUPER_NERD, 14, 76, STAY, UP, 5, OPP_ROCKER, 2 + object SPRITE_FISHER, 12, 40, STAY, LEFT, 6, OPP_FISHER, 5 + object SPRITE_FISHER, 9, 52, STAY, RIGHT, 7, OPP_FISHER, 6 + object SPRITE_FISHER, 6, 87, STAY, DOWN, 8, OPP_FISHER, 11 + object SPRITE_POKE_BALL, 14, 35, STAY, NONE, 9, TM_PAY_DAY + object SPRITE_POKE_BALL, 5, 89, STAY, NONE, 10, IRON ; warp-to warp_to 10, 15, ROUTE_12_WIDTH ; ROUTE_12_GATE_1F diff --git a/data/maps/objects/Route12SuperRodHouse.asm b/data/maps/objects/Route12SuperRodHouse.asm index b645dbdf..08dd8c4c 100755 --- a/data/maps/objects/Route12SuperRodHouse.asm +++ b/data/maps/objects/Route12SuperRodHouse.asm @@ -8,7 +8,7 @@ Route12SuperRodHouse_Object: db 0 ; signs db 1 ; objects - object SPRITE_FISHER, 2, 4, STAY, RIGHT, 1 ; person + object SPRITE_FISHING_GURU, 2, 4, STAY, RIGHT, 1 ; person ; warp-to warp_to 2, 7, ROUTE_12_SUPER_ROD_HOUSE_WIDTH diff --git a/data/maps/objects/Route13.asm b/data/maps/objects/Route13.asm index 3f460901..6a6b64ad 100755 --- a/data/maps/objects/Route13.asm +++ b/data/maps/objects/Route13.asm @@ -9,13 +9,13 @@ Route13_Object: sign 31, 11, 13 ; Route13Text13 db 10 ; objects - object SPRITE_BLACK_HAIR_BOY_1, 49, 10, STAY, RIGHT, 1, OPP_BIRD_KEEPER, 1 - object SPRITE_LASS, 48, 10, STAY, DOWN, 2, OPP_JR_TRAINER_F, 12 - object SPRITE_LASS, 27, 9, STAY, DOWN, 3, OPP_JR_TRAINER_F, 13 - object SPRITE_LASS, 23, 10, STAY, LEFT, 4, OPP_JR_TRAINER_F, 14 - object SPRITE_LASS, 50, 5, STAY, DOWN, 5, OPP_JR_TRAINER_F, 15 - object SPRITE_BLACK_HAIR_BOY_1, 12, 4, STAY, RIGHT, 6, OPP_BIRD_KEEPER, 2 - object SPRITE_FOULARD_WOMAN, 33, 6, STAY, DOWN, 7, OPP_BEAUTY, 4 - object SPRITE_FOULARD_WOMAN, 32, 6, STAY, DOWN, 8, OPP_BEAUTY, 5 + object SPRITE_COOLTRAINER_M, 49, 10, STAY, RIGHT, 1, OPP_BIRD_KEEPER, 1 + object SPRITE_COOLTRAINER_F, 48, 10, STAY, DOWN, 2, OPP_JR_TRAINER_F, 12 + object SPRITE_COOLTRAINER_F, 27, 9, STAY, DOWN, 3, OPP_JR_TRAINER_F, 13 + object SPRITE_COOLTRAINER_F, 23, 10, STAY, LEFT, 4, OPP_JR_TRAINER_F, 14 + object SPRITE_COOLTRAINER_F, 50, 5, STAY, DOWN, 5, OPP_JR_TRAINER_F, 15 + object SPRITE_COOLTRAINER_M, 12, 4, STAY, RIGHT, 6, OPP_BIRD_KEEPER, 2 + object SPRITE_BEAUTY, 33, 6, STAY, DOWN, 7, OPP_BEAUTY, 4 + object SPRITE_BEAUTY, 32, 6, STAY, DOWN, 8, OPP_BEAUTY, 5 object SPRITE_BIKER, 10, 7, STAY, UP, 9, OPP_BIKER, 1 - object SPRITE_BLACK_HAIR_BOY_1, 7, 13, STAY, UP, 10, OPP_BIRD_KEEPER, 3 + object SPRITE_COOLTRAINER_M, 7, 13, STAY, UP, 10, OPP_BIRD_KEEPER, 3 diff --git a/data/maps/objects/Route14.asm b/data/maps/objects/Route14.asm index 565e587f..f7a68846 100755 --- a/data/maps/objects/Route14.asm +++ b/data/maps/objects/Route14.asm @@ -7,12 +7,12 @@ Route14_Object: sign 17, 13, 11 ; Route14Text11 db 10 ; objects - object SPRITE_BLACK_HAIR_BOY_1, 4, 4, STAY, DOWN, 1, OPP_BIRD_KEEPER, 14 - object SPRITE_BLACK_HAIR_BOY_1, 15, 6, STAY, DOWN, 2, OPP_BIRD_KEEPER, 15 - object SPRITE_BLACK_HAIR_BOY_1, 12, 11, STAY, DOWN, 3, OPP_BIRD_KEEPER, 16 - object SPRITE_BLACK_HAIR_BOY_1, 14, 15, STAY, UP, 4, OPP_BIRD_KEEPER, 17 - object SPRITE_BLACK_HAIR_BOY_1, 15, 31, STAY, LEFT, 5, OPP_BIRD_KEEPER, 4 - object SPRITE_BLACK_HAIR_BOY_1, 6, 49, STAY, UP, 6, OPP_BIRD_KEEPER, 5 + object SPRITE_COOLTRAINER_M, 4, 4, STAY, DOWN, 1, OPP_BIRD_KEEPER, 14 + object SPRITE_COOLTRAINER_M, 15, 6, STAY, DOWN, 2, OPP_BIRD_KEEPER, 15 + object SPRITE_COOLTRAINER_M, 12, 11, STAY, DOWN, 3, OPP_BIRD_KEEPER, 16 + object SPRITE_COOLTRAINER_M, 14, 15, STAY, UP, 4, OPP_BIRD_KEEPER, 17 + object SPRITE_COOLTRAINER_M, 15, 31, STAY, LEFT, 5, OPP_BIRD_KEEPER, 4 + object SPRITE_COOLTRAINER_M, 6, 49, STAY, UP, 6, OPP_BIRD_KEEPER, 5 object SPRITE_BIKER, 5, 39, STAY, DOWN, 7, OPP_BIKER, 13 object SPRITE_BIKER, 4, 30, STAY, RIGHT, 8, OPP_BIKER, 14 object SPRITE_BIKER, 15, 30, STAY, LEFT, 9, OPP_BIKER, 15 diff --git a/data/maps/objects/Route15.asm b/data/maps/objects/Route15.asm index 80257319..095e9743 100755 --- a/data/maps/objects/Route15.asm +++ b/data/maps/objects/Route15.asm @@ -11,17 +11,17 @@ Route15_Object: sign 39, 9, 12 ; Route15Text12 db 11 ; objects - object SPRITE_LASS, 41, 11, STAY, DOWN, 1, OPP_JR_TRAINER_F, 20 - object SPRITE_LASS, 53, 10, STAY, LEFT, 2, OPP_JR_TRAINER_F, 21 - object SPRITE_BLACK_HAIR_BOY_1, 31, 13, STAY, UP, 3, OPP_BIRD_KEEPER, 6 - object SPRITE_BLACK_HAIR_BOY_1, 35, 13, STAY, UP, 4, OPP_BIRD_KEEPER, 7 - object SPRITE_FOULARD_WOMAN, 53, 11, STAY, DOWN, 5, OPP_BEAUTY, 9 - object SPRITE_FOULARD_WOMAN, 41, 10, STAY, RIGHT, 6, OPP_BEAUTY, 10 + object SPRITE_COOLTRAINER_F, 41, 11, STAY, DOWN, 1, OPP_JR_TRAINER_F, 20 + object SPRITE_COOLTRAINER_F, 53, 10, STAY, LEFT, 2, OPP_JR_TRAINER_F, 21 + object SPRITE_COOLTRAINER_M, 31, 13, STAY, UP, 3, OPP_BIRD_KEEPER, 6 + object SPRITE_COOLTRAINER_M, 35, 13, STAY, UP, 4, OPP_BIRD_KEEPER, 7 + object SPRITE_BEAUTY, 53, 11, STAY, DOWN, 5, OPP_BEAUTY, 9 + object SPRITE_BEAUTY, 41, 10, STAY, RIGHT, 6, OPP_BEAUTY, 10 object SPRITE_BIKER, 48, 10, STAY, DOWN, 7, OPP_BIKER, 3 object SPRITE_BIKER, 46, 10, STAY, DOWN, 8, OPP_BIKER, 4 - object SPRITE_LASS, 37, 5, STAY, RIGHT, 9, OPP_JR_TRAINER_F, 22 - object SPRITE_LASS, 18, 13, STAY, UP, 10, OPP_JR_TRAINER_F, 23 - object SPRITE_BALL, 18, 5, STAY, NONE, 11, TM_RAGE + object SPRITE_COOLTRAINER_F, 37, 5, STAY, RIGHT, 9, OPP_JR_TRAINER_F, 22 + object SPRITE_COOLTRAINER_F, 18, 13, STAY, UP, 10, OPP_JR_TRAINER_F, 23 + object SPRITE_POKE_BALL, 18, 5, STAY, NONE, 11, TM_RAGE ; warp-to warp_to 7, 8, ROUTE_15_WIDTH ; ROUTE_15_GATE_1F diff --git a/data/maps/objects/Route15Gate2F.asm b/data/maps/objects/Route15Gate2F.asm index 162f2b1f..63b8bf2a 100755 --- a/data/maps/objects/Route15Gate2F.asm +++ b/data/maps/objects/Route15Gate2F.asm @@ -8,7 +8,7 @@ Route15Gate2F_Object: sign 6, 2, 2 ; Route15GateUpstairsText2 db 1 ; objects - object SPRITE_OAK_AIDE, 4, 2, STAY, DOWN, 1 + object SPRITE_SCIENTIST, 4, 2, STAY, DOWN, 1 ; warp-to warp_to 7, 7, ROUTE_15_GATE_2F_WIDTH ; ROUTE_15_GATE_1F diff --git a/data/maps/objects/Route16Gate2F.asm b/data/maps/objects/Route16Gate2F.asm index 5914f854..bb5e1129 100755 --- a/data/maps/objects/Route16Gate2F.asm +++ b/data/maps/objects/Route16Gate2F.asm @@ -9,7 +9,7 @@ Route16Gate2F_Object: sign 6, 2, 4 ; Route16GateUpstairsText4 db 2 ; objects - object SPRITE_YOUNG_BOY, 4, 2, STAY, NONE, 1 ; person + object SPRITE_LITTLE_BOY, 4, 2, STAY, NONE, 1 ; person object SPRITE_LITTLE_GIRL, 2, 5, WALK, 2, 2 ; person ; warp-to diff --git a/data/maps/objects/Route18.asm b/data/maps/objects/Route18.asm index 8bacd6c0..b3a18554 100755 --- a/data/maps/objects/Route18.asm +++ b/data/maps/objects/Route18.asm @@ -12,9 +12,9 @@ Route18_Object: sign 33, 5, 5 ; Route18Text5 db 3 ; objects - object SPRITE_BLACK_HAIR_BOY_1, 36, 11, STAY, RIGHT, 1, OPP_BIRD_KEEPER, 8 - object SPRITE_BLACK_HAIR_BOY_1, 40, 15, STAY, LEFT, 2, OPP_BIRD_KEEPER, 9 - object SPRITE_BLACK_HAIR_BOY_1, 42, 13, STAY, LEFT, 3, OPP_BIRD_KEEPER, 10 + object SPRITE_COOLTRAINER_M, 36, 11, STAY, RIGHT, 1, OPP_BIRD_KEEPER, 8 + object SPRITE_COOLTRAINER_M, 40, 15, STAY, LEFT, 2, OPP_BIRD_KEEPER, 9 + object SPRITE_COOLTRAINER_M, 42, 13, STAY, LEFT, 3, OPP_BIRD_KEEPER, 10 ; warp-to warp_to 33, 8, ROUTE_18_WIDTH ; ROUTE_18_GATE_1F diff --git a/data/maps/objects/Route18Gate2F.asm b/data/maps/objects/Route18Gate2F.asm index e48ec3b8..5f0a4246 100755 --- a/data/maps/objects/Route18Gate2F.asm +++ b/data/maps/objects/Route18Gate2F.asm @@ -9,7 +9,7 @@ Route18Gate2F_Object: sign 6, 2, 3 ; Route18GateUpstairsText3 db 1 ; objects - object SPRITE_BUG_CATCHER, 4, 2, WALK, 2, 1 ; person + object SPRITE_YOUNGSTER, 4, 2, WALK, 2, 1 ; person ; warp-to warp_to 7, 7, ROUTE_18_GATE_2F_WIDTH ; ROUTE_18_GATE_1F diff --git a/data/maps/objects/Route19.asm b/data/maps/objects/Route19.asm index 9b39618e..a2130295 100755 --- a/data/maps/objects/Route19.asm +++ b/data/maps/objects/Route19.asm @@ -7,8 +7,8 @@ Route19_Object: sign 11, 9, 11 ; Route19Text11 db 10 ; objects - object SPRITE_BLACK_HAIR_BOY_1, 8, 7, STAY, LEFT, 1, OPP_SWIMMER, 2 - object SPRITE_BLACK_HAIR_BOY_1, 13, 7, STAY, LEFT, 2, OPP_SWIMMER, 3 + object SPRITE_COOLTRAINER_M, 8, 7, STAY, LEFT, 1, OPP_SWIMMER, 2 + object SPRITE_COOLTRAINER_M, 13, 7, STAY, LEFT, 2, OPP_SWIMMER, 3 object SPRITE_SWIMMER, 13, 25, STAY, LEFT, 3, OPP_SWIMMER, 4 object SPRITE_SWIMMER, 4, 27, STAY, RIGHT, 4, OPP_SWIMMER, 5 object SPRITE_SWIMMER, 16, 31, STAY, UP, 5, OPP_SWIMMER, 6 diff --git a/data/maps/objects/Route2.asm b/data/maps/objects/Route2.asm index b27ad199..8645f9c0 100755 --- a/data/maps/objects/Route2.asm +++ b/data/maps/objects/Route2.asm @@ -14,8 +14,8 @@ Route2_Object: sign 11, 11, 4 ; Route2Text4 db 2 ; objects - object SPRITE_BALL, 13, 54, STAY, NONE, 1, MOON_STONE - object SPRITE_BALL, 13, 45, STAY, NONE, 2, HP_UP + object SPRITE_POKE_BALL, 13, 54, STAY, NONE, 1, MOON_STONE + object SPRITE_POKE_BALL, 13, 45, STAY, NONE, 2, HP_UP ; warp-to warp_to 12, 9, ROUTE_2_WIDTH ; DIGLETTS_CAVE_ROUTE_2 diff --git a/data/maps/objects/Route20.asm b/data/maps/objects/Route20.asm index 7bceef97..c2a26861 100755 --- a/data/maps/objects/Route20.asm +++ b/data/maps/objects/Route20.asm @@ -16,7 +16,7 @@ Route20_Object: object SPRITE_SWIMMER, 55, 14, STAY, RIGHT, 4, OPP_JR_TRAINER_F, 24 object SPRITE_SWIMMER, 38, 13, STAY, DOWN, 5, OPP_SWIMMER, 10 object SPRITE_SWIMMER, 87, 13, STAY, UP, 6, OPP_SWIMMER, 11 - object SPRITE_BLACK_HAIR_BOY_1, 34, 9, STAY, UP, 7, OPP_BIRD_KEEPER, 11 + object SPRITE_COOLTRAINER_M, 34, 9, STAY, UP, 7, OPP_BIRD_KEEPER, 11 object SPRITE_SWIMMER, 25, 7, STAY, UP, 8, OPP_BEAUTY, 7 object SPRITE_SWIMMER, 24, 12, STAY, DOWN, 9, OPP_JR_TRAINER_F, 16 object SPRITE_SWIMMER, 15, 8, STAY, UP, 10, OPP_BEAUTY, 8 diff --git a/data/maps/objects/Route21.asm b/data/maps/objects/Route21.asm index b7759b59..aff8f833 100755 --- a/data/maps/objects/Route21.asm +++ b/data/maps/objects/Route21.asm @@ -6,12 +6,12 @@ Route21_Object: db 0 ; signs db 9 ; objects - object SPRITE_FISHER2, 4, 24, STAY, LEFT, 1, OPP_FISHER, 7 - object SPRITE_FISHER2, 6, 25, STAY, DOWN, 2, OPP_FISHER, 9 + object SPRITE_FISHER, 4, 24, STAY, LEFT, 1, OPP_FISHER, 7 + object SPRITE_FISHER, 6, 25, STAY, DOWN, 2, OPP_FISHER, 9 object SPRITE_SWIMMER, 10, 31, STAY, UP, 3, OPP_SWIMMER, 12 object SPRITE_SWIMMER, 12, 30, STAY, RIGHT, 4, OPP_CUE_BALL, 9 object SPRITE_SWIMMER, 16, 63, STAY, DOWN, 5, OPP_SWIMMER, 13 object SPRITE_SWIMMER, 5, 71, STAY, RIGHT, 6, OPP_SWIMMER, 14 object SPRITE_SWIMMER, 15, 71, STAY, LEFT, 7, OPP_SWIMMER, 15 - object SPRITE_FISHER2, 14, 56, STAY, LEFT, 8, OPP_FISHER, 8 - object SPRITE_FISHER2, 17, 57, STAY, RIGHT, 9, OPP_FISHER, 10 + object SPRITE_FISHER, 14, 56, STAY, LEFT, 8, OPP_FISHER, 8 + object SPRITE_FISHER, 17, 57, STAY, RIGHT, 9, OPP_FISHER, 10 diff --git a/data/maps/objects/Route24.asm b/data/maps/objects/Route24.asm index 6eefd3d3..08eb3849 100755 --- a/data/maps/objects/Route24.asm +++ b/data/maps/objects/Route24.asm @@ -6,11 +6,11 @@ Route24_Object: db 0 ; signs db 8 ; objects - object SPRITE_BLACK_HAIR_BOY_1, 11, 15, STAY, LEFT, 1, OPP_ROCKET, 6 - object SPRITE_BLACK_HAIR_BOY_1, 5, 20, STAY, UP, 2, OPP_JR_TRAINER_M, 2 - object SPRITE_BLACK_HAIR_BOY_1, 11, 19, STAY, LEFT, 3, OPP_JR_TRAINER_M, 3 - object SPRITE_LASS, 10, 22, STAY, RIGHT, 4, OPP_LASS, 7 - object SPRITE_BUG_CATCHER, 11, 25, STAY, LEFT, 5, OPP_YOUNGSTER, 4 - object SPRITE_LASS, 10, 28, STAY, RIGHT, 6, OPP_LASS, 8 - object SPRITE_BUG_CATCHER, 11, 31, STAY, LEFT, 7, OPP_BUG_CATCHER, 9 - object SPRITE_BALL, 10, 5, STAY, NONE, 8, TM_THUNDER_WAVE + object SPRITE_COOLTRAINER_M, 11, 15, STAY, LEFT, 1, OPP_ROCKET, 6 + object SPRITE_COOLTRAINER_M, 5, 20, STAY, UP, 2, OPP_JR_TRAINER_M, 2 + object SPRITE_COOLTRAINER_M, 11, 19, STAY, LEFT, 3, OPP_JR_TRAINER_M, 3 + object SPRITE_COOLTRAINER_F, 10, 22, STAY, RIGHT, 4, OPP_LASS, 7 + object SPRITE_YOUNGSTER, 11, 25, STAY, LEFT, 5, OPP_YOUNGSTER, 4 + object SPRITE_COOLTRAINER_F, 10, 28, STAY, RIGHT, 6, OPP_LASS, 8 + object SPRITE_YOUNGSTER, 11, 31, STAY, LEFT, 7, OPP_BUG_CATCHER, 9 + object SPRITE_POKE_BALL, 10, 5, STAY, NONE, 8, TM_THUNDER_WAVE diff --git a/data/maps/objects/Route25.asm b/data/maps/objects/Route25.asm index 1d2ebc1b..cafcccf5 100755 --- a/data/maps/objects/Route25.asm +++ b/data/maps/objects/Route25.asm @@ -8,16 +8,16 @@ Route25_Object: sign 43, 3, 11 ; Route25Text11 db 10 ; objects - object SPRITE_BUG_CATCHER, 14, 2, STAY, DOWN, 1, OPP_YOUNGSTER, 5 - object SPRITE_BUG_CATCHER, 18, 5, STAY, UP, 2, OPP_YOUNGSTER, 6 - object SPRITE_BLACK_HAIR_BOY_1, 24, 4, STAY, DOWN, 3, OPP_JR_TRAINER_M, 2 - object SPRITE_LASS, 18, 8, STAY, RIGHT, 4, OPP_LASS, 9 - object SPRITE_BUG_CATCHER, 32, 3, STAY, LEFT, 5, OPP_YOUNGSTER, 7 - object SPRITE_LASS, 37, 4, STAY, DOWN, 6, OPP_LASS, 10 + object SPRITE_YOUNGSTER, 14, 2, STAY, DOWN, 1, OPP_YOUNGSTER, 5 + object SPRITE_YOUNGSTER, 18, 5, STAY, UP, 2, OPP_YOUNGSTER, 6 + object SPRITE_COOLTRAINER_M, 24, 4, STAY, DOWN, 3, OPP_JR_TRAINER_M, 2 + object SPRITE_COOLTRAINER_F, 18, 8, STAY, RIGHT, 4, OPP_LASS, 9 + object SPRITE_YOUNGSTER, 32, 3, STAY, LEFT, 5, OPP_YOUNGSTER, 7 + object SPRITE_COOLTRAINER_F, 37, 4, STAY, DOWN, 6, OPP_LASS, 10 object SPRITE_HIKER, 8, 4, STAY, RIGHT, 7, OPP_HIKER, 2 object SPRITE_HIKER, 23, 9, STAY, UP, 8, OPP_HIKER, 3 object SPRITE_HIKER, 13, 7, STAY, RIGHT, 9, OPP_HIKER, 4 - object SPRITE_BALL, 22, 2, STAY, NONE, 10, TM_SEISMIC_TOSS + object SPRITE_POKE_BALL, 22, 2, STAY, NONE, 10, TM_SEISMIC_TOSS ; warp-to warp_to 45, 3, ROUTE_25_WIDTH ; BILLS_HOUSE diff --git a/data/maps/objects/Route2Gate.asm b/data/maps/objects/Route2Gate.asm index 6f045d62..2243a83c 100755 --- a/data/maps/objects/Route2Gate.asm +++ b/data/maps/objects/Route2Gate.asm @@ -10,8 +10,8 @@ Route2Gate_Object: db 0 ; signs db 2 ; objects - object SPRITE_OAK_AIDE, 1, 4, STAY, LEFT, 1 ; person - object SPRITE_BUG_CATCHER, 5, 4, WALK, 2, 2 ; person + object SPRITE_SCIENTIST, 1, 4, STAY, LEFT, 1 ; person + object SPRITE_YOUNGSTER, 5, 4, WALK, 2, 2 ; person ; warp-to warp_to 4, 0, ROUTE_2_GATE_WIDTH diff --git a/data/maps/objects/Route2TradeHouse.asm b/data/maps/objects/Route2TradeHouse.asm index d55f0259..2a345d47 100755 --- a/data/maps/objects/Route2TradeHouse.asm +++ b/data/maps/objects/Route2TradeHouse.asm @@ -8,8 +8,8 @@ Route2TradeHouse_Object: db 0 ; signs db 2 ; objects - object SPRITE_OAK_AIDE, 2, 4, STAY, RIGHT, 1 ; person - object SPRITE_GAMEBOY_KID_COPY, 4, 1, STAY, DOWN, 2 ; person + object SPRITE_SCIENTIST, 2, 4, STAY, RIGHT, 1 ; person + object SPRITE_GAMEBOY_KID, 4, 1, STAY, DOWN, 2 ; person ; warp-to warp_to 2, 7, ROUTE_2_TRADE_HOUSE_WIDTH diff --git a/data/maps/objects/Route3.asm b/data/maps/objects/Route3.asm index 372ea6cf..d495114a 100755 --- a/data/maps/objects/Route3.asm +++ b/data/maps/objects/Route3.asm @@ -7,12 +7,12 @@ Route3_Object: sign 59, 9, 10 ; Route3Text10 db 9 ; objects - object SPRITE_BLACK_HAIR_BOY_2, 57, 11, STAY, NONE, 1 ; person - object SPRITE_BUG_CATCHER, 10, 6, STAY, RIGHT, 2, OPP_BUG_CATCHER, 4 - object SPRITE_BUG_CATCHER, 14, 4, STAY, DOWN, 3, OPP_YOUNGSTER, 1 - object SPRITE_LASS, 16, 9, STAY, LEFT, 4, OPP_LASS, 1 - object SPRITE_BUG_CATCHER, 19, 5, STAY, DOWN, 5, OPP_BUG_CATCHER, 5 - object SPRITE_LASS, 23, 4, STAY, LEFT, 6, OPP_LASS, 2 - object SPRITE_BUG_CATCHER, 22, 9, STAY, LEFT, 7, OPP_YOUNGSTER, 2 - object SPRITE_BUG_CATCHER, 24, 6, STAY, RIGHT, 8, OPP_BUG_CATCHER, 6 - object SPRITE_LASS, 33, 10, STAY, UP, 9, OPP_LASS, 3 + object SPRITE_SUPER_NERD, 57, 11, STAY, NONE, 1 ; person + object SPRITE_YOUNGSTER, 10, 6, STAY, RIGHT, 2, OPP_BUG_CATCHER, 4 + object SPRITE_YOUNGSTER, 14, 4, STAY, DOWN, 3, OPP_YOUNGSTER, 1 + object SPRITE_COOLTRAINER_F, 16, 9, STAY, LEFT, 4, OPP_LASS, 1 + object SPRITE_YOUNGSTER, 19, 5, STAY, DOWN, 5, OPP_BUG_CATCHER, 5 + object SPRITE_COOLTRAINER_F, 23, 4, STAY, LEFT, 6, OPP_LASS, 2 + object SPRITE_YOUNGSTER, 22, 9, STAY, LEFT, 7, OPP_YOUNGSTER, 2 + object SPRITE_YOUNGSTER, 24, 6, STAY, RIGHT, 8, OPP_BUG_CATCHER, 6 + object SPRITE_COOLTRAINER_F, 33, 10, STAY, UP, 9, OPP_LASS, 3 diff --git a/data/maps/objects/Route4.asm b/data/maps/objects/Route4.asm index 0c34f6db..6683e14d 100755 --- a/data/maps/objects/Route4.asm +++ b/data/maps/objects/Route4.asm @@ -12,9 +12,9 @@ Route4_Object: sign 27, 7, 6 ; Route4Text6 db 3 ; objects - object SPRITE_LASS, 9, 8, WALK, 0, 1 ; person - object SPRITE_LASS, 63, 3, STAY, RIGHT, 2, OPP_LASS, 4 - object SPRITE_BALL, 57, 3, STAY, NONE, 3, TM_WHIRLWIND + object SPRITE_COOLTRAINER_F, 9, 8, WALK, 0, 1 ; person + object SPRITE_COOLTRAINER_F, 63, 3, STAY, RIGHT, 2, OPP_LASS, 4 + object SPRITE_POKE_BALL, 57, 3, STAY, NONE, 3, TM_WHIRLWIND ; warp-to warp_to 11, 5, ROUTE_4_WIDTH ; MT_MOON_POKECENTER diff --git a/data/maps/objects/Route6.asm b/data/maps/objects/Route6.asm index fc2d7e24..fc0eb35b 100755 --- a/data/maps/objects/Route6.asm +++ b/data/maps/objects/Route6.asm @@ -11,12 +11,12 @@ Route6_Object: sign 19, 15, 7 ; Route6Text7 db 6 ; objects - object SPRITE_BLACK_HAIR_BOY_1, 10, 21, STAY, RIGHT, 1, OPP_JR_TRAINER_M, 4 - object SPRITE_LASS, 11, 21, STAY, LEFT, 2, OPP_JR_TRAINER_F, 2 - object SPRITE_BUG_CATCHER, 0, 15, STAY, RIGHT, 3, OPP_BUG_CATCHER, 10 - object SPRITE_BLACK_HAIR_BOY_1, 11, 31, STAY, LEFT, 4, OPP_JR_TRAINER_M, 5 - object SPRITE_LASS, 11, 30, STAY, LEFT, 5, OPP_JR_TRAINER_F, 3 - object SPRITE_BUG_CATCHER, 19, 26, STAY, LEFT, 6, OPP_BUG_CATCHER, 11 + object SPRITE_COOLTRAINER_M, 10, 21, STAY, RIGHT, 1, OPP_JR_TRAINER_M, 4 + object SPRITE_COOLTRAINER_F, 11, 21, STAY, LEFT, 2, OPP_JR_TRAINER_F, 2 + object SPRITE_YOUNGSTER, 0, 15, STAY, RIGHT, 3, OPP_BUG_CATCHER, 10 + object SPRITE_COOLTRAINER_M, 11, 31, STAY, LEFT, 4, OPP_JR_TRAINER_M, 5 + object SPRITE_COOLTRAINER_F, 11, 30, STAY, LEFT, 5, OPP_JR_TRAINER_F, 3 + object SPRITE_YOUNGSTER, 19, 26, STAY, LEFT, 6, OPP_BUG_CATCHER, 11 ; warp-to warp_to 9, 1, ROUTE_6_WIDTH ; ROUTE_6_GATE diff --git a/data/maps/objects/Route8.asm b/data/maps/objects/Route8.asm index 137d70a0..5b0bc8fb 100755 --- a/data/maps/objects/Route8.asm +++ b/data/maps/objects/Route8.asm @@ -12,15 +12,15 @@ Route8_Object: sign 17, 3, 10 ; Route8Text10 db 9 ; objects - object SPRITE_BLACK_HAIR_BOY_2, 8, 5, STAY, RIGHT, 1, OPP_SUPER_NERD, 3 + object SPRITE_SUPER_NERD, 8, 5, STAY, RIGHT, 1, OPP_SUPER_NERD, 3 object SPRITE_GAMBLER, 13, 9, STAY, UP, 2, OPP_GAMBLER, 5 - object SPRITE_BLACK_HAIR_BOY_2, 42, 6, STAY, UP, 3, OPP_SUPER_NERD, 4 - object SPRITE_LASS, 26, 3, STAY, LEFT, 4, OPP_LASS, 13 - object SPRITE_BLACK_HAIR_BOY_2, 26, 4, STAY, RIGHT, 5, OPP_SUPER_NERD, 5 - object SPRITE_LASS, 26, 5, STAY, LEFT, 6, OPP_LASS, 14 - object SPRITE_LASS, 26, 6, STAY, RIGHT, 7, OPP_LASS, 15 + object SPRITE_SUPER_NERD, 42, 6, STAY, UP, 3, OPP_SUPER_NERD, 4 + object SPRITE_COOLTRAINER_F, 26, 3, STAY, LEFT, 4, OPP_LASS, 13 + object SPRITE_SUPER_NERD, 26, 4, STAY, RIGHT, 5, OPP_SUPER_NERD, 5 + object SPRITE_COOLTRAINER_F, 26, 5, STAY, LEFT, 6, OPP_LASS, 14 + object SPRITE_COOLTRAINER_F, 26, 6, STAY, RIGHT, 7, OPP_LASS, 15 object SPRITE_GAMBLER, 46, 13, STAY, DOWN, 8, OPP_GAMBLER, 7 - object SPRITE_LASS, 51, 12, STAY, LEFT, 9, OPP_LASS, 16 + object SPRITE_COOLTRAINER_F, 51, 12, STAY, LEFT, 9, OPP_LASS, 16 ; warp-to warp_to 1, 9, ROUTE_8_WIDTH ; ROUTE_8_GATE diff --git a/data/maps/objects/Route9.asm b/data/maps/objects/Route9.asm index 50fac190..756fc8ad 100755 --- a/data/maps/objects/Route9.asm +++ b/data/maps/objects/Route9.asm @@ -7,13 +7,13 @@ Route9_Object: sign 25, 7, 11 ; Route9Text11 db 10 ; objects - object SPRITE_LASS, 13, 10, STAY, LEFT, 1, OPP_JR_TRAINER_F, 5 - object SPRITE_BLACK_HAIR_BOY_1, 24, 7, STAY, LEFT, 2, OPP_JR_TRAINER_M, 7 - object SPRITE_BLACK_HAIR_BOY_1, 31, 7, STAY, RIGHT, 3, OPP_JR_TRAINER_M, 8 - object SPRITE_LASS, 48, 8, STAY, RIGHT, 4, OPP_JR_TRAINER_F, 6 + object SPRITE_COOLTRAINER_F, 13, 10, STAY, LEFT, 1, OPP_JR_TRAINER_F, 5 + object SPRITE_COOLTRAINER_M, 24, 7, STAY, LEFT, 2, OPP_JR_TRAINER_M, 7 + object SPRITE_COOLTRAINER_M, 31, 7, STAY, RIGHT, 3, OPP_JR_TRAINER_M, 8 + object SPRITE_COOLTRAINER_F, 48, 8, STAY, RIGHT, 4, OPP_JR_TRAINER_F, 6 object SPRITE_HIKER, 16, 15, STAY, LEFT, 5, OPP_HIKER, 11 object SPRITE_HIKER, 43, 3, STAY, LEFT, 6, OPP_HIKER, 6 - object SPRITE_BUG_CATCHER, 22, 2, STAY, DOWN, 7, OPP_BUG_CATCHER, 13 + object SPRITE_YOUNGSTER, 22, 2, STAY, DOWN, 7, OPP_BUG_CATCHER, 13 object SPRITE_HIKER, 45, 15, STAY, RIGHT, 8, OPP_HIKER, 5 - object SPRITE_BUG_CATCHER, 40, 8, STAY, RIGHT, 9, OPP_BUG_CATCHER, 14 - object SPRITE_BALL, 10, 15, STAY, NONE, 10, TM_TELEPORT + object SPRITE_YOUNGSTER, 40, 8, STAY, RIGHT, 9, OPP_BUG_CATCHER, 14 + object SPRITE_POKE_BALL, 10, 15, STAY, NONE, 10, TM_TELEPORT diff --git a/data/maps/objects/SSAnne1FRooms.asm b/data/maps/objects/SSAnne1FRooms.asm index 1b7813a1..3a637fb8 100755 --- a/data/maps/objects/SSAnne1FRooms.asm +++ b/data/maps/objects/SSAnne1FRooms.asm @@ -14,14 +14,14 @@ SSAnne1FRooms_Object: db 11 ; objects object SPRITE_GENTLEMAN, 2, 3, STAY, LEFT, 1, OPP_GENTLEMAN, 1 object SPRITE_GENTLEMAN, 11, 4, STAY, UP, 2, OPP_GENTLEMAN, 2 - object SPRITE_BUG_CATCHER, 11, 14, STAY, UP, 3, OPP_YOUNGSTER, 8 - object SPRITE_LASS, 13, 11, STAY, LEFT, 4, OPP_LASS, 11 + object SPRITE_YOUNGSTER, 11, 14, STAY, UP, 3, OPP_YOUNGSTER, 8 + object SPRITE_COOLTRAINER_F, 13, 11, STAY, LEFT, 4, OPP_LASS, 11 object SPRITE_GIRL, 22, 3, WALK, 1, 5 ; person - object SPRITE_FAT_BALD_GUY, 0, 14, STAY, NONE, 6 ; person + object SPRITE_MIDDLE_AGED_MAN, 0, 14, STAY, NONE, 6 ; person object SPRITE_LITTLE_GIRL, 2, 11, STAY, DOWN, 7 ; person - object SPRITE_CLEFAIRY, 3, 11, STAY, DOWN, 8 ; person + object SPRITE_FAIRY, 3, 11, STAY, DOWN, 8 ; person object SPRITE_GIRL, 10, 13, STAY, RIGHT, 9 ; person - object SPRITE_BALL, 12, 15, STAY, NONE, 10, TM_BODY_SLAM + object SPRITE_POKE_BALL, 12, 15, STAY, NONE, 10, TM_BODY_SLAM object SPRITE_GENTLEMAN, 21, 13, WALK, 2, 11 ; person ; warp-to diff --git a/data/maps/objects/SSAnne2F.asm b/data/maps/objects/SSAnne2F.asm index 6abd5ac4..9a08b781 100755 --- a/data/maps/objects/SSAnne2F.asm +++ b/data/maps/objects/SSAnne2F.asm @@ -16,7 +16,7 @@ SSAnne2F_Object: db 2 ; objects object SPRITE_WAITER, 3, 7, WALK, 1, 1 ; person - object SPRITE_BLUE, 36, 4, STAY, DOWN, 2, OPP_SONY1, 1 + object SPRITE_BLUE, 36, 4, STAY, DOWN, 2, OPP_RIVAL1, 1 ; warp-to warp_to 9, 11, SS_ANNE_2F_WIDTH ; SS_ANNE_2F_ROOMS diff --git a/data/maps/objects/SSAnne2FRooms.asm b/data/maps/objects/SSAnne2FRooms.asm index ebb053a8..454b4c6b 100755 --- a/data/maps/objects/SSAnne2FRooms.asm +++ b/data/maps/objects/SSAnne2FRooms.asm @@ -19,18 +19,18 @@ SSAnne2FRooms_Object: db 13 ; objects object SPRITE_GENTLEMAN, 10, 2, STAY, RIGHT, 1, OPP_GENTLEMAN, 3 - object SPRITE_FISHER2, 13, 4, STAY, LEFT, 2, OPP_FISHER, 1 + object SPRITE_FISHER, 13, 4, STAY, LEFT, 2, OPP_FISHER, 1 object SPRITE_GENTLEMAN, 0, 14, STAY, RIGHT, 3, OPP_GENTLEMAN, 5 - object SPRITE_LASS, 2, 11, STAY, DOWN, 4, OPP_LASS, 12 + object SPRITE_COOLTRAINER_F, 2, 11, STAY, DOWN, 4, OPP_LASS, 12 object SPRITE_GENTLEMAN, 1, 2, STAY, DOWN, 5 ; person - object SPRITE_BALL, 12, 1, STAY, NONE, 6, MAX_ETHER + object SPRITE_POKE_BALL, 12, 1, STAY, NONE, 6, MAX_ETHER object SPRITE_GENTLEMAN, 21, 2, STAY, DOWN, 7 ; person - object SPRITE_OLD_PERSON, 22, 1, STAY, DOWN, 8 ; person - object SPRITE_BALL, 0, 12, STAY, NONE, 9, RARE_CANDY + object SPRITE_GRAMPS, 22, 1, STAY, DOWN, 8 ; person + object SPRITE_POKE_BALL, 0, 12, STAY, NONE, 9, RARE_CANDY object SPRITE_GENTLEMAN, 12, 12, STAY, DOWN, 10 ; person - object SPRITE_YOUNG_BOY, 11, 14, STAY, NONE, 11 ; person + object SPRITE_LITTLE_BOY, 11, 14, STAY, NONE, 11 ; person object SPRITE_BRUNETTE_GIRL, 22, 12, STAY, LEFT, 12 ; person - object SPRITE_FOULARD_WOMAN, 20, 12, STAY, RIGHT, 13 ; person + object SPRITE_BEAUTY, 20, 12, STAY, RIGHT, 13 ; person ; warp-to warp_to 2, 5, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F diff --git a/data/maps/objects/SSAnneB1FRooms.asm b/data/maps/objects/SSAnneB1FRooms.asm index 5a03cafd..0f57dd6b 100755 --- a/data/maps/objects/SSAnneB1FRooms.asm +++ b/data/maps/objects/SSAnneB1FRooms.asm @@ -21,12 +21,12 @@ SSAnneB1FRooms_Object: object SPRITE_SAILOR, 12, 3, STAY, LEFT, 3, OPP_SAILOR, 5 object SPRITE_SAILOR, 22, 2, STAY, DOWN, 4, OPP_SAILOR, 6 object SPRITE_SAILOR, 0, 2, STAY, RIGHT, 5, OPP_SAILOR, 7 - object SPRITE_FISHER2, 0, 4, STAY, RIGHT, 6, OPP_FISHER, 2 - object SPRITE_BLACK_HAIR_BOY_2, 10, 13, STAY, RIGHT, 7 ; person - object SPRITE_SLOWBRO, 11, 12, STAY, NONE, 8 ; person - object SPRITE_BALL, 20, 2, STAY, NONE, 9, ETHER - object SPRITE_BALL, 10, 2, STAY, NONE, 10, TM_REST - object SPRITE_BALL, 12, 11, STAY, NONE, 11, MAX_POTION + object SPRITE_FISHER, 0, 4, STAY, RIGHT, 6, OPP_FISHER, 2 + object SPRITE_SUPER_NERD, 10, 13, STAY, RIGHT, 7 ; person + object SPRITE_MONSTER, 11, 12, STAY, NONE, 8 ; person + object SPRITE_POKE_BALL, 20, 2, STAY, NONE, 9, ETHER + object SPRITE_POKE_BALL, 10, 2, STAY, NONE, 10, TM_REST + object SPRITE_POKE_BALL, 12, 11, STAY, NONE, 11, MAX_POTION ; warp-to warp_to 2, 5, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F diff --git a/data/maps/objects/SSAnneBow.asm b/data/maps/objects/SSAnneBow.asm index 8873c8f8..ee434a79 100755 --- a/data/maps/objects/SSAnneBow.asm +++ b/data/maps/objects/SSAnneBow.asm @@ -8,9 +8,9 @@ SSAnneBow_Object: db 0 ; signs db 5 ; objects - object SPRITE_BLACK_HAIR_BOY_2, 5, 2, STAY, UP, 1 ; person + object SPRITE_SUPER_NERD, 5, 2, STAY, UP, 1 ; person object SPRITE_SAILOR, 4, 9, STAY, NONE, 2 ; person - object SPRITE_BLACK_HAIR_BOY_1, 7, 11, STAY, NONE, 3 ; person + object SPRITE_COOLTRAINER_M, 7, 11, STAY, NONE, 3 ; person object SPRITE_SAILOR, 4, 4, STAY, DOWN, 4, OPP_SAILOR, 1 object SPRITE_SAILOR, 10, 8, STAY, UP, 5, OPP_SAILOR, 2 diff --git a/data/maps/objects/SSAnneCaptainsRoom.asm b/data/maps/objects/SSAnneCaptainsRoom.asm index 545656cc..9e6bca22 100755 --- a/data/maps/objects/SSAnneCaptainsRoom.asm +++ b/data/maps/objects/SSAnneCaptainsRoom.asm @@ -9,7 +9,7 @@ SSAnneCaptainsRoom_Object: sign 1, 2, 3 ; SSAnne7Text3 db 1 ; objects - object SPRITE_SS_CAPTAIN, 4, 2, STAY, UP, 1 ; person + object SPRITE_CAPTAIN, 4, 2, STAY, UP, 1 ; person ; warp-to warp_to 0, 7, SS_ANNE_CAPTAINS_ROOM_WIDTH ; SS_ANNE_2F diff --git a/data/maps/objects/SafariZoneCenter.asm b/data/maps/objects/SafariZoneCenter.asm index e54cec74..d94e78f3 100755 --- a/data/maps/objects/SafariZoneCenter.asm +++ b/data/maps/objects/SafariZoneCenter.asm @@ -17,7 +17,7 @@ SafariZoneCenter_Object: sign 14, 22, 3 ; SafariZoneCenterText3 db 1 ; objects - object SPRITE_BALL, 14, 10, STAY, NONE, 1, NUGGET + object SPRITE_POKE_BALL, 14, 10, STAY, NONE, 1, NUGGET ; warp-to warp_to 14, 25, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_GATE diff --git a/data/maps/objects/SafariZoneCenterRestHouse.asm b/data/maps/objects/SafariZoneCenterRestHouse.asm index 9eda9970..d681696e 100755 --- a/data/maps/objects/SafariZoneCenterRestHouse.asm +++ b/data/maps/objects/SafariZoneCenterRestHouse.asm @@ -9,7 +9,7 @@ SafariZoneCenterRestHouse_Object: db 2 ; objects object SPRITE_GIRL, 3, 2, STAY, DOWN, 1 ; person - object SPRITE_OAK_AIDE, 1, 4, WALK, 1, 2 ; person + object SPRITE_SCIENTIST, 1, 4, WALK, 1, 2 ; person ; warp-to warp_to 2, 7, SAFARI_ZONE_CENTER_REST_HOUSE_WIDTH ; SAFARI_ZONE_CENTER diff --git a/data/maps/objects/SafariZoneEast.asm b/data/maps/objects/SafariZoneEast.asm index 31d8861b..fa04087f 100755 --- a/data/maps/objects/SafariZoneEast.asm +++ b/data/maps/objects/SafariZoneEast.asm @@ -14,10 +14,10 @@ SafariZoneEast_Object: sign 5, 23, 7 ; SafariZoneEastText7 db 4 ; objects - object SPRITE_BALL, 21, 10, STAY, NONE, 1, FULL_RESTORE - object SPRITE_BALL, 3, 7, STAY, NONE, 2, MAX_POTION - object SPRITE_BALL, 20, 13, STAY, NONE, 3, CARBOS - object SPRITE_BALL, 15, 12, STAY, NONE, 4, TM_EGG_BOMB + object SPRITE_POKE_BALL, 21, 10, STAY, NONE, 1, FULL_RESTORE + object SPRITE_POKE_BALL, 3, 7, STAY, NONE, 2, MAX_POTION + object SPRITE_POKE_BALL, 20, 13, STAY, NONE, 3, CARBOS + object SPRITE_POKE_BALL, 15, 12, STAY, NONE, 4, TM_EGG_BOMB ; warp-to warp_to 0, 4, SAFARI_ZONE_EAST_WIDTH ; SAFARI_ZONE_NORTH diff --git a/data/maps/objects/SafariZoneEastRestHouse.asm b/data/maps/objects/SafariZoneEastRestHouse.asm index e7c68343..d478a902 100755 --- a/data/maps/objects/SafariZoneEastRestHouse.asm +++ b/data/maps/objects/SafariZoneEastRestHouse.asm @@ -8,9 +8,9 @@ SafariZoneEastRestHouse_Object: db 0 ; signs db 3 ; objects - object SPRITE_OAK_AIDE, 1, 3, WALK, 1, 1 ; person + object SPRITE_SCIENTIST, 1, 3, WALK, 1, 1 ; person object SPRITE_ROCKER, 4, 2, STAY, NONE, 2 ; person - object SPRITE_LAPRAS_GIVER, 5, 2, STAY, NONE, 3 ; person + object SPRITE_SILPH_WORKER, 5, 2, STAY, NONE, 3 ; person ; warp-to warp_to 2, 7, SAFARI_ZONE_EAST_REST_HOUSE_WIDTH ; SAFARI_ZONE_EAST diff --git a/data/maps/objects/SafariZoneGate.asm b/data/maps/objects/SafariZoneGate.asm index 05074a90..6cfe256c 100755 --- a/data/maps/objects/SafariZoneGate.asm +++ b/data/maps/objects/SafariZoneGate.asm @@ -10,8 +10,8 @@ SafariZoneGate_Object: db 0 ; signs db 2 ; objects - object SPRITE_WHITE_PLAYER, 6, 2, STAY, LEFT, 1 ; person - object SPRITE_WHITE_PLAYER, 1, 4, STAY, RIGHT, 2 ; person + object SPRITE_SAFARI_ZONE_WORKER, 6, 2, STAY, LEFT, 1 ; person + object SPRITE_SAFARI_ZONE_WORKER, 1, 4, STAY, RIGHT, 2 ; person ; warp-to warp_to 3, 5, SAFARI_ZONE_GATE_WIDTH diff --git a/data/maps/objects/SafariZoneNorth.asm b/data/maps/objects/SafariZoneNorth.asm index 75c7d164..06563243 100755 --- a/data/maps/objects/SafariZoneNorth.asm +++ b/data/maps/objects/SafariZoneNorth.asm @@ -20,8 +20,8 @@ SafariZoneNorth_Object: sign 26, 28, 7 ; SafariZoneNorthText7 db 2 ; objects - object SPRITE_BALL, 25, 1, STAY, NONE, 1, PROTEIN - object SPRITE_BALL, 19, 7, STAY, NONE, 2, TM_SKULL_BASH + object SPRITE_POKE_BALL, 25, 1, STAY, NONE, 1, PROTEIN + object SPRITE_POKE_BALL, 19, 7, STAY, NONE, 2, TM_SKULL_BASH ; warp-to warp_to 2, 35, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_WEST diff --git a/data/maps/objects/SafariZoneNorthRestHouse.asm b/data/maps/objects/SafariZoneNorthRestHouse.asm index 34b3ab4f..6eb9aac9 100755 --- a/data/maps/objects/SafariZoneNorthRestHouse.asm +++ b/data/maps/objects/SafariZoneNorthRestHouse.asm @@ -8,8 +8,8 @@ SafariZoneNorthRestHouse_Object: db 0 ; signs db 3 ; objects - object SPRITE_OAK_AIDE, 6, 3, WALK, 2, 1 ; person - object SPRITE_WHITE_PLAYER, 3, 4, STAY, NONE, 2 ; person + object SPRITE_SCIENTIST, 6, 3, WALK, 2, 1 ; person + object SPRITE_SAFARI_ZONE_WORKER, 3, 4, STAY, NONE, 2 ; person object SPRITE_GENTLEMAN, 1, 5, WALK, 1, 3 ; person ; warp-to diff --git a/data/maps/objects/SafariZoneSecretHouse.asm b/data/maps/objects/SafariZoneSecretHouse.asm index 2a5fc22d..ea326e67 100755 --- a/data/maps/objects/SafariZoneSecretHouse.asm +++ b/data/maps/objects/SafariZoneSecretHouse.asm @@ -8,7 +8,7 @@ SafariZoneSecretHouse_Object: db 0 ; signs db 1 ; objects - object SPRITE_FISHER, 3, 3, STAY, DOWN, 1 ; person + object SPRITE_FISHING_GURU, 3, 3, STAY, DOWN, 1 ; person ; warp-to warp_to 2, 7, SAFARI_ZONE_SECRET_HOUSE_WIDTH ; SAFARI_ZONE_WEST diff --git a/data/maps/objects/SafariZoneWest.asm b/data/maps/objects/SafariZoneWest.asm index 492dd3e2..2e0692c1 100755 --- a/data/maps/objects/SafariZoneWest.asm +++ b/data/maps/objects/SafariZoneWest.asm @@ -18,10 +18,10 @@ SafariZoneWest_Object: sign 24, 22, 8 ; SafariZoneWestText8 db 4 ; objects - object SPRITE_BALL, 8, 20, STAY, NONE, 1, MAX_POTION - object SPRITE_BALL, 9, 7, STAY, NONE, 2, TM_DOUBLE_TEAM - object SPRITE_BALL, 18, 18, STAY, NONE, 3, MAX_REVIVE - object SPRITE_BALL, 19, 7, STAY, NONE, 4, GOLD_TEETH + object SPRITE_POKE_BALL, 8, 20, STAY, NONE, 1, MAX_POTION + object SPRITE_POKE_BALL, 9, 7, STAY, NONE, 2, TM_DOUBLE_TEAM + object SPRITE_POKE_BALL, 18, 18, STAY, NONE, 3, MAX_REVIVE + object SPRITE_POKE_BALL, 19, 7, STAY, NONE, 4, GOLD_TEETH ; warp-to warp_to 20, 0, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_NORTH diff --git a/data/maps/objects/SafariZoneWestRestHouse.asm b/data/maps/objects/SafariZoneWestRestHouse.asm index 9f1bc0ed..0338667f 100755 --- a/data/maps/objects/SafariZoneWestRestHouse.asm +++ b/data/maps/objects/SafariZoneWestRestHouse.asm @@ -8,8 +8,8 @@ SafariZoneWestRestHouse_Object: db 0 ; signs db 3 ; objects - object SPRITE_OAK_AIDE, 4, 4, WALK, 0, 1 ; person - object SPRITE_BLACK_HAIR_BOY_1, 0, 2, STAY, RIGHT, 2 ; person + object SPRITE_SCIENTIST, 4, 4, WALK, 0, 1 ; person + object SPRITE_COOLTRAINER_M, 0, 2, STAY, RIGHT, 2 ; person object SPRITE_ERIKA, 6, 2, STAY, DOWN, 3 ; person ; warp-to diff --git a/data/maps/objects/SaffronCity.asm b/data/maps/objects/SaffronCity.asm index b8d3a9cf..332f13af 100755 --- a/data/maps/objects/SaffronCity.asm +++ b/data/maps/objects/SaffronCity.asm @@ -31,8 +31,8 @@ SaffronCity_Object: object SPRITE_ROCKET, 11, 25, WALK, 2, 5 ; person object SPRITE_ROCKET, 32, 13, WALK, 2, 6 ; person object SPRITE_ROCKET, 18, 30, WALK, 2, 7 ; person - object SPRITE_OAK_AIDE, 8, 14, WALK, 0, 8 ; person - object SPRITE_LAPRAS_GIVER, 23, 23, STAY, NONE, 9 ; person + object SPRITE_SCIENTIST, 8, 14, WALK, 0, 8 ; person + object SPRITE_SILPH_WORKER, 23, 23, STAY, NONE, 9 ; person object SPRITE_ERIKA, 17, 30, WALK, 2, 10 ; person object SPRITE_GENTLEMAN, 30, 12, STAY, DOWN, 11 ; person object SPRITE_BIRD, 31, 12, STAY, DOWN, 12 ; person diff --git a/data/maps/objects/SaffronGym.asm b/data/maps/objects/SaffronGym.asm index 17bf8c0e..54083d60 100755 --- a/data/maps/objects/SaffronGym.asm +++ b/data/maps/objects/SaffronGym.asm @@ -39,14 +39,14 @@ SaffronGym_Object: db 9 ; objects object SPRITE_GIRL, 9, 8, STAY, DOWN, 1, OPP_SABRINA, 1 - object SPRITE_MEDIUM, 10, 1, STAY, DOWN, 2, OPP_CHANNELER, 22 - object SPRITE_BUG_CATCHER, 17, 1, STAY, DOWN, 3, OPP_PSYCHIC_TR, 1 - object SPRITE_MEDIUM, 3, 7, STAY, DOWN, 4, OPP_CHANNELER, 23 - object SPRITE_BUG_CATCHER, 17, 7, STAY, DOWN, 5, OPP_PSYCHIC_TR, 2 - object SPRITE_MEDIUM, 3, 13, STAY, DOWN, 6, OPP_CHANNELER, 24 - object SPRITE_BUG_CATCHER, 17, 13, STAY, DOWN, 7, OPP_PSYCHIC_TR, 3 - object SPRITE_BUG_CATCHER, 3, 1, STAY, DOWN, 8, OPP_PSYCHIC_TR, 4 - object SPRITE_GYM_HELPER, 10, 15, STAY, DOWN, 9 ; person + object SPRITE_CHANNELER, 10, 1, STAY, DOWN, 2, OPP_CHANNELER, 22 + object SPRITE_YOUNGSTER, 17, 1, STAY, DOWN, 3, OPP_PSYCHIC_TR, 1 + object SPRITE_CHANNELER, 3, 7, STAY, DOWN, 4, OPP_CHANNELER, 23 + object SPRITE_YOUNGSTER, 17, 7, STAY, DOWN, 5, OPP_PSYCHIC_TR, 2 + object SPRITE_CHANNELER, 3, 13, STAY, DOWN, 6, OPP_CHANNELER, 24 + object SPRITE_YOUNGSTER, 17, 13, STAY, DOWN, 7, OPP_PSYCHIC_TR, 3 + object SPRITE_YOUNGSTER, 3, 1, STAY, DOWN, 8, OPP_PSYCHIC_TR, 4 + object SPRITE_GYM_GUIDE, 10, 15, STAY, DOWN, 9 ; person ; warp-to warp_to 8, 17, SAFFRON_GYM_WIDTH diff --git a/data/maps/objects/SaffronMart.asm b/data/maps/objects/SaffronMart.asm index 440fa7bf..5ad06c75 100755 --- a/data/maps/objects/SaffronMart.asm +++ b/data/maps/objects/SaffronMart.asm @@ -8,9 +8,9 @@ SaffronMart_Object: db 0 ; signs db 3 ; objects - object SPRITE_MART_GUY, 0, 5, STAY, RIGHT, 1 ; person - object SPRITE_BLACK_HAIR_BOY_2, 4, 2, STAY, NONE, 2 ; person - object SPRITE_LASS, 6, 5, WALK, 0, 3 ; person + object SPRITE_CLERK, 0, 5, STAY, RIGHT, 1 ; person + object SPRITE_SUPER_NERD, 4, 2, STAY, NONE, 2 ; person + object SPRITE_COOLTRAINER_F, 6, 5, WALK, 0, 3 ; person ; warp-to warp_to 3, 7, SAFFRON_MART_WIDTH diff --git a/data/maps/objects/SaffronPidgeyHouse.asm b/data/maps/objects/SaffronPidgeyHouse.asm index b108df61..b0b52166 100755 --- a/data/maps/objects/SaffronPidgeyHouse.asm +++ b/data/maps/objects/SaffronPidgeyHouse.asm @@ -10,8 +10,8 @@ SaffronPidgeyHouse_Object: db 4 ; objects object SPRITE_BRUNETTE_GIRL, 2, 3, STAY, RIGHT, 1 ; person object SPRITE_BIRD, 0, 4, WALK, 1, 2 ; person - object SPRITE_BUG_CATCHER, 4, 1, STAY, DOWN, 3 ; person - object SPRITE_PAPER_SHEET, 3, 3, STAY, NONE, 4 ; person + object SPRITE_YOUNGSTER, 4, 1, STAY, DOWN, 3 ; person + object SPRITE_PAPER, 3, 3, STAY, NONE, 4 ; person ; warp-to warp_to 2, 7, SAFFRON_PIDGEY_HOUSE_WIDTH diff --git a/data/maps/objects/SaffronPokecenter.asm b/data/maps/objects/SaffronPokecenter.asm index 6921aab6..8396902b 100755 --- a/data/maps/objects/SaffronPokecenter.asm +++ b/data/maps/objects/SaffronPokecenter.asm @@ -9,9 +9,9 @@ SaffronPokecenter_Object: db 4 ; objects object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person - object SPRITE_FOULARD_WOMAN, 5, 5, STAY, NONE, 2 ; person + object SPRITE_BEAUTY, 5, 5, STAY, NONE, 2 ; person object SPRITE_GENTLEMAN, 8, 3, STAY, DOWN, 3 ; person - object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person + object SPRITE_LINK_RECEPTIONIST, 11, 2, STAY, DOWN, 4 ; person ; warp-to warp_to 3, 7, SAFFRON_POKECENTER_WIDTH diff --git a/data/maps/objects/SilphCo10F.asm b/data/maps/objects/SilphCo10F.asm index 0bea3a43..770601ae 100755 --- a/data/maps/objects/SilphCo10F.asm +++ b/data/maps/objects/SilphCo10F.asm @@ -13,11 +13,11 @@ SilphCo10F_Object: db 6 ; objects object SPRITE_ROCKET, 1, 9, STAY, RIGHT, 1, OPP_ROCKET, 39 - object SPRITE_OAK_AIDE, 10, 2, STAY, LEFT, 2, OPP_SCIENTIST, 11 + object SPRITE_SCIENTIST, 10, 2, STAY, LEFT, 2, OPP_SCIENTIST, 11 object SPRITE_ERIKA, 9, 15, WALK, 0, 3 ; person - object SPRITE_BALL, 2, 12, STAY, NONE, 4, TM_EARTHQUAKE - object SPRITE_BALL, 4, 14, STAY, NONE, 5, RARE_CANDY - object SPRITE_BALL, 5, 11, STAY, NONE, 6, CARBOS + object SPRITE_POKE_BALL, 2, 12, STAY, NONE, 4, TM_EARTHQUAKE + object SPRITE_POKE_BALL, 4, 14, STAY, NONE, 5, RARE_CANDY + object SPRITE_POKE_BALL, 5, 11, STAY, NONE, 6, CARBOS ; warp-to warp_to 8, 0, SILPH_CO_10F_WIDTH ; SILPH_CO_9F diff --git a/data/maps/objects/SilphCo11F.asm b/data/maps/objects/SilphCo11F.asm index 3eda424c..c26d5273 100755 --- a/data/maps/objects/SilphCo11F.asm +++ b/data/maps/objects/SilphCo11F.asm @@ -10,8 +10,8 @@ SilphCo11F_Object: db 0 ; signs db 5 ; objects - object SPRITE_MR_MASTERBALL, 7, 5, STAY, DOWN, 1 ; person - object SPRITE_FOULARD_WOMAN, 10, 5, STAY, DOWN, 2 ; person + object SPRITE_SILPH_PRESIDENT, 7, 5, STAY, DOWN, 1 ; person + object SPRITE_BEAUTY, 10, 5, STAY, DOWN, 2 ; person object SPRITE_GIOVANNI, 6, 9, STAY, DOWN, 3, OPP_GIOVANNI, 2 object SPRITE_ROCKET, 3, 16, STAY, UP, 4, OPP_ROCKET, 41 object SPRITE_ROCKET, 15, 9, STAY, UP, 5, OPP_ROCKET, 40 diff --git a/data/maps/objects/SilphCo1F.asm b/data/maps/objects/SilphCo1F.asm index 8d78fba2..0e0df323 100755 --- a/data/maps/objects/SilphCo1F.asm +++ b/data/maps/objects/SilphCo1F.asm @@ -11,7 +11,7 @@ SilphCo1F_Object: db 0 ; signs db 1 ; objects - object SPRITE_CABLE_CLUB_WOMAN, 4, 2, STAY, DOWN, 1 ; person + object SPRITE_LINK_RECEPTIONIST, 4, 2, STAY, DOWN, 1 ; person ; warp-to warp_to 10, 17, SILPH_CO_1F_WIDTH diff --git a/data/maps/objects/SilphCo2F.asm b/data/maps/objects/SilphCo2F.asm index bc30d78d..c226f4d4 100755 --- a/data/maps/objects/SilphCo2F.asm +++ b/data/maps/objects/SilphCo2F.asm @@ -14,8 +14,8 @@ SilphCo2F_Object: db 5 ; objects object SPRITE_ERIKA, 10, 1, STAY, UP, 1 ; person - object SPRITE_OAK_AIDE, 5, 12, STAY, DOWN, 2, OPP_SCIENTIST, 2 - object SPRITE_OAK_AIDE, 24, 13, STAY, LEFT, 3, OPP_SCIENTIST, 3 + object SPRITE_SCIENTIST, 5, 12, STAY, DOWN, 2, OPP_SCIENTIST, 2 + object SPRITE_SCIENTIST, 24, 13, STAY, LEFT, 3, OPP_SCIENTIST, 3 object SPRITE_ROCKET, 16, 11, STAY, UP, 4, OPP_ROCKET, 23 object SPRITE_ROCKET, 24, 7, STAY, UP, 5, OPP_ROCKET, 24 diff --git a/data/maps/objects/SilphCo3F.asm b/data/maps/objects/SilphCo3F.asm index f45cdf81..0c9496de 100755 --- a/data/maps/objects/SilphCo3F.asm +++ b/data/maps/objects/SilphCo3F.asm @@ -16,10 +16,10 @@ SilphCo3F_Object: db 0 ; signs db 4 ; objects - object SPRITE_LAPRAS_GIVER, 24, 8, STAY, NONE, 1 ; person + object SPRITE_SILPH_WORKER, 24, 8, STAY, NONE, 1 ; person object SPRITE_ROCKET, 20, 7, STAY, LEFT, 2, OPP_ROCKET, 25 - object SPRITE_OAK_AIDE, 7, 9, STAY, DOWN, 3, OPP_SCIENTIST, 4 - object SPRITE_BALL, 8, 5, STAY, NONE, 4, HYPER_POTION + object SPRITE_SCIENTIST, 7, 9, STAY, DOWN, 3, OPP_SCIENTIST, 4 + object SPRITE_POKE_BALL, 8, 5, STAY, NONE, 4, HYPER_POTION ; warp-to warp_to 26, 0, SILPH_CO_3F_WIDTH ; SILPH_CO_2F diff --git a/data/maps/objects/SilphCo4F.asm b/data/maps/objects/SilphCo4F.asm index 3d865bbc..ab53309a 100755 --- a/data/maps/objects/SilphCo4F.asm +++ b/data/maps/objects/SilphCo4F.asm @@ -13,13 +13,13 @@ SilphCo4F_Object: db 0 ; signs db 7 ; objects - object SPRITE_LAPRAS_GIVER, 6, 2, STAY, NONE, 1 ; person + object SPRITE_SILPH_WORKER, 6, 2, STAY, NONE, 1 ; person object SPRITE_ROCKET, 9, 14, STAY, RIGHT, 2, OPP_ROCKET, 26 - object SPRITE_OAK_AIDE, 14, 6, STAY, LEFT, 3, OPP_SCIENTIST, 5 + object SPRITE_SCIENTIST, 14, 6, STAY, LEFT, 3, OPP_SCIENTIST, 5 object SPRITE_ROCKET, 26, 10, STAY, UP, 4, OPP_ROCKET, 27 - object SPRITE_BALL, 3, 9, STAY, NONE, 5, FULL_HEAL - object SPRITE_BALL, 4, 7, STAY, NONE, 6, MAX_REVIVE - object SPRITE_BALL, 5, 8, STAY, NONE, 7, ESCAPE_ROPE + object SPRITE_POKE_BALL, 3, 9, STAY, NONE, 5, FULL_HEAL + object SPRITE_POKE_BALL, 4, 7, STAY, NONE, 6, MAX_REVIVE + object SPRITE_POKE_BALL, 5, 8, STAY, NONE, 7, ESCAPE_ROPE ; warp-to warp_to 24, 0, SILPH_CO_4F_WIDTH ; SILPH_CO_3F diff --git a/data/maps/objects/SilphCo5F.asm b/data/maps/objects/SilphCo5F.asm index 86745b21..9b8c74e5 100755 --- a/data/maps/objects/SilphCo5F.asm +++ b/data/maps/objects/SilphCo5F.asm @@ -13,14 +13,14 @@ SilphCo5F_Object: db 0 ; signs db 11 ; objects - object SPRITE_LAPRAS_GIVER, 13, 9, STAY, NONE, 1 ; person + object SPRITE_SILPH_WORKER, 13, 9, STAY, NONE, 1 ; person object SPRITE_ROCKET, 8, 16, STAY, RIGHT, 2, OPP_ROCKET, 28 - object SPRITE_OAK_AIDE, 8, 3, STAY, RIGHT, 3, OPP_SCIENTIST, 6 + object SPRITE_SCIENTIST, 8, 3, STAY, RIGHT, 3, OPP_SCIENTIST, 6 object SPRITE_ROCKER, 18, 10, STAY, UP, 4, OPP_JUGGLER, 1 object SPRITE_ROCKET, 28, 4, STAY, UP, 5, OPP_ROCKET, 29 - object SPRITE_BALL, 2, 13, STAY, NONE, 6, TM_TAKE_DOWN - object SPRITE_BALL, 4, 6, STAY, NONE, 7, PROTEIN - object SPRITE_BALL, 21, 16, STAY, NONE, 8, CARD_KEY + object SPRITE_POKE_BALL, 2, 13, STAY, NONE, 6, TM_TAKE_DOWN + object SPRITE_POKE_BALL, 4, 6, STAY, NONE, 7, PROTEIN + object SPRITE_POKE_BALL, 21, 16, STAY, NONE, 8, CARD_KEY object SPRITE_CLIPBOARD, 22, 12, STAY, NONE, 9 ; person object SPRITE_CLIPBOARD, 25, 10, STAY, NONE, 10 ; person object SPRITE_CLIPBOARD, 24, 6, STAY, NONE, 11 ; person diff --git a/data/maps/objects/SilphCo6F.asm b/data/maps/objects/SilphCo6F.asm index ad2ac32f..fc0787ae 100755 --- a/data/maps/objects/SilphCo6F.asm +++ b/data/maps/objects/SilphCo6F.asm @@ -11,16 +11,16 @@ SilphCo6F_Object: db 0 ; signs db 10 ; objects - object SPRITE_LAPRAS_GIVER, 10, 6, STAY, NONE, 1 ; person - object SPRITE_LAPRAS_GIVER, 20, 6, STAY, NONE, 2 ; person + object SPRITE_SILPH_WORKER, 10, 6, STAY, NONE, 1 ; person + object SPRITE_SILPH_WORKER, 20, 6, STAY, NONE, 2 ; person object SPRITE_ERIKA, 21, 6, STAY, DOWN, 3 ; person object SPRITE_ERIKA, 11, 10, STAY, RIGHT, 4 ; person - object SPRITE_LAPRAS_GIVER, 18, 13, STAY, UP, 5 ; person + object SPRITE_SILPH_WORKER, 18, 13, STAY, UP, 5 ; person object SPRITE_ROCKET, 17, 3, STAY, RIGHT, 6, OPP_ROCKET, 30 - object SPRITE_OAK_AIDE, 7, 8, STAY, DOWN, 7, OPP_SCIENTIST, 7 + object SPRITE_SCIENTIST, 7, 8, STAY, DOWN, 7, OPP_SCIENTIST, 7 object SPRITE_ROCKET, 14, 15, STAY, LEFT, 8, OPP_ROCKET, 31 - object SPRITE_BALL, 3, 12, STAY, NONE, 9, HP_UP - object SPRITE_BALL, 2, 15, STAY, NONE, 10, X_ACCURACY + object SPRITE_POKE_BALL, 3, 12, STAY, NONE, 9, HP_UP + object SPRITE_POKE_BALL, 2, 15, STAY, NONE, 10, X_ACCURACY ; warp-to warp_to 16, 0, SILPH_CO_6F_WIDTH ; SILPH_CO_7F diff --git a/data/maps/objects/SilphCo7F.asm b/data/maps/objects/SilphCo7F.asm index 7202a469..1b75e66e 100755 --- a/data/maps/objects/SilphCo7F.asm +++ b/data/maps/objects/SilphCo7F.asm @@ -12,17 +12,17 @@ SilphCo7F_Object: db 0 ; signs db 11 ; objects - object SPRITE_LAPRAS_GIVER, 1, 5, STAY, NONE, 1 ; person - object SPRITE_LAPRAS_GIVER, 13, 13, STAY, UP, 2 ; person - object SPRITE_LAPRAS_GIVER, 7, 10, STAY, NONE, 3 ; person + object SPRITE_SILPH_WORKER, 1, 5, STAY, NONE, 1 ; person + object SPRITE_SILPH_WORKER, 13, 13, STAY, UP, 2 ; person + object SPRITE_SILPH_WORKER, 7, 10, STAY, NONE, 3 ; person object SPRITE_ERIKA, 10, 8, STAY, NONE, 4 ; person object SPRITE_ROCKET, 13, 1, STAY, DOWN, 5, OPP_ROCKET, 32 - object SPRITE_OAK_AIDE, 2, 13, STAY, DOWN, 6, OPP_SCIENTIST, 8 + object SPRITE_SCIENTIST, 2, 13, STAY, DOWN, 6, OPP_SCIENTIST, 8 object SPRITE_ROCKET, 20, 2, STAY, LEFT, 7, OPP_ROCKET, 33 object SPRITE_ROCKET, 19, 14, STAY, RIGHT, 8, OPP_ROCKET, 34 object SPRITE_BLUE, 3, 7, STAY, UP, 9 ; person - object SPRITE_BALL, 1, 9, STAY, NONE, 10, CALCIUM - object SPRITE_BALL, 24, 11, STAY, NONE, 11, TM_SWORDS_DANCE + object SPRITE_POKE_BALL, 1, 9, STAY, NONE, 10, CALCIUM + object SPRITE_POKE_BALL, 24, 11, STAY, NONE, 11, TM_SWORDS_DANCE ; warp-to warp_to 16, 0, SILPH_CO_7F_WIDTH ; SILPH_CO_8F diff --git a/data/maps/objects/SilphCo8F.asm b/data/maps/objects/SilphCo8F.asm index d05c7844..12470f55 100755 --- a/data/maps/objects/SilphCo8F.asm +++ b/data/maps/objects/SilphCo8F.asm @@ -13,9 +13,9 @@ SilphCo8F_Object: db 0 ; signs db 4 ; objects - object SPRITE_LAPRAS_GIVER, 4, 2, STAY, NONE, 1 ; person + object SPRITE_SILPH_WORKER, 4, 2, STAY, NONE, 1 ; person object SPRITE_ROCKET, 19, 2, STAY, LEFT, 2, OPP_ROCKET, 35 - object SPRITE_OAK_AIDE, 10, 2, STAY, DOWN, 3, OPP_SCIENTIST, 9 + object SPRITE_SCIENTIST, 10, 2, STAY, DOWN, 3, OPP_SCIENTIST, 9 object SPRITE_ROCKET, 12, 15, STAY, RIGHT, 4, OPP_ROCKET, 36 ; warp-to diff --git a/data/maps/objects/SilphCo9F.asm b/data/maps/objects/SilphCo9F.asm index 28ef5f10..efba45f7 100755 --- a/data/maps/objects/SilphCo9F.asm +++ b/data/maps/objects/SilphCo9F.asm @@ -13,7 +13,7 @@ SilphCo9F_Object: db 4 ; objects object SPRITE_NURSE, 3, 14, STAY, DOWN, 1 ; person object SPRITE_ROCKET, 2, 4, STAY, UP, 2, OPP_ROCKET, 37 - object SPRITE_OAK_AIDE, 21, 13, STAY, DOWN, 3, OPP_SCIENTIST, 10 + object SPRITE_SCIENTIST, 21, 13, STAY, DOWN, 3, OPP_SCIENTIST, 10 object SPRITE_ROCKET, 13, 16, STAY, UP, 4, OPP_ROCKET, 38 ; warp-to diff --git a/data/maps/objects/UndergroundPathRoute7.asm b/data/maps/objects/UndergroundPathRoute7.asm index 1c365d59..4e301811 100755 --- a/data/maps/objects/UndergroundPathRoute7.asm +++ b/data/maps/objects/UndergroundPathRoute7.asm @@ -9,7 +9,7 @@ UndergroundPathRoute7_Object: db 0 ; signs db 1 ; objects - object SPRITE_FAT_BALD_GUY, 2, 4, STAY, NONE, 1 ; person + object SPRITE_MIDDLE_AGED_MAN, 2, 4, STAY, NONE, 1 ; person ; warp-to warp_to 3, 7, UNDERGROUND_PATH_ROUTE_7_WIDTH diff --git a/data/maps/objects/UndergroundPathRoute7Copy.asm b/data/maps/objects/UndergroundPathRoute7Copy.asm index 2ae8a4d1..9486fb87 100755 --- a/data/maps/objects/UndergroundPathRoute7Copy.asm +++ b/data/maps/objects/UndergroundPathRoute7Copy.asm @@ -10,7 +10,7 @@ UndergroundPathRoute7Copy_Object: db 2 ; objects object SPRITE_GIRL, 3, 2, STAY, NONE, 1 ; person - object SPRITE_FAT_BALD_GUY, 2, 4, STAY, NONE, 2 ; person + object SPRITE_MIDDLE_AGED_MAN, 2, 4, STAY, NONE, 2 ; person ; warp-to warp_to 3, 7, UNDERGROUND_PATH_ROUTE_7_COPY_WIDTH diff --git a/data/maps/objects/VermilionCity.asm b/data/maps/objects/VermilionCity.asm index b1e1a005..692ef5dd 100755 --- a/data/maps/objects/VermilionCity.asm +++ b/data/maps/objects/VermilionCity.asm @@ -22,11 +22,11 @@ VermilionCity_Object: sign 29, 15, 13 ; VermilionCityText13 db 6 ; objects - object SPRITE_FOULARD_WOMAN, 19, 7, WALK, 2, 1 ; person + object SPRITE_BEAUTY, 19, 7, WALK, 2, 1 ; person object SPRITE_GAMBLER, 14, 6, STAY, NONE, 2 ; person object SPRITE_SAILOR, 19, 30, STAY, UP, 3 ; person object SPRITE_GAMBLER, 30, 7, STAY, NONE, 4 ; person - object SPRITE_SLOWBRO, 29, 9, WALK, 1, 5 ; person + object SPRITE_MONSTER, 29, 9, WALK, 1, 5 ; person object SPRITE_SAILOR, 25, 27, WALK, 2, 6 ; person ; warp-to diff --git a/data/maps/objects/VermilionGym.asm b/data/maps/objects/VermilionGym.asm index 05cb529a..f5cc7b87 100755 --- a/data/maps/objects/VermilionGym.asm +++ b/data/maps/objects/VermilionGym.asm @@ -10,9 +10,9 @@ VermilionGym_Object: db 5 ; objects object SPRITE_ROCKER, 5, 1, STAY, DOWN, 1, OPP_LT_SURGE, 1 object SPRITE_GENTLEMAN, 9, 6, STAY, LEFT, 2, OPP_GENTLEMAN, 3 - object SPRITE_BLACK_HAIR_BOY_2, 3, 8, STAY, LEFT, 3, OPP_ROCKER, 1 + object SPRITE_SUPER_NERD, 3, 8, STAY, LEFT, 3, OPP_ROCKER, 1 object SPRITE_SAILOR, 0, 10, STAY, RIGHT, 4, OPP_SAILOR, 8 - object SPRITE_GYM_HELPER, 4, 14, STAY, DOWN, 5 ; person + object SPRITE_GYM_GUIDE, 4, 14, STAY, DOWN, 5 ; person ; warp-to warp_to 4, 17, VERMILION_GYM_WIDTH diff --git a/data/maps/objects/VermilionMart.asm b/data/maps/objects/VermilionMart.asm index e27020da..f7b358de 100755 --- a/data/maps/objects/VermilionMart.asm +++ b/data/maps/objects/VermilionMart.asm @@ -8,9 +8,9 @@ VermilionMart_Object: db 0 ; signs db 3 ; objects - object SPRITE_MART_GUY, 0, 5, STAY, RIGHT, 1 ; person - object SPRITE_BLACK_HAIR_BOY_1, 5, 6, STAY, NONE, 2 ; person - object SPRITE_LASS, 3, 3, WALK, 2, 3 ; person + object SPRITE_CLERK, 0, 5, STAY, RIGHT, 1 ; person + object SPRITE_COOLTRAINER_M, 5, 6, STAY, NONE, 2 ; person + object SPRITE_COOLTRAINER_F, 3, 3, WALK, 2, 3 ; person ; warp-to warp_to 3, 7, VERMILION_MART_WIDTH diff --git a/data/maps/objects/VermilionOldRodHouse.asm b/data/maps/objects/VermilionOldRodHouse.asm index c8d407b8..f81ded30 100755 --- a/data/maps/objects/VermilionOldRodHouse.asm +++ b/data/maps/objects/VermilionOldRodHouse.asm @@ -8,7 +8,7 @@ VermilionOldRodHouse_Object: db 0 ; signs db 1 ; objects - object SPRITE_FISHER, 2, 4, STAY, RIGHT, 1 ; person + object SPRITE_FISHING_GURU, 2, 4, STAY, RIGHT, 1 ; person ; warp-to warp_to 2, 7, VERMILION_OLD_ROD_HOUSE_WIDTH diff --git a/data/maps/objects/VermilionPidgeyHouse.asm b/data/maps/objects/VermilionPidgeyHouse.asm index 5ee288f3..fbd39231 100755 --- a/data/maps/objects/VermilionPidgeyHouse.asm +++ b/data/maps/objects/VermilionPidgeyHouse.asm @@ -8,9 +8,9 @@ VermilionPidgeyHouse_Object: db 0 ; signs db 3 ; objects - object SPRITE_BUG_CATCHER, 5, 3, STAY, LEFT, 1 ; person + object SPRITE_YOUNGSTER, 5, 3, STAY, LEFT, 1 ; person object SPRITE_BIRD, 3, 5, WALK, 2, 2 ; person - object SPRITE_PAPER_SHEET, 4, 3, STAY, NONE, 3 ; person + object SPRITE_PAPER, 4, 3, STAY, NONE, 3 ; person ; warp-to warp_to 2, 7, VERMILION_PIDGEY_HOUSE_WIDTH diff --git a/data/maps/objects/VermilionPokecenter.asm b/data/maps/objects/VermilionPokecenter.asm index 427e44e6..f527c890 100755 --- a/data/maps/objects/VermilionPokecenter.asm +++ b/data/maps/objects/VermilionPokecenter.asm @@ -9,9 +9,9 @@ VermilionPokecenter_Object: db 4 ; objects object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person - object SPRITE_FISHER, 10, 5, STAY, NONE, 2 ; person + object SPRITE_FISHING_GURU, 10, 5, STAY, NONE, 2 ; person object SPRITE_SAILOR, 5, 4, STAY, NONE, 3 ; person - object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person + object SPRITE_LINK_RECEPTIONIST, 11, 2, STAY, DOWN, 4 ; person ; warp-to warp_to 3, 7, VERMILION_POKECENTER_WIDTH diff --git a/data/maps/objects/VictoryRoad1F.asm b/data/maps/objects/VictoryRoad1F.asm index 72fd1468..271be1b8 100755 --- a/data/maps/objects/VictoryRoad1F.asm +++ b/data/maps/objects/VictoryRoad1F.asm @@ -9,10 +9,10 @@ VictoryRoad1F_Object: db 0 ; signs db 7 ; objects - object SPRITE_LASS, 7, 5, STAY, RIGHT, 1, OPP_COOLTRAINER_F, 5 - object SPRITE_BLACK_HAIR_BOY_1, 3, 2, STAY, DOWN, 2, OPP_COOLTRAINER_M, 5 - object SPRITE_BALL, 11, 0, STAY, NONE, 3, TM_SKY_ATTACK - object SPRITE_BALL, 9, 2, STAY, NONE, 4, RARE_CANDY + object SPRITE_COOLTRAINER_F, 7, 5, STAY, RIGHT, 1, OPP_COOLTRAINER_F, 5 + object SPRITE_COOLTRAINER_M, 3, 2, STAY, DOWN, 2, OPP_COOLTRAINER_M, 5 + object SPRITE_POKE_BALL, 11, 0, STAY, NONE, 3, TM_SKY_ATTACK + object SPRITE_POKE_BALL, 9, 2, STAY, NONE, 4, RARE_CANDY object SPRITE_BOULDER, 5, 15, STAY, BOULDER_MOVEMENT_BYTE_2, 5 ; person object SPRITE_BOULDER, 14, 2, STAY, BOULDER_MOVEMENT_BYTE_2, 6 ; person object SPRITE_BOULDER, 2, 10, STAY, BOULDER_MOVEMENT_BYTE_2, 7 ; person diff --git a/data/maps/objects/VictoryRoad2F.asm b/data/maps/objects/VictoryRoad2F.asm index 170e25e7..a7f6d102 100755 --- a/data/maps/objects/VictoryRoad2F.asm +++ b/data/maps/objects/VictoryRoad2F.asm @@ -14,15 +14,15 @@ VictoryRoad2F_Object: db 13 ; objects object SPRITE_HIKER, 12, 9, STAY, LEFT, 1, OPP_BLACKBELT, 9 - object SPRITE_BLACK_HAIR_BOY_2, 21, 13, STAY, LEFT, 2, OPP_JUGGLER, 2 - object SPRITE_BLACK_HAIR_BOY_1, 19, 8, STAY, DOWN, 3, OPP_TAMER, 5 - object SPRITE_BLACK_HAIR_BOY_2, 4, 2, STAY, DOWN, 4, OPP_POKEMANIAC, 6 - object SPRITE_BLACK_HAIR_BOY_2, 26, 3, STAY, LEFT, 5, OPP_JUGGLER, 5 + object SPRITE_SUPER_NERD, 21, 13, STAY, LEFT, 2, OPP_JUGGLER, 2 + object SPRITE_COOLTRAINER_M, 19, 8, STAY, DOWN, 3, OPP_TAMER, 5 + object SPRITE_SUPER_NERD, 4, 2, STAY, DOWN, 4, OPP_POKEMANIAC, 6 + object SPRITE_SUPER_NERD, 26, 3, STAY, LEFT, 5, OPP_JUGGLER, 5 object SPRITE_BIRD, 11, 5, STAY, UP, 6, MOLTRES, 50 - object SPRITE_BALL, 27, 5, STAY, NONE, 7, TM_SUBMISSION - object SPRITE_BALL, 18, 9, STAY, NONE, 8, FULL_HEAL - object SPRITE_BALL, 9, 11, STAY, NONE, 9, TM_MEGA_KICK - object SPRITE_BALL, 11, 0, STAY, NONE, 10, GUARD_SPEC + object SPRITE_POKE_BALL, 27, 5, STAY, NONE, 7, TM_SUBMISSION + object SPRITE_POKE_BALL, 18, 9, STAY, NONE, 8, FULL_HEAL + object SPRITE_POKE_BALL, 9, 11, STAY, NONE, 9, TM_MEGA_KICK + object SPRITE_POKE_BALL, 11, 0, STAY, NONE, 10, GUARD_SPEC object SPRITE_BOULDER, 4, 14, STAY, BOULDER_MOVEMENT_BYTE_2, 11 ; person object SPRITE_BOULDER, 5, 5, STAY, BOULDER_MOVEMENT_BYTE_2, 12 ; person object SPRITE_BOULDER, 23, 16, STAY, BOULDER_MOVEMENT_BYTE_2, 13 ; person diff --git a/data/maps/objects/VictoryRoad3F.asm b/data/maps/objects/VictoryRoad3F.asm index f5eeae79..ad4bd29f 100755 --- a/data/maps/objects/VictoryRoad3F.asm +++ b/data/maps/objects/VictoryRoad3F.asm @@ -10,12 +10,12 @@ VictoryRoad3F_Object: db 0 ; signs db 10 ; objects - object SPRITE_BLACK_HAIR_BOY_1, 28, 5, STAY, LEFT, 1, OPP_COOLTRAINER_M, 2 - object SPRITE_LASS, 7, 13, STAY, RIGHT, 2, OPP_COOLTRAINER_F, 2 - object SPRITE_BLACK_HAIR_BOY_1, 6, 14, STAY, LEFT, 3, OPP_COOLTRAINER_M, 3 - object SPRITE_LASS, 13, 3, STAY, RIGHT, 4, OPP_COOLTRAINER_F, 3 - object SPRITE_BALL, 26, 5, STAY, NONE, 5, MAX_REVIVE - object SPRITE_BALL, 7, 7, STAY, NONE, 6, TM_EXPLOSION + object SPRITE_COOLTRAINER_M, 28, 5, STAY, LEFT, 1, OPP_COOLTRAINER_M, 2 + object SPRITE_COOLTRAINER_F, 7, 13, STAY, RIGHT, 2, OPP_COOLTRAINER_F, 2 + object SPRITE_COOLTRAINER_M, 6, 14, STAY, LEFT, 3, OPP_COOLTRAINER_M, 3 + object SPRITE_COOLTRAINER_F, 13, 3, STAY, RIGHT, 4, OPP_COOLTRAINER_F, 3 + object SPRITE_POKE_BALL, 26, 5, STAY, NONE, 5, MAX_REVIVE + object SPRITE_POKE_BALL, 7, 7, STAY, NONE, 6, TM_EXPLOSION object SPRITE_BOULDER, 22, 3, STAY, BOULDER_MOVEMENT_BYTE_2, 7 ; person object SPRITE_BOULDER, 13, 12, STAY, BOULDER_MOVEMENT_BYTE_2, 8 ; person object SPRITE_BOULDER, 24, 10, STAY, BOULDER_MOVEMENT_BYTE_2, 9 ; person diff --git a/data/maps/objects/ViridianCity.asm b/data/maps/objects/ViridianCity.asm index 32fe8d3a..02543af8 100755 --- a/data/maps/objects/ViridianCity.asm +++ b/data/maps/objects/ViridianCity.asm @@ -17,12 +17,12 @@ ViridianCity_Object: sign 27, 7, 13 ; ViridianCityText13 db 7 ; objects - object SPRITE_BUG_CATCHER, 13, 20, WALK, 0, 1 ; person + object SPRITE_YOUNGSTER, 13, 20, WALK, 0, 1 ; person object SPRITE_GAMBLER, 30, 8, STAY, NONE, 2 ; person - object SPRITE_BUG_CATCHER, 30, 25, WALK, 0, 3 ; person + object SPRITE_YOUNGSTER, 30, 25, WALK, 0, 3 ; person object SPRITE_GIRL, 17, 9, STAY, RIGHT, 4 ; person - object SPRITE_LYING_OLD_MAN, 18, 9, STAY, NONE, 5 ; person - object SPRITE_FISHER2, 6, 23, STAY, DOWN, 6 ; person + object SPRITE_GAMBLER_ASLEEP, 18, 9, STAY, NONE, 5 ; person + object SPRITE_FISHER, 6, 23, STAY, DOWN, 6 ; person object SPRITE_GAMBLER, 17, 5, WALK, 2, 7 ; person ; warp-to diff --git a/data/maps/objects/ViridianForest.asm b/data/maps/objects/ViridianForest.asm index cbcb6ff8..beee25c2 100755 --- a/data/maps/objects/ViridianForest.asm +++ b/data/maps/objects/ViridianForest.asm @@ -18,14 +18,14 @@ ViridianForest_Object: sign 2, 1, 14 ; ViridianForestText14 db 8 ; objects - object SPRITE_BUG_CATCHER, 16, 43, STAY, NONE, 1 ; person - object SPRITE_BUG_CATCHER, 30, 33, STAY, LEFT, 2, OPP_BUG_CATCHER, 1 - object SPRITE_BUG_CATCHER, 30, 19, STAY, LEFT, 3, OPP_BUG_CATCHER, 2 - object SPRITE_BUG_CATCHER, 2, 18, STAY, LEFT, 4, OPP_BUG_CATCHER, 3 - object SPRITE_BALL, 25, 11, STAY, NONE, 5, ANTIDOTE - object SPRITE_BALL, 12, 29, STAY, NONE, 6, POTION - object SPRITE_BALL, 1, 31, STAY, NONE, 7, POKE_BALL - object SPRITE_BUG_CATCHER, 27, 40, STAY, NONE, 8 ; person + object SPRITE_YOUNGSTER, 16, 43, STAY, NONE, 1 ; person + object SPRITE_YOUNGSTER, 30, 33, STAY, LEFT, 2, OPP_BUG_CATCHER, 1 + object SPRITE_YOUNGSTER, 30, 19, STAY, LEFT, 3, OPP_BUG_CATCHER, 2 + object SPRITE_YOUNGSTER, 2, 18, STAY, LEFT, 4, OPP_BUG_CATCHER, 3 + object SPRITE_POKE_BALL, 25, 11, STAY, NONE, 5, ANTIDOTE + object SPRITE_POKE_BALL, 12, 29, STAY, NONE, 6, POTION + object SPRITE_POKE_BALL, 1, 31, STAY, NONE, 7, POKE_BALL + object SPRITE_YOUNGSTER, 27, 40, STAY, NONE, 8 ; person ; warp-to warp_to 1, 0, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_NORTH_GATE diff --git a/data/maps/objects/ViridianForestNorthGate.asm b/data/maps/objects/ViridianForestNorthGate.asm index 1bc271fe..9ff88a81 100755 --- a/data/maps/objects/ViridianForestNorthGate.asm +++ b/data/maps/objects/ViridianForestNorthGate.asm @@ -10,8 +10,8 @@ ViridianForestNorthGate_Object: db 0 ; signs db 2 ; objects - object SPRITE_BLACK_HAIR_BOY_2, 3, 2, STAY, NONE, 1 ; person - object SPRITE_OLD_PERSON, 2, 5, STAY, NONE, 2 ; person + object SPRITE_SUPER_NERD, 3, 2, STAY, NONE, 1 ; person + object SPRITE_GRAMPS, 2, 5, STAY, NONE, 2 ; person ; warp-to warp_to 4, 0, VIRIDIAN_FOREST_NORTH_GATE_WIDTH diff --git a/data/maps/objects/ViridianGym.asm b/data/maps/objects/ViridianGym.asm index 71cd6147..d6ee127c 100755 --- a/data/maps/objects/ViridianGym.asm +++ b/data/maps/objects/ViridianGym.asm @@ -9,16 +9,16 @@ ViridianGym_Object: db 11 ; objects object SPRITE_GIOVANNI, 2, 1, STAY, DOWN, 1, OPP_GIOVANNI, 3 - object SPRITE_BLACK_HAIR_BOY_1, 12, 7, STAY, DOWN, 2, OPP_COOLTRAINER_M, 9 + object SPRITE_COOLTRAINER_M, 12, 7, STAY, DOWN, 2, OPP_COOLTRAINER_M, 9 object SPRITE_HIKER, 11, 11, STAY, UP, 3, OPP_BLACKBELT, 6 object SPRITE_ROCKER, 10, 7, STAY, DOWN, 4, OPP_TAMER, 3 object SPRITE_HIKER, 3, 7, STAY, LEFT, 5, OPP_BLACKBELT, 7 - object SPRITE_BLACK_HAIR_BOY_1, 13, 5, STAY, RIGHT, 6, OPP_COOLTRAINER_M, 10 + object SPRITE_COOLTRAINER_M, 13, 5, STAY, RIGHT, 6, OPP_COOLTRAINER_M, 10 object SPRITE_HIKER, 10, 1, STAY, DOWN, 7, OPP_BLACKBELT, 8 object SPRITE_ROCKER, 2, 16, STAY, RIGHT, 8, OPP_TAMER, 4 - object SPRITE_BLACK_HAIR_BOY_1, 6, 5, STAY, DOWN, 9, OPP_COOLTRAINER_M, 1 - object SPRITE_GYM_HELPER, 16, 15, STAY, DOWN, 10 ; person - object SPRITE_BALL, 16, 9, STAY, NONE, 11, REVIVE + object SPRITE_COOLTRAINER_M, 6, 5, STAY, DOWN, 9, OPP_COOLTRAINER_M, 1 + object SPRITE_GYM_GUIDE, 16, 15, STAY, DOWN, 10 ; person + object SPRITE_POKE_BALL, 16, 9, STAY, NONE, 11, REVIVE ; warp-to warp_to 16, 17, VIRIDIAN_GYM_WIDTH diff --git a/data/maps/objects/ViridianMart.asm b/data/maps/objects/ViridianMart.asm index c8aa541b..9c8b7497 100755 --- a/data/maps/objects/ViridianMart.asm +++ b/data/maps/objects/ViridianMart.asm @@ -8,9 +8,9 @@ ViridianMart_Object: db 0 ; signs db 3 ; objects - object SPRITE_MART_GUY, 0, 5, STAY, RIGHT, 1 ; person - object SPRITE_BUG_CATCHER, 5, 5, WALK, 1, 2 ; person - object SPRITE_BLACK_HAIR_BOY_1, 3, 3, STAY, NONE, 3 ; person + object SPRITE_CLERK, 0, 5, STAY, RIGHT, 1 ; person + object SPRITE_YOUNGSTER, 5, 5, WALK, 1, 2 ; person + object SPRITE_COOLTRAINER_M, 3, 3, STAY, NONE, 3 ; person ; warp-to warp_to 3, 7, VIRIDIAN_MART_WIDTH diff --git a/data/maps/objects/ViridianPokecenter.asm b/data/maps/objects/ViridianPokecenter.asm index e6da0375..b2410218 100755 --- a/data/maps/objects/ViridianPokecenter.asm +++ b/data/maps/objects/ViridianPokecenter.asm @@ -10,8 +10,8 @@ ViridianPokecenter_Object: db 4 ; objects object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person object SPRITE_GENTLEMAN, 10, 5, WALK, 1, 2 ; person - object SPRITE_BLACK_HAIR_BOY_1, 4, 3, STAY, NONE, 3 ; person - object SPRITE_CABLE_CLUB_WOMAN, 11, 2, STAY, DOWN, 4 ; person + object SPRITE_COOLTRAINER_M, 4, 3, STAY, NONE, 3 ; person + object SPRITE_LINK_RECEPTIONIST, 11, 2, STAY, DOWN, 4 ; person ; warp-to warp_to 3, 7, VIRIDIAN_POKECENTER_WIDTH diff --git a/data/maps/objects/ViridianSchoolHouse.asm b/data/maps/objects/ViridianSchoolHouse.asm index c6b95c9b..582a4d00 100755 --- a/data/maps/objects/ViridianSchoolHouse.asm +++ b/data/maps/objects/ViridianSchoolHouse.asm @@ -9,7 +9,7 @@ ViridianSchoolHouse_Object: db 2 ; objects object SPRITE_BRUNETTE_GIRL, 3, 5, STAY, UP, 1 ; person - object SPRITE_LASS, 4, 1, STAY, DOWN, 2 ; person + object SPRITE_COOLTRAINER_F, 4, 1, STAY, DOWN, 2 ; person ; warp-to warp_to 2, 7, VIRIDIAN_SCHOOL_HOUSE_WIDTH diff --git a/data/maps/objects/WardensHouse.asm b/data/maps/objects/WardensHouse.asm index da1c197c..307390f3 100755 --- a/data/maps/objects/WardensHouse.asm +++ b/data/maps/objects/WardensHouse.asm @@ -11,7 +11,7 @@ WardensHouse_Object: db 3 ; objects object SPRITE_WARDEN, 2, 3, STAY, NONE, 1 ; person - object SPRITE_BALL, 8, 3, STAY, NONE, 2, RARE_CANDY + object SPRITE_POKE_BALL, 8, 3, STAY, NONE, 2, RARE_CANDY object SPRITE_BOULDER, 8, 4, STAY, BOULDER_MOVEMENT_BYTE_2, 3 ; person ; warp-to diff --git a/data/maps/sprite_sets.asm b/data/maps/sprite_sets.asm index ee6ddef0..b2c9371c 100755 --- a/data/maps/sprite_sets.asm +++ b/data/maps/sprite_sets.asm @@ -37,154 +37,155 @@ MapSpriteSets: db $02 ; ROUTE_24 db $02 ; ROUTE_25 +EAST_WEST EQU 1 +NORTH_SOUTH EQU 2 + ; Format: -; 00: determines whether the map is split East/West or North/South -; $01 = East/West divide -; $02 = North/South divide +; 00: determines whether the map is split EAST_WEST or NORTH_SOUTH ; 01: coordinate of dividing line ; 02: sprite set ID if in the West or North side ; 03: sprite set ID if in the East or South side SplitMapSpriteSets: - db $02, $25, $02, $01 ; $f1 - db $02, $32, $02, $03 ; $f2 - db $01, $39, $04, $08 ; $f3 - db $02, $15, $03, $08 ; $f4 - db $01, $08, $0A, $08 ; $f5 - db $01, $18, $09, $05 ; $f6 - db $01, $22, $09, $0A ; $f7 - db $01, $35, $01, $0A ; $f8 - db $02, $21, $02, $07 ; $f9 - db $02, $02, $07, $04 ; $fa - db $01, $11, $05, $07 ; $fb - db $01, $03, $07, $03 ; $fc + db NORTH_SOUTH, 37, $02, $01 ; $f1 + db NORTH_SOUTH, 50, $02, $03 ; $f2 + db EAST_WEST, 57, $04, $08 ; $f3 + db NORTH_SOUTH, 21, $03, $08 ; $f4 + db EAST_WEST, 8, $0A, $08 ; $f5 + db EAST_WEST, 24, $09, $05 ; $f6 + db EAST_WEST, 34, $09, $0A ; $f7 + db EAST_WEST, 53, $01, $0A ; $f8 + db NORTH_SOUTH, 33, $02, $07 ; $f9 + db NORTH_SOUTH, 2, $07, $04 ; $fa + db EAST_WEST, 17, $05, $07 ; $fb + db EAST_WEST, 3, $07, $03 ; $fc SpriteSets: ; sprite set $01 db SPRITE_BLUE - db SPRITE_BUG_CATCHER + db SPRITE_YOUNGSTER db SPRITE_GIRL - db SPRITE_FISHER2 - db SPRITE_BLACK_HAIR_BOY_1 + db SPRITE_FISHER + db SPRITE_COOLTRAINER_M db SPRITE_GAMBLER db SPRITE_SEEL db SPRITE_OAK db SPRITE_SWIMMER - db SPRITE_BALL - db SPRITE_LYING_OLD_MAN + db SPRITE_POKE_BALL + db SPRITE_GAMBLER_ASLEEP ; sprite set $02 - db SPRITE_BUG_CATCHER + db SPRITE_YOUNGSTER db SPRITE_ROCKET - db SPRITE_BLACK_HAIR_BOY_2 + db SPRITE_SUPER_NERD db SPRITE_HIKER - db SPRITE_SLOWBRO + db SPRITE_MONSTER db SPRITE_BLUE db SPRITE_GUARD - db SPRITE_LASS - db SPRITE_BLACK_HAIR_BOY_1 - db SPRITE_BALL - db SPRITE_LYING_OLD_MAN_UNUSED_2 + db SPRITE_COOLTRAINER_F + db SPRITE_COOLTRAINER_M + db SPRITE_POKE_BALL + db SPRITE_UNUSED_GAMBLER_ASLEEP_2 ; sprite set $03 db SPRITE_LITTLE_GIRL db SPRITE_GIRL - db SPRITE_BLACK_HAIR_BOY_2 + db SPRITE_SUPER_NERD db SPRITE_HIKER db SPRITE_GAMBLER - db SPRITE_SLOWBRO - db SPRITE_LASS - db SPRITE_BLACK_HAIR_BOY_1 + db SPRITE_MONSTER + db SPRITE_COOLTRAINER_F + db SPRITE_COOLTRAINER_M db SPRITE_GUARD - db SPRITE_BALL - db SPRITE_LYING_OLD_MAN_UNUSED_2 + db SPRITE_POKE_BALL + db SPRITE_UNUSED_GAMBLER_ASLEEP_2 ; sprite set $04 - db SPRITE_FOULARD_WOMAN - db SPRITE_BLACK_HAIR_BOY_2 - db SPRITE_BUG_CATCHER + db SPRITE_BEAUTY + db SPRITE_SUPER_NERD + db SPRITE_YOUNGSTER db SPRITE_GAMBLER - db SPRITE_SLOWBRO + db SPRITE_MONSTER db SPRITE_GUARD db SPRITE_SAILOR - db SPRITE_LASS - db SPRITE_BLACK_HAIR_BOY_1 - db SPRITE_BALL - db SPRITE_LYING_OLD_MAN_UNUSED_2 + db SPRITE_COOLTRAINER_F + db SPRITE_COOLTRAINER_M + db SPRITE_POKE_BALL + db SPRITE_UNUSED_GAMBLER_ASLEEP_2 ; sprite set $05 db SPRITE_LITTLE_GIRL - db SPRITE_YOUNG_BOY + db SPRITE_LITTLE_BOY db SPRITE_GIRL - db SPRITE_FISHER2 - db SPRITE_FAT_BALD_GUY - db SPRITE_OLD_PERSON - db SPRITE_SLOWBRO + db SPRITE_FISHER + db SPRITE_MIDDLE_AGED_MAN + db SPRITE_GRAMPS + db SPRITE_MONSTER db SPRITE_GUARD db SPRITE_ROCKET - db SPRITE_BALL + db SPRITE_POKE_BALL db SPRITE_SNORLAX ; sprite set $06 - db SPRITE_BUG_CATCHER - db SPRITE_GYM_HELPER - db SPRITE_SLOWBRO + db SPRITE_YOUNGSTER + db SPRITE_GYM_GUIDE + db SPRITE_MONSTER db SPRITE_BLUE - db SPRITE_LASS - db SPRITE_BLACK_HAIR_BOY_1 + db SPRITE_COOLTRAINER_F + db SPRITE_COOLTRAINER_M db SPRITE_SWIMMER db SPRITE_GUARD db SPRITE_GAMBLER - db SPRITE_BALL - db SPRITE_LYING_OLD_MAN_UNUSED_2 + db SPRITE_POKE_BALL + db SPRITE_UNUSED_GAMBLER_ASLEEP_2 ; sprite set $07 db SPRITE_ROCKET - db SPRITE_OAK_AIDE - db SPRITE_LAPRAS_GIVER + db SPRITE_SCIENTIST + db SPRITE_SILPH_WORKER db SPRITE_ERIKA db SPRITE_GENTLEMAN db SPRITE_BIRD db SPRITE_ROCKER - db SPRITE_BLACK_HAIR_BOY_1 - db SPRITE_SLOWBRO - db SPRITE_BALL - db SPRITE_LYING_OLD_MAN_UNUSED_2 + db SPRITE_COOLTRAINER_M + db SPRITE_MONSTER + db SPRITE_POKE_BALL + db SPRITE_UNUSED_GAMBLER_ASLEEP_2 ; sprite set $08 db SPRITE_BIKER - db SPRITE_BLACK_HAIR_BOY_2 - db SPRITE_FAT_BALD_GUY - db SPRITE_LASS - db SPRITE_BLACK_HAIR_BOY_1 - db SPRITE_FOULARD_WOMAN - db SPRITE_FISHER2 + db SPRITE_SUPER_NERD + db SPRITE_MIDDLE_AGED_MAN + db SPRITE_COOLTRAINER_F + db SPRITE_COOLTRAINER_M + db SPRITE_BEAUTY + db SPRITE_FISHER db SPRITE_ROCKER - db SPRITE_SLOWBRO - db SPRITE_BALL + db SPRITE_MONSTER + db SPRITE_POKE_BALL db SPRITE_SNORLAX ; sprite set $09 db SPRITE_BIKER - db SPRITE_BLACK_HAIR_BOY_1 - db SPRITE_LAPRAS_GIVER - db SPRITE_FISHER2 + db SPRITE_COOLTRAINER_M + db SPRITE_SILPH_WORKER + db SPRITE_FISHER db SPRITE_ROCKER db SPRITE_HIKER db SPRITE_GAMBLER - db SPRITE_FAT_BALD_GUY - db SPRITE_BLACK_HAIR_BOY_2 - db SPRITE_BALL + db SPRITE_MIDDLE_AGED_MAN + db SPRITE_SUPER_NERD + db SPRITE_POKE_BALL db SPRITE_SNORLAX ; sprite set $0a db SPRITE_BIRD - db SPRITE_BLACK_HAIR_BOY_1 - db SPRITE_CLEFAIRY - db SPRITE_FISHER2 + db SPRITE_COOLTRAINER_M + db SPRITE_FAIRY + db SPRITE_FISHER db SPRITE_GAMBLER - db SPRITE_SLOWBRO + db SPRITE_MONSTER db SPRITE_SEEL db SPRITE_SWIMMER - db SPRITE_BUG_CATCHER - db SPRITE_BALL - db SPRITE_OMANYTE + db SPRITE_YOUNGSTER + db SPRITE_POKE_BALL + db SPRITE_FOSSIL diff --git a/data/moves/animation_special_effect_pointers.asm b/data/moves/animation_special_effect_pointers.asm deleted file mode 100644 index ae60abb8..00000000 --- a/data/moves/animation_special_effect_pointers.asm +++ /dev/null @@ -1,47 +0,0 @@ -special_effect: MACRO - db \1 - dw \2 -ENDM - -SpecialEffectPointers: - ; special effect id, effect routine address - special_effect SE_DARK_SCREEN_FLASH, AnimationFlashScreen ; $FE - special_effect SE_DARK_SCREEN_PALETTE, AnimationDarkScreenPalette ; $FD - special_effect SE_RESET_SCREEN_PALETTE, AnimationResetScreenPalette ; $FC - special_effect SE_SHAKE_SCREEN, AnimationShakeScreen ; $FB - special_effect SE_WATER_DROPLETS_EVERYWHERE, AnimationWaterDropletsEverywhere ; $FA - special_effect SE_DARKEN_MON_PALETTE, AnimationDarkenMonPalette ; $F9 - special_effect SE_FLASH_SCREEN_LONG, AnimationFlashScreenLong ; $F8 - special_effect SE_SLIDE_MON_UP, AnimationSlideMonUp ; $F7 - special_effect SE_SLIDE_MON_DOWN, AnimationSlideMonDown ; $F6 - special_effect SE_FLASH_MON_PIC, AnimationFlashMonPic ; $F5 - special_effect SE_SLIDE_MON_OFF, AnimationSlideMonOff ; $F4 - special_effect SE_BLINK_MON, AnimationBlinkMon ; $F3 - special_effect SE_MOVE_MON_HORIZONTALLY, AnimationMoveMonHorizontally ; $F2 - special_effect SE_RESET_MON_POSITION, AnimationResetMonPosition ; $F1 - special_effect SE_LIGHT_SCREEN_PALETTE, AnimationLightScreenPalette ; $F0 - special_effect SE_HIDE_MON_PIC, AnimationHideMonPic ; $EF - special_effect SE_SQUISH_MON_PIC, AnimationSquishMonPic ; $EE - special_effect SE_SHOOT_BALLS_UPWARD, AnimationShootBallsUpward ; $ED - special_effect SE_SHOOT_MANY_BALLS_UPWARD, AnimationShootManyBallsUpward ; $EC - special_effect SE_BOUNCE_UP_AND_DOWN, AnimationBoundUpAndDown ; $EB - special_effect SE_MINIMIZE_MON, AnimationMinimizeMon ; $EA - special_effect SE_SLIDE_MON_DOWN_AND_HIDE, AnimationSlideMonDownAndHide ; $E9 - special_effect SE_TRANSFORM_MON, AnimationTransformMon ; $E8 - special_effect SE_LEAVES_FALLING, AnimationLeavesFalling ; $E7 - special_effect SE_PETALS_FALLING, AnimationPetalsFalling ; $E6 - special_effect SE_SLIDE_MON_HALF_OFF, AnimationSlideMonHalfOff ; $E5 - special_effect SE_SHAKE_ENEMY_HUD, AnimationShakeEnemyHUD ; $E4 - special_effect SE_SHAKE_ENEMY_HUD_2, AnimationShakeEnemyHUD ; unused--same pointer as SE_SHAKE_ENEMY_HUD ($E4) - special_effect SE_SPIRAL_BALLS_INWARD, AnimationSpiralBallsInward ; $E2 - special_effect SE_DELAY_ANIMATION_10, AnimationDelay10 ; $E1 - special_effect SE_FLASH_ENEMY_MON_PIC, AnimationFlashEnemyMonPic ; unused--same as SE_FLASH_MON_PIC ($F5), but for the enemy mon - special_effect SE_HIDE_ENEMY_MON_PIC, AnimationHideEnemyMonPic ; $DF - special_effect SE_BLINK_ENEMY_MON, AnimationBlinkEnemyMon ; $DE - special_effect SE_SHOW_MON_PIC, AnimationShowMonPic ; $DD - special_effect SE_SHOW_ENEMY_MON_PIC, AnimationShowEnemyMonPic ; $DC - special_effect SE_SLIDE_ENEMY_MON_OFF, AnimationSlideEnemyMonOff ; $DB - special_effect SE_SHAKE_BACK_AND_FORTH, AnimationShakeBackAndForth ; $DA - special_effect SE_SUBSTITUTE_MON, AnimationSubstitute ; $D9 - special_effect SE_WAVY_SCREEN, AnimationWavyScreen ; $D8 - db -1 ; end diff --git a/data/moves/animation_special_effects.asm b/data/moves/animation_special_effects.asm deleted file mode 100644 index 50c89ffb..00000000 --- a/data/moves/animation_special_effects.asm +++ /dev/null @@ -1,32 +0,0 @@ -anim_special_effect: MACRO - db \1 - dw \2 -ENDM - -AnimationIdSpecialEffects: - ; animation id, effect routine address - anim_special_effect MEGA_PUNCH, AnimationFlashScreen - anim_special_effect GUILLOTINE, AnimationFlashScreen - anim_special_effect MEGA_KICK, AnimationFlashScreen - anim_special_effect HEADBUTT, AnimationFlashScreen - anim_special_effect TAIL_WHIP, TailWhipAnimationUnused - anim_special_effect GROWL, DoGrowlSpecialEffects - anim_special_effect DISABLE, AnimationFlashScreen - anim_special_effect BLIZZARD, DoBlizzardSpecialEffects - anim_special_effect BUBBLEBEAM, AnimationFlashScreen - anim_special_effect HYPER_BEAM, FlashScreenEveryFourFrameBlocks - anim_special_effect THUNDERBOLT, FlashScreenEveryEightFrameBlocks - anim_special_effect REFLECT, AnimationFlashScreen - anim_special_effect SELFDESTRUCT, DoExplodeSpecialEffects - anim_special_effect SPORE, AnimationFlashScreen - anim_special_effect EXPLOSION, DoExplodeSpecialEffects - anim_special_effect ROCK_SLIDE, DoRockSlideSpecialEffects - anim_special_effect TRADE_BALL_DROP_ANIM, TradeHidePokemon - anim_special_effect TRADE_BALL_SHAKE_ANIM, TradeShakePokeball - anim_special_effect TRADE_BALL_TILT_ANIM, TradeJumpPokeball - anim_special_effect TOSS_ANIM, DoBallTossSpecialEffects - anim_special_effect SHAKE_ANIM, DoBallShakeSpecialEffects - anim_special_effect POOF_ANIM, DoPoofSpecialEffects - anim_special_effect GREATTOSS_ANIM, DoBallTossSpecialEffects - anim_special_effect ULTRATOSS_ANIM, DoBallTossSpecialEffects - db -1 ; end diff --git a/data/moves/animations.asm b/data/moves/animations.asm index 6f262952..40cb89fa 100755 --- a/data/moves/animations.asm +++ b/data/moves/animations.asm @@ -203,3426 +203,1072 @@ AttackAnimationPointers: dw ThrowBaitAnim dw ZigZagScreenAnim -; each animation is a list of subanimations and special effects -; if first byte < $56 -; db tileset_and_delay, sound_id, subanimation_id -; if first byte >= $D8 -; db special_effect_id, sound_id -; $FF terminated +; each animation is a list of subanimations +; and/or special effects, terminated by -1 + +;\1: sound_id +;\2: special_effect_id or subanimation_id +; if \2 is a subanimation_id: +;\3: tileset_id +;\4: delay +battle_anim: MACRO + IF _NARG == 4 + db (\3 << 6) | \4 + db \1 - 1 + db \2 + ELSE + db \2 + db \1 - 1 + ENDC +ENDM + ZigZagScreenAnim: - db SE_WAVY_SCREEN, $FF - db $FF + battle_anim NO_MOVE, SE_WAVY_SCREEN + db -1 ; end PoundAnim: StruggleAnim: - db $08, $00, $01 - db $FF + battle_anim POUND, SUBANIM_01, 0, 8 + db -1 ; end KarateChopAnim: - db $08, $01, $03 - db $FF + battle_anim KARATE_CHOP, SUBANIM_03, 0, 8 + db -1 ; end DoubleSlapAnim: - db $05, $02, $01 - db $05, $02, $01 - db $FF + battle_anim DOUBLESLAP, SUBANIM_01, 0, 5 + battle_anim DOUBLESLAP, SUBANIM_01, 0, 5 + db -1 ; end CometPunchAnim: - db $04, $03, $02 - db $04, $03, $02 - db $FF + battle_anim COMET_PUNCH, SUBANIM_02, 0, 4 + battle_anim COMET_PUNCH, SUBANIM_02, 0, 4 + db -1 ; end MegaPunchAnim: - db $46, $04, $04 - db $FF + battle_anim MEGA_PUNCH, SUBANIM_04, 1, 6 + db -1 ; end PayDayAnim: - db $08, $00, $01 - db $04, $05, $52 - db $FF + battle_anim POUND, SUBANIM_01, 0, 8 + battle_anim PAY_DAY, SUBANIM_52, 0, 4 + db -1 ; end FirePunchAnim: - db $06, $06, $02 - db $46, $FF, $11 - db $FF + battle_anim FIRE_PUNCH, SUBANIM_02, 0, 6 + battle_anim NO_MOVE, SUBANIM_11, 1, 6 + db -1 ; end IcePunchAnim: - db $06, $07, $02 - db $10, $FF, $2F - db $FF + battle_anim ICE_PUNCH, SUBANIM_02, 0, 6 + battle_anim NO_MOVE, SUBANIM_2F, 0, 16 + db -1 ; end ThunderPunchAnim: - db $06, $08, $02 - db SE_DARK_SCREEN_PALETTE, $FF - db $46, $FF, $2B - db SE_RESET_SCREEN_PALETTE, $FF - db $FF + battle_anim THUNDERPUNCH, SUBANIM_02, 0, 6 + battle_anim NO_MOVE, SE_DARK_SCREEN_PALETTE + battle_anim NO_MOVE, SUBANIM_2B, 1, 6 + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end ScratchAnim: - db $06, $09, $0F - db $FF + battle_anim SCRATCH, SUBANIM_0F, 0, 6 + db -1 ; end VicegripAnim: - db $08, $0A, $2A - db $FF + battle_anim VICEGRIP, SUBANIM_2A, 0, 8 + db -1 ; end GuillotineAnim: - db $06, $0B, $2A - db $FF + battle_anim GUILLOTINE, SUBANIM_2A, 0, 6 + db -1 ; end RazorWindAnim: - db $04, $0C, $16 - db $FF + battle_anim RAZOR_WIND, SUBANIM_16, 0, 4 + db -1 ; end SwordsDanceAnim: - db $46, $0D, $18 - db $46, $0D, $18 - db $46, $0D, $18 - db $FF + battle_anim SWORDS_DANCE, SUBANIM_18, 1, 6 + battle_anim SWORDS_DANCE, SUBANIM_18, 1, 6 + battle_anim SWORDS_DANCE, SUBANIM_18, 1, 6 + db -1 ; end CutAnim: - db SE_DARK_SCREEN_FLASH, $0E - db $04, $FF, $16 - db $FF + battle_anim CUT, SE_DARK_SCREEN_FLASH + battle_anim NO_MOVE, SUBANIM_16, 0, 4 + db -1 ; end GustAnim: - db $46, $0F, $10 - db $06, $FF, $02 - db $FF + battle_anim GUST, SUBANIM_10, 1, 6 + battle_anim NO_MOVE, SUBANIM_02, 0, 6 + db -1 ; end WingAttackAnim: - db $46, $10, $04 - db $FF + battle_anim WING_ATTACK, SUBANIM_04, 1, 6 + db -1 ; end WhirlwindAnim: - db $46, $11, $10 - db SE_SLIDE_ENEMY_MON_OFF, $FF - db $FF + battle_anim WHIRLWIND, SUBANIM_10, 1, 6 + battle_anim NO_MOVE, SE_SLIDE_ENEMY_MON_OFF + db -1 ; end FlyAnim: - db $46, $12, $04 - db SE_SHOW_MON_PIC, $FF - db $FF + battle_anim FLY, SUBANIM_04, 1, 6 + battle_anim NO_MOVE, SE_SHOW_MON_PIC + db -1 ; end BindAnim: - db $04, $13, $23 - db $04, $13, $23 - db $FF + battle_anim BIND, SUBANIM_23, 0, 4 + battle_anim BIND, SUBANIM_23, 0, 4 + db -1 ; end SlamAnim: - db $06, $14, $02 - db $FF + battle_anim SLAM, SUBANIM_02, 0, 6 + db -1 ; end VineWhipAnim: - db $01, $15, $16 - db $08, $FF, $01 - db $FF + battle_anim VINE_WHIP, SUBANIM_16, 0, 1 + battle_anim NO_MOVE, SUBANIM_01, 0, 8 + db -1 ; end StompAnim: - db $48, $16, $05 - db $FF + battle_anim STOMP, SUBANIM_05, 1, 8 + db -1 ; end DoubleKickAnim: - db $08, $17, $01 - db $08, $17, $01 - db $FF + battle_anim DOUBLE_KICK, SUBANIM_01, 0, 8 + battle_anim DOUBLE_KICK, SUBANIM_01, 0, 8 + db -1 ; end MegaKickAnim: - db $46, $18, $04 - db $FF + battle_anim MEGA_KICK, SUBANIM_04, 1, 6 + db -1 ; end JumpKickAnim: - db $46, $19, $04 - db $FF + battle_anim JUMP_KICK, SUBANIM_04, 1, 6 + db -1 ; end RollingKickAnim: - db SE_DARK_SCREEN_FLASH, $1A - db $46, $FF, $04 - db $FF + battle_anim ROLLING_KICK, SE_DARK_SCREEN_FLASH + battle_anim NO_MOVE, SUBANIM_04, 1, 6 + db -1 ; end SandAttackAnim: - db $46, $1B, $28 - db $FF + battle_anim SAND_ATTACK, SUBANIM_28, 1, 6 + db -1 ; end HeatButtAnim: - db $46, $1C, $05 - db $FF + battle_anim HEADBUTT, SUBANIM_05, 1, 6 + db -1 ; end HornAttackAnim: - db $06, $1D, $45 - db $46, $FF, $05 - db $FF + battle_anim HORN_ATTACK, SUBANIM_45, 0, 6 + battle_anim NO_MOVE, SUBANIM_05, 1, 6 + db -1 ; end FuryAttackAnim: - db $02, $1E, $46 - db $02, $FF, $46 - db $FF + battle_anim FURY_ATTACK, SUBANIM_46, 0, 2 + battle_anim NO_MOVE, SUBANIM_46, 0, 2 + db -1 ; end HornDrillAnim: - db $42, $1F, $05 - db $42, $FF, $05 - db $42, $FF, $05 - db $42, $FF, $05 - db $42, $FF, $05 - db $FF + battle_anim HORN_DRILL, SUBANIM_05, 1, 2 + battle_anim NO_MOVE, SUBANIM_05, 1, 2 + battle_anim NO_MOVE, SUBANIM_05, 1, 2 + battle_anim NO_MOVE, SUBANIM_05, 1, 2 + battle_anim NO_MOVE, SUBANIM_05, 1, 2 + db -1 ; end TackleAnim: - db SE_MOVE_MON_HORIZONTALLY, $48 - db SE_RESET_MON_POSITION, $FF - db $FF + battle_anim LEECH_SEED, SE_MOVE_MON_HORIZONTALLY + battle_anim NO_MOVE, SE_RESET_MON_POSITION + db -1 ; end BodySlamAnim: - db SE_MOVE_MON_HORIZONTALLY, $48 - db SE_DARK_SCREEN_FLASH, $FF - db SE_DARK_SCREEN_FLASH, $FF - db SE_RESET_MON_POSITION, $FF - db $FF + battle_anim LEECH_SEED, SE_MOVE_MON_HORIZONTALLY + battle_anim NO_MOVE, SE_DARK_SCREEN_FLASH + battle_anim NO_MOVE, SE_DARK_SCREEN_FLASH + battle_anim NO_MOVE, SE_RESET_MON_POSITION + db -1 ; end WrapAnim: - db $04, $22, $23 - db $04, $22, $23 - db $04, $22, $23 - db $FF + battle_anim WRAP, SUBANIM_23, 0, 4 + battle_anim WRAP, SUBANIM_23, 0, 4 + battle_anim WRAP, SUBANIM_23, 0, 4 + db -1 ; end TakeDownAnim: - db SE_MOVE_MON_HORIZONTALLY, $48 - db SE_DARK_SCREEN_FLASH, $23 - db SE_RESET_MON_POSITION, $FF - db $FF + battle_anim LEECH_SEED, SE_MOVE_MON_HORIZONTALLY + battle_anim TAKE_DOWN, SE_DARK_SCREEN_FLASH + battle_anim NO_MOVE, SE_RESET_MON_POSITION + db -1 ; end ThrashAnim: - db $46, $24, $04 - db $FF + battle_anim THRASH, SUBANIM_04, 1, 6 + db -1 ; end DoubleEdgeAnim: - db SE_LIGHT_SCREEN_PALETTE, $48 - db $06, $FF, $2D - db SE_RESET_SCREEN_PALETTE, $FF - db SE_MOVE_MON_HORIZONTALLY, $FF - db SE_DARK_SCREEN_FLASH, $25 - db SE_RESET_MON_POSITION, $FF - db $FF + battle_anim LEECH_SEED, SE_LIGHT_SCREEN_PALETTE + battle_anim NO_MOVE, SUBANIM_2D, 0, 6 + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + battle_anim NO_MOVE, SE_MOVE_MON_HORIZONTALLY + battle_anim DOUBLE_EDGE, SE_DARK_SCREEN_FLASH + battle_anim NO_MOVE, SE_RESET_MON_POSITION + db -1 ; end TailWhipAnim: - db SE_MOVE_MON_HORIZONTALLY, $84 - db SE_DELAY_ANIMATION_10, $FF - db SE_RESET_MON_POSITION, $84 - db SE_DELAY_ANIMATION_10, $FF - db SE_MOVE_MON_HORIZONTALLY, $84 - db SE_DELAY_ANIMATION_10, $FF - db SE_RESET_MON_POSITION, $84 - db $FF + battle_anim AMNESIA, SE_MOVE_MON_HORIZONTALLY + battle_anim NO_MOVE, SE_DELAY_ANIMATION_10 + battle_anim AMNESIA, SE_RESET_MON_POSITION + battle_anim NO_MOVE, SE_DELAY_ANIMATION_10 + battle_anim AMNESIA, SE_MOVE_MON_HORIZONTALLY + battle_anim NO_MOVE, SE_DELAY_ANIMATION_10 + battle_anim AMNESIA, SE_RESET_MON_POSITION + db -1 ; end PoisonStingAnim: - db $06, $27, $00 - db $FF + battle_anim POISON_STING, SUBANIM_00, 0, 6 + db -1 ; end TwineedleAnim: - db $05, $28, $01 - db $05, $28, $01 - db $FF + battle_anim TWINEEDLE, SUBANIM_01, 0, 5 + battle_anim TWINEEDLE, SUBANIM_01, 0, 5 + db -1 ; end PinMissileAnim: - db $03, $29, $01 - db $FF + battle_anim PIN_MISSILE, SUBANIM_01, 0, 3 + db -1 ; end LeerAnim: - db SE_DARK_SCREEN_PALETTE, $48 - db SE_DARK_SCREEN_FLASH, $2A - db SE_DARK_SCREEN_FLASH, $2A - db SE_RESET_SCREEN_PALETTE, $FF - db $FF + battle_anim LEECH_SEED, SE_DARK_SCREEN_PALETTE + battle_anim LEER, SE_DARK_SCREEN_FLASH + battle_anim LEER, SE_DARK_SCREEN_FLASH + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end BiteAnim: - db $08, $2B, $02 - db $FF + battle_anim BITE, SUBANIM_02, 0, 8 + db -1 ; end GrowlAnim: - db $46, $2C, $12 - db $FF + battle_anim GROWL, SUBANIM_12, 1, 6 + db -1 ; end RoarAnim: - db $46, $2D, $15 - db $46, $2D, $15 - db $46, $2D, $15 - db $FF + battle_anim ROAR, SUBANIM_15, 1, 6 + battle_anim ROAR, SUBANIM_15, 1, 6 + battle_anim ROAR, SUBANIM_15, 1, 6 + db -1 ; end SingAnim: - db $46, $2E, $12 - db $50, $FF, $40 - db $50, $FF, $40 - db $FF + battle_anim SING, SUBANIM_12, 1, 6 + battle_anim NO_MOVE, SUBANIM_40, 1, 16 + battle_anim NO_MOVE, SUBANIM_40, 1, 16 + db -1 ; end SupersonicAnim: - db $06, $2F, $31 - db $FF + battle_anim SUPERSONIC, SUBANIM_31, 0, 6 + db -1 ; end SonicBoomAnim: - db $46, $2D, $15 - db $46, $2D, $15 - db $46, $0F, $10 - db $46, $FF, $05 - db $FF + battle_anim ROAR, SUBANIM_15, 1, 6 + battle_anim ROAR, SUBANIM_15, 1, 6 + battle_anim GUST, SUBANIM_10, 1, 6 + battle_anim NO_MOVE, SUBANIM_05, 1, 6 + db -1 ; end DisableAnim: - db SE_DARK_SCREEN_PALETTE, $48 - db SE_DARK_SCREEN_FLASH, $2A - db SE_DARK_SCREEN_FLASH, $2A - db SE_RESET_SCREEN_PALETTE, $FF - db $FF + battle_anim LEECH_SEED, SE_DARK_SCREEN_PALETTE + battle_anim LEER, SE_DARK_SCREEN_FLASH + battle_anim LEER, SE_DARK_SCREEN_FLASH + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end AcidAnim: - db $46, $32, $13 - db $46, $32, $14 - db $FF + battle_anim ACID, SUBANIM_13, 1, 6 + battle_anim ACID, SUBANIM_14, 1, 6 + db -1 ; end EmberAnim: - db $46, $33, $11 - db $FF + battle_anim EMBER, SUBANIM_11, 1, 6 + db -1 ; end FlamethrowerAnim: - db $46, $34, $1F - db $46, $34, $0C - db $46, $34, $0D - db $FF + battle_anim FLAMETHROWER, SUBANIM_1F, 1, 6 + battle_anim FLAMETHROWER, SUBANIM_0C, 1, 6 + battle_anim FLAMETHROWER, SUBANIM_0D, 1, 6 + db -1 ; end MistAnim: - db SE_LIGHT_SCREEN_PALETTE, $FF - db SE_WATER_DROPLETS_EVERYWHERE, $38 - db SE_RESET_SCREEN_PALETTE, $FF - db $FF + battle_anim NO_MOVE, SE_LIGHT_SCREEN_PALETTE + battle_anim SURF, SE_WATER_DROPLETS_EVERYWHERE + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end WaterGunAnim: - db $06, $36, $2C - db $FF + battle_anim WATER_GUN, SUBANIM_2C, 0, 6 + db -1 ; end HydroPumpAnim: - db $06, $37, $1A - db $06, $37, $1A - db $FF + battle_anim HYDRO_PUMP, SUBANIM_1A, 0, 6 + battle_anim HYDRO_PUMP, SUBANIM_1A, 0, 6 + db -1 ; end SurfAnim: - db SE_WATER_DROPLETS_EVERYWHERE, $38 - db $06, $37, $1A - db $FF + battle_anim SURF, SE_WATER_DROPLETS_EVERYWHERE + battle_anim HYDRO_PUMP, SUBANIM_1A, 0, 6 + db -1 ; end IceBeamAnim: - db $03, $39, $2E - db $10, $FF, $2F - db $FF + battle_anim ICE_BEAM, SUBANIM_2E, 0, 3 + battle_anim NO_MOVE, SUBANIM_2F, 0, 16 + db -1 ; end BlizzardAnim: - db $04, $3A, $38 - db $04, $37, $38 - db $FF + battle_anim BLIZZARD, SUBANIM_38, 0, 4 + battle_anim HYDRO_PUMP, SUBANIM_38, 0, 4 + db -1 ; end PsyBeamAnim: - db $03, $3B, $2E - db SE_FLASH_SCREEN_LONG, $FF - db $FF + battle_anim PSYBEAM, SUBANIM_2E, 0, 3 + battle_anim NO_MOVE, SE_FLASH_SCREEN_LONG + db -1 ; end BubbleBeamAnim: - db $12, $3C, $35 - db $FF + battle_anim BUBBLEBEAM, SUBANIM_35, 0, 18 + db -1 ; end AuroraBeamAnim: - db $03, $3D, $2E - db SE_DELAY_ANIMATION_10, $FF - db SE_DELAY_ANIMATION_10, $FF - db $FF + battle_anim AURORA_BEAM, SUBANIM_2E, 0, 3 + battle_anim NO_MOVE, SE_DELAY_ANIMATION_10 + battle_anim NO_MOVE, SE_DELAY_ANIMATION_10 + db -1 ; end HyperBeamAnim: - db SE_DARK_SCREEN_PALETTE, $48 - db SE_SPIRAL_BALLS_INWARD, $FF - db $02, $3E, $2E - db SE_DARK_SCREEN_FLASH, $FF - db SE_DARK_SCREEN_FLASH, $FF - db $46, $04, $04 - db SE_RESET_SCREEN_PALETTE, $FF - db $FF + battle_anim LEECH_SEED, SE_DARK_SCREEN_PALETTE + battle_anim NO_MOVE, SE_SPIRAL_BALLS_INWARD + battle_anim HYPER_BEAM, SUBANIM_2E, 0, 2 + battle_anim NO_MOVE, SE_DARK_SCREEN_FLASH + battle_anim NO_MOVE, SE_DARK_SCREEN_FLASH + battle_anim MEGA_PUNCH, SUBANIM_04, 1, 6 + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end PeckAnim: - db $08, $3F, $01 - db $FF + battle_anim PECK, SUBANIM_01, 0, 8 + db -1 ; end DrillPeckAnim: - db $46, $40, $04 - db $FF + battle_anim DRILL_PECK, SUBANIM_04, 1, 6 + db -1 ; end SubmissionAnim: - db SE_SLIDE_MON_OFF, $41 - db $06, $FF, $01 - db SE_SHOW_MON_PIC, $FF - db $FF + battle_anim SUBMISSION, SE_SLIDE_MON_OFF + battle_anim NO_MOVE, SUBANIM_01, 0, 6 + battle_anim NO_MOVE, SE_SHOW_MON_PIC + db -1 ; end LowKickAnim: - db SE_SLIDE_MON_OFF, $42 - db $46, $FF, $04 - db SE_SHOW_MON_PIC, $FF - db $FF + battle_anim LOW_KICK, SE_SLIDE_MON_OFF + battle_anim NO_MOVE, SUBANIM_04, 1, 6 + battle_anim NO_MOVE, SE_SHOW_MON_PIC + db -1 ; end CounterAnim: - db SE_SLIDE_MON_OFF, $43 - db $46, $FF, $04 - db SE_SHOW_MON_PIC, $FF - db $FF + battle_anim COUNTER, SE_SLIDE_MON_OFF + battle_anim NO_MOVE, SUBANIM_04, 1, 6 + battle_anim NO_MOVE, SE_SHOW_MON_PIC + db -1 ; end SeismicTossAnim: - db SE_BLINK_ENEMY_MON, $FF - db $41, $8B, $4E - db SE_HIDE_ENEMY_MON_PIC, $FF - db SE_SLIDE_MON_OFF, $FF - db $42, $44, $4F - db SE_DELAY_ANIMATION_10, $FF - db SE_DELAY_ANIMATION_10, $FF - db SE_SHOW_MON_PIC, $FF - db $41, $44, $50 - db SE_SHOW_ENEMY_MON_PIC, $FF - db SE_SHAKE_SCREEN, $FF - db $FF + battle_anim NO_MOVE, SE_BLINK_ENEMY_MON + battle_anim BARRAGE, SUBANIM_4E, 1, 1 + battle_anim NO_MOVE, SE_HIDE_ENEMY_MON_PIC + battle_anim NO_MOVE, SE_SLIDE_MON_OFF + battle_anim SEISMIC_TOSS, SUBANIM_4F, 1, 2 + battle_anim NO_MOVE, SE_DELAY_ANIMATION_10 + battle_anim NO_MOVE, SE_DELAY_ANIMATION_10 + battle_anim NO_MOVE, SE_SHOW_MON_PIC + battle_anim SEISMIC_TOSS, SUBANIM_50, 1, 1 + battle_anim NO_MOVE, SE_SHOW_ENEMY_MON_PIC + battle_anim NO_MOVE, SE_SHAKE_SCREEN + db -1 ; end StrengthAnim: - db SE_MOVE_MON_HORIZONTALLY, $48 - db SE_RESET_MON_POSITION, $FF - db $46, $06, $04 - db $FF + battle_anim LEECH_SEED, SE_MOVE_MON_HORIZONTALLY + battle_anim NO_MOVE, SE_RESET_MON_POSITION + battle_anim FIRE_PUNCH, SUBANIM_04, 1, 6 + db -1 ; end AbsorbAnim: - db SE_LIGHT_SCREEN_PALETTE, $46 - db $06, $FF, $21 - db $06, $FF, $22 - db SE_RESET_SCREEN_PALETTE, $FF - db $FF + battle_anim ABSORB, SE_LIGHT_SCREEN_PALETTE + battle_anim NO_MOVE, SUBANIM_21, 0, 6 + battle_anim NO_MOVE, SUBANIM_22, 0, 6 + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end MegaDrainAnim: - db SE_LIGHT_SCREEN_PALETTE, $47 - db SE_DARK_SCREEN_FLASH, $FF - db $06, $FF, $21 - db $06, $FF, $22 - db SE_DARK_SCREEN_FLASH, $FF - db SE_RESET_SCREEN_PALETTE, $FF - db $FF + battle_anim MEGA_DRAIN, SE_LIGHT_SCREEN_PALETTE + battle_anim NO_MOVE, SE_DARK_SCREEN_FLASH + battle_anim NO_MOVE, SUBANIM_21, 0, 6 + battle_anim NO_MOVE, SUBANIM_22, 0, 6 + battle_anim NO_MOVE, SE_DARK_SCREEN_FLASH + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end LeechSeedAnim: - db $46, $48, $1B - db $55, $4D, $1C - db $FF + battle_anim LEECH_SEED, SUBANIM_1B, 1, 6 + battle_anim STUN_SPORE, SUBANIM_1C, 1, 21 + db -1 ; end GrowthAnim: - db SE_LIGHT_SCREEN_PALETTE, $49 - db SE_SPIRAL_BALLS_INWARD, $FF - db SE_RESET_SCREEN_PALETTE, $FF - db $FF + battle_anim GROWTH, SE_LIGHT_SCREEN_PALETTE + battle_anim NO_MOVE, SE_SPIRAL_BALLS_INWARD + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end RazorLeafAnim: - db SE_LEAVES_FALLING, $4A - db $41, $80, $44 - db $01, $0C, $16 - db $FF + battle_anim RAZOR_LEAF, SE_LEAVES_FALLING + battle_anim SWIFT, SUBANIM_44, 1, 1 + battle_anim RAZOR_WIND, SUBANIM_16, 0, 1 + db -1 ; end SolarBeamAnim: - db $06, $4B, $2E - db $06, $FF, $01 - db $FF + battle_anim SOLARBEAM, SUBANIM_2E, 0, 6 + battle_anim NO_MOVE, SUBANIM_01, 0, 6 + db -1 ; end PoisonPowderAnim: - db $06, $4C, $36 - db $FF + battle_anim POISONPOWDER, SUBANIM_36, 0, 6 + db -1 ; end StunSporeAnim: - db $06, $4D, $36 - db $FF + battle_anim STUN_SPORE, SUBANIM_36, 0, 6 + db -1 ; end SleepPowderAnim: - db $06, $4E, $36 - db $FF + battle_anim SLEEP_POWDER, SUBANIM_36, 0, 6 + db -1 ; end PedalDanceAnim: - db SE_LIGHT_SCREEN_PALETTE, $4F - db SE_PETALS_FALLING, $FF - db SE_RESET_SCREEN_PALETTE, $FF - db $FF + battle_anim PETAL_DANCE, SE_LIGHT_SCREEN_PALETTE + battle_anim NO_MOVE, SE_PETALS_FALLING + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end StringShotAnim: - db $08, $50, $37 - db $FF + battle_anim STRING_SHOT, SUBANIM_37, 0, 8 + db -1 ; end DragonRageAnim: - db $46, $51, $1F - db $46, $FF, $0C - db $46, $FF, $0D - db $46, $FF, $0E - db $FF + battle_anim DRAGON_RAGE, SUBANIM_1F, 1, 6 + battle_anim NO_MOVE, SUBANIM_0C, 1, 6 + battle_anim NO_MOVE, SUBANIM_0D, 1, 6 + battle_anim NO_MOVE, SUBANIM_0E, 1, 6 + db -1 ; end FireSpinAnim: - db $46, $52, $0C - db $46, $FF, $0D - db $46, $FF, $0E - db $FF + battle_anim FIRE_SPIN, SUBANIM_0C, 1, 6 + battle_anim NO_MOVE, SUBANIM_0D, 1, 6 + battle_anim NO_MOVE, SUBANIM_0E, 1, 6 + db -1 ; end ThunderShockAnim: - db $42, $53, $29 - db $FF + battle_anim THUNDERSHOCK, SUBANIM_29, 1, 2 + db -1 ; end ThunderBoltAnim: - db $41, $54, $29 - db $41, $54, $29 - db $FF + battle_anim THUNDERBOLT, SUBANIM_29, 1, 1 + battle_anim THUNDERBOLT, SUBANIM_29, 1, 1 + db -1 ; end ThunderWaveAnim: - db $42, $55, $29 - db $02, $FF, $23 - db $04, $FF, $23 - db $FF + battle_anim THUNDER_WAVE, SUBANIM_29, 1, 2 + battle_anim NO_MOVE, SUBANIM_23, 0, 2 + battle_anim NO_MOVE, SUBANIM_23, 0, 4 + db -1 ; end ThunderAnim: - db SE_DARK_SCREEN_PALETTE, $56 - db SE_DARK_SCREEN_FLASH, $FF - db $46, $FF, $2B - db SE_DARK_SCREEN_FLASH, $FF - db $42, $54, $29 - db SE_RESET_SCREEN_PALETTE, $FF - db $FF + battle_anim THUNDER, SE_DARK_SCREEN_PALETTE + battle_anim NO_MOVE, SE_DARK_SCREEN_FLASH + battle_anim NO_MOVE, SUBANIM_2B, 1, 6 + battle_anim NO_MOVE, SE_DARK_SCREEN_FLASH + battle_anim THUNDERBOLT, SUBANIM_29, 1, 2 + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end RockThrowAnim: - db $04, $57, $30 - db $FF + battle_anim ROCK_THROW, SUBANIM_30, 0, 4 + db -1 ; end EarthquakeAnim: - db SE_SHAKE_SCREEN, $58 - db SE_SHAKE_SCREEN, $58 - db $FF + battle_anim EARTHQUAKE, SE_SHAKE_SCREEN + battle_anim EARTHQUAKE, SE_SHAKE_SCREEN + db -1 ; end FissureAnim: - db SE_DARK_SCREEN_FLASH, $59 - db SE_SHAKE_SCREEN, $FF - db SE_DARK_SCREEN_FLASH, $59 - db SE_SHAKE_SCREEN, $FF - db $FF + battle_anim FISSURE, SE_DARK_SCREEN_FLASH + battle_anim NO_MOVE, SE_SHAKE_SCREEN + battle_anim FISSURE, SE_DARK_SCREEN_FLASH + battle_anim NO_MOVE, SE_SHAKE_SCREEN + db -1 ; end DigAnim: - db $46, $5A, $04 - db SE_SLIDE_MON_UP, $FF - db $FF + battle_anim DIG, SUBANIM_04, 1, 6 + battle_anim NO_MOVE, SE_SLIDE_MON_UP + db -1 ; end ToxicAnim: - db SE_WATER_DROPLETS_EVERYWHERE, $38 - db $46, $5B, $14 - db $FF + battle_anim SURF, SE_WATER_DROPLETS_EVERYWHERE + battle_anim TOXIC, SUBANIM_14, 1, 6 + db -1 ; end ConfusionAnim: - db SE_FLASH_SCREEN_LONG, $5C - db $FF + battle_anim CONFUSION, SE_FLASH_SCREEN_LONG + db -1 ; end PsychicAnim: - db SE_FLASH_SCREEN_LONG, $5D - db SE_WAVY_SCREEN, $FF - db $FF + battle_anim PSYCHIC_M, SE_FLASH_SCREEN_LONG + battle_anim NO_MOVE, SE_WAVY_SCREEN + db -1 ; end HypnosisAnim: - db SE_FLASH_SCREEN_LONG, $5E - db $FF + battle_anim HYPNOSIS, SE_FLASH_SCREEN_LONG + db -1 ; end MeditateAnim: - db SE_LIGHT_SCREEN_PALETTE, $5F - db $46, $FF, $43 - db SE_DARK_SCREEN_FLASH, $FF - db SE_RESET_SCREEN_PALETTE, $FF - db $FF + battle_anim MEDITATE, SE_LIGHT_SCREEN_PALETTE + battle_anim NO_MOVE, SUBANIM_43, 1, 6 + battle_anim NO_MOVE, SE_DARK_SCREEN_FLASH + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end AgilityAnim: - db SE_LIGHT_SCREEN_PALETTE, $60 - db SE_RESET_SCREEN_PALETTE, $FF - db $FF + battle_anim AGILITY, SE_LIGHT_SCREEN_PALETTE + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end QuickAttackAnim: - db SE_SLIDE_MON_OFF, $61 - db $46, $FF, $04 - db SE_SHOW_MON_PIC, $FF - db $FF + battle_anim QUICK_ATTACK, SE_SLIDE_MON_OFF + battle_anim NO_MOVE, SUBANIM_04, 1, 6 + battle_anim NO_MOVE, SE_SHOW_MON_PIC + db -1 ; end RageAnim: - db $06, $62, $01 - db $FF + battle_anim RAGE, SUBANIM_01, 0, 6 + db -1 ; end TeleportAnim: - db SE_SQUISH_MON_PIC, $63 - db SE_SHOOT_BALLS_UPWARD, $FF - db $FF + battle_anim TELEPORT, SE_SQUISH_MON_PIC + battle_anim NO_MOVE, SE_SHOOT_BALLS_UPWARD + db -1 ; end NightShadeAnim: - db SE_FLASH_SCREEN_LONG, $5C - db SE_WAVY_SCREEN, $FF - db $FF + battle_anim CONFUSION, SE_FLASH_SCREEN_LONG + battle_anim NO_MOVE, SE_WAVY_SCREEN + db -1 ; end MimicAnim: - db $46, $65, $21 - db $46, $65, $22 - db $FF + battle_anim MIMIC, SUBANIM_21, 1, 6 + battle_anim MIMIC, SUBANIM_22, 1, 6 + db -1 ; end ScreechAnim: - db $46, $66, $12 - db $FF + battle_anim SCREECH, SUBANIM_12, 1, 6 + db -1 ; end DoubleTeamAnim: - db SE_DARK_SCREEN_PALETTE, $FF - db SE_DELAY_ANIMATION_10, $FF - db SE_DELAY_ANIMATION_10, $FF - db SE_DARK_SCREEN_FLASH, $FF - db SE_DARK_SCREEN_FLASH, $FF - db SE_RESET_SCREEN_PALETTE, $FF - db SE_SHAKE_BACK_AND_FORTH, $67 - db SE_SHOW_MON_PIC, $FF - db $46, $6F, $33 - db $FF + battle_anim NO_MOVE, SE_DARK_SCREEN_PALETTE + battle_anim NO_MOVE, SE_DELAY_ANIMATION_10 + battle_anim NO_MOVE, SE_DELAY_ANIMATION_10 + battle_anim NO_MOVE, SE_DARK_SCREEN_FLASH + battle_anim NO_MOVE, SE_DARK_SCREEN_FLASH + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + battle_anim DOUBLE_TEAM, SE_SHAKE_BACK_AND_FORTH + battle_anim NO_MOVE, SE_SHOW_MON_PIC + battle_anim BARRIER, SUBANIM_33, 1, 6 + db -1 ; end RecoverAnim: - db SE_BLINK_MON, $68 - db SE_LIGHT_SCREEN_PALETTE, $FF - db SE_SPIRAL_BALLS_INWARD, $FF - db SE_RESET_SCREEN_PALETTE, $FF - db $FF + battle_anim RECOVER, SE_BLINK_MON + battle_anim NO_MOVE, SE_LIGHT_SCREEN_PALETTE + battle_anim NO_MOVE, SE_SPIRAL_BALLS_INWARD + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end HardenAnim: - db SE_LIGHT_SCREEN_PALETTE, $69 - db $46, $FF, $43 - db SE_DARK_SCREEN_FLASH, $FF - db SE_RESET_SCREEN_PALETTE, $FF - db $FF + battle_anim HARDEN, SE_LIGHT_SCREEN_PALETTE + battle_anim NO_MOVE, SUBANIM_43, 1, 6 + battle_anim NO_MOVE, SE_DARK_SCREEN_FLASH + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end MinimizeAnim: - db SE_LIGHT_SCREEN_PALETTE, $6A - db SE_SPIRAL_BALLS_INWARD, $FF - db SE_MINIMIZE_MON, $FF - db SE_RESET_SCREEN_PALETTE, $FF - db $FF + battle_anim MINIMIZE, SE_LIGHT_SCREEN_PALETTE + battle_anim NO_MOVE, SE_SPIRAL_BALLS_INWARD + battle_anim NO_MOVE, SE_MINIMIZE_MON + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end SmokeScreenAnim: - db $46, $6B, $28 - db $04, $FF, $0A - db SE_DARKEN_MON_PALETTE, $FF - db SE_DELAY_ANIMATION_10, $FF - db SE_DELAY_ANIMATION_10, $FF - db SE_DARK_SCREEN_PALETTE, $FF - db SE_DELAY_ANIMATION_10, $FF - db SE_DELAY_ANIMATION_10, $FF - db SE_DELAY_ANIMATION_10, $FF - db SE_DELAY_ANIMATION_10, $FF - db SE_DELAY_ANIMATION_10, $FF - db SE_DELAY_ANIMATION_10, $FF - db SE_DARKEN_MON_PALETTE, $FF - db SE_DELAY_ANIMATION_10, $FF - db SE_RESET_SCREEN_PALETTE, $FF - db $FF + battle_anim SMOKESCREEN, SUBANIM_28, 1, 6 + battle_anim NO_MOVE, SUBANIM_0A, 0, 4 + battle_anim NO_MOVE, SE_DARKEN_MON_PALETTE + battle_anim NO_MOVE, SE_DELAY_ANIMATION_10 + battle_anim NO_MOVE, SE_DELAY_ANIMATION_10 + battle_anim NO_MOVE, SE_DARK_SCREEN_PALETTE + battle_anim NO_MOVE, SE_DELAY_ANIMATION_10 + battle_anim NO_MOVE, SE_DELAY_ANIMATION_10 + battle_anim NO_MOVE, SE_DELAY_ANIMATION_10 + battle_anim NO_MOVE, SE_DELAY_ANIMATION_10 + battle_anim NO_MOVE, SE_DELAY_ANIMATION_10 + battle_anim NO_MOVE, SE_DELAY_ANIMATION_10 + battle_anim NO_MOVE, SE_DARKEN_MON_PALETTE + battle_anim NO_MOVE, SE_DELAY_ANIMATION_10 + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end ConfuseRayAnim: - db SE_DARK_SCREEN_PALETTE, $6C - db $46, $FF, $3E - db SE_RESET_SCREEN_PALETTE, $FF - db $FF + battle_anim CONFUSE_RAY, SE_DARK_SCREEN_PALETTE + battle_anim NO_MOVE, SUBANIM_3E, 1, 6 + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end WithdrawAnim: - db SE_LIGHT_SCREEN_PALETTE, $6E - db SE_SLIDE_MON_DOWN, $FF - db $06, $FF, $51 - db SE_RESET_SCREEN_PALETTE, $FF - db SE_SHOW_MON_PIC, $FF - db $FF + battle_anim DEFENSE_CURL, SE_LIGHT_SCREEN_PALETTE + battle_anim NO_MOVE, SE_SLIDE_MON_DOWN + battle_anim NO_MOVE, SUBANIM_51, 0, 6 + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + battle_anim NO_MOVE, SE_SHOW_MON_PIC + db -1 ; end DefenseCurlAnim: - db SE_LIGHT_SCREEN_PALETTE, $6E - db $06, $FF, $43 - db SE_DARK_SCREEN_FLASH, $FF - db SE_RESET_SCREEN_PALETTE, $FF - db $FF + battle_anim DEFENSE_CURL, SE_LIGHT_SCREEN_PALETTE + battle_anim NO_MOVE, SUBANIM_43, 0, 6 + battle_anim NO_MOVE, SE_DARK_SCREEN_FLASH + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end BarrierAnim: - db $46, $6F, $33 - db $46, $6F, $33 - db $FF + battle_anim BARRIER, SUBANIM_33, 1, 6 + battle_anim BARRIER, SUBANIM_33, 1, 6 + db -1 ; end LightScreenAnim: - db SE_LIGHT_SCREEN_PALETTE, $FF - db $46, $70, $33 - db $46, $70, $33 - db SE_RESET_SCREEN_PALETTE, $FF - db $FF + battle_anim NO_MOVE, SE_LIGHT_SCREEN_PALETTE + battle_anim LIGHT_SCREEN, SUBANIM_33, 1, 6 + battle_anim LIGHT_SCREEN, SUBANIM_33, 1, 6 + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end HazeAnim: - db SE_DARKEN_MON_PALETTE, $FF - db SE_WATER_DROPLETS_EVERYWHERE, $38 - db SE_RESET_SCREEN_PALETTE, $FF - db $FF + battle_anim NO_MOVE, SE_DARKEN_MON_PALETTE + battle_anim SURF, SE_WATER_DROPLETS_EVERYWHERE + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end ReflectAnim: - db SE_DARK_SCREEN_PALETTE, $FF - db $46, $72, $33 - db $46, $72, $33 - db SE_RESET_SCREEN_PALETTE, $FF - db $FF + battle_anim NO_MOVE, SE_DARK_SCREEN_PALETTE + battle_anim REFLECT, SUBANIM_33, 1, 6 + battle_anim REFLECT, SUBANIM_33, 1, 6 + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end FocusEnergyAnim: - db SE_SPIRAL_BALLS_INWARD, $73 - db $FF + battle_anim FOCUS_ENERGY, SE_SPIRAL_BALLS_INWARD + db -1 ; end BideAnim: - db $46, $74, $04 - db $FF + battle_anim BIDE, SUBANIM_04, 1, 6 + db -1 ; end MetronomeAnim: - db SE_MOVE_MON_HORIZONTALLY, $84 - db SE_DELAY_ANIMATION_10, $FF - db SE_RESET_MON_POSITION, $84 - db SE_DELAY_ANIMATION_10, $FF - db SE_MOVE_MON_HORIZONTALLY, $84 - db SE_DELAY_ANIMATION_10, $FF - db SE_RESET_MON_POSITION, $84 - db $FF + battle_anim AMNESIA, SE_MOVE_MON_HORIZONTALLY + battle_anim NO_MOVE, SE_DELAY_ANIMATION_10 + battle_anim AMNESIA, SE_RESET_MON_POSITION + battle_anim NO_MOVE, SE_DELAY_ANIMATION_10 + battle_anim AMNESIA, SE_MOVE_MON_HORIZONTALLY + battle_anim NO_MOVE, SE_DELAY_ANIMATION_10 + battle_anim AMNESIA, SE_RESET_MON_POSITION + db -1 ; end MirrorMoveAnim: - db $08, $76, $01 - db $FF + battle_anim MIRROR_MOVE, SUBANIM_01, 0, 8 + db -1 ; end SelfdestructAnim: - db $43, $77, $34 - db $FF + battle_anim SELFDESTRUCT, SUBANIM_34, 1, 3 + db -1 ; end EggBombAnim: - db $44, $78, $41 - db $44, $78, $42 - db $FF + battle_anim EGG_BOMB, SUBANIM_41, 1, 4 + battle_anim EGG_BOMB, SUBANIM_42, 1, 4 + db -1 ; end LickAnim: - db $46, $7B, $14 - db $FF + battle_anim SLUDGE, SUBANIM_14, 1, 6 + db -1 ; end SmogAnim: - db SE_DARKEN_MON_PALETTE, $48 - db $46, $7A, $19 - db SE_RESET_SCREEN_PALETTE, $FF - db $FF + battle_anim LEECH_SEED, SE_DARKEN_MON_PALETTE + battle_anim SMOG, SUBANIM_19, 1, 6 + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end SludgeAnim: - db $46, $7B, $13 - db $46, $7B, $14 - db $FF + battle_anim SLUDGE, SUBANIM_13, 1, 6 + battle_anim SLUDGE, SUBANIM_14, 1, 6 + db -1 ; end BoneClubAnim: - db $08, $7C, $02 - db $FF + battle_anim BONE_CLUB, SUBANIM_02, 0, 8 + db -1 ; end FireBlastAnim: - db $46, $7D, $1F - db $46, $FF, $20 - db $46, $FF, $20 - db $46, $FF, $0C - db $46, $FF, $0D - db $FF + battle_anim FIRE_BLAST, SUBANIM_1F, 1, 6 + battle_anim NO_MOVE, SUBANIM_20, 1, 6 + battle_anim NO_MOVE, SUBANIM_20, 1, 6 + battle_anim NO_MOVE, SUBANIM_0C, 1, 6 + battle_anim NO_MOVE, SUBANIM_0D, 1, 6 + db -1 ; end WaterfallAnim: - db SE_SLIDE_MON_DOWN, $48 - db $06, $37, $1A - db $08, $FF, $02 - db SE_SLIDE_MON_UP, $FF - db $FF + battle_anim LEECH_SEED, SE_SLIDE_MON_DOWN + battle_anim HYDRO_PUMP, SUBANIM_1A, 0, 6 + battle_anim NO_MOVE, SUBANIM_02, 0, 8 + battle_anim NO_MOVE, SE_SLIDE_MON_UP + db -1 ; end ClampAnim: - db $08, $7F, $2A - db $06, $83, $23 - db $06, $83, $23 - db $FF + battle_anim CLAMP, SUBANIM_2A, 0, 8 + battle_anim CONSTRICT, SUBANIM_23, 0, 6 + battle_anim CONSTRICT, SUBANIM_23, 0, 6 + db -1 ; end SwiftAnim: - db $43, $80, $3F - db $FF + battle_anim SWIFT, SUBANIM_3F, 1, 3 + db -1 ; end SkullBashAnim: - db $46, $81, $05 - db $FF + battle_anim SKULL_BASH, SUBANIM_05, 1, 6 + db -1 ; end SpikeCannonAnim: - db $44, $82, $04 - db $FF + battle_anim SPIKE_CANNON, SUBANIM_04, 1, 4 + db -1 ; end ConstrictAnim: - db $06, $83, $23 - db $06, $83, $23 - db $06, $83, $23 - db $FF + battle_anim CONSTRICT, SUBANIM_23, 0, 6 + battle_anim CONSTRICT, SUBANIM_23, 0, 6 + battle_anim CONSTRICT, SUBANIM_23, 0, 6 + db -1 ; end AmnesiaAnim: - db $08, $84, $25 - db $08, $84, $25 - db $FF + battle_anim AMNESIA, SUBANIM_25, 0, 8 + battle_anim AMNESIA, SUBANIM_25, 0, 8 + db -1 ; end KinesisAnim: - db $08, $85, $01 - db $FF + battle_anim KINESIS, SUBANIM_01, 0, 8 + db -1 ; end SoftboiledAnim: - db SE_SLIDE_MON_HALF_OFF, $48 - db $08, $86, $4C - db SE_LIGHT_SCREEN_PALETTE, $FF - db SE_SPIRAL_BALLS_INWARD, $FF - db SE_RESET_SCREEN_PALETTE, $FF - db SE_SHOW_MON_PIC, $FF - db $FF + battle_anim LEECH_SEED, SE_SLIDE_MON_HALF_OFF + battle_anim SOFTBOILED, SUBANIM_4C, 0, 8 + battle_anim NO_MOVE, SE_LIGHT_SCREEN_PALETTE + battle_anim NO_MOVE, SE_SPIRAL_BALLS_INWARD + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + battle_anim NO_MOVE, SE_SHOW_MON_PIC + db -1 ; end HiJumpKickAnim: - db $46, $87, $04 - db $FF + battle_anim HI_JUMP_KICK, SUBANIM_04, 1, 6 + db -1 ; end GlareAnim: - db SE_DARK_SCREEN_PALETTE, $48 - db SE_DARK_SCREEN_FLASH, $88 - db SE_DARK_SCREEN_FLASH, $FF - db SE_RESET_SCREEN_PALETTE, $FF - db $FF + battle_anim LEECH_SEED, SE_DARK_SCREEN_PALETTE + battle_anim GLARE, SE_DARK_SCREEN_FLASH + battle_anim NO_MOVE, SE_DARK_SCREEN_FLASH + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end DreamEaterAnim: - db SE_FLASH_SCREEN_LONG, $89 - db SE_DARK_SCREEN_PALETTE, $89 - db $08, $89, $02 - db SE_RESET_SCREEN_PALETTE, $FF - db $FF + battle_anim DREAM_EATER, SE_FLASH_SCREEN_LONG + battle_anim DREAM_EATER, SE_DARK_SCREEN_PALETTE + battle_anim DREAM_EATER, SUBANIM_02, 0, 8 + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end PoisonGasAnim: - db $46, $8A, $19 - db $FF + battle_anim POISON_GAS, SUBANIM_19, 1, 6 + db -1 ; end BarrageAnim: - db $43, $8B, $41 - db $05, $FF, $55 - db $FF + battle_anim BARRAGE, SUBANIM_41, 1, 3 + battle_anim NO_MOVE, SUBANIM_55, 0, 5 + db -1 ; end LeechLifeAnim: - db $08, $8C, $02 - db SE_DARK_SCREEN_FLASH, $FF - db $06, $FF, $21 - db $06, $FF, $22 - db SE_DARK_SCREEN_FLASH, $FF - db $FF + battle_anim LEECH_LIFE, SUBANIM_02, 0, 8 + battle_anim NO_MOVE, SE_DARK_SCREEN_FLASH + battle_anim NO_MOVE, SUBANIM_21, 0, 6 + battle_anim NO_MOVE, SUBANIM_22, 0, 6 + battle_anim NO_MOVE, SE_DARK_SCREEN_FLASH + db -1 ; end LovelyKissAnim: - db $06, $8D, $12 - db $FF + battle_anim LOVELY_KISS, SUBANIM_12, 0, 6 + db -1 ; end SkyAttackAnim: - db SE_SQUISH_MON_PIC, $8E - db SE_SHOOT_BALLS_UPWARD, $FF - db $46, $87, $04 - db SE_SHOW_MON_PIC, $FF - db $FF + battle_anim SKY_ATTACK, SE_SQUISH_MON_PIC + battle_anim NO_MOVE, SE_SHOOT_BALLS_UPWARD + battle_anim HI_JUMP_KICK, SUBANIM_04, 1, 6 + battle_anim NO_MOVE, SE_SHOW_MON_PIC + db -1 ; end TransformAnim: - db $46, $8F, $21 - db $44, $8F, $22 - db $08, $FF, $47 - db SE_TRANSFORM_MON, $FF - db $FF + battle_anim TRANSFORM, SUBANIM_21, 1, 6 + battle_anim TRANSFORM, SUBANIM_22, 1, 4 + battle_anim NO_MOVE, SUBANIM_47, 0, 8 + battle_anim NO_MOVE, SE_TRANSFORM_MON + db -1 ; end BubbleAnim: - db $16, $90, $35 - db $FF + battle_anim BUBBLE, SUBANIM_35, 0, 22 + db -1 ; end DizzyPunchAnim: - db $06, $91, $17 - db $06, $91, $17 - db $06, $91, $17 - db $06, $02, $02 - db $FF + battle_anim DIZZY_PUNCH, SUBANIM_17, 0, 6 + battle_anim DIZZY_PUNCH, SUBANIM_17, 0, 6 + battle_anim DIZZY_PUNCH, SUBANIM_17, 0, 6 + battle_anim DOUBLESLAP, SUBANIM_02, 0, 6 + db -1 ; end SporeAnim: - db $06, $92, $36 - db $FF + battle_anim SPORE, SUBANIM_36, 0, 6 + db -1 ; end FlashAnim: - db SE_LIGHT_SCREEN_PALETTE, $48 - db SE_DARK_SCREEN_FLASH, $88 - db SE_DARK_SCREEN_FLASH, $FF - db SE_RESET_SCREEN_PALETTE, $FF - db $FF + battle_anim LEECH_SEED, SE_LIGHT_SCREEN_PALETTE + battle_anim GLARE, SE_DARK_SCREEN_FLASH + battle_anim NO_MOVE, SE_DARK_SCREEN_FLASH + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end PsywaveAnim: - db $06, $2F, $31 - db SE_WAVY_SCREEN, $5C - db $FF + battle_anim SUPERSONIC, SUBANIM_31, 0, 6 + battle_anim CONFUSION, SE_WAVY_SCREEN + db -1 ; end SplashAnim: - db SE_BOUNCE_UP_AND_DOWN, $95 - db $FF + battle_anim SPLASH, SE_BOUNCE_UP_AND_DOWN + db -1 ; end AcidArmorAnim: - db SE_SLIDE_MON_DOWN_AND_HIDE, $96 - db $FF + battle_anim ACID_ARMOR, SE_SLIDE_MON_DOWN_AND_HIDE + db -1 ; end CrabHammerAnim: - db $46, $97, $05 - db $06, $FF, $2A - db $FF + battle_anim CRABHAMMER, SUBANIM_05, 1, 6 + battle_anim NO_MOVE, SUBANIM_2A, 0, 6 + db -1 ; end ExplosionAnim: - db $43, $98, $34 - db $FF + battle_anim EXPLOSION, SUBANIM_34, 1, 3 + db -1 ; end FurySwipesAnim: - db $04, $99, $0F - db $FF + battle_anim FURY_SWIPES, SUBANIM_0F, 0, 4 + db -1 ; end BonemerangAnim: - db $06, $9A, $02 - db $FF + battle_anim BONEMERANG, SUBANIM_02, 0, 6 + db -1 ; end RestAnim: - db $10, $9B, $3A - db $10, $9B, $3A - db $FF + battle_anim REST, SUBANIM_3A, 0, 16 + battle_anim REST, SUBANIM_3A, 0, 16 + db -1 ; end RockSlideAnim: - db $04, $9C, $1D - db $03, $9C, $1E - db $46, $9D, $04 - db $FF + battle_anim ROCK_SLIDE, SUBANIM_1D, 0, 4 + battle_anim ROCK_SLIDE, SUBANIM_1E, 0, 3 + battle_anim HYPER_FANG, SUBANIM_04, 1, 6 + db -1 ; end HyperFangAnim: - db $06, $9D, $02 - db $FF + battle_anim HYPER_FANG, SUBANIM_02, 0, 6 + db -1 ; end SharpenAnim: - db SE_LIGHT_SCREEN_PALETTE, $9E - db $46, $FF, $43 - db SE_DARK_SCREEN_FLASH, $FF - db SE_RESET_SCREEN_PALETTE, $FF - db $FF + battle_anim SHARPEN, SE_LIGHT_SCREEN_PALETTE + battle_anim NO_MOVE, SUBANIM_43, 1, 6 + battle_anim NO_MOVE, SE_DARK_SCREEN_FLASH + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end ConversionAnim: - db SE_DARK_SCREEN_FLASH, $9F - db $46, $FF, $21 - db $46, $FF, $22 - db SE_DARK_SCREEN_FLASH, $FF - db $FF + battle_anim CONVERSION, SE_DARK_SCREEN_FLASH + battle_anim NO_MOVE, SUBANIM_21, 1, 6 + battle_anim NO_MOVE, SUBANIM_22, 1, 6 + battle_anim NO_MOVE, SE_DARK_SCREEN_FLASH + db -1 ; end TriAttackAnim: - db SE_DARK_SCREEN_FLASH, $A0 - db $46, $FF, $4D - db SE_DARK_SCREEN_FLASH, $FF - db $FF + battle_anim TRI_ATTACK, SE_DARK_SCREEN_FLASH + battle_anim NO_MOVE, SUBANIM_4D, 1, 6 + battle_anim NO_MOVE, SE_DARK_SCREEN_FLASH + db -1 ; end SuperFangAnim: - db SE_DARK_SCREEN_PALETTE, $48 - db $46, $A1, $04 - db SE_RESET_SCREEN_PALETTE, $FF - db $FF + battle_anim LEECH_SEED, SE_DARK_SCREEN_PALETTE + battle_anim SUPER_FANG, SUBANIM_04, 1, 6 + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end SlashAnim: - db $06, $A2, $0F - db $FF + battle_anim SLASH, SUBANIM_0F, 0, 6 + db -1 ; end SubstituteAnim: - db SE_SLIDE_MON_OFF, $A3 - db $08, $FF, $47 - db SE_SUBSTITUTE_MON, $FF - db $FF + battle_anim SUBSTITUTE, SE_SLIDE_MON_OFF + battle_anim NO_MOVE, SUBANIM_47, 0, 8 + battle_anim NO_MOVE, SE_SUBSTITUTE_MON + db -1 ; end BallTossAnim: - db $03, $FF, $06 - db $FF + battle_anim NO_MOVE, SUBANIM_06, 0, 3 + db -1 ; end GreatTossAnim: - db $03, $FF, $07 - db $FF + battle_anim NO_MOVE, SUBANIM_07, 0, 3 + db -1 ; end UltraTossAnim: - db $02, $FF, $08 - db $FF + battle_anim NO_MOVE, SUBANIM_08, 0, 2 + db -1 ; end BallShakeAnim: - db $04, $FF, $09 - db $FF + battle_anim NO_MOVE, SUBANIM_09, 0, 4 + db -1 ; end BallPoofAnim: - db $04, $FF, $0A - db $FF + battle_anim NO_MOVE, SUBANIM_0A, 0, 4 + db -1 ; end ShowPicAnim: - db SE_SHOW_ENEMY_MON_PIC, $FF - db $FF + battle_anim NO_MOVE, SE_SHOW_ENEMY_MON_PIC + db -1 ; end HidePicAnim: - db SE_HIDE_ENEMY_MON_PIC, $FF - db $FF + battle_anim NO_MOVE, SE_HIDE_ENEMY_MON_PIC + db -1 ; end EnemyFlashAnim: - db SE_SHOW_MON_PIC, $FF - db $FF + battle_anim NO_MOVE, SE_SHOW_MON_PIC + db -1 ; end PlayerFlashAnim: - db SE_FLASH_MON_PIC, $FF - db $FF + battle_anim NO_MOVE, SE_FLASH_MON_PIC + db -1 ; end EnemyHUDShakeAnim: - db SE_SHAKE_ENEMY_HUD, $FF - db $FF + battle_anim NO_MOVE, SE_SHAKE_ENEMY_HUD + db -1 ; end TradeBallDropAnim: - db $86, $FF, $48 - db $FF + battle_anim NO_MOVE, SUBANIM_48, 2, 6 + db -1 ; end TradeBallAppear1Anim: - db $84, $FF, $49 - db $FF + battle_anim NO_MOVE, SUBANIM_49, 2, 4 + db -1 ; end TradeBallAppear2Anim: - db $86, $FF, $4A - db $FF + battle_anim NO_MOVE, SUBANIM_4A, 2, 6 + db -1 ; end TradeBallPoofAnim: - db $86, $FF, $4B - db $FF + battle_anim NO_MOVE, SUBANIM_4B, 2, 6 + db -1 ; end XStatItemAnim: - db SE_LIGHT_SCREEN_PALETTE, $FF - db SE_SPIRAL_BALLS_INWARD, $FF - db SE_RESET_SCREEN_PALETTE, $FF - db $FF + battle_anim NO_MOVE, SE_LIGHT_SCREEN_PALETTE + battle_anim NO_MOVE, SE_SPIRAL_BALLS_INWARD + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end ShrinkingSquareAnim: - db SE_LIGHT_SCREEN_PALETTE, $FF - db $46, $FF, $43 - db SE_RESET_SCREEN_PALETTE, $FF - db $FF + battle_anim NO_MOVE, SE_LIGHT_SCREEN_PALETTE + battle_anim NO_MOVE, SUBANIM_43, 1, 6 + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end XStatItemBlackAnim: - db SE_DARKEN_MON_PALETTE, $FF - db SE_SPIRAL_BALLS_INWARD, $FF - db SE_RESET_SCREEN_PALETTE, $FF - db $FF + battle_anim NO_MOVE, SE_DARKEN_MON_PALETTE + battle_anim NO_MOVE, SE_SPIRAL_BALLS_INWARD + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end ShrinkingSquareBlackAnim: - db SE_DARKEN_MON_PALETTE, $FF - db $46, $FF, $43 - db SE_RESET_SCREEN_PALETTE, $FF - db $FF + battle_anim NO_MOVE, SE_DARKEN_MON_PALETTE + battle_anim NO_MOVE, SUBANIM_43, 1, 6 + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end UnusedAnim: - db SE_LIGHT_SCREEN_PALETTE, $FF - db SE_SHOOT_MANY_BALLS_UPWARD, $FF - db SE_RESET_SCREEN_PALETTE, $FF - db $FF + battle_anim NO_MOVE, SE_LIGHT_SCREEN_PALETTE + battle_anim NO_MOVE, SE_SHOOT_MANY_BALLS_UPWARD + battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE + db -1 ; end ParalyzeAnim: - db $04, $13, $24 - db $04, $13, $24 - db $FF + battle_anim BIND, SUBANIM_24, 0, 4 + battle_anim BIND, SUBANIM_24, 0, 4 + db -1 ; end PoisonAnim: - db $08, $13, $27 - db $08, $13, $27 - db $FF + battle_anim BIND, SUBANIM_27, 0, 8 + battle_anim BIND, SUBANIM_27, 0, 8 + db -1 ; end SleepPlayerAnim: - db $10, $9B, $3A - db $10, $9B, $3A - db $FF + battle_anim REST, SUBANIM_3A, 0, 16 + battle_anim REST, SUBANIM_3A, 0, 16 + db -1 ; end SleepEnemyAnim: - db $10, $9B, $3B - db $10, $9B, $3B - db $FF + battle_anim REST, SUBANIM_3B, 0, 16 + battle_anim REST, SUBANIM_3B, 0, 16 + db -1 ; end ConfusedPlayerAnim: - db $08, $84, $25 - db $08, $84, $25 - db $FF + battle_anim AMNESIA, SUBANIM_25, 0, 8 + battle_anim AMNESIA, SUBANIM_25, 0, 8 + db -1 ; end ConfusedEnemyAnim: - db $08, $84, $26 - db $08, $84, $26 - db $FF + battle_anim AMNESIA, SUBANIM_26, 0, 8 + battle_anim AMNESIA, SUBANIM_26, 0, 8 + db -1 ; end BallBlockAnim: - db $03, $FF, $0B - db $FF + battle_anim NO_MOVE, SUBANIM_0B, 0, 3 + db -1 ; end FaintAnim: - db SE_SLIDE_MON_DOWN, $5A - db $FF + battle_anim DIG, SE_SLIDE_MON_DOWN + db -1 ; end ShakeScreenAnim: - db SE_SHAKE_SCREEN, $FF - db $FF + battle_anim NO_MOVE, SE_SHAKE_SCREEN + db -1 ; end ThrowRockAnim: - db $03, $8B, $53 - db $FF + battle_anim BARRAGE, SUBANIM_53, 0, 3 + db -1 ; end ThrowBaitAnim: - db $03, $8B, $54 - db $FF - -SubanimationPointers: - dw Subanimation00 - dw Subanimation01 - dw Subanimation02 - dw Subanimation03 - dw Subanimation04 - dw Subanimation05 - dw Subanimation06 - dw Subanimation07 - dw Subanimation08 - dw Subanimation09 - dw Subanimation0a - dw Subanimation0b - dw Subanimation0c - dw Subanimation0d - dw Subanimation0e - dw Subanimation0f - dw Subanimation10 - dw Subanimation11 - dw Subanimation12 - dw Subanimation13 - dw Subanimation14 - dw Subanimation15 - dw Subanimation16 - dw Subanimation17 - dw Subanimation18 - dw Subanimation19 - dw Subanimation1a - dw Subanimation1b - dw Subanimation1c - dw Subanimation1d - dw Subanimation1e - dw Subanimation1f - dw Subanimation20 - dw Subanimation21 - dw Subanimation22 - dw Subanimation23 - dw Subanimation24 - dw Subanimation25 - dw Subanimation26 - dw Subanimation27 - dw Subanimation28 - dw Subanimation29 - dw Subanimation2a - dw Subanimation2b - dw Subanimation2c - dw Subanimation2d - dw Subanimation2e - dw Subanimation2f - dw Subanimation30 - dw Subanimation31 - dw Subanimation32 - dw Subanimation33 - dw Subanimation34 - dw Subanimation35 - dw Subanimation36 - dw Subanimation37 - dw Subanimation38 - dw Subanimation39 - dw Subanimation3a - dw Subanimation3b - dw Subanimation3c - dw Subanimation3d - dw Subanimation3e - dw Subanimation3f - dw Subanimation40 - dw Subanimation41 - dw Subanimation42 - dw Subanimation43 - dw Subanimation44 - dw Subanimation45 - dw Subanimation46 - dw Subanimation47 - dw Subanimation48 - dw Subanimation49 - dw Subanimation4a - dw Subanimation4b - dw Subanimation4c - dw Subanimation4d - dw Subanimation4e - dw Subanimation4f - dw Subanimation50 - dw Subanimation51 - dw Subanimation52 - dw Subanimation53 - dw Subanimation54 - dw Subanimation55 - -Subanimation04: - db $43 - db $02, $1a, $00 - db $02, $10, $00 - db $02, $03, $00 - -Subanimation05: - db $41 - db $02, $10, $00 - -Subanimation08: - db $0b - db $03, $30, $00 - db $03, $44, $00 - db $03, $94, $00 - db $03, $60, $00 - db $03, $76, $00 - db $03, $9f, $00 - db $03, $8d, $00 - db $03, $a0, $00 - db $03, $1a, $00 - db $03, $a1, $00 - db $03, $34, $00 - -Subanimation07: - db $0b - db $03, $30, $00 - db $03, $a2, $00 - db $03, $31, $00 - db $03, $a3, $00 - db $03, $32, $00 - db $03, $a4, $00 - db $03, $92, $00 - db $03, $a5, $00 - db $03, $15, $00 - db $03, $a6, $00 - db $03, $34, $00 - -Subanimation06: - db $0b - db $03, $30, $00 - db $03, $a2, $00 - db $03, $93, $00 - db $03, $61, $00 - db $03, $73, $00 - db $03, $a7, $00 - db $03, $33, $00 - db $03, $a8, $00 - db $03, $0e, $00 - db $03, $a9, $00 - db $03, $34, $00 - -Subanimation09: - db $04 - db $03, $21, $04 - db $04, $21, $04 - db $03, $21, $04 - db $05, $21, $04 - -Subanimation0a: - db $46 - db $06, $1b, $00 - db $07, $1b, $00 - db $08, $36, $00 - db $09, $36, $00 - db $0a, $15, $00 - db $0a, $15, $00 - -Subanimation0b: - db $04 - db $01, $2d, $00 - db $03, $2f, $00 - db $03, $35, $00 - db $03, $4d, $00 - -Subanimation55: - db $41 - db $01, $9d, $00 - -Subanimation11: - db $4c - db $0b, $26, $00 - db $0c, $26, $00 - db $0b, $26, $00 - db $0c, $26, $00 - db $0b, $28, $00 - db $0c, $28, $00 - db $0b, $28, $00 - db $0c, $28, $00 - db $0b, $27, $00 - db $0c, $27, $00 - db $0b, $27, $00 - db $0c, $27, $00 - -Subanimation2b: - db $4b - db $0d, $03, $03 - db $0e, $03, $03 - db $0f, $03, $00 - db $0d, $11, $00 - db $0d, $11, $00 - db $0d, $37, $00 - db $0d, $37, $00 - db $10, $21, $00 - db $10, $21, $00 - db $11, $1b, $00 - db $11, $1b, $00 - -Subanimation2c: - db $4c - db $12, $01, $00 - db $12, $0f, $00 - db $12, $1b, $00 - db $12, $25, $00 - db $13, $38, $00 - db $13, $38, $02 - db $14, $38, $00 - db $14, $38, $02 - db $15, $38, $00 - db $15, $38, $00 - db $16, $38, $00 - db $16, $38, $00 - -Subanimation12: - db $69 - db $17, $30, $00 - db $17, $39, $00 - db $17, $3a, $00 - db $17, $3b, $00 - db $17, $3c, $00 - db $17, $3d, $00 - db $17, $3e, $00 - db $17, $3f, $00 - db $17, $1f, $00 - -Subanimation00: - db $41 - db $01, $17, $00 - -Subanimation01: - db $42 - db $01, $0f, $00 - db $01, $1d, $00 - -Subanimation02: - db $43 - db $01, $12, $00 - db $01, $15, $00 - db $01, $1c, $00 - -Subanimation03: - db $44 - db $01, $0b, $00 - db $01, $11, $00 - db $01, $18, $00 - db $01, $1d, $00 - -Subanimation0c: - db $43 - db $0c, $20, $00 - db $0c, $21, $00 - db $0c, $23, $00 - -Subanimation0d: - db $46 - db $0c, $20, $02 - db $0c, $15, $00 - db $0c, $21, $02 - db $0c, $17, $00 - db $0c, $23, $02 - db $0c, $19, $00 - -Subanimation0e: - db $49 - db $0c, $20, $02 - db $0c, $15, $02 - db $0c, $07, $00 - db $0c, $21, $02 - db $0c, $17, $02 - db $0c, $09, $00 - db $0c, $23, $02 - db $0c, $19, $02 - db $0c, $0c, $00 - -Subanimation1f: - db $85 - db $0c, $30, $03 - db $0c, $40, $03 - db $0c, $41, $03 - db $0c, $42, $03 - db $0c, $21, $00 - -Subanimation2e: - db $2e - db $18, $43, $02 - db $75, $52, $04 - db $19, $43, $02 - db $75, $63, $04 - db $1a, $43, $02 - db $75, $4d, $04 - db $1b, $43, $02 - db $75, $97, $04 - db $1c, $43, $02 - db $75, $98, $04 - db $1d, $43, $02 - db $75, $58, $04 - db $1e, $43, $02 - db $75, $1b, $00 - -Subanimation2f: - db $44 - db $1f, $24, $00 - db $20, $20, $00 - db $21, $1a, $00 - db $22, $15, $00 - -Subanimation30: - db $52 - db $23, $00, $02 - db $23, $02, $02 - db $23, $04, $00 - db $23, $07, $02 - db $23, $02, $02 - db $23, $04, $00 - db $23, $0e, $02 - db $23, $02, $02 - db $23, $0c, $00 - db $25, $07, $00 - db $25, $0e, $00 - db $25, $15, $00 - db $24, $24, $02 - db $23, $1c, $02 - db $23, $23, $00 - db $23, $21, $02 - db $24, $28, $00 - db $24, $28, $00 - -Subanimation0f: - db $4c - db $26, $0e, $02 - db $26, $16, $02 - db $26, $1c, $00 - db $27, $0e, $02 - db $27, $16, $02 - db $27, $1c, $00 - db $28, $0e, $02 - db $28, $16, $02 - db $28, $1c, $00 - db $29, $0e, $02 - db $29, $16, $02 - db $29, $1c, $00 - -Subanimation16: - db $4c - db $2a, $05, $00 - db $2b, $05, $02 - db $2b, $0c, $02 - db $2a, $11, $04 - db $2b, $11, $02 - db $2b, $17, $02 - db $2a, $1b, $04 - db $2b, $1b, $02 - db $2b, $20, $02 - db $2a, $2f, $04 - db $2c, $00, $02 - db $2c, $00, $00 - -Subanimation10: - db $88 - db $2d, $44, $00 - db $2e, $45, $00 - db $2d, $46, $00 - db $2e, $47, $00 - db $2d, $48, $00 - db $2e, $49, $00 - db $2d, $2f, $00 - db $2e, $1a, $00 - -Subanimation31: - db $2a - db $2f, $46, $00 - db $2f, $4a, $00 - db $2f, $4b, $00 - db $2f, $4c, $00 - db $2f, $4d, $00 - db $2f, $4e, $00 - db $2f, $4f, $00 - db $2f, $50, $00 - db $2f, $2e, $00 - db $2f, $51, $00 - -Subanimation13: - db $86 - db $30, $31, $00 - db $30, $32, $00 - db $30, $92, $00 - db $30, $0e, $00 - db $30, $0f, $00 - db $30, $10, $00 - -Subanimation14: - db $49 - db $30, $10, $00 - db $30, $10, $03 - db $31, $1c, $04 - db $31, $21, $04 - db $31, $26, $00 - db $30, $10, $02 - db $31, $1d, $04 - db $31, $22, $04 - db $31, $27, $00 - -Subanimation41: - db $85 - db $03, $31, $00 - db $03, $32, $00 - db $03, $92, $00 - db $03, $0e, $00 - db $03, $10, $00 - -Subanimation42: - db $43 - db $48, $08, $00 - db $49, $08, $00 - db $5a, $08, $00 - -Subanimation15: - db $22 - db $35, $52, $00 - db $35, $53, $00 - -Subanimation17: - db $44 - db $36, $54, $00 - db $36, $55, $00 - db $37, $56, $00 - db $37, $57, $00 - -Subanimation18: - db $a4 - db $36, $54, $00 - db $36, $55, $00 - db $37, $56, $00 - db $37, $57, $00 - -Subanimation40: - db $46 - db $17, $54, $00 - db $17, $55, $00 - db $17, $0e, $00 - db $17, $56, $00 - db $17, $57, $00 - db $17, $13, $00 - -Subanimation19: - db $8c - db $38, $31, $00 - db $39, $31, $00 - db $38, $32, $00 - db $39, $32, $00 - db $38, $92, $00 - db $39, $92, $00 - db $38, $0e, $00 - db $39, $0e, $00 - db $38, $0f, $00 - db $39, $0f, $00 - db $38, $10, $00 - db $39, $10, $00 - -Subanimation1a: - db $50 - db $3a, $08, $00 - db $3b, $08, $00 - db $3c, $08, $00 - db $3d, $08, $00 - db $3e, $08, $00 - db $3f, $08, $00 - db $3e, $08, $00 - db $3f, $08, $00 - db $3a, $0b, $00 - db $3b, $0b, $00 - db $3c, $0b, $00 - db $3d, $0b, $00 - db $3e, $0b, $00 - db $3f, $0b, $00 - db $3e, $0b, $00 - db $3f, $0b, $00 - -Subanimation1b: - db $84 - db $40, $31, $00 - db $40, $32, $00 - db $40, $92, $00 - db $40, $15, $00 - -Subanimation1c: - db $43 - db $41, $58, $00 - db $41, $59, $00 - db $41, $21, $00 - -Subanimation1d: - db $af - db $24, $9a, $00 - db $23, $1b, $02 - db $24, $22, $00 - db $23, $16, $02 - db $23, $1d, $02 - db $24, $98, $00 - db $25, $2c, $04 - db $25, $2a, $04 - db $25, $99, $04 - db $25, $62, $04 - db $25, $99, $04 - db $25, $62, $04 - db $25, $99, $04 - db $25, $62, $04 - db $25, $99, $03 - -Subanimation1e: - db $01 - db $25, $75, $00 - -Subanimation20: - db $42 - db $42, $07, $00 - db $43, $07, $00 - -Subanimation21: - db $43 - db $44, $00, $00 - db $45, $08, $00 - db $46, $10, $02 - -Subanimation22: - db $8b - db $47, $10, $00 - db $47, $56, $00 - db $47, $07, $00 - db $47, $aa, $00 - db $47, $ab, $00 - db $47, $ac, $00 - db $47, $ad, $00 - db $47, $ae, $00 - db $47, $af, $00 - db $47, $89, $00 - db $47, $b0, $00 - -Subanimation2d: - db $66 - db $44, $64, $00 - db $45, $65, $00 - db $46, $66, $00 - db $47, $66, $00 - db $47, $66, $00 - db $47, $66, $00 - -Subanimation39: - db $61 - db $47, $67, $00 - -Subanimation4e: - db $41 - db $71, $0f, $03 - -Subanimation4f: - db $47 - db $71, $0f, $00 - db $71, $08, $00 - db $71, $01, $00 - db $71, $95, $00 - db $72, $95, $00 - db $73, $95, $00 - db $74, $95, $00 - -Subanimation50: - db $48 - db $74, $95, $00 - db $73, $95, $00 - db $72, $95, $00 - db $71, $95, $00 - db $71, $01, $00 - db $71, $08, $00 - db $71, $0f, $00 - db $71, $16, $00 - -Subanimation29: - db $5d - db $48, $0f, $00 - db $4a, $68, $03 - db $4b, $2a, $03 - db $49, $0f, $00 - db $4a, $68, $03 - db $4b, $2a, $00 - db $4c, $6a, $03 - db $4d, $69, $03 - db $49, $6b, $00 - db $4c, $6a, $03 - db $4d, $69, $00 - db $4a, $68, $03 - db $4b, $2a, $03 - db $49, $6c, $00 - db $4a, $68, $03 - db $4b, $2a, $00 - db $4c, $6a, $03 - db $4d, $69, $03 - db $49, $6d, $00 - db $4c, $6a, $03 - db $4d, $2a, $00 - db $4a, $68, $03 - db $4b, $2a, $03 - db $49, $0f, $00 - db $4a, $68, $03 - db $4b, $2a, $00 - db $4c, $6a, $03 - db $4d, $2a, $03 - db $49, $6b, $00 - -Subanimation2a: - db $44 - db $4e, $2b, $00 - db $4f, $2b, $00 - db $50, $2b, $00 - db $50, $2b, $00 - -Subanimation23: - db $42 - db $51, $2d, $00 - db $51, $6e, $00 - -Subanimation24: - db $a2 - db $51, $2d, $00 - db $51, $6e, $00 - -Subanimation25: - db $62 - db $52, $71, $00 - db $52, $72, $00 - -Subanimation26: - db $02 - db $52, $01, $00 - db $52, $2c, $00 - -Subanimation3a: - db $63 - db $53, $71, $00 - db $53, $7f, $00 - db $53, $81, $00 - -Subanimation3b: - db $03 - db $53, $01, $00 - db $53, $15, $00 - db $53, $2c, $00 - -Subanimation27: - db $a2 - db $54, $01, $00 - db $54, $2c, $00 - -Subanimation28: - db $23 - db $55, $73, $03 - db $56, $73, $03 - db $57, $73, $00 - -Subanimation32: - db $63 - db $47, $74, $00 - db $47, $43, $00 - db $47, $75, $00 - -Subanimation33: - db $26 - db $58, $76, $00 - db $34, $76, $00 - db $58, $76, $00 - db $34, $76, $00 - db $58, $76, $00 - db $34, $76, $00 - -Subanimation3c: - db $67 - db $59, $79, $03 - db $59, $7b, $03 - db $59, $77, $03 - db $59, $7a, $03 - db $59, $78, $03 - db $59, $7c, $03 - db $59, $76, $00 - -Subanimation3d: - db $08 - db $3a, $4d, $00 - db $3b, $4d, $00 - db $3c, $4d, $00 - db $3d, $4d, $00 - db $3e, $4d, $00 - db $3f, $4d, $00 - db $3e, $4d, $00 - db $3f, $4d, $00 - -Subanimation34: - db $35 - db $48, $7d, $00 - db $49, $7d, $00 - db $5a, $7d, $00 - db $48, $30, $00 - db $49, $30, $00 - db $5a, $30, $00 - db $48, $7e, $00 - db $49, $7e, $00 - db $5a, $7e, $00 - db $48, $7f, $00 - db $49, $7f, $00 - db $5a, $7f, $00 - db $48, $80, $00 - db $49, $80, $00 - db $5a, $80, $00 - db $48, $81, $00 - db $49, $81, $00 - db $5a, $81, $00 - db $48, $82, $00 - db $49, $82, $00 - db $5a, $82, $00 - -Subanimation35: - db $24 - db $5b, $83, $03 - db $5c, $84, $03 - db $5d, $85, $03 - db $5e, $09, $00 - -Subanimation36: - db $48 - db $5f, $2a, $00 - db $5f, $00, $00 - db $60, $2a, $00 - db $60, $00, $00 - db $61, $2a, $00 - db $61, $00, $00 - db $62, $2a, $00 - db $62, $00, $00 - -Subanimation37: - db $2a - db $63, $89, $00 - db $64, $75, $00 - db $63, $76, $00 - db $65, $0d, $00 - db $65, $86, $00 - db $65, $12, $00 - db $65, $87, $00 - db $65, $17, $00 - db $65, $88, $00 - db $65, $1a, $00 - -Subanimation38: - db $50 - db $66, $8a, $00 - db $66, $33, $00 - db $66, $2e, $00 - db $67, $24, $03 - db $66, $01, $04 - db $66, $10, $04 - db $66, $1d, $04 - db $67, $28, $03 - db $66, $2a, $04 - db $66, $0e, $04 - db $66, $1b, $04 - db $67, $26, $03 - db $66, $03, $04 - db $66, $12, $04 - db $66, $1e, $04 - db $67, $29, $00 - -Subanimation3e: - db $92 - db $02, $31, $00 - db $34, $31, $00 - db $02, $31, $00 - db $02, $32, $00 - db $34, $32, $00 - db $02, $32, $00 - db $02, $92, $00 - db $34, $92, $00 - db $02, $92, $00 - db $02, $0e, $00 - db $34, $0e, $00 - db $02, $0e, $00 - db $02, $0f, $00 - db $34, $0f, $00 - db $02, $0f, $00 - db $02, $10, $00 - db $34, $10, $00 - db $02, $10, $00 - -Subanimation3f: - db $72 - db $68, $4b, $00 - db $68, $8c, $00 - db $68, $20, $00 - db $68, $1c, $00 - db $68, $19, $00 - db $68, $14, $00 - db $68, $76, $00 - db $68, $8d, $00 - db $68, $15, $00 - db $68, $10, $00 - db $68, $0c, $00 - db $68, $06, $00 - db $68, $8e, $00 - db $68, $8f, $00 - db $68, $90, $00 - db $68, $26, $00 - db $68, $23, $00 - db $68, $1f, $00 - -Subanimation44: - db $2c - db $69, $4b, $00 - db $69, $8c, $00 - db $69, $20, $00 - db $69, $1c, $00 - db $69, $19, $00 - db $69, $14, $00 - db $69, $76, $00 - db $69, $8d, $00 - db $69, $15, $00 - db $69, $10, $00 - db $69, $0c, $00 - db $69, $06, $00 - -Subanimation43: - db $a3 - db $6a, $07, $00 - db $6b, $0f, $00 - db $6c, $17, $00 - -Subanimation45: - db $24 - db $6d, $8b, $00 - db $6d, $84, $00 - db $6d, $63, $00 - db $6d, $8c, $00 - -Subanimation46: - db $26 - db $6d, $8b, $00 - db $6d, $84, $00 - db $6d, $63, $00 - db $6d, $8c, $00 - db $6d, $0a, $00 - db $6d, $89, $00 - -Subanimation47: - db $23 - db $06, $82, $00 - db $07, $82, $00 - db $08, $96, $00 - -Subanimation48: - db $06 - db $03, $41, $04 - db $03, $48, $04 - db $04, $48, $04 - db $03, $48, $04 - db $05, $48, $04 - db $03, $48, $03 - -Subanimation49: - db $04 - db $04, $48, $04 - db $03, $48, $04 - db $05, $48, $04 - db $03, $48, $03 - -Subanimation4a: - db $01 - db $04, $84, $03 - -Subanimation4b: - db $03 - db $06, $72, $00 - db $07, $72, $00 - db $08, $72, $00 - -Subanimation4c: - db $68 - db $6f, $30, $00 - db $6e, $30, $00 - db $70, $30, $00 - db $6e, $30, $00 - db $6f, $30, $00 - db $6e, $30, $00 - db $70, $30, $00 - db $6e, $30, $00 - -Subanimation4d: - db $26 - db $32, $4b, $00 - db $33, $4f, $00 - db $32, $20, $00 - db $33, $16, $00 - db $32, $19, $00 - db $33, $0d, $00 - -Subanimation51: - db $a6 - db $76, $1b, $00 - db $34, $1b, $00 - db $76, $1b, $00 - db $34, $1b, $00 - db $76, $1b, $00 - db $34, $1b, $00 - -Subanimation52: - db $47 - db $77, $25, $00 - db $77, $9b, $00 - db $77, $1a, $00 - db $77, $9c, $00 - db $77, $2f, $00 - db $77, $50, $00 - db $77, $8c, $00 - -Subanimation53: - db $0c - db $78, $30, $00 - db $78, $a2, $00 - db $78, $93, $00 - db $78, $61, $00 - db $78, $73, $00 - db $78, $a7, $00 - db $78, $33, $00 - db $78, $a8, $00 - db $78, $0e, $00 - db $78, $a9, $00 - db $78, $34, $00 - db $01, $9e, $00 - -Subanimation54: - db $0b - db $79, $30, $00 - db $79, $a2, $00 - db $79, $93, $00 - db $79, $61, $00 - db $79, $73, $00 - db $79, $a7, $00 - db $79, $33, $00 - db $79, $a8, $00 - db $79, $0e, $00 - db $79, $a9, $00 - db $79, $34, $00 - -FrameBlockPointers: - dw FrameBlock00 - dw FrameBlock01 - dw FrameBlock02 - dw FrameBlock03 - dw FrameBlock04 - dw FrameBlock05 - dw FrameBlock06 - dw FrameBlock07 - dw FrameBlock08 - dw FrameBlock09 - dw FrameBlock0a - dw FrameBlock0b - dw FrameBlock0c - dw FrameBlock0d - dw FrameBlock0e - dw FrameBlock0f - dw FrameBlock10 - dw FrameBlock11 - dw FrameBlock12 - dw FrameBlock13 - dw FrameBlock14 - dw FrameBlock15 - dw FrameBlock16 - dw FrameBlock17 - dw FrameBlock18 - dw FrameBlock19 - dw FrameBlock1a - dw FrameBlock1b - dw FrameBlock1c - dw FrameBlock1d - dw FrameBlock1e - dw FrameBlock1f - dw FrameBlock20 - dw FrameBlock21 - dw FrameBlock22 - dw FrameBlock23 - dw FrameBlock24 - dw FrameBlock25 - dw FrameBlock26 - dw FrameBlock27 - dw FrameBlock28 - dw FrameBlock29 - dw FrameBlock2a - dw FrameBlock2b - dw FrameBlock2c - dw FrameBlock2d - dw FrameBlock2e - dw FrameBlock2f - dw FrameBlock30 - dw FrameBlock31 - dw FrameBlock32 - dw FrameBlock33 - dw FrameBlock34 - dw FrameBlock35 - dw FrameBlock36 - dw FrameBlock37 - dw FrameBlock38 - dw FrameBlock39 - dw FrameBlock3a - dw FrameBlock3b - dw FrameBlock3c - dw FrameBlock3d - dw FrameBlock3e - dw FrameBlock3f - dw FrameBlock40 - dw FrameBlock41 - dw FrameBlock42 - dw FrameBlock43 - dw FrameBlock44 - dw FrameBlock45 - dw FrameBlock46 - dw FrameBlock47 - dw SmallBlackCircleFrameBlock - dw LargeBlockCircleFrameBlock - dw FrameBlock4a - dw FrameBlock4b - dw FrameBlock4c - dw FrameBlock4d - dw FrameBlock4e - dw FrameBlock4f - dw FrameBlock50 - dw FrameBlock51 - dw FrameBlock52 - dw FrameBlock53 - dw FrameBlock54 - dw FrameBlock55 - dw FrameBlock56 - dw FrameBlock57 - dw FrameBlock58 - dw FrameBlock59 - dw FrameBlock5a - dw FrameBlock5b - dw FrameBlock5c - dw FrameBlock5d - dw FrameBlock5e - dw FrameBlock5f - dw FrameBlock60 - dw FrameBlock61 - dw FrameBlock62 - dw FrameBlock63 - dw FrameBlock64 - dw FrameBlock65 - dw FrameBlock66 - dw FrameBlock67 - dw FrameBlock68 - dw FrameBlock69 - dw FrameBlock6a - dw FrameBlock6b - dw FrameBlock6c - dw FrameBlock6d - dw FrameBlock6e - dw FrameBlock6f - dw FrameBlock70 - dw FrameBlock71 - dw FrameBlock72 - dw FrameBlock73 - dw FrameBlock74 - dw FrameBlock75 - dw FrameBlock76 - dw FrameBlock77 - dw FrameBlock78 - dw FrameBlock79 - -; FrameBlock format is as follows: -; first byte = number of tiles in FrameBlock -; -; Next, each group of 4 bytes describes a tile in the FrameBlock -; first byte = y offset -; second byte = x offset -; third byte = tile id (it's actually tile id - $31) -; fourth byte = tile properties (xflip/yflip/etc.) -FrameBlock01: - db $09 - db $00, $00, $2c, $00 - db $00, $08, $2d, $00 - db $00, $10, $2c, $20 - db $08, $00, $3c, $00 - db $08, $08, $3d, $00 - db $08, $10, $3c, $20 - db $10, $00, $2c, $40 - db $10, $08, $2d, $40 - db $10, $10, $2c, $60 - -FrameBlock02: - db $10 - db $00, $00, $20, $00 - db $00, $08, $21, $00 - db $00, $10, $21, $20 - db $00, $18, $20, $20 - db $08, $00, $30, $00 - db $08, $08, $31, $00 - db $08, $10, $31, $20 - db $08, $18, $30, $20 - db $10, $00, $30, $40 - db $10, $08, $31, $40 - db $10, $10, $31, $60 - db $10, $18, $30, $60 - db $18, $00, $20, $40 - db $18, $08, $21, $40 - db $18, $10, $21, $60 - db $18, $18, $20, $60 - -FrameBlock03: - db $04 - db $00, $00, $02, $00 - db $00, $08, $02, $20 - db $08, $00, $12, $00 - db $08, $08, $12, $20 - -FrameBlock04: - db $04 - db $00, $00, $06, $00 - db $00, $08, $07, $00 - db $08, $00, $16, $00 - db $08, $08, $17, $00 - -FrameBlock05: - db $04 - db $00, $00, $07, $20 - db $00, $08, $06, $20 - db $08, $00, $17, $20 - db $08, $08, $16, $20 - -FrameBlock06: - db $0c - db $00, $08, $23, $00 - db $08, $00, $32, $00 - db $08, $08, $33, $00 - db $00, $10, $23, $20 - db $08, $10, $33, $20 - db $08, $18, $32, $20 - db $10, $00, $32, $40 - db $10, $08, $33, $40 - db $18, $08, $23, $40 - db $10, $10, $33, $60 - db $10, $18, $32, $60 - db $18, $10, $23, $60 - -FrameBlock07: - db $10 - db $00, $00, $20, $00 - db $00, $08, $21, $00 - db $08, $00, $30, $00 - db $08, $08, $31, $00 - db $00, $10, $21, $20 - db $00, $18, $20, $20 - db $08, $10, $31, $20 - db $08, $18, $30, $20 - db $10, $00, $30, $40 - db $10, $08, $31, $40 - db $18, $00, $20, $40 - db $18, $08, $21, $40 - db $10, $10, $31, $60 - db $10, $18, $30, $60 - db $18, $10, $21, $60 - db $18, $18, $20, $60 - -FrameBlock08: - db $10 - db $00, $00, $20, $00 - db $00, $08, $21, $00 - db $08, $00, $30, $00 - db $08, $08, $31, $00 - db $00, $18, $21, $20 - db $00, $20, $20, $20 - db $08, $18, $31, $20 - db $08, $20, $30, $20 - db $18, $00, $30, $40 - db $18, $08, $31, $40 - db $20, $00, $20, $40 - db $20, $08, $21, $40 - db $18, $18, $31, $60 - db $18, $20, $30, $60 - db $20, $18, $21, $60 - db $20, $20, $20, $60 - -FrameBlock09: - db $0c - db $00, $00, $24, $00 - db $00, $08, $25, $00 - db $08, $00, $34, $00 - db $00, $18, $25, $20 - db $00, $20, $24, $20 - db $08, $20, $34, $20 - db $18, $00, $34, $40 - db $20, $00, $24, $40 - db $20, $08, $25, $40 - db $18, $20, $34, $60 - db $20, $18, $25, $60 - db $20, $20, $24, $60 - -FrameBlock0a: - db $0c - db $00, $00, $24, $00 - db $00, $08, $25, $00 - db $08, $00, $34, $00 - db $00, $20, $25, $20 - db $00, $28, $24, $20 - db $08, $28, $34, $20 - db $20, $00, $34, $40 - db $28, $00, $24, $40 - db $28, $08, $25, $40 - db $20, $28, $34, $60 - db $28, $20, $25, $60 - db $28, $28, $24, $60 - -FrameBlock0b: - db $04 - db $00, $00, $05, $00 - db $00, $08, $05, $20 - db $08, $00, $15, $00 - db $08, $08, $15, $20 - -FrameBlock0c: - db $04 - db $00, $00, $04, $00 - db $00, $08, $04, $20 - db $08, $00, $14, $00 - db $08, $08, $14, $20 - -FrameBlock0d: - db $08 - db $00, $00, $0c, $00 - db $00, $08, $0d, $00 - db $08, $00, $1c, $00 - db $08, $08, $1d, $00 - db $10, $00, $1d, $60 - db $10, $08, $1c, $60 - db $18, $00, $0d, $60 - db $18, $08, $0c, $60 - -FrameBlock0e: - db $04 - db $20, $00, $0c, $00 - db $20, $08, $0d, $00 - db $28, $00, $1c, $00 - db $28, $08, $1d, $00 - -FrameBlock0f: - db $04 - db $30, $00, $1d, $60 - db $30, $08, $1c, $60 - db $38, $00, $0d, $60 - db $38, $08, $0c, $60 - -FrameBlock10: - db $08 - db $00, $00, $0e, $00 - db $00, $08, $0f, $00 - db $08, $00, $1e, $00 - db $08, $08, $1f, $00 - db $00, $10, $0f, $20 - db $00, $18, $0e, $20 - db $08, $10, $1f, $20 - db $08, $18, $1e, $20 - -FrameBlock11: - db $08 - db $00, $00, $0e, $00 - db $00, $08, $0f, $00 - db $08, $00, $1e, $00 - db $08, $08, $1f, $00 - db $00, $20, $0f, $20 - db $00, $28, $0e, $20 - db $08, $20, $1f, $20 - db $08, $28, $1e, $20 - -FrameBlock12: - db $03 - db $00, $00, $37, $00 - db $08, $10, $37, $00 - db $00, $20, $37, $00 - -FrameBlock13: - db $04 - db $00, $00, $36, $00 - db $00, $08, $36, $20 - db $08, $00, $36, $40 - db $08, $08, $36, $60 - -FrameBlock14: - db $08 - db $00, $10, $28, $00 - db $00, $18, $28, $20 - db $08, $10, $38, $00 - db $08, $18, $38, $20 - db $00, $20, $36, $00 - db $00, $28, $36, $20 - db $08, $20, $36, $40 - db $08, $28, $36, $60 - -FrameBlock15: - db $0c - db $00, $00, $28, $00 - db $00, $08, $28, $20 - db $08, $00, $38, $00 - db $08, $08, $38, $20 - db $00, $10, $29, $00 - db $00, $18, $29, $20 - db $08, $10, $39, $00 - db $08, $18, $39, $20 - db $00, $20, $28, $00 - db $00, $28, $28, $20 - db $08, $20, $38, $00 - db $08, $28, $38, $20 - -FrameBlock16: - db $08 - db $00, $00, $29, $00 - db $00, $08, $29, $20 - db $08, $00, $39, $00 - db $08, $08, $39, $20 - db $00, $20, $29, $00 - db $00, $28, $29, $20 - db $08, $20, $39, $00 - db $08, $28, $39, $20 - -FrameBlock17: - db $04 - db $00, $00, $08, $00 - db $00, $08, $09, $00 - db $08, $00, $18, $00 - db $08, $08, $19, $00 - -FrameBlock18: - db $01 - db $18, $00, $45, $60 - -FrameBlock19: - db $02 - db $18, $08, $45, $00 - db $10, $08, $46, $60 - -FrameBlock1a: - db $02 - db $10, $10, $45, $60 - db $18, $10, $46, $00 - -FrameBlock1b: - db $02 - db $10, $18, $45, $00 - db $08, $18, $46, $60 - -FrameBlock1c: - db $02 - db $08, $20, $45, $60 - db $10, $20, $46, $00 - -FrameBlock1d: - db $02 - db $08, $28, $45, $00 - db $00, $28, $46, $60 - -FrameBlock1e: - db $02 - db $00, $30, $45, $60 - db $08, $30, $46, $00 - -FrameBlock75: - db $04 - db $00, $00, $43, $00 - db $00, $08, $43, $20 - db $08, $00, $22, $00 - db $08, $08, $43, $60 - -FrameBlock1f: - db $02 - db $00, $00, $03, $00 - db $00, $30, $03, $20 - -FrameBlock20: - db $06 - db $00, $00, $03, $00 - db $00, $30, $03, $20 - db $08, $08, $03, $00 - db $08, $28, $03, $20 - db $08, $00, $13, $00 - db $08, $30, $13, $20 - -FrameBlock21: - db $0c - db $00, $00, $03, $00 - db $00, $30, $03, $20 - db $08, $08, $03, $00 - db $08, $28, $03, $20 - db $08, $00, $13, $00 - db $08, $30, $13, $20 - db $10, $10, $03, $00 - db $10, $20, $03, $20 - db $10, $08, $13, $00 - db $10, $28, $13, $20 - db $10, $00, $03, $00 - db $10, $30, $03, $20 - -FrameBlock22: - db $13 - db $00, $00, $03, $00 - db $08, $00, $13, $00 - db $10, $00, $03, $00 - db $18, $00, $13, $00 - db $08, $08, $03, $00 - db $10, $08, $13, $00 - db $18, $08, $03, $00 - db $10, $10, $03, $00 - db $18, $10, $13, $00 - db $18, $18, $03, $00 - db $10, $20, $03, $20 - db $18, $20, $13, $20 - db $08, $28, $03, $20 - db $10, $28, $13, $20 - db $18, $28, $03, $20 - db $00, $30, $03, $20 - db $08, $30, $13, $20 - db $10, $30, $03, $20 - db $18, $30, $13, $20 - -FrameBlock23: - db $04 - db $00, $00, $0a, $00 - db $00, $08, $0b, $00 - db $08, $00, $1a, $00 - db $08, $08, $1b, $00 - -FrameBlock24: - db $02 - db $08, $00, $0a, $00 - db $08, $08, $0b, $00 - -FrameBlock25: - db $0c - db $10, $00, $0a, $00 - db $10, $08, $0b, $00 - db $18, $00, $1a, $00 - db $18, $08, $1b, $00 - db $00, $10, $0a, $00 - db $00, $18, $0b, $00 - db $08, $10, $1a, $00 - db $08, $18, $1b, $00 - db $08, $20, $0a, $00 - db $08, $28, $0b, $00 - db $10, $20, $1a, $00 - db $10, $28, $1b, $00 - -FrameBlock26: - db $04 - db $00, $10, $44, $00 - db $00, $18, $44, $20 - db $08, $10, $44, $40 - db $08, $18, $44, $60 - -FrameBlock27: - db $05 - db $08, $08, $44, $00 - db $08, $10, $44, $20 - db $10, $08, $44, $40 - db $10, $10, $44, $60 - db $00, $18, $47, $00 - -FrameBlock28: - db $06 - db $10, $00, $44, $00 - db $10, $08, $44, $20 - db $18, $00, $44, $40 - db $18, $08, $44, $60 - db $08, $10, $47, $00 - db $02, $16, $47, $00 - -FrameBlock29: - db $04 - db $18, $00, $47, $00 - db $12, $06, $47, $00 - db $0c, $0c, $47, $00 - db $06, $12, $47, $00 - -FrameBlock2a: - db $04 - db $00, $00, $44, $00 - db $00, $08, $44, $20 - db $08, $00, $44, $40 - db $08, $08, $44, $60 - -FrameBlock2b: - db $02 - db $06, $02, $47, $00 - db $00, $08, $47, $00 - -FrameBlock2c: - db $01 - db $a0, $00, $4d, $00 - -FrameBlock2d: - db $08 - db $00, $00, $26, $00 - db $00, $08, $27, $00 - db $08, $00, $36, $00 - db $08, $08, $37, $00 - db $10, $00, $28, $00 - db $10, $08, $29, $00 - db $18, $00, $38, $00 - db $18, $08, $39, $00 - -FrameBlock2e: - db $08 - db $00, $00, $27, $20 - db $00, $08, $26, $20 - db $08, $00, $37, $20 - db $08, $08, $36, $20 - db $10, $00, $29, $20 - db $10, $08, $28, $20 - db $18, $00, $39, $20 - db $18, $08, $38, $20 - -FrameBlock2f: - db $04 - db $00, $00, $0c, $00 - db $00, $08, $0d, $00 - db $08, $00, $0c, $40 - db $08, $08, $0d, $40 - -FrameBlock30: - db $04 - db $00, $00, $44, $00 - db $00, $08, $44, $20 - db $08, $00, $44, $40 - db $08, $08, $44, $60 - -FrameBlock31: - db $01 - db $00, $00, $45, $00 - -FrameBlock32: - db $07 - db $00, $00, $4d, $00 - db $00, $08, $2f, $00 - db $00, $10, $4d, $20 - db $08, $00, $4e, $00 - db $08, $08, $07, $00 - db $08, $10, $4e, $20 - db $10, $08, $3f, $00 - -FrameBlock33: - db $07 - db $00, $08, $3f, $40 - db $08, $00, $4e, $40 - db $08, $08, $07, $40 - db $08, $10, $4e, $60 - db $10, $00, $4d, $40 - db $10, $08, $2f, $40 - db $10, $10, $4d, $60 - -FrameBlock34: - db $01 - db $a0, $00, $00, $10 - -FrameBlock35: - db $06 - db $00, $00, $2a, $00 - db $00, $08, $2b, $00 - db $08, $00, $3a, $00 - db $10, $00, $3a, $40 - db $18, $00, $2a, $40 - db $18, $08, $2b, $40 - -FrameBlock36: - db $04 - db $00, $00, $00, $00 - db $00, $08, $01, $00 - db $08, $00, $10, $00 - db $08, $08, $11, $00 - -FrameBlock37: - db $04 - db $00, $00, $01, $a0 - db $00, $08, $00, $a0 - db $08, $00, $11, $a0 - db $08, $08, $10, $a0 - -FrameBlock38: - db $04 - db $00, $00, $0a, $00 - db $00, $08, $0b, $00 - db $08, $00, $1a, $00 - db $08, $08, $1b, $00 - -FrameBlock39: - db $04 - db $00, $00, $0b, $20 - db $00, $08, $0a, $20 - db $08, $00, $1b, $20 - db $08, $08, $1a, $20 - -FrameBlock3a: - db $04 - db $20, $00, $05, $00 - db $20, $08, $05, $20 - db $28, $00, $15, $00 - db $28, $08, $15, $20 - -FrameBlock3b: - db $05 - db $18, $00, $04, $00 - db $18, $08, $04, $20 - db $20, $00, $14, $00 - db $20, $08, $14, $20 - db $28, $04, $41, $00 - -FrameBlock3c: - db $06 - db $10, $00, $05, $00 - db $10, $08, $05, $20 - db $18, $00, $15, $00 - db $18, $08, $15, $20 - db $20, $04, $42, $00 - db $28, $04, $42, $00 - -FrameBlock3d: - db $07 - db $08, $00, $04, $00 - db $08, $08, $04, $20 - db $10, $00, $14, $00 - db $10, $08, $14, $20 - db $18, $04, $41, $00 - db $20, $04, $41, $00 - db $28, $04, $41, $00 - -FrameBlock3e: - db $08 - db $00, $00, $05, $00 - db $00, $08, $05, $20 - db $08, $00, $15, $00 - db $08, $08, $15, $20 - db $10, $04, $42, $00 - db $18, $04, $42, $00 - db $20, $04, $42, $00 - db $28, $04, $42, $00 - -FrameBlock3f: - db $08 - db $00, $00, $04, $00 - db $00, $08, $04, $20 - db $08, $00, $14, $00 - db $08, $08, $14, $20 - db $10, $04, $41, $00 - db $18, $04, $41, $00 - db $20, $04, $41, $00 - db $28, $04, $41, $00 - -FrameBlock40: - db $03 - db $00, $00, $3d, $00 - db $00, $08, $3d, $00 - db $08, $08, $3d, $00 - -FrameBlock41: - db $04 - db $00, $00, $06, $00 - db $00, $08, $06, $20 - db $08, $00, $16, $00 - db $08, $08, $17, $00 - -FrameBlock42: - db $0b - db $00, $10, $42, $00 - db $08, $00, $42, $00 - db $08, $08, $42, $00 - db $08, $10, $42, $00 - db $08, $18, $42, $00 - db $08, $20, $42, $00 - db $10, $10, $42, $00 - db $18, $08, $42, $00 - db $18, $18, $42, $00 - db $20, $00, $42, $00 - db $20, $20, $42, $00 - -FrameBlock43: - db $0b - db $00, $10, $41, $00 - db $08, $00, $41, $00 - db $08, $08, $41, $00 - db $08, $10, $41, $00 - db $08, $18, $41, $00 - db $08, $20, $41, $00 - db $10, $10, $41, $00 - db $18, $08, $41, $00 - db $18, $18, $41, $00 - db $20, $00, $41, $00 - db $20, $20, $41, $00 - -FrameBlock44: - db $04 - db $00, $00, $49, $00 - db $00, $28, $49, $00 - db $28, $00, $49, $00 - db $28, $28, $49, $00 - -FrameBlock45: - db $04 - db $00, $00, $49, $00 - db $00, $18, $49, $00 - db $18, $00, $49, $00 - db $18, $18, $49, $00 - -FrameBlock46: - db $04 - db $00, $00, $49, $00 - db $00, $08, $49, $00 - db $08, $00, $49, $00 - db $08, $08, $49, $00 - -FrameBlock47: - db $04 - db $00, $00, $43, $00 - db $00, $08, $43, $20 - db $08, $00, $43, $40 - db $08, $08, $43, $60 - -SmallBlackCircleFrameBlock: - db $04 - db $08, $08, $33, $00 - db $08, $10, $33, $20 - db $10, $08, $33, $40 - db $10, $10, $33, $60 - -LargeBlockCircleFrameBlock: - db $10 - db $00, $00, $22, $00 - db $00, $08, $23, $00 - db $00, $10, $23, $20 - db $00, $18, $22, $20 - db $08, $00, $32, $00 - db $08, $08, $43, $00 - db $08, $10, $43, $20 - db $08, $18, $32, $20 - db $10, $00, $32, $40 - db $10, $08, $43, $40 - db $10, $10, $43, $60 - db $10, $18, $32, $60 - db $18, $00, $22, $40 - db $18, $08, $23, $40 - db $18, $10, $23, $60 - db $18, $18, $22, $60 - -FrameBlock71: - db $10 - db $00, $00, $22, $00 - db $00, $08, $3b, $00 - db $00, $10, $23, $20 - db $00, $18, $22, $20 - db $08, $00, $32, $00 - db $08, $08, $43, $00 - db $08, $10, $43, $20 - db $08, $18, $32, $20 - db $10, $00, $32, $40 - db $10, $08, $43, $40 - db $10, $10, $43, $60 - db $10, $18, $32, $60 - db $18, $00, $22, $40 - db $18, $08, $23, $40 - db $18, $10, $23, $60 - db $18, $18, $22, $60 - -FrameBlock72: - db $0c - db $00, $00, $32, $00 - db $00, $08, $43, $00 - db $00, $10, $43, $20 - db $00, $18, $32, $20 - db $08, $00, $32, $40 - db $08, $08, $43, $40 - db $08, $10, $43, $60 - db $08, $18, $32, $60 - db $10, $00, $22, $40 - db $10, $08, $23, $40 - db $10, $10, $23, $60 - db $10, $18, $22, $60 - -FrameBlock73: - db $08 - db $00, $00, $32, $40 - db $00, $08, $43, $40 - db $00, $10, $43, $60 - db $00, $18, $32, $60 - db $08, $00, $22, $40 - db $08, $08, $23, $40 - db $08, $10, $23, $60 - db $08, $18, $22, $60 - -FrameBlock74: - db $04 - db $00, $00, $22, $40 - db $00, $08, $23, $40 - db $00, $10, $23, $60 - db $00, $18, $22, $60 - -FrameBlock4a: - db $04 - db $08, $18, $4c, $20 - db $20, $08, $4b, $00 - db $30, $20, $4c, $00 - db $18, $30, $4b, $40 - -FrameBlock4b: - db $04 - db $00, $18, $4c, $00 - db $20, $00, $4b, $40 - db $38, $20, $4c, $20 - db $18, $38, $4b, $00 - -FrameBlock4c: - db $04 - db $10, $08, $4a, $40 - db $30, $10, $4a, $00 - db $28, $30, $4a, $20 - db $08, $28, $4a, $60 - -FrameBlock4d: - db $04 - db $08, $00, $4a, $20 - db $38, $08, $4a, $60 - db $30, $38, $4a, $40 - db $00, $30, $4a, $00 - -FrameBlock4e: - db $08 - db $00, $30, $44, $00 - db $00, $38, $44, $20 - db $08, $30, $44, $40 - db $08, $38, $44, $60 - db $26, $0a, $44, $00 - db $26, $12, $44, $20 - db $2e, $0a, $44, $40 - db $2e, $12, $44, $60 - -FrameBlock4f: - db $0c - db $0e, $22, $44, $00 - db $0e, $2a, $44, $20 - db $16, $22, $44, $40 - db $16, $2a, $44, $60 - db $06, $32, $47, $00 - db $00, $38, $47, $00 - db $1a, $16, $44, $00 - db $1a, $1e, $44, $20 - db $22, $16, $44, $40 - db $22, $1e, $44, $60 - db $30, $08, $47, $00 - db $2a, $0e, $47, $00 - -FrameBlock50: - db $08 - db $06, $32, $47, $00 - db $00, $38, $47, $00 - db $12, $26, $47, $00 - db $0c, $2c, $47, $00 - db $1e, $1a, $47, $00 - db $18, $20, $47, $00 - db $2a, $0e, $47, $00 - db $24, $14, $47, $00 - -FrameBlock51: - db $08 - db $00, $00, $35, $20 - db $08, $00, $35, $40 - db $10, $00, $35, $00 - db $18, $00, $35, $60 - db $00, $40, $35, $00 - db $08, $40, $35, $60 - db $10, $40, $35, $20 - db $18, $40, $35, $40 - -FrameBlock52: - db $04 - db $00, $00, $2a, $00 - db $00, $08, $2b, $00 - db $08, $00, $3a, $00 - db $08, $08, $3b, $00 - -FrameBlock53: - db $03 - db $00, $00, $3f, $00 - db $00, $08, $3f, $00 - db $08, $06, $3f, $00 - -FrameBlock54: - db $04 - db $00, $00, $0e, $00 - db $00, $08, $0e, $20 - db $08, $00, $0f, $00 - db $08, $08, $0f, $20 - -FrameBlock55: - db $03 - db $10, $00, $2c, $00 - db $10, $08, $3c, $00 - db $10, $10, $2d, $00 - -FrameBlock56: - db $06 - db $10, $10, $31, $00 - db $10, $18, $31, $00 - db $08, $10, $2c, $00 - db $08, $18, $3c, $00 - db $08, $20, $2d, $00 - db $10, $20, $2d, $00 - -FrameBlock57: - db $09 - db $08, $20, $31, $00 - db $10, $20, $31, $00 - db $08, $28, $31, $00 - db $10, $28, $31, $00 - db $00, $20, $2c, $00 - db $00, $28, $3c, $00 - db $00, $30, $2d, $00 - db $08, $30, $2d, $00 - db $10, $30, $2d, $00 - -FrameBlock58: - db $07 - db $00, $00, $46, $00 - db $08, $02, $47, $00 - db $10, $03, $48, $00 - db $18, $04, $48, $00 - db $20, $05, $48, $00 - db $28, $05, $48, $00 - db $30, $05, $48, $00 - -FrameBlock59: - db $01 - db $00, $00, $42, $00 - -FrameBlock5a: - db $0c - db $00, $00, $24, $00 - db $00, $08, $25, $00 - db $08, $00, $34, $00 - db $00, $10, $25, $20 - db $00, $18, $24, $20 - db $08, $18, $34, $20 - db $10, $00, $34, $40 - db $18, $00, $24, $40 - db $18, $08, $25, $40 - db $10, $18, $34, $60 - db $18, $10, $25, $60 - db $18, $18, $24, $60 - -FrameBlock5b: - db $04 - db $00, $00, $43, $00 - db $00, $08, $43, $20 - db $08, $00, $43, $40 - db $08, $08, $43, $60 - -FrameBlock5c: - db $08 - db $00, $00, $49, $00 - db $02, $08, $49, $00 - db $18, $00, $49, $00 - db $10, $10, $49, $00 - db $08, $00, $43, $00 - db $08, $08, $43, $20 - db $10, $00, $43, $40 - db $10, $08, $43, $60 - -FrameBlock5d: - db $0b - db $00, $00, $49, $00 - db $18, $02, $49, $00 - db $14, $10, $49, $00 - db $08, $00, $43, $00 - db $00, $08, $43, $20 - db $10, $00, $43, $40 - db $10, $08, $43, $60 - db $04, $08, $43, $00 - db $04, $10, $43, $20 - db $0c, $08, $43, $40 - db $0c, $10, $43, $60 - -FrameBlock5e: - db $0f - db $00, $08, $49, $00 - db $08, $10, $49, $00 - db $20, $00, $49, $00 - db $08, $00, $43, $00 - db $08, $08, $43, $20 - db $10, $00, $43, $40 - db $10, $08, $43, $60 - db $10, $10, $43, $00 - db $10, $18, $43, $20 - db $18, $10, $43, $40 - db $18, $18, $43, $60 - db $20, $08, $43, $00 - db $20, $10, $43, $20 - db $28, $08, $43, $40 - db $28, $10, $43, $60 - -FrameBlock5f: - db $04 - db $00, $00, $49, $00 - db $00, $10, $49, $00 - db $00, $20, $49, $00 - db $00, $30, $49, $00 - -FrameBlock60: - db $08 - db $00, $00, $49, $00 - db $00, $10, $49, $00 - db $00, $20, $49, $00 - db $00, $30, $49, $00 - db $08, $08, $49, $00 - db $08, $18, $49, $00 - db $08, $28, $49, $00 - db $08, $38, $49, $00 - -FrameBlock61: - db $0c - db $00, $00, $49, $00 - db $00, $10, $49, $00 - db $00, $20, $49, $00 - db $00, $30, $49, $00 - db $08, $08, $49, $00 - db $08, $18, $49, $00 - db $08, $28, $49, $00 - db $08, $38, $49, $00 - db $10, $00, $49, $00 - db $10, $10, $49, $00 - db $10, $20, $49, $00 - db $10, $30, $49, $00 - -FrameBlock62: - db $0f - db $00, $00, $49, $00 - db $00, $10, $49, $00 - db $00, $20, $49, $00 - db $00, $30, $49, $00 - db $08, $08, $49, $00 - db $08, $18, $49, $00 - db $08, $28, $49, $00 - db $08, $38, $49, $00 - db $10, $00, $49, $00 - db $10, $10, $49, $00 - db $10, $20, $49, $00 - db $10, $30, $49, $00 - db $18, $08, $49, $00 - db $18, $18, $49, $00 - db $18, $28, $49, $00 - db $18, $38, $49, $00 ; unused - -FrameBlock63: - db $06 - db $10, $00, $26, $00 - db $10, $08, $27, $00 - db $08, $10, $26, $00 - db $08, $18, $27, $00 - db $00, $20, $26, $00 - db $00, $28, $27, $00 - -FrameBlock64: - db $06 - db $18, $00, $27, $00 - db $10, $08, $26, $00 - db $10, $10, $27, $00 - db $08, $18, $26, $00 - db $08, $20, $27, $00 - db $00, $28, $26, $00 - -FrameBlock65: - db $06 - db $00, $00, $1c, $00 - db $00, $08, $1d, $00 - db $10, $00, $1c, $00 - db $10, $08, $1d, $00 - db $20, $00, $1c, $00 - db $20, $08, $1d, $00 - -FrameBlock66: - db $02 - db $00, $00, $03, $00 - db $08, $00, $13, $00 - -FrameBlock67: - db $01 - db $00, $00, $03, $00 - -FrameBlock68: - db $04 - db $00, $00, $03, $00 - db $00, $08, $03, $20 - db $08, $00, $13, $00 - db $08, $08, $13, $20 - -FrameBlock69: - db $01 - db $00, $00, $06, $00 - -FrameBlock6a: - db $08 - db $00, $00, $2e, $00 - db $00, $30, $2e, $20 - db $30, $00, $2e, $40 - db $30, $30, $2e, $60 - db $00, $18, $2f, $00 - db $30, $18, $2f, $40 - db $18, $00, $3e, $00 - db $18, $30, $3e, $20 - -FrameBlock6b: - db $08 - db $00, $00, $2e, $00 - db $00, $20, $2e, $20 - db $20, $00, $2e, $40 - db $20, $20, $2e, $60 - db $00, $10, $2f, $00 - db $20, $10, $2f, $40 - db $10, $00, $3e, $00 - db $10, $20, $3e, $20 - -FrameBlock6c: - db $08 - db $00, $00, $2e, $00 - db $00, $10, $2e, $20 - db $10, $00, $2e, $40 - db $10, $10, $2e, $60 - db $00, $08, $2f, $00 - db $10, $08, $2f, $40 - db $08, $00, $3e, $00 - db $08, $10, $3e, $20 - -FrameBlock6d: - db $02 - db $00, $00, $1e, $00 - db $00, $08, $1f, $00 - -FrameBlock6e: - db $04 - db $00, $00, $48, $00 - db $00, $08, $48, $20 - db $08, $00, $12, $00 - db $08, $08, $12, $20 - -FrameBlock6f: - db $04 - db $00, $00, $4a, $00 - db $00, $08, $07, $00 - db $08, $00, $16, $00 - db $08, $08, $17, $00 - -FrameBlock70: - db $04 - db $00, $00, $07, $20 - db $00, $08, $4a, $20 - db $08, $00, $17, $20 - db $08, $08, $16, $20 - -FrameBlock76: - db $07 - db $00, $10, $2f, $00 - db $01, $08, $2f, $00 - db $01, $18, $2f, $00 - db $02, $00, $2e, $00 - db $02, $20, $2e, $20 - db $0a, $00, $3e, $00 - db $0a, $20, $3e, $20 - -FrameBlock77: - db $04 - db $00, $02, $4b, $00 - db $00, $0a, $4c, $00 - db $08, $00, $4c, $60 - db $08, $08, $4b, $60 - -FrameBlock78: - db $01 - db $00, $00, $4d, $00 - -FrameBlock79: - db $01 - db $00, $00, $4e, $00 - -FrameBlockBaseCoords: - db $10, $68 - db $10, $70 - db $10, $78 - db $10, $80 - db $10, $88 - db $10, $90 - db $10, $98 - db $18, $68 - db $18, $70 - db $18, $78 - db $34, $28 - db $18, $80 - db $18, $88 - db $18, $98 - db $20, $68 - db $20, $70 - db $20, $78 - db $20, $80 - db $20, $88 - db $20, $90 - db $20, $98 - db $28, $68 - db $28, $70 - db $28, $78 - db $28, $80 - db $28, $88 - db $30, $68 - db $30, $70 - db $30, $78 - db $30, $80 - db $30, $90 - db $30, $98 - db $38, $68 - db $38, $78 - db $38, $80 - db $38, $88 - db $40, $68 - db $40, $70 - db $40, $78 - db $40, $80 - db $40, $88 - db $40, $98 - db $10, $60 - db $18, $60 - db $20, $60 - db $28, $60 - db $30, $60 - db $40, $60 - db $58, $28 - db $43, $38 - db $33, $48 - db $20, $58 - db $32, $78 - db $58, $58 - db $2C, $6C - db $34, $80 - db $48, $70 - db $42, $36 - db $38, $44 - db $40, $52 - db $48, $60 - db $3E, $6E - db $28, $7C - db $28, $8A - db $50, $3C - db $48, $50 - db $40, $64 - db $38, $38 - db $50, $30 - db $50, $38 - db $50, $40 - db $50, $48 - db $50, $50 - db $48, $58 - db $50, $44 - db $48, $48 - db $48, $4C - db $40, $50 - db $40, $54 - db $38, $58 - db $38, $5C - db $30, $64 - db $48, $40 - db $48, $39 - db $24, $88 - db $24, $70 - db $1C, $70 - db $1C, $88 - db $34, $68 - db $34, $88 - db $68, $50 - db $60, $50 - db $68, $60 - db $58, $50 - db $60, $60 - db $68, $40 - db $40, $40 - db $38, $40 - db $0B, $60 - db $44, $48 - db $40, $14 - db $48, $1C - db $50, $24 - db $4C, $24 - db $10, $62 - db $12, $62 - db $12, $60 - db $20, $72 - db $22, $72 - db $22, $70 - db $28, $62 - db $50, $0A - db $52, $0A - db $38, $30 - db $40, $48 - db $30, $48 - db $40, $30 - db $30, $40 - db $38, $48 - db $40, $4A - db $48, $4B - db $50, $4C - db $58, $4D - db $60, $4D - db $68, $4D - db $38, $10 - db $50, $10 - db $38, $28 - db $48, $18 - db $40, $20 - db $48, $20 - db $40, $3C - db $38, $50 - db $28, $64 - db $1C, $90 - db $24, $80 - db $2C, $70 - db $30, $38 - db $10, $50 - db $3C, $40 - db $40, $58 - db $30, $58 - db $58, $48 - db $50, $58 - db $48, $68 - db $40, $18 - db $28, $58 - db $40, $38 - db $48, $38 - db $08, $70 - db $44, $1C - db $3C, $58 - db $38, $60 - db $08, $60 - db $38, $70 - db $38, $6C - db $38, $64 - db $1C, $74 - db $2E, $74 - db $34, $50 - db $2F, $60 - db $31, $70 - db $4C, $30 - db $3B, $40 - db $2D, $50 - db $26, $60 - db $2D, $70 - db $28, $50 - db $1E, $60 - db $29, $70 - db $16, $60 - db $14, $58 - db $12, $54 - db $14, $50 - db $18, $4C - db $1C, $48 - db $48, $28 - -FrameBlock00: - db $00, $00 + battle_anim BARRAGE, SUBANIM_54, 0, 3 + db -1 ; end diff --git a/data/pokemon/dex_entries.asm b/data/pokemon/dex_entries.asm index c8dc12a7..931793df 100755 --- a/data/pokemon/dex_entries.asm +++ b/data/pokemon/dex_entries.asm @@ -1255,5 +1255,5 @@ VictreebelDexEntry: MissingNoDexEntry: db "???@" db 10 ; 1.0 m - db 100 ; 10.0 kg - text "コメント さくせいちゅう@" ; コメント作成中 (Comment to be written) + dw 100 ; 10.0 kg + db "コメント さくせいちゅう@" ; コメント作成中 (Comment to be written) diff --git a/data/sprites/sprites.asm b/data/sprites/sprites.asm index 656d64dd..6b4f2ba0 100644 --- a/data/sprites/sprites.asm +++ b/data/sprites/sprites.asm @@ -6,75 +6,75 @@ ENDM SpriteSheetPointerTable: ; graphics, tile count - overworld_sprite RedSprite, 12 ; SPRITE_RED - overworld_sprite BlueSprite, 12 ; SPRITE_BLUE - overworld_sprite OakSprite, 12 ; SPRITE_OAK - overworld_sprite BugCatcherSprite, 12 ; SPRITE_BUG_CATCHER - overworld_sprite SlowbroSprite, 12 ; SPRITE_SLOWBRO - overworld_sprite LassSprite, 12 ; SPRITE_LASS - overworld_sprite BlackHairBoy1Sprite, 12 ; SPRITE_BLACK_HAIR_BOY_1 - overworld_sprite LittleGirlSprite, 12 ; SPRITE_LITTLE_GIRL - overworld_sprite BirdSprite, 12 ; SPRITE_BIRD - overworld_sprite FatBaldGuySprite, 12 ; SPRITE_FAT_BALD_GUY - overworld_sprite GamblerSprite, 12 ; SPRITE_GAMBLER - overworld_sprite BlackHairBoy2Sprite, 12 ; SPRITE_BLACK_HAIR_BOY_2 - overworld_sprite GirlSprite, 12 ; SPRITE_GIRL - overworld_sprite HikerSprite, 12 ; SPRITE_HIKER - overworld_sprite FoulardWomanSprite, 12 ; SPRITE_FOULARD_WOMAN - overworld_sprite GentlemanSprite, 12 ; SPRITE_GENTLEMAN - overworld_sprite DaisySprite, 12 ; SPRITE_DAISY - overworld_sprite BikerSprite, 12 ; SPRITE_BIKER - overworld_sprite SailorSprite, 12 ; SPRITE_SAILOR - overworld_sprite CookSprite, 12 ; SPRITE_COOK - overworld_sprite BikeShopGuySprite, 12 ; SPRITE_BIKE_SHOP_GUY - overworld_sprite MrFujiSprite, 12 ; SPRITE_MR_FUJI - overworld_sprite GiovanniSprite, 12 ; SPRITE_GIOVANNI - overworld_sprite RocketSprite, 12 ; SPRITE_ROCKET - overworld_sprite MediumSprite, 12 ; SPRITE_MEDIUM - overworld_sprite WaiterSprite, 12 ; SPRITE_WAITER - overworld_sprite ErikaSprite, 12 ; SPRITE_ERIKA - overworld_sprite MomGeishaSprite, 12 ; SPRITE_MOM_GEISHA - overworld_sprite BrunetteGirlSprite, 12 ; SPRITE_BRUNETTE_GIRL - overworld_sprite LanceSprite, 12 ; SPRITE_LANCE - overworld_sprite OakAideSprite, 12 ; SPRITE_OAK_SCIENTIST_AIDE - overworld_sprite OakAideSprite, 12 ; SPRITE_OAK_AIDE - overworld_sprite RockerSprite, 12 ; SPRITE_ROCKER - overworld_sprite SwimmerSprite, 12 ; SPRITE_SWIMMER - overworld_sprite WhitePlayerSprite, 12 ; SPRITE_WHITE_PLAYER - overworld_sprite GymHelperSprite, 12 ; SPRITE_GYM_HELPER - overworld_sprite OldPersonSprite, 12 ; SPRITE_OLD_PERSON - overworld_sprite MartGuySprite, 12 ; SPRITE_MART_GUY - overworld_sprite FisherSprite, 12 ; SPRITE_FISHER - overworld_sprite OldMediumWomanSprite, 12 ; SPRITE_OLD_MEDIUM_WOMAN - overworld_sprite NurseSprite, 12 ; SPRITE_NURSE - overworld_sprite CableClubWomanSprite, 12 ; SPRITE_CABLE_CLUB_WOMAN - overworld_sprite MrMasterballSprite, 12 ; SPRITE_MR_MASTERBALL - overworld_sprite LaprasGiverSprite, 12 ; SPRITE_LAPRAS_GIVER - overworld_sprite WardenSprite, 12 ; SPRITE_WARDEN - overworld_sprite SsCaptainSprite, 12 ; SPRITE_SS_CAPTAIN - overworld_sprite Fisher2Sprite, 12 ; SPRITE_FISHER2 - overworld_sprite BlackbeltSprite, 12 ; SPRITE_BLACKBELT - overworld_sprite GuardSprite, 12 ; SPRITE_GUARD - overworld_sprite GuardSprite, 12 ; $32 - overworld_sprite MomSprite, 12 ; SPRITE_MOM - overworld_sprite BaldingGuySprite, 12 ; SPRITE_BALDING_GUY - overworld_sprite YoungBoySprite, 12 ; SPRITE_YOUNG_BOY - overworld_sprite GameboyKidSprite, 12 ; SPRITE_GAMEBOY_KID - overworld_sprite GameboyKidSprite, 12 ; SPRITE_GAMEBOY_KID_COPY - overworld_sprite ClefairySprite, 12 ; SPRITE_CLEFAIRY - overworld_sprite AgathaSprite, 12 ; SPRITE_AGATHA - overworld_sprite BrunoSprite, 12 ; SPRITE_BRUNO - overworld_sprite LoreleiSprite, 12 ; SPRITE_LORELEI - overworld_sprite SeelSprite, 12 ; SPRITE_SEEL - overworld_sprite BallSprite, 4 ; SPRITE_BALL - overworld_sprite OmanyteSprite, 4 ; SPRITE_OMANYTE - overworld_sprite BoulderSprite, 4 ; SPRITE_BOULDER - overworld_sprite PaperSheetSprite, 4 ; SPRITE_PAPER_SHEET - overworld_sprite BookMapDexSprite, 4 ; SPRITE_BOOK_MAP_DEX - overworld_sprite ClipboardSprite, 4 ; SPRITE_CLIPBOARD - overworld_sprite SnorlaxSprite, 4 ; SPRITE_SNORLAX - overworld_sprite OldAmberSprite, 4 ; SPRITE_OLD_AMBER_COPY - overworld_sprite OldAmberSprite, 4 ; SPRITE_OLD_AMBER - overworld_sprite LyingOldManSprite, 4 ; SPRITE_LYING_OLD_MAN_UNUSED_1 - overworld_sprite LyingOldManSprite, 4 ; SPRITE_LYING_OLD_MAN_UNUSED_2 - overworld_sprite LyingOldManSprite, 4 ; SPRITE_LYING_OLD_MAN + overworld_sprite RedSprite, 12 ; SPRITE_RED + overworld_sprite BlueSprite, 12 ; SPRITE_BLUE + overworld_sprite OakSprite, 12 ; SPRITE_OAK + overworld_sprite YoungsterSprite, 12 ; SPRITE_YOUNGSTER + overworld_sprite MonsterSprite, 12 ; SPRITE_MONSTER + overworld_sprite CooltrainerFSprite, 12 ; SPRITE_COOLTRAINER_F + overworld_sprite CooltrainerMSprite, 12 ; SPRITE_COOLTRAINER_M + overworld_sprite LittleGirlSprite, 12 ; SPRITE_LITTLE_GIRL + overworld_sprite BirdSprite, 12 ; SPRITE_BIRD + overworld_sprite MiddleAgedManSprite, 12 ; SPRITE_MIDDLE_AGED_MAN + overworld_sprite GamblerSprite, 12 ; SPRITE_GAMBLER + overworld_sprite SuperNerdSprite, 12 ; SPRITE_SUPER_NERD + overworld_sprite GirlSprite, 12 ; SPRITE_GIRL + overworld_sprite HikerSprite, 12 ; SPRITE_HIKER + overworld_sprite BeautySprite, 12 ; SPRITE_BEAUTY + overworld_sprite GentlemanSprite, 12 ; SPRITE_GENTLEMAN + overworld_sprite DaisySprite, 12 ; SPRITE_DAISY + overworld_sprite BikerSprite, 12 ; SPRITE_BIKER + overworld_sprite SailorSprite, 12 ; SPRITE_SAILOR + overworld_sprite CookSprite, 12 ; SPRITE_COOK + overworld_sprite BikeShopClerkSprite, 12 ; SPRITE_BIKE_SHOP_CLERK + overworld_sprite MrFujiSprite, 12 ; SPRITE_MR_FUJI + overworld_sprite GiovanniSprite, 12 ; SPRITE_GIOVANNI + overworld_sprite RocketSprite, 12 ; SPRITE_ROCKET + overworld_sprite ChannelerSprite, 12 ; SPRITE_CHANNELER + overworld_sprite WaiterSprite, 12 ; SPRITE_WAITER + overworld_sprite ErikaSprite, 12 ; SPRITE_ERIKA + overworld_sprite MiddleAgedWomanSprite, 12 ; SPRITE_MIDDLE_AGED_WOMAN + overworld_sprite BrunetteGirlSprite, 12 ; SPRITE_BRUNETTE_GIRL + overworld_sprite LanceSprite, 12 ; SPRITE_LANCE + overworld_sprite ScientistSprite, 12 ; SPRITE_UNUSED_SCIENTIST + overworld_sprite ScientistSprite, 12 ; SPRITE_SCIENTIST + overworld_sprite RockerSprite, 12 ; SPRITE_ROCKER + overworld_sprite SwimmerSprite, 12 ; SPRITE_SWIMMER + overworld_sprite SafariZoneWorkerSprite, 12 ; SPRITE_SAFARI_ZONE_WORKER + overworld_sprite GymGuideSprite, 12 ; SPRITE_GYM_GUIDE + overworld_sprite GrampsSprite, 12 ; SPRITE_GRAMPS + overworld_sprite ClerkSprite, 12 ; SPRITE_CLERK + overworld_sprite FishingGuruSprite, 12 ; SPRITE_FISHING_GURU + overworld_sprite GrannySprite, 12 ; SPRITE_GRANNY + overworld_sprite NurseSprite, 12 ; SPRITE_NURSE + overworld_sprite LinkReceptionistSprite, 12 ; SPRITE_LINK_RECEPTIONIST + overworld_sprite SilphPresidentSprite, 12 ; SPRITE_SILPH_PRESIDENT + overworld_sprite SilphWorkerSprite, 12 ; SPRITE_SILPH_WORKER + overworld_sprite WardenSprite, 12 ; SPRITE_WARDEN + overworld_sprite CaptainSprite, 12 ; SPRITE_CAPTAIN + overworld_sprite FisherSprite, 12 ; SPRITE_FISHER + overworld_sprite KogaSprite, 12 ; SPRITE_KOGA + overworld_sprite GuardSprite, 12 ; SPRITE_GUARD + overworld_sprite GuardSprite, 12 ; SPRITE_UNUSED_GUARD + overworld_sprite MomSprite, 12 ; SPRITE_MOM + overworld_sprite BaldingGuySprite, 12 ; SPRITE_BALDING_GUY + overworld_sprite LittleBoySprite, 12 ; SPRITE_LITTLE_BOY + overworld_sprite GameboyKidSprite, 12 ; SPRITE_UNUSED_GAMEBOY_KID + overworld_sprite GameboyKidSprite, 12 ; SPRITE_GAMEBOY_KID + overworld_sprite FairySprite, 12 ; SPRITE_FAIRY + overworld_sprite AgathaSprite, 12 ; SPRITE_AGATHA + overworld_sprite BrunoSprite, 12 ; SPRITE_BRUNO + overworld_sprite LoreleiSprite, 12 ; SPRITE_LORELEI + overworld_sprite SeelSprite, 12 ; SPRITE_SEEL + overworld_sprite PokeBallSprite, 4 ; SPRITE_POKE_BALL + overworld_sprite FossilSprite, 4 ; SPRITE_FOSSIL + overworld_sprite BoulderSprite, 4 ; SPRITE_BOULDER + overworld_sprite PaperSprite, 4 ; SPRITE_PAPER + overworld_sprite PokedexSprite, 4 ; SPRITE_POKEDEX + overworld_sprite ClipboardSprite, 4 ; SPRITE_CLIPBOARD + overworld_sprite SnorlaxSprite, 4 ; SPRITE_SNORLAX + overworld_sprite OldAmberSprite, 4 ; SPRITE_UNUSED_OLD_AMBER + overworld_sprite OldAmberSprite, 4 ; SPRITE_OLD_AMBER + overworld_sprite GamblerAsleepSprite, 4 ; SPRITE_UNUSED_GAMBLER_ASLEEP_1 + overworld_sprite GamblerAsleepSprite, 4 ; SPRITE_UNUSED_GAMBLER_ASLEEP_2 + overworld_sprite GamblerAsleepSprite, 4 ; SPRITE_GAMBLER_ASLEEP diff --git a/data/tilemaps.asm b/data/tilemaps.asm new file mode 100644 index 00000000..c7efb222 --- /dev/null +++ b/data/tilemaps.asm @@ -0,0 +1,46 @@ +tile_ids: MACRO + dw \1 + dn \3, \2 +ENDM + +TileIDListPointerTable: +; entries correspond to TILEMAP_* constants (see constants/gfx_constants.asm) + ; tilemap pointer, width, height + tile_ids MonTiles, 7, 7 + tile_ids SlideDownMonTiles_7x5, 7, 5 + tile_ids SlideDownMonTiles_7x3, 7, 3 + tile_ids GengarIntroTiles1, 7, 7 + tile_ids GengarIntroTiles2, 7, 7 + tile_ids GengarIntroTiles3, 7, 7 + tile_ids GameBoyTiles, 6, 8 + tile_ids LinkCableTiles, 12, 3 + +DownscaledMonTiles_5x5: + INCBIN "gfx/pokemon/downscaled_5x5.tilemap" + +DownscaledMonTiles_3x3: + INCBIN "gfx/pokemon/downscaled_3x3.tilemap" + +MonTiles: + INCBIN "gfx/pokemon/front.tilemap" + +SlideDownMonTiles_7x5: + INCBIN "gfx/pokemon/slide_down_7x5.tilemap" + +SlideDownMonTiles_7x3: + INCBIN "gfx/pokemon/slide_down_7x3.tilemap" + +GengarIntroTiles1: + INCBIN "gfx/intro_credits/gengar_1.tilemap" + +GengarIntroTiles2: + INCBIN "gfx/intro_credits/gengar_2.tilemap" + +GengarIntroTiles3: + INCBIN "gfx/intro_credits/gengar_3.tilemap" + +GameBoyTiles: + INCBIN "gfx/trade/game_boy.tilemap" + +LinkCableTiles: + INCBIN "gfx/trade/link_cable.tilemap" diff --git a/data/trainers/ai_pointers.asm b/data/trainers/ai_pointers.asm index d2e3b11c..9008be86 100644 --- a/data/trainers/ai_pointers.asm +++ b/data/trainers/ai_pointers.asm @@ -15,7 +15,7 @@ TrainerAIPointers: dbw 3, GenericAI dbw 3, GenericAI dbw 3, GenericAI - dbw 3, JugglerAI ; juggler_x + dbw 3, JugglerAI ; unused_juggler dbw 3, GenericAI dbw 3, GenericAI dbw 3, GenericAI diff --git a/data/trainers/encounter_types.asm b/data/trainers/encounter_types.asm index 222b5868..5bca2517 100755 --- a/data/trainers/encounter_types.asm +++ b/data/trainers/encounter_types.asm @@ -6,7 +6,7 @@ FemaleTrainerList:: db -1 ; end EvilTrainerList:: - db OPP_JUGGLER_X + db OPP_UNUSED_JUGGLER db OPP_GAMBLER db OPP_ROCKER db OPP_JUGGLER diff --git a/data/trainers/move_choices.asm b/data/trainers/move_choices.asm index fc230ac1..6e6df63c 100644 --- a/data/trainers/move_choices.asm +++ b/data/trainers/move_choices.asm @@ -20,7 +20,7 @@ TrainerClassMoveChoiceModifications: move_choices 1 ; BIKER move_choices 1, 3 ; BURGLAR move_choices 1 ; ENGINEER - move_choices 1, 2 ; JUGGLER_X + move_choices 1, 2 ; UNUSED_JUGGLER move_choices 1, 3 ; FISHER move_choices 1, 3 ; SWIMMER move_choices ; CUE_BALL @@ -32,7 +32,7 @@ TrainerClassMoveChoiceModifications: move_choices 1 ; TAMER move_choices 1 ; BIRD_KEEPER move_choices 1 ; BLACKBELT - move_choices 1 ; SONY1 + move_choices 1 ; RIVAL1 move_choices 1, 3 ; PROF_OAK move_choices 1, 2 ; CHIEF move_choices 1, 2 ; SCIENTIST @@ -49,8 +49,8 @@ TrainerClassMoveChoiceModifications: move_choices 1, 3 ; BLAINE move_choices 1, 3 ; SABRINA move_choices 1, 2 ; GENTLEMAN - move_choices 1, 3 ; SONY2 - move_choices 1, 3 ; SONY3 + move_choices 1, 3 ; RIVAL2 + move_choices 1, 3 ; RIVAL3 move_choices 1, 2, 3 ; LORELEI move_choices 1 ; CHANNELER move_choices 1 ; AGATHA diff --git a/data/trainers/name_pointers.asm b/data/trainers/name_pointers.asm index 537a95e3..98e2e406 100644 --- a/data/trainers/name_pointers.asm +++ b/data/trainers/name_pointers.asm @@ -12,7 +12,7 @@ TrainerNamePointers: dw wTrainerName dw .BurglarName dw .EngineerName - dw .JugglerXName + dw .UnusedJugglerName dw wTrainerName dw .SwimmerName dw wTrainerName @@ -48,24 +48,24 @@ TrainerNamePointers: dw wTrainerName dw wTrainerName -.YoungsterName: db "YOUNGSTER@" -.BugCatcherName: db "BUG CATCHER@" -.LassName: db "LASS@" -.JrTrainerMName: db "JR.TRAINER♂@" -.JrTrainerFName: db "JR.TRAINER♀@" -.PokemaniacName: db "POKéMANIAC@" -.SuperNerdName: db "SUPER NERD@" -.BurglarName: db "BURGLAR@" -.EngineerName: db "ENGINEER@" -.JugglerXName: db "JUGGLER@" -.SwimmerName: db "SWIMMER@" -.BeautyName: db "BEAUTY@" -.RockerName: db "ROCKER@" -.JugglerName: db "JUGGLER@" -.BlackbeltName: db "BLACKBELT@" -.ProfOakName: db "PROF.OAK@" -.ChiefName: db "CHIEF@" -.ScientistName: db "SCIENTIST@" -.RocketName: db "ROCKET@" -.CooltrainerMName: db "COOLTRAINER♂@" -.CooltrainerFName: db "COOLTRAINER♀@" +.YoungsterName: db "YOUNGSTER@" +.BugCatcherName: db "BUG CATCHER@" +.LassName: db "LASS@" +.JrTrainerMName: db "JR.TRAINER♂@" +.JrTrainerFName: db "JR.TRAINER♀@" +.PokemaniacName: db "POKéMANIAC@" +.SuperNerdName: db "SUPER NERD@" +.BurglarName: db "BURGLAR@" +.EngineerName: db "ENGINEER@" +.UnusedJugglerName: db "JUGGLER@" +.SwimmerName: db "SWIMMER@" +.BeautyName: db "BEAUTY@" +.RockerName: db "ROCKER@" +.JugglerName: db "JUGGLER@" +.BlackbeltName: db "BLACKBELT@" +.ProfOakName: db "PROF.OAK@" +.ChiefName: db "CHIEF@" +.ScientistName: db "SCIENTIST@" +.RocketName: db "ROCKET@" +.CooltrainerMName: db "COOLTRAINER♂@" +.CooltrainerFName: db "COOLTRAINER♀@" diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm index 24b4b9ca..005cb1dd 100755 --- a/data/trainers/parties.asm +++ b/data/trainers/parties.asm @@ -11,7 +11,7 @@ TrainerDataPointers: dw BikerData dw BurglarData dw EngineerData - dw Juggler1Data + dw UnusedJugglerData dw FisherData dw SwimmerData dw CueBallData @@ -308,7 +308,7 @@ EngineerData: db 21, MAGNEMITE, 0 db 18, MAGNEMITE, MAGNEMITE, MAGNETON, 0 -Juggler1Data: +UnusedJugglerData: ; none FisherData: |