Define constants for subanimations' base coords and frame block modes

1 files changed, 599 insertions, 599 deletions

diff --git a/data/battle_anims/subanimations.asm b/data/battle_anims/subanimations.asm
index 6d5f1d8e..bbdc45c0 100644
--- a/data/battle_anims/subanimations.asm
+++ b/data/battle_anims/subanimations.asm
@@ -98,857 +98,857 @@ ENDM
 
 Subanimation04:
 	subanim SUBANIMTYPE_HFLIP, 3
-	db FRAMEBLOCK_02, $1a, $00
-	db FRAMEBLOCK_02, $10, $00
-	db FRAMEBLOCK_02, $03, $00
+	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, $10, $00
+	db FRAMEBLOCK_02, BASECOORD_10, FRAMEBLOCKMODE_00
 
 Subanimation08:
 	subanim SUBANIMTYPE_NORMAL, 11
-	db FRAMEBLOCK_03, $30, $00
-	db FRAMEBLOCK_03, $44, $00
-	db FRAMEBLOCK_03, $94, $00
-	db FRAMEBLOCK_03, $60, $00
-	db FRAMEBLOCK_03, $76, $00
-	db FRAMEBLOCK_03, $9f, $00
-	db FRAMEBLOCK_03, $8d, $00
-	db FRAMEBLOCK_03, $a0, $00
-	db FRAMEBLOCK_03, $1a, $00
-	db FRAMEBLOCK_03, $a1, $00
-	db FRAMEBLOCK_03, $34, $00
+	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, $30, $00
-	db FRAMEBLOCK_03, $a2, $00
-	db FRAMEBLOCK_03, $31, $00
-	db FRAMEBLOCK_03, $a3, $00
-	db FRAMEBLOCK_03, $32, $00
-	db FRAMEBLOCK_03, $a4, $00
-	db FRAMEBLOCK_03, $92, $00
-	db FRAMEBLOCK_03, $a5, $00
-	db FRAMEBLOCK_03, $15, $00
-	db FRAMEBLOCK_03, $a6, $00
-	db FRAMEBLOCK_03, $34, $00
+	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, $30, $00
-	db FRAMEBLOCK_03, $a2, $00
-	db FRAMEBLOCK_03, $93, $00
-	db FRAMEBLOCK_03, $61, $00
-	db FRAMEBLOCK_03, $73, $00
-	db FRAMEBLOCK_03, $a7, $00
-	db FRAMEBLOCK_03, $33, $00
-	db FRAMEBLOCK_03, $a8, $00
-	db FRAMEBLOCK_03, $0e, $00
-	db FRAMEBLOCK_03, $a9, $00
-	db FRAMEBLOCK_03, $34, $00
+	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, $21, $04
-	db FRAMEBLOCK_04, $21, $04
-	db FRAMEBLOCK_03, $21, $04
-	db FRAMEBLOCK_05, $21, $04
+	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, $1b, $00
-	db FRAMEBLOCK_07, $1b, $00
-	db FRAMEBLOCK_08, $36, $00
-	db FRAMEBLOCK_09, $36, $00
-	db FRAMEBLOCK_0A, $15, $00
-	db FRAMEBLOCK_0A, $15, $00
+	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, $2d, $00
-	db FRAMEBLOCK_03, $2f, $00
-	db FRAMEBLOCK_03, $35, $00
-	db FRAMEBLOCK_03, $4d, $00
+	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, $9d, $00
+	db FRAMEBLOCK_01, BASECOORD_9D, FRAMEBLOCKMODE_00
 
 Subanimation11:
 	subanim SUBANIMTYPE_HFLIP, 12
