Clean up some data, using macros for multiline list entries

7 files changed, 2085 insertions, 2105 deletions

diff --git a/data/moves/animation_special_effect_pointers.asm b/data/moves/animation_special_effect_pointers.asm
index ba607141..dc75cfee 100644
--- a/data/moves/animation_special_effect_pointers.asm
+++ b/data/moves/animation_special_effect_pointers.asm
@@ -1,81 +1,47 @@
-; Format: Special Effect ID (1 byte), Address (2 bytes)
+special_effect: MACRO
+	db \1
+	dw \2
+ENDM
+
 SpecialEffectPointers:
-	db SE_DARK_SCREEN_FLASH ; $FE
-	dw AnimationFlashScreen
-	db SE_DARK_SCREEN_PALETTE ; $FD
-	dw AnimationDarkScreenPalette
-	db SE_RESET_SCREEN_PALETTE ; $FC
-	dw AnimationResetScreenPalette
-	db SE_SHAKE_SCREEN ; $FB
-	dw AnimationShakeScreen
-	db SE_WATER_DROPLETS_EVERYWHERE ; $FA
-	dw AnimationWaterDropletsEverywhere
-	db SE_DARKEN_MON_PALETTE ; $F9
-	dw AnimationDarkenMonPalette
-	db SE_FLASH_SCREEN_LONG ; $F8
-	dw AnimationFlashScreenLong
-	db SE_SLIDE_MON_UP ; $F7
-	dw AnimationSlideMonUp
-	db SE_SLIDE_MON_DOWN ; $F6
-	dw AnimationSlideMonDown
-	db SE_FLASH_MON_PIC ; $F5
-	dw AnimationFlashMonPic
-	db SE_SLIDE_MON_OFF ; $F4
-	dw AnimationSlideMonOff
-	db SE_BLINK_MON ; $F3
-	dw AnimationBlinkMon
-	db SE_MOVE_MON_HORIZONTALLY ; $F2
-	dw AnimationMoveMonHorizontally
-	db SE_RESET_MON_POSITION ; $F1
-	dw AnimationResetMonPosition
-	db SE_LIGHT_SCREEN_PALETTE ; $F0
-	dw AnimationLightScreenPalette
-	db SE_HIDE_MON_PIC ; $EF
-	dw AnimationHideMonPic
-	db SE_SQUISH_MON_PIC ; $EE
-	dw AnimationSquishMonPic
-	db SE_SHOOT_BALLS_UPWARD ; $ED
-	dw AnimationShootBallsUpward
-	db SE_SHOOT_MANY_BALLS_UPWARD ; $EC
-	dw AnimationShootManyBallsUpward
-	db SE_BOUNCE_UP_AND_DOWN ; $EB
-	dw AnimationBoundUpAndDown
-	db SE_MINIMIZE_MON ; $EA
-	dw AnimationMinimizeMon
-	db SE_SLIDE_MON_DOWN_AND_HIDE ; $E9
-	dw AnimationSlideMonDownAndHide
-	db SE_TRANSFORM_MON ; $E8
-	dw AnimationTransformMon
-	db SE_LEAVES_FALLING ; $E7
-	dw AnimationLeavesFalling
-	db SE_PETALS_FALLING ; $E6
-	dw AnimationPetalsFalling
-	db SE_SLIDE_MON_HALF_OFF ; $E5
-	dw AnimationSlideMonHalfOff
-	db SE_SHAKE_ENEMY_HUD ; $E4
-	dw AnimationShakeEnemyHUD
-	db SE_SHAKE_ENEMY_HUD_2 ; unused--same pointer as SE_SHAKE_ENEMY_HUD ($E4)
-	dw AnimationShakeEnemyHUD
-	db SE_SPIRAL_BALLS_INWARD ; $E2
-	dw AnimationSpiralBallsInward
-	db SE_DELAY_ANIMATION_10 ; $E1
-	dw AnimationDelay10
-	db SE_FLASH_ENEMY_MON_PIC ; unused--same as SE_FLASH_MON_PIC ($F5), but for the enemy mon
-	dw AnimationFlashEnemyMonPic
-	db SE_HIDE_ENEMY_MON_PIC ; $DF
-	dw AnimationHideEnemyMonPic
-	db SE_BLINK_ENEMY_MON ; $DE
-	dw AnimationBlinkEnemyMon
-	db SE_SHOW_MON_PIC ; $DD
-	dw AnimationShowMonPic
-	db SE_SHOW_ENEMY_MON_PIC ; $DC
-	dw AnimationShowEnemyMonPic
-	db SE_SLIDE_ENEMY_MON_OFF ; $DB
-	dw AnimationSlideEnemyMonOff
-	db SE_SHAKE_BACK_AND_FORTH ; $DA
-	dw AnimationShakeBackAndForth
-	db SE_SUBSTITUTE_MON ; $D9
-	dw AnimationSubstitute
-	db SE_WAVY_SCREEN ; $D8
-	dw AnimationWavyScreen
-	db $FF
+; 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
index 9dfb5645..da8a3fda 100644
--- a/data/moves/animation_special_effects.asm
+++ b/data/moves/animation_special_effects.asm
@@ -1,75 +1,32 @@
-; Format: Animation ID (1 byte), Address (2 bytes)
-AnimationIdSpecialEffects:
-	db MEGA_PUNCH
-	dw AnimationFlashScreen
-
-	db GUILLOTINE
-	dw AnimationFlashScreen
-
-	db MEGA_KICK
-	dw AnimationFlashScreen
-
-	db HEADBUTT
-	dw AnimationFlashScreen
-
-	db TAIL_WHIP
-	dw TailWhipAnimationUnused
-
-	db GROWL
-	dw DoGrowlSpecialEffects
-
-	db DISABLE
-	dw AnimationFlashScreen
-
-	db BLIZZARD
-	dw DoBlizzardSpecialEffects
-
-	db BUBBLEBEAM
-	dw AnimationFlashScreen
-
-	db HYPER_BEAM
-	dw FlashScreenEveryFourFrameBlocks
-
-	db THUNDERBOLT
-	dw FlashScreenEveryEightFrameBlocks
-
-	db REFLECT
-	dw AnimationFlashScreen
-
-	db SELFDESTRUCT
-	dw DoExplodeSpecialEffects
+anim_special_effect: MACRO
+	db \1
+	dw \2
+ENDM
 
-	db SPORE
-	dw AnimationFlashScreen
-
-	db EXPLOSION
-	dw DoExplodeSpecialEffects
-
-	db ROCK_SLIDE
-	dw DoRockSlideSpecialEffects
-
-	db TRADE_BALL_DROP_ANIM
-	dw TradeHidePokemon
-
-	db TRADE_BALL_SHAKE_ANIM
-	dw TradeShakePokeball
-
-	db TRADE_BALL_TILT_ANIM
-	dw TradeJumpPokeball
-
-	db TOSS_ANIM
-	dw DoBallTossSpecialEffects
-
-	db SHAKE_ANIM
-	dw DoBallShakeSpecialEffects
-
-	db POOF_ANIM
-	dw DoPoofSpecialEffects
-
-	db GREATTOSS_ANIM
-	dw DoBallTossSpecialEffects
-
-	db ULTRATOSS_ANIM
-	dw DoBallTossSpecialEffects
-
-	db $FF ; terminator
+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 8c388afd..6f262952 100755
--- a/data/moves/animations.asm
+++ b/data/moves/animations.asm
@@ -215,155 +215,155 @@ ZigZagScreenAnim:
 
 PoundAnim:
 StruggleAnim:
-	db $08,$00,$01
+	db $08, $00, $01
 	db $FF
 
 KarateChopAnim:
-	db $08,$01,$03
+	db $08, $01, $03
 	db $FF
 
 DoubleSlapAnim:
-	db $05,$02,$01
-	db $05,$02,$01
+	db $05, $02, $01
+	db $05, $02, $01
 	db $FF
 
 CometPunchAnim:
-	db $04,$03,$02
-	db $04,$03,$02
+	db $04, $03, $02
+	db $04, $03, $02
 	db $FF
 
 MegaPunchAnim:
-	db $46,$04,$04
+	db $46, $04, $04
 	db $FF
 
 PayDayAnim:
-	db $08,$00,$01
-	db $04,$05,$52
+	db $08, $00, $01
+	db $04, $05, $52
 	db $FF
 
 FirePunchAnim:
-	db $06,$06,$02
-	db $46,$FF,$11
+	db $06, $06, $02
+	db $46, $FF, $11
 	db $FF
 
 IcePunchAnim:
-	db $06,$07,$02
-	db $10,$FF,$2F
+	db $06, $07, $02
+	db $10, $FF, $2F
 	db $FF
 
 ThunderPunchAnim:
-	db $06,$08,$02
+	db $06, $08, $02
 	db SE_DARK_SCREEN_PALETTE, $FF
-	db $46,$FF,$2B
+	db $46, $FF, $2B
 	db SE_RESET_SCREEN_PALETTE, $FF
 	db $FF
 
 ScratchAnim:
-	db $06,$09,$0F
+	db $06, $09, $0F
 	db $FF
 
 VicegripAnim:
-	db $08,$0A,$2A
+	db $08, $0A, $2A
 	db $FF
 
 GuillotineAnim:
-	db $06,$0B,$2A
+	db $06, $0B, $2A
 	db $FF
 
 RazorWindAnim:
-	db $04,$0C,$16
+	db $04, $0C, $16
 	db $FF
 
 SwordsDanceAnim:
-	db $46,$0D,$18
-	db $46,$0D,$18
-	db $46,$0D,$18
+	db $46, $0D, $18
+	db $46, $0D, $18
+	db $46, $0D, $18
 	db $FF
 
 CutAnim:
 	db SE_DARK_SCREEN_FLASH, $0E