-	db FRAMEBLOCK_0B, $26, $00
-	db FRAMEBLOCK_0C, $26, $00
-	db FRAMEBLOCK_0B, $26, $00
-	db FRAMEBLOCK_0C, $26, $00
-	db FRAMEBLOCK_0B, $28, $00
-	db FRAMEBLOCK_0C, $28, $00
-	db FRAMEBLOCK_0B, $28, $00
-	db FRAMEBLOCK_0C, $28, $00
-	db FRAMEBLOCK_0B, $27, $00
-	db FRAMEBLOCK_0C, $27, $00
-	db FRAMEBLOCK_0B, $27, $00
-	db FRAMEBLOCK_0C, $27, $00
+	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, $03, $03
-	db FRAMEBLOCK_0E, $03, $03
-	db FRAMEBLOCK_0F, $03, $00
-	db FRAMEBLOCK_0D, $11, $00
-	db FRAMEBLOCK_0D, $11, $00
-	db FRAMEBLOCK_0D, $37, $00
-	db FRAMEBLOCK_0D, $37, $00
-	db FRAMEBLOCK_10, $21, $00
-	db FRAMEBLOCK_10, $21, $00
-	db FRAMEBLOCK_11, $1b, $00
-	db FRAMEBLOCK_11, $1b, $00
+	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, $01, $00
-	db FRAMEBLOCK_12, $0f, $00
-	db FRAMEBLOCK_12, $1b, $00
-	db FRAMEBLOCK_12, $25, $00
-	db FRAMEBLOCK_13, $38, $00
-	db FRAMEBLOCK_13, $38, $02
-	db FRAMEBLOCK_14, $38, $00
-	db FRAMEBLOCK_14, $38, $02
-	db FRAMEBLOCK_15, $38, $00
-	db FRAMEBLOCK_15, $38, $00
-	db FRAMEBLOCK_16, $38, $00
-	db FRAMEBLOCK_16, $38, $00
+	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, $30, $00
-	db FRAMEBLOCK_17, $39, $00
-	db FRAMEBLOCK_17, $3a, $00
-	db FRAMEBLOCK_17, $3b, $00
-	db FRAMEBLOCK_17, $3c, $00
-	db FRAMEBLOCK_17, $3d, $00
-	db FRAMEBLOCK_17, $3e, $00
-	db FRAMEBLOCK_17, $3f, $00
-	db FRAMEBLOCK_17, $1f, $00
+	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, $17, $00
+	db FRAMEBLOCK_01, BASECOORD_17, FRAMEBLOCKMODE_00
 
 Subanimation01:
 	subanim SUBANIMTYPE_HFLIP, 2
-	db FRAMEBLOCK_01, $0f, $00
-	db FRAMEBLOCK_01, $1d, $00
+	db FRAMEBLOCK_01, BASECOORD_0F, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_01, BASECOORD_1D, FRAMEBLOCKMODE_00
 
 Subanimation02:
 	subanim SUBANIMTYPE_HFLIP, 3
-	db FRAMEBLOCK_01, $12, $00
-	db FRAMEBLOCK_01, $15, $00
-	db FRAMEBLOCK_01, $1c, $00
+	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, $0b, $00
-	db FRAMEBLOCK_01, $11, $00
-	db FRAMEBLOCK_01, $18, $00
-	db FRAMEBLOCK_01, $1d, $00
+	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, $20, $00
-	db FRAMEBLOCK_0C, $21, $00
-	db FRAMEBLOCK_0C, $23, $00
+	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, $20, $02
-	db FRAMEBLOCK_0C, $15, $00
-	db FRAMEBLOCK_0C, $21, $02
-	db FRAMEBLOCK_0C, $17, $00
-	db FRAMEBLOCK_0C, $23, $02
-	db FRAMEBLOCK_0C, $19, $00
+	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, $20, $02
-	db FRAMEBLOCK_0C, $15, $02
-	db FRAMEBLOCK_0C, $07, $00
-	db FRAMEBLOCK_0C, $21, $02
-	db FRAMEBLOCK_0C, $17, $02
-	db FRAMEBLOCK_0C, $09, $00
-	db FRAMEBLOCK_0C, $23, $02
-	db FRAMEBLOCK_0C, $19, $02
-	db FRAMEBLOCK_0C, $0c, $00
+	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, $30, $03
-	db FRAMEBLOCK_0C, $40, $03
-	db FRAMEBLOCK_0C, $41, $03
-	db FRAMEBLOCK_0C, $42, $03
-	db FRAMEBLOCK_0C, $21, $00
+	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, $43, $02
-	db FRAMEBLOCK_75, $52, $04
-	db FRAMEBLOCK_19, $43, $02
-	db FRAMEBLOCK_75, $63, $04
-	db FRAMEBLOCK_1A, $43, $02
-	db FRAMEBLOCK_75, $4d, $04
-	db FRAMEBLOCK_1B, $43, $02
-	db FRAMEBLOCK_75, $97, $04
-	db FRAMEBLOCK_1C, $43, $02
-	db FRAMEBLOCK_75, $98, $04
-	db FRAMEBLOCK_1D, $43, $02
-	db FRAMEBLOCK_75, $58, $04
-	db FRAMEBLOCK_1E, $43, $02
-	db FRAMEBLOCK_75, $1b, $00
+	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, $24, $00
-	db FRAMEBLOCK_20, $20, $00
-	db FRAMEBLOCK_21, $1a, $00
-	db FRAMEBLOCK_22, $15, $00
+	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, $00, $02
-	db FRAMEBLOCK_23, $02, $02
-	db FRAMEBLOCK_23, $04, $00
-	db FRAMEBLOCK_23, $07, $02
-	db FRAMEBLOCK_23, $02, $02
-	db FRAMEBLOCK_23, $04, $00
-	db FRAMEBLOCK_23, $0e, $02
-	db FRAMEBLOCK_23, $02, $02
-	db FRAMEBLOCK_23, $0c, $00
-	db FRAMEBLOCK_25, $07, $00
-	db FRAMEBLOCK_25, $0e, $00
-	db FRAMEBLOCK_25, $15, $00
-	db FRAMEBLOCK_24, $24, $02
-	db FRAMEBLOCK_23, $1c, $02
-	db FRAMEBLOCK_23, $23, $00
-	db FRAMEBLOCK_23, $21, $02
-	db FRAMEBLOCK_24, $28, $00
-	db FRAMEBLOCK_24, $28, $00
+	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, $0e, $02
-	db FRAMEBLOCK_26, $16, $02
-	db FRAMEBLOCK_26, $1c, $00
-	db FRAMEBLOCK_27, $0e, $02
-	db FRAMEBLOCK_27, $16, $02
-	db FRAMEBLOCK_27, $1c, $00
-	db FRAMEBLOCK_28, $0e, $02
-	db FRAMEBLOCK_28, $16, $02
-	db FRAMEBLOCK_28, $1c, $00
-	db FRAMEBLOCK_29, $0e, $02
-	db FRAMEBLOCK_29, $16, $02
-	db FRAMEBLOCK_29, $1c, $00
+	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, $05, $00
-	db FRAMEBLOCK_2B, $05, $02
-	db FRAMEBLOCK_2B, $0c, $02
-	db FRAMEBLOCK_2A, $11, $04
-	db FRAMEBLOCK_2B, $11, $02
-	db FRAMEBLOCK_2B, $17, $02
-	db FRAMEBLOCK_2A, $1b, $04
-	db FRAMEBLOCK_2B, $1b, $02
-	db FRAMEBLOCK_2B, $20, $02
-	db FRAMEBLOCK_2A, $2f, $04
-	db FRAMEBLOCK_2C, $00, $02
-	db FRAMEBLOCK_2C, $00, $00
+	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, $44, $00
-	db FRAMEBLOCK_2E, $45, $00
-	db FRAMEBLOCK_2D, $46, $00
-	db FRAMEBLOCK_2E, $47, $00
-	db FRAMEBLOCK_2D, $48, $00
-	db FRAMEBLOCK_2E, $49, $00
-	db FRAMEBLOCK_2D, $2f, $00
-	db FRAMEBLOCK_2E, $1a, $00
+	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, $46, $00
-	db FRAMEBLOCK_2F, $4a, $00
-	db FRAMEBLOCK_2F, $4b, $00
-	db FRAMEBLOCK_2F, $4c, $00
-	db FRAMEBLOCK_2F, $4d, $00
-	db FRAMEBLOCK_2F, $4e, $00
-	db FRAMEBLOCK_2F, $4f, $00
-	db FRAMEBLOCK_2F, $50, $00
-	db FRAMEBLOCK_2F, $2e, $00
-	db FRAMEBLOCK_2F, $51, $00
+	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, $31, $00
-	db FRAMEBLOCK_30, $32, $00
-	db FRAMEBLOCK_30, $92, $00
-	db FRAMEBLOCK_30, $0e, $00
-	db FRAMEBLOCK_30, $0f, $00
-	db FRAMEBLOCK_30, $10, $00
+	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, $10, $00
-	db FRAMEBLOCK_30, $10, $03
-	db FRAMEBLOCK_31, $1c, $04
-	db FRAMEBLOCK_31, $21, $04
-	db FRAMEBLOCK_31, $26, $00
-	db FRAMEBLOCK_30, $10, $02
-	db FRAMEBLOCK_31, $1d, $04
-	db FRAMEBLOCK_31, $22, $04
-	db FRAMEBLOCK_31, $27, $00
+	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, $31, $00
-	db FRAMEBLOCK_03, $32, $00
-	db FRAMEBLOCK_03, $92, $00
-	db FRAMEBLOCK_03, $0e, $00
-	db FRAMEBLOCK_03, $10, $00
+	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, $08, $00
-	db FRAMEBLOCK_LARGE_BLACK_CIRCLE, $08, $00
-	db FRAMEBLOCK_5A, $08, $00
+	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, $52, $00
-	db FRAMEBLOCK_35, $53, $00
+	db FRAMEBLOCK_35, BASECOORD_52, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_35, BASECOORD_53, FRAMEBLOCKMODE_00
 
 Subanimation17:
 	subanim SUBANIMTYPE_HFLIP, 4