-	db $04,$FF,$16
+	db $04, $FF, $16
 	db $FF
 
 GustAnim:
-	db $46,$0F,$10
-	db $06,$FF,$02
+	db $46, $0F, $10
+	db $06, $FF, $02
 	db $FF
 
 WingAttackAnim:
-	db $46,$10,$04
+	db $46, $10, $04
 	db $FF
 
 WhirlwindAnim:
-	db $46,$11,$10
+	db $46, $11, $10
 	db SE_SLIDE_ENEMY_MON_OFF, $FF
 	db $FF
 
 FlyAnim:
-	db $46,$12,$04
+	db $46, $12, $04
 	db SE_SHOW_MON_PIC, $FF
 	db $FF
 
 BindAnim:
-	db $04,$13,$23
-	db $04,$13,$23
+	db $04, $13, $23
+	db $04, $13, $23
 	db $FF
 
 SlamAnim:
-	db $06,$14,$02
+	db $06, $14, $02
 	db $FF
 
 VineWhipAnim:
-	db $01,$15,$16
-	db $08,$FF,$01
+	db $01, $15, $16
+	db $08, $FF, $01
 	db $FF
 
 StompAnim:
-	db $48,$16,$05
+	db $48, $16, $05
 	db $FF
 
 DoubleKickAnim:
-	db $08,$17,$01
-	db $08,$17,$01
+	db $08, $17, $01
+	db $08, $17, $01
 	db $FF
 
 MegaKickAnim:
-	db $46,$18,$04
+	db $46, $18, $04
 	db $FF
 
 JumpKickAnim:
-	db $46,$19,$04
+	db $46, $19, $04
 	db $FF
 
 RollingKickAnim:
 	db SE_DARK_SCREEN_FLASH, $1A
-	db $46,$FF,$04
+	db $46, $FF, $04
 	db $FF
 
 SandAttackAnim:
-	db $46,$1B,$28
+	db $46, $1B, $28
 	db $FF
 
 HeatButtAnim:
-	db $46,$1C,$05
+	db $46, $1C, $05
 	db $FF
 
 HornAttackAnim:
-	db $06,$1D,$45
-	db $46,$FF,$05
+	db $06, $1D, $45
+	db $46, $FF, $05
 	db $FF
 
 FuryAttackAnim:
-	db $02,$1E,$46
-	db $02,$FF,$46
+	db $02, $1E, $46
+	db $02, $FF, $46
 	db $FF
 
 HornDrillAnim:
-	db $42,$1F,$05
-	db $42,$FF,$05
-	db $42,$FF,$05
-	db $42,$FF,$05
-	db $42,$FF,$05
+	db $42, $1F, $05
+	db $42, $FF, $05
+	db $42, $FF, $05
+	db $42, $FF, $05
+	db $42, $FF, $05
 	db $FF
 
 TackleAnim:
@@ -379,9 +379,9 @@ BodySlamAnim:
 	db $FF
 
 WrapAnim:
-	db $04,$22,$23
-	db $04,$22,$23
-	db $04,$22,$23
+	db $04, $22, $23
+	db $04, $22, $23
+	db $04, $22, $23
 	db $FF
 
 TakeDownAnim:
@@ -391,12 +391,12 @@ TakeDownAnim:
 	db $FF
 
 ThrashAnim:
-	db $46,$24,$04
+	db $46, $24, $04
 	db $FF
 
 DoubleEdgeAnim:
 	db SE_LIGHT_SCREEN_PALETTE, $48
-	db $06,$FF,$2D
+	db $06, $FF, $2D
 	db SE_RESET_SCREEN_PALETTE, $FF
 	db SE_MOVE_MON_HORIZONTALLY, $FF
 	db SE_DARK_SCREEN_FLASH, $25
@@ -414,16 +414,16 @@ TailWhipAnim:
 	db $FF
 
 PoisonStingAnim:
-	db $06,$27,$00
+	db $06, $27, $00
 	db $FF
 
 TwineedleAnim:
-	db $05,$28,$01
-	db $05,$28,$01
+	db $05, $28, $01
+	db $05, $28, $01
 	db $FF
 
 PinMissileAnim:
-	db $03,$29,$01
+	db $03, $29, $01
 	db $FF
 
 LeerAnim:
@@ -434,34 +434,34 @@ LeerAnim:
 	db $FF
 
 BiteAnim:
-	db $08,$2B,$02
+	db $08, $2B, $02
 	db $FF
 
 GrowlAnim:
-	db $46,$2C,$12
+	db $46, $2C, $12
 	db $FF
 
 RoarAnim:
-	db $46,$2D,$15
-	db $46,$2D,$15
-	db $46,$2D,$15
+	db $46, $2D, $15
+	db $46, $2D, $15
+	db $46, $2D, $15
 	db $FF
 
 SingAnim:
-	db $46,$2E,$12
-	db $50,$FF,$40
-	db $50,$FF,$40
+	db $46, $2E, $12
+	db $50, $FF, $40
+	db $50, $FF, $40
 	db $FF
 
 SupersonicAnim:
-	db $06,$2F,$31
+	db $06, $2F, $31
 	db $FF
 
 SonicBoomAnim:
-	db $46,$2D,$15
-	db $46,$2D,$15
-	db $46,$0F,$10
-	db $46,$FF,$05
+	db $46, $2D, $15
+	db $46, $2D, $15
+	db $46, $0F, $10
+	db $46, $FF, $05
 	db $FF
 
 DisableAnim:
@@ -472,18 +472,18 @@ DisableAnim:
 	db $FF
 
 AcidAnim:
-	db $46,$32,$13
-	db $46,$32,$14
+	db $46, $32, $13
+	db $46, $32, $14
 	db $FF
 
 EmberAnim:
-	db $46,$33,$11
+	db $46, $33, $11
 	db $FF
 
 FlamethrowerAnim:
-	db $46,$34,$1F
-	db $46,$34,$0C
-	db $46,$34,$0D
+	db $46, $34, $1F
+	db $46, $34, $0C
+	db $46, $34, $0D
 	db $FF
 
 MistAnim:
@@ -493,40 +493,40 @@ MistAnim:
 	db $FF
 
 WaterGunAnim:
-	db $06,$36,$2C
+	db $06, $36, $2C
 	db $FF
 
 HydroPumpAnim:
-	db $06,$37,$1A
-	db $06,$37,$1A
+	db $06, $37, $1A
+	db $06, $37, $1A
 	db $FF
 
 SurfAnim:
 	db SE_WATER_DROPLETS_EVERYWHERE, $38
-	db $06,$37,$1A
+	db $06, $37, $1A
 	db $FF
 
 IceBeamAnim:
-	db $03,$39,$2E
-	db $10,$FF,$2F
+	db $03, $39, $2E
+	db $10, $FF, $2F
 	db $FF
 
 BlizzardAnim:
-	db $04,$3A,$38
-	db $04,$37,$38
+	db $04, $3A, $38
+	db $04, $37, $38
 	db $FF
 
 PsyBeamAnim:
-	db $03,$3B,$2E
+	db $03, $3B, $2E
 	db SE_FLASH_SCREEN_LONG, $FF
 	db $FF
 
 BubbleBeamAnim:
-	db $12,$3C,$35
+	db $12, $3C, $35
 	db $FF
 
 AuroraBeamAnim:
-	db $03,$3D,$2E
+	db $03, $3D, $2E
 	db SE_DELAY_ANIMATION_10, $FF
 	db SE_DELAY_ANIMATION_10, $FF
 	db $FF
@@ -534,49 +534,49 @@ AuroraBeamAnim:
 HyperBeamAnim:
 	db SE_DARK_SCREEN_PALETTE, $48
 	db SE_SPIRAL_BALLS_INWARD, $FF
-	db $02,$3E,$2E
+	db $02, $3E, $2E
 	db SE_DARK_SCREEN_FLASH, $FF
 	db SE_DARK_SCREEN_FLASH, $FF
-	db $46,$04,$04
+	db $46, $04, $04
 	db SE_RESET_SCREEN_PALETTE, $FF
 	db $FF
 
 PeckAnim:
-	db $08,$3F,$01
+	db $08, $3F, $01
 	db $FF
 
 DrillPeckAnim:
-	db $46,$40,$04
+	db $46, $40, $04
 	db $FF
 
 SubmissionAnim:
 	db SE_SLIDE_MON_OFF, $41
-	db $06,$FF,$01
+	db $06, $FF, $01
 	db SE_SHOW_MON_PIC, $FF
 	db $FF
 
 LowKickAnim:
 	db SE_SLIDE_MON_OFF, $42
-	db $46,$FF,$04
+	db $46, $FF, $04
 	db SE_SHOW_MON_PIC, $FF
 	db $FF
 
 CounterAnim:
 	db SE_SLIDE_MON_OFF, $43
-	db $46,$FF,$04
+	db $46, $FF, $04
 	db SE_SHOW_MON_PIC, $FF
 	db $FF
 
 SeismicTossAnim:
 	db SE_BLINK_ENEMY_MON, $FF
-	db $41,$8B,$4E
+	db $41, $8B, $4E
 	db SE_HIDE_ENEMY_MON_PIC, $FF
 	db SE_SLIDE_MON_OFF, $FF
-	db $42,$44,$4F
+	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 $41, $44, $50
 	db SE_SHOW_ENEMY_MON_PIC, $FF
 	db SE_SHAKE_SCREEN, $FF
 	db $FF
@@ -584,28 +584,28 @@ SeismicTossAnim:
 StrengthAnim:
 	db SE_MOVE_MON_HORIZONTALLY, $48
 	db SE_RESET_MON_POSITION, $FF
-	db $46,$06,$04
+	db $46, $06, $04
 	db $FF
 
 AbsorbAnim:
 	db SE_LIGHT_SCREEN_PALETTE, $46