-	db FRAMEBLOCK_36, $54, $00
-	db FRAMEBLOCK_36, $55, $00
-	db FRAMEBLOCK_37, $56, $00
-	db FRAMEBLOCK_37, $57, $00
+	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, $54, $00
-	db FRAMEBLOCK_36, $55, $00
-	db FRAMEBLOCK_37, $56, $00
-	db FRAMEBLOCK_37, $57, $00
+	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, $54, $00
-	db FRAMEBLOCK_17, $55, $00
-	db FRAMEBLOCK_17, $0e, $00
-	db FRAMEBLOCK_17, $56, $00
-	db FRAMEBLOCK_17, $57, $00
-	db FRAMEBLOCK_17, $13, $00
+	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, $31, $00
-	db FRAMEBLOCK_39, $31, $00
-	db FRAMEBLOCK_38, $32, $00
-	db FRAMEBLOCK_39, $32, $00
-	db FRAMEBLOCK_38, $92, $00
-	db FRAMEBLOCK_39, $92, $00
-	db FRAMEBLOCK_38, $0e, $00
-	db FRAMEBLOCK_39, $0e, $00
-	db FRAMEBLOCK_38, $0f, $00
-	db FRAMEBLOCK_39, $0f, $00
-	db FRAMEBLOCK_38, $10, $00
-	db FRAMEBLOCK_39, $10, $00
+	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, $08, $00
-	db FRAMEBLOCK_3B, $08, $00
-	db FRAMEBLOCK_3C, $08, $00
-	db FRAMEBLOCK_3D, $08, $00
-	db FRAMEBLOCK_3E, $08, $00
-	db FRAMEBLOCK_3F, $08, $00
-	db FRAMEBLOCK_3E, $08, $00
-	db FRAMEBLOCK_3F, $08, $00
-	db FRAMEBLOCK_3A, $0b, $00
-	db FRAMEBLOCK_3B, $0b, $00
-	db FRAMEBLOCK_3C, $0b, $00
-	db FRAMEBLOCK_3D, $0b, $00
-	db FRAMEBLOCK_3E, $0b, $00
-	db FRAMEBLOCK_3F, $0b, $00
-	db FRAMEBLOCK_3E, $0b, $00
-	db FRAMEBLOCK_3F, $0b, $00
+	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, $31, $00
-	db FRAMEBLOCK_40, $32, $00
-	db FRAMEBLOCK_40, $92, $00
-	db FRAMEBLOCK_40, $15, $00
+	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, $58, $00
-	db FRAMEBLOCK_41, $59, $00
-	db FRAMEBLOCK_41, $21, $00
+	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, $9a, $00
-	db FRAMEBLOCK_23, $1b, $02
-	db FRAMEBLOCK_24, $22, $00
-	db FRAMEBLOCK_23, $16, $02
-	db FRAMEBLOCK_23, $1d, $02
-	db FRAMEBLOCK_24, $98, $00
-	db FRAMEBLOCK_25, $2c, $04
-	db FRAMEBLOCK_25, $2a, $04
-	db FRAMEBLOCK_25, $99, $04
-	db FRAMEBLOCK_25, $62, $04
-	db FRAMEBLOCK_25, $99, $04
-	db FRAMEBLOCK_25, $62, $04
-	db FRAMEBLOCK_25, $99, $04
-	db FRAMEBLOCK_25, $62, $04
-	db FRAMEBLOCK_25, $99, $03
+	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, $75, $00
+	db FRAMEBLOCK_25, BASECOORD_75, FRAMEBLOCKMODE_00
 
 Subanimation20:
 	subanim SUBANIMTYPE_HFLIP, 2
-	db FRAMEBLOCK_42, $07, $00
-	db FRAMEBLOCK_43, $07, $00
+	db FRAMEBLOCK_42, BASECOORD_07, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_43, BASECOORD_07, FRAMEBLOCKMODE_00
 
 Subanimation21:
 	subanim SUBANIMTYPE_HFLIP, 3
-	db FRAMEBLOCK_44, $00, $00
-	db FRAMEBLOCK_45, $08, $00
-	db FRAMEBLOCK_46, $10, $02
+	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, $10, $00
-	db FRAMEBLOCK_47, $56, $00
-	db FRAMEBLOCK_47, $07, $00
-	db FRAMEBLOCK_47, $aa, $00
-	db FRAMEBLOCK_47, $ab, $00
-	db FRAMEBLOCK_47, $ac, $00
-	db FRAMEBLOCK_47, $ad, $00
-	db FRAMEBLOCK_47, $ae, $00
-	db FRAMEBLOCK_47, $af, $00
-	db FRAMEBLOCK_47, $89, $00
-	db FRAMEBLOCK_47, $b0, $00
+	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, $64, $00
-	db FRAMEBLOCK_45, $65, $00
-	db FRAMEBLOCK_46, $66, $00
-	db FRAMEBLOCK_47, $66, $00
-	db FRAMEBLOCK_47, $66, $00
-	db FRAMEBLOCK_47, $66, $00
+	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, $67, $00
+	db FRAMEBLOCK_47, BASECOORD_67, FRAMEBLOCKMODE_00
 
 Subanimation4e:
 	subanim SUBANIMTYPE_HFLIP, 1
-	db FRAMEBLOCK_71, $0f, $03
+	db FRAMEBLOCK_71, BASECOORD_0F, FRAMEBLOCKMODE_03
 
 Subanimation4f:
 	subanim SUBANIMTYPE_HFLIP, 7
-	db FRAMEBLOCK_71, $0f, $00
-	db FRAMEBLOCK_71, $08, $00
-	db FRAMEBLOCK_71, $01, $00
-	db FRAMEBLOCK_71, $95, $00
-	db FRAMEBLOCK_72, $95, $00
-	db FRAMEBLOCK_73, $95, $00
-	db FRAMEBLOCK_74, $95, $00
+	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, $95, $00
-	db FRAMEBLOCK_73, $95, $00
-	db FRAMEBLOCK_72, $95, $00
-	db FRAMEBLOCK_71, $95, $00
-	db FRAMEBLOCK_71, $01, $00
-	db FRAMEBLOCK_71, $08, $00
-	db FRAMEBLOCK_71, $0f, $00
-	db FRAMEBLOCK_71, $16, $00
+	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, $0f, $00
-	db FRAMEBLOCK_4A, $68, $03
-	db FRAMEBLOCK_4B, $2a, $03
-	db FRAMEBLOCK_LARGE_BLACK_CIRCLE, $0f, $00
-	db FRAMEBLOCK_4A, $68, $03
-	db FRAMEBLOCK_4B, $2a, $00
-	db FRAMEBLOCK_4C, $6a, $03
-	db FRAMEBLOCK_4D, $69, $03
-	db FRAMEBLOCK_LARGE_BLACK_CIRCLE, $6b, $00
-	db FRAMEBLOCK_4C, $6a, $03
-	db FRAMEBLOCK_4D, $69, $00
-	db FRAMEBLOCK_4A, $68, $03
-	db FRAMEBLOCK_4B, $2a, $03
-	db FRAMEBLOCK_LARGE_BLACK_CIRCLE, $6c, $00
-	db FRAMEBLOCK_4A, $68, $03
-	db FRAMEBLOCK_4B, $2a, $00
-	db FRAMEBLOCK_4C, $6a, $03
-	db FRAMEBLOCK_4D, $69, $03
-	db FRAMEBLOCK_LARGE_BLACK_CIRCLE, $6d, $00
-	db FRAMEBLOCK_4C, $6a, $03
-	db FRAMEBLOCK_4D, $2a, $00
-	db FRAMEBLOCK_4A, $68, $03
-	db FRAMEBLOCK_4B, $2a, $03
-	db FRAMEBLOCK_LARGE_BLACK_CIRCLE, $0f, $00
-	db FRAMEBLOCK_4A, $68, $03
-	db FRAMEBLOCK_4B, $2a, $00
-	db FRAMEBLOCK_4C, $6a, $03
-	db FRAMEBLOCK_4D, $2a, $03
-	db FRAMEBLOCK_LARGE_BLACK_CIRCLE, $6b, $00
+	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, $2b, $00
-	db FRAMEBLOCK_4F, $2b, $00
-	db FRAMEBLOCK_50, $2b, $00
-	db FRAMEBLOCK_50, $2b, $00
+	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, $2d, $00
-	db FRAMEBLOCK_51, $6e, $00
+	db FRAMEBLOCK_51, BASECOORD_2D, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_51, BASECOORD_6E, FRAMEBLOCKMODE_00
 
 Subanimation24:
 	subanim SUBANIMTYPE_ENEMY, 2
-	db FRAMEBLOCK_51, $2d, $00
-	db FRAMEBLOCK_51, $6e, $00
+	db FRAMEBLOCK_51, BASECOORD_2D, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_51, BASECOORD_6E, FRAMEBLOCKMODE_00
 
 Subanimation25:
 	subanim SUBANIMTYPE_COORDFLIP, 2