-	db $06,$FF,$21
-	db $06,$FF,$22
+	db $06, $FF, $21
+	db $06, $FF, $22
 	db SE_RESET_SCREEN_PALETTE, $FF
 	db $FF
 
 MegaDrainAnim:
 	db SE_LIGHT_SCREEN_PALETTE, $47
 	db SE_DARK_SCREEN_FLASH, $FF
-	db $06,$FF,$21
-	db $06,$FF,$22
+	db $06, $FF, $21
+	db $06, $FF, $22
 	db SE_DARK_SCREEN_FLASH, $FF
 	db SE_RESET_SCREEN_PALETTE, $FF
 	db $FF
 
 LeechSeedAnim:
-	db $46,$48,$1B
-	db $55,$4D,$1C
+	db $46, $48, $1B
+	db $55, $4D, $1C
 	db $FF
 
 GrowthAnim:
@@ -616,25 +616,25 @@ GrowthAnim:
 
 RazorLeafAnim:
 	db SE_LEAVES_FALLING, $4A
-	db $41,$80,$44
-	db $01,$0C,$16
+	db $41, $80, $44
+	db $01, $0C, $16
 	db $FF
 
 SolarBeamAnim:
-	db $06,$4B,$2E
-	db $06,$FF,$01
+	db $06, $4B, $2E
+	db $06, $FF, $01
 	db $FF
 
 PoisonPowderAnim:
-	db $06,$4C,$36
+	db $06, $4C, $36
 	db $FF
 
 StunSporeAnim:
-	db $06,$4D,$36
+	db $06, $4D, $36
 	db $FF
 
 SleepPowderAnim:
-	db $06,$4E,$36
+	db $06, $4E, $36
 	db $FF
 
 PedalDanceAnim:
@@ -644,48 +644,48 @@ PedalDanceAnim:
 	db $FF
 
 StringShotAnim:
-	db $08,$50,$37
+	db $08, $50, $37
 	db $FF
 
 DragonRageAnim:
-	db $46,$51,$1F
-	db $46,$FF,$0C
-	db $46,$FF,$0D
-	db $46,$FF,$0E
+	db $46, $51, $1F
+	db $46, $FF, $0C
+	db $46, $FF, $0D
+	db $46, $FF, $0E
 	db $FF
 
 FireSpinAnim:
-	db $46,$52,$0C
-	db $46,$FF,$0D
-	db $46,$FF,$0E
+	db $46, $52, $0C
+	db $46, $FF, $0D
+	db $46, $FF, $0E
 	db $FF
 
 ThunderShockAnim:
-	db $42,$53,$29
+	db $42, $53, $29
 	db $FF
 
 ThunderBoltAnim:
-	db $41,$54,$29
-	db $41,$54,$29
+	db $41, $54, $29
+	db $41, $54, $29
 	db $FF
 
 ThunderWaveAnim:
-	db $42,$55,$29
-	db $02,$FF,$23
-	db $04,$FF,$23
+	db $42, $55, $29
+	db $02, $FF, $23
+	db $04, $FF, $23
 	db $FF
 
 ThunderAnim:
 	db SE_DARK_SCREEN_PALETTE, $56
 	db SE_DARK_SCREEN_FLASH, $FF
-	db $46,$FF,$2B
+	db $46, $FF, $2B
 	db SE_DARK_SCREEN_FLASH, $FF
-	db $42,$54,$29
+	db $42, $54, $29
 	db SE_RESET_SCREEN_PALETTE, $FF
 	db $FF
 
 RockThrowAnim:
-	db $04,$57,$30
+	db $04, $57, $30
 	db $FF
 
 EarthquakeAnim:
@@ -701,13 +701,13 @@ FissureAnim:
 	db $FF
 
 DigAnim:
-	db $46,$5A,$04
+	db $46, $5A, $04
 	db SE_SLIDE_MON_UP, $FF
 	db $FF
 
 ToxicAnim:
 	db SE_WATER_DROPLETS_EVERYWHERE, $38
-	db $46,$5B,$14
+	db $46, $5B, $14
 	db $FF
 
 ConfusionAnim:
@@ -725,7 +725,7 @@ HypnosisAnim:
 
 MeditateAnim:
 	db SE_LIGHT_SCREEN_PALETTE, $5F
-	db $46,$FF,$43
+	db $46, $FF, $43
 	db SE_DARK_SCREEN_FLASH, $FF
 	db SE_RESET_SCREEN_PALETTE, $FF
 	db $FF
@@ -737,12 +737,12 @@ AgilityAnim:
 
 QuickAttackAnim:
 	db SE_SLIDE_MON_OFF, $61
-	db $46,$FF,$04
+	db $46, $FF, $04
 	db SE_SHOW_MON_PIC, $FF
 	db $FF
 
 RageAnim:
-	db $06,$62,$01
+	db $06, $62, $01
 	db $FF
 
 TeleportAnim:
@@ -756,12 +756,12 @@ NightShadeAnim:
 	db $FF
 
 MimicAnim:
-	db $46,$65,$21
-	db $46,$65,$22
+	db $46, $65, $21
+	db $46, $65, $22
 	db $FF
 
 ScreechAnim:
-	db $46,$66,$12
+	db $46, $66, $12
 	db $FF
 
 DoubleTeamAnim:
@@ -773,7 +773,7 @@ DoubleTeamAnim:
 	db SE_RESET_SCREEN_PALETTE, $FF
 	db SE_SHAKE_BACK_AND_FORTH, $67
 	db SE_SHOW_MON_PIC, $FF
-	db $46,$6F,$33
+	db $46, $6F, $33
 	db $FF
 
 RecoverAnim:
@@ -785,7 +785,7 @@ RecoverAnim:
 
 HardenAnim:
 	db SE_LIGHT_SCREEN_PALETTE, $69
-	db $46,$FF,$43
+	db $46, $FF, $43
 	db SE_DARK_SCREEN_FLASH, $FF
 	db SE_RESET_SCREEN_PALETTE, $FF
 	db $FF
@@ -798,8 +798,8 @@ MinimizeAnim:
 	db $FF
 
 SmokeScreenAnim:
-	db $46,$6B,$28
-	db $04,$FF,$0A
+	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
@@ -817,34 +817,34 @@ SmokeScreenAnim:
 
 ConfuseRayAnim:
 	db SE_DARK_SCREEN_PALETTE, $6C
-	db $46,$FF,$3E
+	db $46, $FF, $3E
 	db SE_RESET_SCREEN_PALETTE, $FF
 	db $FF
 
 WithdrawAnim:
 	db SE_LIGHT_SCREEN_PALETTE, $6E
 	db SE_SLIDE_MON_DOWN, $FF
-	db $06,$FF,$51
+	db $06, $FF, $51
 	db SE_RESET_SCREEN_PALETTE, $FF
 	db SE_SHOW_MON_PIC, $FF
 	db $FF
 
 DefenseCurlAnim:
 	db SE_LIGHT_SCREEN_PALETTE, $6E
-	db $06,$FF,$43
+	db $06, $FF, $43
 	db SE_DARK_SCREEN_FLASH, $FF
 	db SE_RESET_SCREEN_PALETTE, $FF
 	db $FF
 
 BarrierAnim:
-	db $46,$6F,$33
-	db $46,$6F,$33
+	db $46, $6F, $33
+	db $46, $6F, $33
 	db $FF
 
 LightScreenAnim:
 	db SE_LIGHT_SCREEN_PALETTE, $FF
-	db $46,$70,$33
-	db $46,$70,$33
+	db $46, $70, $33
+	db $46, $70, $33
 	db SE_RESET_SCREEN_PALETTE, $FF
 	db $FF
 
@@ -856,8 +856,8 @@ HazeAnim:
 
 ReflectAnim:
 	db SE_DARK_SCREEN_PALETTE, $FF
-	db $46,$72,$33
-	db $46,$72,$33
+	db $46, $72, $33
+	db $46, $72, $33
 	db SE_RESET_SCREEN_PALETTE, $FF
 	db $FF
 
@@ -866,7 +866,7 @@ FocusEnergyAnim:
 	db $FF
 
 BideAnim:
-	db $46,$74,$04
+	db $46, $74, $04
 	db $FF
 
 MetronomeAnim:
@@ -880,88 +880,88 @@ MetronomeAnim:
 	db $FF
 
 MirrorMoveAnim:
-	db $08,$76,$01
+	db $08, $76, $01
 	db $FF
 
 SelfdestructAnim:
-	db $43,$77,$34
+	db $43, $77, $34
 	db $FF
 
 EggBombAnim:
-	db $44,$78,$41
-	db $44,$78,$42
+	db $44, $78, $41
+	db $44, $78, $42
 	db $FF
 
 LickAnim:
-	db $46,$7B,$14
+	db $46, $7B, $14
 	db $FF
 
 SmogAnim:
 	db SE_DARKEN_MON_PALETTE, $48
-	db $46,$7A,$19
+	db $46, $7A, $19
 	db SE_RESET_SCREEN_PALETTE, $FF
 	db $FF
 
 SludgeAnim:
-	db $46,$7B,$13
-	db $46,$7B,$14
+	db $46, $7B, $13
+	db $46, $7B, $14
 	db $FF
 
 BoneClubAnim:
-	db $08,$7C,$02
+	db $08, $7C, $02
 	db $FF
 
 FireBlastAnim:
-	db $46,$7D,$1F
-	db $46,$FF,$20
-	db $46,$FF,$20
-	db $46,$FF,$0C
-	db $46,$FF,$0D
+	db $46, $7D, $1F
+	db $46, $FF, $20
+	db $46, $FF, $20
+	db $46, $FF, $0C
+	db $46, $FF, $0D
 	db $FF
 
 WaterfallAnim:
 	db SE_SLIDE_MON_DOWN, $48