-	db FRAMEBLOCK_52, $71, $00
-	db FRAMEBLOCK_52, $72, $00
+	db FRAMEBLOCK_52, BASECOORD_71, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_52, BASECOORD_72, FRAMEBLOCKMODE_00
 
 Subanimation26:
 	subanim SUBANIMTYPE_NORMAL, 2
-	db FRAMEBLOCK_52, $01, $00
-	db FRAMEBLOCK_52, $2c, $00
+	db FRAMEBLOCK_52, BASECOORD_01, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_52, BASECOORD_2C, FRAMEBLOCKMODE_00
 
 Subanimation3a:
 	subanim SUBANIMTYPE_COORDFLIP, 3
-	db FRAMEBLOCK_53, $71, $00
-	db FRAMEBLOCK_53, $7f, $00
-	db FRAMEBLOCK_53, $81, $00
+	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, $01, $00
-	db FRAMEBLOCK_53, $15, $00
-	db FRAMEBLOCK_53, $2c, $00
+	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, $01, $00
-	db FRAMEBLOCK_54, $2c, $00
+	db FRAMEBLOCK_54, BASECOORD_01, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_54, BASECOORD_2C, FRAMEBLOCKMODE_00
 
 Subanimation28:
 	subanim SUBANIMTYPE_HVFLIP, 3
-	db FRAMEBLOCK_55, $73, $03
-	db FRAMEBLOCK_56, $73, $03
-	db FRAMEBLOCK_57, $73, $00
+	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, $74, $00
-	db FRAMEBLOCK_47, $43, $00
-	db FRAMEBLOCK_47, $75, $00
+	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, $76, $00
-	db FRAMEBLOCK_34, $76, $00
-	db FRAMEBLOCK_58, $76, $00
-	db FRAMEBLOCK_34, $76, $00
-	db FRAMEBLOCK_58, $76, $00
-	db FRAMEBLOCK_34, $76, $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
+	db FRAMEBLOCK_58, BASECOORD_76, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_34, BASECOORD_76, FRAMEBLOCKMODE_00
 
 Subanimation3c:
 	subanim SUBANIMTYPE_COORDFLIP, 7
-	db FRAMEBLOCK_59, $79, $03
-	db FRAMEBLOCK_59, $7b, $03
-	db FRAMEBLOCK_59, $77, $03
-	db FRAMEBLOCK_59, $7a, $03
-	db FRAMEBLOCK_59, $78, $03
-	db FRAMEBLOCK_59, $7c, $03
-	db FRAMEBLOCK_59, $76, $00
+	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, $4d, $00
-	db FRAMEBLOCK_3B, $4d, $00
-	db FRAMEBLOCK_3C, $4d, $00
-	db FRAMEBLOCK_3D, $4d, $00
-	db FRAMEBLOCK_3E, $4d, $00
-	db FRAMEBLOCK_3F, $4d, $00
-	db FRAMEBLOCK_3E, $4d, $00
-	db FRAMEBLOCK_3F, $4d, $00
+	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, $7d, $00
-	db FRAMEBLOCK_LARGE_BLACK_CIRCLE, $7d, $00
-	db FRAMEBLOCK_5A, $7d, $00
-	db FRAMEBLOCK_SMALL_BLACK_CIRCLE, $30, $00
-	db FRAMEBLOCK_LARGE_BLACK_CIRCLE, $30, $00
-	db FRAMEBLOCK_5A, $30, $00
-	db FRAMEBLOCK_SMALL_BLACK_CIRCLE, $7e, $00
-	db FRAMEBLOCK_LARGE_BLACK_CIRCLE, $7e, $00
-	db FRAMEBLOCK_5A, $7e, $00
-	db FRAMEBLOCK_SMALL_BLACK_CIRCLE, $7f, $00
-	db FRAMEBLOCK_LARGE_BLACK_CIRCLE, $7f, $00
-	db FRAMEBLOCK_5A, $7f, $00
-	db FRAMEBLOCK_SMALL_BLACK_CIRCLE, $80, $00
-	db FRAMEBLOCK_LARGE_BLACK_CIRCLE, $80, $00
-	db FRAMEBLOCK_5A, $80, $00
-	db FRAMEBLOCK_SMALL_BLACK_CIRCLE, $81, $00
-	db FRAMEBLOCK_LARGE_BLACK_CIRCLE, $81, $00
-	db FRAMEBLOCK_5A, $81, $00
-	db FRAMEBLOCK_SMALL_BLACK_CIRCLE, $82, $00
-	db FRAMEBLOCK_LARGE_BLACK_CIRCLE, $82, $00
-	db FRAMEBLOCK_5A, $82, $00
+	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, $83, $03
-	db FRAMEBLOCK_5C, $84, $03
-	db FRAMEBLOCK_5D, $85, $03
-	db FRAMEBLOCK_5E, $09, $00
+	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, $2a, $00
-	db FRAMEBLOCK_5F, $00, $00
-	db FRAMEBLOCK_60, $2a, $00
-	db FRAMEBLOCK_60, $00, $00
-	db FRAMEBLOCK_61, $2a, $00
-	db FRAMEBLOCK_61, $00, $00
-	db FRAMEBLOCK_62, $2a, $00
-	db FRAMEBLOCK_62, $00, $00
+	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, $89, $00
-	db FRAMEBLOCK_64, $75, $00
-	db FRAMEBLOCK_63, $76, $00
-	db FRAMEBLOCK_65, $0d, $00
-	db FRAMEBLOCK_65, $86, $00
-	db FRAMEBLOCK_65, $12, $00
-	db FRAMEBLOCK_65, $87, $00
-	db FRAMEBLOCK_65, $17, $00
-	db FRAMEBLOCK_65, $88, $00
-	db FRAMEBLOCK_65, $1a, $00
+	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, $8a, $00
-	db FRAMEBLOCK_66, $33, $00
-	db FRAMEBLOCK_66, $2e, $00
-	db FRAMEBLOCK_67, $24, $03
-	db FRAMEBLOCK_66, $01, $04
-	db FRAMEBLOCK_66, $10, $04
-	db FRAMEBLOCK_66, $1d, $04
-	db FRAMEBLOCK_67, $28, $03
-	db FRAMEBLOCK_66, $2a, $04
-	db FRAMEBLOCK_66, $0e, $04
-	db FRAMEBLOCK_66, $1b, $04
-	db FRAMEBLOCK_67, $26, $03
-	db FRAMEBLOCK_66, $03, $04
-	db FRAMEBLOCK_66, $12, $04
-	db FRAMEBLOCK_66, $1e, $04
-	db FRAMEBLOCK_67, $29, $00
+	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, $31, $00
-	db FRAMEBLOCK_34, $31, $00
-	db FRAMEBLOCK_02, $31, $00
-	db FRAMEBLOCK_02, $32, $00
-	db FRAMEBLOCK_34, $32, $00
-	db FRAMEBLOCK_02, $32, $00
-	db FRAMEBLOCK_02, $92, $00
-	db FRAMEBLOCK_34, $92, $00
-	db FRAMEBLOCK_02, $92, $00
-	db FRAMEBLOCK_02, $0e, $00
-	db FRAMEBLOCK_34, $0e, $00
-	db FRAMEBLOCK_02, $0e, $00
-	db FRAMEBLOCK_02, $0f, $00
-	db FRAMEBLOCK_34, $0f, $00
-	db FRAMEBLOCK_02, $0f, $00
-	db FRAMEBLOCK_02, $10, $00
-	db FRAMEBLOCK_34, $10, $00
-	db FRAMEBLOCK_02, $10, $00
+	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, $4b, $00
-	db FRAMEBLOCK_68, $8c, $00
-	db FRAMEBLOCK_68, $20, $00
-	db FRAMEBLOCK_68, $1c, $00
-	db FRAMEBLOCK_68, $19, $00
-	db FRAMEBLOCK_68, $14, $00
-	db FRAMEBLOCK_68, $76, $00
-	db FRAMEBLOCK_68, $8d, $00
-	db FRAMEBLOCK_68, $15, $00
-	db FRAMEBLOCK_68, $10, $00
-	db FRAMEBLOCK_68, $0c, $00
-	db FRAMEBLOCK_68, $06, $00
-	db FRAMEBLOCK_68, $8e, $00
-	db FRAMEBLOCK_68, $8f, $00
-	db FRAMEBLOCK_68, $90, $00
-	db FRAMEBLOCK_68, $26, $00
-	db FRAMEBLOCK_68, $23, $00
-	db FRAMEBLOCK_68, $1f, $00
+	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, $4b, $00
-	db FRAMEBLOCK_69, $8c, $00
-	db FRAMEBLOCK_69, $20, $00
-	db FRAMEBLOCK_69, $1c, $00
-	db FRAMEBLOCK_69, $19, $00
-	db FRAMEBLOCK_69, $14, $00
-	db FRAMEBLOCK_69, $76, $00
-	db FRAMEBLOCK_69, $8d, $00
-	db FRAMEBLOCK_69, $15, $00
-	db FRAMEBLOCK_69, $10, $00
-	db FRAMEBLOCK_69, $0c, $00
-	db FRAMEBLOCK_69, $06, $00
+	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, $07, $00
-	db FRAMEBLOCK_6B, $0f, $00
-	db FRAMEBLOCK_6C, $17, $00
+	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, $8b, $00
-	db FRAMEBLOCK_6D, $84, $00
-	db FRAMEBLOCK_6D, $63, $00
-	db FRAMEBLOCK_6D, $8c, $00
+	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, $8b, $00
-	db FRAMEBLOCK_6D, $84, $00
-	db FRAMEBLOCK_6D, $63, $00
-	db FRAMEBLOCK_6D, $8c, $00
-	db FRAMEBLOCK_6D, $0a, $00
-	db FRAMEBLOCK_6D, $89, $00
+	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, $82, $00
-	db FRAMEBLOCK_07, $82, $00
-	db FRAMEBLOCK_08, $96, $00
+	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, $41, $04
-	db FRAMEBLOCK_03, $48, $04
-	db FRAMEBLOCK_04, $48, $04
-	db FRAMEBLOCK_03, $48, $04
-	db FRAMEBLOCK_05, $48, $04
-	db FRAMEBLOCK_03, $48, $03
+	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, $48, $04
-	db FRAMEBLOCK_03, $48, $04
-	db FRAMEBLOCK_05, $48, $04
-	db FRAMEBLOCK_03, $48, $03
+	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, $84, $03
+	db FRAMEBLOCK_04, BASECOORD_84, FRAMEBLOCKMODE_03
 
 Subanimation4b:
 	subanim SUBANIMTYPE_NORMAL, 3