-	db $06,$37,$1A
-	db $08,$FF,$02
+	db $06, $37, $1A
+	db $08, $FF, $02
 	db SE_SLIDE_MON_UP, $FF
 	db $FF
 
 ClampAnim:
-	db $08,$7F,$2A
-	db $06,$83,$23
-	db $06,$83,$23
+	db $08, $7F, $2A
+	db $06, $83, $23
+	db $06, $83, $23
 	db $FF
 
 SwiftAnim:
-	db $43,$80,$3F
+	db $43, $80, $3F
 	db $FF
 
 SkullBashAnim:
-	db $46,$81,$05
+	db $46, $81, $05
 	db $FF
 
 SpikeCannonAnim:
-	db $44,$82,$04
+	db $44, $82, $04
 	db $FF
 
 ConstrictAnim:
-	db $06,$83,$23
-	db $06,$83,$23
-	db $06,$83,$23
+	db $06, $83, $23
+	db $06, $83, $23
+	db $06, $83, $23
 	db $FF
 
 AmnesiaAnim:
-	db $08,$84,$25
-	db $08,$84,$25
+	db $08, $84, $25
+	db $08, $84, $25
 	db $FF
 
 KinesisAnim:
-	db $08,$85,$01
+	db $08, $85, $01
 	db $FF
 
 SoftboiledAnim:
 	db SE_SLIDE_MON_HALF_OFF, $48
-	db $08,$86,$4C
+	db $08, $86, $4C
 	db SE_LIGHT_SCREEN_PALETTE, $FF
 	db SE_SPIRAL_BALLS_INWARD, $FF
 	db SE_RESET_SCREEN_PALETTE, $FF
@@ -969,7 +969,7 @@ SoftboiledAnim:
 	db $FF
 
 HiJumpKickAnim:
-	db $46,$87,$04
+	db $46, $87, $04
 	db $FF
 
 GlareAnim:
@@ -982,58 +982,58 @@ GlareAnim:
 DreamEaterAnim:
 	db SE_FLASH_SCREEN_LONG, $89
 	db SE_DARK_SCREEN_PALETTE, $89
-	db $08,$89,$02
+	db $08, $89, $02
 	db SE_RESET_SCREEN_PALETTE, $FF
 	db $FF
 
 PoisonGasAnim:
-	db $46,$8A,$19
+	db $46, $8A, $19
 	db $FF
 
 BarrageAnim:
-	db $43,$8B,$41
-	db $05,$FF,$55
+	db $43, $8B, $41
+	db $05, $FF, $55
 	db $FF
 
 LeechLifeAnim:
-	db $08,$8C,$02
+	db $08, $8C, $02
 	db SE_DARK_SCREEN_FLASH, $FF
-	db $06,$FF,$21
-	db $06,$FF,$22
+	db $06, $FF, $21
+	db $06, $FF, $22
 	db SE_DARK_SCREEN_FLASH, $FF
 	db $FF
 
 LovelyKissAnim:
-	db $06,$8D,$12
+	db $06, $8D, $12
 	db $FF
 
 SkyAttackAnim:
 	db SE_SQUISH_MON_PIC, $8E
 	db SE_SHOOT_BALLS_UPWARD, $FF
-	db $46,$87,$04
+	db $46, $87, $04
 	db SE_SHOW_MON_PIC, $FF
 	db $FF
 
 TransformAnim:
-	db $46,$8F,$21
-	db $44,$8F,$22
-	db $08,$FF,$47
+	db $46, $8F, $21
+	db $44, $8F, $22
+	db $08, $FF, $47
 	db SE_TRANSFORM_MON, $FF
 	db $FF
 
 BubbleAnim:
-	db $16,$90,$35
+	db $16, $90, $35
 	db $FF
 
 DizzyPunchAnim:
-	db $06,$91,$17
-	db $06,$91,$17
-	db $06,$91,$17
-	db $06,$02,$02
+	db $06, $91, $17
+	db $06, $91, $17
+	db $06, $91, $17
+	db $06, $02, $02
 	db $FF
 
 SporeAnim:
-	db $06,$92,$36
+	db $06, $92, $36
 	db $FF
 
 FlashAnim:
@@ -1044,7 +1044,7 @@ FlashAnim:
 	db $FF
 
 PsywaveAnim:
-	db $06,$2F,$31
+	db $06, $2F, $31
 	db SE_WAVY_SCREEN, $5C
 	db $FF
 
@@ -1057,91 +1057,91 @@ AcidArmorAnim:
 	db $FF
 
 CrabHammerAnim:
-	db $46,$97,$05
-	db $06,$FF,$2A
+	db $46, $97, $05
+	db $06, $FF, $2A
 	db $FF
 
 ExplosionAnim:
-	db $43,$98,$34
+	db $43, $98, $34
 	db $FF
 
 FurySwipesAnim:
-	db $04,$99,$0F
+	db $04, $99, $0F
 	db $FF
 
 BonemerangAnim:
-	db $06,$9A,$02
+	db $06, $9A, $02
 	db $FF
 
 RestAnim:
-	db $10,$9B,$3A
-	db $10,$9B,$3A
+	db $10, $9B, $3A
+	db $10, $9B, $3A
 	db $FF
 
 RockSlideAnim:
-	db $04,$9C,$1D
-	db $03,$9C,$1E
-	db $46,$9D,$04
+	db $04, $9C, $1D
+	db $03, $9C, $1E
+	db $46, $9D, $04
 	db $FF
 
 HyperFangAnim:
-	db $06,$9D,$02
+	db $06, $9D, $02
 	db $FF
 
 SharpenAnim:
 	db SE_LIGHT_SCREEN_PALETTE, $9E
-	db $46,$FF,$43
+	db $46, $FF, $43
 	db SE_DARK_SCREEN_FLASH, $FF
 	db SE_RESET_SCREEN_PALETTE, $FF
 	db $FF
 
 ConversionAnim:
 	db SE_DARK_SCREEN_FLASH, $9F
-	db $46,$FF,$21
-	db $46,$FF,$22
+	db $46, $FF, $21
+	db $46, $FF, $22
 	db SE_DARK_SCREEN_FLASH, $FF
 	db $FF
 
 TriAttackAnim:
 	db SE_DARK_SCREEN_FLASH, $A0
-	db $46,$FF,$4D
+	db $46, $FF, $4D
 	db SE_DARK_SCREEN_FLASH, $FF
 	db $FF
 
 SuperFangAnim:
 	db SE_DARK_SCREEN_PALETTE, $48
-	db $46,$A1,$04
+	db $46, $A1, $04
 	db SE_RESET_SCREEN_PALETTE, $FF
 	db $FF
 
 SlashAnim:
-	db $06,$A2,$0F
+	db $06, $A2, $0F
 	db $FF
 
 SubstituteAnim:
 	db SE_SLIDE_MON_OFF, $A3
-	db $08,$FF,$47
+	db $08, $FF, $47
 	db SE_SUBSTITUTE_MON, $FF
 	db $FF
 
 BallTossAnim:
-	db $03,$FF,$06
+	db $03, $FF, $06
 	db $FF
 
 GreatTossAnim:
-	db $03,$FF,$07
+	db $03, $FF, $07
 	db $FF
 
 UltraTossAnim:
-	db $02,$FF,$08
+	db $02, $FF, $08
 	db $FF
 
 BallShakeAnim:
-	db $04,$FF,$09
+	db $04, $FF, $09
 	db $FF
 
 BallPoofAnim:
-	db $04,$FF,$0A
+	db $04, $FF, $0A
 	db $FF
 
 ShowPicAnim:
@@ -1165,19 +1165,19 @@ EnemyHUDShakeAnim:
 	db $FF
 
 TradeBallDropAnim:
-	db $86,$FF,$48
+	db $86, $FF, $48
 	db $FF
 
 TradeBallAppear1Anim:
-	db $84,$FF,$49
+	db $84, $FF, $49
 	db $FF
 
 TradeBallAppear2Anim:
-	db $86,$FF,$4A
+	db $86, $FF, $4A
 	db $FF
 
 TradeBallPoofAnim:
-	db $86,$FF,$4B
+	db $86, $FF, $4B
 	db $FF
 
 XStatItemAnim:
@@ -1188,7 +1188,7 @@ XStatItemAnim:
 
 ShrinkingSquareAnim:
 	db SE_LIGHT_SCREEN_PALETTE, $FF
-	db $46,$FF,$43
+	db $46, $FF, $43
 	db SE_RESET_SCREEN_PALETTE, $FF
 	db $FF
 
@@ -1200,7 +1200,7 @@ XStatItemBlackAnim:
 
 ShrinkingSquareBlackAnim:
 	db SE_DARKEN_MON_PALETTE, $FF
-	db $46,$FF,$43
+	db $46, $FF, $43
 	db SE_RESET_SCREEN_PALETTE, $FF
 	db $FF
 
@@ -1211,37 +1211,37 @@ UnusedAnim:
 	db $FF
 
 ParalyzeAnim:
-	db $04,$13,$24
-	db $04,$13,$24
+	db $04, $13, $24
+	db $04, $13, $24
 	db $FF
 
 PoisonAnim:
-	db $08,$13,$27
-	db $08,$13,$27
+	db $08, $13, $27
+	db $08, $13, $27
 	db $FF
 
 SleepPlayerAnim:
-	db $10,$9B,$3A
-	db $10,$9B,$3A
+	db $10, $9B, $3A
+	db $10, $9B, $3A
 	db $FF
 
 SleepEnemyAnim:
-	db $10,$9B,$3B
-	db $10,$9B,$3B
+	db $10, $9B, $3B
+	db $10, $9B, $3B
 	db $FF
 
 ConfusedPlayerAnim:
-	db $08,$84,$25
-	db $08,$84,$25
+	db $08, $84, $25
+	db $08, $84, $25
 	db $FF
 
 ConfusedEnemyAnim:
-	db $08,$84,$26
-	db $08,$84,$26
+	db $08, $84, $26
+	db $08, $84, $26
 	db $FF
 
 BallBlockAnim:
-	db $03,$FF,$0B
+	db $03, $FF, $0B
 	db $FF
 
 FaintAnim:
@@ -1253,11 +1253,11 @@ ShakeScreenAnim:
 	db $FF
 
 ThrowRockAnim:
-	db $03,$8B,$53
+	db $03, $8B, $53
 	db $FF
 
 ThrowBaitAnim:
-	db $03,$8B,$54
+	db $03, $8B, $54
 	db $FF
 
 SubanimationPointers:
@@ -1350,860 +1350,860 @@ SubanimationPointers:
 
 Subanimation04:
 	db $43
-	db $02,$1a,$00
-	db $02,$10,$00
-	db $02,$03,$00
+	db $02, $1a, $00
+	db $02, $10, $00
+	db $02, $03, $00
 
 Subanimation05:
 	db $41
-	db $02,$10,$00
+	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
+	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
+	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
+	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
+	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
+	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
+	db $01, $2d, $00
+	db $03, $2f, $00
+	db $03, $35, $00
+	db $03, $4d, $00
 
 Subanimation55:
 	db $41
-	db $01,$9d,$00
+	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
+	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
+	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
+	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
+	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
+	db $01, $17, $00
 
 Subanimation01:
 	db $42
-	db $01,$0f,$00
-	db $01,$1d,$00
+	db $01, $0f, $00
+	db $01, $1d, $00
 
 Subanimation02:
 	db $43
-	db $01,$12,$00
-	db $01,$15,$00
-	db $01,$1c,$00
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	db $48, $08, $00
+	db $49, $08, $00
+	db $5a, $08, $00
 
 Subanimation15:
 	db $22
-	db $35,$52,$00
-	db $35,$53,$00
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	db $25, $75, $00
 
 Subanimation20:
 	db $42
-	db $42,$07,$00
-	db $43,$07,$00
+	db $42, $07, $00
+	db $43, $07, $00
 
 Subanimation21:
 	db $43
-	db $44,$00,$00
-	db $45,$08,$00
-	db $46,$10,$02
+	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
+	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
+	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
+	db $47, $67, $00
 
 Subanimation4e:
 	db $41
-	db $71,$0f,$03
+	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
+	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
+	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
+	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
+	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
+	db $51, $2d, $00
+	db $51, $6e, $00
 
 Subanimation24:
 	db $a2
-	db $51,$2d,$00
-	db $51,$6e,$00
+	db $51, $2d, $00
+	db $51, $6e, $00
 
 Subanimation25:
 	db $62
-	db $52,$71,$00
-	db $52,$72,$00
+	db $52, $71, $00
+	db $52, $72, $00
 
 Subanimation26:
 	db $02
-	db $52,$01,$00
-	db $52,$2c,$00
+	db $52, $01, $00
+	db $52, $2c, $00
 
 Subanimation3a:
 	db $63
-	db $53,$71,$00
-	db $53,$7f,$00
-	db $53,$81,$00
+	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
+	db $53, $01, $00
+	db $53, $15, $00
+	db $53, $2c, $00
 
 Subanimation27:
 	db $a2
-	db $54,$01,$00
-	db $54,$2c,$00
+	db $54, $01, $00
+	db $54, $2c, $00
 
 Subanimation28:
 	db $23
-	db $55,$73,$03
-	db $56,$73,$03
-	db $57,$73,$00
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	db $04, $48, $04
+	db $03, $48, $04
+	db $05, $48, $04
+	db $03, $48, $03
 
 Subanimation4a:
 	db $01
-	db $04,$84,$03
+	db $04, $84, $03
 
 Subanimation4b:
 	db $03
-	db $06,$72,$00
-	db $07,$72,$00
-	db $08,$72,$00
+	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
+	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
+	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
+	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
+	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
+	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
+	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
@@ -2339,1290 +2339,1290 @@ FrameBlockPointers:
 ; 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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	db $18, $00, $45, $60
 
 FrameBlock19:
 	db $02
-	db $18,$08,$45,$00
-	db $10,$08,$46,$60
+	db $18, $08, $45, $00
+	db $10, $08, $46, $60
 
 FrameBlock1a:
 	db $02
-	db $10,$10,$45,$60
-	db $18,$10,$46,$00
+	db $10, $10, $45, $60
+	db $18, $10, $46, $00
 
 FrameBlock1b:
 	db $02
-	db $10,$18,$45,$00
-	db $08,$18,$46,$60
+	db $10, $18, $45, $00
+	db $08, $18, $46, $60
 
 FrameBlock1c:
 	db $02
-	db $08,$20,$45,$60
-	db $10,$20,$46,$00
+	db $08, $20, $45, $60
+	db $10, $20, $46, $00
 
 FrameBlock1d:
 	db $02
-	db $08,$28,$45,$00
-	db $00,$28,$46,$60
+	db $08, $28, $45, $00
+	db $00, $28, $46, $60
 
 FrameBlock1e:
 	db $02
-	db $00,$30,$45,$60
-	db $08,$30,$46,$00
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	db $06, $02, $47, $00
+	db $00, $08, $47, $00
 
 FrameBlock2c:
 	db $01
-	db $a0,$00,$4d,$00
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	db $00, $00, $03, $00
+	db $08, $00, $13, $00
 
 FrameBlock67:
 	db $01
-	db $00,$00,$03,$00
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	db $00, $00, $4d, $00
 
 FrameBlock79:
 	db $01
-	db $00,$00,$4e,$00
+	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
+	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
+	db $00, $00
diff --git a/data/moves/effects_pointers.asm b/data/moves/effects_pointers.asm
index 02f6e5c6..9858e82e 100644
--- a/data/moves/effects_pointers.asm
+++ b/data/moves/effects_pointers.asm
@@ -1,5 +1,5 @@
 MoveEffectPointerTable:
-	dw SleepEffect               ; unused effect
+	dw SleepEffect               ; EFFECT_01
 	dw PoisonEffect              ; POISON_SIDE_EFFECT1
 	dw DrainHPEffect             ; DRAIN_HP_EFFECT
 	dw FreezeBurnParalyzeEffect  ; BURN_SIDE_EFFECT1
@@ -28,14 +28,14 @@ MoveEffectPointerTable:
 	dw ThrashPetalDanceEffect    ; THRASH_PETAL_DANCE_EFFECT
 	dw SwitchAndTeleportEffect   ; SWITCH_AND_TELEPORT_EFFECT
 	dw TwoToFiveAttacksEffect    ; TWO_TO_FIVE_ATTACKS_EFFECT
-	dw TwoToFiveAttacksEffect    ; unused effect
-	dw FlinchSideEffect           ; FLINCH_SIDE_EFFECT1
+	dw TwoToFiveAttacksEffect    ; EFFECT_1E
+	dw FlinchSideEffect          ; FLINCH_SIDE_EFFECT1
 	dw SleepEffect               ; SLEEP_EFFECT
 	dw PoisonEffect              ; POISON_SIDE_EFFECT2
 	dw FreezeBurnParalyzeEffect  ; BURN_SIDE_EFFECT2
 	dw FreezeBurnParalyzeEffect  ; unused effect
 	dw FreezeBurnParalyzeEffect  ; PARALYZE_SIDE_EFFECT2
-	dw FlinchSideEffect           ; FLINCH_SIDE_EFFECT2
+	dw FlinchSideEffect          ; FLINCH_SIDE_EFFECT2
 	dw OneHitKOEffect            ; OHKO_EFFECT
 	dw ChargeEffect              ; CHARGE_EFFECT
 	dw NULL                      ; SUPER_FANG_EFFECT
diff --git a/data/moves/grammar.asm b/data/moves/grammar.asm
index 8113ab7c..bc3d1dc6 100644
--- a/data/moves/grammar.asm
+++ b/data/moves/grammar.asm
@@ -1,14 +1,72 @@
 ExclamationPointMoveSets:
-	db SWORDS_DANCE, GROWTH
-	db $00
-	db RECOVER, BIDE, SELFDESTRUCT, AMNESIA
-	db $00
-	db MEDITATE, AGILITY, TELEPORT, MIMIC, DOUBLE_TEAM, BARRAGE
-	db $00
-	db POUND, SCRATCH, VICEGRIP, WING_ATTACK, FLY, BIND, SLAM, HORN_ATTACK, BODY_SLAM
-	db WRAP, THRASH, TAIL_WHIP, LEER, BITE, GROWL, ROAR, SING, PECK, COUNTER
-	db STRENGTH, ABSORB, STRING_SHOT, EARTHQUAKE, FISSURE, DIG, TOXIC, SCREECH, HARDEN
-	db MINIMIZE, WITHDRAW, DEFENSE_CURL, METRONOME, LICK, CLAMP, CONSTRICT, POISON_GAS
-	db LEECH_LIFE, BUBBLE, FLASH, SPLASH, ACID_ARMOR, FURY_SWIPES, REST, SHARPEN, SLASH, SUBSTITUTE
-	db $00
-	db $FF ; terminator
+; set 0
+	db SWORDS_DANCE
+	db GROWTH
+	db 0 ; end set
+
+; set 1
+	db RECOVER
+	db BIDE
+	db SELFDESTRUCT
+	db AMNESIA
+	db 0 ; end set
+
+; set 2
+	db MEDITATE
+	db AGILITY
+	db TELEPORT
+	db MIMIC
+	db DOUBLE_TEAM
+	db BARRAGE
+	db 0 ; end set
+
+; set 3
+	db POUND
+	db SCRATCH
+	db VICEGRIP
+	db WING_ATTACK
+	db FLY
+	db BIND
+	db SLAM
+	db HORN_ATTACK
+	db BODY_SLAM
+	db WRAP
+	db THRASH
+	db TAIL_WHIP
+	db LEER
+	db BITE
+	db GROWL
+	db ROAR
+	db SING
+	db PECK
+	db COUNTER
+	db STRENGTH
+	db ABSORB
+	db STRING_SHOT
+	db EARTHQUAKE
+	db FISSURE
+	db DIG
+	db TOXIC
+	db SCREECH
+	db HARDEN
+	db MINIMIZE
+	db WITHDRAW
+	db DEFENSE_CURL
+	db METRONOME
+	db LICK
+	db CLAMP
+	db CONSTRICT
+	db POISON_GAS
+	db LEECH_LIFE
+	db BUBBLE
+	db FLASH
+	db SPLASH
+	db ACID_ARMOR
+	db FURY_SWIPES
+	db REST
+	db SHARPEN
+	db SLASH
+	db SUBSTITUTE
+	db 0 ; end set
+
+	db -1 ; end
diff --git a/data/moves/names.asm b/data/moves/names.asm
index f8706ee3..cbb1a322 100644
--- a/data/moves/names.asm
+++ b/data/moves/names.asm
@@ -164,4 +164,3 @@ MoveNames::
 	db "SLASH@"
 	db "SUBSTITUTE@"
 	db "STRUGGLE@"