-	db FRAMEBLOCK_06, $72, $00
-	db FRAMEBLOCK_07, $72, $00
-	db FRAMEBLOCK_08, $72, $00
+	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, $30, $00
-	db FRAMEBLOCK_6E, $30, $00
-	db FRAMEBLOCK_70, $30, $00
-	db FRAMEBLOCK_6E, $30, $00
-	db FRAMEBLOCK_6F, $30, $00
-	db FRAMEBLOCK_6E, $30, $00
-	db FRAMEBLOCK_70, $30, $00
-	db FRAMEBLOCK_6E, $30, $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
+	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, $4b, $00
-	db FRAMEBLOCK_33, $4f, $00
-	db FRAMEBLOCK_32, $20, $00
-	db FRAMEBLOCK_33, $16, $00
-	db FRAMEBLOCK_32, $19, $00
-	db FRAMEBLOCK_33, $0d, $00
+	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, $1b, $00
-	db FRAMEBLOCK_34, $1b, $00
-	db FRAMEBLOCK_76, $1b, $00
-	db FRAMEBLOCK_34, $1b, $00
-	db FRAMEBLOCK_76, $1b, $00
-	db FRAMEBLOCK_34, $1b, $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
+	db FRAMEBLOCK_76, BASECOORD_1B, FRAMEBLOCKMODE_00
+	db FRAMEBLOCK_34, BASECOORD_1B, FRAMEBLOCKMODE_00
 
 Subanimation52:
 	subanim SUBANIMTYPE_HFLIP, 7
-	db FRAMEBLOCK_77, $25, $00
-	db FRAMEBLOCK_77, $9b, $00
-	db FRAMEBLOCK_77, $1a, $00
-	db FRAMEBLOCK_77, $9c, $00
-	db FRAMEBLOCK_77, $2f, $00
-	db FRAMEBLOCK_77, $50, $00
-	db FRAMEBLOCK_77, $8c, $00
+	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, $30, $00
-	db FRAMEBLOCK_78, $a2, $00
-	db FRAMEBLOCK_78, $93, $00
-	db FRAMEBLOCK_78, $61, $00
-	db FRAMEBLOCK_78, $73, $00
-	db FRAMEBLOCK_78, $a7, $00
-	db FRAMEBLOCK_78, $33, $00
-	db FRAMEBLOCK_78, $a8, $00
-	db FRAMEBLOCK_78, $0e, $00
-	db FRAMEBLOCK_78, $a9, $00
-	db FRAMEBLOCK_78, $34, $00
-	db FRAMEBLOCK_01, $9e, $00
+	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, $30, $00
-	db FRAMEBLOCK_79, $a2, $00
-	db FRAMEBLOCK_79, $93, $00
-	db FRAMEBLOCK_79, $61, $00
-	db FRAMEBLOCK_79, $73, $00
-	db FRAMEBLOCK_79, $a7, $00
-	db FRAMEBLOCK_79, $33, $00
-	db FRAMEBLOCK_79, $a8, $00
-	db FRAMEBLOCK_79, $0e, $00
-	db FRAMEBLOCK_79, $a9, $00
-	db FRAMEBLOCK_79, $34, $00
+	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