-
diff --git a/data/moves/sfx.asm b/data/moves/sfx.asm
index 28ad0b63..c1f12084 100644
--- a/data/moves/sfx.asm
+++ b/data/moves/sfx.asm
@@ -1,168 +1,168 @@
 MoveSoundTable:
 	; ID, pitch mod, tempo mod
-	db SFX_POUND,             $00,$80 ; POUND
-	db SFX_BATTLE_0C,         $10,$80 ; KARATE_CHOP
-	db SFX_DOUBLESLAP,        $00,$80 ; DOUBLESLAP
-	db SFX_BATTLE_0B,         $01,$80 ; COMET_PUNCH
-	db SFX_BATTLE_0D,         $00,$40 ; MEGA_PUNCH
-	db SFX_SILPH_SCOPE,       $00,$ff ; PAY_DAY
-	db SFX_BATTLE_0D,         $10,$60 ; FIRE_PUNCH
-	db SFX_BATTLE_0D,         $20,$80 ; ICE_PUNCH
-	db SFX_BATTLE_0D,         $00,$a0 ; THUNDERPUNCH
-	db SFX_DAMAGE,            $00,$80 ; SCRATCH
-	db SFX_BATTLE_0F,         $20,$40 ; VICEGRIP
-	db SFX_BATTLE_0F,         $00,$80 ; GUILLOTINE
-	db SFX_BATTLE_0E,         $00,$a0 ; RAZOR_WIND
-	db SFX_NOT_VERY_EFFECTIVE,$10,$c0 ; SWORDS_DANCE
-	db SFX_NOT_VERY_EFFECTIVE,$00,$a0 ; CUT
-	db SFX_BATTLE_12,         $00,$c0 ; GUST
-	db SFX_BATTLE_12,         $10,$a0 ; WING_ATTACK
-	db SFX_BATTLE_13,         $00,$e0 ; WHIRLWIND
-	db SFX_NOT_VERY_EFFECTIVE,$20,$c0 ; FLY
-	db SFX_BATTLE_14,         $00,$80 ; BIND
-	db SFX_BATTLE_22,         $00,$80 ; SLAM
-	db SFX_VINE_WHIP,         $01,$80 ; VINE_WHIP
-	db SFX_BATTLE_20,         $00,$80 ; STOMP
-	db SFX_BATTLE_17,         $f0,$40 ; DOUBLE_KICK
-	db SFX_SUPER_EFFECTIVE,   $00,$80 ; MEGA_KICK
-	db SFX_BATTLE_17,         $00,$80 ; JUMP_KICK
-	db SFX_BATTLE_21,         $10,$80 ; ROLLING_KICK
-	db SFX_BATTLE_1B,         $01,$a0 ; SAND_ATTACK
-	db SFX_BATTLE_18,         $00,$80 ; HEADBUTT
-	db SFX_BATTLE_1E,         $00,$60 ; HORN_ATTACK
-	db SFX_BATTLE_1E,         $01,$40 ; FURY_ATTACK
-	db SFX_HORN_DRILL,        $00,$a0 ; HORN_DRILL
-	db SFX_SUPER_EFFECTIVE,   $10,$a0 ; TACKLE
-	db SFX_BATTLE_20,         $00,$c0 ; BODY_SLAM
-	db SFX_BATTLE_14,         $10,$60 ; WRAP
-	db SFX_SUPER_EFFECTIVE,   $00,$a0 ; TAKE_DOWN
-	db SFX_BATTLE_22,         $11,$c0 ; THRASH
-	db SFX_SUPER_EFFECTIVE,   $20,$c0 ; DOUBLE_EDGE
-	db SFX_BATTLE_21,         $00,$80 ; TAIL_WHIP
-	db SFX_BATTLE_1B,         $00,$80 ; POISON_STING
-	db SFX_BATTLE_1B,         $20,$c0 ; TWINEEDLE
-	db SFX_BATTLE_19,         $00,$80 ; PIN_MISSILE
-	db SFX_BATTLE_31,         $ff,$40 ; LEER
-	db SFX_BATTLE_1E,         $00,$80 ; BITE
-	db SFX_BATTLE_0B,         $00,$c0 ; GROWL
-	db SFX_BATTLE_0B,         $00,$40 ; ROAR
-	db SFX_BATTLE_35,         $00,$80 ; SING
-	db SFX_BATTLE_27,         $40,$60 ; SUPERSONIC
-	db SFX_BATTLE_27,         $00,$80 ; SONICBOOM
-	db SFX_BATTLE_27,         $ff,$40 ; DISABLE
-	db SFX_BATTLE_2A,         $80,$c0 ; ACID
-	db SFX_BATTLE_19,         $10,$a0 ; EMBER
-	db SFX_BATTLE_19,         $21,$e0 ; FLAMETHROWER
-	db SFX_BATTLE_29,         $00,$80 ; MIST
-	db SFX_BATTLE_24,         $20,$60 ; WATER_GUN
-	db SFX_BATTLE_2A,         $00,$80 ; HYDRO_PUMP
-	db SFX_BATTLE_2C,         $00,$80 ; SURF
-	db SFX_BATTLE_28,         $40,$80 ; ICE_BEAM
-	db SFX_BATTLE_29,         $f0,$e0 ; BLIZZARD
-	db SFX_PSYBEAM,           $00,$80 ; PSYBEAM
-	db SFX_BATTLE_2A,         $f0,$60 ; BUBBLEBEAM
-	db SFX_BATTLE_28,         $00,$80 ; AURORA_BEAM
-	db SFX_BATTLE_36,         $00,$80 ; HYPER_BEAM
-	db SFX_PECK,              $01,$a0 ; PECK
-	db SFX_BATTLE_13,         $f0,$20 ; DRILL_PECK
-	db SFX_BATTLE_23,         $01,$c0 ; SUBMISSION
-	db SFX_BATTLE_23,         $00,$80 ; LOW_KICK
-	db SFX_SUPER_EFFECTIVE,   $00,$e0 ; COUNTER
-	db SFX_BATTLE_26,         $01,$60 ; SEISMIC_TOSS
-	db SFX_BATTLE_26,         $20,$40 ; STRENGTH
-	db SFX_BATTLE_24,         $00,$80 ; ABSORB
-	db SFX_BATTLE_24,         $40,$c0 ; MEGA_DRAIN
-	db SFX_BATTLE_1B,         $03,$60 ; LEECH_SEED
-	db SFX_BATTLE_25,         $11,$e0 ; GROWTH
-	db SFX_BATTLE_12,         $20,$e0 ; RAZOR_LEAF
-	db SFX_BATTLE_2E,         $00,$80 ; SOLARBEAM
-	db SFX_BATTLE_1C,         $00,$80 ; POISONPOWDER
-	db SFX_BATTLE_1C,         $11,$a0 ; STUN_SPORE
-	db SFX_BATTLE_1C,         $01,$c0 ; SLEEP_POWDER
-	db SFX_BATTLE_13,         $14,$c0 ; PETAL_DANCE
-	db SFX_BATTLE_1B,         $02,$a0 ; STRING_SHOT
-	db SFX_BATTLE_29,         $f0,$80 ; DRAGON_RAGE
-	db SFX_BATTLE_29,         $20,$c0 ; FIRE_SPIN
-	db SFX_BATTLE_2F,         $00,$20 ; THUNDERSHOCK
-	db SFX_BATTLE_2F,         $20,$80 ; THUNDERBOLT
-	db SFX_BATTLE_2E,         $12,$60 ; THUNDER_WAVE
-	db SFX_BATTLE_26,         $00,$80 ; THUNDER
-	db SFX_BATTLE_14,         $01,$e0 ; ROCK_THROW
-	db SFX_BATTLE_29,         $0f,$e0 ; EARTHQUAKE
-	db SFX_BATTLE_29,         $11,$20 ; FISSURE
-	db SFX_DAMAGE,            $10,$40 ; DIG
-	db SFX_BATTLE_0F,         $10,$c0 ; TOXIC
-	db SFX_BATTLE_14,         $00,$20 ; CONFUSION
-	db SFX_PSYCHIC_M,         $00,$80 ; PSYCHIC_M
-	db SFX_BATTLE_35,         $11,$18 ; HYPNOSIS
-	db SFX_BATTLE_09,         $20,$c0 ; MEDITATE
-	db SFX_FAINT_FALL,        $20,$c0 ; AGILITY
-	db SFX_BATTLE_25,         $00,$10 ; QUICK_ATTACK
-	db SFX_BATTLE_26,         $f0,$20 ; RAGE
-	db SFX_BATTLE_33,         $f0,$c0 ; TELEPORT
-	db SFX_NOT_VERY_EFFECTIVE,$f0,$e0 ; NIGHT_SHADE
-	db SFX_BATTLE_09,         $f0,$40 ; MIMIC
-	db SFX_BATTLE_31,         $00,$80 ; SCREECH
-	db SFX_BATTLE_33,         $80,$40 ; DOUBLE_TEAM
-	db SFX_BATTLE_33,         $00,$80 ; RECOVER
-	db SFX_BATTLE_14,         $11,$20 ; HARDEN
-	db SFX_BATTLE_14,         $22,$10 ; MINIMIZE
-	db SFX_BATTLE_1B,         $f1,$ff ; SMOKESCREEN
-	db SFX_BATTLE_13,         $f1,$ff ; CONFUSE_RAY
-	db SFX_BATTLE_14,         $33,$30 ; WITHDRAW
-	db SFX_BATTLE_32,         $40,$c0 ; DEFENSE_CURL
-	db SFX_BATTLE_0E,         $20,$20 ; BARRIER
-	db SFX_BATTLE_0E,         $f0,$10 ; LIGHT_SCREEN
-	db SFX_BATTLE_0F,         $f8,$10 ; HAZE
-	db SFX_NOT_VERY_EFFECTIVE,$f0,$10 ; REFLECT
-	db SFX_BATTLE_25,         $00,$80 ; FOCUS_ENERGY
-	db SFX_BATTLE_18,         $00,$c0 ; BIDE
-	db SFX_BATTLE_32,         $c0,$ff ; METRONOME
-	db SFX_BATTLE_09,         $f2,$20 ; MIRROR_MOVE
-	db SFX_BATTLE_34,         $00,$80 ; SELFDESTRUCT
-	db SFX_BATTLE_34,         $00,$40 ; EGG_BOMB
-	db SFX_BATTLE_09,         $00,$40 ; LICK
-	db SFX_NOT_VERY_EFFECTIVE,$10,$ff ; SMOG
-	db SFX_BATTLE_2A,         $20,$20 ; SLUDGE
-	db SFX_BATTLE_32,         $00,$80 ; BONE_CLUB
-	db SFX_BATTLE_29,         $1f,$20 ; FIRE_BLAST
-	db SFX_BATTLE_25,         $2f,$80 ; WATERFALL
-	db SFX_BATTLE_0F,         $1f,$ff ; CLAMP
-	db SFX_BATTLE_2B,         $1f,$60 ; SWIFT
-	db SFX_BATTLE_26,         $1e,$20 ; SKULL_BASH
-	db SFX_BATTLE_26,         $1f,$18 ; SPIKE_CANNON
-	db SFX_BATTLE_14,         $0f,$80 ; CONSTRICT
-	db SFX_BATTLE_09,         $f8,$10 ; AMNESIA
-	db SFX_FAINT_FALL,        $18,$20 ; KINESIS
-	db SFX_BATTLE_32,         $08,$40 ; SOFTBOILED
-	db SFX_BATTLE_17,         $01,$e0 ; HI_JUMP_KICK
-	db SFX_NOT_VERY_EFFECTIVE,$09,$ff ; GLARE
-	db SFX_BATTLE_35,         $42,$01 ; DREAM_EATER
-	db SFX_BATTLE_1C,         $00,$ff ; POISON_GAS
-	db SFX_BATTLE_32,         $08,$e0 ; BARRAGE
-	db SFX_BATTLE_24,         $00,$80 ; LEECH_LIFE
-	db SFX_BATTLE_09,         $88,$10 ; LOVELY_KISS
-	db SFX_BATTLE_25,         $48,$ff ; SKY_ATTACK
-	db SFX_FAINT_FALL,        $ff,$ff ; TRANSFORM
-	db SFX_BATTLE_24,         $ff,$10 ; BUBBLE
-	db SFX_FAINT_FALL,        $ff,$04 ; DIZZY_PUNCH
-	db SFX_BATTLE_1C,         $01,$ff ; SPORE
-	db SFX_BATTLE_13,         $f8,$ff ; FLASH
-	db SFX_BATTLE_0C,         $f0,$f0 ; PSYWAVE
-	db SFX_BATTLE_0F,         $08,$10 ; SPLASH
-	db SFX_BATTLE_0D,         $f0,$ff ; ACID_ARMOR
-	db SFX_SUPER_EFFECTIVE,   $f0,$ff ; CRABHAMMER
-	db SFX_BATTLE_34,         $10,$ff ; EXPLOSION
-	db SFX_BATTLE_0E,         $f0,$20 ; FURY_SWIPES
-	db SFX_BATTLE_2B,         $f0,$60 ; BONEMERANG
-	db SFX_BATTLE_21,         $12,$10 ; REST
-	db SFX_BATTLE_36,         $f0,$20 ; ROCK_SLIDE
-	db SFX_BATTLE_1E,         $12,$ff ; HYPER_FANG
-	db SFX_BATTLE_31,         $80,$04 ; SHARPEN
-	db SFX_BATTLE_33,         $f0,$10 ; CONVERSION
-	db SFX_BATTLE_29,         $f8,$ff ; TRI_ATTACK
-	db SFX_BATTLE_26,         $f0,$ff ; SUPER_FANG
-	db SFX_NOT_VERY_EFFECTIVE,$01,$ff ; SLASH
-	db SFX_BATTLE_2C,         $d8,$04 ; SUBSTITUTE
-	db SFX_BATTLE_0B,         $00,$80 ; STRUGGLE
-	db SFX_BATTLE_0B,         $00,$80
+	db SFX_POUND,              $00, $80 ; POUND
+	db SFX_BATTLE_0C,          $10, $80 ; KARATE_CHOP
+	db SFX_DOUBLESLAP,         $00, $80 ; DOUBLESLAP
+	db SFX_BATTLE_0B,          $01, $80 ; COMET_PUNCH
+	db SFX_BATTLE_0D,          $00, $40 ; MEGA_PUNCH
+	db SFX_SILPH_SCOPE,        $00, $ff ; PAY_DAY
+	db SFX_BATTLE_0D,          $10, $60 ; FIRE_PUNCH
+	db SFX_BATTLE_0D,          $20, $80 ; ICE_PUNCH
+	db SFX_BATTLE_0D,          $00, $a0 ; THUNDERPUNCH
+	db SFX_DAMAGE,             $00, $80 ; SCRATCH
+	db SFX_BATTLE_0F,          $20, $40 ; VICEGRIP
+	db SFX_BATTLE_0F,          $00, $80 ; GUILLOTINE
+	db SFX_BATTLE_0E,          $00, $a0 ; RAZOR_WIND
+	db SFX_NOT_VERY_EFFECTIVE, $10, $c0 ; SWORDS_DANCE
+	db SFX_NOT_VERY_EFFECTIVE, $00, $a0 ; CUT
+	db SFX_BATTLE_12,          $00, $c0 ; GUST
+	db SFX_BATTLE_12,          $10, $a0 ; WING_ATTACK
+	db SFX_BATTLE_13,          $00, $e0 ; WHIRLWIND
+	db SFX_NOT_VERY_EFFECTIVE, $20, $c0 ; FLY
+	db SFX_BATTLE_14,          $00, $80 ; BIND
+	db SFX_BATTLE_22,          $00, $80 ; SLAM
+	db SFX_VINE_WHIP,          $01, $80 ; VINE_WHIP
+	db SFX_BATTLE_20,          $00, $80 ; STOMP
+	db SFX_BATTLE_17,          $f0, $40 ; DOUBLE_KICK
+	db SFX_SUPER_EFFECTIVE,    $00, $80 ; MEGA_KICK
+	db SFX_BATTLE_17,          $00, $80 ; JUMP_KICK
+	db SFX_BATTLE_21,          $10, $80 ; ROLLING_KICK
+	db SFX_BATTLE_1B,          $01, $a0 ; SAND_ATTACK
+	db SFX_BATTLE_18,          $00, $80 ; HEADBUTT
+	db SFX_BATTLE_1E,          $00, $60 ; HORN_ATTACK
+	db SFX_BATTLE_1E,          $01, $40 ; FURY_ATTACK
+	db SFX_HORN_DRILL,         $00, $a0 ; HORN_DRILL
+	db SFX_SUPER_EFFECTIVE,    $10, $a0 ; TACKLE
+	db SFX_BATTLE_20,          $00, $c0 ; BODY_SLAM
+	db SFX_BATTLE_14,          $10, $60 ; WRAP
+	db SFX_SUPER_EFFECTIVE,    $00, $a0 ; TAKE_DOWN
+	db SFX_BATTLE_22,          $11, $c0 ; THRASH
+	db SFX_SUPER_EFFECTIVE,    $20, $c0 ; DOUBLE_EDGE
+	db SFX_BATTLE_21,          $00, $80 ; TAIL_WHIP
+	db SFX_BATTLE_1B,          $00, $80 ; POISON_STING
+	db SFX_BATTLE_1B,          $20, $c0 ; TWINEEDLE
+	db SFX_BATTLE_19,          $00, $80 ; PIN_MISSILE
+	db SFX_BATTLE_31,          $ff, $40 ; LEER
+	db SFX_BATTLE_1E,          $00, $80 ; BITE
+	db SFX_BATTLE_0B,          $00, $c0 ; GROWL
+	db SFX_BATTLE_0B,          $00, $40 ; ROAR
+	db SFX_BATTLE_35,          $00, $80 ; SING
+	db SFX_BATTLE_27,          $40, $60 ; SUPERSONIC
+	db SFX_BATTLE_27,          $00, $80 ; SONICBOOM
+	db SFX_BATTLE_27,          $ff, $40 ; DISABLE
+	db SFX_BATTLE_2A,          $80, $c0 ; ACID
+	db SFX_BATTLE_19,          $10, $a0 ; EMBER
+	db SFX_BATTLE_19,          $21, $e0 ; FLAMETHROWER
+	db SFX_BATTLE_29,          $00, $80 ; MIST
+	db SFX_BATTLE_24,          $20, $60 ; WATER_GUN
+	db SFX_BATTLE_2A,          $00, $80 ; HYDRO_PUMP
+	db SFX_BATTLE_2C,          $00, $80 ; SURF
+	db SFX_BATTLE_28,          $40, $80 ; ICE_BEAM
+	db SFX_BATTLE_29,          $f0, $e0 ; BLIZZARD
+	db SFX_PSYBEAM,            $00, $80 ; PSYBEAM
+	db SFX_BATTLE_2A,          $f0, $60 ; BUBBLEBEAM
+	db SFX_BATTLE_28,          $00, $80 ; AURORA_BEAM
+	db SFX_BATTLE_36,          $00, $80 ; HYPER_BEAM
+	db SFX_PECK,               $01, $a0 ; PECK
+	db SFX_BATTLE_13,          $f0, $20 ; DRILL_PECK
+	db SFX_BATTLE_23,          $01, $c0 ; SUBMISSION
+	db SFX_BATTLE_23,          $00, $80 ; LOW_KICK
+	db SFX_SUPER_EFFECTIVE,    $00, $e0 ; COUNTER
+	db SFX_BATTLE_26,          $01, $60 ; SEISMIC_TOSS
+	db SFX_BATTLE_26,          $20, $40 ; STRENGTH
+	db SFX_BATTLE_24,          $00, $80 ; ABSORB
+	db SFX_BATTLE_24,          $40, $c0 ; MEGA_DRAIN
+	db SFX_BATTLE_1B,          $03, $60 ; LEECH_SEED
+	db SFX_BATTLE_25,          $11, $e0 ; GROWTH
+	db SFX_BATTLE_12,          $20, $e0 ; RAZOR_LEAF
+	db SFX_BATTLE_2E,          $00, $80 ; SOLARBEAM
+	db SFX_BATTLE_1C,          $00, $80 ; POISONPOWDER
+	db SFX_BATTLE_1C,          $11, $a0 ; STUN_SPORE
+	db SFX_BATTLE_1C,          $01, $c0 ; SLEEP_POWDER
+	db SFX_BATTLE_13,          $14, $c0 ; PETAL_DANCE
+	db SFX_BATTLE_1B,          $02, $a0 ; STRING_SHOT
+	db SFX_BATTLE_29,          $f0, $80 ; DRAGON_RAGE
+	db SFX_BATTLE_29,          $20, $c0 ; FIRE_SPIN
+	db SFX_BATTLE_2F,          $00, $20 ; THUNDERSHOCK
+	db SFX_BATTLE_2F,          $20, $80 ; THUNDERBOLT
+	db SFX_BATTLE_2E,          $12, $60 ; THUNDER_WAVE
+	db SFX_BATTLE_26,          $00, $80 ; THUNDER
+	db SFX_BATTLE_14,          $01, $e0 ; ROCK_THROW
+	db SFX_BATTLE_29,          $0f, $e0 ; EARTHQUAKE
+	db SFX_BATTLE_29,          $11, $20 ; FISSURE
+	db SFX_DAMAGE,             $10, $40 ; DIG
+	db SFX_BATTLE_0F,          $10, $c0 ; TOXIC
+	db SFX_BATTLE_14,          $00, $20 ; CONFUSION
+	db SFX_PSYCHIC_M,          $00, $80 ; PSYCHIC_M
+	db SFX_BATTLE_35,          $11, $18 ; HYPNOSIS
+	db SFX_BATTLE_09,          $20, $c0 ; MEDITATE
+	db SFX_FAINT_FALL,         $20, $c0 ; AGILITY
+	db SFX_BATTLE_25,          $00, $10 ; QUICK_ATTACK
+	db SFX_BATTLE_26,          $f0, $20 ; RAGE
+	db SFX_BATTLE_33,          $f0, $c0 ; TELEPORT
+	db SFX_NOT_VERY_EFFECTIVE, $f0, $e0 ; NIGHT_SHADE
+	db SFX_BATTLE_09,          $f0, $40 ; MIMIC
+	db SFX_BATTLE_31,          $00, $80 ; SCREECH
+	db SFX_BATTLE_33,          $80, $40 ; DOUBLE_TEAM
+	db SFX_BATTLE_33,          $00, $80 ; RECOVER
+	db SFX_BATTLE_14,          $11, $20 ; HARDEN
+	db SFX_BATTLE_14,          $22, $10 ; MINIMIZE
+	db SFX_BATTLE_1B,          $f1, $ff ; SMOKESCREEN
+	db SFX_BATTLE_13,          $f1, $ff ; CONFUSE_RAY
+	db SFX_BATTLE_14,          $33, $30 ; WITHDRAW
+	db SFX_BATTLE_32,          $40, $c0 ; DEFENSE_CURL
+	db SFX_BATTLE_0E,          $20, $20 ; BARRIER
+	db SFX_BATTLE_0E,          $f0, $10 ; LIGHT_SCREEN
+	db SFX_BATTLE_0F,          $f8, $10 ; HAZE
+	db SFX_NOT_VERY_EFFECTIVE, $f0, $10 ; REFLECT
+	db SFX_BATTLE_25,          $00, $80 ; FOCUS_ENERGY
+	db SFX_BATTLE_18,          $00, $c0 ; BIDE
+	db SFX_BATTLE_32,          $c0, $ff ; METRONOME
+	db SFX_BATTLE_09,          $f2, $20 ; MIRROR_MOVE
+	db SFX_BATTLE_34,          $00, $80 ; SELFDESTRUCT
+	db SFX_BATTLE_34,          $00, $40 ; EGG_BOMB
+	db SFX_BATTLE_09,          $00, $40 ; LICK
+	db SFX_NOT_VERY_EFFECTIVE, $10, $ff ; SMOG
+	db SFX_BATTLE_2A,          $20, $20 ; SLUDGE
+	db SFX_BATTLE_32,          $00, $80 ; BONE_CLUB
+	db SFX_BATTLE_29,          $1f, $20 ; FIRE_BLAST
+	db SFX_BATTLE_25,          $2f, $80 ; WATERFALL
+	db SFX_BATTLE_0F,          $1f, $ff ; CLAMP
+	db SFX_BATTLE_2B,          $1f, $60 ; SWIFT
+	db SFX_BATTLE_26,          $1e, $20 ; SKULL_BASH
+	db SFX_BATTLE_26,          $1f, $18 ; SPIKE_CANNON
+	db SFX_BATTLE_14,          $0f, $80 ; CONSTRICT
+	db SFX_BATTLE_09,          $f8, $10 ; AMNESIA
+	db SFX_FAINT_FALL,         $18, $20 ; KINESIS
+	db SFX_BATTLE_32,          $08, $40 ; SOFTBOILED
+	db SFX_BATTLE_17,          $01, $e0 ; HI_JUMP_KICK
+	db SFX_NOT_VERY_EFFECTIVE, $09, $ff ; GLARE
+	db SFX_BATTLE_35,          $42, $01 ; DREAM_EATER
+	db SFX_BATTLE_1C,          $00, $ff ; POISON_GAS
+	db SFX_BATTLE_32,          $08, $e0 ; BARRAGE
+	db SFX_BATTLE_24,          $00, $80 ; LEECH_LIFE
+	db SFX_BATTLE_09,          $88, $10 ; LOVELY_KISS
+	db SFX_BATTLE_25,          $48, $ff ; SKY_ATTACK
+	db SFX_FAINT_FALL,         $ff, $ff ; TRANSFORM
+	db SFX_BATTLE_24,          $ff, $10 ; BUBBLE
+	db SFX_FAINT_FALL,         $ff, $04 ; DIZZY_PUNCH
+	db SFX_BATTLE_1C,          $01, $ff ; SPORE
+	db SFX_BATTLE_13,          $f8, $ff ; FLASH
+	db SFX_BATTLE_0C,          $f0, $f0 ; PSYWAVE
+	db SFX_BATTLE_0F,          $08, $10 ; SPLASH
+	db SFX_BATTLE_0D,          $f0, $ff ; ACID_ARMOR
+	db SFX_SUPER_EFFECTIVE,    $f0, $ff ; CRABHAMMER
+	db SFX_BATTLE_34,          $10, $ff ; EXPLOSION
+	db SFX_BATTLE_0E,          $f0, $20 ; FURY_SWIPES
+	db SFX_BATTLE_2B,          $f0, $60 ; BONEMERANG
+	db SFX_BATTLE_21,          $12, $10 ; REST
+	db SFX_BATTLE_36,          $f0, $20 ; ROCK_SLIDE
+	db SFX_BATTLE_1E,          $12, $ff ; HYPER_FANG
+	db SFX_BATTLE_31,          $80, $04 ; SHARPEN
+	db SFX_BATTLE_33,          $f0, $10 ; CONVERSION
+	db SFX_BATTLE_29,          $f8, $ff ; TRI_ATTACK
+	db SFX_BATTLE_26,          $f0, $ff ; SUPER_FANG
+	db SFX_NOT_VERY_EFFECTIVE, $01, $ff ; SLASH
+	db SFX_BATTLE_2C,          $d8, $04 ; SUBSTITUTE
+	db SFX_BATTLE_0B,          $00, $80 ; STRUGGLE
+	db SFX_BATTLE_0B,          $00, $80